- Update to 3.1.3

PR:		ports/98574
Submitted by:	Yoshito Uchiyama <gato@intaa.net>
Security:	remote code execution vulnerability
		http://www.nabble.com/ANNOUNCE%3A-Apache-SpamAssassin-3.1.3-available%21-p4717543.html

5 files changed, 17 insertions, 38 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 487e81f3f1fc..dfddf15d983f 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	3.1.1
-PORTREVISION=	4
+PORTVERSION=	3.1.3
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
@@ -119,6 +118,7 @@ MAN3=		Mail::SpamAssassin.3 \
 		Mail::SpamAssassin::Plugin::AntiVirus.3 \
 		Mail::SpamAssassin::Plugin::AutoLearnThreshold.3 \
 		Mail::SpamAssassin::Plugin::DCC.3 \
+		Mail::SpamAssassin::Plugin::DKIM.3 \
 		Mail::SpamAssassin::Plugin::DomainKeys.3 \
 		Mail::SpamAssassin::Plugin::Hashcash.3 \
 		Mail::SpamAssassin::Plugin::MIMEHeader.3 \
@@ -171,13 +171,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's#B_CONFDIR)/local.cf#B_CONFDIR)/local.cf.sample#g' \
 		-e 's#B_CONFDIR)/init.pre#B_CONFDIR)/init.pre.sample#g' \
 		-e 's#B_CONFDIR)/v310.pre#B_CONFDIR)/v310.pre.sample#g' \
+		-e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' \
 		-e 's/require DBI/0/' \
 		${WRKSRC}/Makefile.PL
 .if defined(WITH_RAZOR)
