summaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorlioux <lioux@FreeBSD.org>2003-12-10 21:40:13 +0000
committerlioux <lioux@FreeBSD.org>2003-12-10 21:40:13 +0000
commitf27da10f4b5f296ba5e52f6c9e5de1c4df5e8cff (patch)
treeade34c1d535cf843fcd362514df71690722dc841 /mail
parent8992634b5679783c253473d45b7a5965ba611e3f (diff)
downloadFreeBSD-ports-f27da10f4b5f296ba5e52f6c9e5de1c4df5e8cff.zip
FreeBSD-ports-f27da10f4b5f296ba5e52f6c9e5de1c4df5e8cff.tar.gz
1) PORTREVISION bump due to [3] and [4]
2) distinfo - update checksum for outgoingip.patch: no major change in code 3) New patch files/patch-qmail-local.c - Erik Sjlund pointed out a bug in qmail-local at http://www.ornl.gov/its/archives/mailing-lists/qmail/2000/10/msg00696.html - Precedence bug corrected by adding parentheses which affects .qmail files parsing code 4) Add qmail's sendmail emulation fix: "David Phillips noticed that sendmail's '-f' option sets a default From: header, and so should qmail's emulation." - Add distinfo checksum for the patch Submitted by: too many [2] Obtained from: http://www.qmail.org/ [3] [4]
Diffstat (limited to 'mail')
-rw-r--r--mail/qmail/Makefile9
-rw-r--r--mail/qmail/distinfo3
-rw-r--r--mail/qmail/files/patch-qmail-local.c11
3 files changed, 21 insertions, 2 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 937ceb2..228ebd1 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qmail
PORTVERSION?= ${QMAIL_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= mail
MASTER_SITES= http://cr.yp.to/software/ \
ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \
@@ -27,6 +27,13 @@ PATCHFILES+= qmail-103.patch:dns
PATCH_DIST_STRIP+= -p1
.endif # MAIN_QMAIL_PORT_DNS_PATCH_BARRIER
+.if !defined(MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER)
+# David Phillips noticed that sendmail's -f option sets a default
+# From: header, and so should qmail's emulation.
+PATCH_SITES+= http://david.acz.org/software/:sendmail_flagf
+PATCHFILES+= sendmail-flagf.patch:sendmail_flagf
+.endif # MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER
+
PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:local,dns,ldap,mysql,tls/}
PATCH_SITE_SUBDIR+= lioux/:local,dns,ldap,mysql,tls
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 3f6292d..ceb7c9e 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -6,4 +6,5 @@ MD5 (tls.patch) = 57447ec135ddb32ada13a56b70ccf6d4
MD5 (qmailqueue-patch) = 5a8d7a5863b0c56236af945dedd45754
MD5 (big-todo.103.patch) = 39b6f70f65056472ff97ab40c1dba7b4
MD5 (big-concurrency.patch) = 2ff58c3570870a8ff9a1d9eb9aec05a6
-MD5 (outgoingip.patch) = 4286231d925105b6c71a91d668778eb5
+MD5 (outgoingip.patch) = 27e07ea6328cd763481c6d8887b20fe2
+MD5 (sendmail-flagf.patch) = 4e1f2d8315e7e2a5482798c9d19fac4d
diff --git a/mail/qmail/files/patch-qmail-local.c b/mail/qmail/files/patch-qmail-local.c
new file mode 100644
index 0000000..ee0709d
--- /dev/null
+++ b/mail/qmail/files/patch-qmail-local.c
@@ -0,0 +1,11 @@
+--- qmail-local.c.orig Sun Nov 23 18:30:43 2003
++++ qmail-local.c Sun Nov 23 18:31:31 2003
+@@ -645,7 +645,7 @@
+ {
+ cmds.s[j] = 0;
+ k = j;
+- while ((k > i) && (cmds.s[k - 1] == ' ') || (cmds.s[k - 1] == '\t'))
++ while ((k > i) && ((cmds.s[k - 1] == ' ') || (cmds.s[k - 1] == '\t')))
+ cmds.s[--k] = 0;
+ switch(cmds.s[i])
+ {
OpenPOWER on IntegriCloud