Update to 4.0.2 + backported patch

If you are using TxRep plugin follow upgrade instructions at
https://svn.apache.org/repos/asf/spamassassin/trunk/UPGRADE
ok kirill@

mail/p5-Mail-SpamAssassin/Makefile

@@ -1,10 +1,9 @@
 COMMENT=		mailfilter to identify and mark spam
 
-VER=			4.0.1
+VER=			4.0.2
-REVISION=		1
 DISTNAME=		Mail-SpamAssassin-${VER}
 PKGNAME=		p5-${DISTNAME}
-RULESNAME=		Mail-SpamAssassin-rules-${VER}.r1916528.tgz
+RULESNAME=		Mail-SpamAssassin-rules-${VER}.r1928015.tgz
 CATEGORIES=		mail perl5
 
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}

mail/p5-Mail-SpamAssassin/distinfo

@@ -1,4 +1,4 @@
-SHA256 (Mail-SpamAssassin-4.0.1.tar.bz2) = l3XtdVnoPsPmwD7bK+j/x/FcxAX7E+hcFI6wvxkXIag=
+SHA256 (Mail-SpamAssassin-4.0.2.tar.bz2) = 2oGSz3bYhxgw1E173JFL0WQRBayBN5jd6sX2Wrj3PO4=
-SHA256 (Mail-SpamAssassin-rules-4.0.1.r1916528.tgz) = OB6t/H5RPl9zU4m3gXPeWvRx89Bv5quPEpY0pmRLS/Q=
+SHA256 (Mail-SpamAssassin-rules-4.0.2.r1928015.tgz) = +CEoaHEXET2+QL3E4xQbh/lsKwFRnJAiWX2kfnJqYT4=
-SIZE (Mail-SpamAssassin-4.0.1.tar.bz2) = 6379932
+SIZE (Mail-SpamAssassin-4.0.2.tar.bz2) = 6496450
-SIZE (Mail-SpamAssassin-rules-4.0.1.r1916528.tgz) = 362781
+SIZE (Mail-SpamAssassin-rules-4.0.2.r1928015.tgz) = 371575

mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL

@@ -1,7 +1,7 @@
 Index: Makefile.PL
 --- Makefile.PL.orig
 +++ Makefile.PL
