Sat Mar 30 14:22:33 2024 UTC (69d)
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)


(gdt)
diff -r1.151 -r1.152 pkgsrc/mail/spamassassin/Makefile
diff -r1.82 -r1.83 pkgsrc/mail/spamassassin/distinfo
diff -r1.7 -r1.8 pkgsrc/mail/spamassassin/patches/patch-Makefile.PL
diff -r1.7 -r1.8 pkgsrc/mail/spamassassin/patches/patch-sa-update
cvs diff -r1.151 -r1.152 pkgsrc/mail/spamassassin/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/Makefile 2023/10/24 22:09:50 1.151
+++ pkgsrc/mail/spamassassin/Makefile 2024/03/30 14:22:33 1.152
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: Makefile,v 1.151 2023/10/24 22:09:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.152 2024/03/30 14:22:33 gdt Exp $
2 2
3VERSION= 4.0.0 3VERSION= 4.0.1
4DISTNAME= Mail-SpamAssassin-${VERSION} 4DISTNAME= Mail-SpamAssassin-${VERSION}
5PKGNAME= spamassassin-${VERSION} 5PKGNAME= spamassassin-${VERSION}
6PKGREVISION= 3 
7CATEGORIES= mail perl5 6CATEGORIES= mail perl5
8MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} 7MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10DISTFILES+= ${RULESARCHIVE} 9DISTFILES+= ${RULESARCHIVE}
11DISTFILES+= ${RULESARCHIVEASC} 10DISTFILES+= ${RULESARCHIVEASC}
12#DISTFILES+= ${RULESARCHIVESHA} 11#DISTFILES+= ${RULESARCHIVESHA}
13EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 12EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
14 13
15MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= gdt@NetBSD.org
16HOMEPAGE= https://spamassassin.apache.org/ 15HOMEPAGE= https://spamassassin.apache.org/
17COMMENT= Mail filter to identify spam 16COMMENT= Mail filter to identify spam
18LICENSE= apache-2.0 17LICENSE= apache-2.0
19 18
20.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
21 20
22SMF_METHODS= spamassassin 21SMF_METHODS= spamassassin
23 22
24# The RULESARCHIVE path is taken from the link on the Download page 23# The RULESARCHIVE path is taken from the link on the Download page
25# reachable from $HOMEPAGE. 24# reachable from $HOMEPAGE.
26RULESARCHIVE= Mail-SpamAssassin-rules-4.0.0.r1905950.tgz 25RULESARCHIVE= Mail-SpamAssassin-rules-4.0.0.r1905950.tgz
27RULESARCHIVEASC= ${RULESARCHIVE}.asc 26RULESARCHIVEASC= ${RULESARCHIVE}.asc
28#RULESARCHIVESHA= ${RULESARCHIVE}.sha1 27#RULESARCHIVESHA= ${RULESARCHIVE}.sha1
cvs diff -r1.82 -r1.83 pkgsrc/mail/spamassassin/distinfo (expand / switch to unified diff)

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

