On Sat, Nov 02, 2019 at 05:04:57PM +0100, Giovanni Bechis wrote:
> Hi,
> SpamAssassin is close to a new release and tests are very welcome.
>
> rc5 port update follows, this will be very similar to release.
> Full changes at
> https://svn.apache.org/repos/asf/spamassassin/branches/3.4/Changes
> Note that TxRep plugin has changed sql scheme.
>
diff updated to rc6, net/p5-Geo-IP is not strictly needed, net/p5-GeoIP2 is
fully supported by
all plugins.
Should we remove it from dependencies ?
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.111
diff -u -p -r1.111 Makefile
--- Makefile 25 Sep 2018 09:05:09 -0000 1.111
+++ Makefile 9 Nov 2019 21:05:31 -0000
@@ -2,11 +2,10 @@
COMMENT= mailfilter to identify and mark spam
-VER= 3.4.2
+VER= 3.4.3-rc6
DISTNAME= Mail-SpamAssassin-${VER}
PKGNAME= p5-${DISTNAME}
-REVISION= 0
-RULESNAME= Mail-SpamAssassin-rules-${VER}.r1840640.tgz
+RULESNAME= Mail-SpamAssassin-rules-${VER}.r1869531.tgz
CATEGORIES= mail perl5
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}
@@ -18,11 +17,13 @@ MAINTAINER= Giovanni Bechis <giovanni@o
HOMEPAGE= http://spamassassin.apache.org/
# Apache Software License (v2)
-PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE= Yes
WANTLIB= c crypto ssl z
-MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
+# MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
+MASTER_SITES= https://people.apache.org/~kmcgrail/devel/
+WRKDIST= ${WRKDIR}/Mail-SpamAssassin-3.4.3
COMMON_DEPENDS= www/p5-HTML-Parser>=3.31 \
mail/p5-Mail-DKIM>=0.31 \
@@ -35,7 +36,7 @@ RUN_DEPENDS= ${COMMON_DEPENDS} \
devel/re2c \
devel/p5-BSD-Resource \
p5-Mail-SPF-*|p5-Mail-SPF-Query-*:mail/p5-Mail-SPF \
-
p5-Geo-IP-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-Geo-IP \
+
p5-Geo-IP-*|p5-GeoIP2-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-GeoIP2 \
net/p5-Net-LibIDN \
net/p5-Net-Patricia \
security/gnupg \
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo 18 Sep 2018 06:42:57 -0000 1.39
+++ distinfo 9 Nov 2019 21:05:31 -0000
@@ -1,4 +1,4 @@
-SHA256 (Mail-SpamAssassin-3.4.2.tar.bz2) =
zwMEWkmRdSFF7tAH51c38+TH80zyJdtBHOP9NZKA6No=
-SHA256 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) =
jUgaIIHx5ioleSOPZrWNIST3ounzz6PUqisD/nsBmbs=
-SIZE (Mail-SpamAssassin-3.4.2.tar.bz2) = 2700016
-SIZE (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 284758
+SHA256 (Mail-SpamAssassin-3.4.3-rc6.tar.bz2) =
pK+PnQyqvhk0AV8YMtFGF8oKkaxyUc9j8d3bWQPnBR8=
+SHA256 (Mail-SpamAssassin-rules-3.4.3-rc6.r1869531.tgz) =
KopVBHSA7RX+I72ySuEVjDCvtLTccwI7X2XHmFDJtxo=
+SIZE (Mail-SpamAssassin-3.4.3-rc6.tar.bz2) = 2699030
+SIZE (Mail-SpamAssassin-rules-3.4.3-rc6.r1869531.tgz) = 314612
Index: patches/patch-spamc_getopt_c
===================================================================
RCS file: patches/patch-spamc_getopt_c
diff -N patches/patch-spamc_getopt_c
--- patches/patch-spamc_getopt_c 25 Sep 2018 09:05:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-spamc_getopt_c,v 1.1 2018/09/25 09:05:09 giovanni Exp $
-Fix use-after-free, bz 7633
-Index: spamc/getopt.c
---- spamc/getopt.c.orig
-+++ spamc/getopt.c
-@@ -273,7 +273,6 @@ spamc_getopt_long(int argc, char * const argv[],
- } else if(longopts[i].has_arg == optional_argument) {
- if(((spamc_optind < argc) && (argv[spamc_optind]) &&
(argv[spamc_optind][0] != '-')) ||
- (opt != NULL)) {
-- free(opt);
- if(opt != NULL) {
- spamc_optarg = opt;
- } else {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v
retrieving revision 1.37
diff -u -p -r1.37 PLIST
--- pkg/PLIST 18 Sep 2018 06:42:57 -0000 1.37
+++ pkg/PLIST 9 Nov 2019 21:05:31 -0000
@@ -94,6 +94,7 @@ ${P5SITE}/Mail/SpamAssassin/Plugin/Heade
${P5SITE}/Mail/SpamAssassin/Plugin/ImageInfo.pm
${P5SITE}/Mail/SpamAssassin/Plugin/MIMEEval.pm
${P5SITE}/Mail/SpamAssassin/Plugin/MIMEHeader.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/OLEVBMacro.pm
${P5SITE}/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
${P5SITE}/Mail/SpamAssassin/Plugin/PDFInfo.pm
${P5SITE}/Mail/SpamAssassin/Plugin/PhishTag.pm
@@ -184,11 +185,13 @@ ${P5SITE}/spamassassin-run.pod
@man man/man3p/Mail::SpamAssassin::Plugin::DCC.3p
@man man/man3p/Mail::SpamAssassin::Plugin::DKIM.3p
@man man/man3p/Mail::SpamAssassin::Plugin::DNSEval.3p
+@man man/man3p/Mail::SpamAssassin::Plugin::FreeMail.3p
@man man/man3p/Mail::SpamAssassin::Plugin::FromNameSpoof.3p
@man man/man3p/Mail::SpamAssassin::Plugin::HashBL.3p
@man man/man3p/Mail::SpamAssassin::Plugin::Hashcash.3p
@man man/man3p/Mail::SpamAssassin::Plugin::MIMEEval.3p
@man man/man3p/Mail::SpamAssassin::Plugin::MIMEHeader.3p
+@man man/man3p/Mail::SpamAssassin::Plugin::OLEVBMacro.3p
@man man/man3p/Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3p
@man man/man3p/Mail::SpamAssassin::Plugin::PDFInfo.3p
@man man/man3p/Mail::SpamAssassin::Plugin::PhishTag.3p
@@ -246,6 +249,7 @@ share/doc/SpamAssassin/sql/bayes_mysql.s
share/doc/SpamAssassin/sql/bayes_pg.sql
share/doc/SpamAssassin/sql/txrep_mysql.sql
share/doc/SpamAssassin/sql/txrep_pg.sql
+share/doc/SpamAssassin/sql/txrep_sqlite.sql
share/doc/SpamAssassin/sql/userpref_mysql.sql
share/doc/SpamAssassin/sql/userpref_pg.sql
share/doc/pkg-readmes/${PKGSTEM}
@@ -270,6 +274,8 @@ share/examples/SpamAssassin/v341.pre
@sample ${CONFDIR}/v341.pre
share/examples/SpamAssassin/v342.pre
@sample ${CONFDIR}/v342.pre
+share/examples/SpamAssassin/v343.pre
+@sample ${CONFDIR}/v343.pre
share/spamassassin/
share/spamassassin/10_default_prefs.cf
share/spamassassin/10_hasbase.cf
@@ -302,7 +308,7 @@ share/spamassassin/25_antivirus.cf
share/spamassassin/25_asn.cf
share/spamassassin/25_dcc.cf
share/spamassassin/25_dkim.cf
-share/spamassassin/25_hashcash.cf
+share/spamassassin/25_dnswl.cf
share/spamassassin/25_pyzor.cf
share/spamassassin/25_razor2.cf
share/spamassassin/25_replace.cf