-@@ -886,7 +886,7 @@ sub MY::install {
+@@ -822,7 +822,7 @@ sub MY::install {
  
    foreach (@code) {
      # Add our install targets as a dependency to all top-level install targets

mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_PerMsgStatus_pm

@@ -0,0 +1,20 @@
+Improve CNAME caching
+https://github.com/apache/spamassassin/commit/4c6ae4d6215f4c553ac9ffcaabb380e2904b7027
+Index: lib/Mail/SpamAssassin/PerMsgStatus.pm
+--- lib/Mail/SpamAssassin/PerMsgStatus.pm.orig
++++ lib/Mail/SpamAssassin/PerMsgStatus.pm
+@@ -2918,10 +2918,14 @@ sub add_uri_detail_list {
+       my $pkt;
+       eval {
+         return if not defined $host;
++        return if exists $self->{dns_cname_cache}{$host};
+         my $handle = $orig_resolver->bgsend($host, 'CNAME');
+         $pkt = $orig_resolver->bgread($handle);
+         return if !$pkt; # aborted / timed out
+         my @answ = $pkt->answer;
++        # Set an invalid value in the cache, it will be overwritten later
++        # if a CNAME is present
++        $self->{dns_cname_cache}{$host} = 'invalid';
+         foreach my $ans ( @answ ) {
+           return if not defined $ans->cname;
+           if(not exists $self->{dns_cname_cache}{$host}) {

mail/p5-Mail-SpamAssassin/patches/patch-spamd_spamd_raw

@@ -1,14 +0,0 @@
-Explicitly handle one-sided SSL shutdown,
-fixes compatibility with IO::Socket::SSL >= 2.091
-https://github.com/apache/spamassassin/commit/df9325b73d6dc71be0f3415e77d183329bfe0483
-Index: spamd/spamd.raw
---- spamd/spamd.raw.orig
-+++ spamd/spamd.raw
-@@ -1107,6 +1107,7 @@ sub server_sock_setup_inet {
-         SSL_server      => 1,
-         SSL_key_file    => $opt{'server-key'},
-         SSL_cert_file   => $opt{'server-cert'},
-+        SSL_on_peer_shutdown => sub { return 0 },
-       ));
-       my $ssl_mode;
-       if ($opt{'ssl-verify'}) {

mail/p5-Mail-SpamAssassin/patches/patch-t_sa_compile_t

@@ -1,7 +1,7 @@
 Index: t/sa_compile.t
 --- t/sa_compile.t.orig
 +++ t/sa_compile.t
-@@ -10,8 +10,7 @@ use SATest; sa_t_init("sa_compile");
+@@ -12,8 +12,7 @@ use SATest; sa_t_init("sa_compile");
  
  use Config;
  
@@ -9,5 +9,5 @@ Index: t/sa_compile.t
 -$temp_binpath =~ s|^\Q$Config{siteprefixexp}\E/||;
 +my $temp_binpath = "bin";
  
- use Test::More;
+ my $RE2C_BIN = get_re2c_bin_from_sa_compile();
- plan skip_all => "Long running tests disabled" unless conf_bool('run_long_tests');
+ 

mail/p5-Mail-SpamAssassin/pkg/PLIST

@@ -46,7 +46,12 @@ ${P5SITE}/Mail/SpamAssassin/DBBasedAddrList.pm
 ${P5SITE}/Mail/SpamAssassin/Dns.pm
 ${P5SITE}/Mail/SpamAssassin/DnsResolver.pm
 ${P5SITE}/Mail/SpamAssassin/GeoDB.pm
+${P5SITE}/Mail/SpamAssassin/HTML/
 ${P5SITE}/Mail/SpamAssassin/HTML.pm
+${P5SITE}/Mail/SpamAssassin/HTML/Color.pm
+${P5SITE}/Mail/SpamAssassin/Header/
+${P5SITE}/Mail/SpamAssassin/Header.pm
+${P5SITE}/Mail/SpamAssassin/Header/ParameterHeader.pm
 ${P5SITE}/Mail/SpamAssassin/Locales.pm
 ${P5SITE}/Mail/SpamAssassin/Locker/
 ${P5SITE}/Mail/SpamAssassin/Locker.pm
@@ -104,6 +109,7 @@ ${P5SITE}/Mail/SpamAssassin/Plugin/PhishTag.pm
 ${P5SITE}/Mail/SpamAssassin/Plugin/Phishing.pm
 ${P5SITE}/Mail/SpamAssassin/Plugin/Pyzor.pm
 ${P5SITE}/Mail/SpamAssassin/Plugin/Razor2.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/Redirectors.pm
 ${P5SITE}/Mail/SpamAssassin/Plugin/RelayCountry.pm
 ${P5SITE}/Mail/SpamAssassin/Plugin/RelayEval.pm
 ${P5SITE}/Mail/SpamAssassin/Plugin/ReplaceTags.pm
@@ -174,6 +180,9 @@ ${P5SITE}/spamassassin-run.pod
 @man man/man3p/Mail::SpamAssassin::Conf::SQL.3p
 @man man/man3p/Mail::SpamAssassin::DnsResolver.3p
 @man man/man3p/Mail::SpamAssassin::GeoDB.3p
+@man man/man3p/Mail::SpamAssassin::HTML::Color.3p
+@man man/man3p/Mail::SpamAssassin::Header.3p
+@man man/man3p/Mail::SpamAssassin::Header::ParameterHeader.3p
 @man man/man3p/Mail::SpamAssassin::Logger.3p
 @man man/man3p/Mail::SpamAssassin::Logger::File.3p
 @man man/man3p/Mail::SpamAssassin::Logger::Stderr.3p
@@ -204,6 +213,7 @@ ${P5SITE}/spamassassin-run.pod
 @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::HeaderEval.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
@@ -213,6 +223,7 @@ ${P5SITE}/spamassassin-run.pod
 @man man/man3p/Mail::SpamAssassin::Plugin::Phishing.3p
 @man man/man3p/Mail::SpamAssassin::Plugin::Pyzor.3p
 @man man/man3p/Mail::SpamAssassin::Plugin::Razor2.3p
+@man man/man3p/Mail::SpamAssassin::Plugin::Redirectors.3p
 @man man/man3p/Mail::SpamAssassin::Plugin::RelayCountry.3p
 @man man/man3p/Mail::SpamAssassin::Plugin::ReplaceTags.3p
 @man man/man3p/Mail::SpamAssassin::Plugin::ResourceLimits.3p
@@ -228,6 +239,7 @@ ${P5SITE}/spamassassin-run.pod
 @man man/man3p/Mail::SpamAssassin::Plugin::URIDetail.3p
 @man man/man3p/Mail::SpamAssassin::Plugin::URILocalBL.3p
 @man man/man3p/Mail::SpamAssassin::Plugin::VBounce.3p
+@man man/man3p/Mail::SpamAssassin::Plugin::WLBLEval.3p
 @man man/man3p/Mail::SpamAssassin::Plugin::WelcomeListSubject.3p
 @man man/man3p/Mail::SpamAssassin::PluginHandler.3p
 @man man/man3p/Mail::SpamAssassin::Pyzor.3p
@@ -270,6 +282,9 @@ share/doc/SpamAssassin/sql/bayes_pg.sql
 share/doc/SpamAssassin/sql/decodeshorturl_mysql.sql
 share/doc/SpamAssassin/sql/decodeshorturl_pg.sql
 share/doc/SpamAssassin/sql/decodeshorturl_sqlite.sql
+share/doc/SpamAssassin/sql/redirectors_mysql.sql
+share/doc/SpamAssassin/sql/redirectors_pg.sql
+share/doc/SpamAssassin/sql/redirectors_sqlite.sql
 share/doc/SpamAssassin/sql/txrep_mysql.sql
 share/doc/SpamAssassin/sql/txrep_pg.sql
 share/doc/SpamAssassin/sql/txrep_sqlite.sql
@@ -303,6 +318,8 @@ share/examples/SpamAssassin/v400.pre
 @sample ${CONFDIR}/v400.pre
 share/examples/SpamAssassin/v401.pre
 @sample ${CONFDIR}/v401.pre
+share/examples/SpamAssassin/v402.pre
+@sample ${CONFDIR}/v402.pre
 share/spamassassin/
 share/spamassassin/10_default_prefs.cf
 share/spamassassin/10_hasbase.cf
@@ -343,6 +360,7 @@ share/spamassassin/25_replace.cf
 share/spamassassin/25_spf.cf
 share/spamassassin/25_textcat.cf
 share/spamassassin/25_uribl.cf
+share/spamassassin/25_url_redirectors.cf
 share/spamassassin/25_url_shortener.cf
 share/spamassassin/30_text_de.cf
 share/spamassassin/30_text_fr.cf