-	${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
+	${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
 .endif
 .if defined(WITH_DOMAINKEYS)
-	${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
+	${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
 .endif
 .if defined(WITH_RELAY_COUNTRY)
 	${REINPLACE_CMD} -e '/RelayCountry/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre
@@ -194,6 +195,9 @@ post-install:
 	@[ -f ${PREFIX}/etc/mail/spamassassin/v310.pre ] || \
 		${CP} ${PREFIX}/etc/mail/spamassassin/v310.pre.sample \
 			${PREFIX}/etc/mail/spamassassin/v310.pre
+	@[ -f ${PREFIX}/etc/mail/spamassassin/v312.pre ] || \
+		${CP} ${PREFIX}/etc/mail/spamassassin/v312.pre.sample \
+			${PREFIX}/etc/mail/spamassassin/v312.pre
 .if defined(WITH_TOOLS)
 	@${MKDIR} ${DATADIR}/tools
 	@for f in ${WRKSRC}/tools/*; do \
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index 8693b74f74da..a611fce00cce 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-3.1.1.tar.gz) = f7844cbc149de3d7b09a4310f4ab6739
-SHA256 (Mail-SpamAssassin-3.1.1.tar.gz) = e4284c445f8fed11bc82b3900dc4b75eec0d632768c894bf186c3b7e1de63797
-SIZE (Mail-SpamAssassin-3.1.1.tar.gz) = 1129275
+MD5 (Mail-SpamAssassin-3.1.3.tar.gz) = 32ad78f3cdaddb02cdf0f55572604d07
+SHA256 (Mail-SpamAssassin-3.1.3.tar.gz) = 1da55f280e9e8ff0a2fc373b8c610ea3f7eea5303b474e4a42ed554e87ba0e1d
+SIZE (Mail-SpamAssassin-3.1.3.tar.gz) = 1134662
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw b/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
deleted file mode 100644
index 0b2a3ae49ff5..000000000000
--- a/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
+++ /dev/null
@@ -1,19 +0,0 @@
---- sa-learn.raw.org	Tue Sep 13 19:07:32 2005
-+++ sa-learn.raw	Sun Dec  4 16:43:52 2005
-@@ -109,6 +109,7 @@ GetOptions(
-   'local|L'              => \$opt{'local'},
-   'no-sync|nosync'       => \$opt{'nosync'},
-   'showdots'             => \$opt{'showdots'},
-+  'quiet'                => \$opt{'quiet'},
-   'progress'             => \$opt{'progress'},
-   'use-ignores'          => \$opt{'use-ignores'},
-   'no-rebuild|norebuild' => sub { $opt{'nosync'} = 1; warn "The --no-rebuild option has been deprecated.  Please use --no-sync instead.\n" },
-@@ -409,7 +410,7 @@ eval {
-   $progress->final() if ($opt{progress} && $progress);
- 
-   my $phrase = defined $forget ? "Forgot" : "Learned";
--  print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n";
-+  print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n" if (!$opt{quiet});
- 
-   # If we needed to make a tempfile, go delete it.
-   if ( defined $tempfile ) {
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw b/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw
deleted file mode 100644
index ddcc3445e94f..000000000000
--- a/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw
+++ /dev/null
@@ -1,11 +0,0 @@
---- spamassassin.raw~	Tue Sep 14 01:34:05 2004
-+++ spamassassin.raw	Wed Sep 22 18:03:37 2004
-@@ -329,7 +329,7 @@
- # Let folks know how many messages were handled, as long as the handling
- # didn't produce output (ala: check, test, or remove_markup ...)
- if ( $opt{'report'} || $opt{'revoke'} || $doing_whitelist_operation ) {
--  print "$count message(s) examined.\n";
-+  print "$count message(s) examined.\n" unless $opt{'quiet'};
- }
- 
- # if the eval died from something, report it here and return an error.
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index 339e2442392d..05eca6b8c357 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -12,6 +12,9 @@ etc/mail/spamassassin/init.pre.sample
 @unexec if cmp -s %B/v310.pre.sample %B/v310.pre; then rm -f %B/v310.pre; fi
 etc/mail/spamassassin/v310.pre.sample
 @exec [ -f %B/v310.pre ] || cp %B/%f %B/v310.pre
+@unexec if cmp -s %B/v312.pre.sample %B/v312.pre; then rm -f %B/v312.pre; fi
+etc/mail/spamassassin/v312.pre.sample
+@exec [ -f %B/v312.pre ] || cp %B/%f %B/v312.pre
 %%SITE_PERL%%/Mail/SpamAssassin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
 %%SITE_PERL%%/Mail/SpamAssassin/AutoWhitelist.pm
@@ -59,6 +62,7 @@ etc/mail/spamassassin/v310.pre.sample
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AntiVirus.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DCC.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/DKIM.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DomainKeys.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Hashcash.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/MIMEHeader.pm
@@ -106,6 +110,7 @@ etc/mail/spamassassin/v310.pre.sample
 %%DATADIR%%/25_body_tests_es.cf
 %%DATADIR%%/25_body_tests_pl.cf
 %%DATADIR%%/25_dcc.cf
+%%DATADIR%%/25_dkim.cf
 %%DATADIR%%/25_domainkeys.cf
 %%DATADIR%%/25_hashcash.cf
 %%DATADIR%%/25_pyzor.cf
@@ -123,6 +128,7 @@ etc/mail/spamassassin/v310.pre.sample
 %%DATADIR%%/50_scores.cf
 %%DATADIR%%/60_awl.cf
 %%DATADIR%%/60_whitelist.cf
+%%DATADIR%%/60_whitelist_dkim.cf
 %%DATADIR%%/60_whitelist_spf.cf
 %%DATADIR%%/60_whitelist_subject.cf
 %%DATADIR%%/languages
@@ -130,7 +136,6 @@ etc/mail/spamassassin/v310.pre.sample
 %%DATADIR%%/sa-update-pubkey.txt
 %%DATADIR%%/user_prefs.template
 %%TOOLS%%%%DATADIR%%/tools/README.speedtest
-%%TOOLS%%%%DATADIR%%/tools/bayes_dump_to_trusted_networks
 %%TOOLS%%%%DATADIR%%/tools/check_whitelist
 %%TOOLS%%%%DATADIR%%/tools/convert_awl_dbm_to_sql
 %%TOOLS%%%%DATADIR%%/tools/desc_length.pl