Thu Dec 18 22:23:01 2014 UTC ()
Update to 0.4.0.
Several patches are dropped because they were integrated upsteam.
(Approval during freeze by wiz@.)

Upstream changes since 0.3.1 from
  https://savannah.nongnu.org/forum/forum.php?forum_id=8094

Item posted by Todd Kover <kovert> on Thu 11 Sep 2014 01:05:20 AM GMT.

I am pleased to announce the release of spamass-milt version 0.4.0.

This is the first of what I hope are a number of maintenance releases
with the goal to eliminate the outstanding bug/patch/feature requests:

The following changes are included in this release

- -C option to change the default reject code
- -S option to specify a path to sendmail (for the -x option)
- -R option to specify the rejection message
- -a option to skip messages that were authenticated
- IPv6 address support
- zombie process fix for the - option introduced in 0.3.2

This also includes the fix for CVE-2010-1132 that was in the unannounced but generated 0.3.2 release.


(gdt)
diff -r1.32 -r1.33 pkgsrc/mail/spamass-milter/Makefile
diff -r1.11 -r1.12 pkgsrc/mail/spamass-milter/distinfo
diff -r1.5 -r0 pkgsrc/mail/spamass-milter/patches/patch-aa
diff -r1.2 -r0 pkgsrc/mail/spamass-milter/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/mail/spamass-milter/patches/patch-ac
cvs diff -r1.32 -r1.33 pkgsrc/mail/spamass-milter/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/spamass-milter/Makefile 2012/10/08 12:19:31 1.32
+++ pkgsrc/mail/spamass-milter/Makefile 2014/12/18 22:23:01 1.33
@@ -1,30 +1,23 @@ @@ -1,30 +1,23 @@
1# $NetBSD: Makefile,v 1.32 2012/10/08 12:19:31 asau Exp $ 1# $NetBSD: Makefile,v 1.33 2014/12/18 22:23:01 gdt Exp $
2# 2#
3 3
4DISTNAME= spamass-milter-0.3.1 4DISTNAME= spamass-milter-0.4.0
5PKGREVISION= 4 
6CATEGORIES= mail 5CATEGORIES= mail
7MASTER_SITES= http://savannah.nongnu.org/download/spamass-milt/ 6MASTER_SITES= http://savannah.nongnu.org/download/spamass-milt/
8 7
9# This patch is taken from upstream CVS, and is from the 0.3.1 release 
10# tag to head of CVS on 5 Jun 2010, although CVS last changed on 24 
11# Jul 2006. The patch fixes an error in formatting of the synthetic 
12# Received: line. The patch is a patchfile (hosted on ftp.netbsd.org) 
13# instead of a pkgsrc patch because it is something upstream would 
14# have released if upstream were still maintaining this code. 
15PATCHFILES= spamass-milter-001.patch 
16 
17MAINTAINER= gdt@NetBSD.org 8MAINTAINER= gdt@NetBSD.org
18HOMEPAGE= http://savannah.nongnu.org/projects/spamass-milt/ 9HOMEPAGE= http://savannah.nongnu.org/projects/spamass-milt/
19COMMENT= Milter interface to Spamassassin 10COMMENT= Milter interface to Spamassassin
20 11
 12LICENSE= original-bsd
 13
