- Update qmail-spamcontrol to 2.4.14, finally with STARTTLS support

Full ChangeLog at:
	http://www.fehcom.de/qmail/spamcontrol.html

3 files changed, 10 insertions, 39 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 5ac7d304f62f..42d7d222d912 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -163,12 +163,8 @@ LDAP_PARAMS=	ALTQUEUE BIGBROTHER BIGTODO BIND_8_COMPAT\
 
 .elif defined(SLAVE_SPAMCONTROL)
 OPTIONS+=	RELAYMAILFROM	"Open relay based on mailfrom" off \
-		QUITASAP	"Close session in case of a filter condition" off \
 		REQBRACKETS	"Require brackets in <addresses>" on \
 		VERP		"VERP addresses for recipients" on \
-		RECIPIENTS550	"Get a 550 reply instead of a deferred bounce" off \
-		LOCALMFREQAUTH	"Require auth when from is @ your domains" off \
-		AUTHCRAM	"Aditional CRAM-MD5 support" off \
 		MOREIPME	"Additional control files moreipme & notipme" off \
 		BIGTODO		"Bruce Guenter's BigToDo patch" off
 .endif
@@ -261,16 +257,14 @@ DOCFILES_WRKDIR+=	TLS.readme
 .elif defined(SLAVE_SPAMCONTROL)
 DOCFILES_WRKDIR_doc+=	FILES.spamcontrol HISTORY.spamcontrol \
 			INSTALL.spamcontrol LICENSE.spamcontrol \
-			LOGGING.spamcontrol Makefile.djbdns README.auth \
-			README.bigtodo README.bouncemaxbytes README.djbdns \
-			README.doublebouncetrim README.moreipme \
-			README.qmailqueue README.recipients README.spamcontrol \
+			LOGGING.spamcontrol Makefile.djbdns 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 TESTING.spamcontrol \
-			TODO.spamcontrol badloadertypes badmailfrom \
-			badmimetypes badrcptto conf-spamcontrol \
-			install_spamcontrol.sh tarpitcount
+			SMTPREPLY.spamcontrol TODO.spamcontrol badloadertypes \
+			badmailfrom badmimetypes badrcptto tarpitcount
 SCRIPTS+=	qmail-alias2recipients qmail-pwd2recipients \
 		qmail-users2recipients qmail-vpopmail2recipients
 .endif
@@ -419,12 +413,6 @@ SELECTED_OPTIONS+=	relaymailfrom=yes
 SELECTED_OPTIONS+=	relaymailfrom=no
 . endif
 
-. if defined(WITH_QUITASAP)
-SELECTED_OPTIONS+=	quitasap=yes
-. else
-SELECTED_OPTIONS+=	quitasap=no
-. endif
-
 . if !defined(WITHOUT_REQBRACKETS)
 SELECTED_OPTIONS+=	reqbrackets=yes
 . else
@@ -437,24 +425,6 @@ SELECTED_OPTIONS+=	verp=yes
 SELECTED_OPTIONS+=	verp=no
 . endif
 
-. if defined(WITH_RECIPIENTS550)
-SELECTED_OPTIONS+=	recipients550=yes
-. else
-SELECTED_OPTIONS+=	recipients550=no
-. endif
-
-. if defined(WITH_LOCALMFREQAUTH)
-SELECTED_OPTIONS+=	localmfreqauth=yes
-. else
-SELECTED_OPTIONS+=	localmfreqauth=no
-. endif
-
-. if defined(WITH_AUTHCRAM)
-SELECTED_OPTIONS+=	cram_md5=yes
-. else
-SELECTED_OPTIONS+=	cram_md5=no
-. endif
-
 . if defined(WITH_MOREIPME)
 SELECTED_OPTIONS+=	moreipme=yes
 . else
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 89ac68a02e37..29ca01677a89 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -55,9 +55,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-2317_tgz.bin) = c68915008cbf9c16c3b4bb7185b047bc
-SHA256 (qmail/spamcontrol-2317_tgz.bin) = 86f628398411d6d71a76e653e992e8d0acbe58a20978ea0668f22cb722bbdd03
-SIZE (qmail/spamcontrol-2317_tgz.bin) = 120429
+MD5 (qmail/spamcontrol-2414_tgz.bin) = c7569fd045ce8181423e287d64feb3cd
+SHA256 (qmail/spamcontrol-2414_tgz.bin) = 0be01c1dd45001dba13e23fbba3277b1de14db061345006269689646488f39dc
+SIZE (qmail/spamcontrol-2414_tgz.bin) = 121789
 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
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
index f02516d24e61..bd82b52d1593 100644
--- a/mail/qmail/pkg-plist
+++ b/mail/qmail/pkg-plist
@@ -34,6 +34,7 @@ bin/qmail-inject
 %%LDAP%%bin/qmail-ldaplookup
 bin/qmail-local
 bin/qmail-lspawn
+%%SPAMCONTROL%%bin/qmail-mfrules
 bin/qmail-newmrh
 bin/qmail-newu
 bin/qmail-pop3d