Update spamcontrol to 2.6.22

3 files changed, 56 insertions, 36 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 81c2a1db1ae0..4b4cb8e9948d 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -43,7 +43,6 @@ BARRIER_SMTP_AUTH_PATCH=	yes
 .if defined(SLAVE_LDAP)
 BARRIER_BIG_CONCURRENCY_PATCH=	yes
 BARRIER_EXTTODO_PATCH=		yes
-BARRIER_OUTGOINGIP_PATCH=	yes
 .endif
 
 .if defined(SLAVE_LDAP) || \
@@ -53,6 +52,7 @@ BARRIER_DISCBOUNCES_PATCH=	yes
 BARRIER_SENDMAIL_F_PATCH=	yes
 BARRIER_BIG_TODO_PATCH=		yes
 BARRIER_DNS_PATCH=		yes
+BARRIER_OUTGOINGIP_PATCH=	yes
 .endif
 
 .if defined(SLAVE_LDAP) || \
@@ -180,11 +180,9 @@ LDAP_PARAMS=	ALTQUEUE BIGBROTHER BIGTODO BIND_8_COMPAT\
 		QMQP_COMPRESS QUOTATRASH SMTPEXECCHECK
 
 .elif defined(SLAVE_SPAMCONTROL)
-OPTIONS+=	REQBRACKETS	"Require brackets in <addresses>" on \
-		VERP		"VERP addresses for recipients" on \
+OPTIONS+=	TLSREMOTE	"TLS support (requires ucspi-ssl)" 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 \
@@ -280,14 +278,16 @@ DOCFILES_WRKDIR+=	TLS.readme
 .elif defined(SLAVE_SPAMCONTROL)
 DOCFILES_WRKDIR_doc+=	FILES.spamcontrol HISTORY.spamcontrol \
 			INSTALL.spamcontrol LICENSE.spamcontrol \
-			LOGGING.spamcontrol Makefile.djbdns README.bigtodo \
+			LOGGING.spamcontrol PROPOSAL.mav README.bigtodo \
 			README.bouncemaxbytes README.clamav README.djbdns \
 			README.doublebouncetrim README.mav README.moreipme \
 			README.qmailqueue README.recipients \
 			README.wildmat README_spamcontrol.html \
 			RELEASE_22.spamcontrol RELEASE_23.spamcontrol \
-			SMTPREPLY.spamcontrol TODO.spamcontrol badloadertypes \
-			badmailfrom badmimetypes badrcptto
+			RELEASE_24.spamcontrol RELEASE_25.spamcontrol \
+			RELEASE_26.spamcontrol SMTPREPLY.spamcontrol \
+			TODO.spamcontrol badloadertypes badmailfrom \
+			badmimetypes badrcptto
 SCRIPTS+=	qmail-alias2recipients qmail-pwd2recipients \
 		qmail-users2recipients qmail-vpopmail2recipients
 .endif
@@ -383,7 +383,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-25
+SPF_SPAMCONTROL_PATCH=	qmail-spf-rc5.patch-spamcontrol-26
 MASTER_SITES+=		${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/}
 MASTER_SITE_SUBDIR+=	garga/qmail/:spf_spamcontrol
 DISTFILES+=		${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol
@@ -458,10 +458,6 @@ PATCHFILES+=	big-concurrency.patch
 .if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH) && \
     defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH)
 PATCHFILES+=	qmail-1.03-qmtpc_outgoingip_20090630.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-25:outgoingip_spamcontrol
 .elif defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)
 PATCHFILES+=	outgoingip.patch
 .elif defined(WITH_QMTPC_PATCH) && !defined(BARRIER_QMTPC_PATCH)
@@ -514,6 +510,18 @@ PATCH_SITE_SUBDIR+=	garga/qmail/:ldapenhacelog
 PATCHFILES+=	enhacelogging-ldap-${LDAP_PATCH_DATE}_4.patch:ldapenhacelog
 .endif
 
