Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171180855353360"
MIME-Version: 1.0
Date: Sat, 30 Mar 2024 14:22:33 +0000
From: "Greg Troxel" <gdt@netbsd.org>
Subject: CVS commit: pkgsrc/mail/spamassassin
To: pkgsrc-changes@NetBSD.org
Reply-To: gdt@netbsd.org
Message-Id: <20240330142233.A7601FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171180855353360
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gdt
Date:		Sat Mar 30 14:22:33 UTC 2024

Modified Files:
	pkgsrc/mail/spamassassin: Makefile distinfo
	pkgsrc/mail/spamassassin/patches: patch-Makefile.PL patch-sa-update

Log Message:
mail/spamassassin: Update to 4.0.1

Upstream changes are bugfixes and very minor improvements.  Packaging
changes are simply changing the version number, patch defuzzing and
dropping one fix that is now upstream.

Tested on netbsd-9 amd64 for 24h, handling real mail.

Take maintainership.

(ok during freeze from wiz)


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 pkgsrc/mail/spamassassin/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/mail/spamassassin/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/spamassassin/patches/patch-Makefile.PL \
    pkgsrc/mail/spamassassin/patches/patch-sa-update

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171180855353360
Content-Disposition: inline
Content-Length: 7685
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/spamassassin/Makefile
diff -u pkgsrc/mail/spamassassin/Makefile:1.151 pkgsrc/mail/spamassassin/Makefile:1.152
--- pkgsrc/mail/spamassassin/Makefile:1.151	Tue Oct 24 22:09:50 2023
+++ pkgsrc/mail/spamassassin/Makefile	Sat Mar 30 14:22:33 2024
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.151 2023/10/24 22:09:50 wiz Exp $
+# $NetBSD: Makefile,v 1.152 2024/03/30 14:22:33 gdt Exp $
 
-VERSION=	4.0.0
+VERSION=	4.0.1
 DISTNAME=	Mail-SpamAssassin-${VERSION}
 PKGNAME=	spamassassin-${VERSION}
-PKGREVISION=	3
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/source/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -12,7 +11,7 @@ DISTFILES+=	${RULESARCHIVEASC}
 #DISTFILES+=	${RULESARCHIVESHA}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	https://spamassassin.apache.org/
 COMMENT=	Mail filter to identify spam
 LICENSE=	apache-2.0

Index: pkgsrc/mail/spamassassin/distinfo
diff -u pkgsrc/mail/spamassassin/distinfo:1.82 pkgsrc/mail/spamassassin/distinfo:1.83
--- pkgsrc/mail/spamassassin/distinfo:1.82	Tue Aug 15 10:20:00 2023
+++ pkgsrc/mail/spamassassin/distinfo	Sat Mar 30 14:22:33 2024
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.82 2023/08/15 10:20:00 abs Exp $
+$NetBSD: distinfo,v 1.83 2024/03/30 14:22:33 gdt Exp $
 
