3 files changed, 51 insertions, 36 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index bd4f347c00d9..73d351b1a0f6 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -38,7 +38,6 @@ BARRIER_SMTP_AUTH_PATCH=	yes
 
 .if defined(SLAVE_LDAP)
 BARRIER_BIG_CONCURRENCY_PATCH=	yes
-BARRIER_DNS_PATCH=		yes
 BARRIER_EXTTODO_PATCH=		yes
 BARRIER_OUTGOINGIP_PATCH=	yes
 .endif
@@ -49,6 +48,7 @@ BARRIER_QMTPC_PATCH=		yes
 BARRIER_DISCBOUNCES_PATCH=	yes
 BARRIER_SENDMAIL_F_PATCH=	yes
 BARRIER_BIG_TODO_PATCH=		yes
+BARRIER_DNS_PATCH=		yes
 .endif
 
 .if defined(SLAVE_LDAP) || \
@@ -177,11 +177,13 @@ LDAP_PARAMS=	ALTQUEUE BIGBROTHER BIGTODO BIND_8_COMPAT\
 		QMQP_COMPRESS QUOTATRASH SMTPEXECCHECK
 
 .elif defined(SLAVE_SPAMCONTROL)
-OPTIONS+=	RELAYMAILFROM	"Open relay based on mailfrom" off \
-		REQBRACKETS	"Require brackets in <addresses>" on \
+OPTIONS+=	REQBRACKETS	"Require brackets in <addresses>" on \
 		VERP		"VERP addresses for recipients" on \
 		MOREIPME	"Add control files (more|not)ipme" off \
 		BIGTODO		"Bruce Guenter's BigToDo patch" off \
+		DELIVERTO	"smtpd can deliver identified spam" off \
+		NEWLINE		"smtpd accept bare line feeds" off \
+		PAM111421	"smtpd allow email in case PAM failure" on \
 		SMTPEXTFORK	"Allow qmail-smtpd fork external progs" off \
 		XF_QUITASAP	"Close SMTP session ASAP (SMTPEXTFORK)" off
 .endif
@@ -286,7 +288,7 @@ DOCFILES_WRKDIR_doc+=	FILES.spamcontrol HISTORY.spamcontrol \
 			README.wildmat README_spamcontrol.html \
 			RELEASE_22.spamcontrol RELEASE_23.spamcontrol \
 			SMTPREPLY.spamcontrol TODO.spamcontrol badloadertypes \
-			badmailfrom badmimetypes badrcptto tarpitcount
+			badmailfrom badmimetypes badrcptto
 SCRIPTS+=	qmail-alias2recipients qmail-pwd2recipients \
 		qmail-users2recipients qmail-vpopmail2recipients
 .endif
@@ -374,7 +376,7 @@ PATCHFILES+=	qmail-discard-double-bounces.patch:doublebounce
 .if defined(WITH_SPF_PATCH) && !defined(BARRIER_SPF_PATCH)
 . if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL)
 .  if defined(SLAVE_SPAMCONTROL)
-SPF_SPAMCONTROL_PATCH=	qmail-spf-rc5.patch-spamcontrol
+SPF_SPAMCONTROL_PATCH=	qmail-spf-rc5.patch-spamcontrol-25
 MASTER_SITES+=		${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/}
 MASTER_SITE_SUBDIR+=	garga/qmail/:spf_spamcontrol
 DISTFILES+=		${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol
@@ -452,7 +454,7 @@ PATCHFILES+=	qmail-1.03-qmtpc_outgoingip.patch:qmtpc_outgoingip
 .elif defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH) && defined(SLAVE_SPAMCONTROL)
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:outgoingip_spamcontrol/}
 MASTER_SITE_SUBDIR+=	garga/qmail/:outgoingip_spamcontrol
-DISTFILES+=	outgoingip.patch-spamcontrol:outgoingip_spamcontrol
+DISTFILES+=	outgoingip.patch-spamcontrol-25:outgoingip_spamcontrol
 .elif defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)
 PATCHFILES+=	outgoingip.patch
 .elif defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH)
@@ -471,7 +473,7 @@ PATCHFILES+=	tarpit.patch:tarpit
 
 .if defined(WITH_SMTPEXTFORK) && ( defined(SLAVE_SPAMCONTROL) || defined(SLAVE_LDAP) )
 . if defined(SLAVE_SPAMCONTROL)
-SMTPEXTFORK_PATCH=	smtpextfork-spamcontrol-${SPAMCONTROL_VERSION}_1_2.patch
+SMTPEXTFORK_PATCH=	smtpextfork-spamcontrol-${SPAMCONTROL_VERSION}.patch
 . else
 SMTPEXTFORK_PATCH=	smtpextfork-ldap-${LDAP_PATCH_DATE}.patch
 . endif
@@ -503,11 +505,6 @@ RCDLINK=	\#
 
 # Fill SELECTED_OPTIONS with options to write conf-spamcontrol
 .if defined(SLAVE_SPAMCONTROL)