--- pkgsrc/mail/spamassassin/patches/patch-Makefile.PL 2022/12/17 14:29:33 1.7
+++ pkgsrc/mail/spamassassin/patches/patch-Makefile.PL 2024/03/30 14:22:33 1.8
@@ -1,55 +1,57 @@ @@ -1,55 +1,57 @@
1$NetBSD: patch-Makefile.PL,v 1.7 2022/12/17 14:29:33 gdt Exp $ 1$NetBSD: patch-Makefile.PL,v 1.8 2024/03/30 14:22:33 gdt Exp $
2 2
3 - enable build of qmail-spamc 3 - enable build of qmail-spamc
4 - some files (local.cf, *.pre) are managed by pkgsrc, disable 4 - some files (local.cf, *.pre) are managed by pkgsrc, disable
5 their installation. 5 their installation.
6 - pkgsrc creates B_DATADIR, so there is no need to re-set permissions 6 - pkgsrc creates B_DATADIR, so there is no need to re-set permissions
7 7
8--- Makefile.PL.orig 2022-12-06 23:27:28.000000000 +0000 8--- Makefile.PL.orig 2024-03-26 04:52:15.000000000 +0000
9+++ Makefile.PL 9+++ Makefile.PL
10@@ -134,6 +134,7 @@ my %makefile = ( 10@@ -134,6 +134,7 @@ my %makefile = (
11 'spamassassin.raw' => 'spamassassin', 11 'spamassassin.raw' => 'spamassassin',
12 'sa-learn.raw' => 'sa-learn', 12 'sa-learn.raw' => 'sa-learn',
13 'sa-update.raw' => 'sa-update', 13 'sa-update.raw' => 'sa-update',
14+ 'spamc/qmail-spamc.c' => 'spamc/qmail-spamc$(EXE_EXT)', 14+ 'spamc/qmail-spamc.c' => 'spamc/qmail-spamc$(EXE_EXT)',
15 'sa-compile.raw' => 'sa-compile', 15 'sa-compile.raw' => 'sa-compile',
16 'sa-awl.raw' => 'sa-awl', 16 'sa-awl.raw' => 'sa-awl',
17 'sa-check_spamd.raw' => 'sa-check_spamd', 17 'sa-check_spamd.raw' => 'sa-check_spamd',
18@@ -1150,23 +1151,25 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail 18@@ -1151,24 +1152,26 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
19  19
20 conf__install: 20 conf__install:
21 -$(MKPATH) $(B_CONFDIR) 21 -$(MKPATH) $(B_CONFDIR)
22- $(PERL) -MFile::Copy -e "copy(q[rules/local.cf], q[$(B_CONFDIR)/local.cf]) unless -f q[$(B_CONFDIR)/local.cf]" 22- $(PERL) -MFile::Copy -e "copy(q[rules/local.cf], q[$(B_CONFDIR)/local.cf]) unless -f q[$(B_CONFDIR)/local.cf]"
23- $(PERL) -MFile::Copy -e "copy(q[rules/init.pre], q[$(B_CONFDIR)/init.pre]) unless -f q[$(B_CONFDIR)/init.pre]" 23- $(PERL) -MFile::Copy -e "copy(q[rules/init.pre], q[$(B_CONFDIR)/init.pre]) unless -f q[$(B_CONFDIR)/init.pre]"
24- $(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q[$(B_CONFDIR)/v310.pre]) unless -f q[$(B_CONFDIR)/v310.pre]" 24- $(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q[$(B_CONFDIR)/v310.pre]) unless -f q[$(B_CONFDIR)/v310.pre]"
25- $(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q[$(B_CONFDIR)/v312.pre]) unless -f q[$(B_CONFDIR)/v312.pre]" 25- $(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q[$(B_CONFDIR)/v312.pre]) unless -f q[$(B_CONFDIR)/v312.pre]"
26- $(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q[$(B_CONFDIR)/v320.pre]) unless -f q[$(B_CONFDIR)/v320.pre]" 26- $(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q[$(B_CONFDIR)/v320.pre]) unless -f q[$(B_CONFDIR)/v320.pre]"
27- $(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q[$(B_CONFDIR)/v330.pre]) unless -f q[$(B_CONFDIR)/v330.pre]" 27- $(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q[$(B_CONFDIR)/v330.pre]) unless -f q[$(B_CONFDIR)/v330.pre]"
28- $(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q[$(B_CONFDIR)/v340.pre]) unless -f q[$(B_CONFDIR)/v340.pre]" 28- $(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q[$(B_CONFDIR)/v340.pre]) unless -f q[$(B_CONFDIR)/v340.pre]"
29- $(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q[$(B_CONFDIR)/v341.pre]) unless -f q[$(B_CONFDIR)/v341.pre]" 29- $(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q[$(B_CONFDIR)/v341.pre]) unless -f q[$(B_CONFDIR)/v341.pre]"
30- $(PERL) -MFile::Copy -e "copy(q[rules/v342.pre], q[$(B_CONFDIR)/v342.pre]) unless -f q[$(B_CONFDIR)/v342.pre]" 30- $(PERL) -MFile::Copy -e "copy(q[rules/v342.pre], q[$(B_CONFDIR)/v342.pre]) unless -f q[$(B_CONFDIR)/v342.pre]"
31- $(PERL) -MFile::Copy -e "copy(q[rules/v343.pre], q[$(B_CONFDIR)/v343.pre]) unless -f q[$(B_CONFDIR)/v343.pre]" 31- $(PERL) -MFile::Copy -e "copy(q[rules/v343.pre], q[$(B_CONFDIR)/v343.pre]) unless -f q[$(B_CONFDIR)/v343.pre]"
32- $(PERL) -MFile::Copy -e "copy(q[rules/v400.pre], q[$(B_CONFDIR)/v400.pre]) unless -f q[$(B_CONFDIR)/v400.pre]" 32- $(PERL) -MFile::Copy -e "copy(q[rules/v400.pre], q[$(B_CONFDIR)/v400.pre]) unless -f q[$(B_CONFDIR)/v400.pre]"
 33- $(PERL) -MFile::Copy -e "copy(q[rules/v401.pre], q[$(B_CONFDIR)/v401.pre]) unless -f q[$(B_CONFDIR)/v401.pre]"
33+ # manage local.cf and *.pre through pkgsrc .mk files 34+ # manage local.cf and *.pre through pkgsrc .mk files
34+ # $(PERL) -MFile::Copy -e "copy(q[rules/local.cf], q[$(B_CONFDIR)/local.cf]) unless -f q[$(B_CONFDIR)/local.cf]" 35+ # $(PERL) -MFile::Copy -e "copy(q[rules/local.cf], q[$(B_CONFDIR)/local.cf]) unless -f q[$(B_CONFDIR)/local.cf]"
35+ # $(PERL) -MFile::Copy -e "copy(q[rules/init.pre], q[$(B_CONFDIR)/init.pre]) unless -f q[$(B_CONFDIR)/init.pre]" 36+ # $(PERL) -MFile::Copy -e "copy(q[rules/init.pre], q[$(B_CONFDIR)/init.pre]) unless -f q[$(B_CONFDIR)/init.pre]"
36+ # $(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q[$(B_CONFDIR)/v310.pre]) unless -f q[$(B_CONFDIR)/v310.pre]" 37+ # $(PERL) -MFile::Copy -e "copy(q[rules/v310.pre], q[$(B_CONFDIR)/v310.pre]) unless -f q[$(B_CONFDIR)/v310.pre]"
37+ # $(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q[$(B_CONFDIR)/v312.pre]) unless -f q[$(B_CONFDIR)/v312.pre]" 38+ # $(PERL) -MFile::Copy -e "copy(q[rules/v312.pre], q[$(B_CONFDIR)/v312.pre]) unless -f q[$(B_CONFDIR)/v312.pre]"
38+ # $(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q[$(B_CONFDIR)/v320.pre]) unless -f q[$(B_CONFDIR)/v320.pre]" 39+ # $(PERL) -MFile::Copy -e "copy(q[rules/v320.pre], q[$(B_CONFDIR)/v320.pre]) unless -f q[$(B_CONFDIR)/v320.pre]"
39+ # $(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q[$(B_CONFDIR)/v330.pre]) unless -f q[$(B_CONFDIR)/v330.pre]" 40+ # $(PERL) -MFile::Copy -e "copy(q[rules/v330.pre], q[$(B_CONFDIR)/v330.pre]) unless -f q[$(B_CONFDIR)/v330.pre]"
40+ # $(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q[$(B_CONFDIR)/v340.pre]) unless -f q[$(B_CONFDIR)/v340.pre]" 41+ # $(PERL) -MFile::Copy -e "copy(q[rules/v340.pre], q[$(B_CONFDIR)/v340.pre]) unless -f q[$(B_CONFDIR)/v340.pre]"
41+ # $(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q[$(B_CONFDIR)/v341.pre]) unless -f q[$(B_CONFDIR)/v341.pre]" 42+ # $(PERL) -MFile::Copy -e "copy(q[rules/v341.pre], q[$(B_CONFDIR)/v341.pre]) unless -f q[$(B_CONFDIR)/v341.pre]"
42+ # $(PERL) -MFile::Copy -e "copy(q[rules/v342.pre], q[$(B_CONFDIR)/v342.pre]) unless -f q[$(B_CONFDIR)/v342.pre]" 43+ # $(PERL) -MFile::Copy -e "copy(q[rules/v342.pre], q[$(B_CONFDIR)/v342.pre]) unless -f q[$(B_CONFDIR)/v342.pre]"
43+ # $(PERL) -MFile::Copy -e "copy(q[rules/v343.pre], q[$(B_CONFDIR)/v343.pre]) unless -f q[$(B_CONFDIR)/v343.pre]" 44+ # $(PERL) -MFile::Copy -e "copy(q[rules/v343.pre], q[$(B_CONFDIR)/v343.pre]) unless -f q[$(B_CONFDIR)/v343.pre]"
44+ # $(PERL) -MFile::Copy -e "copy(q[rules/v400.pre], q[$(B_CONFDIR)/v400.pre]) unless -f q[$(B_CONFDIR)/v400.pre]" 45+ # $(PERL) -MFile::Copy -e "copy(q[rules/v400.pre], q[$(B_CONFDIR)/v400.pre]) unless -f q[$(B_CONFDIR)/v400.pre]"
 46+ # $(PERL) -MFile::Copy -e "copy(q[rules/v401.pre], q[$(B_CONFDIR)/v401.pre]) unless -f q[$(B_CONFDIR)/v401.pre]"
45  47
46 data__install: 48 data__install:
47 -$(MKPATH) $(B_DATADIR) 49 -$(MKPATH) $(B_DATADIR)
48 $(PERL) -e "map unlink, <$(B_DATADIR)/*>" 50 $(PERL) -e "map unlink, <$(B_DATADIR)/*>"
49 $(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(DATAFILES) 51 $(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(DATAFILES)
50- $(CHMOD) $(PERM_RWX) $(B_DATADIR) 52- $(CHMOD) $(PERM_RWX) $(B_DATADIR)
51+ # no change of directory created by pkgsrc 53+ # no change of directory created by pkgsrc
52+ # $(CHMOD) $(PERM_RWX) $(B_DATADIR) 54+ # $(CHMOD) $(PERM_RWX) $(B_DATADIR)
53  55
54 text_html_doc: made-doc-stamp 56 text_html_doc: made-doc-stamp
55 $(NOOP) 57 $(NOOP)
cvs diff -r1.7 -r1.8 pkgsrc/mail/spamassassin/patches/patch-sa-update (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/patches/patch-sa-update 2023/08/15 10:20:00 1.7
+++ pkgsrc/mail/spamassassin/patches/patch-sa-update 2024/03/30 14:22:33 1.8
@@ -1,44 +1,32 @@ @@ -1,44 +1,32 @@
1$NetBSD: patch-sa-update,v 1.7 2023/08/15 10:20:00 abs Exp $ 1$NetBSD: patch-sa-update,v 1.8 2024/03/30 14:22:33 gdt Exp $
2 2
3Prepare for substitution. 3Prepare for substitution.
4 4
5Plus switch from rdatastr to rdstring to avoid deprecated warning 5--- sa-update.raw.orig 2024-03-26 04:52:25.000000000 +0000
6https://svn.apache.org/viewvc?view=revision&revision=1910601 
7 
8--- sa-update.raw.orig 2022-12-14 06:03:27.000000000 +0000 
9+++ sa-update.raw 6+++ sa-update.raw
10@@ -361,10 +361,10 @@ my $GPGPath; 7@@ -362,10 +362,10 @@ my $GPGPath;
11 if ($GPG_ENABLED || $opt{'import'}) { 8 if ($GPG_ENABLED || $opt{'import'}) {
12 # find GPG in the PATH 9 # find GPG in the PATH
13 # bug 4958: for *NIX it's "gpg", in Windows it's "gpg.exe" 10 # bug 4958: for *NIX it's "gpg", in Windows it's "gpg.exe"
14- $GPGPath = 'gpg' . $Config{_exe}; 11- $GPGPath = 'gpg' . $Config{_exe};
15+ $GPGPath = '@GPGPATH@' . $Config{_exe}; 12+ $GPGPath = '@GPGPATH@' . $Config{_exe};
16 dbg("gpg: Searching for '$GPGPath'"); 13 dbg("gpg: Searching for '$GPGPath'");
17  14
18- if ($GPGPath = Mail::SpamAssassin::Util::find_executable_in_env_path($GPGPath)) { 15- if ($GPGPath = Mail::SpamAssassin::Util::find_executable_in_env_path($GPGPath)) {
19+ if (-f $GPGPath) { 16+ if (-f $GPGPath) {
20 dbg("gpg: found $GPGPath"); 17 dbg("gpg: found $GPGPath");
21  18
22 # bug 5030: if GPGPath has a space, put it in quotes 19 # bug 5030: if GPGPath has a space, put it in quotes
23@@ -1458,7 +1458,7 @@ sub do_dns_query { 20@@ -1629,10 +1629,8 @@ sub http_get {
24 next if !$rr; # no answer records, only rcode 
25 next if $rr->type ne $rr_type; 
26 # scalar context! 
27- my $text = $rr->UNIVERSAL::can('txtdata') ? $rr->txtdata : $rr->rdatastr; 
28+ my $text = $rr->UNIVERSAL::can('txtdata') ? $rr->txtdata : $rr->rdstring; 
29 push(@result,$text) if defined $text && $text ne ''; 
30 } 
31 printf("DNS %s query: %s -> %s\n", $rr_type, $query, join(", ",@result)) 
32@@ -1628,10 +1628,8 @@ sub http_get { 
33 } 21 }
34 } 22 }
35 } else { 23 } else {
36- foreach my $try_prog ('curl', 'wget', 'fetch') { 24- foreach my $try_prog ('curl', 'wget', 'fetch') {
37- $cmd = Mail::SpamAssassin::Util::find_executable_in_env_path($try_prog); 25- $cmd = Mail::SpamAssassin::Util::find_executable_in_env_path($try_prog);
38- if (defined $cmd && $cmd ne '') { $ext_prog = $try_prog; last } 26- if (defined $cmd && $cmd ne '') { $ext_prog = $try_prog; last }
39- } 27- }
40+ $ext_prog = '@SA_UPDATE_FETCH_PROG@'; 28+ $ext_prog = '@SA_UPDATE_FETCH_PROG@';
41+ $cmd = '@SA_UPDATE_FETCH_CMD@'; 29+ $cmd = '@SA_UPDATE_FETCH_CMD@';
42 } 30 }
43  31
44 if (defined $ext_prog && $ext_prog eq 'curl') { 32 if (defined $ext_prog && $ext_prog eq 'curl') {