+.if defined(SLAVE_SPAMCONTROL) && defined(WITH_TLSREMOTE)
+MASTER_SITES+=	http://www.superscript.com/ucspi-ssl/:ucspi_ssl \
+		http://dev.qmailrocks.org/downloads/qmailrocks_3.0-beta/:ucspi_ssl \
+		${MASTER_SITE_GENTOO:S/$/:ucspi_ssl/}
+DISTFILES+=	ucspi-ssl-0.70.tar.gz:ucspi_ssl
+
+MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:ucspi_ssl_patch
+DISTFILES+=	ucspi-ssl-0.70_ucspitls-0.6.patch_:ucspi_ssl_patch
+
+UCSPISRC=	${WRKDIR}/host/superscript.com/net/ucspi-ssl-0.70
+.endif
+
 # Some default values, these can be modified by make command line
 .if defined(WITH_BIG_CONCURRENCY_PATCH) && !defined(BARRIER_BIG_CONCURRENCY_PATCH)
 WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?=	509
@@ -530,16 +538,10 @@ RCDLINK=	\#
 # Fill SELECTED_OPTIONS with options to write conf-spamcontrol
 .if defined(SLAVE_SPAMCONTROL)
 
-. if defined(WITH_REQBRACKETS)
-SELECTED_OPTIONS+=	reqbrackets=yes
-. else
-SELECTED_OPTIONS+=	reqbrackets=no
-. endif
-
-. if defined(WITH_VERP)
-SELECTED_OPTIONS+=	verp=yes
+. if defined(WITH_TLSREMOTE)
+SELECTED_OPTIONS+=	tlsremote=yes
 . else
-SELECTED_OPTIONS+=	verp=no
+SELECTED_OPTIONS+=	tlsremote=no
 . endif
 
 . if defined(WITH_MOREIPME)
@@ -554,12 +556,6 @@ 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
@@ -601,6 +597,9 @@ pre-everything::
 post-extract:
 .if defined(SLAVE_SPAMCONTROL)
 	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${SPAMCONTROL_DIST}
+. if defined(WITH_TLSREMOTE)
+	@cd ${WRKDIR} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/ucspi-ssl-0.70.tar.gz
+. endif
 .endif
 
 post-patch:
@@ -641,9 +640,6 @@ post-patch:
 	@${PATCH} -p1 -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXTTODO_PATCH}
 .  endif
 . endif
-. if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)
-	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/outgoingip.patch-spamcontrol-25
-. endif
 . if defined(WITH_SMTPEXTFORK)
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SMTPEXTFORK_PATCH}
 .  if defined(WITH_XF_QUITASAP)
@@ -651,6 +647,10 @@ post-patch:
 		${WRKSRC}/qmail-smtpd.c
 .  endif
 . endif
+. if defined(WITH_TLSREMOTE)
+	@cd ${UCSPISRC}/src && patch -p0 < ${DISTDIR}/${DIST_SUBDIR}/ucspi-ssl-0.70_ucspitls-0.6.patch_
+	@${ECHO_CMD} "${UCSPISRC}/compile" > ${WRKSRC}/conf-ucspissl
+. endif
 	@${REINPLACE_CMD} -E "/qhpsi *= *\"unknown\"/d; s/(\*qqx *== *'D')/qhpsi \&\& \1/g" \
 		${WRKSRC}/qmail-smtpd.c
 .elif defined(SLAVE_TLS)
@@ -732,6 +732,19 @@ do-configure:
 			> ${WRKSRC}/conf-spawn ; \
 	fi
 .endif