-. if defined(WITH_RELAYMAILFROM)
-SELECTED_OPTIONS+=	relaymailfrom=yes
-. else
-SELECTED_OPTIONS+=	relaymailfrom=no
-. endif
 
 . if defined(WITH_REQBRACKETS)
 SELECTED_OPTIONS+=	reqbrackets=yes
@@ -533,6 +530,24 @@ SELECTED_OPTIONS+=	bigtodo=yes
 SELECTED_OPTIONS+=	bigtodo=no
 . endif
 
+. if defined(WITH_DELIVERTO)
+SELECTED_OPTIONS+=	deliverto=yes
+. else
+SELECTED_OPTIONS+=	deliverto=no
+. endif
+
+. if defined(WITH_NEWLINE)
+SELECTED_OPTIONS+=	newline=yes
+. else
+SELECTED_OPTIONS+=	newline=no
+. endif
+
+. if defined(WITH_PAM111421)
+SELECTED_OPTIONS+=	pam111421=yes
+. else
+SELECTED_OPTIONS+=	pam111421=no
+. endif
+
 .endif
 
 pre-everything::
@@ -603,7 +618,7 @@ post-patch:
 .  endif
 . endif
 . if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)
-	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/outgoingip.patch-spamcontrol
+	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/outgoingip.patch-spamcontrol-25
 . endif
 . if defined(WITH_SMTPEXTFORK)
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SMTPEXTFORK_PATCH}
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 5cd61172dc83..8b8834170768 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -28,9 +28,9 @@ SIZE (qmail/qmail-1.03-qmtpc.patch) = 6197
 MD5 (qmail/outgoingip.patch) = 3c9277dcf5f9b4b6d3a270fb3abf7994
 SHA256 (qmail/outgoingip.patch) = c117f5c41033f062cdc782a16403fc19725e98d92e73ab193dfd24f48c0ca5ac
 SIZE (qmail/outgoingip.patch) = 6839
-MD5 (qmail/outgoingip.patch-spamcontrol) = ed3ca1e309116647e9adb0a49194e2e5
-SHA256 (qmail/outgoingip.patch-spamcontrol) = 721f5a1199867a26e69773608b07ec54fce1444cfa0679906592b60b7dd68abe
-SIZE (qmail/outgoingip.patch-spamcontrol) = 6769
+MD5 (qmail/outgoingip.patch-spamcontrol-25) = 6265bfd682c0b4111745f1144c91e3c7
+SHA256 (qmail/outgoingip.patch-spamcontrol-25) = 17ef58193aad3ec834641a8e6c0b064965fa0f71ca432f52fe57ef1e48333ea3
+SIZE (qmail/outgoingip.patch-spamcontrol-25) = 6751
 MD5 (qmail/qmail-1.03-qmtpc_outgoingip.patch) = 4b2623cbd9e9a4f137f7b16f78a43975
 SHA256 (qmail/qmail-1.03-qmtpc_outgoingip.patch) = d8dc66a5057b5ffbab4a9e0a27a6392b1f29d3c6aadea1f13f2290918846e89c
 SIZE (qmail/qmail-1.03-qmtpc_outgoingip.patch) = 10357
@@ -58,9 +58,9 @@ SIZE (qmail/qmail-ldap-1.03-20060201.patch.gz) = 270788
 MD5 (qmail/qmail-mysql-1.1.15.patch) = c0298550475f928e82881e574e905313
 SHA256 (qmail/qmail-mysql-1.1.15.patch) = 3d2b6a08fb149d6c9fe6c8250e87edd6c4d4b2b0417f03adf5cf4202bbadc53f
 SIZE (qmail/qmail-mysql-1.1.15.patch) = 67602
-MD5 (qmail/spamcontrol-2418_tgz.bin) = a5502cd69e573a2753e532bce8fb6c3a
-SHA256 (qmail/spamcontrol-2418_tgz.bin) = e9874f9961707cd15e135269796fbec7a2d417b18124d802a352d65b76e22d85
-SIZE (qmail/spamcontrol-2418_tgz.bin) = 124059
+MD5 (qmail/spamcontrol-2519_tgz.bin) = acca46cc48d8b5cfa9eb3de4d3fc90ad
+SHA256 (qmail/spamcontrol-2519_tgz.bin) = 53ba586618b593cb017505d6c1780b17057139b8bc70095c1778f4280df4db35
+SIZE (qmail/spamcontrol-2519_tgz.bin) = 143349
 MD5 (qmail/qmail-spf-rc5.patch-spamcontrol) = c7da17aa55896eae8c525d05c65387fd
 MD5 (qmail/qmail-1.03-tls-20021228-renato.patch) = be15cd5eaff7aa3cd88aee962febadc6
 SHA256 (qmail/qmail-1.03-tls-20021228-renato.patch) = ab0de8f744241dcb7f5ee207fc7eab4f067bf42812deb85f9eb0050ac49e6e23
@@ -83,9 +83,9 @@ SIZE (qmail/ext_todo-20030105_spf.patch) = 33781
 MD5 (qmail/ext_todo-20030105_mysql.patch) = ecddff9ba6d725ec3be61843bc8007a7
 SHA256 (qmail/ext_todo-20030105_mysql.patch) = 3fc65b91faaaae147dbf6264f9381664819ef2f236532764309d174f29919ff1
 SIZE (qmail/ext_todo-20030105_mysql.patch) = 33797
