diff options
| -rw-r--r-- | mail/qmail-spamcontrol/Makefile | 2 | ||||
| -rw-r--r-- | mail/qmail/distinfo | 6 | ||||
| -rw-r--r-- | mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile index 2478892a0554..1e2a0d1ba8f7 100644 --- a/mail/qmail-spamcontrol/Makefile +++ b/mail/qmail-spamcontrol/Makefile @@ -25,7 +25,7 @@ EXTRA_PATCHES+= ${MASTERDIR}/files/patch-install.c # Distfiles QMAIL_DIST= ${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX} SPAMCONTROL_DIST= spamcontrol-${SPAMCONTROL_VERSION}_tgz.bin -SPAMCONTROL_VERSION= 2523 +SPAMCONTROL_VERSION= 2525a LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} SLAVE_SPAMCONTROL= yes diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo index d5cfe7ec82a6..8e31e32a5dcc 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-2523_tgz.bin) = 123c0a2be4d81c4dfa99268a99b5ff68 -SHA256 (qmail/spamcontrol-2523_tgz.bin) = 53c4b533d7f03889e04298ac6a49941fe8d9633e2f900a646a6800f1c2384020 -SIZE (qmail/spamcontrol-2523_tgz.bin) = 145273 +MD5 (qmail/spamcontrol-2525a_tgz.bin) = 9e413fd1b8a5059497a41affd9525229 +SHA256 (qmail/spamcontrol-2525a_tgz.bin) = 229282b04d8954d4a7e5de485de2b2ae2a14d2629bd0f08131b5c4ada095e193 +SIZE (qmail/spamcontrol-2525a_tgz.bin) = 145590 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/files/extra-patch-spamcontrol-qmail-smtpd.c b/mail/qmail/files/extra-patch-spamcontrol-qmail-smtpd.c index ae883a743467..522f43f485da 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 2008-12-01 12:55:54.000000000 -0200 -+++ qmail-smtpd.c 2008-12-01 12:57:31.000000000 -0200 -@@ -136,6 +136,27 @@ +--- qmail-smtpd.c.orig 2009-06-16 13:17:52.000000000 -0300 ++++ qmail-smtpd.c 2009-06-16 13:20:56.000000000 -0300 +@@ -137,6 +137,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); -@@ -280,6 +301,8 @@ +@@ -281,6 +302,8 @@ char *auth; char *reqauth; @@ -37,7 +37,7 @@ int smtpauth = 0; int seenauth = 0; -@@ -403,6 +426,9 @@ +@@ -404,6 +427,9 @@ if (env_get("UCSPITLS")) starttls = 1; if (starttls) reqttls = env_get("REQUIRETLS"); @@ -47,14 +47,14 @@ #ifdef DELIVERTO delivermailto = env_get("DELIVERTO"); #endif -@@ -891,6 +917,10 @@ - flagerrcpts++; +@@ -888,6 +914,10 @@ return; - } + } + + if (!seenauth && rbl2smtpd && rblmatch && str_len(rblmatch) != 0) { + err_rbl("Reject::RBL::RBL_Listed:",protocol.s,remoteip,remotehost,helohost.s,mailfrom.s,addr.s); + return; + } 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); - return; |