From: giovanni@paclan.it Subject: Re: UPDATE: mail/p5-Mail-SpamAssassin To: "Kirill A. Korinsky" Cc: ports@openbsd.org Date: Thu, 4 Sep 2025 15:46:05 +0200 On 9/4/25 9:40 AM, Kirill A. Korinsky wrote: > On Tue, 02 Sep 2025 22:45:48 +0200, > Giovanni Bechis wrote: >> >> [1 ] >> Hi, >> update to 4.0.2 recently released. >> If you are using TxRep plugin with sql backend, take a look at >> https://svn.apache.org/repos/asf/spamassassin/trunk/UPGRADE >> >> Comments ? ok ? >> Cheers >> Giovanni >> > > Deployed to my mailservers, no regression for a few days. > > OK kirill@ > I would like to also backport this diff to improve performance when an email has lot of links. https://github.com/apache/spamassassin/commit/4c6ae4d6215f4c553ac9ffcaabb380e2904b7027 Thanks Giovanni >> Index: Makefile >> =================================================================== >> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v >> diff -u -p -r1.125 Makefile >> --- Makefile 27 Jun 2025 08:05:34 -0000 1.125 >> +++ Makefile 2 Sep 2025 20:42:38 -0000 >> @@ -1,10 +1,9 @@ >> COMMENT= mailfilter to identify and mark spam >> >> -VER= 4.0.1 >> -REVISION= 1 >> +VER= 4.0.2 >> 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} >> Index: distinfo >> =================================================================== >> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v >> diff -u -p -r1.45 distinfo >> --- distinfo 2 Apr 2024 08:41:02 -0000 1.45 >> +++ distinfo 2 Sep 2025 20:42:38 -0000 >> @@ -1,4 +1,4 @@ >> -SHA256 (Mail-SpamAssassin-4.0.1.tar.bz2) = l3XtdVnoPsPmwD7bK+j/x/FcxAX7E+hcFI6wvxkXIag= >> -SHA256 (Mail-SpamAssassin-rules-4.0.1.r1916528.tgz) = OB6t/H5RPl9zU4m3gXPeWvRx89Bv5quPEpY0pmRLS/Q= >> -SIZE (Mail-SpamAssassin-4.0.1.tar.bz2) = 6379932 >> -SIZE (Mail-SpamAssassin-rules-4.0.1.r1916528.tgz) = 362781 >> +SHA256 (Mail-SpamAssassin-4.0.2.tar.bz2) = 2oGSz3bYhxgw1E173JFL0WQRBayBN5jd6sX2Wrj3PO4= >> +SHA256 (Mail-SpamAssassin-rules-4.0.2.r1928015.tgz) = +CEoaHEXET2+QL3E4xQbh/lsKwFRnJAiWX2kfnJqYT4= >> +SIZE (Mail-SpamAssassin-4.0.2.tar.bz2) = 6496450 >> +SIZE (Mail-SpamAssassin-rules-4.0.2.r1928015.tgz) = 371575 >> Index: patches/patch-spamd_spamd_raw >> =================================================================== >> RCS file: patches/patch-spamd_spamd_raw >> diff -N patches/patch-spamd_spamd_raw >> --- patches/patch-spamd_spamd_raw 27 Jun 2025 08:05:34 -0000 1.11 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -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'}) { >> Index: pkg/PLIST >> =================================================================== >> RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v >> diff -u -p -r1.44 PLIST >> --- pkg/PLIST 8 Dec 2024 14:59:54 -0000 1.44 >> +++ pkg/PLIST 2 Sep 2025 20:42:38 -0000 >> @@ -46,7 +46,12 @@ ${P5SITE}/Mail/SpamAssassin/DBBasedAddrL >> ${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/Phish >> ${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 >> [2 signature.asc ] >> No public key for FABEEA09897258E5 created at 2025-09-02T22:45:48+0200 using RSA >