Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BA9D284E87 for ; Tue, 15 Aug 2023 10:20:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id g5FukDEB1hCY for ; Tue, 15 Aug 2023 10:20:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 1926084D52 for ; Tue, 15 Aug 2023 10:20:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 11B68FBDB; Tue, 15 Aug 2023 10:20:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1692094801207330" MIME-Version: 1.0 Date: Tue, 15 Aug 2023 10:20:01 +0000 From: "David Brownlee" Subject: CVS commit: pkgsrc/mail/spamassassin To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: abs@netbsd.org X-Mailer: log_accum Message-Id: <20230815102001.11B68FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1692094801207330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: abs Date: Tue Aug 15 10:20:00 UTC 2023 Modified Files: pkgsrc/mail/spamassassin: Makefile distinfo pkgsrc/mail/spamassassin/patches: patch-sa-update Log Message: Avoid deprecated warning from cron Patch from upstream, bump pkgrevision To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 pkgsrc/mail/spamassassin/Makefile cvs rdiff -u -r1.81 -r1.82 pkgsrc/mail/spamassassin/distinfo cvs rdiff -u -r1.6 -r1.7 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. --_----------=_1692094801207330 Content-Disposition: inline Content-Length: 3573 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.149 pkgsrc/mail/spamassassin/Makefile:1.150 --- pkgsrc/mail/spamassassin/Makefile:1.149 Thu Jul 6 09:40:50 2023 +++ pkgsrc/mail/spamassassin/Makefile Tue Aug 15 10:20:00 2023 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.149 2023/07/06 09:40:50 wiz Exp $ +# $NetBSD: Makefile,v 1.150 2023/08/15 10:20:00 abs Exp $ VERSION= 4.0.0 DISTNAME= Mail-SpamAssassin-${VERSION} PKGNAME= spamassassin-${VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: pkgsrc/mail/spamassassin/distinfo diff -u pkgsrc/mail/spamassassin/distinfo:1.81 pkgsrc/mail/spamassassin/distinfo:1.82 --- pkgsrc/mail/spamassassin/distinfo:1.81 Sat Dec 17 14:29:33 2022 +++ pkgsrc/mail/spamassassin/distinfo Tue Aug 15 10:20:00 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.81 2022/12/17 14:29:33 gdt Exp $ +$NetBSD: distinfo,v 1.82 2023/08/15 10:20:00 abs Exp $ BLAKE2s (Mail-SpamAssassin-4.0.0.tar.gz) = fdcc278214de88b9796e678b5902ded5100e2c30dbb5725c4b5aea027980e340 SHA512 (Mail-SpamAssassin-4.0.0.tar.gz) = db8e5d0249d9fabfa89bc4c7309a7eafd103ae07617ed9bd32e6b35473c5efc05b1a913b4a3d4bb0ff19093400e3510ae602bf9e96290c63e7946a1d0df6de47 @@ -12,6 +12,6 @@ Size (Mail-SpamAssassin-rules-4.0.0.r190 SHA1 (patch-Makefile.PL) = f190b064069506aa9afb1b6ecd8affea78104699 SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0 SHA1 (patch-ae) = e6e83c1de1002b8db647779d17740e67103b69d8 -SHA1 (patch-sa-update) = 0cac6f2315db8f80cd313473e8d141b49edb791f +SHA1 (patch-sa-update) = bf19da673a44c1016692e8978b612067c9c071eb SHA1 (patch-spamc_libspamc.c) = 6e634b5e4e795bd1e2bddbe4b192e2826de8ba5a SHA1 (patch-spamd_netbsd-rc-script.sh) = 192fc1876ee30a4475c0efd9be6340e87d9fa2f4 Index: pkgsrc/mail/spamassassin/patches/patch-sa-update diff -u pkgsrc/mail/spamassassin/patches/patch-sa-update:1.6 pkgsrc/mail/spamassassin/patches/patch-sa-update:1.7 --- pkgsrc/mail/spamassassin/patches/patch-sa-update:1.6 Mon Mar 23 18:45:47 2020 +++ pkgsrc/mail/spamassassin/patches/patch-sa-update Tue Aug 15 10:20:00 2023 @@ -1,10 +1,13 @@ -$NetBSD: patch-sa-update,v 1.6 2020/03/23 18:45:47 gdt Exp $ +$NetBSD: patch-sa-update,v 1.7 2023/08/15 10:20:00 abs Exp $ Prepare for substitution. ---- sa-update.raw.orig 2020-01-25 02:51:16.000000000 +0000 +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 -@@ -357,10 +357,10 @@ my $GPGPath; +@@ -361,10 +361,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,7 +20,16 @@ Prepare for substitution. dbg("gpg: found $GPGPath"); # bug 5030: if GPGPath has a space, put it in quotes -@@ -1570,10 +1570,8 @@ sub http_get { +@@ -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 { } } } else { --_----------=_1692094801207330--