21DEPENDS+= spamassassin>=2.44:../../mail/spamassassin 14DEPENDS+= spamassassin>=2.44:../../mail/spamassassin
22 15
23GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
24USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
25 18
26RCD_SCRIPTS= spamass-milter 19RCD_SCRIPTS= spamass-milter
27 20
28.include "../../mail/libmilter/buildlink3.mk" 21.include "../../mail/libmilter/buildlink3.mk"
29.include "../../mk/pthread.buildlink3.mk" 22.include "../../mk/pthread.buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/mail/spamass-milter/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/spamass-milter/distinfo 2011/03/18 15:26:30 1.11
+++ pkgsrc/mail/spamass-milter/distinfo 2014/12/18 22:23:01 1.12
@@ -1,11 +1,6 @@ @@ -1,11 +1,6 @@
1$NetBSD: distinfo,v 1.11 2011/03/18 15:26:30 gdt Exp $ 1$NetBSD: distinfo,v 1.12 2014/12/18 22:23:01 gdt Exp $
2 2
3SHA1 (spamass-milter-0.3.1.tar.gz) = dd488eb9ab1f230440fba8a729bee80550f2fbff 3SHA1 (spamass-milter-0.4.0.tar.gz) = 2b4f7ab1b17ca881c68063a4814780b00bb736bc
4RMD160 (spamass-milter-0.3.1.tar.gz) = 5db6af6b31de1bf83eafbd9713d81cdc957b5033 4RMD160 (spamass-milter-0.4.0.tar.gz) = e7a6d090b0328a314fda8e9872cd93f0e8a9206a
5Size (spamass-milter-0.3.1.tar.gz) = 141144 bytes 5Size (spamass-milter-0.4.0.tar.gz) = 158646 bytes
6SHA1 (spamass-milter-001.patch) = d37227f95808479dc4d6ba5c76ddd2413b4530d3 6SHA1 (patch-ac) = 7875b8f8ed8f16c9e31d0d4012d327742e395b3c
7RMD160 (spamass-milter-001.patch) = eef17cb4506e6f5c0908b6872b7fb5dcd8bc2e16 
8Size (spamass-milter-001.patch) = 2435 bytes 
9SHA1 (patch-aa) = f5fd2951082c916e3cae1746f8921793ff09b567 
10SHA1 (patch-ab) = 03f7d4abc24e950fd44a4adbb708f3433d111643 
11SHA1 (patch-ac) = 851cbceab64b1a391cfe0aad0ba5a86c88218eb0 
File Deleted: pkgsrc/mail/spamass-milter/patches/Attic/patch-aa
File Deleted: pkgsrc/mail/spamass-milter/patches/Attic/patch-ab
cvs diff -r1.1 -r1.2 pkgsrc/mail/spamass-milter/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/spamass-milter/patches/patch-ac 2010/09/10 23:33:42 1.1
+++ pkgsrc/mail/spamass-milter/patches/patch-ac 2014/12/18 22:23:01 1.2
@@ -1,19 +1,28 @@ @@ -1,19 +1,28 @@
1$NetBSD: patch-ac,v 1.1 2010/09/10 23:33:42 gdt Exp $ 1$NetBSD: patch-ac,v 1.2 2014/12/18 22:23:01 gdt Exp $
2 2
3(Part of) patch to add option to not scan mail from authenticated 3(Part of) patch to add option to not scan mail from authenticated
4users, from: 4users, from:
5 5
6 http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2006-November/106024.html 6 http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2006-November/106024.html
7 7
8--- spamass-milter.1.in.orig 2004-03-18 18:37:08.000000000 +0000 8--- spamass-milter.1.in.orig 2014-08-15 02:30:07.000000000 +0000
9+++ spamass-milter.1.in 9+++ spamass-milter.1.in
10@@ -199,6 +199,9 @@ The resulting username is then passed to 10@@ -22,6 +22,7 @@
11 Requires the 11 .Op Fl r rejectmsg
12 .Fl u 12 .Op Fl u Ar defaultuser
13 flag.  13 .Op Fl x
 14+.Op Fl a
 15 .Op Fl S /path/to/sendmail
 16 .Op Fl - Ar spamc flags ...
 17 .Sh DESCRIPTION
 18@@ -218,6 +219,10 @@ Requires the
 19 flag. The spamass-milter configuration process does its
 20 best to find sendmail, but it is possible to override this compiled-in
 21 setting via the
14+.It Fl a 22+.It Fl a
15+Causes spamass-milter to pass through unchecked any messages from connections 23+Causes spamass-milter to pass through unchecked any messages from connections
16+established using SMTP authentication. This is useful for sites with remote users. 24+established using SMTP authentication. This is useful for sites with
 25+remote usrs.
17 .It Fl - Ar spamc flags ... 26 .It Fl - Ar spamc flags ...
18 Pass all remaining options to spamc.  27 Pass all remaining options to spamc.
19 This allows you to connect to a remote spamd with 28 This allows you to connect to a remote spamd with