-BLAKE2s (Mail-SpamAssassin-4.0.0.tar.gz) = fdcc278214de88b9796e678b5902ded5100e2c30dbb5725c4b5aea027980e340
-SHA512 (Mail-SpamAssassin-4.0.0.tar.gz) = db8e5d0249d9fabfa89bc4c7309a7eafd103ae07617ed9bd32e6b35473c5efc05b1a913b4a3d4bb0ff19093400e3510ae602bf9e96290c63e7946a1d0df6de47
-Size (Mail-SpamAssassin-4.0.0.tar.gz) = 6779828 bytes
+BLAKE2s (Mail-SpamAssassin-4.0.1.tar.gz) = f51acb74059a28b6fe88d0b83cf4dd90d2c8328717280bb8893d690804cfd43f
+SHA512 (Mail-SpamAssassin-4.0.1.tar.gz) = 7ac2d789d8744dfe37f647013871e293de50cfcd792029956eb6cea8e51343aad135398bd91867c3c21a68e5fb6330bd6b38a04b794a24449a59287b46d4ac70
+Size (Mail-SpamAssassin-4.0.1.tar.gz) = 6789832 bytes
 BLAKE2s (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = f69d64dbe6ac98e556013540cf61889b8013dbca890577a1142a4ef6f5d33a5f
 SHA512 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 8ff0e68e18dc52a88fec83239bb9dc3a1d34f2dcb4c03cd6c566b97fa91242e3c8d006612aeb4df0acf43929eaaa59d542eb5cf904498343adf5eadefcb89255
 Size (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 355737 bytes
 BLAKE2s (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc) = 445aee22649a330357df398cd0694535cd09e83abbaf8f3d338de5f842ed8160
 SHA512 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc) = 517dbf83b4cf984036cb7cbf92a290ea0c8eea1da87f80d202275e71d2823b7b2eed4efff2f71742ca28090d355a690346f1bf97cfc15a3ea26a6d52792b1882
 Size (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc) = 833 bytes
-SHA1 (patch-Makefile.PL) = f190b064069506aa9afb1b6ecd8affea78104699
+SHA1 (patch-Makefile.PL) = aa33d0062e1f63b4ba1b7a18b404ec602bb15348
 SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0
 SHA1 (patch-ae) = e6e83c1de1002b8db647779d17740e67103b69d8
-SHA1 (patch-sa-update) = bf19da673a44c1016692e8978b612067c9c071eb
+SHA1 (patch-sa-update) = dd9a5da8dd62ced920035f39c59e0e866174cc7f
 SHA1 (patch-spamc_libspamc.c) = 6e634b5e4e795bd1e2bddbe4b192e2826de8ba5a
 SHA1 (patch-spamd_netbsd-rc-script.sh) = 192fc1876ee30a4475c0efd9be6340e87d9fa2f4

Index: pkgsrc/mail/spamassassin/patches/patch-Makefile.PL
diff -u pkgsrc/mail/spamassassin/patches/patch-Makefile.PL:1.7 pkgsrc/mail/spamassassin/patches/patch-Makefile.PL:1.8
--- pkgsrc/mail/spamassassin/patches/patch-Makefile.PL:1.7	Sat Dec 17 14:29:33 2022
+++ pkgsrc/mail/spamassassin/patches/patch-Makefile.PL	Sat Mar 30 14:22:33 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.PL,v 1.7 2022/12/17 14:29:33 gdt Exp $
+$NetBSD: patch-Makefile.PL,v 1.8 2024/03/30 14:22:33 gdt Exp $
 
   - enable build of qmail-spamc
   - some files (local.cf, *.pre) are managed by pkgsrc, disable
     their installation.
   - pkgsrc creates B_DATADIR, so there is no need to re-set permissions
 
---- Makefile.PL.orig	2022-12-06 23:27:28.000000000 +0000
+--- Makefile.PL.orig	2024-03-26 04:52:15.000000000 +0000
 +++ Makefile.PL
 @@ -134,6 +134,7 @@ my %makefile = (
        'spamassassin.raw' => 'spamassassin',
@@ -15,7 +15,7 @@ $NetBSD: patch-Makefile.PL,v 1.7 2022/12
        'sa-compile.raw'   => 'sa-compile',
        'sa-awl.raw'       => 'sa-awl',
        'sa-check_spamd.raw' => 'sa-check_spamd',
-@@ -1150,23 +1151,25 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
+@@ -1151,24 +1152,26 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
  
  conf__install:
  	-$(MKPATH) $(B_CONFDIR)
@@ -30,6 +30,7 @@ $NetBSD: patch-Makefile.PL,v 1.7 2022/12
 -	$(PERL) -MFile::Copy -e "copy(q[rules/v342.pre], q[$(B_CONFDIR)/v342.pre]) unless -f q[$(B_CONFDIR)/v342.pre]"
 -	$(PERL) -MFile::Copy -e "copy(q[rules/v343.pre], q[$(B_CONFDIR)/v343.pre]) unless -f q[$(B_CONFDIR)/v343.pre]"
 -	$(PERL) -MFile::Copy -e "copy(q[rules/v400.pre], q[$(B_CONFDIR)/v400.pre]) unless -f q[$(B_CONFDIR)/v400.pre]"
+-	$(PERL) -MFile::Copy -e "copy(q[rules/v401.pre], q[$(B_CONFDIR)/v401.pre]) unless -f q[$(B_CONFDIR)/v401.pre]"
 +	# manage local.cf and *.pre through pkgsrc .mk files
 +	# $(PERL) -MFile::Copy -e "copy(q[rules/local.cf], q[$(B_CONFDIR)/local.cf]) unless -f q[$(B_CONFDIR)/local.cf]"
 +	# $(PERL) -MFile::Copy -e "copy(q[rules/init.pre], q[$(B_CONFDIR)/init.pre]) unless -f q[$(B_CONFDIR)/init.pre]"
@@ -42,6 +43,7 @@ $NetBSD: patch-Makefile.PL,v 1.7 2022/12
 +	# $(PERL) -MFile::Copy -e "copy(q[rules/v342.pre], q[$(B_CONFDIR)/v342.pre]) unless -f q[$(B_CONFDIR)/v342.pre]"
 +	# $(PERL) -MFile::Copy -e "copy(q[rules/v343.pre], q[$(B_CONFDIR)/v343.pre]) unless -f q[$(B_CONFDIR)/v343.pre]"
 +	# $(PERL) -MFile::Copy -e "copy(q[rules/v400.pre], q[$(B_CONFDIR)/v400.pre]) unless -f q[$(B_CONFDIR)/v400.pre]"
++	# $(PERL) -MFile::Copy -e "copy(q[rules/v401.pre], q[$(B_CONFDIR)/v401.pre]) unless -f q[$(B_CONFDIR)/v401.pre]"
  
  data__install:
  	-$(MKPATH) $(B_DATADIR)
Index: pkgsrc/mail/spamassassin/patches/patch-sa-update
diff -u pkgsrc/mail/spamassassin/patches/patch-sa-update:1.7 pkgsrc/mail/spamassassin/patches/patch-sa-update:1.8
--- pkgsrc/mail/spamassassin/patches/patch-sa-update:1.7	Tue Aug 15 10:20:00 2023
+++ pkgsrc/mail/spamassassin/patches/patch-sa-update	Sat Mar 30 14:22:33 2024
@@ -1,13 +1,10 @@
-$NetBSD: patch-sa-update,v 1.7 2023/08/15 10:20:00 abs Exp $
+$NetBSD: patch-sa-update,v 1.8 2024/03/30 14:22:33 gdt Exp $
 
 Prepare for substitution.
 
-Plus switch from rdatastr to rdstring to avoid deprecated warning
-https://svn.apache.org/viewvc?view=revision&revision=1910601
-
---- sa-update.raw.orig	2022-12-14 06:03:27.000000000 +0000
+--- sa-update.raw.orig	2024-03-26 04:52:25.000000000 +0000
 +++ sa-update.raw
-@@ -361,10 +361,10 @@ my $GPGPath;
+@@ -362,10 +362,10 @@ my $GPGPath;
  if ($GPG_ENABLED || $opt{'import'}) {
    # find GPG in the PATH
    # bug 4958: for *NIX it's "gpg", in Windows it's "gpg.exe"
@@ -20,16 +17,7 @@ https://svn.apache.org/viewvc?view=revis
      dbg("gpg: found $GPGPath");
  
      # bug 5030: if GPGPath has a space, put it in quotes
-@@ -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))
-@@ -1628,10 +1628,8 @@ sub http_get {
+@@ -1629,10 +1629,8 @@ sub http_get {
        }
      }
    } else {


--_----------=_171180855353360--