Re: UPDATE: mail/p5-Mail-SpamAssassin

ping...
Cheers
Giovanni


On 12/20/22 08:29, Giovanni Bechis wrote:
> Hi,
> major update to 4.0.0.
> Lot of improvements and new features, more info at
> https://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_release_4_0_0/UPGRADE.
>
> Comments ? Ok ?
>
> Cheers
> Giovanni
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
> retrieving revision 1.119
> diff -u -p -r1.119 Makefile
> --- Makefile 8 Nov 2022 11:14:50 -0000 1.119
> +++ Makefile 20 Dec 2022 07:23:44 -0000
> @@ -1,11 +1,10 @@
> COMMENT= mailfilter to identify and mark spam
>
> -VER= 3.4.6
> +VER= 4.0.0
> DISTNAME= Mail-SpamAssassin-${VER}
> PKGNAME= p5-${DISTNAME}
> -RULESNAME= Mail-SpamAssassin-rules-${VER}.r1888502.tgz
> +RULESNAME= Mail-SpamAssassin-rules-${VER}.r1905950.tgz
> CATEGORIES= mail perl5
> -REVISION= 0
>
> DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RULESNAME}
> EXTRACT_SUFX= .tar.bz2
> @@ -24,6 +23,8 @@ MASTER_SITES= ${MASTER_SITE_APACHE:=spa
>
> COMMON_DEPENDS= www/p5-HTML-Parser>=3.31 \
> mail/p5-Mail-DKIM>=0.31 \
> + mail/p5-Email-Address-XS \
> + mail/p5-Mail-DMARC \
> net/p5-Net-DNS>=0.34 \
> net/p5-NetAddr-IP \
> security/p5-IO-Socket-SSL
> @@ -36,7 +37,7 @@ RUN_DEPENDS= ${COMMON_DEPENDS} \
> devel/p5-IO-String \
> p5-Mail-SPF-*|p5-Mail-SPF-Query-*:mail/p5-Mail-SPF \
> p5-GeoIP2-*|p5-IP-Country-DB_File-*|p5-IP-Country-*:net/p5-GeoIP2 \
> - net/p5-Net-LibIDN \
> + net/p5-Net-LibIDN2 \
> net/p5-Net-Patricia \
> security/gnupg \
> textproc/p5-Encode-Detect \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
> retrieving revision 1.43
> diff -u -p -r1.43 distinfo
> --- distinfo 30 Apr 2021 14:43:48 -0000 1.43
> +++ distinfo 20 Dec 2022 07:23:44 -0000
> @@ -1,4 +1,4 @@
> -SHA256 (Mail-SpamAssassin-3.4.6.tar.bz2) = vEh18+S7WXnwwQKDITpRLEyWRiIK4BMqeMjjr5R4lhA=
> -SHA256 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = se/NxX5rEAc1hV4k7oORsIVzJ9cOHh0sJ1fV9m6KHOY=
> -SIZE (Mail-SpamAssassin-3.4.6.tar.bz2) = 6166807
> -SIZE (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 369768
> +SHA256 (Mail-SpamAssassin-4.0.0.tar.bz2) = 5aoXBQowvHK6qGr9xgSMrepNHsLsxh14dxegWbgxnog=
> +SHA256 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = rk/7uRfrx/76ckD8W7UVHdpmP45AWRYa18m0Lu0brG0=
> +SIZE (Mail-SpamAssassin-4.0.0.tar.bz2) = 6371055
> +SIZE (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 355737
> Index: patches/patch-Makefile_PL
> ===================================================================
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL,v
> retrieving revision 1.16
> diff -u -p -r1.16 patch-Makefile_PL
> --- patches/patch-Makefile_PL 11 Mar 2022 19:34:50 -0000 1.16
> +++ patches/patch-Makefile_PL 20 Dec 2022 07:23:44 -0000
> @@ -1,7 +1,7 @@
> Index: Makefile.PL
> --- Makefile.PL.orig
> +++ Makefile.PL
> -@@ -857,7 +857,7 @@ sub MY::install {
> +@@ -886,7 +886,7 @@ sub MY::install {
>
> foreach (@code) {
> # Add our install targets as a dependency to all top-level install targets
> Index: patches/patch-t_sa_compile_t
> ===================================================================
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/patches/patch-t_sa_compile_t,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-t_sa_compile_t
> --- patches/patch-t_sa_compile_t 11 Mar 2022 19:34:50 -0000 1.5
> +++ patches/patch-t_sa_compile_t 20 Dec 2022 07:23:44 -0000
> @@ -1,9 +1,9 @@
> Index: t/sa_compile.t
> --- t/sa_compile.t.orig
> +++ t/sa_compile.t
> -@@ -12,8 +12,7 @@ use Config;
> - use File::Basename;
> - use File::Path qw/mkpath/;
> +@@ -10,8 +10,7 @@ use SATest; sa_t_init("sa_compile");
> +
> + use Config;
>
> -my $temp_binpath = $Config{sitebinexp};
> -$temp_binpath =~ s|^\Q$Config{siteprefixexp}\E/||;
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v
> retrieving revision 1.41
> diff -u -p -r1.41 PLIST
> --- pkg/PLIST 8 Nov 2022 11:14:51 -0000 1.41
> +++ pkg/PLIST 20 Dec 2022 07:23:44 -0000
> @@ -21,7 +21,7 @@ ${P5SITE}/Mail/SpamAssassin.pm
> ${P5SITE}/Mail/SpamAssassin/AICache.pm
> ${P5SITE}/Mail/SpamAssassin/ArchiveIterator.pm
> ${P5SITE}/Mail/SpamAssassin/AsyncLoop.pm
> -${P5SITE}/Mail/SpamAssassin/AutoWhitelist.pm
> +${P5SITE}/Mail/SpamAssassin/AutoWelcomelist.pm
> ${P5SITE}/Mail/SpamAssassin/Bayes/
> ${P5SITE}/Mail/SpamAssassin/Bayes.pm
> ${P5SITE}/Mail/SpamAssassin/Bayes/CombineChi.pm
> @@ -45,6 +45,7 @@ ${P5SITE}/Mail/SpamAssassin/Constants.pm
> ${P5SITE}/Mail/SpamAssassin/DBBasedAddrList.pm
> ${P5SITE}/Mail/SpamAssassin/Dns.pm
> ${P5SITE}/Mail/SpamAssassin/DnsResolver.pm
> +${P5SITE}/Mail/SpamAssassin/GeoDB.pm
> ${P5SITE}/Mail/SpamAssassin/HTML.pm
> ${P5SITE}/Mail/SpamAssassin/Locales.pm
> ${P5SITE}/Mail/SpamAssassin/Locker/
> @@ -75,6 +76,7 @@ ${P5SITE}/Mail/SpamAssassin/Plugin/AWL.p
> ${P5SITE}/Mail/SpamAssassin/Plugin/AccessDB.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/AntiVirus.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/AskDNS.pm
> +${P5SITE}/Mail/SpamAssassin/Plugin/AuthRes.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/Bayes.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/BodyEval.pm
> @@ -82,13 +84,15 @@ ${P5SITE}/Mail/SpamAssassin/Plugin/BodyR
> ${P5SITE}/Mail/SpamAssassin/Plugin/Check.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/DCC.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/DKIM.pm
> +${P5SITE}/Mail/SpamAssassin/Plugin/DMARC.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/DNSEval.pm
> +${P5SITE}/Mail/SpamAssassin/Plugin/DecodeShortURLs.pm
> +${P5SITE}/Mail/SpamAssassin/Plugin/ExtractText.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/FreeMail.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/FromNameSpoof.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/HTMLEval.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/HashBL.pm
> -${P5SITE}/Mail/SpamAssassin/Plugin/Hashcash.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/HeaderEval.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/ImageInfo.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/MIMEEval.pm
> @@ -118,7 +122,7 @@ ${P5SITE}/Mail/SpamAssassin/Plugin/URIEv
> ${P5SITE}/Mail/SpamAssassin/Plugin/URILocalBL.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/VBounce.pm
> ${P5SITE}/Mail/SpamAssassin/Plugin/WLBLEval.pm
> -${P5SITE}/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
> +${P5SITE}/Mail/SpamAssassin/Plugin/WelcomeListSubject.pm
> ${P5SITE}/Mail/SpamAssassin/PluginHandler.pm
> ${P5SITE}/Mail/SpamAssassin/RegistryBoundaries.pm
> ${P5SITE}/Mail/SpamAssassin/Reporter.pm
> @@ -148,7 +152,7 @@ ${P5SITE}/spamassassin-run.pod
> @man man/man3p/Mail::SpamAssassin::AICache.3p
> @man man/man3p/Mail::SpamAssassin::ArchiveIterator.3p
> @man man/man3p/Mail::SpamAssassin::AsyncLoop.3p
> -@man man/man3p/Mail::SpamAssassin::AutoWhitelist.3p
> +@man man/man3p/Mail::SpamAssassin::AutoWelcomelist.3p
> @man man/man3p/Mail::SpamAssassin::Bayes.3p
> @man man/man3p/Mail::SpamAssassin::BayesStore.3p
> @man man/man3p/Mail::SpamAssassin::BayesStore::BDB.3p
> @@ -162,6 +166,7 @@ ${P5SITE}/spamassassin-run.pod
> @man man/man3p/Mail::SpamAssassin::Conf::Parser.3p
> @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::Logger.3p
> @man man/man3p/Mail::SpamAssassin::Logger::File.3p
> @man man/man3p/Mail::SpamAssassin::Logger::Stderr.3p
> @@ -178,17 +183,20 @@ ${P5SITE}/spamassassin-run.pod
> @man man/man3p/Mail::SpamAssassin::Plugin::AccessDB.3p
> @man man/man3p/Mail::SpamAssassin::Plugin::AntiVirus.3p
> @man man/man3p/Mail::SpamAssassin::Plugin::AskDNS.3p
> +@man man/man3p/Mail::SpamAssassin::Plugin::AuthRes.3p
> @man man/man3p/Mail::SpamAssassin::Plugin::AutoLearnThreshold.3p
> @man man/man3p/Mail::SpamAssassin::Plugin::Bayes.3p
> @man man/man3p/Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3p
> @man man/man3p/Mail::SpamAssassin::Plugin::Check.3p
> @man man/man3p/Mail::SpamAssassin::Plugin::DCC.3p
> @man man/man3p/Mail::SpamAssassin::Plugin::DKIM.3p
> +@man man/man3p/Mail::SpamAssassin::Plugin::DMARC.3p
> @man man/man3p/Mail::SpamAssassin::Plugin::DNSEval.3p
> +@man man/man3p/Mail::SpamAssassin::Plugin::DecodeShortURLs.3p
> +@man man/man3p/Mail::SpamAssassin::Plugin::ExtractText.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
> @@ -213,7 +221,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::WhiteListSubject.3p
> +@man man/man3p/Mail::SpamAssassin::Plugin::WelcomeListSubject.3p
> @man man/man3p/Mail::SpamAssassin::PluginHandler.3p
> @man man/man3p/Mail::SpamAssassin::RegistryBoundaries.3p
> @man man/man3p/Mail::SpamAssassin::SQLBasedAddrList.3p
> @@ -247,6 +255,9 @@ share/doc/SpamAssassin/sql/awl_mysql.sql
> share/doc/SpamAssassin/sql/awl_pg.sql
> share/doc/SpamAssassin/sql/bayes_mysql.sql
> 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/txrep_mysql.sql
> share/doc/SpamAssassin/sql/txrep_pg.sql
> share/doc/SpamAssassin/sql/txrep_sqlite.sql
> @@ -276,6 +287,8 @@ share/examples/SpamAssassin/v342.pre
> @sample ${CONFDIR}/v342.pre
> share/examples/SpamAssassin/v343.pre
> @sample ${CONFDIR}/v343.pre
> +share/examples/SpamAssassin/v400.pre
> +@sample ${CONFDIR}/v400.pre
> share/spamassassin/
> share/spamassassin/10_default_prefs.cf
> share/spamassassin/10_hasbase.cf
> @@ -308,6 +321,7 @@ share/spamassassin/25_antivirus.cf
> share/spamassassin/25_asn.cf
> share/spamassassin/25_dcc.cf
> share/spamassassin/25_dkim.cf
> +share/spamassassin/25_dmarc.cf
> share/spamassassin/25_dnswl.cf
> share/spamassassin/25_pyzor.cf
> share/spamassassin/25_razor2.cf
> @@ -315,6 +329,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_shortener.cf
> share/spamassassin/30_text_de.cf
> share/spamassassin/30_text_fr.cf
> share/spamassassin/30_text_it.cf
> @@ -327,11 +342,11 @@ share/spamassassin/60_awl.cf
> share/spamassassin/60_bayes_stopwords.cf
> share/spamassassin/60_shortcircuit.cf
> share/spamassassin/60_txrep.cf
> -share/spamassassin/60_whitelist.cf
> -share/spamassassin/60_whitelist_auth.cf
> -share/spamassassin/60_whitelist_dkim.cf
> -share/spamassassin/60_whitelist_spf.cf
> -share/spamassassin/60_whitelist_subject.cf
> +share/spamassassin/60_welcomelist.cf
> +share/spamassassin/60_welcomelist_auth.cf
> +share/spamassassin/60_welcomelist_dkim.cf
> +share/spamassassin/60_welcomelist_spf.cf
> +share/spamassassin/60_welcomelist_subject.cf
> share/spamassassin/72_active.cf
> share/spamassassin/72_scores.cf
> share/spamassassin/73_sandbox_manual_scores.cf
> Index: pkg/spamassassin.rc
> ===================================================================
> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/spamassassin.rc,v
> retrieving revision 1.8
> diff -u -p -r1.8 spamassassin.rc
> --- pkg/spamassassin.rc 11 Mar 2022 19:34:50 -0000 1.8
> +++ pkg/spamassassin.rc 20 Dec 2022 07:23:44 -0000
> @@ -5,6 +5,6 @@ daemon_flags="-u _spamdaemon -P"
>
> . /etc/rc.d/rc.subr
>
> -pexp="/usr/bin/perl -T -w ${daemon}${daemon_flags:+ ${daemon_flags}}"
> +pexp="perl: spamd"
>
> rc_cmd $1