diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2014-06-27 02:33:04 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2014-06-27 02:33:04 +0000 |
commit | 0328b1b13cbb4ccdc77dcf8871ee5a1f4583d0db (patch) | |
tree | c0cd5a22c8d473a90f8f4a9fa14a2fbf1cc35330 /mail/qmail/files | |
parent | dc8c4aa733848215d613e706e9a7dfad72ea9096 (diff) | |
download | FreeBSD-ports-0328b1b13cbb4ccdc77dcf8871ee5a1f4583d0db.zip FreeBSD-ports-0328b1b13cbb4ccdc77dcf8871ee5a1f4583d0db.tar.gz |
mail/qmail-spamcontrol: Update to 2.7.31
TLSREMOTE, NEWLINE, and BIGTODO are now mandatory upstream and have been
removed as options.
MOREIPME was removed upstream.
Changes:
http://www.fehcom.de/qmail/spamcontrol/RELEASE_27.spamcontrol
CHANGES (2.6 -> 2.7)
--------------------
Userland:
+) ucspi-ssl (> 0.8) mandatory.
+) Added CRAM-MD5 support for qmail-remote.
+) Added qmail-smtpam PAM for Recipients extension.
+) Added sender-domain based TLS settings for qmail-remote.
:) Changed qmail-remote's 'tlspeerhosts' to' tlsdestinations'.
-) Removed moreip and notipme feature.
:) REQUIREAUTH has been collapsed into SMTPAUTH with leading "!",
:) SMTPAUTH has been enhanced to support: "!" Required; "-" Off.
:) SMTPAUTH cram-md5 annoucement has to be prefixed with a '+':
SMTPAUTH='+cram' (to allow future additional AUTH mechanisms).
:) UCSPITLS has been enhanced to support: "!" Required "-" Off.
+) Added logging for qmail-popup.
+) Added CAPA support for qmail-popup/qmail-pop3d.
:) Unified qmail-smtpd and qmail-popup logging.
+) SPF and RBLSMTPD hook to display info in Received header.
+) LOCALMFCHECK='=' requiring 'Mail From:' = 'TCPREMOTEINFO'.
Internal:
!) Bigtodo is default now.
!) Maximum silent concurrency increased to 500.
#) Aligend with recipients-0.7.2.
#) Aligned with smtp-authentication 0.7.6.
%) qmail-smtpd logging and reply messages 'off-shored'.
?) qmail-smtpd tls vulnerability VU#555316 fixed.
?) qmail-smtpd DNS lookup failures don't result in dropped
connections anymore.
%) qmail-remote evalutes in addition Alternative Subject for TLS host verification.
%) Complete FreeBSD AMD64 support (conf-cc, conf-ld, conf-spamcontrol).
#) Aligned with mav 0.20.
+) Added partial clang support.
ADDITIONAL CHANGES
------------------
+) Added SMTP Authentication based on smtproutes/destination.
#) Aligned with SMTP Authentication 0.8.0.
-) Removed obsolete SUBMISSION environment variable and special treatement.
:) Enhanced badmailfrom with new qualifier '~' for extended addresses
to filter mismatched domain names.
+) Added *.3 man pages in setup (dirs were missing before).
;) SPF Hook working now.
Diffstat (limited to 'mail/qmail/files')
3 files changed, 22 insertions, 45 deletions
diff --git a/mail/qmail/files/extra-patch-spamcontrol-qmail-remote.c b/mail/qmail/files/extra-patch-spamcontrol-qmail-remote.c deleted file mode 100644 index 32da199..0000000 --- a/mail/qmail/files/extra-patch-spamcontrol-qmail-remote.c +++ /dev/null @@ -1,13 +0,0 @@ ---- qmail-remote.c.orig 2010-09-20 10:31:12.000000000 -0300 -+++ qmail-remote.c 2010-09-20 10:32:12.000000000 -0300 -@@ -507,6 +507,10 @@ - j = str_chr(smtptext.s+i+8,'L'); /* AUTH LOGIN */ - if (j > 0) - if (case_starts(smtptext.s+i+8+j,"LOGIN")) { mailfrom_login(); flagauth = 1; return; } -+ /* Deal with EHLO messages like "PLAIN LOGIN" in this order */ -+ j = str_chr(smtptext.s+i+14,'L'); /* AUTH LOGIN */ -+ if (j > 0) -+ if (case_starts(smtptext.s+i+14+j,"LOGIN")) { mailfrom_login(); flagauth = 1; return; } - j = str_chr(smtptext.s+i+8,'P'); /* AUTH PLAIN */ - if (j > 0) - if (case_starts(smtptext.s+i+8+j,"PLAIN")) { mailfrom_plain(); flagauth = 2; return; } diff --git a/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c b/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c index cfa11a4..c288737 100644 --- a/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c +++ b/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c @@ -1,9 +1,9 @@ ---- qmail-smtpd.c.orig 2009-12-23 15:20:45.000000000 -0200 -+++ qmail-smtpd.c 2009-12-23 15:23:40.000000000 -0200 -@@ -136,6 +136,27 @@ - logs(s1,s2,s3,s4,s5,s6,s7); - return; - } +--- qmail-smtpd.c.orig 2014-06-26 16:33:05.703716277 -0500 ++++ qmail-smtpd.c 2014-06-26 16:40:11.516685934 -0500 +@@ -116,6 +116,28 @@ int seenhelo = 0; + char *badmailcond; + char *badhelocond; + +void err_rbl(s1,s2,s3,s4,s5,s6,s7) char *s1, *s2, *s3, *s4, *s5, *s6, *s7; { + char *rblmatch; + stralloc rblmessage = {0}; @@ -22,32 +22,33 @@ + if (!stralloc_0(&new_s1)) die_nomem(); + + out(rblmessage.s); -+ logs(new_s1.s,s2,s3,s4,s5,s6,s7); ++ smtp_logg(new_s1.s,s2,s3,s4,s5,s6,s7); + return; + } - 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); -@@ -282,6 +303,8 @@ ++ + void dohelo(arg) char *arg; + { + if (!stralloc_copys(&helohost,arg)) die_nomem(); +@@ -183,6 +205,8 @@ int tarpitcount = 0; + int tarpitdelay = 0; char *auth; - char *reqauth; +char *rbl2smtpd; +char *rblmatch; - int smtpauth = 0; + int smtpauth = 0; /* -1:Cert 0:none 1:login/plain 2:cram 3:login/plain/cram 11:must_login/plain 12:must_2 13:must_3 */ int seenauth = 0; -@@ -404,6 +427,9 @@ - if (env_get("UCSPITLS")) starttls = 1; - if (starttls) reqttls = env_get("REQUIRETLS"); +@@ -344,6 +368,9 @@ void setup() + if (!stralloc_cats(&mailto," ")) die_nomem(); + } + rbl2smtpd = env_get("RBL2SMTPD"); + rblmatch = env_get("RBLMATCH"); + - delivermailto = env_get("DELIVERTO"); - if (delivermailto) { - if (!stralloc_cats(&mailto,delivermailto)) die_nomem(); -@@ -909,6 +935,10 @@ + rblsmtpd = env_get("RBLSMTPD"); + if (rblsmtpd) { + if (!stralloc_cats(&rblinfo,rblsmtpd)) die_nomem(); +@@ -909,6 +936,10 @@ void smtp_rcpt(arg) char *arg; { return; } @@ -57,4 +58,4 @@ + } if (tarpitcount && flagerrcpts >= tarpitcount) { /* Tarpitting et al. */ if (tarpitdelay == 999) flagnotorious++; - err_rcpts("Reject::RCPT::Toomany_Rcptto:",protocol.s,remoteip,remotehost,helohost.s,mailfrom.s,addr.s); + err_rcpts("Reject::RCPT::Toomany_Rcptto",protocol.s,remoteip,remotehost,helohost.s,mailfrom.s,addr.s); diff --git a/mail/qmail/files/extra-patch-spamcontrol-tls_remote.c b/mail/qmail/files/extra-patch-spamcontrol-tls_remote.c deleted file mode 100644 index 2f3f7c0..0000000 --- a/mail/qmail/files/extra-patch-spamcontrol-tls_remote.c +++ /dev/null @@ -1,11 +0,0 @@ ---- tls_remote.c.orig 2013-08-26 14:12:08.434131056 -0500 -+++ tls_remote.c 2013-08-26 14:13:09.158131515 -0500 -@@ -59,7 +59,7 @@ - int tls_checkcrl(SSL *ssl) - { - -- return; -+ return 0; - } - - int tls_exit(SSL *ssl) |