+.if defined(SLAVE_SPAMCONTROL) && defined(WITH_TLSREMOTE)
+	${ECHO_CMD} "${CC} ${CFLAGS}" > ${UCSPISRC}/src/conf-cc
+	${ECHO_CMD} "${PREFIX}" > ${UCSPISRC}/src/conf-home
+	${ECHO_CMD} "${PREFIX}/bin" > ${UCSPISRC}/src/conf-tcpbin
+	${ECHO_CMD} "/etc/ssl" > ${UCSPISRC}/src/conf-cadir
+	${ECHO_CMD} "/etc/ssl/cert.pem" > ${UCSPISRC}/src/conf-cafile
+	${ECHO_CMD} "/etc/ssl/dh1024.pem" > ${UCSPISRC}/src/conf-dhfile
+.endif
+
+pre-build:
+.if defined(SLAVE_SPAMCONTROL) && defined(WITH_TLSREMOTE)
+	@cd ${UCSPISRC} && package/compile
+.endif
 
 do-install:
 .for i in ${BOOTFILES}
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index da127acae563..e8e37655563b 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -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-2527_tgz.bin) = 94e9948c3d7dfa25f4e85c90502188c2
-SHA256 (qmail/spamcontrol-2527_tgz.bin) = d09aee58fce7624afb55588d0e26398be2777ea082f352dba81e03eb509ec0f1
-SIZE (qmail/spamcontrol-2527_tgz.bin) = 145019
+MD5 (qmail/spamcontrol-2622_tgz.bin) = d73662b7398a72ba475586f92ea8599b
+SHA256 (qmail/spamcontrol-2622_tgz.bin) = c517b90f0aa2ea42ebc4ce11d4e73454c9c6329dac3fca54af7a27db423837b9
+SIZE (qmail/spamcontrol-2622_tgz.bin) = 167272
 MD5 (qmail/qmail-1.03-tls-20021228-renato.patch) = be15cd5eaff7aa3cd88aee962febadc6
 SHA256 (qmail/qmail-1.03-tls-20021228-renato.patch) = ab0de8f744241dcb7f5ee207fc7eab4f067bf42812deb85f9eb0050ac49e6e23
 SIZE (qmail/qmail-1.03-tls-20021228-renato.patch) = 42095
@@ -82,9 +82,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-25) = b6d3a880a9a7868891ae3c52cf849eba
-SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-25) = a046366f28a9d768d83389a1a2e472bf4c8e64902dafac24aabb7ac4c1a3d605
-SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-25) = 64220
+MD5 (qmail/qmail-spf-rc5.patch-spamcontrol-26) = f282174588302334e74998c79cc3ae02
+SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol-26) = cc3530c984a1866c8ee9a015cfa1074173e38623522461becd50e5c2ee7188e3
+SIZE (qmail/qmail-spf-rc5.patch-spamcontrol-26) = 64004
 MD5 (qmail/auth.patch.diff) = 23e0509061cd5dda4a1abf9a7cb7596d
 SHA256 (qmail/auth.patch.diff) = 1d0f8e0ce139cd00b86f056bc31c1422d30b88cb8b125023d534cc3664f827b8
 SIZE (qmail/auth.patch.diff) = 4412
@@ -112,3 +112,9 @@ SIZE (qmail/qmail-ldap-20060201-grtdelay.patch) = 6051
 MD5 (qmail/enhacelogging-ldap-20060201_4.patch) = 3ad238c62d0864ac72d058c454f207d4
 SHA256 (qmail/enhacelogging-ldap-20060201_4.patch) = 07973f05602a1689e7585a2572c2b523723930214623ef5b922aeeed0bcfc867
 SIZE (qmail/enhacelogging-ldap-20060201_4.patch) = 1205
+MD5 (qmail/ucspi-ssl-0.70.tar.gz) = 22a2ebd0c6905726811c615286bac875
+SHA256 (qmail/ucspi-ssl-0.70.tar.gz) = 8834aaa83a6862457c853818ce829291285043a553d4466671c05663bc580cf5
+SIZE (qmail/ucspi-ssl-0.70.tar.gz) = 85111
+MD5 (qmail/ucspi-ssl-0.70_ucspitls-0.6.patch_) = a04d2f35a74b4b74ed022d23034074ee
+SHA256 (qmail/ucspi-ssl-0.70_ucspitls-0.6.patch_) = 35ae45bd17a9ecb9cd79c25a751af47af787189c8b833b26d464b47bed1472ac
+SIZE (qmail/ucspi-ssl-0.70_ucspitls-0.6.patch_) = 12351
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
index e4f837bc1764..926eaf0311e9 100644
--- a/mail/qmail/pkg-plist
+++ b/mail/qmail/pkg-plist
@@ -11,6 +11,7 @@ bin/datemail
 bin/elq
 bin/except
 bin/forward
+%%SPAMCONTROL%%bin/ipmeprint
 bin/maildir2mbox
 bin/maildirmake
 bin/maildirwatch