-MD5 (qmail/qmail-spf-rc5.patch-spamcontrol) = c7da17aa55896eae8c525d05c65387fd
-SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol) = 52a3e4a6c8ae0124be280b6c0d183d81f4a6bd10c23fc735d99f4f731d4f5c6d
-SIZE (qmail/qmail-spf-rc5.patch-spamcontrol) = 64214
+MD5 (qmail/qmail-spf-rc5.patch-spamcontrol-25) = b6d3a880a9a7868891ae3c52cf849eba
+SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-25) = a046366f28a9d768d83389a1a2e472bf4c8e64902dafac24aabb7ac4c1a3d605
+SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-25) = 64220
 MD5 (qmail/auth.patch.diff) = 23e0509061cd5dda4a1abf9a7cb7596d
 SHA256 (qmail/auth.patch.diff) = 1d0f8e0ce139cd00b86f056bc31c1422d30b88cb8b125023d534cc3664f827b8
 SIZE (qmail/auth.patch.diff) = 4412
@@ -98,9 +98,9 @@ SIZE (qmail/ext_todo-20030105+big-todo.103.patch) = 2523
 MD5 (qmail/smtpextfork-ldap-20060201.patch) = a359bf9aa2a2799e4ab0fb9cc2dd6593
 SHA256 (qmail/smtpextfork-ldap-20060201.patch) = 554eb7879d26bb5a3f3dd671e91abc803a53d5ba2fee397ab248b52917ff2ffc
 SIZE (qmail/smtpextfork-ldap-20060201.patch) = 6715
-MD5 (qmail/smtpextfork-spamcontrol-2418_1_2.patch) = e5d7e5dc0039bff20a7c3fe6f55f9ca1
-SHA256 (qmail/smtpextfork-spamcontrol-2418_1_2.patch) = f45ecbb0949e4def25dc80b0b6c45d5e27df3afdb2ead1e5f0ac48d487af6bf2
-SIZE (qmail/smtpextfork-spamcontrol-2418_1_2.patch) = 7611
+MD5 (qmail/smtpextfork-spamcontrol-2519.patch) = e5d7e5dc0039bff20a7c3fe6f55f9ca1
+SHA256 (qmail/smtpextfork-spamcontrol-2519.patch) = f45ecbb0949e4def25dc80b0b6c45d5e27df3afdb2ead1e5f0ac48d487af6bf2
+SIZE (qmail/smtpextfork-spamcontrol-2519.patch) = 7611
 MD5 (qmail/README.smtpextfork) = e783965f5a7510c38b30f0ba3cda1e11
 SHA256 (qmail/README.smtpextfork) = c43122d27d4e20dd955c30ca402903d2e9a6a1820c3cf11902e2477316abdcbb
 SIZE (qmail/README.smtpextfork) = 7618
diff --git a/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c b/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c
index c1544a99c77e..ae883a743467 100644
--- a/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c
+++ b/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c
@@ -1,6 +1,6 @@
---- qmail-smtpd.c.orig	Wed Jan 31 13:03:47 2007
-+++ qmail-smtpd.c	Wed Jan 31 13:22:36 2007
-@@ -129,6 +129,27 @@
+--- qmail-smtpd.c.orig	2008-12-01 12:55:54.000000000 -0200
++++ qmail-smtpd.c	2008-12-01 12:57:31.000000000 -0200
+@@ -136,6 +136,27 @@
    logs(s1,s2,s3,s4,s5,s6,s7);
    return;
    }
@@ -28,7 +28,7 @@
  void err_brcptto(s1,s2,s3,s4,s5,s6,s7) char *s1, *s2, *s3, *s4, *s5, *s6, *s7; {
    out("550 sorry, your envelope recipient is in my badrcptto list (#5.7.1)\r\n");
    logs(s1,s2,s3,s4,s5,s6,s7);
-@@ -270,6 +291,8 @@
+@@ -280,6 +301,8 @@
  
  char *auth;
  char *reqauth;
@@ -37,17 +37,17 @@
  int smtpauth = 0;
  int seenauth = 0;
  
-@@ -388,6 +411,9 @@
-   if(env_get("UCSPITLS")) starttls = 1;
-   if(starttls) reqttls = env_get("REQUIRETLS");
+@@ -403,6 +426,9 @@
+   if (env_get("UCSPITLS")) starttls = 1;
+   if (starttls) reqttls = env_get("REQUIRETLS");
  
 +  rbl2smtpd = env_get("RBL2SMTPD");
 +  rblmatch = env_get("RBLMATCH");
 +
- #ifdef RELAYMAILFROM
-   if (!relayclient) {
-     relaymailfromok = control_readfile(&relaymailfrom,"control/relaymailfrom",0);
-@@ -876,6 +902,10 @@
+ #ifdef DELIVERTO
+   delivermailto = env_get("DELIVERTO");
+ #endif
+@@ -891,6 +917,10 @@
        flagerrcpts++;
        return; 
      }