Received: by mail.netbsd.org (Postfix, from userid 605) id 6FCD284D63; Mon, 23 Mar 2020 18:45:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ED91A84CD2 for ; Mon, 23 Mar 2020 18:45:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 998KVgMGUpSq for ; Mon, 23 Mar 2020 18:45:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id F069C84C8B for ; Mon, 23 Mar 2020 18:45:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EE25FFB27; Mon, 23 Mar 2020 18:45:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1584989147263740" MIME-Version: 1.0 Date: Mon, 23 Mar 2020 18:45:47 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/mail/spamassassin To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20200323184547.EE25FFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1584989147263740 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Mon Mar 23 18:45:47 UTC 2020 Modified Files: pkgsrc/mail/spamassassin: Makefile distinfo pkgsrc/mail/spamassassin/patches: patch-Makefile.PL patch-sa-update Log Message: mail/spamassassin: Update to 3.4.4 This is a micro update (actually 2) with security fixes, and is trivial except for hand-applying some patch hunks that have textual but not semantic conflicts. The upstream announcement hints at minor new features and a new plugin, but does not explain. (There is no NEWS file.) To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 pkgsrc/mail/spamassassin/Makefile cvs rdiff -u -r1.74 -r1.75 pkgsrc/mail/spamassassin/distinfo cvs rdiff -u -r1.5 -r1.6 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. --_----------=_1584989147263740 Content-Disposition: inline Content-Length: 11743 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.140 pkgsrc/mail/spamassassin/Makefile:1.141 --- pkgsrc/mail/spamassassin/Makefile:1.140 Sat Mar 21 15:36:32 2020 +++ pkgsrc/mail/spamassassin/Makefile Mon Mar 23 18:45:47 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.140 2020/03/21 15:36:32 taca Exp $ +# $NetBSD: Makefile,v 1.141 2020/03/23 18:45:47 gdt Exp $ -DISTNAME= Mail-SpamAssassin-3.4.2 -PKGNAME= spamassassin-3.4.2 -PKGREVISION= 3 +VERSION= 3.4.4 +DISTNAME= Mail-SpamAssassin-${VERSION} +PKGNAME= spamassassin-${VERSION} CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -20,7 +20,9 @@ LICENSE= apache-2.0 SMF_METHODS= spamassassin -RULESARCHIVE= Mail-SpamAssassin-rules-3.4.2.r1840640.tgz +# The RULESARCHIVE path is taken from the link on the Download page +# reachable from $HOMEPAGE. +RULESARCHIVE= Mail-SpamAssassin-rules-3.4.4.r1873061.tgz #RULESARCHIVEASC= ${RULESARCHIVE}.asc #RULESARCHIVESHA= ${RULESARCHIVE}.sha1 FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE} Index: pkgsrc/mail/spamassassin/distinfo diff -u pkgsrc/mail/spamassassin/distinfo:1.74 pkgsrc/mail/spamassassin/distinfo:1.75 --- pkgsrc/mail/spamassassin/distinfo:1.74 Sat Mar 21 15:36:32 2020 +++ pkgsrc/mail/spamassassin/distinfo Mon Mar 23 18:45:47 2020 @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.74 2020/03/21 15:36:32 taca Exp $ +$NetBSD: distinfo,v 1.75 2020/03/23 18:45:47 gdt Exp $ -SHA1 (Mail-SpamAssassin-3.4.2.tar.gz) = f24c471d6594f60f1a1146a11bcb1c2f5215de03 -RMD160 (Mail-SpamAssassin-3.4.2.tar.gz) = dd3cbd744a642478d5773e2fb524461b2cd864e3 -SHA512 (Mail-SpamAssassin-3.4.2.tar.gz) = 85e3d78bb885ad1d0bf2066d1bc919d6ad5e9f86795069397e7c28cc1ba02870566ec014c08c81f68e7ed03b7f60d2de0b9730b3415b35d848abde2c8920a28f -Size (Mail-SpamAssassin-3.4.2.tar.gz) = 3185452 bytes -SHA1 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = c93006e1572297f816a0e186a98cbbae246a4945 -RMD160 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = d1f5d207176e51e37c346b2b6ce893b50341011d -SHA512 (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 38b5f4dc6e6776937e787123c265ecd9a0a2f60aca1b57d6ed4a8f78cf81550478eddd0829b1255e9e8ce64421e06cc13ae82f1a597e893b65f0d07ba8c53a7f -Size (Mail-SpamAssassin-rules-3.4.2.r1840640.tgz) = 284758 bytes -SHA1 (patch-Makefile.PL) = f598b173e73130b55714413d5fc55e29ca6a3c4f +SHA1 (Mail-SpamAssassin-3.4.4.tar.gz) = 98ce46e464a3dd9d3bf83b8744eebcb109292a6d +RMD160 (Mail-SpamAssassin-3.4.4.tar.gz) = 414fdfcb544afd44f3e17dbced145f26fe827e2e +SHA512 (Mail-SpamAssassin-3.4.4.tar.gz) = b6efa1c733ddf810b189ec69445faeae6488ee2671f87f56b49ec3bf85690bf7950aa5ce251c1f1371b2bbe4fb88dbce0a162c9a24a48ed5e6584f9019611552 +Size (Mail-SpamAssassin-3.4.4.tar.gz) = 3274482 bytes +SHA1 (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = ee022f1cc18a66d49c1954936c70c36049c37dcf +RMD160 (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = fb8a8c71dbd6621ca7044600bf9a52f9398b6fcb +SHA512 (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = cc2f6949db4662cdcaf5dcef922e69d18320a591deb7fb98c1fb729d91d37f5164052ab6cd2e294657334874fbfc0cccdefc750910e0453cb8da0b3f263b3ede +Size (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = 315930 bytes +SHA1 (patch-Makefile.PL) = bcf48afe3adce57fbe4ff0de583ca23bf5177aab SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0 SHA1 (patch-ae) = e6e83c1de1002b8db647779d17740e67103b69d8 -SHA1 (patch-sa-update) = 59cba1287051042fc7f510f5e5ef462e2ee8d034 +SHA1 (patch-sa-update) = 0cac6f2315db8f80cd313473e8d141b49edb791f SHA1 (patch-spamc_libspamc.c) = 757b845df445414d4ba0c2fb039dbc6d9e68b85f 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.5 pkgsrc/mail/spamassassin/patches/patch-Makefile.PL:1.6 --- pkgsrc/mail/spamassassin/patches/patch-Makefile.PL:1.5 Sat Mar 21 15:36:33 2020 +++ pkgsrc/mail/spamassassin/patches/patch-Makefile.PL Mon Mar 23 18:45:47 2020 @@ -1,13 +1,13 @@ -$NetBSD: patch-Makefile.PL,v 1.5 2020/03/21 15:36:33 taca Exp $ +$NetBSD: patch-Makefile.PL,v 1.6 2020/03/23 18:45:47 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 2015-04-28 15:57:01.000000000 -0400 -+++ Makefile.PL 2015-09-09 14:59:06.000000000 -0400 -@@ -139,6 +139,7 @@ +--- Makefile.PL.orig 2020-01-25 02:51:33.000000000 +0000 ++++ Makefile.PL +@@ -139,6 +139,7 @@ my %makefile = ( 'spamassassin.raw' => 'spamassassin', 'sa-learn.raw' => 'sa-learn', 'sa-update.raw' => 'sa-update', @@ -15,33 +15,34 @@ $NetBSD: patch-Makefile.PL,v 1.5 2020/03 'sa-compile.raw' => 'sa-compile', 'sa-awl.raw' => 'sa-awl', 'sa-check_spamd.raw' => 'sa-check_spamd', -@@ -1120,15 +1121,16 @@ +@@ -1120,22 +1121,24 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail conf__install: -$(MKPATH) $(B_CONFDIR) -- $(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}" -- $(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}" -- $(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}" -- $(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}" -- $(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}" -- $(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}" -- $(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q{$(B_CONFDIR)/v341.pre}) unless -f q{$(B_CONFDIR)/v341.pre}" -- $(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/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]" +- $(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q[$(B_CONFDIR)/v310.pre]) unless -f q[$(B_CONFDIR)/v310.pre]" +- $(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q[$(B_CONFDIR)/v312.pre]) unless -f q[$(B_CONFDIR)/v312.pre]" +- $(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q[$(B_CONFDIR)/v320.pre]) unless -f q[$(B_CONFDIR)/v320.pre]" +- $(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q[$(B_CONFDIR)/v330.pre]) unless -f q[$(B_CONFDIR)/v330.pre]" +- $(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q[$(B_CONFDIR)/v340.pre]) unless -f q[$(B_CONFDIR)/v340.pre]" +- $(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q[$(B_CONFDIR)/v341.pre]) unless -f q[$(B_CONFDIR)/v341.pre]" +- $(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]" + # 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}" -+ # $(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}" -+ # $(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}" -+ # $(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}" -+ # $(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q{$(B_CONFDIR)/v330.pre}) unless -f q{$(B_CONFDIR)/v330.pre}" -+ # $(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q{$(B_CONFDIR)/v340.pre}) unless -f q{$(B_CONFDIR)/v340.pre}" -+ # $(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q{$(B_CONFDIR)/v341.pre}) unless -f q{$(B_CONFDIR)/v341.pre}" -+ # $(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/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]" ++ # $(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q[$(B_CONFDIR)/v310.pre]) unless -f q[$(B_CONFDIR)/v310.pre]" ++ # $(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q[$(B_CONFDIR)/v312.pre]) unless -f q[$(B_CONFDIR)/v312.pre]" ++ # $(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q[$(B_CONFDIR)/v320.pre]) unless -f q[$(B_CONFDIR)/v320.pre]" ++ # $(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q[$(B_CONFDIR)/v330.pre]) unless -f q[$(B_CONFDIR)/v330.pre]" ++ # $(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q[$(B_CONFDIR)/v340.pre]) unless -f q[$(B_CONFDIR)/v340.pre]" ++ # $(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q[$(B_CONFDIR)/v341.pre]) unless -f q[$(B_CONFDIR)/v341.pre]" ++ # $(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]" data__install: - -$(MKPATH) $(B_DATADIR) + -$(MKPATH) $(B_DATADIR) $(PERL) -e "map unlink, <$(B_DATADIR)/*>" $(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(DATAFILES) - $(CHMOD) $(PERM_RWX) $(B_DATADIR) Index: pkgsrc/mail/spamassassin/patches/patch-sa-update diff -u pkgsrc/mail/spamassassin/patches/patch-sa-update:1.5 pkgsrc/mail/spamassassin/patches/patch-sa-update:1.6 --- pkgsrc/mail/spamassassin/patches/patch-sa-update:1.5 Sat Mar 21 15:36:33 2020 +++ pkgsrc/mail/spamassassin/patches/patch-sa-update Mon Mar 23 18:45:47 2020 @@ -1,10 +1,10 @@ -$NetBSD: patch-sa-update,v 1.5 2020/03/21 15:36:33 taca Exp $ +$NetBSD: patch-sa-update,v 1.6 2020/03/23 18:45:47 gdt Exp $ Prepare for substitution. ---- sa-update.raw.orig 2014-02-07 08:36:38.000000000 +0000 -+++ sa-update.raw 2014-04-26 13:56:38.000000000 +0100 -@@ -340,10 +340,10 @@ +--- sa-update.raw.orig 2020-01-25 02:51:16.000000000 +0000 ++++ sa-update.raw +@@ -357,10 +357,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" @@ -17,16 +17,16 @@ Prepare for substitution. dbg("gpg: found $GPGPath"); # bug 5030: if GPGPath has a space, put it in quotes -@@ -1459,10 +1459,8 @@ - !$out_fname_exists ? 'new' : $force_reload ? 'replace' : 'update'); - - my($ext_prog, $cmd, @args); -- foreach my $try_prog ('curl', 'wget', 'fetch') { -- $cmd = Mail::SpamAssassin::Util::find_executable_in_env_path($try_prog); -- if (defined $cmd && $cmd ne '') { $ext_prog = $try_prog; last } -- } -+ $ext_prog = '@SA_UPDATE_FETCH_PROG@'; -+ $cmd = '@SA_UPDATE_FETCH_CMD@'; +@@ -1570,10 +1570,8 @@ sub http_get { + } + } + } else { +- foreach my $try_prog ('curl', 'wget', 'fetch') { +- $cmd = Mail::SpamAssassin::Util::find_executable_in_env_path($try_prog); +- if (defined $cmd && $cmd ne '') { $ext_prog = $try_prog; last } +- } ++ $ext_prog = '@SA_UPDATE_FETCH_PROG@'; ++ $cmd = '@SA_UPDATE_FETCH_CMD@'; + } if (defined $ext_prog && $ext_prog eq 'curl') { - push(@args, qw(-s -L -O --remote-time -g --max-redirs 2 --_----------=_1584989147263740--