Thu Oct 18 19:54:32 2018 UTC ()
Update spamassassin to 3.4.2.

From Attila Fueloep in pull request NetBSD/pkgsrc#32.

Apache SpamAssassin 3.4.2 contains numerous tweaks and bug fixes over the
past three and 1/2 years.  As we release 3.4.2, we are preparing 4.0.0 which
will move us into a full UTF-8 environment.  We expect one final 3.4.3
release.

As with any release there are a number of functional patches, improvements as
well as security reasons to upgrade to 3.4.2.  In this case we have over 3
years of issues being resolved at once.  And we are laying thr groundwork for
version 4.0 which is is designed to more natively handle UTF-8.

However, there is one specific pressing reason to upgrade.  Specifically, we
will stop producing SHA-1 signatures for rule updates.  This means that while
we produce rule updates with the focus on them working for any release from
v3.3.2 forward, they will start failing SHA-1 validation for sa-update.

*** If you do not update to 3.4.2, you will be stuck at the last ruleset
    with SHA-1 signatures in the near future. ***

Full release notes at http://svn.apache.org/repos/asf/spamassassin/branches/3.4/build/announcements/3.4.2.txt.


(bsiegert)
diff -r1.131 -r1.132 pkgsrc/mail/spamassassin/Makefile
diff -r1.71 -r1.72 pkgsrc/mail/spamassassin/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/spamassassin/patches/patch-Makefile.PL
diff -r1.13 -r1.14 pkgsrc/mail/spamassassin/patches/patch-ae
diff -r1.5 -r0 pkgsrc/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_DnsResolver.pm
diff -r1.3 -r0 pkgsrc/mail/spamassassin/patches/patch-lib_Mail_SpamAssassin_PerMsgStatus.pm
diff -r1.1 -r0 pkgsrc/mail/spamassassin/patches/patch-sa-compile
diff -r1.1 -r1.2 pkgsrc/mail/spamassassin/patches/patch-spamc_libspamc.c
cvs diff -r1.131 -r1.132 pkgsrc/mail/spamassassin/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/Makefile 2018/08/22 09:45:34 1.131
+++ pkgsrc/mail/spamassassin/Makefile 2018/10/18 19:54:32 1.132
@@ -1,36 +1,35 @@ @@ -1,36 +1,35 @@
1# $NetBSD: Makefile,v 1.131 2018/08/22 09:45:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.132 2018/10/18 19:54:32 bsiegert Exp $
2 2
3DISTNAME= Mail-SpamAssassin-3.4.1 3DISTNAME= Mail-SpamAssassin-3.4.2
4PKGNAME= spamassassin-3.4.1 4PKGNAME= spamassassin-3.4.2
5PKGREVISION= 9 
6CATEGORIES= mail perl5 5CATEGORIES= mail perl5
7MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} 6MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9DISTFILES+= ${RULESARCHIVE} 8DISTFILES+= ${RULESARCHIVE}
10#DISTFILES+= ${RULESARCHIVEASC} 9#DISTFILES+= ${RULESARCHIVEASC}
11#DISTFILES+= ${RULESARCHIVESHA} 10#DISTFILES+= ${RULESARCHIVESHA}
12EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 11EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
13 12
14MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= http://spamassassin.apache.org/ 14HOMEPAGE= http://spamassassin.apache.org/
16COMMENT= Mail filter to identify spam 15COMMENT= Mail filter to identify spam
17LICENSE= apache-2.0 16LICENSE= apache-2.0
18 17
19.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
20 19
21SMF_METHODS= spamassassin 20SMF_METHODS= spamassassin
22 21
23RULESARCHIVE= Mail-SpamAssassin-rules-3.4.1.r1675274.tgz 22RULESARCHIVE= Mail-SpamAssassin-rules-3.4.2.r1840640.tgz
24#RULESARCHIVEASC=${RULESARCHIVE}.asc 23#RULESARCHIVEASC=${RULESARCHIVE}.asc
25#RULESARCHIVESHA=${RULESARCHIVE}.sha1 24#RULESARCHIVESHA=${RULESARCHIVE}.sha1
26FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE} 25FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE}
27PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q} 26PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q}
28#PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q} 27#PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q}
29#PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q} 28#PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q}
30 29
31#DEPENDS+= {perl>=5.9.3,p5-Archive-Tar>=1.23}:../../archivers/p5-Archive-Tar 30#DEPENDS+= {perl>=5.9.3,p5-Archive-Tar>=1.23}:../../archivers/p5-Archive-Tar
32#DEPENDS+= {perl>=5,p5-DB_File-[0-9]*}:../../databases/p5-DB_File 31#DEPENDS+= {perl>=5,p5-DB_File-[0-9]*}:../../databases/p5-DB_File
33DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 32DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
34DEPENDS+= p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser 33DEPENDS+= p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser
35#DEPENDS+= {perl>=5.9.3,p5-IO-Compress-[0-9]*}:../../devel/p5-IO-Compress # Compress::Zlib>=0 34#DEPENDS+= {perl>=5.9.3,p5-IO-Compress-[0-9]*}:../../devel/p5-IO-Compress # Compress::Zlib>=0
36#DEPENDS+= {perl>=5.9.3,p5-IO-Zlib>=1.04}:../../devel/p5-IO-Zlib 35#DEPENDS+= {perl>=5.9.3,p5-IO-Zlib>=1.04}:../../devel/p5-IO-Zlib
cvs diff -r1.71 -r1.72 pkgsrc/mail/spamassassin/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/distinfo 2018/03/17 09:14:35 1.71
+++ pkgsrc/mail/spamassassin/distinfo 2018/10/18 19:54:32 1.72
@@ -1,19 +1,16 @@ @@ -1,19 +1,16 @@
1$NetBSD: distinfo,v 1.71 2018/03/17 09:14:35 tnn Exp $ 1$NetBSD: distinfo,v 1.72 2018/10/18 19:54:32 bsiegert Exp $
2 2
3SHA1 (Mail-SpamAssassin-3.4.1.tar.gz) = e7b342d30f4983f70f4234480b489ccc7d2aa615 3SHA1 (Mail-SpamAssassin-3.4.2.tar.gz) = f24c471d6594f60f1a1146a11bcb1c2f5215de03
4RMD160 (Mail-SpamAssassin-3.4.1.tar.gz) = 4b7d6a6def068eb015e8d4699db410ade76b28f3 4RMD160 (Mail-SpamAssassin-3.4.2.tar.gz) = dd3cbd744a642478d5773e2fb524461b2cd864e3
5SHA512 (Mail-SpamAssassin-3.4.1.tar.gz) = 6a074f1a4177e1969cef575fe3b1b844d27c813d48fe1e07a46f56ffa728fc780897597d00f11acb269317a6308f284f0dee544d504da874d93b0549d094a6a3 5SHA512 (Mail-SpamAssassin-3.4.2.tar.gz) = 85e3d78bb885ad1d0bf2066d1bc919d6ad5e9f86795069397e7c28cc1ba02870566ec014c08c81f68e7ed03b7f60d2de0b9730b3415b35d848abde2c8920a28f
6Size (Mail-SpamAssassin-3.4.1.tar.gz) = 3174888 bytes 6Size (Mail-SpamAssassin-3.4.2.tar.gz) = 3185452 bytes
7SHA1 (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = fcbcbf767f8c0b1b2ce2c3be4010cf6130f826b9 7SHA1 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = c93006e1572297f816a0e186a98cbbae246a4945
8RMD160 (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = 7ed097fa0b8fddc43f73985f0474c45b497c0d95 8RMD160 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = d1f5d207176e51e37c346b2b6ce893b50341011d
9SHA512 (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = b5822c116b5b3c558cbbc7a92dcf134a8e0338fa6e038e19ac34111d90c4fa0755111f36e61146674a9ad3b44c55a73941f103a12c4da50b17b05f95557efc6b 9SHA512 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 38b5f4dc6e6776937e787123c265ecd9a0a2f60aca1b57d6ed4a8f78cf81550478eddd0829b1255e9e8ce64421e06cc13ae82f1a597e893b65f0d07ba8c53a7f
10Size (Mail-SpamAssassin-rules-3.4.1.r1675274.tgz) = 270622 bytes 10Size (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 284758 bytes
11SHA1 (patch-Makefile.PL) = d322d7fb7286d5cf87ca775f9c381db32626e060 11SHA1 (patch-Makefile.PL) = f598b173e73130b55714413d5fc55e29ca6a3c4f
12SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0 12SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0
13SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353 13SHA1 (patch-ae) = e6e83c1de1002b8db647779d17740e67103b69d8
14SHA1 (patch-lib_Mail_SpamAssassin_DnsResolver.pm) = 129386c70010f6005ff93d4c237c219fe5b8a4a9 
15SHA1 (patch-lib_Mail_SpamAssassin_PerMsgStatus.pm) = 414255bf5ffb2083029950bb38309716616803ce 
16SHA1 (patch-sa-compile) = e8a92060eefbc1c95b7b2c674fc69686a66f230b 
17SHA1 (patch-sa-update) = 59cba1287051042fc7f510f5e5ef462e2ee8d034 14SHA1 (patch-sa-update) = 59cba1287051042fc7f510f5e5ef462e2ee8d034
18SHA1 (patch-spamc_libspamc.c) = 9175012a0e06faaf6a425da65438ba8e2c29f1f1 15SHA1 (patch-spamc_libspamc.c) = 757b845df445414d4ba0c2fb039dbc6d9e68b85f
19SHA1 (patch-spamd_netbsd-rc-script.sh) = 192fc1876ee30a4475c0efd9be6340e87d9fa2f4 16SHA1 (patch-spamd_netbsd-rc-script.sh) = 192fc1876ee30a4475c0efd9be6340e87d9fa2f4
cvs diff -r1.2 -r1.3 pkgsrc/mail/spamassassin/patches/patch-Makefile.PL (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/patches/patch-Makefile.PL 2015/09/09 19:13:49 1.2
+++ pkgsrc/mail/spamassassin/patches/patch-Makefile.PL 2018/10/18 19:54:32 1.3
@@ -1,50 +1,52 @@ @@ -1,50 +1,52 @@
1$NetBSD: patch-Makefile.PL,v 1.2 2015/09/09 19:13:49 christos Exp $ 1$NetBSD: patch-Makefile.PL,v 1.3 2018/10/18 19:54:32 bsiegert Exp $
2 2
3 - enable build of qmail-spamc 3 - enable build of qmail-spamc
4 - some files (local.cf, *.pre) are managed by pkgsrc, disable 4 - some files (local.cf, *.pre) are managed by pkgsrc, disable
5 their installation. 5 their installation.
6 - pkgsrc creates B_DATADIR, so there is no need to re-set permissions 6 - pkgsrc creates B_DATADIR, so there is no need to re-set permissions
7 7
8--- Makefile.PL.orig 2015-04-28 15:57:01.000000000 -0400 8--- Makefile.PL.orig 2015-04-28 15:57:01.000000000 -0400
9+++ Makefile.PL 2015-09-09 14:59:06.000000000 -0400 9+++ Makefile.PL 2015-09-09 14:59:06.000000000 -0400
10@@ -133,6 +133,7 @@ 10@@ -139,6 +139,7 @@
11 'spamassassin.raw' => 'spamassassin', 11 'spamassassin.raw' => 'spamassassin',
12 'sa-learn.raw' => 'sa-learn', 12 'sa-learn.raw' => 'sa-learn',
13 'sa-update.raw' => 'sa-update', 13 'sa-update.raw' => 'sa-update',
14+ 'spamc/qmail-spamc.c' => 'spamc/qmail-spamc$(EXE_EXT)', 14+ 'spamc/qmail-spamc.c' => 'spamc/qmail-spamc$(EXE_EXT)',
15 'sa-compile.raw' => 'sa-compile', 15 'sa-compile.raw' => 'sa-compile',
16 'sa-awl.raw' => 'sa-awl', 16 'sa-awl.raw' => 'sa-awl',
17 'sa-check_spamd.raw' => 'sa-check_spamd', 17 'sa-check_spamd.raw' => 'sa-check_spamd',
18@@ -1093,21 +1094,23 @@ 18@@ -1120,15 +1121,16 @@
19  19
20 conf__install: 20 conf__install:
21 -$(MKPATH) $(B_CONFDIR) 21 -$(MKPATH) $(B_CONFDIR)
22- $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}" 22- $(PERL) -MFile::Copy -e "copy(q[rules/local.cf], q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
23- $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}" 23- $(PERL) -MFile::Copy -e "copy(q[rules/init.pre], q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
24- $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}" 24- $(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
25- $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}" 25- $(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
26- $(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}" 26- $(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}"
27- $(PERL) -MFile::Copy -e "copy(q{rules/v330.pre}, q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}" 27- $(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}"
28- $(PERL) -MFile::Copy -e "copy(q{rules/v340.pre}, q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}" 28- $(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}"
29- $(PERL) -MFile::Copy -e "copy(q{rules/v341.pre}, q{$(B_CONFDIR)/v341.pre}) unless -f q{$(B_CONFDIR)/v341.pre}" 29- $(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q{$(B_CONFDIR)/v341.pre}) unless -f q{$(B_CONFDIR)/v341.pre}"
 30- $(PERL) -MFile::Copy -e "copy(q[rules/v342.pre], q{$(B_CONFDIR)/v342.pre}) unless -f q{$(B_CONFDIR)/v342.pre}"
30+ # manage local.cf and *.pre through pkgsrc .mk files 31+ # manage local.cf and *.pre through pkgsrc .mk files
31+ # $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}" 32+ # $(PERL) -MFile::Copy -e "copy(q[rules/local.cf], q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
32+ # $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}" 33+ # $(PERL) -MFile::Copy -e "copy(q[rules/init.pre], q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
33+ # $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}" 34+ # $(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
34+ # $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}" 35+ # $(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
35+ # $(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}" 36+ # $(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}"
36+ # $(PERL) -MFile::Copy -e "copy(q{rules/v330.pre}, q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}" 37+ # $(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}"
37+ # $(PERL) -MFile::Copy -e "copy(q{rules/v340.pre}, q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}" 38+ # $(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}"
38+ # $(PERL) -MFile::Copy -e "copy(q{rules/v341.pre}, q{$(B_CONFDIR)/v341.pre}) unless -f q{$(B_CONFDIR)/v341.pre}" 39+ # $(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q{$(B_CONFDIR)/v341.pre}) unless -f q{$(B_CONFDIR)/v341.pre}"
 40+ # $(PERL) -MFile::Copy -e "copy(q[rules/v342.pre], q{$(B_CONFDIR)/v342.pre}) unless -f q{$(B_CONFDIR)/v342.pre}"
39  41
40  42
41 data__install: 43 data__install:
42 -$(MKPATH) $(B_DATADIR) 44 -$(MKPATH) $(B_DATADIR)
43 $(PERL) -e "map unlink, <$(B_DATADIR)/*>" 45 $(PERL) -e "map unlink, <$(B_DATADIR)/*>"
44 $(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(DATAFILES) 46 $(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(DATAFILES)
45- $(CHMOD) $(PERM_RWX) $(B_DATADIR) 47- $(CHMOD) $(PERM_RWX) $(B_DATADIR)
46+ # no change of directory created by pkgsrc 48+ # no change of directory created by pkgsrc
47+ # $(CHMOD) $(PERM_RWX) $(B_DATADIR) 49+ # $(CHMOD) $(PERM_RWX) $(B_DATADIR)
48  50
49 text_html_doc: made-doc-stamp 51 text_html_doc: made-doc-stamp
50 $(NOOP) 52 $(NOOP)
cvs diff -r1.13 -r1.14 pkgsrc/mail/spamassassin/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/patches/patch-ae 2007/06/12 21:43:30 1.13
+++ pkgsrc/mail/spamassassin/patches/patch-ae 2018/10/18 19:54:32 1.14
@@ -1,31 +1,19 @@ @@ -1,31 +1,19 @@
1$NetBSD: patch-ae,v 1.13 2007/06/12 21:43:30 heinz Exp $ 1$NetBSD: patch-ae,v 1.14 2018/10/18 19:54:32 bsiegert Exp $
2 2
3 - pkgsrc sets default paths for rules and configuration data 3 - pkgsrc sets default paths for rules and configuration data
4 4
5--- spamd/spamd.raw.orig 2007-04-23 14:15:48.000000000 +0200 5--- spamd/spamd.raw.orig 2007-04-23 14:15:48.000000000 +0200
6+++ spamd/spamd.raw 6+++ spamd/spamd.raw
7@@ -2404,8 +2404,9 @@ sub backtrace_handler { 
8 } 
9  
10 sub daemonize { 
11- # Pretty command line in ps 
12- $0 = join (' ', $ORIG_ARG0, @ORIG_ARGV) unless would_log("dbg"); 
13+ # no pretty 'ps' command line (easier for pkgsrc rc script) 
14+ # # Pretty command line in ps 
15+ # $0 = join (' ', $ORIG_ARG0, @ORIG_ARGV) unless would_log("dbg"); 
16  
17 # be a nice daemon and chdir to the root so we don't block any 
18 # unmount attempts 
19@@ -2664,12 +2665,12 @@ Create user preferences files if they do 7@@ -2664,12 +2665,12 @@ Create user preferences files if they do
20 =item B<-C> I<path>, B<--configpath>=I<path> 8 =item B<-C> I<path>, B<--configpath>=I<path>
21  9
22 Use the specified path for locating the distributed configuration files. 10 Use the specified path for locating the distributed configuration files.
23-Ignore the default directories (usually C</usr/share/spamassassin> or similar). 11-Ignore the default directories (usually C</usr/share/spamassassin> or similar).
24+Ignore the default directories (usually C<@@DEF_RULES_DIR@@> or similar). 12+Ignore the default directories (usually C<@@DEF_RULES_DIR@@> or similar).
25  13
26 =item B<--siteconfigpath>=I<path> 14 =item B<--siteconfigpath>=I<path>
27  15
28 Use the specified path for locating site-specific configuration files. Ignore 16 Use the specified path for locating site-specific configuration files. Ignore
29-the default directories (usually C</etc/mail/spamassassin> or similar). 17-the default directories (usually C</etc/mail/spamassassin> or similar).
30+the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar). 18+the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
31  19
File Deleted: pkgsrc/mail/spamassassin/patches/Attic/patch-lib_Mail_SpamAssassin_DnsResolver.pm
File Deleted: pkgsrc/mail/spamassassin/patches/Attic/patch-lib_Mail_SpamAssassin_PerMsgStatus.pm
File Deleted: pkgsrc/mail/spamassassin/patches/Attic/patch-sa-compile
cvs diff -r1.1 -r1.2 pkgsrc/mail/spamassassin/patches/patch-spamc_libspamc.c (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/patches/patch-spamc_libspamc.c 2018/03/17 09:14:35 1.1
+++ pkgsrc/mail/spamassassin/patches/patch-spamc_libspamc.c 2018/10/18 19:54:32 1.2
@@ -1,29 +1,25 @@ @@ -1,29 +1,25 @@
1$NetBSD: patch-spamc_libspamc.c,v 1.1 2018/03/17 09:14:35 tnn Exp $ 1$NetBSD: patch-spamc_libspamc.c,v 1.2 2018/10/18 19:54:32 bsiegert Exp $
2 2
3Set the client protocol to TLS instead of SSLv3. 3Set the client protocol to TLS instead of SSLv3.
4Fixes build with current openssl. 4Fixes build with current openssl.
5 5
6--- spamc/libspamc.c.orig 2015-04-28 19:56:59.000000000 +0000 6--- spamc/libspamc.c.orig 2015-04-28 19:56:59.000000000 +0000
7+++ spamc/libspamc.c 7+++ spamc/libspamc.c
8@@ -1213,11 +1213,7 @@ int message_filter(struct transport *tp, 8@@ -1214,7 +1214,7 @@
9 if (flags & SPAMC_USE_SSL) { 9 if (flags & SPAMC_USE_SSL) {
10 #ifdef SPAMC_SSL 10 #ifdef SPAMC_SSL
11 SSLeay_add_ssl_algorithms(); 11 SSLeay_add_ssl_algorithms();
12- if (flags & SPAMC_TLSV1) { 12- meth = SSLv23_client_method();
13- meth = TLSv1_client_method(); 
14- } else { 
15- meth = SSLv3_client_method(); /* default */ 
16- } 
17+ meth = TLSv1_client_method(); 13+ meth = TLSv1_client_method();
18 SSL_load_error_strings(); 14 SSL_load_error_strings();
19 ctx = SSL_CTX_new(meth); 15 ctx = SSL_CTX_new(meth);
20 #else 16 #else
21@@ -1604,7 +1600,7 @@ int message_tell(struct transport *tp, c 17@@ -1601,7 +1601,7 @@
22 if (flags & SPAMC_USE_SSL) { 18 if (flags & SPAMC_USE_SSL) {
23 #ifdef SPAMC_SSL 19 #ifdef SPAMC_SSL
24 SSLeay_add_ssl_algorithms(); 20 SSLeay_add_ssl_algorithms();
25- meth = SSLv3_client_method(); 21- meth = SSLv23_client_method();
26+ meth = TLSv1_client_method(); 22+ meth = TLSv1_client_method();
27 SSL_load_error_strings(); 23 SSL_load_error_strings();
28 ctx = SSL_CTX_new(meth); 24 ctx = SSL_CTX_new(meth);
29 #else 25 #else