Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 Mar 2024 01:27:17 GMT
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 16e8b4502b4a - main - mail/spamassassin: Update 4.0.0 --> 4.0.1
Message-ID:  <202403310127.42V1RH8e052116@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=16e8b4502b4abdd7e8fa45171ffd755eecd3f73f

commit 16e8b4502b4abdd7e8fa45171ffd755eecd3f73f
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-03-31 01:07:51 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-03-31 01:07:51 +0000

    mail/spamassassin: Update 4.0.0 --> 4.0.1
    
    The release announcement can be found at
    https://svn.apache.org/repos/asf/spamassassin/trunk/build/announcements/\
    4.0.1.txt.
---
 mail/spamassassin/Makefile                  |  4 ++--
 mail/spamassassin/distinfo                  |  6 +++---
 mail/spamassassin/files/patch-sa-update.raw | 12 ------------
 mail/spamassassin/pkg-plist                 | 11 +++++++++++
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 6104f9183f61..06993c0e624f 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	spamassassin
-PORTVERSION=	4.0.0
-PORTREVISION=	6
+PORTVERSION=	4.0.1
 CATEGORIES?=	mail perl5
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/source/ CPAN/Mail
 DISTNAME=	Mail-SpamAssassin-${PORTVERSION}
@@ -180,6 +179,7 @@ post-patch::
 		-e 's,B_CONFDIR)/v342.pre,B_CONFDIR)/v342.pre.sample,g' \
 		-e 's,B_CONFDIR)/v343.pre,B_CONFDIR)/v343.pre.sample,g' \
 		-e 's,B_CONFDIR)/v400.pre,B_CONFDIR)/v400.pre.sample,g' \
+		-e 's,B_CONFDIR)/v401.pre,B_CONFDIR)/v401.pre.sample,g' \
 		-e 's/require DBI/0/' \
 		${WRKSRC}/Makefile.PL
 	${REINPLACE_CMD} -e '/^CC =/d; \
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 65380a2b42b5..f211a38125fa 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672761727
-SHA256 (Mail-SpamAssassin-4.0.0.tar.gz) = 65979da7d103e3c37563f23a1a24f470090afb33664348968a00bf3d09a84f36
-SIZE (Mail-SpamAssassin-4.0.0.tar.gz) = 6779828
+TIMESTAMP = 1711824814
+SHA256 (Mail-SpamAssassin-4.0.1.tar.gz) = 5c6bb222e18405f1a276816d04e1ffc5cc90785e1265714b4506c2b541d6d5e5
+SIZE (Mail-SpamAssassin-4.0.1.tar.gz) = 6789832
diff --git a/mail/spamassassin/files/patch-sa-update.raw b/mail/spamassassin/files/patch-sa-update.raw
deleted file mode 100644
index 4a3df72b29f5..000000000000
--- a/mail/spamassassin/files/patch-sa-update.raw
+++ /dev/null
@@ -1,12 +0,0 @@
-# https://svn.apache.org/viewvc?view=revision&revision=1910601
---- sa-update.raw.orig	2022-12-14 06:03:27 UTC
-+++ sa-update.raw
-@@ -1458,7 +1458,7 @@ sub do_dns_query {
-       next if !$rr;  # no answer records, only rcode
-       next if $rr->type ne $rr_type;
-       # scalar context!
--      my $text = $rr->UNIVERSAL::can('txtdata') ? $rr->txtdata : $rr->rdatastr;
-+      my $text = $rr->UNIVERSAL::can('txtdata') ? $rr->txtdata : $rr->rdstring;
-       push(@result,$text)  if defined $text && $text ne '';
-     }
-     printf("DNS %s query: %s -> %s\n", $rr_type, $query, join(", ",@result))
diff --git a/mail/spamassassin/pkg-plist b/mail/spamassassin/pkg-plist
index 7cd9c3a9f0b1..e37a8d5b535e 100644
--- a/mail/spamassassin/pkg-plist
+++ b/mail/spamassassin/pkg-plist
@@ -17,6 +17,7 @@ bin/spamd
 @sample %%ETCDIR%%/v342.pre.sample
 @sample %%ETCDIR%%/v343.pre.sample
 @sample %%ETCDIR%%/v400.pre.sample
+@sample %%ETCDIR%%/v401.pre.sample
 include/libspamc.h
 lib/libspamc.so
 lib/libspamc.so.0
@@ -121,6 +122,11 @@ lib/libspamc.so.0
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/WLBLEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/WelcomeListSubject.pm
 %%SITE_PERL%%/Mail/SpamAssassin/PluginHandler.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Pyzor.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Pyzor/Client.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Pyzor/Digest.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Pyzor/Digest/Pieces.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Pyzor/Digest/StripHtml.pm
 %%SITE_PERL%%/Mail/SpamAssassin/RegistryBoundaries.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Reporter.pm
 %%SITE_PERL%%/Mail/SpamAssassin/SQLBasedAddrList.pm
@@ -218,6 +224,11 @@ lib/libspamc.so.0
 %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::VBounce.3.gz
 %%PERL5_MAN3%%/Mail::SpamAssassin::Plugin::WelcomeListSubject.3.gz
 %%PERL5_MAN3%%/Mail::SpamAssassin::PluginHandler.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Pyzor.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Pyzor::Client.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Pyzor::Digest.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Pyzor::Digest::Pieces.3.gz
+%%PERL5_MAN3%%/Mail::SpamAssassin::Pyzor::Digest::StripHtml.3.gz
 %%PERL5_MAN3%%/Mail::SpamAssassin::RegistryBoundaries.3.gz
 %%PERL5_MAN3%%/Mail::SpamAssassin::SQLBasedAddrList.3.gz
 %%PERL5_MAN3%%/Mail::SpamAssassin::SubProcBackChannel.3.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403310127.42V1RH8e052116>