* bump up to sendmail 8.13 and cross fingers

* make sure recipient addresses starting with '-' are not mistaken for flags
This commit is contained in:
Christian Weisgerber 2007-07-24 17:36:02 +00:00
parent 76eb368f13
commit d368a7dd35
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=196221
4 changed files with 31 additions and 9 deletions

View file

@ -6,7 +6,7 @@
PORTNAME= bsmtp
PORTVERSION= 1.02
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= naddy
@ -32,7 +32,10 @@ UUPREFIX= ${LOCALBASE}
post-patch:
@${CP} ${WRKSRC}/bsmtp.m4.8.9.in ${WRKSRC}/bsmtp.m4.8.10.in
@${CP} ${FILESDIR}/bsmtp.m4.*.in ${WRKSRC}/
@${CP} ${FILESDIR}/bsmtp.m4.8.11.in ${WRKSRC}/
.for v in 12 13 14
@${CP} ${FILESDIR}/bsmtp.m4.8.12.in ${WRKSRC}/bsmtp.m4.8.$v.in
.endfor
pre-configure:
@${SED} <${FILESDIR}/config.sed >${WRKSRC}/config.sed \

View file

@ -20,9 +20,9 @@ s,@DAEMONUID@,66,
s,@INPROTO@,BSMTP,
s,@LOCALHOSTNAME@,`hostname`,
s,@DOMAINSUFFIX@,none,
s,@SENDMAILVERS@,8.11,
s,@SENDMAILVERS@,8.13,
s,@INSTALLMAILER@,true,
s,@MAILERVERSION@,8.11,
s,@MAILERVERSION@,8.13,
s,@FLOCK@,true,
s,@LOCKDEFINE@,-DUSE_FLOCK,
s,@BATCHER@,batcher.new,

View file

@ -1,20 +1,21 @@
$FreeBSD$
--- configure.orig Fri Feb 22 17:30:58 2002
+++ configure Fri Feb 22 17:32:13 2002
@@ -41,6 +41,10 @@
--- configure.orig
+++ configure
@@ -41,6 +41,11 @@
"batcher",
"batcher.c",
"bsmtp.c",
+ "bsmtp.m4.8.14",
+ "bsmtp.m4.8.13",
+ "bsmtp.m4.8.12",
+ "bsmtp.m4.8.11",
+ "bsmtp.m4.8.10",
+ "bsmtp.m4.8.9",
"bsmtp.m4.8.9",
"bsmtp.m4.8.8",
"bsmtp.m4.8.7",
@@ -198,6 +202,12 @@
@@ -198,6 +203,16 @@
$default[$i] = '8.8';
} elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.9(\..*)?\s*$/) {
$default[$i] = '8.9';
@ -24,6 +25,10 @@ $FreeBSD$
+ $default[$i] = '8.11';
+ } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.12(\..*)?\s*$/) {
+ $default[$i] = '8.12';
+ } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.13(\..*)?\s*$/) {
+ $default[$i] = '8.13';
+ } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.14(\..*)?\s*$/) {
+ $default[$i] = '8.14';
} else {
$default[$i] = ''; # Will not be installed
}

View file

@ -0,0 +1,14 @@
$FreeBSD$
--- rsmtp.in.orig
+++ rsmtp.in
@@ -72,7 +72,7 @@
print STDERR "Recipient: $r\n" if ($debug);
push (@recipients, $r);
}
- $sendmail="$sendmailproto -f$mailfrom -p@INPROTO@:$fromhost";
+ $sendmail="$sendmailproto -f$mailfrom -p@INPROTO@:$fromhost --";
while (defined $recipients[0]) {
$sendmail .= " " . $recipients[0];
shift (@recipients);