ports/79523: [MAINTAINER] mail/qmail-spamcontrol: Update to spamcontrol-2.3.13
Renato Botelho
renato at galle.com.br
Mon Apr 4 11:50:03 UTC 2005
>Number: 79523
>Category: ports
>Synopsis: [MAINTAINER] mail/qmail-spamcontrol: Update to spamcontrol-2.3.13
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 04 11:50:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Renato Botelho
>Release: FreeBSD 5.3-RELEASE-p5 i386
>Organization:
Galle Folheados - http://www.galle.com.br
>Environment:
System: FreeBSD data.galle.com.br 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #7: Thu Mar 3 09:03:28 BRST
>Description:
Update to spamcontrol-2.3.13
Changes from 2.3.12:
o Fixed (potential) false positives using 'badloadertype' recognition
o Fixes for Exim's 'Mail From:' reverse address check employing SMTP Reset
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- qmail-spamcontrol-1.03.2313.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/qmail-spamcontrol/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 14 Mar 2005 19:59:10 -0000 1.4
+++ Makefile 4 Apr 2005 11:39:20 -0000
@@ -19,7 +19,7 @@
# Distfiles
QMAIL_DIST= ${PORTNAME}-${QMAIL_VERSION}${EXTRACT_SUFX}
SPAMCONTROL_DIST= spamcontrol-${SPAMCONTROL_VERSION}_tgz.bin
-SPAMCONTROL_VERSION= 2312
+SPAMCONTROL_VERSION= 2313
PREFIX?= ${QMAIL_PORT_PREFIX}
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/qmail-spamcontrol/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo 11 Mar 2005 16:28:55 -0000 1.1
+++ distinfo 4 Apr 2005 11:39:20 -0000
@@ -1,4 +1,4 @@
MD5 (qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c
SIZE (qmail-1.03.tar.gz) = 220668
-MD5 (spamcontrol-2312_tgz.bin) = 02266b33a6d3e16130e912205b0da6b5
-SIZE (spamcontrol-2312_tgz.bin) = 116806
+MD5 (spamcontrol-2313_tgz.bin) = a8ad350699dfd6110c3e8a8784f55ad4
+SIZE (spamcontrol-2313_tgz.bin) = 116888
Index: files/patch-qmail-smtpd.c.patch
===================================================================
RCS file: /home/ncvs/ports/mail/qmail-spamcontrol/files/patch-qmail-smtpd.c.patch,v
retrieving revision 1.1
diff -u -r1.1 patch-qmail-smtpd.c.patch
--- files/patch-qmail-smtpd.c.patch 11 Mar 2005 16:28:56 -0000 1.1
+++ files/patch-qmail-smtpd.c.patch 4 Apr 2005 11:39:20 -0000
@@ -1,14 +1,13 @@
-diff -ruN ./qmail-smtpd.c.patch ../galle/qmail-smtpd.c.patch
---- ./qmail-smtpd.c.patch Sun Jan 30 08:27:34 2005
-+++ ../galle/qmail-smtpd.c.patch Tue Feb 1 08:10:38 2005
+--- orig/qmail-smtpd.c.patch Sun Apr 3 15:51:55 2005
++++ ./galle/qmail-smtpd.c.patch Mon Apr 4 08:06:31 2005
@@ -1,8 +1,6 @@
---- qmail-smtpd.c.orig 1998-06-15
--+++ qmail-smtpd.c 2005-01-31
+-+++ qmail-smtpd.c 2005-04-03
---- .././qmail-1.03/qmail-smtpd.c Mon Jun 15 12:53:16 1998
--+++ ../qmail-1.03.2312/qmail-smtpd.c Sun Jan 30 11:24:25 2005
+-+++ ../qmail-1.03.2313/qmail-smtpd.c Sun Apr 3 20:49:22 2005
-@@ -20,14 +20,51 @@
-+--- qmail-smtpd.c.orig Tue Feb 1 07:47:52 2005
-++++ qmail-smtpd.c Tue Feb 1 08:08:28 2005
++--- qmail-smtpd.c.orig Mon Apr 4 08:00:20 2005
+++++ qmail-smtpd.c Mon Apr 4 08:05:18 2005
+@@ -20,14 +20,52 @@
#include "now.h"
#include "exit.h"
@@ -62,98 +61,69 @@
int liphostok = 0;
-@@ -97,6 +260,39 @@
-+@@ -97,6 +261,41 @@
++@@ -97,6 +261,40 @@
stralloc bmf = {0};
struct constmap mapbmf;
-@@ -248,6 +247,8 @@
+@@ -248,6 +247,7 @@
+char *localmfcheck;
+char *mfdnscheck;
+char *reqauth;
-++char *reqbrackets;
++char *localmf_reqauth;
+
+int maxrcptcount = 0;
+int flaglocal = -1;
-@@ -260,7 +261,7 @@
+@@ -260,7 +260,7 @@
void setup()
{
char *x;
-@@ -111,17 +307,24 @@
-+@@ -111,17 +310,24 @@
++@@ -111,17 +309,24 @@
if (timeout <= 0) timeout = 1;
if (rcpthosts_init() == -1) die_control();
-@@ -286,7 +287,7 @@
+@@ -286,7 +286,7 @@
remoteip = env_get("TCPREMOTEIP");
if (!remoteip) remoteip = "unknown";
local = env_get("TCPLOCALHOST");
-@@ -131,11 +334,70 @@
-+@@ -131,11 +337,82 @@
++@@ -131,11 +336,76 @@
if (!remotehost) remotehost = "unknown";
remoteinfo = env_get("TCPREMOTEINFO");
relayclient = env_get("RELAYCLIENT");
-@@ -338,6 +339,18 @@
+@@ -338,6 +338,12 @@
+ qhpsi = env_get("QHPSI");
+ if (!qhpsi) qhpsi = "unknown";
+
-++ #ifdef LOCALMFREQAUTH
-++ localmf_reqauth = env_get("LOCALMFREQAUTH");
-++ #else
-++ localmf_reqauth = 0;
-++ #endif
-++
-++ #ifdef REQBRACKETS
-++ reqbrackets = env_get("REQBRACKETS");
-++ #else
-++ reqbrackets = 0;
-++ #endif
+++#ifdef LOCALMFREQAUTH
+++ localmf_reqauth = env_get("LOCALMFREQAUTH");
+++#else
+++ localmf_reqauth = 0;
+++#endif
++
+#ifdef RELAYMAILFROM
+ if (!relayclient) {
+ relaymailfromok = control_readfile(&relaymailfrom,"control/relaymailfrom",0);
-@@ -358,35 +371,21 @@
+@@ -358,7 +364,7 @@
int addrparse(arg)
char *arg;
-@@ -151,12 +413,17 @@
-+@@ -151,6 +428,8 @@
++@@ -151,12 +421,17 @@
i = str_chr(arg,'<');
if (arg[i])
arg += i + 1;
--+#ifdef REQBRACKETS
--+ else
-++ else if (reqbrackets)
- + return 0;
--+#else
- else { /* partner should go read rfc 821 */
- terminator = ' ';
- arg += str_chr(arg,':');
-- if (*arg == ':') ++arg;
-- while (*arg == ' ') ++arg;
-- }
--+#endif
--
-- /* strip source route */
-- if (*arg == '@') while (*arg) if (*arg++ == ':') break;
+@@ -376,7 +382,7 @@
+
+ /* strip source route */
+ if (*arg == '@') while (*arg) if (*arg++ == ':') break;
-@@ -199,12 +466,106 @@
-+@@ -199,12 +478,106 @@
++@@ -199,12 +474,106 @@
int bmfcheck()
{
- + int i;
-- int j;
--- if (!bmfok) return 0;
--- if (constmap(&mapbmf,addr.s,addr.len - 1)) return 1;
--- j = byte_rchr(addr.s,addr.len,'@');
--- if (j < addr.len)
--- if (constmap(&mapbmf,addr.s + j,addr.len - j - 1)) return 1;
-++ int j;
- + int k = 0;
- + char subvalue;
- +
-@@ -436,7 +435,12 @@
- +int bhelocheck()
+@@ -406,7 +412,12 @@
+ +int brtcheck()
+{
+ int i;
-+ int j;
@@ -165,17 +135,31 @@
+- if (constmap(&mapbmf,addr.s + j,addr.len - j - 1)) return 1;
+ int k = 0;
+ char subvalue;
+ +
+@@ -431,12 +442,7 @@
+ +int bhelocheck()
+ +{
+ + int i;
+- int j;
+-- if (!bmfok) return 0;
+-- if (constmap(&mapbmf,addr.s,addr.len - 1)) return 1;
+-- j = byte_rchr(addr.s,addr.len,'@');
+-- if (j < addr.len)
+-- if (constmap(&mapbmf,addr.s + j,addr.len - j - 1)) return 1;
+++ int j;
+ + int k = 0;
+ + char subvalue;
+
-@@ -488,7 +492,7 @@
+@@ -488,7 +494,7 @@
return 0;
}
--@@ -216,21 +577,126 @@
-+@@ -216,21 +589,136 @@
+-@@ -216,52 +577,203 @@
++@@ -216,52 +585,214 @@
return r;
}
-@@ -583,6 +587,16 @@
+@@ -583,6 +589,16 @@
+ }
+}
+
@@ -192,16 +176,7 @@
+#ifdef RELAYMAILFROM
+int rmfcheck()
+{
-@@ -618,7 +632,7 @@
- }
- void smtp_rset()
- {
--@@ -240,28 +706,73 @@
-+@@ -240,28 +728,74 @@
- void smtp_mail(arg) char *arg;
- {
- if (!addrparse(arg)) { err_syntax(); return; }
-@@ -671,6 +685,7 @@
+@@ -675,6 +691,7 @@
+ flagrcpt = rcptallowed();
+ if (!flagrcpt) { err_recipient("Reject::RCPT::Failed_Rcptto:",remoteip,remotehost,helohost.s,mailfrom.s,addr.s); flagerrcpts++; return; }
+ if (reqauth) if (!flagauth) { err_authreq("Reject::ORIG::Missing_Auth:",remoteip,remotehost,helohost.s,mailfrom.s,addr.s); return; }
@@ -209,39 +184,62 @@
}
- else
- if (!addrallowed()) { err_nogateway(); return; }
-@@ -697,7 +712,7 @@
+@@ -701,7 +718,7 @@
}
--@@ -279,11 +790,69 @@
-+@@ -279,11 +813,69 @@
+-@@ -279,11 +791,69 @@
++@@ -279,11 +810,69 @@
substdio ssin = SUBSTDIO_FDBUF(saferead,0,ssinbuf,sizeof ssinbuf);
struct qmail qqt;
-@@ -768,7 +783,7 @@
+@@ -772,7 +789,7 @@
if (bytestooverflow)
if (!--bytestooverflow)
qmail_fail(&qqt);
--@@ -316,8 +885,8 @@
-+@@ -316,8 +908,8 @@
+-@@ -316,8 +886,8 @@
++@@ -316,8 +905,8 @@
if (flagmaybex) if (pos == 7) ++*hops;
if (pos < 2) if (ch != "\r\n"[pos]) flagmaybey = 0;
if (flagmaybey) if (pos == 1) flaginheader = 0;
-@@ -778,7 +793,7 @@
+@@ -782,7 +799,7 @@
if (ch == '\n') { pos = 0; flagmaybex = flagmaybey = flagmaybez = 1; }
}
switch(state) {
--@@ -373,31 +942,275 @@
-+@@ -373,31 +965,275 @@
+-@@ -373,31 +943,275 @@
++@@ -373,31 +962,275 @@
if (!seenmail) { err_wantmail(); return; }
if (!rcptto.len) { err_wantrcpt(); return; }
seenmail = 0;
-@@ -1058,7 +1073,7 @@
+@@ -995,7 +1012,7 @@
+ +
+ + if (!user.len || !pass.len) return err_input();
+ + return authenticate();
+-+}
++ }
+ +#endif
+ +
+ +struct authcmd {
+@@ -1050,10 +1067,10 @@
+ + case 1:
+ + err_authfail("Reject::ORIG::Failed_Auth:",remoteip,remotehost,helohost.s,user.s,authcmds[i].text);
+ + }
+- }
+-
+-+/* this file is too long --------------------------------------------- GO ON */
+++}
+ +
+++/* this file is too long --------------------------------------------- GO ON */
++
+ struct commands smtpcommands[] = {
+ { "rcpt", smtp_rcpt, 0 }
+ , { "mail", smtp_mail, 0 }
+@@ -1062,7 +1079,7 @@
, { "quit", smtp_quit, flush }
, { "helo", smtp_helo, flush }
, { "ehlo", smtp_ehlo, flush }
--@@ -408,8 +1221,11 @@
-+@@ -408,8 +1244,11 @@
+-@@ -408,8 +1222,11 @@
++@@ -408,8 +1241,11 @@
, { 0, err_unimpl, flush }
} ;
--- qmail-spamcontrol-1.03.2313.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list