head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.18 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.16 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.14 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.12 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.10 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.8 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.6 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.8.0.4 pkgsrc-2024Q2-base:1.8 pkgsrc-2024Q1:1.8.0.2 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.7.0.4 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.2 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.6.0.28 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.26 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.24 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.22 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.20 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.18 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.16 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.14 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.12 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.10 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.8 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.6 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.4 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.2 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.3.0.36 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.32 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.30 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.28 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.26 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.24 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.22 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.20 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.18 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.16 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.12 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.10 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.8 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.6 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.4 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.2 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.2.0.14 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.12 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.10 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.8 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.6 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.4 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.2 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.1.0.8 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.6 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.4 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.2; locks; strict; comment @# @; 1.8 date 2024.03.30.14.22.33; author gdt; state Exp; branches; next 1.7; commitid F4j8HxYNgL0AVb4F; 1.7 date 2023.08.15.10.20.00; author abs; state Exp; branches; next 1.6; commitid 020u1slSIFGKVRAE; 1.6 date 2020.03.23.18.45.47; author gdt; state Exp; branches; next 1.5; commitid yY6NybnXHOzGzy1C; 1.5 date 2020.03.21.15.36.33; author taca; state Exp; branches; next 1.4; commitid cjssp0ewO6Q0Bh1C; 1.4 date 2020.03.21.15.29.38; author taca; state Exp; branches; next 1.3; commitid 0CYC85OGTrS4zh1C; 1.3 date 2016.02.05.16.06.09; author prlw1; state Exp; branches; next 1.2; commitid tfRPcLMt8QeWaKTy; 1.2 date 2014.04.26.13.55.10; author tron; state Exp; branches; next 1.1; commitid AEkt5CGzNvrrlcyx; 1.1 date 2013.08.01.10.29.00; author bouyer; state Exp; branches 1.1.2.1; next ; commitid UBeUq594YWuyOJZw; 1.1.2.1 date 2013.08.01.10.29.00; author tron; state dead; branches; next 1.1.2.2; commitid VPMy3rfKnWfPBKZw; 1.1.2.2 date 2013.08.01.12.51.54; author tron; state Exp; branches; next ; commitid VPMy3rfKnWfPBKZw; desc @@ 1.8 log @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) @ text @$NetBSD: patch-sa-update,v 1.7 2023/08/15 10:20:00 abs Exp $ Prepare for substitution. --- sa-update.raw.orig 2024-03-26 04:52:25.000000000 +0000 +++ sa-update.raw @@@@ -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" - $GPGPath = 'gpg' . $Config{_exe}; + $GPGPath = '@@GPGPATH@@' . $Config{_exe}; dbg("gpg: Searching for '$GPGPath'"); - if ($GPGPath = Mail::SpamAssassin::Util::find_executable_in_env_path($GPGPath)) { + if (-f $GPGPath) { dbg("gpg: found $GPGPath"); # bug 5030: if GPGPath has a space, put it in quotes @@@@ -1629,10 +1629,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') { @ 1.7 log @Avoid deprecated warning from cron Patch from upstream, bump pkgrevision @ text @d1 1 a1 1 $NetBSD: patch-sa-update,v 1.6 2020/03/23 18:45:47 gdt Exp $ d5 1 a5 4 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 d7 1 a7 1 @@@@ -361,10 +361,10 @@@@ my $GPGPath; d20 1 a20 10 @@@@ -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 { @ 1.6 log @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.) @ text @d1 1 a1 1 $NetBSD: patch-sa-update,v 1.5 2020/03/21 15:36:33 taca Exp $ d5 4 a8 1 --- sa-update.raw.orig 2020-01-25 02:51:16.000000000 +0000 d10 1 a10 1 @@@@ -357,10 +357,10 @@@@ my $GPGPath; d23 10 a32 1 @@@@ -1570,10 +1570,8 @@@@ sub http_get { @ 1.5 log @mail/spamassassin: revert previous accidential commit Revert previous accidential commit by my mistake. @ text @d1 1 a1 1 $NetBSD: patch-sa-update,v 1.4 2020/03/21 15:29:38 taca Exp $ d5 3 a7 3 --- 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 @@@@ d20 11 a30 10 @@@@ -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@@'; a32 1 push(@@args, qw(-s -L -O --remote-time -g --max-redirs 2 @ 1.4 log @mail/Makefile: delete ruby-actionmailer42 @ text @d1 1 a1 1 $NetBSD: patch-sa-update,v 1.3 2016/02/05 16:06:09 prlw1 Exp $ d5 3 a7 3 --- sa-update.raw.orig 2020-01-25 02:51:16.000000000 +0000 +++ sa-update.raw @@@@ -357,10 +357,10 @@@@ my $GPGPath; d20 10 a29 11 @@@@ -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@@'; } d32 1 @ 1.3 log @Use REPLACE_PERL rather than manual patch @ text @d1 1 a1 1 $NetBSD: patch-sa-update,v 1.2 2014/04/26 13:55:10 tron Exp $ d5 3 a7 3 --- 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 @@@@ d20 11 a30 10 @@@@ -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@@'; a32 1 push(@@args, qw(-s -L -O --remote-time -g --max-redirs 2 @ 1.2 log @Update "spamassassin" package to version 3.4.0: This is a major release. It introduces over two years of bug fixes and features since the release of SpamAssassin 3.3.2 on June 16, 2011. 3.4.0 includes the Bayes Redis (http://redis.io/) back-end (bug 6879), EDNS0 changes (bug 6910), native IPv6 support, numerous URIBL.pm changes or features and a small API change in libspamc (bug 6562) with many other subtle changes. @ text @d1 1 a1 1 $NetBSD$ a6 6 @@@@ -1,4 +1,4 @@@@ -#!/usr/bin/perl -w -T +#!/usr/pkg/bin/perl -w -T # <@@LICENSE> # Licensed to the Apache Software Foundation (ASF) under one or more @ 1.1 log @Add a patch from the svn repository (via https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6872). Fix sa-update with new p5-Net-DNS. Bump PKGREVISION @ text @d1 1 a1 1 $NetBSD: $ d3 1 a3 2 from https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6872, fix for new Net::DNS d5 34 a38 19 Index: sa-update.raw =================================================================== --- sa-update.raw (revision 1421187) +++ sa-update (working copy) @@@@ -1136,9 +1136,11 @@@@ if ($RR) { foreach my $rr ($RR->answer) { my $text = $rr->rdatastr; - local($1); - $text =~ /^"(.*)"$/; - push @@result, $1; + if (defined $text && $text ne '') { + local($1); + $text =~ s/^"(.*)"\z/$1/s; + push(@@result,$text); + } } } else { @ 1.1.2.1 log @file patch-sa-update was added on branch pkgsrc-2013Q2 on 2013-08-01 12:51:54 +0000 @ text @d1 24 @ 1.1.2.2 log @Pullup ticket #4195 - requested by bouyer mail/spamassassin: bug fix patch Revisions pulled up: - mail/spamassassin/Makefile 1.109 - mail/spamassassin/distinfo 1.60 via patch - mail/spamassassin/patches/patch-sa-update 1.1 --- Module Name: pkgsrc Committed By: bouyer Date: Thu Aug 1 10:29:00 UTC 2013 Modified Files: pkgsrc/mail/spamassassin: Makefile distinfo Added Files: pkgsrc/mail/spamassassin/patches: patch-sa-update Log Message: Add a patch from the svn repository (via https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6872). Fix sa-update with new p5-Net-DNS. Bump PKGREVISION @ text @a0 24 $NetBSD$ from https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6872, fix for new Net::DNS Index: sa-update.raw =================================================================== --- sa-update.raw (revision 1421187) +++ sa-update (working copy) @@@@ -1136,9 +1136,11 @@@@ if ($RR) { foreach my $rr ($RR->answer) { my $text = $rr->rdatastr; - local($1); - $text =~ /^"(.*)"$/; - push @@result, $1; + if (defined $text && $text ne '') { + local($1); + $text =~ s/^"(.*)"\z/$1/s; + push(@@result,$text); + } } } else { @