From 764ea8317a3108c9000e3922c6525330121ed69caad7b6f9800b13b7d32e4f39 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Sun, 9 Sep 2018 09:54:34 +0000 Subject: [PATCH 01/37] - bsc#1069831 Running sa-update from spamassassin gives warning about deprecated regex o remove deprecated-regex.patch and apply upstream patch: Unescaped_left_brace_in_regex_is_deprecated.diff OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=116 --- ...ed_left_brace_in_regex_is_deprecated.patch | 99 +++++++++++++++++++ deprecated-regex.patch | 24 ----- spamassassin.changes | 8 ++ spamassassin.spec | 4 +- 4 files changed, 109 insertions(+), 26 deletions(-) create mode 100644 Unescaped_left_brace_in_regex_is_deprecated.patch delete mode 100644 deprecated-regex.patch diff --git a/Unescaped_left_brace_in_regex_is_deprecated.patch b/Unescaped_left_brace_in_regex_is_deprecated.patch new file mode 100644 index 0000000..1d3f90c --- /dev/null +++ b/Unescaped_left_brace_in_regex_is_deprecated.patch @@ -0,0 +1,99 @@ +--- ./Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm.orig 2015-04-28 21:56:49.000000000 +0200 ++++ ./Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm 2018-09-09 11:45:13.713136743 +0200 +@@ -738,7 +738,7 @@ + sub get_names_of_tests_hit_with_scores_hash { + my ($self) = @_; + +- my ($line, %testsscores); ++ my (%testsscores); + + #BASED ON CODE FOR TESTSSCORES TAG - KAM 2014-04-24 + foreach my $test (@{$self->{test_names_hit}}) { +@@ -763,6 +763,8 @@ + + my ($line, %testsscores); + ++ $line = ''; ++ + #BASED ON CODE FOR TESTSSCORES TAG - KAM 2014-04-24 + foreach my $test (sort @{$self->{test_names_hit}}) { + my $score = $self->{conf}->{scores}->{$test}; +@@ -914,16 +916,16 @@ + $str .= shift @{$ary}; + } + undef $ary; +- chomp ($str); $str .= " [...]\n"; + + # in case the last line was huge, trim it back to around 200 chars + local $1; +- $str =~ s/^(.{,200}).*$/$1/gs; ++ $str =~ s/^(.{200}).+$/$1 [...]/gm; ++ chomp ($str); $str .= "\n"; + + # now, some tidy-ups that make things look a bit prettier +- $str =~ s/-----Original Message-----.*$//gs; ++ $str =~ s/-----Original Message-----.*$//gm; + $str =~ s/This is a multi-part message in MIME format\.//gs; +- $str =~ s/[-_\*\.]{10,}//gs; ++ $str =~ s/[-_*.]{10,}//gs; + $str =~ s/\s+/ /gs; + + # add "Content preview:" ourselves, so that the text aligns +@@ -1289,8 +1291,8 @@ + sub qp_encode_header { + my ($self, $text) = @_; + +- # do nothing unless there's an 8-bit char +- return $text unless ($text =~ /[\x80-\xff]/); ++ # return unchanged if there are no 8-bit characters ++ return $text if $text !~ tr/\x00-\x7F//c; + + my $cs = 'ISO-8859-1'; + if ($self->{report_charset}) { +@@ -1980,7 +1982,8 @@ + else { + my @results = $getraw ? $self->{msg}->raw_header($request) + : $self->{msg}->get_header($request); +- # dbg("message: get(%s) = %s", $request, join(", ",@results)); ++ # dbg("message: get(%s)%s = %s", ++ # $request, $getraw?'raw':'', join(", ",@results)); + if (@results) { + $result = join('', @results); + } else { # metadata +@@ -3073,24 +3076,25 @@ + + #TEST POINT - my @addrs = ("test.voipquotes2.net","test.voipquotes2.co.uk"); + #Start with all the normal from addrs +- my @addrs = &all_from_addrs($self); ++ my @addrs = all_from_addrs($self); + + dbg("eval: all '*From' addrs domains (before): " . join(" ", @addrs)); + +- #loop through and limit to just the domain with a dummy address +- for (my $i = 0; $i < scalar(@addrs); $i++) { +- $addrs[$i] = 'dummy@'.$self->{main}->{registryboundaries}->uri_to_domain($addrs[$i]); ++ #Take just the domain with a dummy localpart ++ #removing invalid and duplicate domains ++ my(%addrs_seen, @addrs_filtered); ++ foreach my $a (@addrs) { ++ my $domain = $self->{main}->{registryboundaries}->uri_to_domain($a); ++ next if !defined $domain || $addrs_seen{lc $domain}++; ++ push(@addrs_filtered, 'dummy@'.$domain); + } + +- #Remove duplicate domains +- my %addrs = map { $_ => 1 } @addrs; +- @addrs = keys %addrs; +- +- dbg("eval: all '*From' addrs domains (after uri to domain): " . join(" ", @addrs)); ++ dbg("eval: all '*From' addrs domains (after uri to domain): " . ++ join(" ", @addrs_filtered)); + +- $self->{all_from_addrs_domains} = \@addrs; ++ $self->{all_from_addrs_domains} = \@addrs_filtered; + +- return @addrs; ++ return @addrs_filtered; + } + + sub all_to_addrs { diff --git a/deprecated-regex.patch b/deprecated-regex.patch deleted file mode 100644 index d69349d..0000000 --- a/deprecated-regex.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm 2017/04/11 18:34:11 1791009 -+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm 2017/04/11 18:37:20 1791010 -@@ -896,16 +896,16 @@ - $str .= shift @{$ary}; - } - undef $ary; -- chomp ($str); $str .= " [...]\n"; - - # in case the last line was huge, trim it back to around 200 chars - local $1; -- $str =~ s/^(.{,200}).*$/$1/gs; -+ $str =~ s/^(.{200}).+$/$1 [...]/gm; -+ chomp ($str); $str .= "\n"; - - # now, some tidy-ups that make things look a bit prettier -- $str =~ s/-----Original Message-----.*$//gs; -+ $str =~ s/-----Original Message-----.*$//gm; - $str =~ s/This is a multi-part message in MIME format\.//gs; -- $str =~ s/[-_\*\.]{10,}//gs; -+ $str =~ s/[-_*.]{10,}//gs; - $str =~ s/\s+/ /gs; - - # add "Content preview:" ourselves, so that the text aligns - diff --git a/spamassassin.changes b/spamassassin.changes index b6fa7a6..a5a80d2 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Sep 9 09:52:44 UTC 2018 - varkoly@suse.com + +- bsc#1069831 Running sa-update from spamassassin gives warning + about deprecated regex + o remove deprecated-regex.patch and apply upstream patch: + Unescaped_left_brace_in_regex_is_deprecated.diff + ------------------------------------------------------------------- Mon Feb 19 17:19:18 UTC 2018 - varkoly@suse.com diff --git a/spamassassin.spec b/spamassassin.spec index d9f1f4b..d5895f6 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -63,7 +63,7 @@ Patch13: 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch # PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/attachment.cgi?id=5314 Patch14: DNS-resolver-recursion-desired-not-set.patch # PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7404 -Patch15: deprecated-regex.patch +Patch15: Unescaped_left_brace_in_regex_is_deprecated.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} PreReq: %fillup_prereq @@ -183,7 +183,7 @@ Digest::MD5 installed %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p2 +%patch15 -p1 %build if [ -e t/data/whitelists/winxpnews.com ]; then -- 2.51.1 From 3c34f586ec95d0d134085047d6097909f1f44d4716d78d6b2fd468900cd4ffc7 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Sun, 9 Sep 2018 10:05:30 +0000 Subject: [PATCH 02/37] This patch also fixes the bug PerMsgStatus Warning https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7196 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=117 --- spamassassin.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spamassassin.changes b/spamassassin.changes index a5a80d2..0c2d537 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -5,6 +5,8 @@ Sun Sep 9 09:52:44 UTC 2018 - varkoly@suse.com about deprecated regex o remove deprecated-regex.patch and apply upstream patch: Unescaped_left_brace_in_regex_is_deprecated.diff + This patch also fixes the bug PerMsgStatus Warning + https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7196 ------------------------------------------------------------------- Mon Feb 19 17:19:18 UTC 2018 - varkoly@suse.com -- 2.51.1 From c8e1dd98d3a1317e4b2d7877e1c6e1d5aadb3aefdaf4ff294b735ebf01c7e65d Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Sun, 9 Sep 2018 10:21:40 +0000 Subject: [PATCH 03/37] Fix the patch. OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=118 --- Unescaped_left_brace_in_regex_is_deprecated.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Unescaped_left_brace_in_regex_is_deprecated.patch b/Unescaped_left_brace_in_regex_is_deprecated.patch index 1d3f90c..4ed52eb 100644 --- a/Unescaped_left_brace_in_regex_is_deprecated.patch +++ b/Unescaped_left_brace_in_regex_is_deprecated.patch @@ -1,5 +1,5 @@ ---- ./Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm.orig 2015-04-28 21:56:49.000000000 +0200 -+++ ./Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm 2018-09-09 11:45:13.713136743 +0200 +--- Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm.orig 2015-04-28 21:56:49.000000000 +0200 ++++ Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm 2018-09-09 11:45:13.713136743 +0200 @@ -738,7 +738,7 @@ sub get_names_of_tests_hit_with_scores_hash { my ($self) = @_; -- 2.51.1 From e8c44a403abe3b3a13f9c17ad5de827a12c97e559109e12f77b8025b96f9eb81 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Thu, 13 Sep 2018 14:10:30 +0000 Subject: [PATCH 04/37] - bsc#1107765 - spamassassin: incompatibility with Net::DNS >= 1.01 - Add upstream patch: incompatibility-with-NET-DNS.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=119 --- incompatibility-with-NET-DNS.patch | 10 ++++++++++ spamassassin.changes | 7 +++++++ spamassassin.spec | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 incompatibility-with-NET-DNS.patch diff --git a/incompatibility-with-NET-DNS.patch b/incompatibility-with-NET-DNS.patch new file mode 100644 index 0000000..b509c80 --- /dev/null +++ b/incompatibility-with-NET-DNS.patch @@ -0,0 +1,10 @@ +--- tmp/Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm 2015-04-28 20:56:49.000000000 +0100 ++++ tmp/Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm 2015-07-15 20:53:55.594508162 +0100 +@@ -575,6 +575,7 @@ + { $1 eq '\\' ? "\\$1" : sprintf("\\%03d",ord($1)) }xgse; + + $packet = Net::DNS::Packet->new($domain, $type, $class); ++ $packet->header->rd(1); + + # a bit noisy, so commented by default... + #dbg("dns: new DNS packet time=%.3f domain=%s type=%s id=%s", diff --git a/spamassassin.changes b/spamassassin.changes index 0c2d537..91e53fc 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 13 14:05:04 UTC 2018 - varkoly@suse.com + +- bsc#1107765 - spamassassin: incompatibility with Net::DNS >= 1.01 + - Add upstream patch: + incompatibility-with-NET-DNS.patch + ------------------------------------------------------------------- Sun Sep 9 09:52:44 UTC 2018 - varkoly@suse.com diff --git a/spamassassin.spec b/spamassassin.spec index d5895f6..16692d2 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -64,6 +64,7 @@ Patch13: 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch Patch14: DNS-resolver-recursion-desired-not-set.patch # PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7404 Patch15: Unescaped_left_brace_in_regex_is_deprecated.patch +Patch16: incompatibility-with-NET-DNS.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} PreReq: %fillup_prereq @@ -184,6 +185,7 @@ Digest::MD5 installed %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build if [ -e t/data/whitelists/winxpnews.com ]; then -- 2.51.1 From dccd1c2aa06c0fce691aee1f0d7be7d511e6471a88cb65779c6ef5d6a18c5a00 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 18 Sep 2018 09:11:10 +0000 Subject: [PATCH 05/37] Accepting request 636231 from home:adkorte:branches:devel:languages:perl - Revert incompatibility-with-NET-DNS.patch (this patch attempts to fix a problem that was already solved by bsc#1059210) OBS-URL: https://build.opensuse.org/request/show/636231 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=120 --- incompatibility-with-NET-DNS.patch | 10 ---------- spamassassin.changes | 6 ++++++ spamassassin.spec | 4 +--- 3 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 incompatibility-with-NET-DNS.patch diff --git a/incompatibility-with-NET-DNS.patch b/incompatibility-with-NET-DNS.patch deleted file mode 100644 index b509c80..0000000 --- a/incompatibility-with-NET-DNS.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tmp/Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm 2015-04-28 20:56:49.000000000 +0100 -+++ tmp/Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm 2015-07-15 20:53:55.594508162 +0100 -@@ -575,6 +575,7 @@ - { $1 eq '\\' ? "\\$1" : sprintf("\\%03d",ord($1)) }xgse; - - $packet = Net::DNS::Packet->new($domain, $type, $class); -+ $packet->header->rd(1); - - # a bit noisy, so commented by default... - #dbg("dns: new DNS packet time=%.3f domain=%s type=%s id=%s", diff --git a/spamassassin.changes b/spamassassin.changes index 91e53fc..225598d 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 17 19:11:13 UTC 2018 - Arjen de Korte + +- Revert incompatibility-with-NET-DNS.patch (this patch attempts to + fix a problem that was already solved by bsc#1059210) + ------------------------------------------------------------------- Thu Sep 13 14:05:04 UTC 2018 - varkoly@suse.com diff --git a/spamassassin.spec b/spamassassin.spec index 16692d2..a78b046 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -64,7 +64,6 @@ Patch13: 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch Patch14: DNS-resolver-recursion-desired-not-set.patch # PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7404 Patch15: Unescaped_left_brace_in_regex_is_deprecated.patch -Patch16: incompatibility-with-NET-DNS.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} PreReq: %fillup_prereq @@ -185,7 +184,6 @@ Digest::MD5 installed %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 %build if [ -e t/data/whitelists/winxpnews.com ]; then -- 2.51.1 From 50f736e0cfc3580cb725361f14ac709b0e19ef02706881d66115fb96e159912d Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 19 Sep 2018 11:59:57 +0000 Subject: [PATCH 06/37] OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=121 --- spamassassin.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spamassassin.changes b/spamassassin.changes index 225598d..ab76756 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -17,7 +17,7 @@ Sun Sep 9 09:52:44 UTC 2018 - varkoly@suse.com - bsc#1069831 Running sa-update from spamassassin gives warning about deprecated regex o remove deprecated-regex.patch and apply upstream patch: - Unescaped_left_brace_in_regex_is_deprecated.diff + Unescaped_left_brace_in_regex_is_deprecated.patch This patch also fixes the bug PerMsgStatus Warning https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7196 -- 2.51.1 From 676f43c312021ac924e29779146256f7dbfe76c3de9c0f067f847ba6330d531e Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Fri, 21 Sep 2018 19:21:50 +0000 Subject: [PATCH 07/37] Accepting request 636660 from home:adkorte:branches:devel:languages:perl - update spamassassin to 3.4.2 * There are four new plugins (disabled by default) HashBL - interface to The Email Blocklist (EBL) ResourceLimits - assure your spamd child processes do not exceed specified CPU or memory limit FromNameSpoof - detection of the From:name field being used to mislead Phishing - finds uris used in phishing campaigns detected by OpenPhish (https://openphish.com) or PhishTank (https://phishtank.com) feeds * For security reasons SSLv3 support has been removed from spamc(1). * Four CVE security bug fixes are included in this release for PDFInfo.pm and the SA core: CVE-2017-15705, CVE-2016-1238, CVE-2018-11780 & CVE-2018-11781. * In sa-update script, optional support for SHA-256 / SHA-512 in addition to or instead of SHA1 has been added for better validation of rules. * GeoIP2 support has been added to RelayCountry and URILocalBL plugins due to GeoIP legacy API deprecations. * several new or enhanced configuration options - update spampd to 2.51 * Replace IO::Socket::INET with IO::Socket::IP for IPv6 support * Unix ports (ability to listen on UNIX sockets) * Add X-Envelope-* headers before Received * Add /usr/local/bin and /usr/local/sbin to PATH * Add --setsid option to start server with setsid if running in background - Removed patches (are now in upstream): * 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch * 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch * DNS-resolver-recursion-desired-not-set.patch * spamassassin-dont_use_SSLv3_methods.patch * spampd-2.42_git_20170226.patch * Unescaped_left_brace_in_regex_is_deprecated.patch OBS-URL: https://build.opensuse.org/request/show/636660 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=122 --- ...-t-assume-cwd-.-is-in-INC-it-may-be-.patch | 27 -- ...Allow-building-against-OpenSSL-1.1.0.patch | 445 ------------------ DNS-resolver-recursion-desired-not-set.patch | 10 - Mail-SpamAssassin-3.4.1.tar.bz2 | 3 - Mail-SpamAssassin-3.4.2.tar.bz2 | 3 + Mail-SpamAssassin-rules-3.4.1.r1675274.tgz | 3 - Mail-SpamAssassin-rules-3.4.2.r1840640.tgz | 3 + ...ed_left_brace_in_regex_is_deprecated.patch | 99 ---- spamassassin-dont_use_SSLv3_methods.patch | 28 -- spamassassin.changes | 38 ++ spamassassin.spec | 45 +- spampd-2.42.tar.bz2 | 3 - spampd-2.42_git_20170226.patch | 56 --- spampd-2.51.tar.gz | 3 + 14 files changed, 65 insertions(+), 701 deletions(-) delete mode 100644 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch delete mode 100644 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch delete mode 100644 DNS-resolver-recursion-desired-not-set.patch delete mode 100644 Mail-SpamAssassin-3.4.1.tar.bz2 create mode 100644 Mail-SpamAssassin-3.4.2.tar.bz2 delete mode 100644 Mail-SpamAssassin-rules-3.4.1.r1675274.tgz create mode 100644 Mail-SpamAssassin-rules-3.4.2.r1840640.tgz delete mode 100644 Unescaped_left_brace_in_regex_is_deprecated.patch delete mode 100644 spamassassin-dont_use_SSLv3_methods.patch delete mode 100644 spampd-2.42.tar.bz2 delete mode 100644 spampd-2.42_git_20170226.patch create mode 100644 spampd-2.51.tar.gz diff --git a/0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch b/0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch deleted file mode 100644 index 052357a..0000000 --- a/0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 353ba0d96670e80fca1b78369d1701e1cad2bfaf Mon Sep 17 00:00:00 2001 -From: John Hardin -Date: Mon, 13 Feb 2017 02:16:44 +0000 -Subject: [PATCH 1/1] Fix bug#7367: Don't assume cwd (".") is in @INC, it may - be removed for security reasons - see CVE-2016-1238 - -git-svn-id: https://svn.apache.org/repos/asf/spamassassin/branches/3.4@1782717 13f79535-47bb-0310-9956-ffa450edef68 ---- - spamc/configure.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spamc/configure.pl b/spamc/configure.pl -index 0f10f3010..c6f67f208 100755 ---- a/spamc/configure.pl -+++ b/spamc/configure.pl -@@ -66,7 +66,7 @@ print join(' ', $Config{'perlpath'}, "version.h.pl") . "\n"; - # Do the same thing as for the preprocessor below. - package version_h; - my $Z = $0; -- local $0 = "version.h.pl"; -+ local $0 = "./version.h.pl"; - local @ARGV = (); - # Got to check for defined because the script returns shell error level! - unless (defined do $0) { --- -2.13.5 - diff --git a/0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch b/0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch deleted file mode 100644 index 026654f..0000000 --- a/0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch +++ /dev/null @@ -1,445 +0,0 @@ -From 83d31e4555d63a87cb00a732711f80562b455ad0 Mon Sep 17 00:00:00 2001 -From: Karsten Braeckelmann -Date: Tue, 29 Aug 2017 10:45:10 +0000 -Subject: [PATCH] bug 7361: Allow building against OpenSSL 1.1.0 - -git-svn-id: https://svn.apache.org/repos/asf/spamassassin/branches/3.4@1806555 13f79535-47bb-0310-9956-ffa450edef68 ---- - spamc/configure | 129 +++++++++++++++++++++++++++++++++-------------------- - spamc/configure.in | 4 +- - 2 files changed, 82 insertions(+), 51 deletions(-) - -diff --git a/spamc/configure b/spamc/configure -index 48d29fa2d..d8e5dcf8a 100755 ---- a/spamc/configure -+++ b/spamc/configure -@@ -1874,7 +1874,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -1932,7 +1933,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2048,7 +2050,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2102,7 +2105,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2147,7 +2151,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2191,7 +2196,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2523,7 +2529,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2693,7 +2700,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2764,7 +2772,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2917,7 +2926,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3069,7 +3079,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3260,7 +3271,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3323,7 +3335,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3388,7 +3401,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3491,7 +3505,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3557,7 +3572,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3628,7 +3644,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3666,9 +3683,9 @@ fi - SSLLIBS="" - SSLCFLAGS="" - if test yes = "$sa_ssl_enabled"; then -- echo "$as_me:$LINENO: checking for CRYPTO_lock in -lcrypto" >&5 --echo $ECHO_N "checking for CRYPTO_lock in -lcrypto... $ECHO_C" >&6 --if test "${ac_cv_lib_crypto_CRYPTO_lock+set}" = set; then -+ echo "$as_me:$LINENO: checking for CRYPTO_malloc in -lcrypto" >&5 -+echo $ECHO_N "checking for CRYPTO_malloc in -lcrypto... $ECHO_C" >&6 -+if test "${ac_cv_lib_crypto_CRYPTO_malloc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -3686,11 +3703,11 @@ extern "C" - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char CRYPTO_lock (); -+char CRYPTO_malloc (); - int - main () - { --CRYPTO_lock (); -+CRYPTO_malloc (); - ; - return 0; - } -@@ -3704,7 +3721,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3716,20 +3734,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_crypto_CRYPTO_lock=yes -+ ac_cv_lib_crypto_CRYPTO_malloc=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_crypto_CRYPTO_lock=no -+ac_cv_lib_crypto_CRYPTO_malloc=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_lock" >&5 --echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_lock" >&6 --if test $ac_cv_lib_crypto_CRYPTO_lock = yes; then -+echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_malloc" >&5 -+echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_malloc" >&6 -+if test $ac_cv_lib_crypto_CRYPTO_malloc = yes; then - SSLLIBS="-lcrypto $SSLLIBS" - fi - -@@ -3771,7 +3789,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3804,7 +3823,7 @@ fi - # before defining SPAMC_SSL check that all its requirements are - # actually available - if test yes = "$ac_cv_header_openssl_crypto_h" && \ -- test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \ -+ test yes = "$ac_cv_lib_crypto_CRYPTO_malloc" && \ - test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then - SSLCFLAGS="-DSPAMC_SSL" - else -@@ -3854,7 +3873,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3927,7 +3947,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4000,7 +4021,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4073,7 +4095,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4182,7 +4205,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4246,7 +4270,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4311,7 +4336,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4368,7 +4394,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4435,7 +4462,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4500,7 +4528,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4564,7 +4593,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4628,7 +4658,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4692,7 +4723,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5527,6 +5559,11 @@ esac - - - -+ if test x"$ac_file" != x-; then -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ rm -f "$ac_file" -+ fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ -@@ -5565,12 +5602,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;} - fi;; - esac - done` || { (exit 1); exit 1; } -- -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -diff --git a/spamc/configure.in b/spamc/configure.in -index 246c4fa9a..42cc99841 100644 ---- a/spamc/configure.in -+++ b/spamc/configure.in -@@ -64,13 +64,13 @@ AC_CHECK_LIB(socket, socket) - SSLLIBS="" - SSLCFLAGS="" - if test yes = "$sa_ssl_enabled"; then -- AC_CHECK_LIB(crypto, CRYPTO_lock,[SSLLIBS="-lcrypto $SSLLIBS"]) -+ AC_CHECK_LIB(crypto, CRYPTO_malloc,[SSLLIBS="-lcrypto $SSLLIBS"]) - AC_CHECK_LIB(ssl, SSL_CTX_free,[SSLLIBS="-lssl $SSLLIBS"],,-lcrypto) - - # before defining SPAMC_SSL check that all its requirements are - # actually available - if test yes = "$ac_cv_header_openssl_crypto_h" && \ -- test yes = "$ac_cv_lib_crypto_CRYPTO_lock" && \ -+ test yes = "$ac_cv_lib_crypto_CRYPTO_malloc" && \ - test yes = "$ac_cv_lib_ssl_SSL_CTX_free"; then - SSLCFLAGS="-DSPAMC_SSL" - else --- -2.13.5 - diff --git a/DNS-resolver-recursion-desired-not-set.patch b/DNS-resolver-recursion-desired-not-set.patch deleted file mode 100644 index 44f91c9..0000000 --- a/DNS-resolver-recursion-desired-not-set.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm.orig 2018-01-18 09:33:58.566828560 +0100 -+++ Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/DnsResolver.pm 2018-01-18 09:32:47.765978605 +0100 -@@ -575,6 +575,7 @@ - { $1 eq '\\' ? "\\$1" : sprintf("\\%03d",ord($1)) }xgse; - - $packet = Net::DNS::Packet->new($domain, $type, $class); -+ $packet->header->rd(1); - - # a bit noisy, so commented by default... - #dbg("dns: new DNS packet time=%.3f domain=%s type=%s id=%s", diff --git a/Mail-SpamAssassin-3.4.1.tar.bz2 b/Mail-SpamAssassin-3.4.1.tar.bz2 deleted file mode 100644 index 729904d..0000000 --- a/Mail-SpamAssassin-3.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0c1c9808f0684b389594eb8b2ccbace6486546593493f9308c9554563d14651 -size 2710985 diff --git a/Mail-SpamAssassin-3.4.2.tar.bz2 b/Mail-SpamAssassin-3.4.2.tar.bz2 new file mode 100644 index 0000000..9b625e7 --- /dev/null +++ b/Mail-SpamAssassin-3.4.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf03045a4991752145eed007e75737f3e4c7f34cf225db411ce3fd359280e8da +size 2700016 diff --git a/Mail-SpamAssassin-rules-3.4.1.r1675274.tgz b/Mail-SpamAssassin-rules-3.4.1.r1675274.tgz deleted file mode 100644 index 44e0594..0000000 --- a/Mail-SpamAssassin-rules-3.4.1.r1675274.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:382f7ee160a96a15aae559f53df92c36f2e17647b19c5954efede86149f8d12b -size 270622 diff --git a/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz b/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz new file mode 100644 index 0000000..3616044 --- /dev/null +++ b/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d481a2081f1e62a2579238f66b58d2124f7a2e9f3cfa3d4aa2b03fe7b0199bb +size 284758 diff --git a/Unescaped_left_brace_in_regex_is_deprecated.patch b/Unescaped_left_brace_in_regex_is_deprecated.patch deleted file mode 100644 index 4ed52eb..0000000 --- a/Unescaped_left_brace_in_regex_is_deprecated.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm.orig 2015-04-28 21:56:49.000000000 +0200 -+++ Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm 2018-09-09 11:45:13.713136743 +0200 -@@ -738,7 +738,7 @@ - sub get_names_of_tests_hit_with_scores_hash { - my ($self) = @_; - -- my ($line, %testsscores); -+ my (%testsscores); - - #BASED ON CODE FOR TESTSSCORES TAG - KAM 2014-04-24 - foreach my $test (@{$self->{test_names_hit}}) { -@@ -763,6 +763,8 @@ - - my ($line, %testsscores); - -+ $line = ''; -+ - #BASED ON CODE FOR TESTSSCORES TAG - KAM 2014-04-24 - foreach my $test (sort @{$self->{test_names_hit}}) { - my $score = $self->{conf}->{scores}->{$test}; -@@ -914,16 +916,16 @@ - $str .= shift @{$ary}; - } - undef $ary; -- chomp ($str); $str .= " [...]\n"; - - # in case the last line was huge, trim it back to around 200 chars - local $1; -- $str =~ s/^(.{,200}).*$/$1/gs; -+ $str =~ s/^(.{200}).+$/$1 [...]/gm; -+ chomp ($str); $str .= "\n"; - - # now, some tidy-ups that make things look a bit prettier -- $str =~ s/-----Original Message-----.*$//gs; -+ $str =~ s/-----Original Message-----.*$//gm; - $str =~ s/This is a multi-part message in MIME format\.//gs; -- $str =~ s/[-_\*\.]{10,}//gs; -+ $str =~ s/[-_*.]{10,}//gs; - $str =~ s/\s+/ /gs; - - # add "Content preview:" ourselves, so that the text aligns -@@ -1289,8 +1291,8 @@ - sub qp_encode_header { - my ($self, $text) = @_; - -- # do nothing unless there's an 8-bit char -- return $text unless ($text =~ /[\x80-\xff]/); -+ # return unchanged if there are no 8-bit characters -+ return $text if $text !~ tr/\x00-\x7F//c; - - my $cs = 'ISO-8859-1'; - if ($self->{report_charset}) { -@@ -1980,7 +1982,8 @@ - else { - my @results = $getraw ? $self->{msg}->raw_header($request) - : $self->{msg}->get_header($request); -- # dbg("message: get(%s) = %s", $request, join(", ",@results)); -+ # dbg("message: get(%s)%s = %s", -+ # $request, $getraw?'raw':'', join(", ",@results)); - if (@results) { - $result = join('', @results); - } else { # metadata -@@ -3073,24 +3076,25 @@ - - #TEST POINT - my @addrs = ("test.voipquotes2.net","test.voipquotes2.co.uk"); - #Start with all the normal from addrs -- my @addrs = &all_from_addrs($self); -+ my @addrs = all_from_addrs($self); - - dbg("eval: all '*From' addrs domains (before): " . join(" ", @addrs)); - -- #loop through and limit to just the domain with a dummy address -- for (my $i = 0; $i < scalar(@addrs); $i++) { -- $addrs[$i] = 'dummy@'.$self->{main}->{registryboundaries}->uri_to_domain($addrs[$i]); -+ #Take just the domain with a dummy localpart -+ #removing invalid and duplicate domains -+ my(%addrs_seen, @addrs_filtered); -+ foreach my $a (@addrs) { -+ my $domain = $self->{main}->{registryboundaries}->uri_to_domain($a); -+ next if !defined $domain || $addrs_seen{lc $domain}++; -+ push(@addrs_filtered, 'dummy@'.$domain); - } - -- #Remove duplicate domains -- my %addrs = map { $_ => 1 } @addrs; -- @addrs = keys %addrs; -- -- dbg("eval: all '*From' addrs domains (after uri to domain): " . join(" ", @addrs)); -+ dbg("eval: all '*From' addrs domains (after uri to domain): " . -+ join(" ", @addrs_filtered)); - -- $self->{all_from_addrs_domains} = \@addrs; -+ $self->{all_from_addrs_domains} = \@addrs_filtered; - -- return @addrs; -+ return @addrs_filtered; - } - - sub all_to_addrs { diff --git a/spamassassin-dont_use_SSLv3_methods.patch b/spamassassin-dont_use_SSLv3_methods.patch deleted file mode 100644 index b498050..0000000 --- a/spamassassin-dont_use_SSLv3_methods.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: Mail-SpamAssassin-3.4.1/spamc/libspamc.c -=================================================================== ---- Mail-SpamAssassin-3.4.1.orig/spamc/libspamc.c 2015-04-28 21:56:59.000000000 +0200 -+++ Mail-SpamAssassin-3.4.1/spamc/libspamc.c 2017-08-30 16:05:14.426823560 +0200 -@@ -1216,7 +1216,11 @@ int message_filter(struct transport *tp, - if (flags & SPAMC_TLSV1) { - meth = TLSv1_client_method(); - } else { -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ meth = TLS_client_method(); /* default */ -+#else - meth = SSLv3_client_method(); /* default */ -+#endif - } - SSL_load_error_strings(); - ctx = SSL_CTX_new(meth); -@@ -1604,7 +1608,11 @@ int message_tell(struct transport *tp, c - if (flags & SPAMC_USE_SSL) { - #ifdef SPAMC_SSL - SSLeay_add_ssl_algorithms(); -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+ meth = TLS_client_method(); -+#else - meth = SSLv3_client_method(); -+#endif - SSL_load_error_strings(); - ctx = SSL_CTX_new(meth); - #else diff --git a/spamassassin.changes b/spamassassin.changes index ab76756..b94716b 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Tue Sep 18 20:29:34 UTC 2018 - Arjen de Korte + +- update spamassassin to 3.4.2 + * There are four new plugins (disabled by default) + HashBL - interface to The Email Blocklist (EBL) + ResourceLimits - assure your spamd child processes do not exceed + specified CPU or memory limit + FromNameSpoof - detection of the From:name field being used to + mislead + Phishing - finds uris used in phishing campaigns detected by + OpenPhish (https://openphish.com) or PhishTank + (https://phishtank.com) feeds + * For security reasons SSLv3 support has been removed from spamc(1). + * Four CVE security bug fixes are included in this release for + PDFInfo.pm and the SA core: CVE-2017-15705, CVE-2016-1238, + CVE-2018-11780 & CVE-2018-11781. + * In sa-update script, optional support for SHA-256 / SHA-512 in + addition to or instead of SHA1 has been added for better validation + of rules. + * GeoIP2 support has been added to RelayCountry and URILocalBL plugins + due to GeoIP legacy API deprecations. + * several new or enhanced configuration options +- update spampd to 2.51 + * Replace IO::Socket::INET with IO::Socket::IP for IPv6 support + * Unix ports (ability to listen on UNIX sockets) + * Add X-Envelope-* headers before Received + * Add /usr/local/bin and /usr/local/sbin to PATH + * Add --setsid option to start server with setsid if running in + background +- Removed patches (are now in upstream): + * 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch + * 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch + * DNS-resolver-recursion-desired-not-set.patch + * spamassassin-dont_use_SSLv3_methods.patch + * spampd-2.42_git_20170226.patch + * Unescaped_left_brace_in_regex_is_deprecated.patch + ------------------------------------------------------------------- Mon Sep 17 19:11:13 UTC 2018 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index a78b046..61ce15f 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -22,8 +22,8 @@ %endif %define ix_version 2.05 -%define spd_version 2.42 -# http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm +%define spd_version 2.51 +# https://github.com/mpaperno/spampd/releases %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} @@ -32,15 +32,15 @@ Name: spamassassin Summary: Extensible email filter which is used to identify spam License: Apache-2.0 Group: Productivity/Networking/Email/Utilities -Version: 3.4.1 +Version: 3.4.2 Release: 0 -%define sa_version 3.4.1 -%define rules_revision 1675274 +%define sa_version 3.4.2 +%define rules_revision 1840640 Url: http://spamassassin.org/ -Source: http://apache.mirrors.hoobly.com//spamassassin/source/Mail-SpamAssassin-%{version}.tar.bz2 -Source1: http://apache.mirrors.hoobly.com//spamassassin/source/Mail-SpamAssassin-rules-%{version}.r%{rules_revision}.tgz +Source: http://apache.mirrors.hoobly.com/spamassassin/source/Mail-SpamAssassin-%{version}.tar.bz2 +Source1: http://apache.mirrors.hoobly.com/spamassassin/source/Mail-SpamAssassin-rules-%{version}.r%{rules_revision}.tgz Source2: %{IXHASH}.tar.gz -Source3: %{SPAMPD}.tar.bz2 +Source3: %{SPAMPD}.tar.gz Source10: local.cf Source12: sysconfig.spamd Source14: sysconfig.spampd @@ -51,25 +51,18 @@ Patch1: patch-PgSQL Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT Patch6: bnc#582111.diff -Patch7: spampd-2.42_git_20170226.patch Patch10: iXhash2-meta-rules.patch -# add OpenSSL 1.1 support -# PATCH-FIX-UPSTREAM https://svn.apache.org/viewvc?view=revision&revision=1806555 -Patch11: 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch -# PATCH-FIX-SUSE don't use deprecated SSLv3_client_method -Patch12: spamassassin-dont_use_SSLv3_methods.patch -# PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7367 -Patch13: 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch -# PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/attachment.cgi?id=5314 -Patch14: DNS-resolver-recursion-desired-not-set.patch -# PATCH-FIX-UPSTREAM https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7404 -Patch15: Unescaped_left_brace_in_regex_is_deprecated.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} PreReq: %fillup_prereq BuildRequires: dos2unix BuildRequires: openssl-devel +# optional, but want them for build (test) +BuildRequires: curl >= 7.2.14 +BuildRequires: gpg +BuildRequires: re2c # +Requires: curl >= 7.2.14 Requires: perl-IO-Socket-INET6 Requires: perl-Mail-DKIM Requires: perl-Mail-SpamAssassin = %version @@ -108,13 +101,17 @@ BuildRequires: perl(Sys::Hostname) BuildRequires: perl(Time::HiRes) BuildRequires: perl(Time::Local) # optional, but want them for build (test) +BuildRequires: perl(BSD::Resource) BuildRequires: perl(DBI) BuildRequires: perl(Encode::Detect) +BuildRequires: perl(HTTP::Date) BuildRequires: perl(IO::Socket::INET6) BuildRequires: perl(IO::Socket::SSL) BuildRequires: perl(IP::Country) +BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Mail::SPF) BuildRequires: perl(Net::Ident) +BuildRequires: perl(Net::Patricia) >= 1.16 BuildRequires: perl(Razor2::Client::Agent) >= 2.61 # Requires: perl-libwww-perl @@ -135,7 +132,7 @@ Requires: perl(Time::HiRes) Requires: perl(Time::Local) # optional Recommends: perl(Mail::SPF) -Recommends: perl(Net::Patricia) +Recommends: perl(Net::Patricia) >= 1.16 Recommends: perl(Razor2::Client::Agent) >= 2.61 Recommends: perl(IO::Socket::INET6) Recommends: perl(IO::Socket::SSL) @@ -177,13 +174,7 @@ Digest::MD5 installed %patch2 -p1 %patch3 -p0 %patch6 -p0 -%patch7 -p0 %patch10 -p0 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 %build if [ -e t/data/whitelists/winxpnews.com ]; then diff --git a/spampd-2.42.tar.bz2 b/spampd-2.42.tar.bz2 deleted file mode 100644 index 6993555..0000000 --- a/spampd-2.42.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ea0d8357b0de342d6b420e92dba9a5b4e0bd775c6a9c79e983cbdff50bf6e0a -size 112640 diff --git a/spampd-2.42_git_20170226.patch b/spampd-2.42_git_20170226.patch deleted file mode 100644 index 3441e01..0000000 --- a/spampd-2.42_git_20170226.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -ur spampd-2.42/spampd.html spampd-2.42_20170226/spampd.html ---- spampd-2.42.orig/spampd.html 2013-12-08 12:34:02.000000000 +0100 -+++ spampd-2.42/spampd.html 2015-10-18 01:22:58.000000000 +0200 -@@ -96,7 +96,7 @@ -
-
IO::File
-
--
IO::Socket
-+
IO::Socket::IP
-
-
Time::HiRes (not actually required but recommended)
-
-diff -ur spampd-2.42/spampd.pl spampd-2.42_20170226/spampd.pl ---- spampd-2.42/spampd.pl 2013-12-08 12:34:02.000000000 +0100 -+++ spampd-2.42_20170226/spampd.pl 2015-10-18 01:22:58.000000000 +0200 -@@ -307,19 +307,19 @@ - # =cut - - use strict; --use IO::Socket; -+use IO::Socket::IP; - - # =item new(interface => $interface, port => $port[, timeout = 300]); - # - # The interface and port to talk to must be specified. The interface - # must be a valid numeric IP address; the port must be numeric. If - # this call succeeds, it returns a client structure with an open --# IO::Socket::INET in it, ready to talk to. If it fails it dies, -+# IO::Socket::IP in it, ready to talk to. If it fails it dies, - # so if you want anything other than an exit with an explanatory - # error message, wrap the constructor call in an eval block and pull - # the error out of $@ as usual. This is also the case for all other - # methods; they succeed or they die. The timeout parameter is passed --# on into the IO::Socket::INET constructor. -+# on into the IO::Socket::IP constructor. - # - # =cut - -@@ -327,7 +327,7 @@ - my ($this, @opts) = @_; - my $class = ref($this) || $this; - my $self = bless { timeout => 300, @opts }, $class; -- $self->{sock} = IO::Socket::INET->new( -+ $self->{sock} = IO::Socket::IP->new( - PeerAddr => $self->{interface}, - PeerPort => $self->{port}, - Timeout => $self->{timeout}, -@@ -1171,7 +1171,7 @@ - - =item B - --=item B -+=item B - - =item B (not actually required but recommended) - diff --git a/spampd-2.51.tar.gz b/spampd-2.51.tar.gz new file mode 100644 index 0000000..c3bd8df --- /dev/null +++ b/spampd-2.51.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93cc3ef19ecff224ac00f6c7a0e028f059ec839703329f4567846b750964ac07 +size 215462 -- 2.51.1 From 01468a027f73939c23adb0244946df01651cf583b1ffc89426c15e0a15e88078 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Wed, 16 Jan 2019 09:51:35 +0000 Subject: [PATCH 08/37] - bsc#1115411 spamassassin: migrate from cron to systemd timers OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=124 --- sa-update.service | 7 +++++++ sa-update.timer | 10 ++++++++++ spamassassin.changes | 5 +++++ spamassassin.spec | 19 +++++++++++++------ suse.cron-sa-update => timed-sa-update | 0 5 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 sa-update.service create mode 100644 sa-update.timer rename suse.cron-sa-update => timed-sa-update (100%) diff --git a/sa-update.service b/sa-update.service new file mode 100644 index 0000000..7e51e7c --- /dev/null +++ b/sa-update.service @@ -0,0 +1,7 @@ +[Unit] +Description=Update spamassassin +ConditionACPower=true + +[Service] +Type=oneshot +ExecStart=/usr/sbin/timed-sa-update diff --git a/sa-update.timer b/sa-update.timer new file mode 100644 index 0000000..fe05933 --- /dev/null +++ b/sa-update.timer @@ -0,0 +1,10 @@ +[Unit] +Description=Daily update of spamassasin + +[Timer] +OnCalendar=daily +AccuracySec=12h +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/spamassassin.changes b/spamassassin.changes index b94716b..c3dec29 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 16 09:43:23 UTC 2019 - Peter Varkoly + +- bsc#1115411 spamassassin: migrate from cron to systemd timers + ------------------------------------------------------------------- Tue Sep 18 20:29:34 UTC 2018 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index 61ce15f..613dac4 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,9 +44,11 @@ Source3: %{SPAMPD}.tar.gz Source10: local.cf Source12: sysconfig.spamd Source14: sysconfig.spampd -Source15: suse.cron-sa-update +Source15: timed-sa-update Source16: spamd.service Source17: spampd.service +Source18: sa-update.service +Source19: sa-update.timer Patch1: patch-PgSQL Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT @@ -138,7 +140,6 @@ Recommends: perl(IO::Socket::INET6) Recommends: perl(IO::Socket::SSL) Recommends: perl(DBI) Recommends: perl(Encode::Detect) -Recommends: cron Provides: perl-spamassassin = %version Obsoletes: perl-spamassassin < %version @@ -214,9 +215,8 @@ cp %{IXHASH}/iXhash2.pm %{buildroot}/%{perl_vendorlib}/Mail/SpamAssassin/Plugin cp %{IXHASH}/iXhash2.cf %{buildroot}/etc/mail/spamassassin/iXhash2.cf # ## spamassassin stuff -install -d %{buildroot}/etc/cron.daily/ -install -m 0755 %{S:15} %{buildroot}/etc/cron.daily/ install -D -m0755 %{SPAMPD}/spampd.pl %{buildroot}/%{_sbindir}/spampd +install -m 0755 %{S:15} %{buildroot}/%{_sbindir}/ mv %{buildroot}/%{_bindir}/spamd %{buildroot}/%{_sbindir}/ install -m 0644 %{S:10} %{buildroot}/etc/mail/spamassassin/local.cf ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd @@ -235,24 +235,30 @@ pushd %{buildroot}/usr/share/spamassassin && tar -xjf %{S:1} && popd mkdir -p %{buildroot}/%{_unitdir} install -D -m 644 %{S:16} %{buildroot}/%{_unitdir} install -D -m 644 %{S:17} %{buildroot}/%{_unitdir} +install -D -m 644 %{S:18} %{buildroot}/%{_unitdir} +install -D -m 644 %{S:19} %{buildroot}/%{_unitdir} %post %service_add_post spamd.service %service_add_post spampd.service +%service_add_post sa-update.timer %{fillup_only -n spamd} %{fillup_only -n spampd} %pre %service_add_pre spamd.service %service_add_pre spampd.service +%service_add_pre sa-update.timer %preun %service_del_preun spamd.service %service_del_preun spampd.service +%service_del_preun sa-update.timer %postun %service_del_postun spamd.service %service_del_postun spampd.service +%service_del_postun sa-update.timer %files %defattr(-,root,root) @@ -264,6 +270,8 @@ install -D -m 644 %{S:17} %{buildroot}/%{_unitdir} %{_fillupdir}/sysconfig.spampd %{_unitdir}/spamd.service %{_unitdir}/spampd.service +%{_unitdir}/sa-update.service +%{_unitdir}/sa-update.timer %files -n perl-Mail-SpamAssassin -f %{name}.files %defattr(-,root,root) @@ -272,7 +280,6 @@ install -D -m 644 %{S:17} %{buildroot}/%{_unitdir} %doc ldap sql %dir /etc/mail %config(noreplace) /etc/mail/spamassassin -%config(noreplace) /etc/cron.daily/suse.cron-sa-update %exclude /etc/mail/spamassassin/iXhash2.cf %dir /usr/share/spamassassin /usr/share/spamassassin/* diff --git a/suse.cron-sa-update b/timed-sa-update similarity index 100% rename from suse.cron-sa-update rename to timed-sa-update -- 2.51.1 From 3e67db118e8cccf4e222ca4c08ba3ce9a6d91e5aec5a60df44655bb1b1b7e77c Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Wed, 16 Jan 2019 09:56:50 +0000 Subject: [PATCH 09/37] Fix license. OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=125 --- spamassassin.changes | 1 + spamassassin.spec | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spamassassin.changes b/spamassassin.changes index c3dec29..3d103ee 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -2,6 +2,7 @@ Wed Jan 16 09:43:23 UTC 2019 - Peter Varkoly - bsc#1115411 spamassassin: migrate from cron to systemd timers +- Apply %license macro ------------------------------------------------------------------- Tue Sep 18 20:29:34 UTC 2018 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index 613dac4..543c8d4 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -275,7 +275,8 @@ install -D -m 644 %{S:19} %{buildroot}/%{_unitdir} %files -n perl-Mail-SpamAssassin -f %{name}.files %defattr(-,root,root) -%doc CREDITS Changes LICENSE MANIFEST* NOTICE PACKAGING README +%license LICENSE +%doc CREDITS Changes MANIFEST* NOTICE PACKAGING README %doc TRADEMARK UPGRADE USAGE sample-nonspam.txt sample-spam.txt %doc ldap sql %dir /etc/mail -- 2.51.1 From acbcd2a4f9f3e49bde4f1d34c53439c80a251aef846452aa11d82b45a2a6c837 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Wed, 16 Jan 2019 13:32:55 +0000 Subject: [PATCH 10/37] Accepting request 666464 from home:jengelh:branches:devel:languages:perl - Reduce boilerplate generated by %service_*. OBS-URL: https://build.opensuse.org/request/show/666464 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=126 --- spamassassin.changes | 5 +++++ spamassassin.spec | 16 ++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index 3d103ee..44d213c 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 16 11:50:16 UTC 2019 - Jan Engelhardt + +- Reduce boilerplate generated by %service_*. + ------------------------------------------------------------------- Wed Jan 16 09:43:23 UTC 2019 - Peter Varkoly diff --git a/spamassassin.spec b/spamassassin.spec index 543c8d4..0761054 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -239,26 +239,18 @@ install -D -m 644 %{S:18} %{buildroot}/%{_unitdir} install -D -m 644 %{S:19} %{buildroot}/%{_unitdir} %post -%service_add_post spamd.service -%service_add_post spampd.service -%service_add_post sa-update.timer +%service_add_post spamd.service spampd.service sa-update.timer %{fillup_only -n spamd} %{fillup_only -n spampd} %pre -%service_add_pre spamd.service -%service_add_pre spampd.service -%service_add_pre sa-update.timer +%service_add_pre spamd.service spampd.service sa-update.timer %preun -%service_del_preun spamd.service -%service_del_preun spampd.service -%service_del_preun sa-update.timer +%service_del_preun spamd.service spampd.service sa-update.timer %postun -%service_del_postun spamd.service -%service_del_postun spampd.service -%service_del_postun sa-update.timer +%service_del_postun spamd.service spampd.service sa-update.timer %files %defattr(-,root,root) -- 2.51.1 From 0534705640e5df61c03144a96354ef007ceab0171f81b14f1c6060a007782cc1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 12 Jun 2019 06:18:12 +0000 Subject: [PATCH 11/37] Accepting request 709150 from home:dimstar:Factory - BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to shortcut the build queues by allowing usage of systemd-mini OBS-URL: https://build.opensuse.org/request/show/709150 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=128 --- spamassassin.changes | 6 ++++++ spamassassin.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index 44d213c..43f854d 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 11 12:33:05 UTC 2019 - Dominique Leuenberger + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut the build queues by allowing usage of systemd-mini + ------------------------------------------------------------------- Wed Jan 16 11:50:16 UTC 2019 - Jan Engelhardt diff --git a/spamassassin.spec b/spamassassin.spec index 0761054..942e805 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -70,8 +70,8 @@ Requires: perl-Mail-DKIM Requires: perl-Mail-SpamAssassin = %version Requires: re2c Requires: perl(Net::Server::PreForkSimple) -BuildRequires: systemd -%{?systemd_requires} +BuildRequires: pkgconfig(systemd) +%{?systemd_ordering} %description spamassassin adds a header line that shows if the mail has been -- 2.51.1 From c9139d62af5fac4ff9b3f074665c0615b6fee999637bac97373cc85be8c927cd Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Fri, 8 Nov 2019 07:58:48 +0000 Subject: [PATCH 12/37] Accepting request 745100 from home:adkorte Update keyring. Keys are now available in a single download from upstream (see https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7765) OBS-URL: https://build.opensuse.org/request/show/745100 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=130 --- Mail-SpamAssassin-3.4.2.tar.bz2.asc | 17 ++ ...-SpamAssassin-rules-3.4.2.r1840640.tgz.asc | 17 ++ spamassassin.changes | 20 ++ spamassassin.keyring | 229 ++++++++++++++++++ spamassassin.spec | 32 +-- spamd.service | 4 +- spampd-2.51.tar.gz | 3 - spampd-2.53.tar.gz | 3 + spampd.service | 2 +- 9 files changed, 307 insertions(+), 20 deletions(-) create mode 100644 Mail-SpamAssassin-3.4.2.tar.bz2.asc create mode 100644 Mail-SpamAssassin-rules-3.4.2.r1840640.tgz.asc create mode 100644 spamassassin.keyring delete mode 100644 spampd-2.51.tar.gz create mode 100644 spampd-2.53.tar.gz diff --git a/Mail-SpamAssassin-3.4.2.tar.bz2.asc b/Mail-SpamAssassin-3.4.2.tar.bz2.asc new file mode 100644 index 0000000..8909f0e --- /dev/null +++ b/Mail-SpamAssassin-3.4.2.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIVAwUAW5sPAf3lL0D305gUAQrPsQ//bTWpPyiW+HIZvYAGi1aixbPGhGN13VOt +VUekdgIJY8/F9trWo3GWQ14DUh1bIkMPXCxoD1kczeGeOUkInp7Dhsq+1zbt+chP +zQsT7HiqKVCUezrB24yo90a8EQxG9TmaLWKPaMTd/xP77CJHlqPgCvKKe/b5xxz5 +5x7JkG68F3mGHbuE5RtGXjC2l39/uygot486MjpaCS9zhopxjYLPEo/A03ZlJ1ZY +6cwbD9pok747vn6n8yiqZ7COHPe44Gnz+eFI9NXX8xd/ANxtkPKO/uiQpiRnkQU+ +GQRbj8H/c2plmzoGKgP3z/ujKcq65+ZVNMqzOXWv58nD9EvTWOwD2qXCPJ7tMJ1i +6KTglFkN6rD4+8L/tNS3gmfkpJk9wj2sycFgWqi91dtwnO1lxOfUZbV1Owbd4ajO +hgVh+wBBkOk3wc9g2YSYXZgzy8jZIvv83JcWsYtYEOriUuHiEKT0qWjSQ27F/aft +HkGO+aes4qqNeNVp900EYRRGPc5y25hOwMuUfNHSbKWYf0ZchjGnHlQQ4smbiajt +vp5t1fd0ZK4RjJX0HfTSueeK1bOriWsq5t+ZbyxWUaNvtesEtGDNgVl4rM4p+yjQ +9fBI4HPRTo7YvxlWaa2s/6Ns2fzV4OalM6MH9GVfdjudMaDzV4njDCyq9l92IilA +aKOo+2h++4I= +=w7sR +-----END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz.asc b/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz.asc new file mode 100644 index 0000000..81b2603 --- /dev/null +++ b/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJbmdQDAAoJEGxVOXgk9DTOSjUP/21ZfAQ1GAUBCeYFumxWbxDv +HZSVzZSfMUmRS8bl1jZjBZauT6iLZYFaHCkMRVgKuYgi2M/beHb87jDagC0ly17i +P6ncK7MRETIw5BPC9DnZFeuW71k4GXMLIS229jEXis25405TFeM9KWLTlvdk9eTV +wJRaXCaBwkT6DM4GV0XZdQ8Hz7MWjIADgLDyjAwZmcFhqpMkpuhtjR9vM57CHVoq +8qHkqtmAH0863HTvilwZCrZQAp67MV04+42nOqEgFDL+0yHrS6oom/pGAVWii52b +X7HVYs8yuFGvzoqzUbkIEtk0TIaN9KfPmPh3jJOCWdWYckgCPpR0dMRgDhyPOU4D +ZwHbA26Nxyp590ifWkOII1ndBsNQLKT+v2EIlh15VQAQqGv58pLZ0qla0Z8J/YEp +ORGyt40Ez8WTAhnU2PzwY0ar/pog3qwOBJ9dpSfRJ3RVHqhvqz6IYkHXWjrAhZz8 +BOeHjvPK2ntTZmCz45zlbts4fnDn0fEXV5sWiMkX62jmkY57BvRXOam1CbJQiesP +qZddAfcx5ylKxD+/iExFsyrOkhejExbBi8p83Zh5lsTFsrSobUI6Sef/z7a8ZL03 +MzX2xwwHVaJiFfS/RssiGQLxHOB5waawLYB5tj1NcbtlpXgq8xFyFXGXhaLnFJhF +eF3FD0oPmODAlviwzIx+ +=ANnX +-----END PGP SIGNATURE----- diff --git a/spamassassin.changes b/spamassassin.changes index 43f854d..38fbde7 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,23 @@ +---------------------------------------------------------- +Sun Oct 27 12:36:31 UTC 2019 - Arjen de Korte + +- update spampd to 2.53 + * Fix LMTP delivery with multiple recipients + * Fix Warning for "Use of uninitialized value in string" + update spampd to 2.52 + * Override Net::Server's HUP handling, just restart children + * Add --version option to print information about SpamPD, + Net::Server, SpamAssassin, and Perl. + * Add warnings about using deprecated options. + * Documentation updates and code cosmetics. +- Update download links (add for spampd and iXhash2 sources) +- Add source verification (add spamassassin.keyring) +- Add %{perl_requires} for perl-Mail-SpamAssassin +- Fix "PIDFile= references a path below legacy directory /var/run/" + (change /var/run/ -> /run/) +- Don't package README.SuSE which documents an init script that + was never bundled + ------------------------------------------------------------------- Tue Jun 11 12:33:05 UTC 2019 - Dominique Leuenberger diff --git a/spamassassin.keyring b/spamassassin.keyring new file mode 100644 index 0000000..ce4568e --- /dev/null +++ b/spamassassin.keyring @@ -0,0 +1,229 @@ +PREFACE: This file lives at https://spamassassin.apache.org/KEYS and +https://www.apache.org/dist/spamassassin/KEYS + + +This file contains the GPG keys which Apache SpamAssassin's release and +update distributions are signed with. + +Please don't use these keys for email. They are only used for code signing. + +Please realize that this file itself, or the public key servers may be +compromised. You are encouraged to validate the authenticity of this key in an +out-of-band manner. For information about our validation and signing policies, +please read http://httpd.apache.org/dev/verification.html . + +The following key is used to sign releases after, and including SA 3.3.0: + +pub 4096R/F7D39814 2009-12-02 + Key fingerprint = D809 9BC7 9E17 D7E4 9BC2 1E31 FDE5 2F40 F7D3 9814 +uid SpamAssassin Project Management Committee +uid SpamAssassin Signing Key (Code Signing Key, replacement for 1024D/265FA05B) +sub 4096R/7B3265A5 2009-12-02 + +The PUBLIC KEY BLOCK Follows. [1] + +NOTE: The following key was used to sign releases before that point, but + will NEVER be used to sign later releases: + + pub 1024D/265FA05B 2003-06-09 + Key fingerprint = 26C9 00A4 6DD4 0CD5 AD24 F6D7 DEE0 1987 265F A05B + uid SpamAssassin Signing Key + sub 1024D/FC51569B 2003-08-21 + +The following key is used to sign rule updates: + +pub 4096R/5244EC45 2005-12-20 + Key fingerprint = 5E54 1DC9 59CB 8BAC 7C78 DFDC 4056 A61A 5244 EC45 +uid updates.spamassassin.org Signing Key +sub 4096R/24F434CE 2005-12-20 + +The PUBLIC KEY BLOCK Follows. [2] + + +[1] +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.13 (FreeBSD) + +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 +=VQsP +-----END PGP PUBLIC KEY BLOCK----- + +[2] +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +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 +aB8EKy5bg4U6 +=IbYW +-----END PGP PUBLIC KEY BLOCK----- diff --git a/spamassassin.spec b/spamassassin.spec index 942e805..1cf284c 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -22,8 +22,9 @@ %endif %define ix_version 2.05 -%define spd_version 2.51 -# https://github.com/mpaperno/spampd/releases +%define spd_version 2.53 +%define sa_version 3.4.2 +%define rules_revision 1840640 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} @@ -32,15 +33,13 @@ Name: spamassassin Summary: Extensible email filter which is used to identify spam License: Apache-2.0 Group: Productivity/Networking/Email/Utilities -Version: 3.4.2 +Version: %{sa_version} Release: 0 -%define sa_version 3.4.2 -%define rules_revision 1840640 -Url: http://spamassassin.org/ -Source: http://apache.mirrors.hoobly.com/spamassassin/source/Mail-SpamAssassin-%{version}.tar.bz2 -Source1: http://apache.mirrors.hoobly.com/spamassassin/source/Mail-SpamAssassin-rules-%{version}.r%{rules_revision}.tgz -Source2: %{IXHASH}.tar.gz -Source3: %{SPAMPD}.tar.gz +Url: https://spamassassin.apache.org/ +Source: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2 +Source1: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz +Source2: https://mailfud.org/iXhash2/%{IXHASH}.tar.gz +Source3: https://github.com/mpaperno/spampd/archive/%{spd_version}.tar.gz#/%{SPAMPD}.tar.gz Source10: local.cf Source12: sysconfig.spamd Source14: sysconfig.spampd @@ -49,6 +48,10 @@ Source16: spamd.service Source17: spampd.service Source18: sa-update.service Source19: sa-update.timer +Source100: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2.asc +Source101: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz.asc +# Keyring downloaded from https://www.apache.org/dist/spamassassin/KEYS +Source102: spamassassin.keyring Patch1: patch-PgSQL Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT @@ -140,8 +143,9 @@ Recommends: perl(IO::Socket::INET6) Recommends: perl(IO::Socket::SSL) Recommends: perl(DBI) Recommends: perl(Encode::Detect) -Provides: perl-spamassassin = %version -Obsoletes: perl-spamassassin < %version +Provides: perl-spamassassin = %{sa_version} +Obsoletes: perl-spamassassin < %{sa_version} +%{perl_requires} %description -n perl-Mail-SpamAssassin This package contains the perl modules for the spamassassin, including @@ -151,7 +155,7 @@ the filter rules. This package is required for the package %package -n perl-Mail-SpamAssassin-Plugin-iXhash2 Summary: The iXhash plugin for SpamAssassin Group: Development/Libraries/Perl -Requires: perl-Mail-SpamAssassin = %version +Requires: perl-Mail-SpamAssassin = %{sa_version} Requires: perl(Digest::MD5) Version: %{ix_version} Release: 0 @@ -254,7 +258,7 @@ install -D -m 644 %{S:19} %{buildroot}/%{_unitdir} %files %defattr(-,root,root) -%doc spamd/README* spamd/PROTOCOL +%doc spamd/README spamd/README.vpopmail spamd/PROTOCOL %doc %{_mandir}/man1/* %{_bindir}/* %{_sbindir}/* diff --git a/spamd.service b/spamd.service index b9dc41f..ce3b381 100644 --- a/spamd.service +++ b/spamd.service @@ -21,10 +21,10 @@ Before=mail-transfer-agent.target [Service] Type=forking -PIDFile=/var/run/spamd.pid +PIDFile=/run/spamd.pid ExecStartPre=/bin/bash -c "sa-update || true" EnvironmentFile=-/etc/sysconfig/spamd -ExecStart=/usr/sbin/spamd $SPAMD_ARGS -r /var/run/spamd.pid +ExecStart=/usr/sbin/spamd $SPAMD_ARGS -r /run/spamd.pid ExecReload=/usr/bin/kill -HUP $MAINPID [Install] diff --git a/spampd-2.51.tar.gz b/spampd-2.51.tar.gz deleted file mode 100644 index c3bd8df..0000000 --- a/spampd-2.51.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93cc3ef19ecff224ac00f6c7a0e028f059ec839703329f4567846b750964ac07 -size 215462 diff --git a/spampd-2.53.tar.gz b/spampd-2.53.tar.gz new file mode 100644 index 0000000..5246ae8 --- /dev/null +++ b/spampd-2.53.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58f37e61bac99a0423605c7db23cf8d1e4389681fe50d7e37ce2e31d46e27a88 +size 217945 diff --git a/spampd.service b/spampd.service index 90f0872..a3f9319 100644 --- a/spampd.service +++ b/spampd.service @@ -21,7 +21,7 @@ Before=mail-transfer-agent.target [Service] Type=forking -PIDFile=/var/run/spampd.pid +PIDFile=/run/spampd.pid ExecStartPre=/bin/bash -c "sa-update || true" EnvironmentFile=-/etc/sysconfig/spampd ExecStart=/usr/sbin/spampd $SPAMPD_OPTIONS -- 2.51.1 From 2efbdde36f27f34366fc0ac0917e5f86c31769375a522bec04da6af3d27d5876 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Mon, 11 Nov 2019 13:14:41 +0000 Subject: [PATCH 13/37] Accepting request 747252 from home:adkorte - Change architecture of perl modules to 'noarch' - Fix extraction command for default rules (proper fix for boo#911355, rather than a workaround) - Don't unconditionally run sa-update on spamd and spampd service start as this doesn't honor the settings in /etc/sysconfig/spamd - After running sa-update, only restart services if they were running before - Fix name in logging timed-sa-update (suse.cron-sa-update doesn't exist anymore) OBS-URL: https://build.opensuse.org/request/show/747252 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=132 --- spamassassin.changes | 17 +++++++++++++++++ spamassassin.spec | 20 +++++++++++++++----- spamd.service | 1 - spampd.service | 1 - timed-sa-update | 8 ++++---- 5 files changed, 36 insertions(+), 11 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index 38fbde7..78df56f 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sat Nov 9 12:42:47 UTC 2019 - Arjen de Korte + +- Change architecture of perl modules to 'noarch' + +------------------------------------------------------------------- +Fri Nov 8 10:40:45 UTC 2019 - Arjen de Korte + +- Fix extraction command for default rules (proper fix for + boo#911355, rather than a workaround) +- Don't unconditionally run sa-update on spamd and spampd service + start as this doesn't honor the settings in /etc/sysconfig/spamd +- After running sa-update, only restart services if they were + running before +- Fix name in logging timed-sa-update (suse.cron-sa-update + doesn't exist anymore) + ---------------------------------------------------------- Sun Oct 27 12:36:31 UTC 2019 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index 1cf284c..4d3521f 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -24,6 +24,7 @@ %define ix_version 2.05 %define spd_version 2.53 %define sa_version 3.4.2 +%define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') %define rules_revision 1840640 %define IXHASH iXhash2-%{ix_version} @@ -145,6 +146,7 @@ Recommends: perl(DBI) Recommends: perl(Encode::Detect) Provides: perl-spamassassin = %{sa_version} Obsoletes: perl-spamassassin < %{sa_version} +BuildArch: noarch %{perl_requires} %description -n perl-Mail-SpamAssassin @@ -161,6 +163,7 @@ Version: %{ix_version} Release: 0 Provides: perl-Mail-SpamAssassin-Plugin-iXhash = %{ix_version} Obsoletes: perl-Mail-SpamAssassin-Plugin-iXhash < 2 +BuildArch: noarch %{perl_requires} %description -n perl-Mail-SpamAssassin-Plugin-iXhash2 @@ -175,6 +178,7 @@ Digest::MD5 installed %prep %setup -q -n Mail-SpamAssassin-%{sa_version} -a 2 -a 3 +tar -zxf %{S:1} -C rules %patch1 -p0 %patch2 -p1 %patch3 -p0 @@ -197,7 +201,7 @@ export CFLAGS="%{optflags}" perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" \ CONTACT_ADDRESS="postmaster" ENABLE_SSL="yes" -make +make %{?_smp_mflags} %check # fails now... FIGURE out why @@ -232,8 +236,13 @@ test -f %{buildroot}/usr/share/spamassassin/user_prefs.template || { echo "MakeMaker is broken again..." exit 1 } -install -d %{buildroot}/usr/share/spamassassin -pushd %{buildroot}/usr/share/spamassassin && tar -xjf %{S:1} && popd + +## default rules +install -d %{buildroot}%{_datadir}/spamassassin +install -D -m 0644 rules/[0-9]*.cf %{buildroot}%{_datadir}/spamassassin +sed -i -e 's|@@CONTACT_ADDRESS@@|postmaster|g' \ + -e 's|@@LOCAL_RULES_DIR@@|/etc/mail/spamassassin|g' \ + -e 's|@@VERSION@@|%{sa_float}|g' %{buildroot}%{_datadir}/spamassassin/*.cf ## systemd stuff mkdir -p %{buildroot}/%{_unitdir} @@ -278,8 +287,9 @@ install -D -m 644 %{S:19} %{buildroot}/%{_unitdir} %dir /etc/mail %config(noreplace) /etc/mail/spamassassin %exclude /etc/mail/spamassassin/iXhash2.cf -%dir /usr/share/spamassassin -/usr/share/spamassassin/* +%exclude %{perl_vendorarch} +%dir %{_datadir}/spamassassin +%{_datadir}/spamassassin/* %files -n perl-Mail-SpamAssassin-Plugin-iXhash2 %defattr(-,root,root) diff --git a/spamd.service b/spamd.service index ce3b381..a8dbbd2 100644 --- a/spamd.service +++ b/spamd.service @@ -22,7 +22,6 @@ Before=mail-transfer-agent.target [Service] Type=forking PIDFile=/run/spamd.pid -ExecStartPre=/bin/bash -c "sa-update || true" EnvironmentFile=-/etc/sysconfig/spamd ExecStart=/usr/sbin/spamd $SPAMD_ARGS -r /run/spamd.pid ExecReload=/usr/bin/kill -HUP $MAINPID diff --git a/spampd.service b/spampd.service index a3f9319..a2f4fc4 100644 --- a/spampd.service +++ b/spampd.service @@ -22,7 +22,6 @@ Before=mail-transfer-agent.target [Service] Type=forking PIDFile=/run/spampd.pid -ExecStartPre=/bin/bash -c "sa-update || true" EnvironmentFile=-/etc/sysconfig/spampd ExecStart=/usr/sbin/spampd $SPAMPD_OPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID diff --git a/timed-sa-update b/timed-sa-update index 3e9d4ad..d8e8537 100644 --- a/timed-sa-update +++ b/timed-sa-update @@ -23,21 +23,21 @@ then fi if [ "$SPAM_SPAMD_RESTART" = "yes" -a $result = 0 ] ; then - /sbin/service spamd restart &> /dev/null + /sbin/service spamd try-restart &> /dev/null fi if [ "$SPAM_AMAVISD_RESTART" = "yes" -a $result = 0 ] ; then - /sbin/service amavis restart &> /dev/null + /sbin/service amavis try-restart &> /dev/null fi if [ $result = 2 ] ; then echo "sa-update lint check failed" | \ - logger -t suse.cron-sa-update + logger -t timed-sa-update fi if [ $result -ge 3 ] ; then echo "sa-update failed, exitcode $result" | \ - logger -t suse.cron-sa-update + logger -t timed-sa-update fi fi exit 0 -- 2.51.1 From 4f36347fe22f6b49cb62cc3864afb2516ad260409418fc232390d0abcf11e6f7 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Fri, 13 Dec 2019 08:47:17 +0000 Subject: [PATCH 14/37] Accepting request 755484 from home:dstoecker:branches:devel:languages:perl Spam size is growing. Tsss. OBS-URL: https://build.opensuse.org/request/show/755484 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=134 --- spamassassin.changes | 5 +++++ sysconfig.spampd | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/spamassassin.changes b/spamassassin.changes index 78df56f..23a6380 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 10 09:17:05 UTC 2019 - Dirk Stoecker + +- Increase maximum size for spampd to 7168 + ------------------------------------------------------------------- Sat Nov 9 12:42:47 UTC 2019 - Arjen de Korte diff --git a/sysconfig.spampd b/sysconfig.spampd index ed74c4b..0859b03 100644 --- a/sysconfig.spampd +++ b/sysconfig.spampd @@ -1 +1 @@ -SPAMPD_OPTIONS="--host=localhost:10025 --relayhost=localhost:10026 --user=vscan --tagall --children=5 --maxsize=768 --homedir=/home/vscan" +SPAMPD_OPTIONS="--host=localhost:10025 --relayhost=localhost:10026 --user=vscan --tagall --children=5 --maxsize=7168 --homedir=/home/vscan" -- 2.51.1 From c3f3ffeb0237b28c7ed2ec159e8fdd432c88b824d4198c76fdb3c9612aaff824 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Fri, 13 Dec 2019 08:47:40 +0000 Subject: [PATCH 15/37] Accepting request 756055 from home:adkorte - update spamassassin to 3.4.3 * There is one new plugin (disabled by default) OLEVBMacro - Detects both OLE macros and VB code inside Office documents * Two CVE security bug fixes are included in this release CVE-2019-12420 for Multipart Denial of Service Vulnerability CVE-2018-11805 for nefarious CF files can be configured to run system commands without any output or errors * Safer and faster scanning of large emails using body_part_scan_size and rawbody_part_scan_size settings. * New tflag "nosubject" for 'body' rules, to stop matching the Subject header which is part of the body text. * Security updates include deprecation of the unsafe sa-update '--allowplugins' option, which now prints a warning that '--reallyallowplugins' is required to use it. OBS-URL: https://build.opensuse.org/request/show/756055 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=135 --- Mail-SpamAssassin-3.4.2.tar.bz2 | 3 --- Mail-SpamAssassin-3.4.2.tar.bz2.asc | 17 ----------------- Mail-SpamAssassin-3.4.3.tar.bz2 | 3 +++ Mail-SpamAssassin-3.4.3.tar.bz2.asc | 17 +++++++++++++++++ Mail-SpamAssassin-rules-3.4.2.r1840640.tgz | 3 --- ...-SpamAssassin-rules-3.4.2.r1840640.tgz.asc | 17 ----------------- Mail-SpamAssassin-rules-3.4.3.r1871124.tgz | 3 +++ ...-SpamAssassin-rules-3.4.3.r1871124.tgz.asc | 17 +++++++++++++++++ spamassassin.changes | 19 +++++++++++++++++++ spamassassin.spec | 4 ++-- 10 files changed, 61 insertions(+), 42 deletions(-) delete mode 100644 Mail-SpamAssassin-3.4.2.tar.bz2 delete mode 100644 Mail-SpamAssassin-3.4.2.tar.bz2.asc create mode 100644 Mail-SpamAssassin-3.4.3.tar.bz2 create mode 100644 Mail-SpamAssassin-3.4.3.tar.bz2.asc delete mode 100644 Mail-SpamAssassin-rules-3.4.2.r1840640.tgz delete mode 100644 Mail-SpamAssassin-rules-3.4.2.r1840640.tgz.asc create mode 100644 Mail-SpamAssassin-rules-3.4.3.r1871124.tgz create mode 100644 Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc diff --git a/Mail-SpamAssassin-3.4.2.tar.bz2 b/Mail-SpamAssassin-3.4.2.tar.bz2 deleted file mode 100644 index 9b625e7..0000000 --- a/Mail-SpamAssassin-3.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf03045a4991752145eed007e75737f3e4c7f34cf225db411ce3fd359280e8da -size 2700016 diff --git a/Mail-SpamAssassin-3.4.2.tar.bz2.asc b/Mail-SpamAssassin-3.4.2.tar.bz2.asc deleted file mode 100644 index 8909f0e..0000000 --- a/Mail-SpamAssassin-3.4.2.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIVAwUAW5sPAf3lL0D305gUAQrPsQ//bTWpPyiW+HIZvYAGi1aixbPGhGN13VOt -VUekdgIJY8/F9trWo3GWQ14DUh1bIkMPXCxoD1kczeGeOUkInp7Dhsq+1zbt+chP -zQsT7HiqKVCUezrB24yo90a8EQxG9TmaLWKPaMTd/xP77CJHlqPgCvKKe/b5xxz5 -5x7JkG68F3mGHbuE5RtGXjC2l39/uygot486MjpaCS9zhopxjYLPEo/A03ZlJ1ZY -6cwbD9pok747vn6n8yiqZ7COHPe44Gnz+eFI9NXX8xd/ANxtkPKO/uiQpiRnkQU+ -GQRbj8H/c2plmzoGKgP3z/ujKcq65+ZVNMqzOXWv58nD9EvTWOwD2qXCPJ7tMJ1i -6KTglFkN6rD4+8L/tNS3gmfkpJk9wj2sycFgWqi91dtwnO1lxOfUZbV1Owbd4ajO -hgVh+wBBkOk3wc9g2YSYXZgzy8jZIvv83JcWsYtYEOriUuHiEKT0qWjSQ27F/aft -HkGO+aes4qqNeNVp900EYRRGPc5y25hOwMuUfNHSbKWYf0ZchjGnHlQQ4smbiajt -vp5t1fd0ZK4RjJX0HfTSueeK1bOriWsq5t+ZbyxWUaNvtesEtGDNgVl4rM4p+yjQ -9fBI4HPRTo7YvxlWaa2s/6Ns2fzV4OalM6MH9GVfdjudMaDzV4njDCyq9l92IilA -aKOo+2h++4I= -=w7sR ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-3.4.3.tar.bz2 b/Mail-SpamAssassin-3.4.3.tar.bz2 new file mode 100644 index 0000000..76f6593 --- /dev/null +++ b/Mail-SpamAssassin-3.4.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5b8fde50e468be8b36b90f5c39b19dfea947d6184a06cbf6dd16bf97265008d +size 2739618 diff --git a/Mail-SpamAssassin-3.4.3.tar.bz2.asc b/Mail-SpamAssassin-3.4.3.tar.bz2.asc new file mode 100644 index 0000000..1b6aef5 --- /dev/null +++ b/Mail-SpamAssassin-3.4.3.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIVAwUAXfFYoP3lL0D305gUAQqkqg//WaOsG1vKqt5EZfP06Gb491JWdgh5+0ea +ZUKN/k8cwdCVJgOu2CViOVWgaZMg923resMm+ZLhMbTQswLXIYIQXY0IUGi9yHyN +3GdyImEjOj/01iG6z10JnK7gGspw6hERt81S/mcPuUuU24CBcf6rGHiFBNoR1/2Z +cdxfRjJnnfqv65szJCorPa2INaOWej8SGqm3KqT9roGu8R2NcVxR/Tzkh/lW3ihe +U0PWaM8DfW6IBmh2u/3emHQlgP8EIUDS5Skj9CYKESRNnOvhejcvRrFy0ikYm6ik +4RrR/FbFZrgzL4szJUMQQJfSypGZnh29sUgV8xVNkvY1cSUC601eD+hNVB9vytbu +mPxwQwfGbULBIe7K2AOY7y0gI0/M49+P5MVXpTrqhicCVEwKm0J9Ukh5HHCblBtJ +GYmSBJEsbKDxI+le8afFHeog9Xy/bOoBk/syrHJADWIahxKQvvx2JZGSgmgtIFuO +IPevu4zxd4aP1iLr+ZlLjvq/e6o/ss5GQIGdZ9GKfs2CHH6/ckqoqB/L2H99p7li +bNcCTtpVsS8pO/pmxQwsMTSxQkwbZW8QhAC1xUaRYEsEZ6ID9Y8+rrEmco8Opo38 +DGfOsRxUmMGqh5vY6+5ycrLDqlzWRrvb4jLyhxitiuA1Q4u4D8ZpJ57SfwRjt1ad +dtqWTxFWQqA= +=VeZv +-----END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz b/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz deleted file mode 100644 index 3616044..0000000 --- a/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d481a2081f1e62a2579238f66b58d2124f7a2e9f3cfa3d4aa2b03fe7b0199bb -size 284758 diff --git a/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz.asc b/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz.asc deleted file mode 100644 index 81b2603..0000000 --- a/Mail-SpamAssassin-rules-3.4.2.r1840640.tgz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJbmdQDAAoJEGxVOXgk9DTOSjUP/21ZfAQ1GAUBCeYFumxWbxDv -HZSVzZSfMUmRS8bl1jZjBZauT6iLZYFaHCkMRVgKuYgi2M/beHb87jDagC0ly17i -P6ncK7MRETIw5BPC9DnZFeuW71k4GXMLIS229jEXis25405TFeM9KWLTlvdk9eTV -wJRaXCaBwkT6DM4GV0XZdQ8Hz7MWjIADgLDyjAwZmcFhqpMkpuhtjR9vM57CHVoq -8qHkqtmAH0863HTvilwZCrZQAp67MV04+42nOqEgFDL+0yHrS6oom/pGAVWii52b -X7HVYs8yuFGvzoqzUbkIEtk0TIaN9KfPmPh3jJOCWdWYckgCPpR0dMRgDhyPOU4D -ZwHbA26Nxyp590ifWkOII1ndBsNQLKT+v2EIlh15VQAQqGv58pLZ0qla0Z8J/YEp -ORGyt40Ez8WTAhnU2PzwY0ar/pog3qwOBJ9dpSfRJ3RVHqhvqz6IYkHXWjrAhZz8 -BOeHjvPK2ntTZmCz45zlbts4fnDn0fEXV5sWiMkX62jmkY57BvRXOam1CbJQiesP -qZddAfcx5ylKxD+/iExFsyrOkhejExbBi8p83Zh5lsTFsrSobUI6Sef/z7a8ZL03 -MzX2xwwHVaJiFfS/RssiGQLxHOB5waawLYB5tj1NcbtlpXgq8xFyFXGXhaLnFJhF -eF3FD0oPmODAlviwzIx+ -=ANnX ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz b/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz new file mode 100644 index 0000000..ab64e42 --- /dev/null +++ b/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4804c19c5ee2065443fa09e3940462daa48481dfa9d4a1d95e2683d75c7c7d9 +size 315149 diff --git a/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc b/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc new file mode 100644 index 0000000..be18256 --- /dev/null +++ b/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJd8IgEAAoJEGxVOXgk9DTOXhgP/i3ntGFfW1GSsflxwe/4IXVl +9/o7cpi7hDKdv9JrtyUU1TUR752w5t85kFmtVDSODgFlbg6E00HeyPIH+ISYKFRo +axKxeqaEBbWZP2vk7O9f7ss+a+fmHOwfMXW4Fpgd52GBUdWSx2+faf5TSeV2YJWo +eQxXD2hbBNaOKUbWf/AxRhtruGpn0N0sDJ2Ip8C8weJrmanXW1AUARDNTudtYp2i +nGwajngiPhMZQ6Q8y+1kmW/KyfzAmhkhLnmyN2mvpxkZMkkOh1rPSMj+kgAehi4R +l/rEgAOnk7YZIyqnuZx+PZH7xnz2LVkTM5Y+n9SApd+PyVyRzpVw5yzO4W0E1PJp +uuglBtLA47R24gOm0wdMKCVFCWKX/XC7HVFGsQrxb3A8mdl1tAHWPqZm7s6TljPd +5wPbucUeSro/6ZrPzxD5Y2qTBG7GiePDpKueVWrx8AxSDqYf6GDlQtScYdMellNw +48rIK0M4+BXBNYfoDuFgBVPFTTYt/J77fN4VYNHTDtx65LXdBMsI28lUVtwu2tjQ +hWRHQr69koHwBdLdqn29bsR1COBimb3t80XvAW0JZTFmWgqg8I3fDxMwRqKfSdEB +PhZTZSH90tiIa6FDNcGELiswBFFGpQAtnjHM0DtiJS8e7S/Qs1HHHaPn2N/D3xle +J3oOYk6EbVPShMirErLn +=fECM +-----END PGP SIGNATURE----- diff --git a/spamassassin.changes b/spamassassin.changes index 23a6380..1984905 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Dec 12 11:55:55 UTC 2019 - Arjen de Korte + +- update spamassassin to 3.4.3 + * There is one new plugin (disabled by default) + OLEVBMacro - Detects both OLE macros and VB code inside Office + documents + * Two CVE security bug fixes are included in this release + CVE-2019-12420 for Multipart Denial of Service Vulnerability + CVE-2018-11805 for nefarious CF files can be configured to + run system commands without any output or errors + * Safer and faster scanning of large emails using + body_part_scan_size and rawbody_part_scan_size settings. + * New tflag "nosubject" for 'body' rules, to stop matching the + Subject header which is part of the body text. + * Security updates include deprecation of the unsafe sa-update + '--allowplugins' option, which now prints a warning that + '--reallyallowplugins' is required to use it. + ------------------------------------------------------------------- Tue Dec 10 09:17:05 UTC 2019 - Dirk Stoecker diff --git a/spamassassin.spec b/spamassassin.spec index 4d3521f..7854293 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -23,9 +23,9 @@ %define ix_version 2.05 %define spd_version 2.53 -%define sa_version 3.4.2 +%define sa_version 3.4.3 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') -%define rules_revision 1840640 +%define rules_revision 1871124 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} -- 2.51.1 From 8b0e28daed478bae43bfaa2bba6b6b0fe4ae85276018eb7c2d52eaa27d36650d Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 17 Dec 2019 14:07:29 +0000 Subject: [PATCH 16/37] Accepting request 757092 from home:adkorte - remove old (compiled) rules in /var/lib/spamassassin directory after package upgrade and remove entirely upon package removal - add BuildRequires for perl(Archive::Zip) and perl(IO::String) OBS-URL: https://build.opensuse.org/request/show/757092 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=136 --- spamassassin.changes | 7 +++++++ spamassassin.spec | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index 1984905..e01d1cc 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 14 10:32:50 UTC 2019 - Arjen de Korte + +- remove old (compiled) rules in /var/lib/spamassassin directory + after package upgrade and remove entirely upon package removal +- add BuildRequires for perl(Archive::Zip) and perl(IO::String) + ------------------------------------------------------------------- Thu Dec 12 11:55:55 UTC 2019 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index 7854293..f1699d5 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,7 +36,7 @@ License: Apache-2.0 Group: Productivity/Networking/Email/Utilities Version: %{sa_version} Release: 0 -Url: https://spamassassin.apache.org/ +URL: https://spamassassin.apache.org/ Source: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2 Source1: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz Source2: https://mailfud.org/iXhash2/%{IXHASH}.tar.gz @@ -107,12 +107,14 @@ BuildRequires: perl(Sys::Hostname) BuildRequires: perl(Time::HiRes) BuildRequires: perl(Time::Local) # optional, but want them for build (test) +BuildRequires: perl(Archive::Zip) BuildRequires: perl(BSD::Resource) BuildRequires: perl(DBI) BuildRequires: perl(Encode::Detect) BuildRequires: perl(HTTP::Date) BuildRequires: perl(IO::Socket::INET6) BuildRequires: perl(IO::Socket::SSL) +BuildRequires: perl(IO::String) BuildRequires: perl(IP::Country) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Mail::SPF) @@ -255,6 +257,15 @@ install -D -m 644 %{S:19} %{buildroot}/%{_unitdir} %service_add_post spamd.service spampd.service sa-update.timer %{fillup_only -n spamd} %{fillup_only -n spampd} +if [ $1 -gt 1 ]; then + # Package upgrade + for dir in $(ls -d %{_sharedstatedir}/%{name}/{,compiled/*/}[0-9\.]* 2>/dev/null); do + if [ "${dir##*/}" != "%{sa_float}" ]; then + rm -rf ${dir} + fi + done + find %{_sharedstatedir}/%{name} -type d -empty -delete 2>/dev/null || : +fi %pre %service_add_pre spamd.service spampd.service sa-update.timer @@ -264,6 +275,10 @@ install -D -m 644 %{S:19} %{buildroot}/%{_unitdir} %postun %service_del_postun spamd.service spampd.service sa-update.timer +if [ $1 -eq 0 ]; then + # Package removal + rm -rf %{_sharedstatedir}/%{name} +fi %files %defattr(-,root,root) @@ -277,6 +292,7 @@ install -D -m 644 %{S:19} %{buildroot}/%{_unitdir} %{_unitdir}/spampd.service %{_unitdir}/sa-update.service %{_unitdir}/sa-update.timer +%ghost %{_sharedstatedir}/%{name} %files -n perl-Mail-SpamAssassin -f %{name}.files %defattr(-,root,root) -- 2.51.1 From 665a3ff3b46094f5bb36b0c2e757c9c0a94e16462e220f0ea5b3e967944df19e Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Thu, 30 Jan 2020 11:31:46 +0000 Subject: [PATCH 17/37] Accepting request 768441 from home:adkorte - update spamassassin to 3.4.4 * In this release, there are bug fixes for two CVEs: CVE-2020-1931 for Nefarious rule configuration (.cf) files can be configured to run system commands with warnings. CVE-2020-1930 for Nefarious rule configuration (.cf) files can be configured to run system commands with sa-compile. * Improvements to OLEVBMacro * Fix for CRLF handling with SpamAssMilter & DKIM * Small fix for a regexp to provide Perl 5.8.x compatability again * Increased fns_extrachars default value to 50 * Fixed nosubject and maxhits tflags when sa-compile is used * Limited the Bayes parsed token count * Improvements to whitespace trimming OBS-URL: https://build.opensuse.org/request/show/768441 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=138 --- Mail-SpamAssassin-3.4.3.tar.bz2 | 3 --- Mail-SpamAssassin-3.4.3.tar.bz2.asc | 17 ----------------- Mail-SpamAssassin-3.4.4.tar.bz2 | 3 +++ Mail-SpamAssassin-3.4.4.tar.bz2.asc | 17 +++++++++++++++++ Mail-SpamAssassin-rules-3.4.3.r1871124.tgz | 3 --- Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc | 17 ----------------- Mail-SpamAssassin-rules-3.4.4.r1873061.tgz | 3 +++ Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc | 17 +++++++++++++++++ spamassassin.changes | 17 +++++++++++++++++ spamassassin.spec | 6 +++--- 10 files changed, 60 insertions(+), 43 deletions(-) delete mode 100644 Mail-SpamAssassin-3.4.3.tar.bz2 delete mode 100644 Mail-SpamAssassin-3.4.3.tar.bz2.asc create mode 100644 Mail-SpamAssassin-3.4.4.tar.bz2 create mode 100644 Mail-SpamAssassin-3.4.4.tar.bz2.asc delete mode 100644 Mail-SpamAssassin-rules-3.4.3.r1871124.tgz delete mode 100644 Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc create mode 100644 Mail-SpamAssassin-rules-3.4.4.r1873061.tgz create mode 100644 Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc diff --git a/Mail-SpamAssassin-3.4.3.tar.bz2 b/Mail-SpamAssassin-3.4.3.tar.bz2 deleted file mode 100644 index 76f6593..0000000 --- a/Mail-SpamAssassin-3.4.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a5b8fde50e468be8b36b90f5c39b19dfea947d6184a06cbf6dd16bf97265008d -size 2739618 diff --git a/Mail-SpamAssassin-3.4.3.tar.bz2.asc b/Mail-SpamAssassin-3.4.3.tar.bz2.asc deleted file mode 100644 index 1b6aef5..0000000 --- a/Mail-SpamAssassin-3.4.3.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIVAwUAXfFYoP3lL0D305gUAQqkqg//WaOsG1vKqt5EZfP06Gb491JWdgh5+0ea -ZUKN/k8cwdCVJgOu2CViOVWgaZMg923resMm+ZLhMbTQswLXIYIQXY0IUGi9yHyN -3GdyImEjOj/01iG6z10JnK7gGspw6hERt81S/mcPuUuU24CBcf6rGHiFBNoR1/2Z -cdxfRjJnnfqv65szJCorPa2INaOWej8SGqm3KqT9roGu8R2NcVxR/Tzkh/lW3ihe -U0PWaM8DfW6IBmh2u/3emHQlgP8EIUDS5Skj9CYKESRNnOvhejcvRrFy0ikYm6ik -4RrR/FbFZrgzL4szJUMQQJfSypGZnh29sUgV8xVNkvY1cSUC601eD+hNVB9vytbu -mPxwQwfGbULBIe7K2AOY7y0gI0/M49+P5MVXpTrqhicCVEwKm0J9Ukh5HHCblBtJ -GYmSBJEsbKDxI+le8afFHeog9Xy/bOoBk/syrHJADWIahxKQvvx2JZGSgmgtIFuO -IPevu4zxd4aP1iLr+ZlLjvq/e6o/ss5GQIGdZ9GKfs2CHH6/ckqoqB/L2H99p7li -bNcCTtpVsS8pO/pmxQwsMTSxQkwbZW8QhAC1xUaRYEsEZ6ID9Y8+rrEmco8Opo38 -DGfOsRxUmMGqh5vY6+5ycrLDqlzWRrvb4jLyhxitiuA1Q4u4D8ZpJ57SfwRjt1ad -dtqWTxFWQqA= -=VeZv ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-3.4.4.tar.bz2 b/Mail-SpamAssassin-3.4.4.tar.bz2 new file mode 100644 index 0000000..64b2e07 --- /dev/null +++ b/Mail-SpamAssassin-3.4.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e2bc79e24cdbb3d8262e6ec4f5bb3dde670de9caaa739d50c698b6d45ac453d +size 2741290 diff --git a/Mail-SpamAssassin-3.4.4.tar.bz2.asc b/Mail-SpamAssassin-3.4.4.tar.bz2.asc new file mode 100644 index 0000000..52d8aa2 --- /dev/null +++ b/Mail-SpamAssassin-3.4.4.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIVAwUAXiutgf3lL0D305gUAQrTlg/9F06MB9f9hzBXZRJCUmX5Xybe87MsxDNf +XqNmvbYGDBGXdKdH1+GNc6jNMUxGyg9JCokvXSNeNSMeOvB3fIISEmGaPy9k48u9 +vUExtfqYU4qIx5vfVPaHsxInxuyAoKwHbROJ+eNtWX7QWS6ewlWjQKJQfnD8fwrs +VkYJnwptzVh9XPpTm3ZCzmSeNR+9pCYqqZJQueNIg1LpySB0sVAK3DzfZNXnCf53 +QfS5EcBqjVwxeu4UguR8/DcL0lIZNwPUb+AoEviJANzXVrPndGOELpEDpj3wcs7L +TGmMvwiQgB7yO6F4Iz1gtBa765Dhb1q4Qlg7WCCfmjOkn8hfNvHN+kcpz7ioNeWN +znZP4hDmje168q6BDiVcHZCQxiRmoQkGx1GWiHFv8LNDamIGrs3Fo9DTgTIwsh+A +Neh/flxlcZ/KH2aMi19eYeP02ex0avXcYQER8l6AYf7C0HVp0WdzbqQzopMCgPam +4IhCU8HAiGKiITUvi27D1Ex1bP8omKaOgyZm5X8ulzeT4zqV49945wYL725Yy9h7 +ZwlpNZm1TgJ6HzITpGxMof57uiKV5bs3vft614z2oODpigLIKpCTiqJs2fwLAWsk +mgtjODTpEtZiSJFFPWjeUH6ZuzoSirUTYhlKlqkINzunEtvh4ibiRqfnTe27Ib5G +/FmYaD8zqRg= +=JVLX +-----END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz b/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz deleted file mode 100644 index ab64e42..0000000 --- a/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4804c19c5ee2065443fa09e3940462daa48481dfa9d4a1d95e2683d75c7c7d9 -size 315149 diff --git a/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc b/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc deleted file mode 100644 index be18256..0000000 --- a/Mail-SpamAssassin-rules-3.4.3.r1871124.tgz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJd8IgEAAoJEGxVOXgk9DTOXhgP/i3ntGFfW1GSsflxwe/4IXVl -9/o7cpi7hDKdv9JrtyUU1TUR752w5t85kFmtVDSODgFlbg6E00HeyPIH+ISYKFRo -axKxeqaEBbWZP2vk7O9f7ss+a+fmHOwfMXW4Fpgd52GBUdWSx2+faf5TSeV2YJWo -eQxXD2hbBNaOKUbWf/AxRhtruGpn0N0sDJ2Ip8C8weJrmanXW1AUARDNTudtYp2i -nGwajngiPhMZQ6Q8y+1kmW/KyfzAmhkhLnmyN2mvpxkZMkkOh1rPSMj+kgAehi4R -l/rEgAOnk7YZIyqnuZx+PZH7xnz2LVkTM5Y+n9SApd+PyVyRzpVw5yzO4W0E1PJp -uuglBtLA47R24gOm0wdMKCVFCWKX/XC7HVFGsQrxb3A8mdl1tAHWPqZm7s6TljPd -5wPbucUeSro/6ZrPzxD5Y2qTBG7GiePDpKueVWrx8AxSDqYf6GDlQtScYdMellNw -48rIK0M4+BXBNYfoDuFgBVPFTTYt/J77fN4VYNHTDtx65LXdBMsI28lUVtwu2tjQ -hWRHQr69koHwBdLdqn29bsR1COBimb3t80XvAW0JZTFmWgqg8I3fDxMwRqKfSdEB -PhZTZSH90tiIa6FDNcGELiswBFFGpQAtnjHM0DtiJS8e7S/Qs1HHHaPn2N/D3xle -J3oOYk6EbVPShMirErLn -=fECM ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz b/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz new file mode 100644 index 0000000..bf4c7da --- /dev/null +++ b/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4cbd90fa22b9104ee095d1fe08a9d1cd3b3a0f6022c52214c025443ffffe241 +size 315930 diff --git a/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc b/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc new file mode 100644 index 0000000..ec5be32 --- /dev/null +++ b/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJeKoFqAAoJEGxVOXgk9DTOqg4P/3FugriP1lyeznUjh2dQLNbw +9MudGbjpxAYRelR+gDCfuvpcsDODaayfxGkj2g5FCmZkqClqM+6j6FRTmt3qOV/6 +Qzt0x+Ok+HHRf++JhQ+xMiKFfFp6h0K3hwkq4s4ElAVryEKKjucOKtd3b6A5hi5x +FDgQKglUHILwB90QNDElBhIcJogI2Too/FmBqfxOxEXRlATGPgJKDjnJvr05wUmv +EbFaTzUPiyzaVdraPHWH/YgAr0n8o8tmWCvg9afdUnUsJWTeRUaGmYqzcHHodRXD +wcBpjZZR+xfaWkjtPNL2KddWRSxAaWsPIM5/zICH9vhUPvb0G7HYQsab9/0BrjpE +GUbkJ4XJ74BQBfGeQD1m5aH5e1f+1yv0tX6bHcG8lg6wX7RxWHK1B1UcQB/dcFJZ +hjhGHAdd/3VFbxzM4cXdDmS8JugEgIn1cUbThHIzkhPzfEVpOQ85iHpRi5NvbQwP +RGHcSRH+9/skrwOvSC7Sw7JyQDEboRmLjMEnUC+yers+1Hnfuf4k0o8/wBjjWjIJ +VZSZtPKVZF2dxCcSplWIvBESeHEO3YOWvk/ZaQv4A3Vtq47io6013IE/Iys1kuJf +8bEhPDs2Yu9lcUPF6QmHS/IE+zDE3fgLxmZVeThoQ5pK0XAE2q0EhtwpRWRHQ5Am +JyYr5EQwbki+judv7tto +=oNL6 +-----END PGP SIGNATURE----- diff --git a/spamassassin.changes b/spamassassin.changes index e01d1cc..cbd6a4a 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Jan 29 19:26:21 UTC 2020 - Arjen de Korte + +- update spamassassin to 3.4.4 + * In this release, there are bug fixes for two CVEs: + CVE-2020-1931 for Nefarious rule configuration (.cf) files can + be configured to run system commands with warnings. + CVE-2020-1930 for Nefarious rule configuration (.cf) files can + be configured to run system commands with sa-compile. + * Improvements to OLEVBMacro + * Fix for CRLF handling with SpamAssMilter & DKIM + * Small fix for a regexp to provide Perl 5.8.x compatability again + * Increased fns_extrachars default value to 50 + * Fixed nosubject and maxhits tflags when sa-compile is used + * Limited the Bayes parsed token count + * Improvements to whitespace trimming + ------------------------------------------------------------------- Sat Dec 14 10:32:50 UTC 2019 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index f1699d5..ae4cb5e 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,9 +23,9 @@ %define ix_version 2.05 %define spd_version 2.53 -%define sa_version 3.4.3 +%define sa_version 3.4.4 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') -%define rules_revision 1871124 +%define rules_revision 1873061 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} -- 2.51.1 From ac652cefec983efd8f8ddc5857dc1f16783127de3d777bda0666c64a2feb383c Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Sun, 20 Dec 2020 11:14:08 +0000 Subject: [PATCH 18/37] Accepting request 857130 from home:kukuk:container - Move spamc into an own sub-package to avoid the full spamassassin installation on every client if there is a spamd server OBS-URL: https://build.opensuse.org/request/show/857130 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=140 --- spamassassin.changes | 6 ++++++ spamassassin.spec | 26 ++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index cbd6a4a..1898da8 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 19 16:16:05 UTC 2020 - Thorsten Kukuk + +- Move spamc into an own sub-package to avoid the full spamassassin + installation on every client if there is a spamd server + ------------------------------------------------------------------- Wed Jan 29 19:26:21 UTC 2020 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index ae4cb5e..9156c36 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -73,6 +73,7 @@ Requires: perl-IO-Socket-INET6 Requires: perl-Mail-DKIM Requires: perl-Mail-SpamAssassin = %version Requires: re2c +Requires: spamassassin-spamc = %version Requires: perl(Net::Server::PreForkSimple) BuildRequires: pkgconfig(systemd) %{?systemd_ordering} @@ -87,6 +88,14 @@ See the files in the documentation directory /usr/share/doc/packages/spamassassin/ for more information on how to use the filter. +%package spamc +Summary: Spammassassin Client +Group: Productivity/Networking/Email/Utilities + +%description spamc +Spamc is the client to contact the spammassassin spamd daemon. It should +be used in place of "spamassassin" in scripts to process mail. + %package -n perl-Mail-SpamAssassin Summary: Perl Modules For Using Spamassassin Within An Own Perl Script Group: Development/Libraries/Perl @@ -283,8 +292,11 @@ fi %files %defattr(-,root,root) %doc spamd/README spamd/README.vpopmail spamd/PROTOCOL -%doc %{_mandir}/man1/* -%{_bindir}/* +%{_mandir}/man1/sa-* +%{_mandir}/man1/spamassassin* +%{_mandir}/man1/spamd.1* +%{_bindir}/sa-* +%{_bindir}/spamassassin %{_sbindir}/* %{_fillupdir}/sysconfig.spamd %{_fillupdir}/sysconfig.spampd @@ -294,9 +306,15 @@ fi %{_unitdir}/sa-update.timer %ghost %{_sharedstatedir}/%{name} +%files spamc +%defattr(-,root,root) +%license LICENSE +%{_bindir}/spamc +%doc %{_mandir}/man1/spamc.1* + %files -n perl-Mail-SpamAssassin -f %{name}.files %defattr(-,root,root) -%license LICENSE +%license LICENSE %doc CREDITS Changes MANIFEST* NOTICE PACKAGING README %doc TRADEMARK UPGRADE USAGE sample-nonspam.txt sample-spam.txt %doc ldap sql @@ -309,7 +327,7 @@ fi %files -n perl-Mail-SpamAssassin-Plugin-iXhash2 %defattr(-,root,root) -%doc %{IXHASH}/CHANGELOG %{IXHASH}/LICENSE %{IXHASH}/README +%doc %{IXHASH}/CHANGELOG %{IXHASH}/LICENSE %{IXHASH}/README %config(noreplace) /etc/mail/spamassassin/iXhash2.cf %{perl_vendorlib}/Mail/SpamAssassin/Plugin/iXhash2.pm -- 2.51.1 From aaf443eef7ff95e8a7ada4ddccd3cb80922f7836ee90d4da083f9086b2e2cea3 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Sun, 20 Dec 2020 13:58:15 +0000 Subject: [PATCH 19/37] Accepting request 857145 from home:adkorte - Compile rules in %post if Perl and/or spamassassin version changed and SPAM_SA_COMPILE=yes - Enable test (add basic-lint-without-sandbox.patch) - Ignore known warnings (add spamassassin-rpmlintrc) OBS-URL: https://build.opensuse.org/request/show/857145 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=141 --- basic-lint-without-sandbox.patch | 12 ++ spamassassin-rpmlintrc | 3 + spamassassin.changes | 8 ++ spamassassin.spec | 199 +++++++++++++++++-------------- 4 files changed, 135 insertions(+), 87 deletions(-) create mode 100644 basic-lint-without-sandbox.patch create mode 100644 spamassassin-rpmlintrc diff --git a/basic-lint-without-sandbox.patch b/basic-lint-without-sandbox.patch new file mode 100644 index 0000000..952c37a --- /dev/null +++ b/basic-lint-without-sandbox.patch @@ -0,0 +1,12 @@ +diff -purN a/t/basic_lint_without_sandbox.t b/t/basic_lint_without_sandbox.t +--- a/t/basic_lint_without_sandbox.t 2020-01-25 03:51:14.000000000 +0100 ++++ b/t/basic_lint_without_sandbox.t 2020-11-10 22:58:02.294809138 +0100 +@@ -25,7 +25,7 @@ my $sandboxfile = "log/test_rules_copy/7 + # so we can use that to tell if this is the case + SKIP: { + skip( "Not on a sandbox", 2 ) unless -f $scoresfile; +- ok -f $sandboxfile; ++ skip( "Not on a sandbox", 2 ) unless -f $sandboxfile; + unlink $sandboxfile; + ok !-f $sandboxfile; + } diff --git a/spamassassin-rpmlintrc b/spamassassin-rpmlintrc new file mode 100644 index 0000000..9f5d105 --- /dev/null +++ b/spamassassin-rpmlintrc @@ -0,0 +1,3 @@ +addFilter("no-dependency-on perl-base") +addFilter("systemd-service-without-service_.* sa-update.service") +addFilter("suse-missing-rclink sa-update") diff --git a/spamassassin.changes b/spamassassin.changes index 1898da8..55f6128 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -4,6 +4,14 @@ Sat Dec 19 16:16:05 UTC 2020 - Thorsten Kukuk - Move spamc into an own sub-package to avoid the full spamassassin installation on every client if there is a spamd server +------------------------------------------------------------------- +Thu Dec 17 20:21:29 UTC 2020 - Arjen de Korte + +- Compile rules in %post if Perl and/or spamassassin version changed + and SPAM_SA_COMPILE=yes +- Enable test (add basic-lint-without-sandbox.patch) +- Ignore known warnings (add spamassassin-rpmlintrc) + ------------------------------------------------------------------- Wed Jan 29 19:26:21 UTC 2020 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index 9156c36..0183a0f 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -16,26 +16,24 @@ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates -%endif +%bcond_without test %define ix_version 2.05 %define spd_version 2.53 %define sa_version 3.4.4 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') +%define perl_float %(echo %{perl_version} | awk -F. '{ printf "%d.%03d", $1, $2 }') %define rules_revision 1873061 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} Name: spamassassin +Version: %{sa_version} +Release: 0 Summary: Extensible email filter which is used to identify spam License: Apache-2.0 Group: Productivity/Networking/Email/Utilities -Version: %{sa_version} -Release: 0 URL: https://spamassassin.apache.org/ Source: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2 Source1: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz @@ -53,29 +51,33 @@ Source100: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAss Source101: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz.asc # Keyring downloaded from https://www.apache.org/dist/spamassassin/KEYS Source102: spamassassin.keyring +Source103: %{name}-rpmlintrc Patch1: patch-PgSQL Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT Patch6: bnc#582111.diff +Patch7: basic-lint-without-sandbox.patch Patch10: iXhash2-meta-rules.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} -PreReq: %fillup_prereq -BuildRequires: dos2unix -BuildRequires: openssl-devel +BuildRequires: perl(Error) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(zlib) # optional, but want them for build (test) BuildRequires: curl >= 7.2.14 BuildRequires: gpg +BuildRequires: netcfg BuildRequires: re2c +BuildRequires: wget >= 1.8.2 # -Requires: curl >= 7.2.14 -Requires: perl-IO-Socket-INET6 -Requires: perl-Mail-DKIM -Requires: perl-Mail-SpamAssassin = %version +Requires: perl-spamassassin = %{sa_version} +Requires: spamassassin-spamc = %{sa_version} Requires: re2c -Requires: spamassassin-spamc = %version +Requires: (curl >= 7.2.14 or wget >= 1.8.2) +Requires: perl(Archive::Tar) >= 1.23 +Requires: perl(Error) +Requires: perl(IO::Zlib) >= 1.04 +Requires: perl(LWP) Requires: perl(Net::Server::PreForkSimple) -BuildRequires: pkgconfig(systemd) +Requires(post): %fillup_prereq %{?systemd_ordering} %description @@ -85,7 +87,7 @@ mail within the scope of your own filtering rules in your MUA (Mail User Agent, your mail program) or your LDA (Local Delivery Agent). See the files in the documentation directory -/usr/share/doc/packages/spamassassin/ for more information on how to +%{_docdir}/spamassassin/ for more information on how to use the filter. %package spamc @@ -99,62 +101,88 @@ be used in place of "spamassassin" in scripts to process mail. %package -n perl-Mail-SpamAssassin Summary: Perl Modules For Using Spamassassin Within An Own Perl Script Group: Development/Libraries/Perl -BuildRequires: perl -BuildRequires: perl-Error BuildRequires: perl(Archive::Tar) >= 1.23 +BuildRequires: perl(Compress::Zlib) +BuildRequires: perl(DB_File) BuildRequires: perl(Digest::SHA1) BuildRequires: perl(Errno) BuildRequires: perl(File::Copy) >= 2.02 BuildRequires: perl(File::Spec) >= 0.8 +BuildRequires: perl(Getopt::Long) >= 2.32 BuildRequires: perl(HTML::Parser) >= 3.43 BuildRequires: perl(IO::Zlib) >= 1.04 +BuildRequires: perl(MIME::Base64) BuildRequires: perl(Mail::DKIM) >= 0.37 -BuildRequires: perl(Net::DNS) >= 0.34 -BuildRequires: perl(NetAddr::IP) >= 4.000 +BuildRequires: perl(Net::DNS) >= 0.58 +BuildRequires: perl(Net::SMTP) +BuildRequires: perl(NetAddr::IP) >= 4.010 BuildRequires: perl(Pod::Usage) >= 1.10 BuildRequires: perl(Sys::Hostname) +BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) BuildRequires: perl(Time::Local) # optional, but want them for build (test) BuildRequires: perl(Archive::Zip) +BuildRequires: perl(BerkeleyDB) BuildRequires: perl(BSD::Resource) +BuildRequires: perl(DBD::mysql) BuildRequires: perl(DBI) BuildRequires: perl(Encode::Detect) BuildRequires: perl(HTTP::Date) BuildRequires: perl(IO::Socket::INET6) -BuildRequires: perl(IO::Socket::SSL) +BuildRequires: perl(IO::Socket::SSL) >= 1.76 BuildRequires: perl(IO::String) -BuildRequires: perl(IP::Country) +BuildRequires: perl(IP::Country::Fast) BuildRequires: perl(LWP::UserAgent) -BuildRequires: perl(Mail::SPF) +BuildRequires: perl(Mail::SPF) >= 2.001 BuildRequires: perl(Net::Ident) BuildRequires: perl(Net::Patricia) >= 1.16 BuildRequires: perl(Razor2::Client::Agent) >= 2.61 +%if 0%{?is_opensuse} +BuildRequires: perl(Devel::Cycle) +BuildRequires: perl(Net::CIDR::Lite) +%endif # -Requires: perl-libwww-perl -Requires: perl(Archive::Tar) >= 1.23 +Requires: perl(Archive::Zip) Requires: perl(Digest::SHA1) Requires: perl(Errno) Requires: perl(File::Copy) >= 2.02 Requires: perl(File::Spec) >= 0.8 Requires: perl(HTML::Parser) >= 3.43 -Requires: perl(IO::Socket::IP) -Requires: perl(IO::Zlib) >= 1.04 -Requires: perl(Mail::DKIM) >= 0.37 +Requires: perl(Mail::DKIM) >= 0.31 Requires: perl(Net::DNS) >= 0.34 Requires: perl(NetAddr::IP) >= 4.010 Requires: perl(Pod::Usage) >= 1.10 Requires: perl(Sys::Hostname) Requires: perl(Time::HiRes) Requires: perl(Time::Local) -# optional -Recommends: perl(Mail::SPF) -Recommends: perl(Net::Patricia) >= 1.16 -Recommends: perl(Razor2::Client::Agent) >= 2.61 -Recommends: perl(IO::Socket::INET6) -Recommends: perl(IO::Socket::SSL) -Recommends: perl(DBI) +Recommends: perl(Archive::Tar) >= 1.23 +Recommends: perl(BSD::Resource) +Recommends: perl(Compress::Zlib) +Recommends: perl(DB_File) Recommends: perl(Encode::Detect) +Recommends: perl(Getopt::Long) >= 2.32 +Recommends: perl(HTTP::Date) +Recommends: perl(IO::Socket::INET6) +Recommends: perl(IO::Socket::SSL) >= 1.76 +Recommends: perl(IO::String) +Recommends: perl(IO::Zlib) >= 1.04 +Recommends: perl(IP::Country::Fast) +Recommends: perl(LWP::UserAgent) +Recommends: perl(MIME::Base64) +Recommends: perl(Mail::DKIM) >= 0.37 +Recommends: perl(Mail::SPF) >= 2.001 +Recommends: perl(Net::CIDR::Lite) +Recommends: perl(Net::DNS) >= 0.58 +Recommends: perl(Net::Ident) +Recommends: perl(Net::Patricia) >= 1.16 +Recommends: perl(Net::SMTP) +Recommends: perl(Test::More) +Recommends: perl(Razor2::Client::Agent) >= 2.61 +Suggests: perl(DBD::mysql) +Suggests: perl(DBI) +Suggests: perl(Geo::IP) +Suggests: perl(GeoIP2::Database::Reader) Provides: perl-spamassassin = %{sa_version} Obsoletes: perl-spamassassin < %{sa_version} BuildArch: noarch @@ -166,14 +194,14 @@ the filter rules. This package is required for the package "spamassassin", the commandline tool. %package -n perl-Mail-SpamAssassin-Plugin-iXhash2 -Summary: The iXhash plugin for SpamAssassin -Group: Development/Libraries/Perl -Requires: perl-Mail-SpamAssassin = %{sa_version} -Requires: perl(Digest::MD5) Version: %{ix_version} Release: 0 +Summary: The iXhash plugin for SpamAssassin +Group: Development/Libraries/Perl +Requires: perl-spamassassin = %{sa_version} +Requires: perl(Digest::MD5) Provides: perl-Mail-SpamAssassin-Plugin-iXhash = %{ix_version} -Obsoletes: perl-Mail-SpamAssassin-Plugin-iXhash < 2 +Obsoletes: perl-Mail-SpamAssassin-Plugin-iXhash < %{ix_version} BuildArch: noarch %{perl_requires} @@ -184,39 +212,34 @@ software, along with an example config file. Basically the plugin provides a network-based test just as razor2, pyzor and DCC do. Working solely on the body of an email, it removes parts of it and computes a hash value from the rest. These values will then be looked up -via DNS using the domains given in the config file(s). You need Net::DNS and -Digest::MD5 installed +via DNS using the domains given in the config file(s). %prep %setup -q -n Mail-SpamAssassin-%{sa_version} -a 2 -a 3 -tar -zxf %{S:1} -C rules -%patch1 -p0 +tar -zxf %{SOURCE1} -C rules +%patch1 %patch2 -p1 -%patch3 -p0 -%patch6 -p0 -%patch10 -p0 +%patch3 +%patch6 +%patch7 -p1 +%patch10 %build -if [ -e t/data/whitelists/winxpnews.com ]; then - echo "t/data/whitelists/winxpnews.com is not allowed to be distributed." - echo "see #102221" - #exit -1 # hidden bug description, so I can't see there - ignored -fi; -if [ -e build/cf_to_html ]; then - echo "build/cf_to_html is not allowed to be distributed." - echo "see #102221" - #exit -1 # hidden bug description, so I can't see there - ignored -fi; +# Run substitutions in default rules +sed -i -e 's|@@CONTACT_ADDRESS@@|postmaster|g' \ + -e 's|@@LOCAL_RULES_DIR@@|%{_sysconfdir}/mail/spamassassin|g' \ + -e 's|@@VERSION@@|%{sa_float}|g' rules/*.cf export CFLAGS="%{optflags}" perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" \ - CONTACT_ADDRESS="postmaster" ENABLE_SSL="yes" + CONTACT_ADDRESS="postmaster" ENABLE_SSL="yes" -make %{?_smp_mflags} +%make_build %check -# fails now... FIGURE out why -#make test +%if %{with test} +%make_build -j1 test +%endif %install ## perl-Mail-SpamAssassin stuff @@ -229,21 +252,21 @@ sed -i -e "/\/usr\/bin/d" %{name}.files sed -i -e "s,%{_mandir}/man?,%{_mandir}/man3," %{name}.files # ## perl-Mail-SpamAssassin-Plugin-iXhash2 stuff -install -d %{buildroot}/etc/mail/spamassassin -cp %{IXHASH}/iXhash2.pm %{buildroot}/%{perl_vendorlib}/Mail/SpamAssassin/Plugin -cp %{IXHASH}/iXhash2.cf %{buildroot}/etc/mail/spamassassin/iXhash2.cf +install -d %{buildroot}%{_sysconfdir}/mail/spamassassin +cp %{IXHASH}/iXhash2.pm %{buildroot}%{perl_vendorlib}/Mail/SpamAssassin/Plugin +cp %{IXHASH}/iXhash2.cf %{buildroot}%{_sysconfdir}/mail/spamassassin/iXhash2.cf # ## spamassassin stuff -install -D -m0755 %{SPAMPD}/spampd.pl %{buildroot}/%{_sbindir}/spampd -install -m 0755 %{S:15} %{buildroot}/%{_sbindir}/ -mv %{buildroot}/%{_bindir}/spamd %{buildroot}/%{_sbindir}/ -install -m 0644 %{S:10} %{buildroot}/etc/mail/spamassassin/local.cf +install -D -m0755 %{SPAMPD}/spampd.pl %{buildroot}%{_sbindir}/spampd +install -m 0755 %{SOURCE15} %{buildroot}%{_sbindir}/ +mv %{buildroot}%{_bindir}/spamd %{buildroot}%{_sbindir}/ +install -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/mail/spamassassin/local.cf ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd echo "Most of the documentation is at ../perl-Mail-SpamAssassin/." > README.SUSE -install -D -m 0640 %{S:12} %{buildroot}/%{_fillupdir}/sysconfig.spamd -install -m 0640 %{S:14} %{buildroot}/%{_fillupdir}/ -test -f %{buildroot}/usr/share/spamassassin/user_prefs.template || { +install -D -m 0640 %{SOURCE12} %{buildroot}%{_fillupdir}/sysconfig.spamd +install -m 0640 %{SOURCE14} %{buildroot}%{_fillupdir}/ +test -f %{buildroot}%{_datadir}/spamassassin/user_prefs.template || { echo "MakeMaker is broken again..." exit 1 } @@ -251,16 +274,13 @@ test -f %{buildroot}/usr/share/spamassassin/user_prefs.template || { ## default rules install -d %{buildroot}%{_datadir}/spamassassin install -D -m 0644 rules/[0-9]*.cf %{buildroot}%{_datadir}/spamassassin -sed -i -e 's|@@CONTACT_ADDRESS@@|postmaster|g' \ - -e 's|@@LOCAL_RULES_DIR@@|/etc/mail/spamassassin|g' \ - -e 's|@@VERSION@@|%{sa_float}|g' %{buildroot}%{_datadir}/spamassassin/*.cf ## systemd stuff -mkdir -p %{buildroot}/%{_unitdir} -install -D -m 644 %{S:16} %{buildroot}/%{_unitdir} -install -D -m 644 %{S:17} %{buildroot}/%{_unitdir} -install -D -m 644 %{S:18} %{buildroot}/%{_unitdir} -install -D -m 644 %{S:19} %{buildroot}/%{_unitdir} +install -d %{buildroot}%{_unitdir} +install -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir} +install -D -m 644 %{SOURCE17} %{buildroot}%{_unitdir} +install -D -m 644 %{SOURCE18} %{buildroot}%{_unitdir} +install -D -m 644 %{SOURCE19} %{buildroot}%{_unitdir} %post %service_add_post spamd.service spampd.service sa-update.timer @@ -274,6 +294,11 @@ if [ $1 -gt 1 ]; then fi done find %{_sharedstatedir}/%{name} -type d -empty -delete 2>/dev/null || : + + # Compile rules if Perl and/or spamassassin version changed + if [ ! -d %{_sharedstatedir}/%{name}/compiled/%{perl_float}/%{sa_float} ]; then + grep -q "^SPAM_SA_COMPILE.*yes.*" %{_sysconfdir}/sysconfig/spamd && %{_bindir}/sa-compile &> /dev/null || : + fi fi %pre @@ -318,17 +343,17 @@ fi %doc CREDITS Changes MANIFEST* NOTICE PACKAGING README %doc TRADEMARK UPGRADE USAGE sample-nonspam.txt sample-spam.txt %doc ldap sql -%dir /etc/mail -%config(noreplace) /etc/mail/spamassassin -%exclude /etc/mail/spamassassin/iXhash2.cf +%dir %{_sysconfdir}/mail +%config(noreplace) %{_sysconfdir}/mail/spamassassin +%exclude %{_sysconfdir}/mail/spamassassin/iXhash2.cf %exclude %{perl_vendorarch} %dir %{_datadir}/spamassassin %{_datadir}/spamassassin/* %files -n perl-Mail-SpamAssassin-Plugin-iXhash2 -%defattr(-,root,root) -%doc %{IXHASH}/CHANGELOG %{IXHASH}/LICENSE %{IXHASH}/README -%config(noreplace) /etc/mail/spamassassin/iXhash2.cf +%license %{IXHASH}/LICENSE +%doc %{IXHASH}/CHANGELOG %{IXHASH}/README +%config(noreplace) %{_sysconfdir}/mail/spamassassin/iXhash2.cf %{perl_vendorlib}/Mail/SpamAssassin/Plugin/iXhash2.pm %changelog -- 2.51.1 From b3203ca53c42647d5b14271d80e6913fd0b36c133f013940e64d9bfaff7fd6ba Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Sat, 26 Dec 2020 13:56:27 +0000 Subject: [PATCH 20/37] Accepting request 858756 from home:adkorte - Require perl(Mail::SpamAssassin) instead of perl-spamassassin - Don't use BerkeleyDB (not even for unit test) - Don't use is_opensuse conditional OBS-URL: https://build.opensuse.org/request/show/858756 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=142 --- spamassassin.changes | 7 +++++++ spamassassin.spec | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index 55f6128..c9c9215 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 23 16:05:26 UTC 2020 - Arjen de Korte + +- Require perl(Mail::SpamAssassin) instead of perl-spamassassin +- Don't use BerkeleyDB (not even for unit test) +- Don't use is_opensuse conditional + ------------------------------------------------------------------- Sat Dec 19 16:16:05 UTC 2020 - Thorsten Kukuk diff --git a/spamassassin.spec b/spamassassin.spec index 0183a0f..771c2a5 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -68,7 +68,6 @@ BuildRequires: netcfg BuildRequires: re2c BuildRequires: wget >= 1.8.2 # -Requires: perl-spamassassin = %{sa_version} Requires: spamassassin-spamc = %{sa_version} Requires: re2c Requires: (curl >= 7.2.14 or wget >= 1.8.2) @@ -76,6 +75,7 @@ Requires: perl(Archive::Tar) >= 1.23 Requires: perl(Error) Requires: perl(IO::Zlib) >= 1.04 Requires: perl(LWP) +Requires: perl(Mail::SpamAssassin) = %{sa_float} Requires: perl(Net::Server::PreForkSimple) Requires(post): %fillup_prereq %{?systemd_ordering} @@ -123,10 +123,10 @@ BuildRequires: perl(Time::HiRes) BuildRequires: perl(Time::Local) # optional, but want them for build (test) BuildRequires: perl(Archive::Zip) -BuildRequires: perl(BerkeleyDB) BuildRequires: perl(BSD::Resource) BuildRequires: perl(DBD::mysql) BuildRequires: perl(DBI) +BuildRequires: perl(Devel::Cycle) BuildRequires: perl(Encode::Detect) BuildRequires: perl(HTTP::Date) BuildRequires: perl(IO::Socket::INET6) @@ -135,13 +135,10 @@ BuildRequires: perl(IO::String) BuildRequires: perl(IP::Country::Fast) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Mail::SPF) >= 2.001 +BuildRequires: perl(Net::CIDR::Lite) BuildRequires: perl(Net::Ident) BuildRequires: perl(Net::Patricia) >= 1.16 BuildRequires: perl(Razor2::Client::Agent) >= 2.61 -%if 0%{?is_opensuse} -BuildRequires: perl(Devel::Cycle) -BuildRequires: perl(Net::CIDR::Lite) -%endif # Requires: perl(Archive::Zip) Requires: perl(Digest::SHA1) @@ -198,8 +195,8 @@ Version: %{ix_version} Release: 0 Summary: The iXhash plugin for SpamAssassin Group: Development/Libraries/Perl -Requires: perl-spamassassin = %{sa_version} Requires: perl(Digest::MD5) +Requires: perl(Mail::SpamAssassin) = %{sa_float} Provides: perl-Mail-SpamAssassin-Plugin-iXhash = %{ix_version} Obsoletes: perl-Mail-SpamAssassin-Plugin-iXhash < %{ix_version} BuildArch: noarch -- 2.51.1 From a8a7469a34e47a28eb66e965ee169f31e6057ab3660e3c4b7e3026d237aacf10 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Fri, 12 Feb 2021 13:57:49 +0000 Subject: [PATCH 21/37] Accepting request 871434 from home:pmonrealgonzalez:branches:devel:languages:perl - Relax the crypto policies for the test-suite. This will allow the tests that use certificates with small key lengths to pass. OBS-URL: https://build.opensuse.org/request/show/871434 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=144 --- spamassassin.changes | 6 ++++++ spamassassin.spec | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index c9c9215..6fa94a2 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 12 11:25:16 UTC 2021 - Pedro Monreal + +- Relax the crypto policies for the test-suite. This will allow the + tests that use certificates with small key lengths to pass. + ------------------------------------------------------------------- Wed Dec 23 16:05:26 UTC 2020 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index 771c2a5..fd02727 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -68,8 +68,8 @@ BuildRequires: netcfg BuildRequires: re2c BuildRequires: wget >= 1.8.2 # -Requires: spamassassin-spamc = %{sa_version} Requires: re2c +Requires: spamassassin-spamc = %{sa_version} Requires: (curl >= 7.2.14 or wget >= 1.8.2) Requires: perl(Archive::Tar) >= 1.23 Requires: perl(Error) @@ -235,6 +235,9 @@ perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" \ %check %if %{with test} +# Relax the crypto policies for the test-suite +export OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file +export OPENSSL_CONF='' %make_build -j1 test %endif -- 2.51.1 From 8a26f8561a0b31f7dc4c517ecd0dc36ce7bd0788132499b1ad7dda4e8d755b1b Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Wed, 24 Mar 2021 20:06:24 +0000 Subject: [PATCH 22/37] Accepting request 881204 from home:adkorte - update spamassassin to 3.4.5 * In this release, there are bug fixes for one CVE: CVE-2020-1946 for Malicious rule configuration (.cf) files can be configured to run system commands * Improvements to OLEVBMacro and AskDNS plugins * Received and EnvelopeFrom headers matching improvements * userpref SQL schema fixes * rbl and hashbl evaluation improvements * fix for non working TxRep tag names * man page fixes - Update download links OBS-URL: https://build.opensuse.org/request/show/881204 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=146 --- Mail-SpamAssassin-3.4.4.tar.bz2 | 3 --- Mail-SpamAssassin-3.4.4.tar.bz2.asc | 17 ----------------- Mail-SpamAssassin-3.4.5.tar.bz2 | 3 +++ Mail-SpamAssassin-3.4.5.tar.bz2.asc | 17 +++++++++++++++++ Mail-SpamAssassin-rules-3.4.4.r1873061.tgz | 3 --- Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc | 17 ----------------- Mail-SpamAssassin-rules-3.4.5.r1887800.tgz | 3 +++ Mail-SpamAssassin-rules-3.4.5.r1887800.tgz.asc | 16 ++++++++++++++++ spamassassin.changes | 15 +++++++++++++++ spamassassin.spec | 14 +++++++------- 10 files changed, 61 insertions(+), 47 deletions(-) delete mode 100644 Mail-SpamAssassin-3.4.4.tar.bz2 delete mode 100644 Mail-SpamAssassin-3.4.4.tar.bz2.asc create mode 100644 Mail-SpamAssassin-3.4.5.tar.bz2 create mode 100644 Mail-SpamAssassin-3.4.5.tar.bz2.asc delete mode 100644 Mail-SpamAssassin-rules-3.4.4.r1873061.tgz delete mode 100644 Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc create mode 100644 Mail-SpamAssassin-rules-3.4.5.r1887800.tgz create mode 100644 Mail-SpamAssassin-rules-3.4.5.r1887800.tgz.asc diff --git a/Mail-SpamAssassin-3.4.4.tar.bz2 b/Mail-SpamAssassin-3.4.4.tar.bz2 deleted file mode 100644 index 64b2e07..0000000 --- a/Mail-SpamAssassin-3.4.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e2bc79e24cdbb3d8262e6ec4f5bb3dde670de9caaa739d50c698b6d45ac453d -size 2741290 diff --git a/Mail-SpamAssassin-3.4.4.tar.bz2.asc b/Mail-SpamAssassin-3.4.4.tar.bz2.asc deleted file mode 100644 index 52d8aa2..0000000 --- a/Mail-SpamAssassin-3.4.4.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIVAwUAXiutgf3lL0D305gUAQrTlg/9F06MB9f9hzBXZRJCUmX5Xybe87MsxDNf -XqNmvbYGDBGXdKdH1+GNc6jNMUxGyg9JCokvXSNeNSMeOvB3fIISEmGaPy9k48u9 -vUExtfqYU4qIx5vfVPaHsxInxuyAoKwHbROJ+eNtWX7QWS6ewlWjQKJQfnD8fwrs -VkYJnwptzVh9XPpTm3ZCzmSeNR+9pCYqqZJQueNIg1LpySB0sVAK3DzfZNXnCf53 -QfS5EcBqjVwxeu4UguR8/DcL0lIZNwPUb+AoEviJANzXVrPndGOELpEDpj3wcs7L -TGmMvwiQgB7yO6F4Iz1gtBa765Dhb1q4Qlg7WCCfmjOkn8hfNvHN+kcpz7ioNeWN -znZP4hDmje168q6BDiVcHZCQxiRmoQkGx1GWiHFv8LNDamIGrs3Fo9DTgTIwsh+A -Neh/flxlcZ/KH2aMi19eYeP02ex0avXcYQER8l6AYf7C0HVp0WdzbqQzopMCgPam -4IhCU8HAiGKiITUvi27D1Ex1bP8omKaOgyZm5X8ulzeT4zqV49945wYL725Yy9h7 -ZwlpNZm1TgJ6HzITpGxMof57uiKV5bs3vft614z2oODpigLIKpCTiqJs2fwLAWsk -mgtjODTpEtZiSJFFPWjeUH6ZuzoSirUTYhlKlqkINzunEtvh4ibiRqfnTe27Ib5G -/FmYaD8zqRg= -=JVLX ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-3.4.5.tar.bz2 b/Mail-SpamAssassin-3.4.5.tar.bz2 new file mode 100644 index 0000000..5647a87 --- /dev/null +++ b/Mail-SpamAssassin-3.4.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67edf87126af4869c2a42720fc3dbb34ce25285449ef1f3fc1ab712d2e0a5463 +size 6167088 diff --git a/Mail-SpamAssassin-3.4.5.tar.bz2.asc b/Mail-SpamAssassin-3.4.5.tar.bz2.asc new file mode 100644 index 0000000..b002717 --- /dev/null +++ b/Mail-SpamAssassin-3.4.5.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIVAwUAYFXJf/3lL0D305gUAQqFqhAAhv3O1fvHNQAy3Rl8iSYOXwQEBD7nnFSa +mfntV4l8SmdShqb5tTCLt5zbnGaCOhG3r5HaDkfAR/mxPyG96kF+Q/Iol2JtUZ9T +GoGWg4oyihnBZUjME3K9GFVREwcj3heOnGFp4UqZoMBJwTh13lYHYK+xfHxoQDYI +3Dqldax7UiPulLWll7GC9mL/Ecb90UzXCwQQGYqxMC/+cKvmVMBDNS7zPVSu7SMr +5tkFTqFG4rxa7DKXH6BhfkJUy/uAxb+dv9FzEPnV1wfBVXKt9jEIYX4QWbSD637t +928ilZlYhLFo5D1Ull3/80xjE5ikkPBut6dbai9etXwwUFS2EF6pdJF4A3XUZQnJ +Ifsk686SGjnbbQXLPT9Is5/nK/RIQCnsZ/pa65xsBamg0ztmcHGog9cP8PSIBx3g +g0zTcIpzmzyoIdnuD6Nqm2zttxAWd4u9ONMeladCVkxARmBCDudAOdOZhEvWfMa3 +N1aOvJmOlL5Tyi1ZT0EOqdWmyD2liXncDvG6AXtKqsBQnQ9xaddk2zcig0MomKbE +qUgfG20SfntjXiXTb0m7rYZJcMwF3VKSeuVSlOTpJPcloJFvMKmk97TGnIbfpP0D +feQqLdfnFD5PYQUVCGUtMTCIE1ujT6j3KK0kyi/6P3MQ1gn0Er0ZydUKQJuSwKjj +fQke97A+Us4= +=YPB8 +-----END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz b/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz deleted file mode 100644 index bf4c7da..0000000 --- a/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4cbd90fa22b9104ee095d1fe08a9d1cd3b3a0f6022c52214c025443ffffe241 -size 315930 diff --git a/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc b/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc deleted file mode 100644 index ec5be32..0000000 --- a/Mail-SpamAssassin-rules-3.4.4.r1873061.tgz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJeKoFqAAoJEGxVOXgk9DTOqg4P/3FugriP1lyeznUjh2dQLNbw -9MudGbjpxAYRelR+gDCfuvpcsDODaayfxGkj2g5FCmZkqClqM+6j6FRTmt3qOV/6 -Qzt0x+Ok+HHRf++JhQ+xMiKFfFp6h0K3hwkq4s4ElAVryEKKjucOKtd3b6A5hi5x -FDgQKglUHILwB90QNDElBhIcJogI2Too/FmBqfxOxEXRlATGPgJKDjnJvr05wUmv -EbFaTzUPiyzaVdraPHWH/YgAr0n8o8tmWCvg9afdUnUsJWTeRUaGmYqzcHHodRXD -wcBpjZZR+xfaWkjtPNL2KddWRSxAaWsPIM5/zICH9vhUPvb0G7HYQsab9/0BrjpE -GUbkJ4XJ74BQBfGeQD1m5aH5e1f+1yv0tX6bHcG8lg6wX7RxWHK1B1UcQB/dcFJZ -hjhGHAdd/3VFbxzM4cXdDmS8JugEgIn1cUbThHIzkhPzfEVpOQ85iHpRi5NvbQwP -RGHcSRH+9/skrwOvSC7Sw7JyQDEboRmLjMEnUC+yers+1Hnfuf4k0o8/wBjjWjIJ -VZSZtPKVZF2dxCcSplWIvBESeHEO3YOWvk/ZaQv4A3Vtq47io6013IE/Iys1kuJf -8bEhPDs2Yu9lcUPF6QmHS/IE+zDE3fgLxmZVeThoQ5pK0XAE2q0EhtwpRWRHQ5Am -JyYr5EQwbki+judv7tto -=oNL6 ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz b/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz new file mode 100644 index 0000000..b75dc78 --- /dev/null +++ b/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2690aa131b79788ba756030af8746dd4531ab2c0cb56c0fe469f58d9dd043aad +size 368878 diff --git a/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz.asc b/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz.asc new file mode 100644 index 0000000..a1f6015 --- /dev/null +++ b/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmBVZvEACgkQbFU5eCT0 +NM4t9w/+NuclXWlPMv0+e+UXUFI7k0qYqBOT4S3eSXwzM9J4YpAd8KRrcBpIge2R +M2HRriR8nhnSKFY4sunCWBTWiNKh6DolOSKujkfNjVkedGrmigyP4avQIQCFV3ua +2RG839WAmAKU4HejSngNcELte2t6wuS6OqOTcsOpwTfyIBpHYbkmGWYJlLPAK+ls +IUGzaB0J9ocdisQHGq9zY2wUC1Ynx4cE9AbCOaD8FBsGBRvITZdOOdHHbP+BCUFZ +Shj+CvqBuyZibGpZxJ58GiOtKj4/T771+jCIXaxTxZ7rEkLbRvo5Uqrdk56GE3QN +kYGV7HtGChh646SdWR58GTslUnvAI+4MXnc0/K0i1pZuMIUVzN2DJx4yBVoBJVmb +ktGJfimkViapk7vWiG6Kv49E9R+MRcwqdi+bwBqZvJ9OPcmqpmwkTe0UvFey0qPb +3A5HJdqs01PwGpqbnWQi6JZ2519un98wJ9P8HiZkQkHjDQTrO43HdrR9rqqMJ2EZ +wGgHqCF0SM6VN7wOXelgw9FcsetUN5oPfJOduUisWLUOrSwDMAOrCETGCbGthhGI +FDV/IYtOSea6o2uul13Dgr3JDNy6mLo/jKhFB7YiVSuZvClWqi0yKxTUn9aXorsH +ChidOuELSEy6cikhIQTKVKzIVZon4szh3gGOIl3uAKye2wBZhxo= +=JSJq +-----END PGP SIGNATURE----- diff --git a/spamassassin.changes b/spamassassin.changes index 6fa94a2..d77a281 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Mar 24 17:58:15 UTC 2021 - Arjen de Korte + +- update spamassassin to 3.4.5 + * In this release, there are bug fixes for one CVE: + CVE-2020-1946 for Malicious rule configuration (.cf) files can + be configured to run system commands + * Improvements to OLEVBMacro and AskDNS plugins + * Received and EnvelopeFrom headers matching improvements + * userpref SQL schema fixes + * rbl and hashbl evaluation improvements + * fix for non working TxRep tag names + * man page fixes +- Update download links + ------------------------------------------------------------------- Fri Feb 12 11:25:16 UTC 2021 - Pedro Monreal diff --git a/spamassassin.spec b/spamassassin.spec index fd02727..61f78e2 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -20,10 +20,10 @@ %define ix_version 2.05 %define spd_version 2.53 -%define sa_version 3.4.4 +%define sa_version 3.4.5 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') %define perl_float %(echo %{perl_version} | awk -F. '{ printf "%d.%03d", $1, $2 }') -%define rules_revision 1873061 +%define rules_revision 1887800 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} @@ -35,8 +35,8 @@ Summary: Extensible email filter which is used to identify spam License: Apache-2.0 Group: Productivity/Networking/Email/Utilities URL: https://spamassassin.apache.org/ -Source: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2 -Source1: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz +Source0: https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2 +Source1: https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz Source2: https://mailfud.org/iXhash2/%{IXHASH}.tar.gz Source3: https://github.com/mpaperno/spampd/archive/%{spd_version}.tar.gz#/%{SPAMPD}.tar.gz Source10: local.cf @@ -47,8 +47,8 @@ Source16: spamd.service Source17: spampd.service Source18: sa-update.service Source19: sa-update.timer -Source100: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2.asc -Source101: https://archive.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz.asc +Source100: https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2.asc +Source101: https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz.asc # Keyring downloaded from https://www.apache.org/dist/spamassassin/KEYS Source102: spamassassin.keyring Source103: %{name}-rpmlintrc @@ -174,8 +174,8 @@ Recommends: perl(Net::DNS) >= 0.58 Recommends: perl(Net::Ident) Recommends: perl(Net::Patricia) >= 1.16 Recommends: perl(Net::SMTP) -Recommends: perl(Test::More) Recommends: perl(Razor2::Client::Agent) >= 2.61 +Recommends: perl(Test::More) Suggests: perl(DBD::mysql) Suggests: perl(DBI) Suggests: perl(Geo::IP) -- 2.51.1 From 64001daf55bd0dbe1d57b5e80342ccf0d263a966fa2b752611a77efc6c7a9aae Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Sat, 3 Apr 2021 17:26:28 +0000 Subject: [PATCH 23/37] Accepting request 882827 from home:AndreasStieger:branches:devel:languages:perl update some past bugzilla references / CVEs for tracking OBS-URL: https://build.opensuse.org/request/show/882827 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=147 --- spamassassin.changes | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index d77a281..9067ebb 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -4,7 +4,7 @@ Wed Mar 24 17:58:15 UTC 2021 - Arjen de Korte - update spamassassin to 3.4.5 * In this release, there are bug fixes for one CVE: CVE-2020-1946 for Malicious rule configuration (.cf) files can - be configured to run system commands + be configured to run system commands (boo#1184221) * Improvements to OLEVBMacro and AskDNS plugins * Received and EnvelopeFrom headers matching improvements * userpref SQL schema fixes @@ -47,8 +47,10 @@ Wed Jan 29 19:26:21 UTC 2020 - Arjen de Korte * In this release, there are bug fixes for two CVEs: CVE-2020-1931 for Nefarious rule configuration (.cf) files can be configured to run system commands with warnings. + (boo#1162200) CVE-2020-1930 for Nefarious rule configuration (.cf) files can be configured to run system commands with sa-compile. + (boo#1162197) * Improvements to OLEVBMacro * Fix for CRLF handling with SpamAssMilter & DKIM * Small fix for a regexp to provide Perl 5.8.x compatability again @@ -73,8 +75,10 @@ Thu Dec 12 11:55:55 UTC 2019 - Arjen de Korte documents * Two CVE security bug fixes are included in this release CVE-2019-12420 for Multipart Denial of Service Vulnerability + (boo#1159133) CVE-2018-11805 for nefarious CF files can be configured to run system commands without any output or errors + (boo#1118987) * Safer and faster scanning of large emails using body_part_scan_size and rawbody_part_scan_size settings. * New tflag "nosubject" for 'body' rules, to stop matching the @@ -123,7 +127,7 @@ Sun Oct 27 12:36:31 UTC 2019 - Arjen de Korte - Fix "PIDFile= references a path below legacy directory /var/run/" (change /var/run/ -> /run/) - Don't package README.SuSE which documents an init script that - was never bundled + was never bundled boo#1068469 ------------------------------------------------------------------- Tue Jun 11 12:33:05 UTC 2019 - Dominique Leuenberger -- 2.51.1 From ea6b4b76877e52b4cafcde742adaf7c1b428156a799eb7b0d325f435d953a65d Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Tue, 13 Apr 2021 07:11:26 +0000 Subject: [PATCH 24/37] Accepting request 884847 from home:adkorte - update spamassassin to 3.4.6 * Fixed URIDNSBL not triggering meta rules * Fix false positive in T_KAM_HTML_FONT_INVALID on CSS color !important OBS-URL: https://build.opensuse.org/request/show/884847 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=149 --- Mail-SpamAssassin-3.4.5.tar.bz2 | 3 --- Mail-SpamAssassin-3.4.5.tar.bz2.asc | 17 ----------------- Mail-SpamAssassin-3.4.6.tar.bz2 | 3 +++ Mail-SpamAssassin-3.4.6.tar.bz2.asc | 17 +++++++++++++++++ Mail-SpamAssassin-rules-3.4.5.r1887800.tgz | 3 --- Mail-SpamAssassin-rules-3.4.5.r1887800.tgz.asc | 16 ---------------- Mail-SpamAssassin-rules-3.4.6.r1888502.tgz | 3 +++ Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc | 16 ++++++++++++++++ spamassassin.changes | 7 +++++++ spamassassin.spec | 4 ++-- 10 files changed, 48 insertions(+), 41 deletions(-) delete mode 100644 Mail-SpamAssassin-3.4.5.tar.bz2 delete mode 100644 Mail-SpamAssassin-3.4.5.tar.bz2.asc create mode 100644 Mail-SpamAssassin-3.4.6.tar.bz2 create mode 100644 Mail-SpamAssassin-3.4.6.tar.bz2.asc delete mode 100644 Mail-SpamAssassin-rules-3.4.5.r1887800.tgz delete mode 100644 Mail-SpamAssassin-rules-3.4.5.r1887800.tgz.asc create mode 100644 Mail-SpamAssassin-rules-3.4.6.r1888502.tgz create mode 100644 Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc diff --git a/Mail-SpamAssassin-3.4.5.tar.bz2 b/Mail-SpamAssassin-3.4.5.tar.bz2 deleted file mode 100644 index 5647a87..0000000 --- a/Mail-SpamAssassin-3.4.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67edf87126af4869c2a42720fc3dbb34ce25285449ef1f3fc1ab712d2e0a5463 -size 6167088 diff --git a/Mail-SpamAssassin-3.4.5.tar.bz2.asc b/Mail-SpamAssassin-3.4.5.tar.bz2.asc deleted file mode 100644 index b002717..0000000 --- a/Mail-SpamAssassin-3.4.5.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIVAwUAYFXJf/3lL0D305gUAQqFqhAAhv3O1fvHNQAy3Rl8iSYOXwQEBD7nnFSa -mfntV4l8SmdShqb5tTCLt5zbnGaCOhG3r5HaDkfAR/mxPyG96kF+Q/Iol2JtUZ9T -GoGWg4oyihnBZUjME3K9GFVREwcj3heOnGFp4UqZoMBJwTh13lYHYK+xfHxoQDYI -3Dqldax7UiPulLWll7GC9mL/Ecb90UzXCwQQGYqxMC/+cKvmVMBDNS7zPVSu7SMr -5tkFTqFG4rxa7DKXH6BhfkJUy/uAxb+dv9FzEPnV1wfBVXKt9jEIYX4QWbSD637t -928ilZlYhLFo5D1Ull3/80xjE5ikkPBut6dbai9etXwwUFS2EF6pdJF4A3XUZQnJ -Ifsk686SGjnbbQXLPT9Is5/nK/RIQCnsZ/pa65xsBamg0ztmcHGog9cP8PSIBx3g -g0zTcIpzmzyoIdnuD6Nqm2zttxAWd4u9ONMeladCVkxARmBCDudAOdOZhEvWfMa3 -N1aOvJmOlL5Tyi1ZT0EOqdWmyD2liXncDvG6AXtKqsBQnQ9xaddk2zcig0MomKbE -qUgfG20SfntjXiXTb0m7rYZJcMwF3VKSeuVSlOTpJPcloJFvMKmk97TGnIbfpP0D -feQqLdfnFD5PYQUVCGUtMTCIE1ujT6j3KK0kyi/6P3MQ1gn0Er0ZydUKQJuSwKjj -fQke97A+Us4= -=YPB8 ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-3.4.6.tar.bz2 b/Mail-SpamAssassin-3.4.6.tar.bz2 new file mode 100644 index 0000000..6758331 --- /dev/null +++ b/Mail-SpamAssassin-3.4.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc4875f3e4bb5979f0c10283213a512c4c9646220ae0132a78c8e3af94789610 +size 6166807 diff --git a/Mail-SpamAssassin-3.4.6.tar.bz2.asc b/Mail-SpamAssassin-3.4.6.tar.bz2.asc new file mode 100644 index 0000000..c77b165 --- /dev/null +++ b/Mail-SpamAssassin-3.4.6.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIVAwUAYHAQ1P3lL0D305gUAQqzQxAAin7EQj+5CzIlasxABJBl6LpcMZQRReXv +w38sJqe2uMHNvzKdwxA8ncYYj77InyuU/T0T0J+E4UJ3UMGMFD7aTivQm6c08QyG +iF1BR72YnNxRJ+Bw8pWHl1BRa35Xk4Y16wDW3U6OD0RC6KDnQ7UjcX1dLGNDZ5Jt +9RgEHyIyu1a/iEY2MXb/v6XxVItrBjw9SHzSbOme2JB/RC8raAqtFIjC/CEQD0L8 +Ld1y+hIre7D4t20nJYzju3JwvuHKkFmDAaoMiSKUFDm4Okeq3ih/any9tAd/hEld +RYIu9w3dZFVx4OoD+SJYJlHNhfziIbbXgpyuoAUSVMXmLbgz5MQn7vaiTeYXyxgZ +IBG0M5lZnXDcrH0hrDijRuTExcwbPRNRoOQ2ii7KesJ67JxUjvUMGrIEt1DM9Foh +TWeKQV9cYlzg3dXM5QPR2smmPf84KYIrGUJ4WULHCmOGjuN6S0zcmHiiWYWNl2Ev +w9B1Xg6jWqDtiFV99Hsd9ZP2bz+Jc8gKodsw1LuF6bI2RFZQP2pb7ZrmBpw9aG4e +ptTig5yFLxxN8Xw2joVcDN63QFk6L7lsHT6kN2oRslwuiwD7EaxF9bW94EJDjQ5q +ARN1zWEdLsIjNVLW+61K8fCb4lm0f5lsryHz+F3wpGf8JMdRsuiV9KdEoCayZoX9 +wJfn3/67OXE= +=gWSm +-----END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz b/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz deleted file mode 100644 index b75dc78..0000000 --- a/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2690aa131b79788ba756030af8746dd4531ab2c0cb56c0fe469f58d9dd043aad -size 368878 diff --git a/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz.asc b/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz.asc deleted file mode 100644 index a1f6015..0000000 --- a/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmBVZvEACgkQbFU5eCT0 -NM4t9w/+NuclXWlPMv0+e+UXUFI7k0qYqBOT4S3eSXwzM9J4YpAd8KRrcBpIge2R -M2HRriR8nhnSKFY4sunCWBTWiNKh6DolOSKujkfNjVkedGrmigyP4avQIQCFV3ua -2RG839WAmAKU4HejSngNcELte2t6wuS6OqOTcsOpwTfyIBpHYbkmGWYJlLPAK+ls -IUGzaB0J9ocdisQHGq9zY2wUC1Ynx4cE9AbCOaD8FBsGBRvITZdOOdHHbP+BCUFZ -Shj+CvqBuyZibGpZxJ58GiOtKj4/T771+jCIXaxTxZ7rEkLbRvo5Uqrdk56GE3QN -kYGV7HtGChh646SdWR58GTslUnvAI+4MXnc0/K0i1pZuMIUVzN2DJx4yBVoBJVmb -ktGJfimkViapk7vWiG6Kv49E9R+MRcwqdi+bwBqZvJ9OPcmqpmwkTe0UvFey0qPb -3A5HJdqs01PwGpqbnWQi6JZ2519un98wJ9P8HiZkQkHjDQTrO43HdrR9rqqMJ2EZ -wGgHqCF0SM6VN7wOXelgw9FcsetUN5oPfJOduUisWLUOrSwDMAOrCETGCbGthhGI -FDV/IYtOSea6o2uul13Dgr3JDNy6mLo/jKhFB7YiVSuZvClWqi0yKxTUn9aXorsH -ChidOuELSEy6cikhIQTKVKzIVZon4szh3gGOIl3uAKye2wBZhxo= -=JSJq ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz b/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz new file mode 100644 index 0000000..19b9b5e --- /dev/null +++ b/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1efcdc57e6b100735855e24ee8391b0857327d70e1e1d2c2757d5f66e8a1ce6 +size 369768 diff --git a/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc b/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc new file mode 100644 index 0000000..41be3d4 --- /dev/null +++ b/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmBvxTwACgkQbFU5eCT0 +NM7PQA//V+Xkx0ay33lnvei2E6K42Yu9AyNZI9QrZLwyQyQAbdgAmLboCCUnOs4X +4snWkBJfJAeAAXFq3boCWLvQRKjSlVTu0IgQHg8oRGUndKP5r0E8pwws3/y7GWKG +ymdbStL81Mg9GX8/Dkka1jyAGINcgBwvrDVwLAMyeuW5zCotK2gKw7Yj1S3/eS94 +5xYoOrhKZPPoXwgOUIiKMhFmtLPbNKMaHUhQAi+VQ79BNPIPsCkHDAkQ2IBZVRVi +LgL5R9V2EfYXlq5aOVxlSXN6aaRR2swTNqDZ2Yk5XKyVKN6sUbNv+ZGb+22+38Az +XsNsYNU3kgFIf5c+O2B1dUzv/lkXgcZSN8JhmPXLy8n8lrz/k/wiwYtP+Qg9Tbhn +weVlegXhadK/p23mQiucI+J/5LfNhTYB/nMKojIpchibHWXvt5LOAkwncHakPTTT +y32XyvJQKKJnT8zB8AM0O3lOHCfSdBj8Hs+fHIooWAjuFAJbWPWk39WGzkuzDYTr +352Wk6SLwKni1oclJO/ds+nzqiqTbi/mxweqiLWkQozitTsVJzBzJHPdHuofxKBE +bsO/P79d7zygZVKR0ugQhYtnU+6IfoGggQ9o8TdyiMnobuxVf2cuQFYk/bmWV6bO +LlR3zMmQLNXMVNk1slsqxHSfIsBIja8HpHFjRZuwm3nTm8lyX7o= +=O25N +-----END PGP SIGNATURE----- diff --git a/spamassassin.changes b/spamassassin.changes index 9067ebb..ee4ddb0 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 13 06:17:23 UTC 2021 - Arjen de Korte + +- update spamassassin to 3.4.6 + * Fixed URIDNSBL not triggering meta rules + * Fix false positive in T_KAM_HTML_FONT_INVALID on CSS color !important + ------------------------------------------------------------------- Wed Mar 24 17:58:15 UTC 2021 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index 61f78e2..299d45c 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -20,10 +20,10 @@ %define ix_version 2.05 %define spd_version 2.53 -%define sa_version 3.4.5 +%define sa_version 3.4.6 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') %define perl_float %(echo %{perl_version} | awk -F. '{ printf "%d.%03d", $1, $2 }') -%define rules_revision 1887800 +%define rules_revision 1888502 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} -- 2.51.1 From 1462d6dc141276d6418695360e9ff8c11093c8c607bee3d1f1268037df653800 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Thu, 9 Sep 2021 18:53:54 +0000 Subject: [PATCH 25/37] Accepting request 917789 from home:varkoly:branches:devel:languages:perl - spamassassin: sa-update.timer does not work (bsc#1175375) Remove sence less SPAM_SA_UPDATE Document how to use sa-update.service OBS-URL: https://build.opensuse.org/request/show/917789 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=151 --- README.SUSE | 10 ++++++++++ spamassassin.changes | 8 ++++++++ spamassassin.spec | 5 +++-- sysconfig.spamd | 15 +++------------ timed-sa-update | 39 ++++++++++++++++++--------------------- 5 files changed, 42 insertions(+), 35 deletions(-) create mode 100644 README.SUSE diff --git a/README.SUSE b/README.SUSE new file mode 100644 index 0000000..037fd62 --- /dev/null +++ b/README.SUSE @@ -0,0 +1,10 @@ +There is a sa-update.timer which can start daily the sa-update.service +You can enable this timer by: + systemctl enable sa-update.timer + systemctl start sa-update.timer + +In /etc/sysconfig/spamd You can enable or disable some functionality of sa-update.service: + * SPAM_SA_COMPILE + * SPAM_SPAMD_RESTART + * SPAM_AMAVISD_RESTART + diff --git a/spamassassin.changes b/spamassassin.changes index ee4ddb0..45129d2 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 9 17:03:07 UTC 2021 - Peter Varkoly + +- spamassassin: sa-update.timer does not work + (bsc#1175375) + Remove sence less SPAM_SA_UPDATE + Document how to use sa-update.service + ------------------------------------------------------------------- Tue Apr 13 06:17:23 UTC 2021 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index 299d45c..b87e727 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -40,6 +40,7 @@ Source1: https://downloads.apache.org/spamassassin/source/Mail-SpamAssass Source2: https://mailfud.org/iXhash2/%{IXHASH}.tar.gz Source3: https://github.com/mpaperno/spampd/archive/%{spd_version}.tar.gz#/%{SPAMPD}.tar.gz Source10: local.cf +Source11: README.SUSE Source12: sysconfig.spamd Source14: sysconfig.spampd Source15: timed-sa-update @@ -220,6 +221,7 @@ tar -zxf %{SOURCE1} -C rules %patch6 %patch7 -p1 %patch10 +cp %{SOURCE11} ./ %build # Run substitutions in default rules @@ -263,7 +265,6 @@ mv %{buildroot}%{_bindir}/spamd %{buildroot}%{_sbindir}/ install -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/mail/spamassassin/local.cf ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd -echo "Most of the documentation is at ../perl-Mail-SpamAssassin/." > README.SUSE install -D -m 0640 %{SOURCE12} %{buildroot}%{_fillupdir}/sysconfig.spamd install -m 0640 %{SOURCE14} %{buildroot}%{_fillupdir}/ test -f %{buildroot}%{_datadir}/spamassassin/user_prefs.template || { @@ -316,7 +317,7 @@ fi %files %defattr(-,root,root) -%doc spamd/README spamd/README.vpopmail spamd/PROTOCOL +%doc spamd/README spamd/README.vpopmail spamd/PROTOCOL README.SUSE %{_mandir}/man1/sa-* %{_mandir}/man1/spamassassin* %{_mandir}/man1/spamd.1* diff --git a/sysconfig.spamd b/sysconfig.spamd index 2870105..b0860fa 100644 --- a/sysconfig.spamd +++ b/sysconfig.spamd @@ -9,21 +9,12 @@ # Default is "-d -c -L" SPAMD_ARGS="-d -c -L" -## Path: Network/Mail/Spamassassin -## Description: Call sa-update periodicaly -## Type: yesno -## Default: "no" -# -# Set this varible to yes if you want the daily cron job -# to call sa-update. -SPAM_SA_UPDATE="no" - ## Path: Network/Mail/Spamassassin ## Description: Compile SpamAssassin ruleset into native code ## Type: yesno ## Default: "no" # -# Set this varible to yes if you want the daily cron job +# Set this varible to yes if you want the sa-update.service # compile SpamAssassin ruleset into native code after # calling sa-update. SPAM_SA_COMPILE="no" @@ -33,7 +24,7 @@ SPAM_SA_COMPILE="no" ## Type: yesno ## Default: "yes" # -# Set this varible to yes if you want the daily cron job +# Set this varible to yes if you want the daily sa-update.service # restart spamd after recompiling spamassassin ruleset. SPAM_SPAMD_RESTART="yes" @@ -42,7 +33,7 @@ SPAM_SPAMD_RESTART="yes" ## Type: yesno ## Default: "yes" # -# Set this varible to yes if you want the daily cron job +# Set this varible to yes if you want the sa-update.service # restart amavisd after recompiling spamassassin ruleset. SPAM_AMAVISD_RESTART="yes" diff --git a/timed-sa-update b/timed-sa-update index d8e8537..264de61 100644 --- a/timed-sa-update +++ b/timed-sa-update @@ -13,31 +13,28 @@ then . /etc/sysconfig/spamd fi -if [ "$SPAM_SA_UPDATE" = "yes" ] -then - /usr/bin/sa-update &> /dev/null - result=$? +/usr/bin/sa-update &> /dev/null +result=$? - if [ "$SPAM_SA_COMPILE" = "yes" -a $result = 0 ] ; then - /usr/bin/sa-compile &> /dev/null - fi +if [ "$SPAM_SA_COMPILE" = "yes" -a $result = 0 ] ; then + /usr/bin/sa-compile &> /dev/null +fi - if [ "$SPAM_SPAMD_RESTART" = "yes" -a $result = 0 ] ; then - /sbin/service spamd try-restart &> /dev/null - fi +if [ "$SPAM_SPAMD_RESTART" = "yes" -a $result = 0 ] ; then + /sbin/service spamd try-restart &> /dev/null +fi - if [ "$SPAM_AMAVISD_RESTART" = "yes" -a $result = 0 ] ; then - /sbin/service amavis try-restart &> /dev/null - fi +if [ "$SPAM_AMAVISD_RESTART" = "yes" -a $result = 0 ] ; then + /sbin/service amavis try-restart &> /dev/null +fi - if [ $result = 2 ] ; then - echo "sa-update lint check failed" | \ - logger -t timed-sa-update - fi +if [ $result = 2 ] ; then + echo "sa-update lint check failed" | \ + logger -t timed-sa-update +fi - if [ $result -ge 3 ] ; then - echo "sa-update failed, exitcode $result" | \ - logger -t timed-sa-update - fi +if [ $result -ge 3 ] ; then + echo "sa-update failed, exitcode $result" | \ + logger -t timed-sa-update fi exit 0 -- 2.51.1 From c909b25a99bd96b26889c5f01977c708113d5f40a0ea8f00cdf63c2c566817f2 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Mon, 22 Nov 2021 09:40:17 +0000 Subject: [PATCH 26/37] Accepting request 932932 from home:jsegitz:branches:systemdhardening:devel:languages:perl - Added hardening to systemd service(s) (bsc#1181400). Modified: * spamd.service * spampd.service OBS-URL: https://build.opensuse.org/request/show/932932 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=152 --- spamassassin.changes | 7 +++++++ spamd.service | 13 +++++++++++++ spampd.service | 13 +++++++++++++ 3 files changed, 33 insertions(+) diff --git a/spamassassin.changes b/spamassassin.changes index 45129d2..b9c4a5b 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 17 13:56:17 UTC 2021 - Johannes Segitz + +- Added hardening to systemd service(s) (bsc#1181400). Modified: + * spamd.service + * spampd.service + ------------------------------------------------------------------- Thu Sep 9 17:03:07 UTC 2021 - Peter Varkoly diff --git a/spamd.service b/spamd.service index a8dbbd2..e5a64f5 100644 --- a/spamd.service +++ b/spamd.service @@ -20,6 +20,19 @@ After=remote-fs.target network.target Before=mail-transfer-agent.target [Service] +# added automatically, for details please see +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort +ProtectSystem=full +ProtectHome=true +PrivateDevices=true +ProtectHostname=true +ProtectClock=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +# end of automatic additions Type=forking PIDFile=/run/spamd.pid EnvironmentFile=-/etc/sysconfig/spamd diff --git a/spampd.service b/spampd.service index a2f4fc4..e089a8e 100644 --- a/spampd.service +++ b/spampd.service @@ -20,6 +20,19 @@ After=remote-fs.target Before=mail-transfer-agent.target [Service] +# added automatically, for details please see +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort +ProtectSystem=full +ProtectHome=true +PrivateDevices=true +ProtectHostname=true +ProtectClock=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +# end of automatic additions Type=forking PIDFile=/run/spampd.pid EnvironmentFile=-/etc/sysconfig/spampd -- 2.51.1 From ce78cc5974d52a40c4acd46c38c0db7b054bbcfe27da476043fdd73351e6d124 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 23 Nov 2021 08:22:56 +0000 Subject: [PATCH 27/37] Breaks loading data files in /home/vscan. OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=153 --- spampd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spampd.service b/spampd.service index e089a8e..6521a33 100644 --- a/spampd.service +++ b/spampd.service @@ -23,7 +23,7 @@ Before=mail-transfer-agent.target # added automatically, for details please see # https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort ProtectSystem=full -ProtectHome=true +ProtectHome=false PrivateDevices=true ProtectHostname=true ProtectClock=true -- 2.51.1 From bc24745acae232a769c5b43abf07bf1f18b4a4a5a282c2521983f21e8c064647 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 23 Nov 2021 08:23:55 +0000 Subject: [PATCH 28/37] OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=154 --- spamassassin.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spamassassin.changes b/spamassassin.changes index b9c4a5b..033586d 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 23 08:23:11 UTC 2021 - Dirk Stoecker + +- Set ProtectHome=false for spampd.service, as this breaks loading + and storing data files in /home/vscan. + ------------------------------------------------------------------- Wed Nov 17 13:56:17 UTC 2021 - Johannes Segitz -- 2.51.1 From cd3218c7d76f8d23332bcf6f490c292ee9d233108f28401022bd4c6c88f6f679 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Thu, 20 Jan 2022 06:35:38 +0000 Subject: [PATCH 29/37] Accepting request 947612 from home:jsegitz:branches:devel:languages:perl - Drop ProtectHome from spamd.service and spampd.service. Unfortunately spamassing writes there, so ProtectHome=read-only doesn't work. Whitelisting a specific part has a too high chance of breaking for this package (bsc#1193248) OBS-URL: https://build.opensuse.org/request/show/947612 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=155 --- spamassassin.changes | 8 ++++++++ spamassassin.spec | 2 +- spamd.service | 1 - spampd.service | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index 033586d..16bf1d1 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 19 15:39:37 UTC 2022 - Johannes Segitz + +- Drop ProtectHome from spamd.service and spampd.service. Unfortunately + spamassing writes there, so ProtectHome=read-only doesn't work. + Whitelisting a specific part has a too high chance of breaking for + this package (bsc#1193248) + ------------------------------------------------------------------- Tue Nov 23 08:23:11 UTC 2021 - Dirk Stoecker diff --git a/spamassassin.spec b/spamassassin.spec index b87e727..e7908d4 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/spamd.service b/spamd.service index e5a64f5..3f2e907 100644 --- a/spamd.service +++ b/spamd.service @@ -23,7 +23,6 @@ Before=mail-transfer-agent.target # added automatically, for details please see # https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort ProtectSystem=full -ProtectHome=true PrivateDevices=true ProtectHostname=true ProtectClock=true diff --git a/spampd.service b/spampd.service index 6521a33..2770b89 100644 --- a/spampd.service +++ b/spampd.service @@ -23,7 +23,6 @@ Before=mail-transfer-agent.target # added automatically, for details please see # https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort ProtectSystem=full -ProtectHome=false PrivateDevices=true ProtectHostname=true ProtectClock=true -- 2.51.1 From abc668ea00f9dfa823b98a5a62e9230c417c0846de05c4f23863c51a3a2dcfd1 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Sat, 24 Dec 2022 17:15:58 +0000 Subject: [PATCH 30/37] Accepting request 1045234 from home:adkorte - Update known warnings % spamassassin-rpmlintrc - Update to spamassissin 4.0.0: * Notable internal changes: - Meta rules no longer use priority values, they are evaluated dynamically when the rules they depend on are finished - DNS and other asynchronous lookups like DCC or Razor2 plugins are now launched when priority -100 is reached. This allows short circuiting at lower priority without sending unneeded DNS queries - New internal Mail::SpamAssassin::GeoDB module supporting RelayCountry and URILocalBL plugins provides a unified interface to Geographic IP modules. These include: MaxMind::DB::Reader (GeoIP2) Geo::IP IP::Country::DB_File IP::Country::Fast. * New plugins: - Mail::SpamAssassin::Plugin::ExtractText - Mail::SpamAssassin::Plugin::DMARC - Mail::SpamAssassin::Plugin::DecodeShortURLs * HashCash module has been removed completely * Full detailed changelog: https://svn.apache.org/repos/asf/spamassassin/trunk/Changes OBS-URL: https://build.opensuse.org/request/show/1045234 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=156 --- Mail-SpamAssassin-3.4.6.tar.bz2 | 3 - Mail-SpamAssassin-3.4.6.tar.bz2.asc | 17 ----- Mail-SpamAssassin-4.0.0.tar.bz2 | 3 + Mail-SpamAssassin-4.0.0.tar.bz2.asc | 16 +++++ Mail-SpamAssassin-rules-3.4.6.r1888502.tgz | 3 - ...-SpamAssassin-rules-3.4.6.r1888502.tgz.asc | 16 ----- Mail-SpamAssassin-rules-4.0.0.r1905950.tgz | 3 + ...-SpamAssassin-rules-4.0.0.r1905950.tgz.asc | 16 +++++ basic-lint-without-sandbox.patch | 9 +-- bnc#582111.diff | 10 +-- iXhash2-2.05.tar.gz | 3 - iXhash2-4.00.tar.gz | 3 + iXhash2-meta-rules.patch | 44 ++++++------ patch-PgSQL | 10 +-- patch-SQL_ASCII_SORT | 8 ++- patch-URIDNSBL | 9 +-- spamassassin-rpmlintrc | 3 +- spamassassin.changes | 68 +++++++++++++++++++ spamassassin.spec | 29 ++++---- spampd-2.53.tar.gz | 3 - spampd-2.61.tar.gz | 3 + 21 files changed, 176 insertions(+), 103 deletions(-) delete mode 100644 Mail-SpamAssassin-3.4.6.tar.bz2 delete mode 100644 Mail-SpamAssassin-3.4.6.tar.bz2.asc create mode 100644 Mail-SpamAssassin-4.0.0.tar.bz2 create mode 100644 Mail-SpamAssassin-4.0.0.tar.bz2.asc delete mode 100644 Mail-SpamAssassin-rules-3.4.6.r1888502.tgz delete mode 100644 Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc create mode 100644 Mail-SpamAssassin-rules-4.0.0.r1905950.tgz create mode 100644 Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc delete mode 100644 iXhash2-2.05.tar.gz create mode 100644 iXhash2-4.00.tar.gz delete mode 100644 spampd-2.53.tar.gz create mode 100644 spampd-2.61.tar.gz diff --git a/Mail-SpamAssassin-3.4.6.tar.bz2 b/Mail-SpamAssassin-3.4.6.tar.bz2 deleted file mode 100644 index 6758331..0000000 --- a/Mail-SpamAssassin-3.4.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc4875f3e4bb5979f0c10283213a512c4c9646220ae0132a78c8e3af94789610 -size 6166807 diff --git a/Mail-SpamAssassin-3.4.6.tar.bz2.asc b/Mail-SpamAssassin-3.4.6.tar.bz2.asc deleted file mode 100644 index c77b165..0000000 --- a/Mail-SpamAssassin-3.4.6.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIVAwUAYHAQ1P3lL0D305gUAQqzQxAAin7EQj+5CzIlasxABJBl6LpcMZQRReXv -w38sJqe2uMHNvzKdwxA8ncYYj77InyuU/T0T0J+E4UJ3UMGMFD7aTivQm6c08QyG -iF1BR72YnNxRJ+Bw8pWHl1BRa35Xk4Y16wDW3U6OD0RC6KDnQ7UjcX1dLGNDZ5Jt -9RgEHyIyu1a/iEY2MXb/v6XxVItrBjw9SHzSbOme2JB/RC8raAqtFIjC/CEQD0L8 -Ld1y+hIre7D4t20nJYzju3JwvuHKkFmDAaoMiSKUFDm4Okeq3ih/any9tAd/hEld -RYIu9w3dZFVx4OoD+SJYJlHNhfziIbbXgpyuoAUSVMXmLbgz5MQn7vaiTeYXyxgZ -IBG0M5lZnXDcrH0hrDijRuTExcwbPRNRoOQ2ii7KesJ67JxUjvUMGrIEt1DM9Foh -TWeKQV9cYlzg3dXM5QPR2smmPf84KYIrGUJ4WULHCmOGjuN6S0zcmHiiWYWNl2Ev -w9B1Xg6jWqDtiFV99Hsd9ZP2bz+Jc8gKodsw1LuF6bI2RFZQP2pb7ZrmBpw9aG4e -ptTig5yFLxxN8Xw2joVcDN63QFk6L7lsHT6kN2oRslwuiwD7EaxF9bW94EJDjQ5q -ARN1zWEdLsIjNVLW+61K8fCb4lm0f5lsryHz+F3wpGf8JMdRsuiV9KdEoCayZoX9 -wJfn3/67OXE= -=gWSm ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-4.0.0.tar.bz2 b/Mail-SpamAssassin-4.0.0.tar.bz2 new file mode 100644 index 0000000..f57e501 --- /dev/null +++ b/Mail-SpamAssassin-4.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5aa17050a30bc72baa86afdc6048cadea4d1ec2ecc61d787717a059b8319e88 +size 6371055 diff --git a/Mail-SpamAssassin-4.0.0.tar.bz2.asc b/Mail-SpamAssassin-4.0.0.tar.bz2.asc new file mode 100644 index 0000000..abe69e7 --- /dev/null +++ b/Mail-SpamAssassin-4.0.0.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2Ambx54X1+Sbwh4x/eUvQPfTmBQFAmOZZ8wACgkQ/eUvQPfT +mBTwiA//SiUeiW/4C7y1MKKoFal//+h8DxfAuw5boKaL2EaR21YCWtnXedxN2Abu +ICGYZu6qw7M0JYYq/MtkPGgXz06K8SbG49taadfoeu1tFnqHInPBhLBp75eRgxVS +UcC45EmFDprfJKu5UyojJ5FDnTo6hmLZrCyq3ttE35wopzejcALF+XHm/3JNA7mc +jWS72DfquB2iGlHOA0VcA0Md3YLk0/8EUYxtitoogqaAwlN4SFyqjI9PNvdpmSYS +rXHtrpDj4BiQUfOAmh7BI/OhrNqDpTKKs4xL06crb3VDVHyoHoajv16ayLSqQXq9 +LBQb0oksvMMGlh/s//hMpw1AcIY+LIJkgFtwdComSFv0o6dGhfSJzV4ZaGgnem7F +1/FRHzy5Me4ET9GjVRjyMoQMyO/aMd65DzoarPNtPLIWm7bqsovky/dRpoPhyqXR +7+GOPmePZ9tyaRRpXWlONEC5ehdY/zgikTDjlIfKyGaaI8mGqgvK4fAKrfvdtBVE +YtycRnmESJ32yLu1GUq6k8HhQHWdoEeM7wddcmdw1nHkK9iOyfhsvQczYsmHyUGW +M6Pp+W/VnEw3mb0VnR9grhmOnx7bpKW2lgMix6EXdjFyfL7nK6oT1x18kDjLp+N9 +K9AMTx/7jm592udosLbBbMgVxKVa+qOz3kZP/Xs4/pCvREWcGf4= +=exnT +-----END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz b/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz deleted file mode 100644 index 19b9b5e..0000000 --- a/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1efcdc57e6b100735855e24ee8391b0857327d70e1e1d2c2757d5f66e8a1ce6 -size 369768 diff --git a/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc b/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc deleted file mode 100644 index 41be3d4..0000000 --- a/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmBvxTwACgkQbFU5eCT0 -NM7PQA//V+Xkx0ay33lnvei2E6K42Yu9AyNZI9QrZLwyQyQAbdgAmLboCCUnOs4X -4snWkBJfJAeAAXFq3boCWLvQRKjSlVTu0IgQHg8oRGUndKP5r0E8pwws3/y7GWKG -ymdbStL81Mg9GX8/Dkka1jyAGINcgBwvrDVwLAMyeuW5zCotK2gKw7Yj1S3/eS94 -5xYoOrhKZPPoXwgOUIiKMhFmtLPbNKMaHUhQAi+VQ79BNPIPsCkHDAkQ2IBZVRVi -LgL5R9V2EfYXlq5aOVxlSXN6aaRR2swTNqDZ2Yk5XKyVKN6sUbNv+ZGb+22+38Az -XsNsYNU3kgFIf5c+O2B1dUzv/lkXgcZSN8JhmPXLy8n8lrz/k/wiwYtP+Qg9Tbhn -weVlegXhadK/p23mQiucI+J/5LfNhTYB/nMKojIpchibHWXvt5LOAkwncHakPTTT -y32XyvJQKKJnT8zB8AM0O3lOHCfSdBj8Hs+fHIooWAjuFAJbWPWk39WGzkuzDYTr -352Wk6SLwKni1oclJO/ds+nzqiqTbi/mxweqiLWkQozitTsVJzBzJHPdHuofxKBE -bsO/P79d7zygZVKR0ugQhYtnU+6IfoGggQ9o8TdyiMnobuxVf2cuQFYk/bmWV6bO -LlR3zMmQLNXMVNk1slsqxHSfIsBIja8HpHFjRZuwm3nTm8lyX7o= -=O25N ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz b/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz new file mode 100644 index 0000000..c0407e5 --- /dev/null +++ b/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae4ffbb917ebc7fefa7240fc5bb5151dda663f8e4059161ad7c9b42eed1bac6d +size 355737 diff --git a/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc b/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc new file mode 100644 index 0000000..6b8b3a4 --- /dev/null +++ b/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmOZODgACgkQbFU5eCT0 +NM4TdQ//QwAY5KNK5xP2+pHIY0ChcrKq1DjkaS9xgIOMUiaR17elwx+DpNAMYBwx +eX7m22nk++M7JZ668BHwfozxpzCLZouqAZHlHkOwm9l2xoiUMwuzYlUkEc5XxVyN +2BmeitLBAAfVveBKwY83oaZShIHD5EHuf7Ue9Ds8ORC/YTSmXe22JE2pA2HjgtWp +VJfsSPxIqeWF7ffawAHS0DqTS9mRJVFtmp3o7UvFrxJv+qKwPxcRDcMD2WARnoRF +F99ZL8dG50hxVy19sHePT4GVvFVXOIWt6NDsFRThuYARj4q2sdT27pUkG5AY5Fhp +t2HaEot/SrT6Dpktv6XFW3XDsnJfRwlQW3/1Jyf5GUhybAvuR+xx+UPNgXgkUg24 +FHKlEIFSha6qPeOar/5L3yjwCg4arnteLUX2DnPDa4TRQAfLD0dUKQzgcyOtOCqM +R0Bq6KMksc/vGQUQ/g+3k+ljPo1rH/G4vuzn6wVj7Nh519eNCU71FaIoWtb4opS6 +mJAN/vDdYFtFbbd/E1GLDRhYliBe1mi/f8+icGLCnX4QqqQ4I14bNDmfFA1TK8Nz +ojwhHgWEwXWFdD5919HOTmPTQpBKXrCeWppbfJVhjq3WI699WL0WUpe9Y28CVR0I +TubCLTDlCT2DDzQFs0qs9S0Jrsmo+N5hxrwTjfcSCTdl8JwJskE= +=hvna +-----END PGP SIGNATURE----- diff --git a/basic-lint-without-sandbox.patch b/basic-lint-without-sandbox.patch index 952c37a..8fc0e92 100644 --- a/basic-lint-without-sandbox.patch +++ b/basic-lint-without-sandbox.patch @@ -1,7 +1,8 @@ -diff -purN a/t/basic_lint_without_sandbox.t b/t/basic_lint_without_sandbox.t ---- a/t/basic_lint_without_sandbox.t 2020-01-25 03:51:14.000000000 +0100 -+++ b/t/basic_lint_without_sandbox.t 2020-11-10 22:58:02.294809138 +0100 -@@ -25,7 +25,7 @@ my $sandboxfile = "log/test_rules_copy/7 +Index: Mail-SpamAssassin-4.0.0/t/basic_lint_without_sandbox.t +=================================================================== +--- Mail-SpamAssassin-4.0.0.orig/t/basic_lint_without_sandbox.t ++++ Mail-SpamAssassin-4.0.0/t/basic_lint_without_sandbox.t +@@ -23,7 +23,7 @@ my $sandboxfile = "$localrules/70_sandbo # so we can use that to tell if this is the case SKIP: { skip( "Not on a sandbox", 2 ) unless -f $scoresfile; diff --git a/bnc#582111.diff b/bnc#582111.diff index fd9e058..ea3fc1f 100644 --- a/bnc#582111.diff +++ b/bnc#582111.diff @@ -1,10 +1,12 @@ ---- spamd/spamd.raw.orig 2010-06-24 11:28:10.047109188 +0200 -+++ spamd/spamd.raw 2010-06-24 11:28:57.942234270 +0200 -@@ -174,6 +174,7 @@ +Index: spamd/spamd.raw +=================================================================== +--- spamd/spamd.raw.orig ++++ spamd/spamd.raw +@@ -339,6 +339,7 @@ sub print_usage_and_exit { # defaults my %opt = ( + 'syslog-socket' => 'unix', 'user-config' => 1, - 'ident-timeout' => 5.0, # scaling settings; some of these aren't actually settable via cmdline + 'server-scale-period' => 2, # how often to scale the # of kids, secs diff --git a/iXhash2-2.05.tar.gz b/iXhash2-2.05.tar.gz deleted file mode 100644 index e479115..0000000 --- a/iXhash2-2.05.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d51fe8661bf407433db6c0fa12e3c6c66a1cd626751f51b170990089dc966a8 -size 7871 diff --git a/iXhash2-4.00.tar.gz b/iXhash2-4.00.tar.gz new file mode 100644 index 0000000..4a51805 --- /dev/null +++ b/iXhash2-4.00.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2590758ef3afe088e9f130d8987b150af99369cb7293936f163d60578a5c21a +size 7765 diff --git a/iXhash2-meta-rules.patch b/iXhash2-meta-rules.patch index 3fb534c..8498ddc 100644 --- a/iXhash2-meta-rules.patch +++ b/iXhash2-meta-rules.patch @@ -1,36 +1,30 @@ -diff -ur iXhash2-2.05.orig/iXhash2.cf iXhash2-2.05/iXhash2.cf ---- iXhash2-2.05.orig/iXhash2.cf 2012-07-08 13:29:31.000000000 +0200 -+++ iXhash2-2.05/iXhash2.cf 2012-09-26 13:41:11.874466944 +0200 -@@ -1,20 +1,40 @@ +--- Mail-SpamAssassin-4.0.0/iXhash2-4.00/iXhash2.cf.orig 2022-12-22 11:03:27.016843078 +0100 ++++ Mail-SpamAssassin-4.0.0/iXhash2-4.00/iXhash2.cf 2022-12-22 11:04:19.045110018 +0100 +@@ -1,15 +1,40 @@ # Note: loadplugin should really go into local.pre or so -loadplugin Mail::SpamAssassin::Plugin::iXhash2 iXhash2.pm -+loadplugin Mail::SpamAssassin::Plugin::iXhash2 ++loadplugin Mail::SpamAssassin::Plugin::iXhash2 ifplugin Mail::SpamAssassin::Plugin::iXhash2 --ixhashdnsbl GENERIC_IXHASH generic.ixhash.net. --body GENERIC_IXHASH eval:check_ixhash('GENERIC_IXHASH') --tflags GENERIC_IXHASH net -- --ixhashdnsbl NIXSPAM_IXHASH ix.dnsbl.manitu.net. --body NIXSPAM_IXHASH eval:check_ixhash('NIXSPAM_IXHASH') --tflags NIXSPAM_IXHASH net -- --ixhashdnsbl SEM_IXHASH ixhash.spameatingmonkey.net. --body SEM_IXHASH eval:check_ixhash('SEM_IXHASH') --tflags SEM_IXHASH net -+ixhashdnsbl __GENERIC_IXHASH generic.ixhash.net. -+body __GENERIC_IXHASH eval:check_ixhash('GENERIC_IXHASH') -+tflags __GENERIC_IXHASH net +-ixhashdnsbl IXHASH_IX ix.dnsbl.manitu.net. +-body IXHASH_IX eval:check_ixhash('IXHASH_IX') +-describe IXHASH_IX http://www.ixhash.net/listinfo.html +-tflags IXHASH_IX net +-score IXHASH_IX 1.5 +-reuse IXHASH_IX ++ixhashdnsbl __GENERIC_IXHASH generic.ixhash.net. ++body __GENERIC_IXHASH eval:check_ixhash('GENERIC_IXHASH') ++tflags __GENERIC_IXHASH net + -+ixhashdnsbl __NIXSPAM_IXHASH ix.dnsbl.manitu.net. -+body __NIXSPAM_IXHASH eval:check_ixhash('NIXSPAM_IXHASH') -+tflags __NIXSPAM_IXHASH net ++ixhashdnsbl __NIXSPAM_IXHASH ix.dnsbl.manitu.net. ++body __NIXSPAM_IXHASH eval:check_ixhash('NIXSPAM_IXHASH') ++tflags __NIXSPAM_IXHASH net + -+ixhashdnsbl __SEM_IXHASH ixhash.spameatingmonkey.net. -+body __SEM_IXHASH eval:check_ixhash('SEM_IXHASH') -+tflags __SEM_IXHASH net ++ixhashdnsbl __SEM_IXHASH ixhash.spameatingmonkey.net. ++body __SEM_IXHASH eval:check_ixhash('SEM_IXHASH') ++tflags __SEM_IXHASH net + +ixhashdnsbl __HOSTEUROPE_IXHASH hosteurope.ixhash.net. +body __HOSTEUROPE_IXHASH eval:check_ixhash('HOSTEUROPE_IXHASH') diff --git a/patch-PgSQL b/patch-PgSQL index 141ff4e..48b1163 100644 --- a/patch-PgSQL +++ b/patch-PgSQL @@ -1,6 +1,8 @@ ---- lib/Mail/SpamAssassin/BayesStore/PgSQL.pm 2010-01-21 13:14:34.000000000 +0100 -+++ lib/Mail/SpamAssassin/BayesStore/PgSQL.pm 2010-03-17 08:44:19.000000000 +0100 -@@ -941,7 +941,7 @@ +Index: lib/Mail/SpamAssassin/BayesStore/PgSQL.pm +=================================================================== +--- lib/Mail/SpamAssassin/BayesStore/PgSQL.pm.orig ++++ lib/Mail/SpamAssassin/BayesStore/PgSQL.pm +@@ -987,7 +987,7 @@ sub _put_token { } my $escaped_token = _quote_bytea($token); @@ -9,7 +11,7 @@ unless (defined($sth)) { dbg("bayes: _put_token: SQL error: ".$self->{_dbh}->errstr()); -@@ -1004,7 +1004,7 @@ +@@ -1050,7 +1050,7 @@ sub _put_tokens { my $tokenarray = join(",", map { '"' . _quote_bytea($_) . '"' } sort keys %{$tokens}); diff --git a/patch-SQL_ASCII_SORT b/patch-SQL_ASCII_SORT index 15c0842..0c4d308 100644 --- a/patch-SQL_ASCII_SORT +++ b/patch-SQL_ASCII_SORT @@ -1,6 +1,8 @@ ---- lib/Mail/SpamAssassin/Conf/SQL.pm 2006-09-29 15:06:39.000000000 +0200 -+++ lib/Mail/SpamAssassin/Conf/SQL.pm 2007-02-09 16:48:42.000000000 +0100 -@@ -139,9 +139,14 @@ +Index: lib/Mail/SpamAssassin/Conf/SQL.pm +=================================================================== +--- lib/Mail/SpamAssassin/Conf/SQL.pm.orig ++++ lib/Mail/SpamAssassin/Conf/SQL.pm +@@ -148,9 +148,14 @@ sub load_with_dbi { $sql =~ s/_DOMAIN_/$quoted_domain/g; } else { diff --git a/patch-URIDNSBL b/patch-URIDNSBL index 2cc4fa9..1ee9588 100644 --- a/patch-URIDNSBL +++ b/patch-URIDNSBL @@ -1,7 +1,8 @@ -diff -ur Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Mail-SpamAssassin-3.4.0_fix/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm ---- Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2014-02-07 09:36:27.000000000 +0100 -+++ Mail-SpamAssassin-3.4.0_fix/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2014-02-13 17:24:09.259369721 +0100 -@@ -416,6 +416,8 @@ +Index: Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm +=================================================================== +--- Mail-SpamAssassin-4.0.0.orig/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm ++++ Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm +@@ -422,6 +422,8 @@ sub check_dnsbl { while (my($uri, $info) = each %{$uris}) { # we want to skip mailto: uris next if ($uri =~ /^mailto:/i); diff --git a/spamassassin-rpmlintrc b/spamassassin-rpmlintrc index 9f5d105..29340e5 100644 --- a/spamassassin-rpmlintrc +++ b/spamassassin-rpmlintrc @@ -1,3 +1,2 @@ -addFilter("no-dependency-on perl-base") addFilter("systemd-service-without-service_.* sa-update.service") -addFilter("suse-missing-rclink sa-update") +addFilter("spamassassin.* no-binary") diff --git a/spamassassin.changes b/spamassassin.changes index 16bf1d1..8f0b431 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,71 @@ +------------------------------------------------------------------- +Sat Dec 24 17:10:36 UTC 2022 - Arjen de Korte + +- Update known warnings + % spamassassin-rpmlintrc + +------------------------------------------------------------------- +Thu Dec 22 10:08:30 UTC 2022 - Paolo Stivanin + +- Update to spamassissin 4.0.0: + * Notable internal changes: + - Meta rules no longer use priority values, they are evaluated + dynamically when the rules they depend on are finished + - DNS and other asynchronous lookups like DCC or Razor2 plugins + are now launched when priority -100 is reached. This allows + short circuiting at lower priority without sending unneeded + DNS queries + - New internal Mail::SpamAssassin::GeoDB module supporting + RelayCountry and URILocalBL plugins provides a unified + interface to Geographic IP modules. These include: + MaxMind::DB::Reader (GeoIP2) + Geo::IP + IP::Country::DB_File + IP::Country::Fast. + * New plugins: + - Mail::SpamAssassin::Plugin::ExtractText + - Mail::SpamAssassin::Plugin::DMARC + - Mail::SpamAssassin::Plugin::DecodeShortURLs + * HashCash module has been removed completely + * Full detailed changelog: + https://svn.apache.org/repos/asf/spamassassin/trunk/Changes +- Update to iXhash2 4.00: + * Minimum required version: SpamAssassin 4.0.0 +- Update to spampd 2.61: + * Performance and diagnostic improvements, quicker startups, and + a lot of documentation updates. + * Add support for configuration files (examples included in /misc + folder and in POD). + * Add optional "scalable mode" using Net::Server::PreFork module + (16-year TODO!). More info in POD. + * Add --logfile option to control logging destination(s) (syslog, + stderr, and/or file/device). + * Add --logident, --logfacility options for syslog. + * Add multiple levels of help, including full "man" output with + optional HTML formatting. + * Add --show argument for printing default option values + and other debug. + * Fix SpamAssassin debug logging with versions 3.1+ (output + was going to stderr/wrong syslog/null). + * Fix for IPv6 addresses being used on --host and --relayhost + options (was not possible due to ":" check). + * SIGHUP will now reload SpamAssassin and SpamPD configuration files + (and all module code), still with graceful child process shutdown. + * Use SpamAssassin::Logger module (with SA 3.1+) for all logging. + * Log to stderr by default if running non-daemonized + * Child processes are now renamed to "spampd child" + to distinguish them from the parent in task lists. + * Now requires Net::Server v0.89+ (though latest 2.009 is recommended). + * The --auto-whitelist option is no longer allowed with SpamAssassin v3+. + * Improve --debug option, adding ability to specify + SpamAssassin (v3.1+) debug areas (aka channels/facilities). + * All boolean options can take 0/1 argument and be negated + with "no-" prefix. + * The --children (-c) option is now more formally named + --max-servers (-mxs), but still accepted. + * IO::Socket::UNIX and ::IP are only required if actually + needed for --relaysocket / --relayhost options. + ------------------------------------------------------------------- Wed Jan 19 15:39:37 UTC 2022 - Johannes Segitz diff --git a/spamassassin.spec b/spamassassin.spec index e7908d4..2f32dc0 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -18,12 +18,12 @@ %bcond_without test -%define ix_version 2.05 -%define spd_version 2.53 -%define sa_version 3.4.6 +%define ix_version 4.00 +%define spd_version 2.61 +%define sa_version 4.0.0 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') %define perl_float %(echo %{perl_version} | awk -F. '{ printf "%d.%03d", $1, $2 }') -%define rules_revision 1888502 +%define rules_revision 1905950 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} @@ -59,7 +59,6 @@ Patch3: patch-SQL_ASCII_SORT Patch6: bnc#582111.diff Patch7: basic-lint-without-sandbox.patch Patch10: iXhash2-meta-rules.patch -BuildRequires: perl(Error) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(zlib) # optional, but want them for build (test) @@ -114,7 +113,7 @@ BuildRequires: perl(HTML::Parser) >= 3.43 BuildRequires: perl(IO::Zlib) >= 1.04 BuildRequires: perl(MIME::Base64) BuildRequires: perl(Mail::DKIM) >= 0.37 -BuildRequires: perl(Net::DNS) >= 0.58 +BuildRequires: perl(Net::DNS) >= 0.69 BuildRequires: perl(Net::SMTP) BuildRequires: perl(NetAddr::IP) >= 4.010 BuildRequires: perl(Pod::Usage) >= 1.10 @@ -125,12 +124,14 @@ BuildRequires: perl(Time::Local) # optional, but want them for build (test) BuildRequires: perl(Archive::Zip) BuildRequires: perl(BSD::Resource) -BuildRequires: perl(DBD::mysql) +BuildRequires: perl(DBD::SQLite) BuildRequires: perl(DBI) BuildRequires: perl(Devel::Cycle) -BuildRequires: perl(Encode::Detect) +BuildRequires: perl(Email::Address::XS) +BuildRequires: perl(Encode::Detect::Detector) BuildRequires: perl(HTTP::Date) BuildRequires: perl(IO::Socket::INET6) +BuildRequires: perl(IO::Socket::IP) BuildRequires: perl(IO::Socket::SSL) >= 1.76 BuildRequires: perl(IO::String) BuildRequires: perl(IP::Country::Fast) @@ -138,6 +139,7 @@ BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Mail::SPF) >= 2.001 BuildRequires: perl(Net::CIDR::Lite) BuildRequires: perl(Net::Ident) +BuildRequires: perl(Net::LibIDN) BuildRequires: perl(Net::Patricia) >= 1.16 BuildRequires: perl(Razor2::Client::Agent) >= 2.61 # @@ -148,7 +150,7 @@ Requires: perl(File::Copy) >= 2.02 Requires: perl(File::Spec) >= 0.8 Requires: perl(HTML::Parser) >= 3.43 Requires: perl(Mail::DKIM) >= 0.31 -Requires: perl(Net::DNS) >= 0.34 +Requires: perl(Net::DNS) >= 0.69 Requires: perl(NetAddr::IP) >= 4.010 Requires: perl(Pod::Usage) >= 1.10 Requires: perl(Sys::Hostname) @@ -158,10 +160,12 @@ Recommends: perl(Archive::Tar) >= 1.23 Recommends: perl(BSD::Resource) Recommends: perl(Compress::Zlib) Recommends: perl(DB_File) -Recommends: perl(Encode::Detect) +Recommends: perl(Email::Address::XS) +Recommends: perl(Encode::Detect::Detector) Recommends: perl(Getopt::Long) >= 2.32 Recommends: perl(HTTP::Date) Recommends: perl(IO::Socket::INET6) +Recommends: perl(IO::Socket::IP) Recommends: perl(IO::Socket::SSL) >= 1.76 Recommends: perl(IO::String) Recommends: perl(IO::Zlib) >= 1.04 @@ -173,11 +177,12 @@ Recommends: perl(Mail::SPF) >= 2.001 Recommends: perl(Net::CIDR::Lite) Recommends: perl(Net::DNS) >= 0.58 Recommends: perl(Net::Ident) +Recommends: perl(Net::LibIDN) Recommends: perl(Net::Patricia) >= 1.16 Recommends: perl(Net::SMTP) Recommends: perl(Razor2::Client::Agent) >= 2.61 Recommends: perl(Test::More) -Suggests: perl(DBD::mysql) +Suggests: perl(DBD::SQLite) Suggests: perl(DBI) Suggests: perl(Geo::IP) Suggests: perl(GeoIP2::Database::Reader) @@ -220,7 +225,7 @@ tar -zxf %{SOURCE1} -C rules %patch3 %patch6 %patch7 -p1 -%patch10 +%patch10 -p1 cp %{SOURCE11} ./ %build diff --git a/spampd-2.53.tar.gz b/spampd-2.53.tar.gz deleted file mode 100644 index 5246ae8..0000000 --- a/spampd-2.53.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58f37e61bac99a0423605c7db23cf8d1e4389681fe50d7e37ce2e31d46e27a88 -size 217945 diff --git a/spampd-2.61.tar.gz b/spampd-2.61.tar.gz new file mode 100644 index 0000000..7a624fd --- /dev/null +++ b/spampd-2.61.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91e60f10745ea4f9c27b9e57619a1bf246ab9a88ea1b88c4f39f8af607e2dbae +size 246956 -- 2.51.1 From 8da2a6c94b4ee2bf04ca6bd7db1094c0f7a4b3b33cf62f84153bbe5021609c25 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Sat, 24 Dec 2022 19:02:56 +0000 Subject: [PATCH 31/37] Accepting request 1045238 from home:adkorte:branches:devel:languages:perl - Add BuildRequires Text::Diff that was accidentally removed from original submission OBS-URL: https://build.opensuse.org/request/show/1045238 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=157 --- spamassassin.changes | 4 +++- spamassassin.spec | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index 8f0b431..a1f03e1 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,6 +1,8 @@ ------------------------------------------------------------------- -Sat Dec 24 17:10:36 UTC 2022 - Arjen de Korte +Sat Dec 24 18:01:29 UTC 2022 - Arjen de Korte +- Add BuildRequires Text::Diff that was accidentally removed from + original submission - Update known warnings % spamassassin-rpmlintrc diff --git a/spamassassin.spec b/spamassassin.spec index 2f32dc0..7c767d4 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -121,6 +121,12 @@ BuildRequires: perl(Sys::Hostname) BuildRequires: perl(Test::More) BuildRequires: perl(Time::HiRes) BuildRequires: perl(Time::Local) +# required for tests +BuildRequires: perl(Devel::Cycle) +#BuildRequires: perl(Perl::Critic::Policy::Perlsecret) +BuildRequires: perl(Perl::Critic::Policy::TestingAndDebugging::ProhibitNoStrict) +BuildRequires: perl(Test::More) +BuildRequires: perl(Text::Diff) # optional, but want them for build (test) BuildRequires: perl(Archive::Zip) BuildRequires: perl(BSD::Resource) @@ -182,7 +188,7 @@ Recommends: perl(Net::Patricia) >= 1.16 Recommends: perl(Net::SMTP) Recommends: perl(Razor2::Client::Agent) >= 2.61 Recommends: perl(Test::More) -Suggests: perl(DBD::SQLite) +Suggests: perl(DBD::mysql) Suggests: perl(DBI) Suggests: perl(Geo::IP) Suggests: perl(GeoIP2::Database::Reader) -- 2.51.1 From 783bbdfa7abad0d45d846f6cab0d2cace010b739feff0b31ecfd2fc11fc9df01 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 4 Jan 2024 12:49:35 +0000 Subject: [PATCH 32/37] Accepting request 1136753 from home:pmonrealgonzalez:INET6 - Remove the dependency on perl(IO::Socket::INET6) as it has been deprecated by upstream, is no longer suitable for use and its not being maintained. A compatible replacement for this package is perl(IO::Socket::IP) which is shipped by the perl-base package. OBS-URL: https://build.opensuse.org/request/show/1136753 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=159 --- spamassassin.changes | 8 ++++++++ spamassassin.spec | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index a1f03e1..4f94b22 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 2 21:58:50 UTC 2024 - Pedro Monreal + +- Remove the dependency on perl(IO::Socket::INET6) as it has been + deprecated by upstream, is no longer suitable for use and its not + being maintained. A compatible replacement for this package is + perl(IO::Socket::IP) which is shipped by the perl-base package. + ------------------------------------------------------------------- Sat Dec 24 18:01:29 UTC 2022 - Arjen de Korte diff --git a/spamassassin.spec b/spamassassin.spec index 7c767d4..c6e5de2 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,7 +1,7 @@ # # spec file for package spamassassin # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -136,7 +136,6 @@ BuildRequires: perl(Devel::Cycle) BuildRequires: perl(Email::Address::XS) BuildRequires: perl(Encode::Detect::Detector) BuildRequires: perl(HTTP::Date) -BuildRequires: perl(IO::Socket::INET6) BuildRequires: perl(IO::Socket::IP) BuildRequires: perl(IO::Socket::SSL) >= 1.76 BuildRequires: perl(IO::String) @@ -170,7 +169,6 @@ Recommends: perl(Email::Address::XS) Recommends: perl(Encode::Detect::Detector) Recommends: perl(Getopt::Long) >= 2.32 Recommends: perl(HTTP::Date) -Recommends: perl(IO::Socket::INET6) Recommends: perl(IO::Socket::IP) Recommends: perl(IO::Socket::SSL) >= 1.76 Recommends: perl(IO::String) -- 2.51.1 From 113ddfc676cb87973c1b56414aeff60441cdbc1e3dae1a2a5764c889a37753d7 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Tue, 27 Feb 2024 20:58:10 +0000 Subject: [PATCH 33/37] Accepting request 1151565 from home:dimstar:rpm4.20:s Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1151565 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=161 --- spamassassin.changes | 5 +++++ spamassassin.spec | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/spamassassin.changes b/spamassassin.changes index 4f94b22..b34e504 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 26 13:33:28 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Tue Jan 2 21:58:50 UTC 2024 - Pedro Monreal diff --git a/spamassassin.spec b/spamassassin.spec index c6e5de2..2665e50 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -224,12 +224,12 @@ via DNS using the domains given in the config file(s). %prep %setup -q -n Mail-SpamAssassin-%{sa_version} -a 2 -a 3 tar -zxf %{SOURCE1} -C rules -%patch1 -%patch2 -p1 -%patch3 -%patch6 -%patch7 -p1 -%patch10 -p1 +%patch -P 1 +%patch -P 2 -p1 +%patch -P 3 +%patch -P 6 +%patch -P 7 -p1 +%patch -P 10 -p1 cp %{SOURCE11} ./ %build -- 2.51.1 From 6a61e2ea192e728adad04eb8d0009b644be828c94718a8a3b462c3a6dac94a23 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Tue, 9 Apr 2024 19:56:58 +0000 Subject: [PATCH 34/37] Accepting request 1166486 from home:dstoecker:branches:devel:languages:perl - update to patch release version 4.0.1 - Incompatibilities with some versions of perl and some perl modules that have been released since the release of SpamAssassin 4.0.0 - Problems using cpan to install SpamAssassin when certain required or optional modules are not already installed - Support for space characters in the path name of some executables used by certain plugins - Improved handling of URL shortener link redirects - Improved TxRep locking management - Added Mail::SpamAssassin::Plugin::AuthRes plugin to use Authentication-Results header fields in other plugins - Added a Pyzor Perl implementation - Perl crash when certain uri_detail rules processed some messages with UTF-8 characters - Inconsistent handling of newlines in header rules - Text or HTML content placed in octet-stream attachments by spammers to bypass SpamAssassin scanning - Implemented TCP fallback for truncated DNS UDP replies - Refresh patch-URIDNSBL - Drop undocumented patch-SQL_ASCII_SORT breaking sqlite - Drop most of iXhash2-meta-rules.patch (additional services no longer exist) OBS-URL: https://build.opensuse.org/request/show/1166486 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=163 --- Mail-SpamAssassin-4.0.0.tar.bz2 | 3 - Mail-SpamAssassin-4.0.0.tar.bz2.asc | 16 ----- Mail-SpamAssassin-4.0.1.tar.bz2 | 3 + Mail-SpamAssassin-4.0.1.tar.bz2.asc | 16 +++++ Mail-SpamAssassin-rules-4.0.0.r1905950.tgz | 3 - ...-SpamAssassin-rules-4.0.0.r1905950.tgz.asc | 16 ----- Mail-SpamAssassin-rules-4.0.1.r1916528.tgz | 3 + ...-SpamAssassin-rules-4.0.1.r1916528.tgz.asc | 16 +++++ iXhash2-meta-rules.patch | 60 +++++-------------- patch-SQL_ASCII_SORT | 22 ------- patch-URIDNSBL | 15 +++-- spamassassin.changes | 25 ++++++++ spamassassin.spec | 9 ++- 13 files changed, 88 insertions(+), 119 deletions(-) delete mode 100644 Mail-SpamAssassin-4.0.0.tar.bz2 delete mode 100644 Mail-SpamAssassin-4.0.0.tar.bz2.asc create mode 100644 Mail-SpamAssassin-4.0.1.tar.bz2 create mode 100644 Mail-SpamAssassin-4.0.1.tar.bz2.asc delete mode 100644 Mail-SpamAssassin-rules-4.0.0.r1905950.tgz delete mode 100644 Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc create mode 100644 Mail-SpamAssassin-rules-4.0.1.r1916528.tgz create mode 100644 Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc delete mode 100644 patch-SQL_ASCII_SORT diff --git a/Mail-SpamAssassin-4.0.0.tar.bz2 b/Mail-SpamAssassin-4.0.0.tar.bz2 deleted file mode 100644 index f57e501..0000000 --- a/Mail-SpamAssassin-4.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5aa17050a30bc72baa86afdc6048cadea4d1ec2ecc61d787717a059b8319e88 -size 6371055 diff --git a/Mail-SpamAssassin-4.0.0.tar.bz2.asc b/Mail-SpamAssassin-4.0.0.tar.bz2.asc deleted file mode 100644 index abe69e7..0000000 --- a/Mail-SpamAssassin-4.0.0.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2Ambx54X1+Sbwh4x/eUvQPfTmBQFAmOZZ8wACgkQ/eUvQPfT -mBTwiA//SiUeiW/4C7y1MKKoFal//+h8DxfAuw5boKaL2EaR21YCWtnXedxN2Abu -ICGYZu6qw7M0JYYq/MtkPGgXz06K8SbG49taadfoeu1tFnqHInPBhLBp75eRgxVS -UcC45EmFDprfJKu5UyojJ5FDnTo6hmLZrCyq3ttE35wopzejcALF+XHm/3JNA7mc -jWS72DfquB2iGlHOA0VcA0Md3YLk0/8EUYxtitoogqaAwlN4SFyqjI9PNvdpmSYS -rXHtrpDj4BiQUfOAmh7BI/OhrNqDpTKKs4xL06crb3VDVHyoHoajv16ayLSqQXq9 -LBQb0oksvMMGlh/s//hMpw1AcIY+LIJkgFtwdComSFv0o6dGhfSJzV4ZaGgnem7F -1/FRHzy5Me4ET9GjVRjyMoQMyO/aMd65DzoarPNtPLIWm7bqsovky/dRpoPhyqXR -7+GOPmePZ9tyaRRpXWlONEC5ehdY/zgikTDjlIfKyGaaI8mGqgvK4fAKrfvdtBVE -YtycRnmESJ32yLu1GUq6k8HhQHWdoEeM7wddcmdw1nHkK9iOyfhsvQczYsmHyUGW -M6Pp+W/VnEw3mb0VnR9grhmOnx7bpKW2lgMix6EXdjFyfL7nK6oT1x18kDjLp+N9 -K9AMTx/7jm592udosLbBbMgVxKVa+qOz3kZP/Xs4/pCvREWcGf4= -=exnT ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-4.0.1.tar.bz2 b/Mail-SpamAssassin-4.0.1.tar.bz2 new file mode 100644 index 0000000..f5e1d22 --- /dev/null +++ b/Mail-SpamAssassin-4.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9775ed7559e83ec3e6c03edb2be8ffc7f15cc405fb13e85c148eb0bf191721a8 +size 6379932 diff --git a/Mail-SpamAssassin-4.0.1.tar.bz2.asc b/Mail-SpamAssassin-4.0.1.tar.bz2.asc new file mode 100644 index 0000000..24a96c9 --- /dev/null +++ b/Mail-SpamAssassin-4.0.1.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2Ambx54X1+Sbwh4x/eUvQPfTmBQFAmYCVQUACgkQ/eUvQPfT +mBQWIQ//ZnbjJ0SLv9WdXhOuzlyV49OHxlKhMnYNY5fn0CM6hgGo017kQaY4+82x +CBUHedemooGvlcRObapRNv1wtT4HYK50SWmuO1vIDQdXwCkc+4mbyQ/t9hYaOSEq +ZpIThJIX7JJjc5CaWI3woZgiD10L+/t34boU5a3md4KOsrqj9pypbd5Sk6ZKJQU3 +nDqrfdWyckm7MsS4fHVy4xC1CZT5b8tVHwt+JnNfhX4njlDjHbzoAfon9MibYV6z +K7QPJOQkweJzYSRuh5RC/1LsdsrKsOB1PR1R09zOFDvy7wOj3uXu3S80Bh43TZEo +PbvaRN4g6zrTnGPSiBPvg3BXKNlB4JhgCjpzj9IFY3tcVAXOURHQIYbzriNFhNCT +IWTbtiOInK4TtvDr5fdx7LOJCzAafq8ee/gTyfYS60GmPhLzKirK/tATlyQzkk6C +X1Va6tnjUudrMZ6AeRTASsISlS8WgTrdtDigAUpxlATpg/KKnZ8xB5Qqfyki178C +TDkXtFwjBnKq/uXUcUc50CZtJiiVRpNHgODc1ARi8WttWZVJk/h7fWnLLFPsfOyo +6+Z47vGcUl33ZsJSTaforuwthBe6G8saHVAy8WX4nU9z9rzNUj6Ox+Ait2TmQ/c+ +uBjO31q68+cKryjpdSFMQ+D7K02Jee7Gmi0wF2IvIVCqcJ7Pee0= +=aSi0 +-----END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz b/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz deleted file mode 100644 index c0407e5..0000000 --- a/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae4ffbb917ebc7fefa7240fc5bb5151dda663f8e4059161ad7c9b42eed1bac6d -size 355737 diff --git a/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc b/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc deleted file mode 100644 index 6b8b3a4..0000000 --- a/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmOZODgACgkQbFU5eCT0 -NM4TdQ//QwAY5KNK5xP2+pHIY0ChcrKq1DjkaS9xgIOMUiaR17elwx+DpNAMYBwx -eX7m22nk++M7JZ668BHwfozxpzCLZouqAZHlHkOwm9l2xoiUMwuzYlUkEc5XxVyN -2BmeitLBAAfVveBKwY83oaZShIHD5EHuf7Ue9Ds8ORC/YTSmXe22JE2pA2HjgtWp -VJfsSPxIqeWF7ffawAHS0DqTS9mRJVFtmp3o7UvFrxJv+qKwPxcRDcMD2WARnoRF -F99ZL8dG50hxVy19sHePT4GVvFVXOIWt6NDsFRThuYARj4q2sdT27pUkG5AY5Fhp -t2HaEot/SrT6Dpktv6XFW3XDsnJfRwlQW3/1Jyf5GUhybAvuR+xx+UPNgXgkUg24 -FHKlEIFSha6qPeOar/5L3yjwCg4arnteLUX2DnPDa4TRQAfLD0dUKQzgcyOtOCqM -R0Bq6KMksc/vGQUQ/g+3k+ljPo1rH/G4vuzn6wVj7Nh519eNCU71FaIoWtb4opS6 -mJAN/vDdYFtFbbd/E1GLDRhYliBe1mi/f8+icGLCnX4QqqQ4I14bNDmfFA1TK8Nz -ojwhHgWEwXWFdD5919HOTmPTQpBKXrCeWppbfJVhjq3WI699WL0WUpe9Y28CVR0I -TubCLTDlCT2DDzQFs0qs9S0Jrsmo+N5hxrwTjfcSCTdl8JwJskE= -=hvna ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz new file mode 100644 index 0000000..15c11f6 --- /dev/null +++ b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:381eadfc7e513e5f735389b78173de5af471f3d06fe6ab8f129634a6644b4bf4 +size 362781 diff --git a/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc new file mode 100644 index 0000000..9d725cc --- /dev/null +++ b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmYCOFAACgkQbFU5eCT0 +NM7CohAAo9FkqQ+XCtu2v4TyySfTETyigeVJaib4yegDxMKu+JGwOipaanLxZ7hl +hL0LMpwyrju5Ez9vqzWsa+huuqhXpuqZiFpStK9bOFdF5RNnkFaSisAa2tUuHlGK +qLmg/izxD1Ev5gdQ56js5grm1o8+C3Rm/6xcB+KxU27TlXbklw9HaH1ueoZvqV/w +eW0oeGX94MpVR5YPLd5ZDZgAtS3AZ9jOE8Ftad3TgG5OclAzaht2Xoh7APH4Er1G +MVabLflxUCqbfoJg+gpkjquH7jilUk0dQpP2KtNlv5q/ynl1aXYvj6QlOfnOimY6 +AkLSOjZ7z+NzA3knxdm6ZptT0zwoKqqjTOtRnJVTX10lekQpzmaiZZobEGCqGB0c +du4o5pNW6eYgP14yuppYupYn67mcPc/JSaXD1XJK/I97H7BhID9mQ0PU8bMUAmkE +0RY0bwhEAQcLPSbvZ/LNyuHxizSKvbimUx98Korm+qPb3Emvz7yph4AiRRCPWHqH +3mL5tIQ15pxGPcYoYCJPQMWn05IVn0N8rEbvXmRug6scufD2w7DtSuPiWA6ur0Fk +aZFDVYxSGnb/2g5Ud4zQCCDMGkDGiuaf3aTAL3lopInBZRevzFvSK1csp4CB6ozZ +oBqMFCJUOlpW5NkhGozYiOsf9i7gecTJnOPDnywnJqQ6ydP61dE= +=V2Gs +-----END PGP SIGNATURE----- diff --git a/iXhash2-meta-rules.patch b/iXhash2-meta-rules.patch index 8498ddc..e01a4f1 100644 --- a/iXhash2-meta-rules.patch +++ b/iXhash2-meta-rules.patch @@ -1,50 +1,18 @@ ---- Mail-SpamAssassin-4.0.0/iXhash2-4.00/iXhash2.cf.orig 2022-12-22 11:03:27.016843078 +0100 -+++ Mail-SpamAssassin-4.0.0/iXhash2-4.00/iXhash2.cf 2022-12-22 11:04:19.045110018 +0100 -@@ -1,15 +1,40 @@ - - # Note: loadplugin should really go into local.pre or so +diff -u iXhash2-4.00/iXhash2.cf iXhash2-4.00_fix/iXhash2.cf +--- iXhash2-4.00/iXhash2.cf 2019-04-30 16:49:39.000000000 +0200 ++++ iXhash2-4.00_fix/iXhash2.cf 2024-04-09 17:30:19.594173030 +0200 +@@ -1,12 +1,8 @@ +- +-# Note: loadplugin should really go into local.pre or so -loadplugin Mail::SpamAssassin::Plugin::iXhash2 iXhash2.pm +- +-ifplugin Mail::SpamAssassin::Plugin::iXhash2 +loadplugin Mail::SpamAssassin::Plugin::iXhash2 - ifplugin Mail::SpamAssassin::Plugin::iXhash2 - --ixhashdnsbl IXHASH_IX ix.dnsbl.manitu.net. --body IXHASH_IX eval:check_ixhash('IXHASH_IX') + ixhashdnsbl IXHASH_IX ix.dnsbl.manitu.net. + body IXHASH_IX eval:check_ixhash('IXHASH_IX') -describe IXHASH_IX http://www.ixhash.net/listinfo.html --tflags IXHASH_IX net --score IXHASH_IX 1.5 --reuse IXHASH_IX -+ixhashdnsbl __GENERIC_IXHASH generic.ixhash.net. -+body __GENERIC_IXHASH eval:check_ixhash('GENERIC_IXHASH') -+tflags __GENERIC_IXHASH net -+ -+ixhashdnsbl __NIXSPAM_IXHASH ix.dnsbl.manitu.net. -+body __NIXSPAM_IXHASH eval:check_ixhash('NIXSPAM_IXHASH') -+tflags __NIXSPAM_IXHASH net -+ -+ixhashdnsbl __SEM_IXHASH ixhash.spameatingmonkey.net. -+body __SEM_IXHASH eval:check_ixhash('SEM_IXHASH') -+tflags __SEM_IXHASH net -+ -+ixhashdnsbl __HOSTEUROPE_IXHASH hosteurope.ixhash.net. -+body __HOSTEUROPE_IXHASH eval:check_ixhash('HOSTEUROPE_IXHASH') -+tflags __HOSTEUROPE_IXHASH net -+ -+ixhashdnsbl __JUNKMAIL_IXHASH ixhash.junkemailfilter.com. -+body __JUNKMAIL_IXHASH eval:check_ixhash('JUNKMAIL_IXHASH') -+tflags __JUNKMAIL_IXHASH net -+ -+meta IXHASH_X1 (__GENERIC_IXHASH + __NIXSPAM_IXHASH + __SEM_IXHASH + __HOSTEUROPE_IXHASH + __JUNKMAIL_IXHASH) == 1 -+describe IXHASH_X1 iXhash listed on one server -+score IXHASH_X1 1.5 -+ -+meta IXHASH_X2 (__GENERIC_IXHASH + __NIXSPAM_IXHASH + __SEM_IXHASH + __HOSTEUROPE_IXHASH + __JUNKMAIL_IXHASH) == 2 -+describe IXHASH_X2 iXhash listed on two servers -+score IXHASH_X2 2.5 -+ -+meta IXHASH_X3 (__GENERIC_IXHASH + __NIXSPAM_IXHASH + __SEM_IXHASH + __HOSTEUROPE_IXHASH + __JUNKMAIL_IXHASH) > 2 -+describe IXHASH_X3 iXhash listed on more than two servers -+score IXHASH_X3 3.5 - - endif - ++describe IXHASH_IX https://www.nixspam.net/ + tflags IXHASH_IX net + score IXHASH_IX 1.5 + reuse IXHASH_IX diff --git a/patch-SQL_ASCII_SORT b/patch-SQL_ASCII_SORT deleted file mode 100644 index 0c4d308..0000000 --- a/patch-SQL_ASCII_SORT +++ /dev/null @@ -1,22 +0,0 @@ -Index: lib/Mail/SpamAssassin/Conf/SQL.pm -=================================================================== ---- lib/Mail/SpamAssassin/Conf/SQL.pm.orig -+++ lib/Mail/SpamAssassin/Conf/SQL.pm -@@ -148,9 +148,14 @@ sub load_with_dbi { - $sql =~ s/_DOMAIN_/$quoted_domain/g; - } - else { -- $sql = "select $f_preference, $f_value from $f_table where ". -- "$f_username = ".$dbh->quote($username). -- " or $f_username = '\@GLOBAL' order by $f_username asc"; -+ $sql = "select $f_preference, $f_value, ascii(username) as user_asci from $f_table where ". -+ "$f_username = ".$dbh->quote($username). -+ " or $f_username = '\@GLOBAL' order by user_asci asc"; -+ # changed by varkoly@novell.com on 09.02.2007 suggested by -+ # Charles Camello -+ #$sql = "select $f_preference, $f_value from $f_table where ". -+ #"$f_username = ".$dbh->quote($username). -+ #" or $f_username = '\@GLOBAL' order by $f_username asc"; - } - dbg("config: Conf::SQL: executing SQL: $sql"); - my $sth = $dbh->prepare($sql); diff --git a/patch-URIDNSBL b/patch-URIDNSBL index 1ee9588..0d0d759 100644 --- a/patch-URIDNSBL +++ b/patch-URIDNSBL @@ -1,11 +1,10 @@ -Index: Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm -=================================================================== ---- Mail-SpamAssassin-4.0.0.orig/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm -+++ Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm -@@ -422,6 +422,8 @@ sub check_dnsbl { - while (my($uri, $info) = each %{$uris}) { - # we want to skip mailto: uris - next if ($uri =~ /^mailto:/i); +diff -ur Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Mail-SpamAssassin-4.0.1_fix/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm +--- Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2024-03-26 05:52:09.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1_fix/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2024-04-09 15:42:31.054588924 +0200 +@@ -430,6 +430,8 @@ + if ($conf->{uridnsbl_skip_mailto}) { + next if ($uri =~ /^mailto:/i); + } + # we want to skip so-files, they are not url's + next if ($uri =~ /\.so$/); diff --git a/spamassassin.changes b/spamassassin.changes index b34e504..9d978e6 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Apr 9 13:31:41 UTC 2024 - Dirk Stoecker + +- update to patch release version 4.0.1 + - Incompatibilities with some versions of perl and some perl modules + that have been released since the release of SpamAssassin 4.0.0 + - Problems using cpan to install SpamAssassin when certain required + or optional modules are not already installed + - Support for space characters in the path name of some executables + used by certain plugins + - Improved handling of URL shortener link redirects + - Improved TxRep locking management + - Added Mail::SpamAssassin::Plugin::AuthRes plugin to use + Authentication-Results header fields in other plugins + - Added a Pyzor Perl implementation + - Perl crash when certain uri_detail rules processed some messages + with UTF-8 characters + - Inconsistent handling of newlines in header rules + - Text or HTML content placed in octet-stream attachments by + spammers to bypass SpamAssassin scanning + - Implemented TCP fallback for truncated DNS UDP replies +- Refresh patch-URIDNSBL +- Drop undocumented patch-SQL_ASCII_SORT breaking sqlite +- Drop most of iXhash2-meta-rules.patch (additional services no longer exist) + ------------------------------------------------------------------- Mon Feb 26 13:33:28 UTC 2024 - Dominique Leuenberger diff --git a/spamassassin.spec b/spamassassin.spec index 2665e50..e639a53 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -20,10 +20,10 @@ %define ix_version 4.00 %define spd_version 2.61 -%define sa_version 4.0.0 +%define sa_version 4.0.1 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') %define perl_float %(echo %{perl_version} | awk -F. '{ printf "%d.%03d", $1, $2 }') -%define rules_revision 1905950 +%define rules_revision 1916528 %define IXHASH iXhash2-%{ix_version} %define SPAMPD spampd-%{spd_version} @@ -55,9 +55,9 @@ Source102: spamassassin.keyring Source103: %{name}-rpmlintrc Patch1: patch-PgSQL Patch2: patch-URIDNSBL -Patch3: patch-SQL_ASCII_SORT Patch6: bnc#582111.diff Patch7: basic-lint-without-sandbox.patch +# PATCH-FIX-OPENSUSE adapt ixHash config to RPM package Patch10: iXhash2-meta-rules.patch BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(zlib) @@ -226,10 +226,9 @@ via DNS using the domains given in the config file(s). tar -zxf %{SOURCE1} -C rules %patch -P 1 %patch -P 2 -p1 -%patch -P 3 %patch -P 6 %patch -P 7 -p1 -%patch -P 10 -p1 +%patch -P 10 -p0 cp %{SOURCE11} ./ %build -- 2.51.1 From 30656d53825c4cc2d08fc76d81c7140a8fd4bd0e47ae7cdf5a3af9649111d24f Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 10 Apr 2024 08:26:12 +0000 Subject: [PATCH 35/37] fix iXhash2-meta-rules.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=164 --- iXhash2-meta-rules.patch | 7 +++++-- spamassassin.changes | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/iXhash2-meta-rules.patch b/iXhash2-meta-rules.patch index e01a4f1..b350710 100644 --- a/iXhash2-meta-rules.patch +++ b/iXhash2-meta-rules.patch @@ -1,7 +1,7 @@ diff -u iXhash2-4.00/iXhash2.cf iXhash2-4.00_fix/iXhash2.cf --- iXhash2-4.00/iXhash2.cf 2019-04-30 16:49:39.000000000 +0200 -+++ iXhash2-4.00_fix/iXhash2.cf 2024-04-09 17:30:19.594173030 +0200 -@@ -1,12 +1,8 @@ ++++ iXhash2-4.00_fix/iXhash2.cf 2024-04-10 10:25:00.975919467 +0200 +@@ -1,15 +1,8 @@ - -# Note: loadplugin should really go into local.pre or so -loadplugin Mail::SpamAssassin::Plugin::iXhash2 iXhash2.pm @@ -16,3 +16,6 @@ diff -u iXhash2-4.00/iXhash2.cf iXhash2-4.00_fix/iXhash2.cf tflags IXHASH_IX net score IXHASH_IX 1.5 reuse IXHASH_IX +- +-endif +- diff --git a/spamassassin.changes b/spamassassin.changes index 9d978e6..5e92751 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 10 08:25:53 UTC 2024 - Dirk Stoecker + +- fix iXhash2-meta-rules.patch + ------------------------------------------------------------------- Tue Apr 9 13:31:41 UTC 2024 - Dirk Stoecker -- 2.51.1 From c296f791e06755bca3f5dcf07e3203581b9b6e3afd627964afc1a92519e4f678 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Mon, 20 Jan 2025 14:19:46 +0000 Subject: [PATCH 36/37] drop iXHash plugin OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/spamassassin?expand=0&rev=166 --- .gitattributes | 23 + .gitignore | 1 + Mail-SpamAssassin-4.0.1.tar.bz2 | 3 + Mail-SpamAssassin-4.0.1.tar.bz2.asc | 16 + Mail-SpamAssassin-rules-4.0.1.r1916528.tgz | 3 + ...-SpamAssassin-rules-4.0.1.r1916528.tgz.asc | 16 + README.SUSE | 10 + basic-lint-without-sandbox.patch | 13 + bnc#582111.diff | 12 + iXhash2-4.00.tar.gz | 3 + iXhash2-meta-rules.patch | 21 + local.cf | 30 + patch-PgSQL | 22 + patch-URIDNSBL | 12 + sa-update.service | 7 + sa-update.timer | 10 + spamassassin-rpmlintrc | 2 + spamassassin.changes | 1605 +++++++++++++++++ spamassassin.keyring | 229 +++ spamassassin.spec | 330 ++++ spamd.service | 42 + spampd-2.61.tar.gz | 3 + spampd.service | 42 + sysconfig.spamd | 39 + sysconfig.spampd | 1 + timed-sa-update | 40 + 26 files changed, 2535 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 Mail-SpamAssassin-4.0.1.tar.bz2 create mode 100644 Mail-SpamAssassin-4.0.1.tar.bz2.asc create mode 100644 Mail-SpamAssassin-rules-4.0.1.r1916528.tgz create mode 100644 Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc create mode 100644 README.SUSE create mode 100644 basic-lint-without-sandbox.patch create mode 100644 bnc#582111.diff create mode 100644 iXhash2-4.00.tar.gz create mode 100644 iXhash2-meta-rules.patch create mode 100644 local.cf create mode 100644 patch-PgSQL create mode 100644 patch-URIDNSBL create mode 100644 sa-update.service create mode 100644 sa-update.timer create mode 100644 spamassassin-rpmlintrc create mode 100644 spamassassin.changes create mode 100644 spamassassin.keyring create mode 100644 spamassassin.spec create mode 100644 spamd.service create mode 100644 spampd-2.61.tar.gz create mode 100644 spampd.service create mode 100644 sysconfig.spamd create mode 100644 sysconfig.spampd create mode 100644 timed-sa-update diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/Mail-SpamAssassin-4.0.1.tar.bz2 b/Mail-SpamAssassin-4.0.1.tar.bz2 new file mode 100644 index 0000000..f5e1d22 --- /dev/null +++ b/Mail-SpamAssassin-4.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9775ed7559e83ec3e6c03edb2be8ffc7f15cc405fb13e85c148eb0bf191721a8 +size 6379932 diff --git a/Mail-SpamAssassin-4.0.1.tar.bz2.asc b/Mail-SpamAssassin-4.0.1.tar.bz2.asc new file mode 100644 index 0000000..24a96c9 --- /dev/null +++ b/Mail-SpamAssassin-4.0.1.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2Ambx54X1+Sbwh4x/eUvQPfTmBQFAmYCVQUACgkQ/eUvQPfT +mBQWIQ//ZnbjJ0SLv9WdXhOuzlyV49OHxlKhMnYNY5fn0CM6hgGo017kQaY4+82x +CBUHedemooGvlcRObapRNv1wtT4HYK50SWmuO1vIDQdXwCkc+4mbyQ/t9hYaOSEq +ZpIThJIX7JJjc5CaWI3woZgiD10L+/t34boU5a3md4KOsrqj9pypbd5Sk6ZKJQU3 +nDqrfdWyckm7MsS4fHVy4xC1CZT5b8tVHwt+JnNfhX4njlDjHbzoAfon9MibYV6z +K7QPJOQkweJzYSRuh5RC/1LsdsrKsOB1PR1R09zOFDvy7wOj3uXu3S80Bh43TZEo +PbvaRN4g6zrTnGPSiBPvg3BXKNlB4JhgCjpzj9IFY3tcVAXOURHQIYbzriNFhNCT +IWTbtiOInK4TtvDr5fdx7LOJCzAafq8ee/gTyfYS60GmPhLzKirK/tATlyQzkk6C +X1Va6tnjUudrMZ6AeRTASsISlS8WgTrdtDigAUpxlATpg/KKnZ8xB5Qqfyki178C +TDkXtFwjBnKq/uXUcUc50CZtJiiVRpNHgODc1ARi8WttWZVJk/h7fWnLLFPsfOyo +6+Z47vGcUl33ZsJSTaforuwthBe6G8saHVAy8WX4nU9z9rzNUj6Ox+Ait2TmQ/c+ +uBjO31q68+cKryjpdSFMQ+D7K02Jee7Gmi0wF2IvIVCqcJ7Pee0= +=aSi0 +-----END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz new file mode 100644 index 0000000..15c11f6 --- /dev/null +++ b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:381eadfc7e513e5f735389b78173de5af471f3d06fe6ab8f129634a6644b4bf4 +size 362781 diff --git a/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc new file mode 100644 index 0000000..9d725cc --- /dev/null +++ b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmYCOFAACgkQbFU5eCT0 +NM7CohAAo9FkqQ+XCtu2v4TyySfTETyigeVJaib4yegDxMKu+JGwOipaanLxZ7hl +hL0LMpwyrju5Ez9vqzWsa+huuqhXpuqZiFpStK9bOFdF5RNnkFaSisAa2tUuHlGK +qLmg/izxD1Ev5gdQ56js5grm1o8+C3Rm/6xcB+KxU27TlXbklw9HaH1ueoZvqV/w +eW0oeGX94MpVR5YPLd5ZDZgAtS3AZ9jOE8Ftad3TgG5OclAzaht2Xoh7APH4Er1G +MVabLflxUCqbfoJg+gpkjquH7jilUk0dQpP2KtNlv5q/ynl1aXYvj6QlOfnOimY6 +AkLSOjZ7z+NzA3knxdm6ZptT0zwoKqqjTOtRnJVTX10lekQpzmaiZZobEGCqGB0c +du4o5pNW6eYgP14yuppYupYn67mcPc/JSaXD1XJK/I97H7BhID9mQ0PU8bMUAmkE +0RY0bwhEAQcLPSbvZ/LNyuHxizSKvbimUx98Korm+qPb3Emvz7yph4AiRRCPWHqH +3mL5tIQ15pxGPcYoYCJPQMWn05IVn0N8rEbvXmRug6scufD2w7DtSuPiWA6ur0Fk +aZFDVYxSGnb/2g5Ud4zQCCDMGkDGiuaf3aTAL3lopInBZRevzFvSK1csp4CB6ozZ +oBqMFCJUOlpW5NkhGozYiOsf9i7gecTJnOPDnywnJqQ6ydP61dE= +=V2Gs +-----END PGP SIGNATURE----- diff --git a/README.SUSE b/README.SUSE new file mode 100644 index 0000000..037fd62 --- /dev/null +++ b/README.SUSE @@ -0,0 +1,10 @@ +There is a sa-update.timer which can start daily the sa-update.service +You can enable this timer by: + systemctl enable sa-update.timer + systemctl start sa-update.timer + +In /etc/sysconfig/spamd You can enable or disable some functionality of sa-update.service: + * SPAM_SA_COMPILE + * SPAM_SPAMD_RESTART + * SPAM_AMAVISD_RESTART + diff --git a/basic-lint-without-sandbox.patch b/basic-lint-without-sandbox.patch new file mode 100644 index 0000000..8fc0e92 --- /dev/null +++ b/basic-lint-without-sandbox.patch @@ -0,0 +1,13 @@ +Index: Mail-SpamAssassin-4.0.0/t/basic_lint_without_sandbox.t +=================================================================== +--- Mail-SpamAssassin-4.0.0.orig/t/basic_lint_without_sandbox.t ++++ Mail-SpamAssassin-4.0.0/t/basic_lint_without_sandbox.t +@@ -23,7 +23,7 @@ my $sandboxfile = "$localrules/70_sandbo + # so we can use that to tell if this is the case + SKIP: { + skip( "Not on a sandbox", 2 ) unless -f $scoresfile; +- ok -f $sandboxfile; ++ skip( "Not on a sandbox", 2 ) unless -f $sandboxfile; + unlink $sandboxfile; + ok !-f $sandboxfile; + } diff --git a/bnc#582111.diff b/bnc#582111.diff new file mode 100644 index 0000000..ea3fc1f --- /dev/null +++ b/bnc#582111.diff @@ -0,0 +1,12 @@ +Index: spamd/spamd.raw +=================================================================== +--- spamd/spamd.raw.orig ++++ spamd/spamd.raw +@@ -339,6 +339,7 @@ sub print_usage_and_exit { + + # defaults + my %opt = ( ++ 'syslog-socket' => 'unix', + 'user-config' => 1, + # scaling settings; some of these aren't actually settable via cmdline + 'server-scale-period' => 2, # how often to scale the # of kids, secs diff --git a/iXhash2-4.00.tar.gz b/iXhash2-4.00.tar.gz new file mode 100644 index 0000000..4a51805 --- /dev/null +++ b/iXhash2-4.00.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2590758ef3afe088e9f130d8987b150af99369cb7293936f163d60578a5c21a +size 7765 diff --git a/iXhash2-meta-rules.patch b/iXhash2-meta-rules.patch new file mode 100644 index 0000000..b350710 --- /dev/null +++ b/iXhash2-meta-rules.patch @@ -0,0 +1,21 @@ +diff -u iXhash2-4.00/iXhash2.cf iXhash2-4.00_fix/iXhash2.cf +--- iXhash2-4.00/iXhash2.cf 2019-04-30 16:49:39.000000000 +0200 ++++ iXhash2-4.00_fix/iXhash2.cf 2024-04-10 10:25:00.975919467 +0200 +@@ -1,15 +1,8 @@ +- +-# Note: loadplugin should really go into local.pre or so +-loadplugin Mail::SpamAssassin::Plugin::iXhash2 iXhash2.pm +- +-ifplugin Mail::SpamAssassin::Plugin::iXhash2 ++loadplugin Mail::SpamAssassin::Plugin::iXhash2 + + ixhashdnsbl IXHASH_IX ix.dnsbl.manitu.net. + body IXHASH_IX eval:check_ixhash('IXHASH_IX') +-describe IXHASH_IX http://www.ixhash.net/listinfo.html ++describe IXHASH_IX https://www.nixspam.net/ + tflags IXHASH_IX net + score IXHASH_IX 1.5 + reuse IXHASH_IX +- +-endif +- diff --git a/local.cf b/local.cf new file mode 100644 index 0000000..80caf7f --- /dev/null +++ b/local.cf @@ -0,0 +1,30 @@ +# Add your own customisations to this file. See 'man Mail::SpamAssassin::Conf' +# for details of what can be tweaked. +# + + +# do not change the subject +# to change the subject, e.g. use +# rewrite_header Subject ****SPAM(_SCORE_)**** +rewrite_header Subject ****SPAM(_SCORE_)**** + +# Set the score required before a mail is considered spam. +# required_score 5.00 + +# uncomment, if you do not want spamassassin to create a new message +# in case of detecting spam +# report_safe 0 + +# Enhance the uridnsbl_skip_domain list with some usefull entries +# Do not block the web-sites of Novell and SUSE +ifplugin Mail::SpamAssassin::Plugin::URIDNSBL +uridnsbl_skip_domain suse.de opensuse.org suse.com suse.org +uridnsbl_skip_domain novell.com novell.org novell.ru novell.de novell.hu novell.co.uk +endif # Mail::SpamAssassin::Plugin::URIDNSBL + +#The combination of SpamAssassin + The Bat! as mail client can cause false positives. +#The reason for the high spam rating is the Reply-To header inserted by mailman, +#which seems to have more quoting than The Bat! can do. +#If you have such problem activate the next two lines +#header IS_MAILMAN exists:X-Mailman-Version +#score IS_MAILMAN -2 diff --git a/patch-PgSQL b/patch-PgSQL new file mode 100644 index 0000000..48b1163 --- /dev/null +++ b/patch-PgSQL @@ -0,0 +1,22 @@ +Index: lib/Mail/SpamAssassin/BayesStore/PgSQL.pm +=================================================================== +--- lib/Mail/SpamAssassin/BayesStore/PgSQL.pm.orig ++++ lib/Mail/SpamAssassin/BayesStore/PgSQL.pm +@@ -987,7 +987,7 @@ sub _put_token { + } + + my $escaped_token = _quote_bytea($token); +- my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid}, $self->{_esc_prefix}'{$escaped_token}', $spam_count,$ham_count,$atime)"); ++ my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid}, $self->{_esc_prefix}'{$escaped_token}'::bytea[], $spam_count,$ham_count,$atime)"); + + unless (defined($sth)) { + dbg("bayes: _put_token: SQL error: ".$self->{_dbh}->errstr()); +@@ -1050,7 +1050,7 @@ sub _put_tokens { + + my $tokenarray = join(",", map { '"' . _quote_bytea($_) . '"' } sort keys %{$tokens}); + +- my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid}, $self->{_esc_prefix}'{$tokenarray}', $spam_count, $ham_count, $atime)"); ++ my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid}, $self->{_esc_prefix}'{$tokenarray}'::bytea[], $spam_count, $ham_count, $atime)"); + + unless (defined($sth)) { + dbg("bayes: _put_tokens: SQL error: ".$self->{_dbh}->errstr()); diff --git a/patch-URIDNSBL b/patch-URIDNSBL new file mode 100644 index 0000000..0d0d759 --- /dev/null +++ b/patch-URIDNSBL @@ -0,0 +1,12 @@ +diff -ur Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Mail-SpamAssassin-4.0.1_fix/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm +--- Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2024-03-26 05:52:09.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1_fix/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2024-04-09 15:42:31.054588924 +0200 +@@ -430,6 +430,8 @@ + if ($conf->{uridnsbl_skip_mailto}) { + next if ($uri =~ /^mailto:/i); + } ++ # we want to skip so-files, they are not url's ++ next if ($uri =~ /\.so$/); + + # no hosts/domains were found via this uri, so skip + next unless ($info->{hosts}); diff --git a/sa-update.service b/sa-update.service new file mode 100644 index 0000000..7e51e7c --- /dev/null +++ b/sa-update.service @@ -0,0 +1,7 @@ +[Unit] +Description=Update spamassassin +ConditionACPower=true + +[Service] +Type=oneshot +ExecStart=/usr/sbin/timed-sa-update diff --git a/sa-update.timer b/sa-update.timer new file mode 100644 index 0000000..fe05933 --- /dev/null +++ b/sa-update.timer @@ -0,0 +1,10 @@ +[Unit] +Description=Daily update of spamassasin + +[Timer] +OnCalendar=daily +AccuracySec=12h +Persistent=true + +[Install] +WantedBy=timers.target diff --git a/spamassassin-rpmlintrc b/spamassassin-rpmlintrc new file mode 100644 index 0000000..29340e5 --- /dev/null +++ b/spamassassin-rpmlintrc @@ -0,0 +1,2 @@ +addFilter("systemd-service-without-service_.* sa-update.service") +addFilter("spamassassin.* no-binary") diff --git a/spamassassin.changes b/spamassassin.changes new file mode 100644 index 0000000..9ea1eb9 --- /dev/null +++ b/spamassassin.changes @@ -0,0 +1,1605 @@ +------------------------------------------------------------------- +Mon Jan 20 13:29:51 UTC 2025 - Dirk Stoecker + +- drop iXHash plugin (last provider stopped operation) + * remove iXhash2-4.00.tar.gz + * remove iXhash2-meta-rules.patch + +------------------------------------------------------------------- +Wed Apr 10 08:25:53 UTC 2024 - Dirk Stoecker + +- fix iXhash2-meta-rules.patch + +------------------------------------------------------------------- +Tue Apr 9 13:31:41 UTC 2024 - Dirk Stoecker + +- update to patch release version 4.0.1 + - Incompatibilities with some versions of perl and some perl modules + that have been released since the release of SpamAssassin 4.0.0 + - Problems using cpan to install SpamAssassin when certain required + or optional modules are not already installed + - Support for space characters in the path name of some executables + used by certain plugins + - Improved handling of URL shortener link redirects + - Improved TxRep locking management + - Added Mail::SpamAssassin::Plugin::AuthRes plugin to use + Authentication-Results header fields in other plugins + - Added a Pyzor Perl implementation + - Perl crash when certain uri_detail rules processed some messages + with UTF-8 characters + - Inconsistent handling of newlines in header rules + - Text or HTML content placed in octet-stream attachments by + spammers to bypass SpamAssassin scanning + - Implemented TCP fallback for truncated DNS UDP replies +- Refresh patch-URIDNSBL +- Drop undocumented patch-SQL_ASCII_SORT breaking sqlite +- Drop most of iXhash2-meta-rules.patch (additional services no longer exist) + +------------------------------------------------------------------- +Mon Feb 26 13:33:28 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + +------------------------------------------------------------------- +Tue Jan 2 21:58:50 UTC 2024 - Pedro Monreal + +- Remove the dependency on perl(IO::Socket::INET6) as it has been + deprecated by upstream, is no longer suitable for use and its not + being maintained. A compatible replacement for this package is + perl(IO::Socket::IP) which is shipped by the perl-base package. + +------------------------------------------------------------------- +Sat Dec 24 18:01:29 UTC 2022 - Arjen de Korte + +- Add BuildRequires Text::Diff that was accidentally removed from + original submission +- Update known warnings + % spamassassin-rpmlintrc + +------------------------------------------------------------------- +Thu Dec 22 10:08:30 UTC 2022 - Paolo Stivanin + +- Update to spamassissin 4.0.0: + * Notable internal changes: + - Meta rules no longer use priority values, they are evaluated + dynamically when the rules they depend on are finished + - DNS and other asynchronous lookups like DCC or Razor2 plugins + are now launched when priority -100 is reached. This allows + short circuiting at lower priority without sending unneeded + DNS queries + - New internal Mail::SpamAssassin::GeoDB module supporting + RelayCountry and URILocalBL plugins provides a unified + interface to Geographic IP modules. These include: + MaxMind::DB::Reader (GeoIP2) + Geo::IP + IP::Country::DB_File + IP::Country::Fast. + * New plugins: + - Mail::SpamAssassin::Plugin::ExtractText + - Mail::SpamAssassin::Plugin::DMARC + - Mail::SpamAssassin::Plugin::DecodeShortURLs + * HashCash module has been removed completely + * Full detailed changelog: + https://svn.apache.org/repos/asf/spamassassin/trunk/Changes +- Update to iXhash2 4.00: + * Minimum required version: SpamAssassin 4.0.0 +- Update to spampd 2.61: + * Performance and diagnostic improvements, quicker startups, and + a lot of documentation updates. + * Add support for configuration files (examples included in /misc + folder and in POD). + * Add optional "scalable mode" using Net::Server::PreFork module + (16-year TODO!). More info in POD. + * Add --logfile option to control logging destination(s) (syslog, + stderr, and/or file/device). + * Add --logident, --logfacility options for syslog. + * Add multiple levels of help, including full "man" output with + optional HTML formatting. + * Add --show argument for printing default option values + and other debug. + * Fix SpamAssassin debug logging with versions 3.1+ (output + was going to stderr/wrong syslog/null). + * Fix for IPv6 addresses being used on --host and --relayhost + options (was not possible due to ":" check). + * SIGHUP will now reload SpamAssassin and SpamPD configuration files + (and all module code), still with graceful child process shutdown. + * Use SpamAssassin::Logger module (with SA 3.1+) for all logging. + * Log to stderr by default if running non-daemonized + * Child processes are now renamed to "spampd child" + to distinguish them from the parent in task lists. + * Now requires Net::Server v0.89+ (though latest 2.009 is recommended). + * The --auto-whitelist option is no longer allowed with SpamAssassin v3+. + * Improve --debug option, adding ability to specify + SpamAssassin (v3.1+) debug areas (aka channels/facilities). + * All boolean options can take 0/1 argument and be negated + with "no-" prefix. + * The --children (-c) option is now more formally named + --max-servers (-mxs), but still accepted. + * IO::Socket::UNIX and ::IP are only required if actually + needed for --relaysocket / --relayhost options. + +------------------------------------------------------------------- +Wed Jan 19 15:39:37 UTC 2022 - Johannes Segitz + +- Drop ProtectHome from spamd.service and spampd.service. Unfortunately + spamassing writes there, so ProtectHome=read-only doesn't work. + Whitelisting a specific part has a too high chance of breaking for + this package (bsc#1193248) + +------------------------------------------------------------------- +Tue Nov 23 08:23:11 UTC 2021 - Dirk Stoecker + +- Set ProtectHome=false for spampd.service, as this breaks loading + and storing data files in /home/vscan. + +------------------------------------------------------------------- +Wed Nov 17 13:56:17 UTC 2021 - Johannes Segitz + +- Added hardening to systemd service(s) (bsc#1181400). Modified: + * spamd.service + * spampd.service + +------------------------------------------------------------------- +Thu Sep 9 17:03:07 UTC 2021 - Peter Varkoly + +- spamassassin: sa-update.timer does not work + (bsc#1175375) + Remove sence less SPAM_SA_UPDATE + Document how to use sa-update.service + +------------------------------------------------------------------- +Tue Apr 13 06:17:23 UTC 2021 - Arjen de Korte + +- update spamassassin to 3.4.6 + * Fixed URIDNSBL not triggering meta rules + * Fix false positive in T_KAM_HTML_FONT_INVALID on CSS color !important + +------------------------------------------------------------------- +Wed Mar 24 17:58:15 UTC 2021 - Arjen de Korte + +- update spamassassin to 3.4.5 + * In this release, there are bug fixes for one CVE: + CVE-2020-1946 for Malicious rule configuration (.cf) files can + be configured to run system commands (boo#1184221) + * Improvements to OLEVBMacro and AskDNS plugins + * Received and EnvelopeFrom headers matching improvements + * userpref SQL schema fixes + * rbl and hashbl evaluation improvements + * fix for non working TxRep tag names + * man page fixes +- Update download links + +------------------------------------------------------------------- +Fri Feb 12 11:25:16 UTC 2021 - Pedro Monreal + +- Relax the crypto policies for the test-suite. This will allow the + tests that use certificates with small key lengths to pass. + +------------------------------------------------------------------- +Wed Dec 23 16:05:26 UTC 2020 - Arjen de Korte + +- Require perl(Mail::SpamAssassin) instead of perl-spamassassin +- Don't use BerkeleyDB (not even for unit test) +- Don't use is_opensuse conditional + +------------------------------------------------------------------- +Sat Dec 19 16:16:05 UTC 2020 - Thorsten Kukuk + +- Move spamc into an own sub-package to avoid the full spamassassin + installation on every client if there is a spamd server + +------------------------------------------------------------------- +Thu Dec 17 20:21:29 UTC 2020 - Arjen de Korte + +- Compile rules in %post if Perl and/or spamassassin version changed + and SPAM_SA_COMPILE=yes +- Enable test (add basic-lint-without-sandbox.patch) +- Ignore known warnings (add spamassassin-rpmlintrc) + +------------------------------------------------------------------- +Wed Jan 29 19:26:21 UTC 2020 - Arjen de Korte + +- update spamassassin to 3.4.4 + * In this release, there are bug fixes for two CVEs: + CVE-2020-1931 for Nefarious rule configuration (.cf) files can + be configured to run system commands with warnings. + (boo#1162200) + CVE-2020-1930 for Nefarious rule configuration (.cf) files can + be configured to run system commands with sa-compile. + (boo#1162197) + * Improvements to OLEVBMacro + * Fix for CRLF handling with SpamAssMilter & DKIM + * Small fix for a regexp to provide Perl 5.8.x compatability again + * Increased fns_extrachars default value to 50 + * Fixed nosubject and maxhits tflags when sa-compile is used + * Limited the Bayes parsed token count + * Improvements to whitespace trimming + +------------------------------------------------------------------- +Sat Dec 14 10:32:50 UTC 2019 - Arjen de Korte + +- remove old (compiled) rules in /var/lib/spamassassin directory + after package upgrade and remove entirely upon package removal +- add BuildRequires for perl(Archive::Zip) and perl(IO::String) + +------------------------------------------------------------------- +Thu Dec 12 11:55:55 UTC 2019 - Arjen de Korte + +- update spamassassin to 3.4.3 + * There is one new plugin (disabled by default) + OLEVBMacro - Detects both OLE macros and VB code inside Office + documents + * Two CVE security bug fixes are included in this release + CVE-2019-12420 for Multipart Denial of Service Vulnerability + (boo#1159133) + CVE-2018-11805 for nefarious CF files can be configured to + run system commands without any output or errors + (boo#1118987) + * Safer and faster scanning of large emails using + body_part_scan_size and rawbody_part_scan_size settings. + * New tflag "nosubject" for 'body' rules, to stop matching the + Subject header which is part of the body text. + * Security updates include deprecation of the unsafe sa-update + '--allowplugins' option, which now prints a warning that + '--reallyallowplugins' is required to use it. + +------------------------------------------------------------------- +Tue Dec 10 09:17:05 UTC 2019 - Dirk Stoecker + +- Increase maximum size for spampd to 7168 + +------------------------------------------------------------------- +Sat Nov 9 12:42:47 UTC 2019 - Arjen de Korte + +- Change architecture of perl modules to 'noarch' + +------------------------------------------------------------------- +Fri Nov 8 10:40:45 UTC 2019 - Arjen de Korte + +- Fix extraction command for default rules (proper fix for + boo#911355, rather than a workaround) +- Don't unconditionally run sa-update on spamd and spampd service + start as this doesn't honor the settings in /etc/sysconfig/spamd +- After running sa-update, only restart services if they were + running before +- Fix name in logging timed-sa-update (suse.cron-sa-update + doesn't exist anymore) + +---------------------------------------------------------- +Sun Oct 27 12:36:31 UTC 2019 - Arjen de Korte + +- update spampd to 2.53 + * Fix LMTP delivery with multiple recipients + * Fix Warning for "Use of uninitialized value in string" + update spampd to 2.52 + * Override Net::Server's HUP handling, just restart children + * Add --version option to print information about SpamPD, + Net::Server, SpamAssassin, and Perl. + * Add warnings about using deprecated options. + * Documentation updates and code cosmetics. +- Update download links (add for spampd and iXhash2 sources) +- Add source verification (add spamassassin.keyring) +- Add %{perl_requires} for perl-Mail-SpamAssassin +- Fix "PIDFile= references a path below legacy directory /var/run/" + (change /var/run/ -> /run/) +- Don't package README.SuSE which documents an init script that + was never bundled boo#1068469 + +------------------------------------------------------------------- +Tue Jun 11 12:33:05 UTC 2019 - Dominique Leuenberger + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut the build queues by allowing usage of systemd-mini + +------------------------------------------------------------------- +Wed Jan 16 11:50:16 UTC 2019 - Jan Engelhardt + +- Reduce boilerplate generated by %service_*. + +------------------------------------------------------------------- +Wed Jan 16 09:43:23 UTC 2019 - Peter Varkoly + +- bsc#1115411 spamassassin: migrate from cron to systemd timers +- Apply %license macro + +------------------------------------------------------------------- +Tue Sep 18 20:29:34 UTC 2018 - Arjen de Korte + +- update spamassassin to 3.4.2 + * There are four new plugins (disabled by default) + HashBL - interface to The Email Blocklist (EBL) + ResourceLimits - assure your spamd child processes do not exceed + specified CPU or memory limit + FromNameSpoof - detection of the From:name field being used to + mislead + Phishing - finds uris used in phishing campaigns detected by + OpenPhish (https://openphish.com) or PhishTank + (https://phishtank.com) feeds + * For security reasons SSLv3 support has been removed from spamc(1). + * Four CVE security bug fixes are included in this release for + PDFInfo.pm and the SA core: CVE-2017-15705, CVE-2016-1238, + CVE-2018-11780 & CVE-2018-11781. + * In sa-update script, optional support for SHA-256 / SHA-512 in + addition to or instead of SHA1 has been added for better validation + of rules. + * GeoIP2 support has been added to RelayCountry and URILocalBL plugins + due to GeoIP legacy API deprecations. + * several new or enhanced configuration options +- update spampd to 2.51 + * Replace IO::Socket::INET with IO::Socket::IP for IPv6 support + * Unix ports (ability to listen on UNIX sockets) + * Add X-Envelope-* headers before Received + * Add /usr/local/bin and /usr/local/sbin to PATH + * Add --setsid option to start server with setsid if running in + background +- Removed patches (are now in upstream): + * 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch + * 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch + * DNS-resolver-recursion-desired-not-set.patch + * spamassassin-dont_use_SSLv3_methods.patch + * spampd-2.42_git_20170226.patch + * Unescaped_left_brace_in_regex_is_deprecated.patch + +------------------------------------------------------------------- +Mon Sep 17 19:11:13 UTC 2018 - Arjen de Korte + +- Revert incompatibility-with-NET-DNS.patch (this patch attempts to + fix a problem that was already solved by bsc#1059210) + +------------------------------------------------------------------- +Thu Sep 13 14:05:04 UTC 2018 - varkoly@suse.com + +- bsc#1107765 - spamassassin: incompatibility with Net::DNS >= 1.01 + - Add upstream patch: + incompatibility-with-NET-DNS.patch + +------------------------------------------------------------------- +Sun Sep 9 09:52:44 UTC 2018 - varkoly@suse.com + +- bsc#1069831 Running sa-update from spamassassin gives warning + about deprecated regex + o remove deprecated-regex.patch and apply upstream patch: + Unescaped_left_brace_in_regex_is_deprecated.patch + This patch also fixes the bug PerMsgStatus Warning + https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7196 + +------------------------------------------------------------------- +Mon Feb 19 17:19:18 UTC 2018 - varkoly@suse.com + +- bsc#1069831 Running sa-update from spamassassin gives warning about deprecated regex + o add deprecated-regex.patch + +------------------------------------------------------------------- +Thu Jan 18 08:52:03 UTC 2018 - varkoly@suse.com + +- bsc#1059210 spamassassin perl dns resolver recursion desired not set + o add DNS-resolver-recursion-desired-not-set.patch + +------------------------------------------------------------------- +Mon Dec 11 00:44:26 UTC 2017 - jengelh@inai.de + +- Replace %__-type macro indirections. + Replace old $RPM_ shell variables. + +------------------------------------------------------------------- +Thu Nov 23 13:43:44 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- +Tue Nov 21 09:07:53 UTC 2017 - mpluskal@suse.com + +- Update umask in cronjob (boo#861539) +- Make sure that spamd can start (boo#961291) + +------------------------------------------------------------------- +Wed Aug 30 13:40:24 UTC 2017 - vcizek@suse.com + +- Add support for building with OpenSSL 1.1 (bsc#1055252) + * add 0001-bug-7361-Allow-building-against-OpenSSL-1.1.0.patch + * add spamassassin-dont_use_SSLv3_methods.patch +- Fix build with Perl 5.26 + * https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7367 + * add 0001-Fix-bug-7367-Don-t-assume-cwd-.-is-in-INC-it-may-be-.patch + +------------------------------------------------------------------- +Sun Feb 26 13:38:51 UTC 2017 - opensuse@dstoecker.de + +- SPAMPD: add spampd-2.42_git_20170226.patch - support IPv6 with IO::Socket::IP +- Drop old init system support (systems before 12.x) + +------------------------------------------------------------------- +Mon Feb 20 16:26:30 CET 2017 - kukuk@suse.de + +- Don't call/require insserv if we use systemd + +------------------------------------------------------------------- +Tue Jan 12 07:20:02 UTC 2016 - bwiedemann@suse.com + +- use service command to restart spamd and amavis (boo#961279) + +------------------------------------------------------------------- +Sun Nov 29 21:04:11 UTC 2015 - opensuse@dstoecker.de + +- change default spampd settings to properly support IPv6 and allow larger SPAM + +------------------------------------------------------------------- +Wed Aug 26 14:18:20 UTC 2015 - hsk@imb-jena.de + +- disable again "make test" (seems not to like being run offline) + +------------------------------------------------------------------- +Thu Jul 9 10:18:20 UTC 2015 - hsk@imb-jena.de + +- update to 3.4.1 + * new plugins (disabled by default) + TxRep -substantially improved replacement of AWL plugin + PDFInfo - help detecting spam with attached PDF files + URILocalBL - new rule test types for URIs in html message parts + * several new or enhanced configuration options, e.g.: + normalize_charset - reimplemented, see Mail::SpamAssassin::Conf + bayes_token_sources - more control on sources of tokens for Bayes plugin + * internal change, probably only affecting 3rd party plugins: + Util::RegistrarBoundaries is being replaced by RegistryBoundaries + * rule updates, improvements, optimizations, bug fixes +- patch-utf8 removed, cf. bz.apache.org/SpamAssassin/show_bug.cgi?id=7133 +- re-enable "make test" for 13.2 and up + +------------------------------------------------------------------- +Mon Feb 2 08:18:20 UTC 2015 - mpluskal@suse.com + +- Enable reload in unit files (boo#915736) + +------------------------------------------------------------------- +Tue Jan 6 20:21:54 UTC 2015 - mpluskal@suse.com + +- Fix for boo#911355 +- Don't install init files when service files are installed +- Create symlinks for rcspamd and rcspampd when systemd is used +- Remove unnecessary cleanup section from spec files + +------------------------------------------------------------------- +Fri Aug 1 20:02:46 UTC 2014 - varkoly@suse.com + +- bnc#889004 - Package 'spamassassin' contains 'SuSE' spelling in a filename and/or SPEC file + +------------------------------------------------------------------- +Tue Jul 8 00:42:36 CEST 2014 - ro@suse.de + +- make init scripts executable to fix build + +------------------------------------------------------------------- +Tue Feb 25 09:08:13 UTC 2014 - jweberhofer@weberhofer.at + +- Use perl(IO::Socket::IP) only for openSUSE 12.2+, because it requires + a version minimum version of perl(IO::Socket) of 1.97 which is not available. + Spamassassin will fallback to use perl(IO::Socket::INET6) or + perl(IO::Socket::INET) instead. + +------------------------------------------------------------------- +Thu Feb 13 15:47:36 UTC 2014 - opensuse@dstoecker.de + +- Update to 3.4.0 +- INCOMPATIBLE CHANGES + o DNS queries generated by SpamAssassin now enable option EDNS0 in query + packets and specify a buffer size of 4096 bytes by default. + o A default setting for option 'dns_available' was changed from 'test' to + 'yes' (bug 6770, bug 6769), so SpamAssassin now assumes by default that + it is running on a host with an internet connection and a working DNS resolver. +- BUG FIXES + o The sa-update program now avoids repeatedly downloading same rules if + subsequent unpacking of rules and updating fails. Documented in bug 6655. + o Several incompatibilities with newer versions of a perl module Net::DNS + as used by sa-update and by the SpamAssassin library were fixed. + o A perl module Razor agent clobbers entropy of a random number generator by + re-initializing the generator on every call. The SpamAssassin Razor plugin + now provides a workaround, preserving entropy across calls to Razor2 agent. +- NEW FEATURES + o Redis database backend for a Bayes database + o Improved support for IPv6 + o New command-line options: + --listen (or -i), spamd + Can be specified multiple times and allows spamd to accept requests + over multiple INET (IPv4) or INET6 (IPv6) or UNIX sockets. + -X (or --unavailable-tempfail), spamc + Allows return EX_TEMPFAIL instead of EX_UNAVAILABLE when using option -x. + -4 and -6 were added to programs spamassassin, spamd, spamc, and sa-update. + -v or --verbose, sa-update + Can now take multiple -v or --verbose options to increase verbosity. + --max-size, sa-learn + o New configuration options + - Plugin/URIDNSBL: new tflags options 'a' and 'ns' were introduced. They are + documented in the Mail::SpamAssassin::Plugin::URIDNSBL POD or man page. + - Plugin/AutoLearnThreshold: new option autolearn_force was added. It is + documented in the Mail::SpamAssassin::Plugin::AutoLearnThreshold POD or + man page. + - Plugin/ASN: new options asn_prefix and clear_asn_lookups were added. + They are documented in Mail::SpamAssassin::Plugin::ASN POD or man page. + - ArchiveIterator has new options opt_max_size and opt_from_regex. They are + documented in Mail::SpamAssassin::ArchiveIterator POD or man page. + - A new tag (macro) _RULESVERSION_ was added. It expands to a comma-separated + list of rules versions, retrieved from an '# UPDATE version' comment in + rules files and can be used in an 'add_header' configuration setting. + + The following new options, as implemented by various plugins or by + other modules, are all documented in the Mail::SpamAssassin::Conf POD + or man page: + - Plugin/WLBLEval: new configuration options were added: enlist_uri_host, + delist_uri_host, with shorthands blacklist_uri_host and whitelist_uri_host + and an associated eval rule check_uri_host_listed. + - Configuration options dns_query_restriction (allow|deny) and + clear_dns_query_restriction were added (bug 6884). + - A 'dns_options' setting accepts new sub-options 'dns0x20' and 'edns'. + - Added option 'dns_server' which specifies an IP address of a recursive + DNS server (i.e. DNS resolver) and optionally its port number. + - Added options dns_local_ports_permit, dns_local_ports_avoid and + dns_local_ports_none to control source port local ranges available to + DNS queries + - Added the following sub-options to the tflags setting: autolearn_force, + maxhits=N, ips_only, domains_only, a, ns. + - The option whitelist_from_rcvd can now take an IP address as its second + argument (instead of a domain name), which can be useful for whitelisting + a sending mailer which has no reverse DNS mapping. + o New plugins + A new plugin AskDNS was introduced. + +------------------------------------------------------------------- +Fri Jan 31 07:33:20 UTC 2014 - opensuse@dstoecker.de + +- set default homedir to override invalid default in spampd file + +------------------------------------------------------------------- +Sun Dec 8 10:03:12 UTC 2013 - opensuse@dstoecker.de + +- update spampd to version 2.42 (GIT version) + +------------------------------------------------------------------- +Thu May 30 00:36:59 UTC 2013 - crrodriguez@opensuse.org + +- Do not use syslog.target or Requires in systemd units. + +------------------------------------------------------------------- +Sat May 25 08:48:04 UTC 2013 - opensuse@dstoecker.de + +- increase maximum message size from 250 to 512 KB for spampd, as SPAM message size increased a lot + +------------------------------------------------------------------- +Wed Mar 27 14:24:38 UTC 2013 - stefan.jakobs@rus.uni-stuttgart.de + +- remove 'BuildRequires: perl-macros' from spec file, because perl + included in openSUSE > 1210 deprecates perl-macros which causes a + build failure. + +------------------------------------------------------------------- +Mon Feb 25 07:00:52 UTC 2013 - mlin@suse.com + +- Install spamd.service and spampd.service accordingly (/usr/lib/systemd + for 12.3 and up or /lib/systemd for older versions). + +------------------------------------------------------------------- +Wed Sep 26 13:37:00 UTC 2012 - stefan.jakobs@rus.uni-stuttgart.de + +- replace iXhash with the inofficial, but recommended, version iXhash2 + +------------------------------------------------------------------- +Wed Jul 11 07:47:47 UTC 2012 - varkoly@suse.com + +- 768582 - suse.cron-sa-update should allow to restart spamd after a successful run of sa-update + +------------------------------------------------------------------- +Tue Jul 3 09:57:18 UTC 2012 - varkoly@suse.com + +- killproc can not stop spamd + +------------------------------------------------------------------- +Tue Jun 26 08:54:29 UTC 2012 - varkoly@suse.com + +- Add systemd service files for spamd and spampd + bnc#768581 - rcspamd stop doesn't terminate spamd + +------------------------------------------------------------------- +Tue Dec 20 09:03:09 UTC 2011 - varkoly@suse.com + +- bnc#737637 - IPv6 support in spamassassin not functional + +------------------------------------------------------------------- +Thu Oct 6 14:27:12 UTC 2011 - varkoly@suse.com + +- bnc#720220 - spampd, installed by pkg:spamassassin, FAILs to launch, + uses non-existent/un-installed 'user' + +------------------------------------------------------------------- +Fri Sep 16 17:41:59 UTC 2011 - coolo@suse.com + +- fix perl requires + +------------------------------------------------------------------- +Fri Jun 24 18:00:29 CEST 2011 - dmueller@suse.de + +- update to 3.3.2: + * various fixes, fix support with perl 5.12 +- remove upstreamed patches + +------------------------------------------------------------------- +Wed Apr 20 09:38:34 UTC 2011 - varkoly@novell.com + +- Fix the sa-update cronjob + +------------------------------------------------------------------- +Sun Apr 10 09:40:55 UTC 2011 - varkoly@novell.com + +- bnc#676667 - sa-update cronjob should allow amavisd restart + +------------------------------------------------------------------- +Wed Dec 1 13:36:28 UTC 2010 - coolo@novell.com + +- switch to perl_requires macro + +------------------------------------------------------------------- +Fri Nov 12 06:09:15 UTC 2010 - varkoly@novell.com + +- bnc#650645 - Spamassassin Bug 6392 + +------------------------------------------------------------------- +Wed Oct 13 22:37:42 UTC 2010 - chris@computersalat.de + +- fix build + o mkdir /etc/cron.daily -> + {__install} -d $RPM_BUILD_ROOT/etc/cron.daily/ + o removed from filelist + dir /etc/cron.daily/ (provided by filesystem) + +------------------------------------------------------------------- +Fri Oct 8 17:48:15 UTC 2010 - varkoly@novell.com + +- Add script to call sa-update + +------------------------------------------------------------------- +Wed Oct 6 07:55:27 UTC 2010 - opensuse@dstoecker.de + +- add missing requires for spampd + +------------------------------------------------------------------- +Thu Jun 24 09:24:04 UTC 2010 - varkoly@novell.com + +- Update the rules +- Fix the spec file +- bnc#582111 - Spamassassin. spamd doesn't start. + +------------------------------------------------------------------- +Thu Apr 1 19:10:01 UTC 2010 - chris@computersalat.de + +- update sa to 3.3.1 +- update rules to 3.3.1.r923257 +- cleanup spec + o removed comments +- added deprecated patch for suse_version > 1120 (perl 5.12) + o used stuff from combo patch + https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6392 +- added MIMEEval patch + o https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6396 + +------------------------------------------------------------------- +Sun Mar 21 01:10:29 UTC 2010 - chris@computersalat.de + +- added perl-Net-Ident for Build/Recommends +- fix build for SLE_10 + +------------------------------------------------------------------- +Sat Mar 20 19:10:43 UTC 2010 - chris@computersalat.de + +- bzipped Source Mail-SpamAssassin-rules... +- removed patch4 + o Mail-SpamAssassin-3.2.5.diff +- build with ssl support + o ENABLE_SSL="yes" +- renamed subpackages + o perl-spamassassin > perl-Mail-SpamAssassin + o new sub package perl-Mail-SpamAssassin-Plugin-iXhash +- fixed deps + o moved most deps over to perl-Mail-SpamAssassin +- some rpmlint fixes + o wrong-file-end-of-line-encoding {IXHASH}/CHANGELOG + o fix build without RPM_OPT_FLAGS + +------------------------------------------------------------------- +Fri Mar 19 17:46:07 UTC 2010 - chris@computersalat.de + +- cleanup spec + o sort TAGS + o redefine SOURCES + - added iXhash-1.5.5.tgz + - added spampd-2.20.tar.gz + - removed iXhash.pm + - removed spampd + o macros + - added perl-macros + o cleanup install section + +------------------------------------------------------------------- +Fri Mar 19 12:00:00 CET 2010 - opensuse@dstoecker.de + +- updated iXhash module to 1.5.5 + - iXhash is now a sourceforge project (http://ixhash.sourceforge.net/) + +------------------------------------------------------------------- +Thu Mar 18 20:11:20 UTC 2010 - chris@computersalat.de + +- added original SOURCES + o spampd-2.20.tar.gz +- renewed Mail-SpamAssassin-3.3.0.tar.bz2 + o wget Mail-SpamAssassin-3.3.0.tar.gz + bznew +- some spec mods + o macros {__make}, {__install} ... + o perl_make_install + o added check +- some rpmlint fixes + o invalid-suse-version-check 1120 + +------------------------------------------------------------------- +Wed Mar 17 12:00:00 CET 2010 - opensuse@dstoecker.de + +- update to 3.3.0 +- add ixHash module (not activated by default) +- add additional spampd tool + - better performance than spamd +- fixed deps + - added perl-NetAddr-IP +- fixed Summary + +------------------------------------------------------------------- +Sun Jan 3 01:02:42 CET 2010 - dmueller@suse.de + +- apply rules update (bnc#567849) + +------------------------------------------------------------------- +Thu Dec 24 20:36:34 UTC 2009 - coolo@novell.com + +- fix install + +------------------------------------------------------------------- +Tue Nov 10 16:16:54 CET 2009 - varkoly@suse.de + +- bnc#551880 – spamassassin package should require re2c +- bnc#552035 – install of spamassassin corrupts /etc/sysconfig/spamd + +------------------------------------------------------------------- +Mon Jan 26 12:28:32 CET 2009 - coolo@suse.de + +- no reason to hide the init-script from !root + +------------------------------------------------------------------- +Fri Nov 7 12:57:05 CET 2008 - varkoly@suse.de + +- (bnc#440529) - spamd init-script should support reload + +------------------------------------------------------------------- +Wed Sep 10 15:19:57 CEST 2008 - varkoly@suse.de + +- (bnc#420649) - rcspamd restart is broken + +------------------------------------------------------------------- +Tue Jul 1 08:37:26 CEST 2008 - varkoly@suse.de + +- update to 3.2.5 + * bug 5775: newer gpg versions require keys to be cross-certified (backsig). + * bug 5899: add perl version string to the storage area for compiled rulesets, + to avoid crashes when perl is upgraded between major versions (e.g perl 5.8.x to 5.10.0) and the ABI breaks + * bug 5496, bug 5910: clear some FORGED_MUA_OUTLOOK false positives, particularly + on the new-format Message-ID generated by the Outlook Express version used in Windows XP service pack 3 + * bug 5730: when using Postgres >= 8.1.0 with Bayes, this error occurs: + 'WARNING: nonstandard use of \ in a string literal at character'. + * bug 5769: fix 'sa-compile: eval failed: Can't find label NO' error, caused + in rare circumstances when sa-compile attempted to deal with rules written using 'replace_rules' features + * bug 5858: fix circular reference memory leak caused by some messages + * bug 5815: update 2TLD list to include .rs CCTLD + * bug 4706: remove HG_HORMOME rules due to poor performance + * bug 5835: typo in POD docs for SPF plugin; thanks to Benny Pedersen for fix + * bug 5839: a missing or failed eval rule function could mistakenly count as a rule hit, fixed + * trivial bugfix for the VBounce ruleset: __BOUNCE_FROM_DAEMON incorrectly used + instead of *, + so some From addresses were not being recognised as bounce senders + +------------------------------------------------------------------- +Tue Jan 8 15:15:11 CET 2008 - varkoly@suse.de + +- update to 3.2.4: + * bug 5599: allow load distribution of SA nameserver queries across all + nameservers listed in resolv.conf, using 'dns_options rotate'. thanks to + Pawel Sasin + * bug 5673: 'ALL' header was including spurious extra spaces between header + names and values. fix + * bug 5594: several major sa-compile fixes. major increase in overall speed; + cache results between runs to further increase speed; and fix a danger of + massive memory usage + * bug 5556: fix a variety of sa-compile portability issues, and support for + 5.6.x perls + * bug 5514: make 'score set for a non-existent rule' a debug message, instead + of a lint warning, since it's a very frequent FAQ + * bug 5493: sa-compile fails to correctly deal with escaped backslashes. fix + * bug 5672: remove DNS_FROM_SECURITYSAGE (DNSBL lookups against + securitysage.com) due to unreliability + * bug 5476: update Bonded Sender (now Sender Score Certified) rules, and add + a rule for their strictly-confirmed-opt-in-required zone + * bug 5538: remove FORGED_MUA_AOL_FROM and FORGED_AOL_TAGS entirely; they're + obsolete, given the current capabilities of AOL mail user agents + * bug 5632: remove all completewhois.com DNSBL lookups, site seems to have + disappeared without warning + * bug 5715: allow for more than one sa-update MIRRORED.BY file host in DNS, + for redundancy + * bug 5662: DKIM changes: recognize author signature and multiple signatures + for whitelisting (with Mail::DKIM 0.29); disable useless + "check_dkim_signsome"; new eval rules "check_dkim_valid_author_sig" and + "check_dkim_valid" (an alias for a "check_dkim_verified" misnomer); new + tags _DKIMIDENTITY_ and _DKIMDOMAIN_; updated terminology; verification + speedup with Mail::DKIM 0.30 (or its pre-releases) + * bug 5696: sa-compile: cut regexp base strings at Unicode high codepoints, + to avoid corruption of patterns containing UTF-8 + * bug 5637: bayes_file_mode is handled incorrectly when creating bayes.mutex, + resulting in incorrect permissions on that file; fix by Mihaly Barasz + * bug 5612: DB_File version 4.2.x has a bug that loops infinitely if files + named '__db.{filename}' are present; work around. thanks to J. Nick Koston + for the report and fix + * bug 5606: too-early init_learner() call causes root's user prefs file to be + read when spamd is started; this is inappropriate. fix + * bug 4179: if allow_user_rules is 1, user rules are not unique to each user; + one user's user rules can appear in later scans for other users that are + run using the same spamd process. fix + * bug 5680: ALL_TRUSTED can fire if a trusted MSA or webmail system receives + the message from an untrusted X-Originating-IP: header. fix + * bug 5626: in the 'spamassassin' script, install a signal handler for + SIGHUP, SIGINT, SIGTERM and SIGPIPE to ensure that temporary files are + removed + * bug 5557: some temporary files are left not cleaned up on Windows; fix + * bug 5661: speed up Bayes SQL queries by allowing the use of indexes when + expiring + * bug 5611: support 'spamd --nouser-config -u username', which setuids to + 'username' but does not read user_prefs files from anywhere + * bug 5665: spamd may fail to notice that a child has completed exiting, and + keeps in the child list in state 'K', eventually filling up the child list + with 'ghost' children. fix + * bug 5735: spamc should allow retry_sleep 0 + * bug 5728: spamd: require -u with --sql-config or --ldap-config + * bug 5682: remove FH_HOST_ALMOST_IP, FH_HOST_EQ_D_D_D_D, due to false + positives and redundancy with RDNS_DYNAMIC; remove FH_HOST_EQ_D_D_D_DB due + to no hits + * bug 5681: look up IP addresses found in 'X-Yahoo-Post-IP' and 'X-SenderIP' + headers, too, thanks to Martin Blapp + * Bug 5589: Refined async events handling and DNS lookup completions + * bug 5586: RDNS_NONE has false positives if the MTA doesn't put the hostname + in the Received header, like Communigate Pro. add an exception for this + * bug 5748: fix locale problem with use of external sort in sa-compile + +------------------------------------------------------------------- +Sun Aug 12 11:45:35 CEST 2007 - varkoly@suse.de + +- update to 3.2.3: + *bug 5574: fix new setuid code to work with perl 5.6.1, and to support DCC and + Pyzor in all releases of perl + + *bug 5107: change default 'user_scores_ldap_username' to be the null string, + allowing anonymous binding; fix 'schema' syntax error in LDAP config support + + *zeroing an 'eval' rule's score did not stop it running. fix, thanks to + Richard Birkett + + *bug 5571: allow for new message ID format we have seen from Vista or Windows + 2003 Server MAPI to avoid false positives + + *bug 5397: RDNS_DYNAMIC should never fire on a PTR with 'static' in it; thanks + to Martin Blapp . bug 5563: RDNS_DYNAMIC rules use + order-dependent fields where it is unsafe to depend on this, fix. bug 5564: + __RDNS_DYNAMIC_IPADDR does not hit all of its test patterns, fix. + + *bug 5475: fix FORGED_MUA_AOL_FROM to allow <*@{aol,cs}.*> addresses instead + of just <*@{aol,cs}.com> + + +------------------------------------------------------------------- +Thu Aug 2 13:48:28 CEST 2007 - dmueller@suse.de + +- update to 3.2.2: + * bug 5548: Certain mail input can take a long time to scan with 100% CPU + utilisation, due to backtracking in a rule's regexp. fix + * bugs 5510, 5518, 5529: fix 'make test' when running as root, needed for CPAN + * bug 5419: kill -HUP of pidof spamd causes the ps name to change from spamd + to perl. fixed + * bug 5535: 'make test' errors in Windows caused by nonportable use of + getpwuid + * bug 5462: multiple DNS records for a host name should allow use of spamd -H + for load balancing installs to work + * bugs 5509, 5511: fix network lookup timeouts, where lookups were being lost + once a timeout was hit; also fix code to match documentation on + rbl_timeout's scaling and minimum duration of 1 second; and attempt to + collect already-received DNS responses when the timeout is reached; improve + related debugging output. Thanks to Mark Martinec + * bugs 5412, 5478, 5522: Fix problems using the spamc -x option with certain + other options; 'spamc -x -R' always returned 0, instead of the exit code, on + error. Bug 5478: in addition, 'spamc -x -e /command' would still run the + command, even if errors meant that the filtered text would be unavailable, + which contradicted -x. + * bug 5445: body eval tests defined in user_rules cause ugly 'Subroutine + _eval_tests_type11_prineg400_set3 redefined' warnings + * bug 5355: add in new entries for RegistrarBoundaries + * bug 5515: libsslspamc.so & libsslspamc.so can not build without -fPIC, but + we were picking up the wrong CFLAGS to do this. + * bug 5501: zero score for FH_HAS_XID + * bug 5449: allow_user_rules causes sa-compile / Rule2XSBody plugin to emit + spurious warnings; fix. also, add a new 'user_conf_parsing_end' plugin + hook, which is called after the per-user configuration is parsed + * bug 5182: update the sa-learn doc to mention that -u is only usable w/ sql + * bug 5534: fix harmless-but-ugly C compiler warning in sa-compile + +------------------------------------------------------------------- +Thu Jul 26 10:32:25 CEST 2007 - varkoly@suse.de + +- #278626 - SpamAssassin + Mailman + The Bat! = false positive + +------------------------------------------------------------------- +Thu Jun 14 09:58:00 CEST 2007 - varkoly@suse.de + +- UPDATE to version 3.2.1 + +- bug 5480: fix for CVE-2007-2873: a local user symlink-attack DoS + vulnerability. It only affects systems where spamd is run as root, is used + with vpopmail or virtual users via the "-v"/"--vpopmail" OR + "--virtual-config-dir" switch, AND with the "-x"/"--no-user-config AND + WITHOUT the "-u"/"--username" switch AND with the "-l"/"--allow-tell" switch. + This is not default on any distro package, and is not a common configuration. + More details of the vulnerability can be read at + . + +- bug 5488: zero some rules causing false positives: FH_HOST_EQ_D_D_D_DB and + FH_HOST_EQ_D_D_D_D. + +- bug 5257: re-raise autolearn ham threshold to 1.0; the lower value + used in 3.2.0 was creating problems. + +- bug 5422: in spamd, deleting hash entries from the SIGCHLD signal handler is + unsafe, causes corruption of the data structure, and results in 'prefork: + ordered child N to accept, but they reported state '1', killing rogue' + errors. fix. + +- bug 5102: tighten up regexp for FORGED_HOTMAIL_RCVD to avoid some FPs. + +- bug 5457: spamc build and test should handle not having zlib available. + +- bug 5379: spamd could crash at startup if its preloading temporary directory + already exists. fix. + +- bug 4616: spamc config can cause command line options to be ignored. fix. + +- bug 5485: zero score DK/DKIM_POLICY_SIGNSOME rules since they'll always fire + due to defaults (unless there's an explicit SIGNALL policy). + +- bug 5492: VBounce rule was looking in header instead of body for whitelisted + relays. fix. + +- bug 5487: prevent multiple "urirhssub"s using the same zone from overwriting + each other. + +- bug 5432 - Change default in Win32 build to not build spamc. + +- bug 5446: add --updatedir option to sa-compile and remove inaccurate re2c + required version info from pod. + +- bug 5436: add omitted "ifplugin" statements to the configuration, which would + otherwise cause lint errors if the default plugins were disabled. + +- bug 5477: prevent Rule2XSBody info message from appearing on stderr during + spamd startup. + +------------------------------------------------------------------- +Thu May 3 15:38:00 CEST 2007 - varkoly@suse.de + +- update to 3.2.0 + Summary of major changes since 3.1.8 + ------------------------------------ + + Changes to the core code: + + * new behavior for trusted_networks/internal_networks: the 127.* network + is now always considered trusted and internal, regardless of configuration. + + * bug 3109: short-circuiting of 'definite ham' or 'definite spam' messages + based on individual short-circuit rules using the 'shortcircuit' setting, + by Dallas Engelken . + + * bug 5305: implement 'msa_networks', for ISPs to specify their Mail Submission + Agents, and extend network trust accordingly. + + * bug 4636: Add support for charset normalization, so rules can be written + in UTF-8 to match text in other charsets. + + * sa-compile: compilation of SpamAssassin rules into a fast parallel-matching DFA, + implemented in native code. + + * "tflags multiple": allow writing of rules that count multiple hits in a single message. + + * bug 4363: if a message uses CRLF for line endings, we should use it as well, + otherwise stay with LF as usual; important for Windows users. + + * bug 4515: content preview was omitting first paragraph when no Subject: header was present. + + * The third-party modules used by sa-update are now required by the SpamAssassin package, + instead of being optional. + + * Bug 5165: 'sa-update --checkonly' added to check for updates without applying them; + thanks to + + * Bugs 4606, 4609: Adjust MIME parsing limits for nested multipart/* and message/rfc822 MIME parts. + + * bug 5295: add 'whitelist_auth', to whitelist addresses that send mail using + sender-authorization systems like SPF, Domain Keys, and DKIM + + * Removed dependency on Text::Wrap CPAN module. + + * Received header parsing updates/fixes/additions. + + Spamc / spamd: + + * bug 4603: Mail::SpamAssassin::Spamd::Apache2 -- mod_perl2 module, implementing spamd + as a mod_perl module, contributed as a Google Summer of Code project by Radoslaw Zielinski. + + * bug 3991: spamd can now listen on UNIX domain, TCP, and SSL sockets simultaneously. + Command-line semantics extended slightly, although fully backwards compatibly; + add the --ssl-port switch to allow TCP and SSL listening at the same time. + + * bug 3466: do Bayes expiration, if required, after results have been passed back + to the client from spamd; this helps avoid client timeouts. + + * more complete IPv6 support. + + * spamc: Add '-K' switch, to ping spamd. + + * spamc: add '-z' switch, which compresses mails to be scanned using zlib compression; + very useful for long-distance use of spamc over the internet. + + * bug 5296: spamc '--headers' switch, which scans messages and transmits back just rewritten headers. + This is more bandwidth-efficient than the normal mode of scanning, but only works for 'report_safe 0'. + + * Bump spamd's protocol version to 1.4, to reflect new HEADERS verb used for '--headers'. + + Mail::SpamAssassin modules and API: + + * bug 4589: allow M::SA::Message to use IO::File objects to read in message (same as GLOB). + + * bug 4517: rule instrumentation plugin hooks, to measure performance, + from John Gardiner Myers . + + * add two features to core rule-parsing code; 1. optional behaviour to recurse through subdirs + looking for .cf/.pre's, to support rules compilers working on rulesrc dir. 2. call back + into invoking code on lint failure, so rule compiler can detect which rules exactly fail the lint check. + + * bug 5206: detect duplicate rules, and silently merge them internally for greater efficiency. + + * bug 5243: add Plugin::register_method_priority() API, allowing plugins to control the relative + ordering of plugin callbacks relative to other plugins' implementations. + + * Reduced memory footprint. + + Plugins: + + * bug 5236: Support Mail::SPF replacement for Mail::SPF::Query. + + * bug 5127: allow mimeheader :raw rules to match newlines and folded-header whitespace + in MIME header strings. + + * bug 4770: add ASN.pm plugin, contributed by Matthias Leisi + + * bug 5271: move ImageInfo ruleset into 3.2.0 core rules, thanks to Dallas Engelken . + + * VBounce ruleset and plugin: detect spurious bounce messages sent by broken mail systems + in response to spam or viruses. (Based on Tim Jackson's "bogus-virus-warnings.cf" ruleset.) + + * DomainKeys/DKIM: Mail::DKIM is now preferred over Mail::DomainKeys, since the latter module + is no longer actively maintained, and Mail::DKIM can handle both DomainKeys and DKIM signatures. + + * DKIM: separate signature verification from fetching a policy: can save a DNS lookup for each + unverified message by setting score to 0 for all policy-related rules (DKIM_POLICY_SIGNALL, + DKIM_POLICY_SIGNSOME, and DKIM_POLICY_TESTING). (thanks to Mark Martinec) + + * DKIM: support testing flags in the public key, as well as in the policy record. (thanks to Mark Martinec) + + * DKIM: skip fetching a policy (SSP) if a signature does verify, according to draft-allman-dkim-ssp-02 + (thanks to Mark Martinec) + + * Move rule functionality and checking into separate Check plugin, allowing third parties + to implement alternative scanner core algorithms. + + * core EvalTests code moved into various plugins. + + * Plus lots of miscellaneous bug fixes. + +------------------------------------------------------------------- +Fri Apr 20 11:08:35 CEST 2007 - meissner@suse.de + +- removed bad /tmp usage. + +------------------------------------------------------------------- +Wed Mar 28 12:08:09 CEST 2007 - varkoly@suse.de + +- #249652 - spamassassin missing dependencies + +------------------------------------------------------------------- +Mon Feb 19 19:11:36 CET 2007 - dmueller@suse.de + +- update to 3.1.8: + * fix for CVE-2007-0451: possible DoS due to incredibly + long URIs found in the message content. + * disable perl module usage in update channels unless + --allowplugins is specified + * files with names starting/ending in whitespace weren't usable + * remove Text::Wrap related code due to upstream issues + * update spamassassin and sa-learn to better deal with STDIN + * improvements and bug fixes related to DomainKeys + and DKIM support + * several updates for Received header parsing + * several documentation updates and random taint-variable related + issues + +------------------------------------------------------------------- +Fri Feb 9 16:52:13 CET 2007 - varkoly@suse.de + +- fixing: Bug 225248 - Problem in SpamAssassin: if spamassassin configuration + is stored in postgresql the search in the table userpref delivers + results in wrong order. +- fixing: Bug 218272 - SpamAssassin URIDNSBL plugin tries to lookup + libraries (libimf.so, liblua.so, ...) via nameserver + +------------------------------------------------------------------- +Fri Dec 22 10:28:47 CET 2006 - varkoly@suse.de + +- Enhancing local.cf for the plugin Mail::SpamAssassin::Plugin::URIDNSBL + to skip the novell and suse domains from spam checks and to give + examples for problems like #218272 "SpamAssassin URIDNSBL plugin tries to + lookup libraries (libimf.so, liblua.so, ...) via nameserver" + +------------------------------------------------------------------- +Mon Dec 4 23:00:59 CET 2006 - dmueller@suse.de + +- update to "hot-fix" 3.1.7: + * fix sa-update failure when rule scores ae set + +------------------------------------------------------------------- +Wed Nov 15 08:50:57 CET 2006 - varkoly@suse.de + +- fixing bug: 215722 BUG in archive PgSQL.pm (SpamAssassin) + +------------------------------------------------------------------- +Mon Oct 9 15:29:59 CEST 2006 - varkoly@suse.de + +- update to version 3.1.6: This is a maintenance release of the 3.1.x branch. + * fixes to bug in date handling affecting DATE_IN_FUTURE_* + and DATE_IN_PAST_* rules when more than one Resent-Date header is + present + * include local site config in sa-update lint checks + * fix race condition in spamd preforking code that sometimes left + one child process running after SIGHUPing spamd + * unescape hash characters in the config + * fix false SPF_SOFTFAIL's when SPF queries timeout + * update RCVD_ILLEGAL_IP evaltest to properly deal with 127/8 + * enable adding headers with single digit zero value + * add support for ecelerity Received headers + * fix a bug, introduced in 3.1.5, in mbx code + * M::SA::Client doesn't always catch failed connection + to spamd, fixed + +------------------------------------------------------------------- +Sun Aug 6 15:35:28 CEST 2006 - dmueller@suse.de + +- update to version 3.1.4: + * bug 4941: if the first sa-update run failed and wasn't re-run to successful + completion, the local state directory would exist, and therefore SA sees no + rules. now, wait as long as possible to create the directory, and try to + remove it on failure. + * bug 4997: increase module version requirements for Archive::Tar to 1.23 and + IO::Zlib to 1.04 + * bug 4966: fix major BSMTP bug, which rendered SA unusable with exim4 when + BSMTP is used. + * bug 4899: Windows had issues with single quotes around filenames so certain + things like pyzor, etc, wouldn't function. + * bug 4958: sa-update should work on Windows + * bug 4908: gtube.t test failed in non-english locales + * bug 4488: deal with potential memory leak due to Bayes and BayesStore + circular references + * bug 4862: update macro values in update channels + +------------------------------------------------------------------- +Thu Jun 22 18:18:30 CEST 2006 - ro@suse.de + +- remove selfprovides + +------------------------------------------------------------------- +Fri Jun 9 14:10:29 CEST 2006 - varkoly@suse.de + +- * Fixing Requiers tag in spec file + The missed packages are: perl-libwww-perl and perl-IO-Zlib + +------------------------------------------------------------------- +Tue Jun 6 16:43:42 CEST 2006 - varkoly@suse.de + +- update to version 3.1.3: + * #181157: VUL-0: spamassassin: remote root + * 4879: add in pointer to the wiki to find out more about debug channels + + +------------------------------------------------------------------- +Mon May 29 16:10:33 CEST 2006 - dmueller@suse.de + +- update to version 3.1.2: + * bug 4802: implement DKIM plugin, including whitelist_from_dkim support + * bug 3838: work around Perl bug causing captured RE variables to become + tainted -- thanks to Mark Martinec for pointing out the bug with + Perl itself + * bug 4850: re-enable the Razor2 plugin by default due to a service + policy change + * bug 4826: Razor2 plugin needs to load Mail::SpamAssassin::Timeout module + * bug 4827: M::SA::first_existing_path() would return the last array + entry passed in if none of the paths were found. Now return undef + instead and handle the error when it happens. + * bug 4813: generally open RE causes sendmail received header get read + in as qmail in error + * bug 4839: Logger.pm converts control chars including tab into + underscores which confuses a bunch of users when checking debug output. + Convert tab into space instead, etc. + * bug 4884: if a null message is passed in, there are several variables + which end up undefined causing warnings. fake an empty message if no + input is given. + * bug 4793: when replacing tags in a message (_TAG_), leave the tags + that don't exist alone instead of just removing them + * bug 4861, 4760: handle dccifd and dccproc failover properly, backport + relays_internal and relays_external code, backport bug 4760 fix so + that it's not possible to be in internal_networks without being in + trusted_networks as well + * bug 4901: deal more properly with failures in bgsend(). also, use + the proper variable to show when errors occur. + * bug 4867: fetchmail changed header formats at some point making Received + parsing fail in certain conditions + * bug 4699: use M::SA::Timeout for spamd copy_config call and allow + for empty $@ values + * bug 3754: if there's a problem opening a file via sa-learn or + spamassassin, return an error exit value. + +------------------------------------------------------------------- +Fri Mar 17 23:49:00 CET 2006 - dmueller@suse.de + +- Adjust BuildRequires + +------------------------------------------------------------------- +Tue Mar 14 13:20:16 CET 2006 - dmueller@suse.de + +- update to version 3.1.1: + * bug 4760: strictly validate trusted network configurations + * bug 4363: honor CRLF settings + * bug 4748: Update rules to catch Google redirector + * bug 4791: fix handling of invalid encoded utf8 messages + * bug 4809: add TLD for Greece + * bug 4606: Adjust MIME parsing limits (possible DoS) + * bug 4795: Improved validation of the score option + * fix fd leak in Bayes token DB handling + * bug 4780: fix IP_ADDRESS & LOCALHOST IPv6 support + * bug 4735: lack of network interfaces crashes in DnsResolver.pm. + * bug 4700: prevent arbitrary code injection + * bug 4704,4686,4627,4690: Fixed Received: headers parsing + +------------------------------------------------------------------- +Wed Jan 25 21:41:45 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Jan 12 13:32:56 CET 2006 - varkoly@suse.de + +- fixing bug #138545 + +------------------------------------------------------------------- +Thu Jan 12 09:50:03 CET 2006 - varkoly@suse.de + +- fixing bug #141557 + +------------------------------------------------------------------- +Wed Oct 26 11:36:51 CEST 2005 - choeger@suse.de + +- bugfix for init-script: tell spamd to use a pidfile + +------------------------------------------------------------------- +Fri Sep 16 14:59:19 CEST 2005 - choeger@suse.de + +- update to version 3.1.0 + +------------------------------------------------------------------- +Mon Aug 8 16:51:40 CEST 2005 - ug@suse.de + +- fixed a license problem. + See Bug #102221 + +------------------------------------------------------------------- +Thu Jun 23 09:38:49 CEST 2005 - meissner@suse.de + +- use RPM_OPT_FLAGS (for spamc). + +------------------------------------------------------------------- +Wed Jun 8 11:12:28 CEST 2005 - choeger@suse.de + +- Update to version 3.0.4 + +------------------------------------------------------------------- +Mon May 2 10:59:08 CEST 2005 - choeger@suse.de + +- Update to version 3.0.3 + +------------------------------------------------------------------- +Fri Apr 22 16:02:03 CEST 2005 - choeger@suse.de + +- Bugfix ID#79285 - spamd: "short" description missing + +------------------------------------------------------------------- +Wed Jan 12 18:26:55 CET 2005 - choeger@suse.de + +- cleaned up build process, now properly using ExtUtils::MakeMaker + following the PACKAGING readme + +------------------------------------------------------------------- +Mon Dec 20 11:29:11 CET 2004 - choeger@suse.de + +- Update to version 3.0.2 + +------------------------------------------------------------------- +Thu Nov 25 12:36:15 CET 2004 - choeger@suse.de + +- removed superfluous line: + test -d /root/.spamassassin || mkdir /root/.spamassassin + from init script + +------------------------------------------------------------------- +Tue Oct 26 14:19:55 CEST 2004 - choeger@suse.de + +- Update to version 3.0.1 +- specfile can now also be used on older SuSE Linux versions + +------------------------------------------------------------------- +Thu Sep 23 12:01:58 CEST 2004 - choeger@suse.de + +- Update to version 3.0.0 + +------------------------------------------------------------------- +Fri Aug 6 13:59:06 CEST 2004 - meissner@suse.de + +- Upgraded to security / bugfix release 2.64. #43546 + +------------------------------------------------------------------- +Sat Mar 27 11:34:02 CET 2004 - ro@suse.de + +- added directory /etc/mail to filelist + +------------------------------------------------------------------- +Tue Jan 27 14:29:27 CET 2004 - choeger@suse.de + +- Update to version 2.63 + +------------------------------------------------------------------- +Sat Jan 3 18:51:04 CET 2004 - mmj@suse.de + +- References to %version have to go below the Version: tag + +------------------------------------------------------------------- +Wed Dec 31 12:24:44 CET 2003 - mmj@suse.de + +- Update to version 2.61 + +------------------------------------------------------------------- +Sun Dec 7 18:35:53 CET 2003 - mmj@suse.de + +- The perl-spamassassin version should be the same as the spam- + assassin version. + +------------------------------------------------------------------- +Sat Oct 18 16:30:11 CEST 2003 - mmj@suse.de + +- Not necessary to explicitly tell SA not to query Osirusoft + blocklist anymore + +------------------------------------------------------------------- +Fri Oct 17 20:45:25 CEST 2003 - mmj@suse.de + +- Don't build as root +- Update to version 2.60 + +------------------------------------------------------------------- +Tue Oct 14 14:11:33 CEST 2003 - choeger@suse.de + +- Bugfix Bugzilla ID#32025, spamd is not started because of a bug + in the init-script +- Bugfix Bugzilla ID#31867, spamassassin -lint reports errors because + of outdated local.cf configuration options + +------------------------------------------------------------------- +Thu Sep 4 17:07:41 CEST 2003 - choeger@suse.de + +- Michael fixed MakeMaker PITA again + +------------------------------------------------------------------- +Tue Sep 2 15:30:37 CEST 2003 - choeger@suse.de + +- Don't query Osirusoft blocklist anymore, see + http://news.spamassassin.org/modules.php?op=modload&name=News&file=article&sid=44&mode=thread&order=0&thold=0 for more details. + Bugzilla ID#29566 + +------------------------------------------------------------------- +Wed Aug 20 20:22:56 CEST 2003 - mjancar@suse.cz + +- require the perl version we build with + +------------------------------------------------------------------- +Thu Aug 14 18:45:28 CEST 2003 - choeger@suse.de + +- Bugfix Bugzilla ID#28942: + missing activation metadata in sysconfig template + +------------------------------------------------------------------- +Wed Jul 30 13:30:39 CEST 2003 - choeger@suse.de + +- new macros for stop/restart of services on rpm update/removal + +------------------------------------------------------------------- +Thu Jul 17 13:28:57 CEST 2003 - choeger@suse.de + +- use install_vendor and new %perl_process_packlist macro + +------------------------------------------------------------------- +Tue Jul 1 12:52:28 CEST 2003 - choeger@suse.de + +- don't use PREFIX in 'perl Makefile.PL' +- don't set LOCAL_RULES_DIR using %buildroot as prefix + +------------------------------------------------------------------- +Tue Jun 17 10:39:09 CEST 2003 - choeger@suse.de + +- updated filelist + +------------------------------------------------------------------- +Wed May 28 14:12:24 CEST 2003 - choeger@suse.de + +- Update to 2.55 + +------------------------------------------------------------------- +Tue May 13 16:08:59 CEST 2003 - mmj@suse.de + +- Update to 2.54 +- Move %defattr to cover all files +- Remove unwanted files + +------------------------------------------------------------------- +Sun Apr 6 13:01:19 CEST 2003 - mmj@suse.de + +- Update to version 2.53 which fixes some major bugs in earlier + 2.5x releases + +------------------------------------------------------------------- +Fri Mar 28 14:07:47 CET 2003 - mmj@suse.de + +- spamassassin and perl-spamassassin should not both own + /etc/mail/spamassassin/local.cf + +------------------------------------------------------------------- +Tue Mar 25 09:55:26 CET 2003 - adrian@suse.de + +- update to version 2.52 + +------------------------------------------------------------------- +Mon Mar 24 14:22:24 CET 2003 - adrian@suse.de + +- use pid files in runlevel script (patch from Dirk Mueller #25767) + +------------------------------------------------------------------- +Sun Mar 23 22:28:26 CET 2003 - coolo@suse.de + +- adding perl-HTML-Parser to neededforbuild + +------------------------------------------------------------------- +Fri Mar 21 10:11:45 CET 2003 - adrian@suse.de + +- update to version 2.51 + +------------------------------------------------------------------- +Sun Mar 2 19:59:19 CET 2003 - mmj@suse.de + +- Disabling HABEAS_HIL test turned out to be just a bandaid. It still + stalls for longer periods, so add "-L" switch so it only performs + local tests. Subsequently remove the score HABEAS_HIL 0 in local.cf. + +------------------------------------------------------------------- +Tue Feb 25 09:28:46 CET 2003 - mmj@suse.de + +- Disable the HABEAS_HIL test (sender is on www.habeas.com Habeas + Infringer List) since it made each test last ~30 seconds. +- Default-Start: should be "3 5" not "" + +------------------------------------------------------------------- +Fri Feb 21 14:43:18 CET 2003 - adrian@suse.de + +- update to version 2.50 + * fixing crash on x86_64 [#22015] + +------------------------------------------------------------------- +Thu Feb 20 12:04:55 CET 2003 - mmj@suse.de + +- Add sysconfig metadata [#22690] + +------------------------------------------------------------------- +Mon Feb 3 21:32:31 CET 2003 - adrian@suse.de + +- update to version 2.44 + * obsoletes security fix + +------------------------------------------------------------------- +Wed Jan 29 20:16:24 CET 2003 - adrian@suse.de + +- update to version 2.43 + +------------------------------------------------------------------- +Tue Jan 28 17:26:10 MET 2003 - draht@suse.de + +- remove off-by-one bo -> spamassassin-ob1-security.diff + +------------------------------------------------------------------- +Wed Oct 16 01:32:39 CEST 2002 - ro@suse.de + +- fixed requires typo + +------------------------------------------------------------------- +Tue Oct 8 12:11:58 CEST 2002 - adrian@suse.de + +- add missing requires +- update to version 2.42 + +------------------------------------------------------------------- +Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de + +- removed bogus self-provides + +------------------------------------------------------------------- +Tue Aug 20 02:55:54 CEST 2002 - mmj@suse.de + +- Correct PreReq + +------------------------------------------------------------------- +Mon Jul 29 22:22:44 CEST 2002 - mls@suse.de + +- fixed neededforbuild for perl-5.8.0 + +------------------------------------------------------------------- +Fri Jul 12 11:31:25 CEST 2002 - choeger@suse.de + +- update to most recent version +- added perl-Time-HiRes to requires +- removed DOSWIN_EXECUTABLE patch + http://sourceforge.net/mailarchive/message.php?msg_id=1606621 + +------------------------------------------------------------------- +Fri May 10 23:50:32 MEST 2002 - garloff@suse.de + +- Add rule to filter mails with files having names with DOS/Win + suffixes (DOSWIN_EXECUTABLE), default score 4.6 +- Provide init script for spamd +- Install READMEs as %doc +- Move spamc/d/proxy/assassin man pages to spamassassin package +- Configuration of spamd in sysconfig/spamd + +------------------------------------------------------------------- +Wed May 8 23:43:26 MEST 2002 - garloff@suse.de + +- Update to version 2.20. + +------------------------------------------------------------------- +Tue Apr 16 19:09:31 MEST 2002 - draht@suse.de + +- fix file list (/usr/share/spamassassin) + add more convenient defaults to /etc/mail/spamassassin/local.cf + +------------------------------------------------------------------- +Tue Apr 9 17:10:25 MEST 2002 - draht@suse.de + +- initial package, version 2.11. + diff --git a/spamassassin.keyring b/spamassassin.keyring new file mode 100644 index 0000000..ce4568e --- /dev/null +++ b/spamassassin.keyring @@ -0,0 +1,229 @@ +PREFACE: This file lives at https://spamassassin.apache.org/KEYS and +https://www.apache.org/dist/spamassassin/KEYS + + +This file contains the GPG keys which Apache SpamAssassin's release and +update distributions are signed with. + +Please don't use these keys for email. They are only used for code signing. + +Please realize that this file itself, or the public key servers may be +compromised. You are encouraged to validate the authenticity of this key in an +out-of-band manner. For information about our validation and signing policies, +please read http://httpd.apache.org/dev/verification.html . + +The following key is used to sign releases after, and including SA 3.3.0: + +pub 4096R/F7D39814 2009-12-02 + Key fingerprint = D809 9BC7 9E17 D7E4 9BC2 1E31 FDE5 2F40 F7D3 9814 +uid SpamAssassin Project Management Committee +uid SpamAssassin Signing Key (Code Signing Key, replacement for 1024D/265FA05B) +sub 4096R/7B3265A5 2009-12-02 + +The PUBLIC KEY BLOCK Follows. [1] + +NOTE: The following key was used to sign releases before that point, but + will NEVER be used to sign later releases: + + pub 1024D/265FA05B 2003-06-09 + Key fingerprint = 26C9 00A4 6DD4 0CD5 AD24 F6D7 DEE0 1987 265F A05B + uid SpamAssassin Signing Key + sub 1024D/FC51569B 2003-08-21 + +The following key is used to sign rule updates: + +pub 4096R/5244EC45 2005-12-20 + Key fingerprint = 5E54 1DC9 59CB 8BAC 7C78 DFDC 4056 A61A 5244 EC45 +uid updates.spamassassin.org Signing Key +sub 4096R/24F434CE 2005-12-20 + +The PUBLIC KEY BLOCK Follows. [2] + + +[1] +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.13 (FreeBSD) + +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 +=VQsP +-----END PGP PUBLIC KEY BLOCK----- + +[2] +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +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 +aB8EKy5bg4U6 +=IbYW +-----END PGP PUBLIC KEY BLOCK----- diff --git a/spamassassin.spec b/spamassassin.spec new file mode 100644 index 0000000..27c60f9 --- /dev/null +++ b/spamassassin.spec @@ -0,0 +1,330 @@ +# +# spec file for package spamassassin +# +# Copyright (c) 2025 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%bcond_without test + +%define spd_version 2.61 +%define sa_version 4.0.1 +%define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') +%define perl_float %(echo %{perl_version} | awk -F. '{ printf "%d.%03d", $1, $2 }') +%define rules_revision 1916528 + +%define SPAMPD spampd-%{spd_version} + +Name: spamassassin +Version: %{sa_version} +Release: 0 +Summary: Extensible email filter which is used to identify spam +License: Apache-2.0 +Group: Productivity/Networking/Email/Utilities +URL: https://spamassassin.apache.org/ +Source0: https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2 +Source1: https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz +Source3: https://github.com/mpaperno/spampd/archive/%{spd_version}.tar.gz#/%{SPAMPD}.tar.gz +Source10: local.cf +Source11: README.SUSE +Source12: sysconfig.spamd +Source14: sysconfig.spampd +Source15: timed-sa-update +Source16: spamd.service +Source17: spampd.service +Source18: sa-update.service +Source19: sa-update.timer +Source100: https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2.asc +Source101: https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz.asc +# Keyring downloaded from https://www.apache.org/dist/spamassassin/KEYS +Source102: spamassassin.keyring +Source103: %{name}-rpmlintrc +Patch1: patch-PgSQL +Patch2: patch-URIDNSBL +Patch6: bnc#582111.diff +Patch7: basic-lint-without-sandbox.patch +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(zlib) +# optional, but want them for build (test) +BuildRequires: curl >= 7.2.14 +BuildRequires: gpg +BuildRequires: netcfg +BuildRequires: re2c +BuildRequires: wget >= 1.8.2 +# +Requires: re2c +Requires: spamassassin-spamc = %{sa_version} +Requires: (curl >= 7.2.14 or wget >= 1.8.2) +Requires: perl(Archive::Tar) >= 1.23 +Requires: perl(Error) +Requires: perl(IO::Zlib) >= 1.04 +Requires: perl(LWP) +Requires: perl(Mail::SpamAssassin) = %{sa_float} +Requires: perl(Net::Server::PreForkSimple) +Requires(post): %fillup_prereq +%{?systemd_ordering} + +%description +spamassassin adds a header line that shows if the mail has been +determined spam or not. This way, you can decide what to do with the +mail within the scope of your own filtering rules in your MUA (Mail +User Agent, your mail program) or your LDA (Local Delivery Agent). + +See the files in the documentation directory +%{_docdir}/spamassassin/ for more information on how to +use the filter. + +%package spamc +Summary: Spammassassin Client +Group: Productivity/Networking/Email/Utilities + +%description spamc +Spamc is the client to contact the spammassassin spamd daemon. It should +be used in place of "spamassassin" in scripts to process mail. + +%package -n perl-Mail-SpamAssassin +Summary: Perl Modules For Using Spamassassin Within An Own Perl Script +Group: Development/Libraries/Perl +BuildRequires: perl(Archive::Tar) >= 1.23 +BuildRequires: perl(Compress::Zlib) +BuildRequires: perl(DB_File) +BuildRequires: perl(Digest::SHA1) +BuildRequires: perl(Errno) +BuildRequires: perl(File::Copy) >= 2.02 +BuildRequires: perl(File::Spec) >= 0.8 +BuildRequires: perl(Getopt::Long) >= 2.32 +BuildRequires: perl(HTML::Parser) >= 3.43 +BuildRequires: perl(IO::Zlib) >= 1.04 +BuildRequires: perl(MIME::Base64) +BuildRequires: perl(Mail::DKIM) >= 0.37 +BuildRequires: perl(Net::DNS) >= 0.69 +BuildRequires: perl(Net::SMTP) +BuildRequires: perl(NetAddr::IP) >= 4.010 +BuildRequires: perl(Pod::Usage) >= 1.10 +BuildRequires: perl(Sys::Hostname) +BuildRequires: perl(Test::More) +BuildRequires: perl(Time::HiRes) +BuildRequires: perl(Time::Local) +# required for tests +BuildRequires: perl(Devel::Cycle) +#BuildRequires: perl(Perl::Critic::Policy::Perlsecret) +BuildRequires: perl(Perl::Critic::Policy::TestingAndDebugging::ProhibitNoStrict) +BuildRequires: perl(Test::More) +BuildRequires: perl(Text::Diff) +# optional, but want them for build (test) +BuildRequires: perl(Archive::Zip) +BuildRequires: perl(BSD::Resource) +BuildRequires: perl(DBD::SQLite) +BuildRequires: perl(DBI) +BuildRequires: perl(Devel::Cycle) +BuildRequires: perl(Email::Address::XS) +BuildRequires: perl(Encode::Detect::Detector) +BuildRequires: perl(HTTP::Date) +BuildRequires: perl(IO::Socket::IP) +BuildRequires: perl(IO::Socket::SSL) >= 1.76 +BuildRequires: perl(IO::String) +BuildRequires: perl(IP::Country::Fast) +BuildRequires: perl(LWP::UserAgent) +BuildRequires: perl(Mail::SPF) >= 2.001 +BuildRequires: perl(Net::CIDR::Lite) +BuildRequires: perl(Net::Ident) +BuildRequires: perl(Net::LibIDN) +BuildRequires: perl(Net::Patricia) >= 1.16 +BuildRequires: perl(Razor2::Client::Agent) >= 2.61 +# +Requires: perl(Archive::Zip) +Requires: perl(Digest::SHA1) +Requires: perl(Errno) +Requires: perl(File::Copy) >= 2.02 +Requires: perl(File::Spec) >= 0.8 +Requires: perl(HTML::Parser) >= 3.43 +Requires: perl(Mail::DKIM) >= 0.31 +Requires: perl(Net::DNS) >= 0.69 +Requires: perl(NetAddr::IP) >= 4.010 +Requires: perl(Pod::Usage) >= 1.10 +Requires: perl(Sys::Hostname) +Requires: perl(Time::HiRes) +Requires: perl(Time::Local) +Recommends: perl(Archive::Tar) >= 1.23 +Recommends: perl(BSD::Resource) +Recommends: perl(Compress::Zlib) +Recommends: perl(DB_File) +Recommends: perl(Email::Address::XS) +Recommends: perl(Encode::Detect::Detector) +Recommends: perl(Getopt::Long) >= 2.32 +Recommends: perl(HTTP::Date) +Recommends: perl(IO::Socket::IP) +Recommends: perl(IO::Socket::SSL) >= 1.76 +Recommends: perl(IO::String) +Recommends: perl(IO::Zlib) >= 1.04 +Recommends: perl(IP::Country::Fast) +Recommends: perl(LWP::UserAgent) +Recommends: perl(MIME::Base64) +Recommends: perl(Mail::DKIM) >= 0.37 +Recommends: perl(Mail::SPF) >= 2.001 +Recommends: perl(Net::CIDR::Lite) +Recommends: perl(Net::DNS) >= 0.58 +Recommends: perl(Net::Ident) +Recommends: perl(Net::LibIDN) +Recommends: perl(Net::Patricia) >= 1.16 +Recommends: perl(Net::SMTP) +Recommends: perl(Razor2::Client::Agent) >= 2.61 +Recommends: perl(Test::More) +Suggests: perl(DBD::mysql) +Suggests: perl(DBI) +Suggests: perl(Geo::IP) +Suggests: perl(GeoIP2::Database::Reader) +Provides: perl-spamassassin = %{sa_version} +Obsoletes: perl-spamassassin < %{sa_version} +BuildArch: noarch +%{perl_requires} + +%description -n perl-Mail-SpamAssassin +This package contains the perl modules for the spamassassin, including +the filter rules. This package is required for the package +"spamassassin", the commandline tool. + +%prep +%setup -q -n Mail-SpamAssassin-%{sa_version} -a 3 +tar -zxf %{SOURCE1} -C rules +%patch -P 1 +%patch -P 2 -p1 +%patch -P 6 +%patch -P 7 -p1 +cp %{SOURCE11} ./ + +%build +# Run substitutions in default rules +sed -i -e 's|@@CONTACT_ADDRESS@@|postmaster|g' \ + -e 's|@@LOCAL_RULES_DIR@@|%{_sysconfdir}/mail/spamassassin|g' \ + -e 's|@@VERSION@@|%{sa_float}|g' rules/*.cf + +export CFLAGS="%{optflags}" +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" \ + CONTACT_ADDRESS="postmaster" ENABLE_SSL="yes" + +%make_build + +%check +%if %{with test} +# Relax the crypto policies for the test-suite +export OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file +export OPENSSL_CONF='' +%make_build -j1 test +%endif + +%install +## perl-Mail-SpamAssassin stuff +%perl_make_install +%perl_process_packlist +%perl_gen_filelist +# remove %%{_bindir} from filelist +sed -i -e "/\/usr\/bin/d" %{name}.files +# package only %%{_mandir}/man3 +sed -i -e "s,%{_mandir}/man?,%{_mandir}/man3," %{name}.files +# +## spamassassin stuff +install -D -m0755 %{SPAMPD}/spampd.pl %{buildroot}%{_sbindir}/spampd +install -m 0755 %{SOURCE15} %{buildroot}%{_sbindir}/ +mv %{buildroot}%{_bindir}/spamd %{buildroot}%{_sbindir}/ +install -d %{buildroot}%{_sysconfdir}/mail/spamassassin +install -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/mail/spamassassin/local.cf +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd +install -D -m 0640 %{SOURCE12} %{buildroot}%{_fillupdir}/sysconfig.spamd +install -m 0640 %{SOURCE14} %{buildroot}%{_fillupdir}/ +test -f %{buildroot}%{_datadir}/spamassassin/user_prefs.template || { + echo "MakeMaker is broken again..." + exit 1 +} + +## default rules +install -d %{buildroot}%{_datadir}/spamassassin +install -D -m 0644 rules/[0-9]*.cf %{buildroot}%{_datadir}/spamassassin + +## systemd stuff +install -d %{buildroot}%{_unitdir} +install -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir} +install -D -m 644 %{SOURCE17} %{buildroot}%{_unitdir} +install -D -m 644 %{SOURCE18} %{buildroot}%{_unitdir} +install -D -m 644 %{SOURCE19} %{buildroot}%{_unitdir} + +%post +%service_add_post spamd.service spampd.service sa-update.timer +%{fillup_only -n spamd} +%{fillup_only -n spampd} +if [ $1 -gt 1 ]; then + # Package upgrade + for dir in $(ls -d %{_sharedstatedir}/%{name}/{,compiled/*/}[0-9\.]* 2>/dev/null); do + if [ "${dir##*/}" != "%{sa_float}" ]; then + rm -rf ${dir} + fi + done + find %{_sharedstatedir}/%{name} -type d -empty -delete 2>/dev/null || : + + # Compile rules if Perl and/or spamassassin version changed + if [ ! -d %{_sharedstatedir}/%{name}/compiled/%{perl_float}/%{sa_float} ]; then + grep -q "^SPAM_SA_COMPILE.*yes.*" %{_sysconfdir}/sysconfig/spamd && %{_bindir}/sa-compile &> /dev/null || : + fi +fi + +%pre +%service_add_pre spamd.service spampd.service sa-update.timer + +%preun +%service_del_preun spamd.service spampd.service sa-update.timer + +%postun +%service_del_postun spamd.service spampd.service sa-update.timer +if [ $1 -eq 0 ]; then + # Package removal + rm -rf %{_sharedstatedir}/%{name} +fi + +%files +%defattr(-,root,root) +%doc spamd/README spamd/README.vpopmail spamd/PROTOCOL README.SUSE +%{_mandir}/man1/sa-* +%{_mandir}/man1/spamassassin* +%{_mandir}/man1/spamd.1* +%{_bindir}/sa-* +%{_bindir}/spamassassin +%{_sbindir}/* +%{_fillupdir}/sysconfig.spamd +%{_fillupdir}/sysconfig.spampd +%{_unitdir}/spamd.service +%{_unitdir}/spampd.service +%{_unitdir}/sa-update.service +%{_unitdir}/sa-update.timer +%ghost %{_sharedstatedir}/%{name} + +%files spamc +%defattr(-,root,root) +%license LICENSE +%{_bindir}/spamc +%doc %{_mandir}/man1/spamc.1* + +%files -n perl-Mail-SpamAssassin -f %{name}.files +%defattr(-,root,root) +%license LICENSE +%doc CREDITS Changes MANIFEST* NOTICE PACKAGING README +%doc TRADEMARK UPGRADE USAGE sample-nonspam.txt sample-spam.txt +%doc ldap sql +%dir %{_sysconfdir}/mail +%config(noreplace) %{_sysconfdir}/mail/spamassassin +%exclude %{perl_vendorarch} +%dir %{_datadir}/spamassassin +%{_datadir}/spamassassin/* + +%changelog diff --git a/spamd.service b/spamd.service new file mode 100644 index 0000000..3f2e907 --- /dev/null +++ b/spamd.service @@ -0,0 +1,42 @@ +# This file is part of package amavisd. +# +# Copyright (c) 2011 SuSE LINUX Products GmbH, Germany. +# Author: Werner Fink +# Please send feedback to http://www.suse.de/feedback +# +# Description: +# +# Used to start the spamd the daemonized version of spamassassin +# spamassassin adds a header line that shows if the mail has been +# determined spam or not. This way, you can decide what to do with the +# mail within the scope of your own filtering rules in your MUA (Mail +# User Agent, your mail program) or your LDA (Local Delivery Agent). +# + +[Unit] +Description=Daemonized version of spamassassin +Wants=remote-fs.target network.target +After=remote-fs.target network.target +Before=mail-transfer-agent.target + +[Service] +# added automatically, for details please see +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort +ProtectSystem=full +PrivateDevices=true +ProtectHostname=true +ProtectClock=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +# end of automatic additions +Type=forking +PIDFile=/run/spamd.pid +EnvironmentFile=-/etc/sysconfig/spamd +ExecStart=/usr/sbin/spamd $SPAMD_ARGS -r /run/spamd.pid +ExecReload=/usr/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/spampd-2.61.tar.gz b/spampd-2.61.tar.gz new file mode 100644 index 0000000..7a624fd --- /dev/null +++ b/spampd-2.61.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91e60f10745ea4f9c27b9e57619a1bf246ab9a88ea1b88c4f39f8af607e2dbae +size 246956 diff --git a/spampd.service b/spampd.service new file mode 100644 index 0000000..2770b89 --- /dev/null +++ b/spampd.service @@ -0,0 +1,42 @@ +# This file is part of package amavisd. +# +# Copyright (c) 2011 SuSE LINUX Products GmbH, Germany. +# Author: Werner Fink +# Please send feedback to http://www.suse.de/feedback +# +# Description: +# +# Used to start the spampd the SpamAssassin Proxy Daemon +# spamassassin adds a header line that shows if the mail has been +# determined spam or not. This way, you can decide what to do with the +# mail within the scope of your own filtering rules in your MUA (Mail +# User Agent, your mail program) or your LDA (Local Delivery Agent). +# + +[Unit] +Description=SpamAssassin Proxy Daemon +Wants=remote-fs.target +After=remote-fs.target +Before=mail-transfer-agent.target + +[Service] +# added automatically, for details please see +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort +ProtectSystem=full +PrivateDevices=true +ProtectHostname=true +ProtectClock=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +# end of automatic additions +Type=forking +PIDFile=/run/spampd.pid +EnvironmentFile=-/etc/sysconfig/spampd +ExecStart=/usr/sbin/spampd $SPAMPD_OPTIONS +ExecReload=/usr/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/sysconfig.spamd b/sysconfig.spamd new file mode 100644 index 0000000..b0860fa --- /dev/null +++ b/sysconfig.spamd @@ -0,0 +1,39 @@ +## Path: Network/Mail/Spamassassin +## Description: Arguments for the spam daemon +## Type: string +## Default: "-d -c -L" +## ServiceRestart: spamd +# +# The arguments passed to spamd. +# See spamd(1) man page. +# Default is "-d -c -L" +SPAMD_ARGS="-d -c -L" + +## Path: Network/Mail/Spamassassin +## Description: Compile SpamAssassin ruleset into native code +## Type: yesno +## Default: "no" +# +# Set this varible to yes if you want the sa-update.service +# compile SpamAssassin ruleset into native code after +# calling sa-update. +SPAM_SA_COMPILE="no" + +## Path: Network/Mail/Spamassassin +## Description: Restart spamd after recompiling spamassassin ruleset +## Type: yesno +## Default: "yes" +# +# Set this varible to yes if you want the daily sa-update.service +# restart spamd after recompiling spamassassin ruleset. +SPAM_SPAMD_RESTART="yes" + +## Path: Network/Mail/Spamassassin +## Description: Restart amavisd after recompiling spamassassin ruleset +## Type: yesno +## Default: "yes" +# +# Set this varible to yes if you want the sa-update.service +# restart amavisd after recompiling spamassassin ruleset. +SPAM_AMAVISD_RESTART="yes" + diff --git a/sysconfig.spampd b/sysconfig.spampd new file mode 100644 index 0000000..0859b03 --- /dev/null +++ b/sysconfig.spampd @@ -0,0 +1 @@ +SPAMPD_OPTIONS="--host=localhost:10025 --relayhost=localhost:10026 --user=vscan --tagall --children=5 --maxsize=7168 --homedir=/home/vscan" diff --git a/timed-sa-update b/timed-sa-update new file mode 100644 index 0000000..264de61 --- /dev/null +++ b/timed-sa-update @@ -0,0 +1,40 @@ +#!/bin/bash + +# +# paranoia settings +# +umask 022 + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +export PATH + +if [ -e /etc/sysconfig/spamd ] +then + . /etc/sysconfig/spamd +fi + +/usr/bin/sa-update &> /dev/null +result=$? + +if [ "$SPAM_SA_COMPILE" = "yes" -a $result = 0 ] ; then + /usr/bin/sa-compile &> /dev/null +fi + +if [ "$SPAM_SPAMD_RESTART" = "yes" -a $result = 0 ] ; then + /sbin/service spamd try-restart &> /dev/null +fi + +if [ "$SPAM_AMAVISD_RESTART" = "yes" -a $result = 0 ] ; then + /sbin/service amavis try-restart &> /dev/null +fi + +if [ $result = 2 ] ; then + echo "sa-update lint check failed" | \ + logger -t timed-sa-update +fi + +if [ $result -ge 3 ] ; then + echo "sa-update failed, exitcode $result" | \ + logger -t timed-sa-update +fi +exit 0 -- 2.51.1 From 14aeee4289b66f8911d35498fba345f1ab5b6a79025bb6f284d1ecb5b435ac49 Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Tue, 2 Sep 2025 22:22:02 +0200 Subject: [PATCH 37/37] Update spamassassin to version 4.0.2 and spampd to version 2.62 --- Mail-SpamAssassin-4.0.1.tar.bz2 | 3 --- Mail-SpamAssassin-4.0.1.tar.bz2.asc | 16 ------------ Mail-SpamAssassin-4.0.2.tar.bz2 | 3 +++ Mail-SpamAssassin-4.0.2.tar.bz2.asc | 16 ++++++++++++ Mail-SpamAssassin-rules-4.0.1.r1916528.tgz | 3 --- ...-SpamAssassin-rules-4.0.1.r1916528.tgz.asc | 16 ------------ Mail-SpamAssassin-rules-4.0.2.r1928015.tgz | 3 +++ ...-SpamAssassin-rules-4.0.2.r1928015.tgz.asc | 16 ++++++++++++ spamassassin.changes | 26 +++++++++++++++++++ spamassassin.spec | 6 ++--- spampd-2.61.tar.gz | 3 --- spampd-2.62.tar.gz | 3 +++ 12 files changed, 70 insertions(+), 44 deletions(-) delete mode 100644 Mail-SpamAssassin-4.0.1.tar.bz2 delete mode 100644 Mail-SpamAssassin-4.0.1.tar.bz2.asc create mode 100644 Mail-SpamAssassin-4.0.2.tar.bz2 create mode 100644 Mail-SpamAssassin-4.0.2.tar.bz2.asc delete mode 100644 Mail-SpamAssassin-rules-4.0.1.r1916528.tgz delete mode 100644 Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc create mode 100644 Mail-SpamAssassin-rules-4.0.2.r1928015.tgz create mode 100644 Mail-SpamAssassin-rules-4.0.2.r1928015.tgz.asc delete mode 100644 spampd-2.61.tar.gz create mode 100644 spampd-2.62.tar.gz diff --git a/Mail-SpamAssassin-4.0.1.tar.bz2 b/Mail-SpamAssassin-4.0.1.tar.bz2 deleted file mode 100644 index f5e1d22..0000000 --- a/Mail-SpamAssassin-4.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9775ed7559e83ec3e6c03edb2be8ffc7f15cc405fb13e85c148eb0bf191721a8 -size 6379932 diff --git a/Mail-SpamAssassin-4.0.1.tar.bz2.asc b/Mail-SpamAssassin-4.0.1.tar.bz2.asc deleted file mode 100644 index 24a96c9..0000000 --- a/Mail-SpamAssassin-4.0.1.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2Ambx54X1+Sbwh4x/eUvQPfTmBQFAmYCVQUACgkQ/eUvQPfT -mBQWIQ//ZnbjJ0SLv9WdXhOuzlyV49OHxlKhMnYNY5fn0CM6hgGo017kQaY4+82x -CBUHedemooGvlcRObapRNv1wtT4HYK50SWmuO1vIDQdXwCkc+4mbyQ/t9hYaOSEq -ZpIThJIX7JJjc5CaWI3woZgiD10L+/t34boU5a3md4KOsrqj9pypbd5Sk6ZKJQU3 -nDqrfdWyckm7MsS4fHVy4xC1CZT5b8tVHwt+JnNfhX4njlDjHbzoAfon9MibYV6z -K7QPJOQkweJzYSRuh5RC/1LsdsrKsOB1PR1R09zOFDvy7wOj3uXu3S80Bh43TZEo -PbvaRN4g6zrTnGPSiBPvg3BXKNlB4JhgCjpzj9IFY3tcVAXOURHQIYbzriNFhNCT -IWTbtiOInK4TtvDr5fdx7LOJCzAafq8ee/gTyfYS60GmPhLzKirK/tATlyQzkk6C -X1Va6tnjUudrMZ6AeRTASsISlS8WgTrdtDigAUpxlATpg/KKnZ8xB5Qqfyki178C -TDkXtFwjBnKq/uXUcUc50CZtJiiVRpNHgODc1ARi8WttWZVJk/h7fWnLLFPsfOyo -6+Z47vGcUl33ZsJSTaforuwthBe6G8saHVAy8WX4nU9z9rzNUj6Ox+Ait2TmQ/c+ -uBjO31q68+cKryjpdSFMQ+D7K02Jee7Gmi0wF2IvIVCqcJ7Pee0= -=aSi0 ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-4.0.2.tar.bz2 b/Mail-SpamAssassin-4.0.2.tar.bz2 new file mode 100644 index 0000000..35a1c6f --- /dev/null +++ b/Mail-SpamAssassin-4.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da8192cf76d8871830d44d7bdc914bd1641105ac813798ddeac5f65ab8f73cee +size 6496450 diff --git a/Mail-SpamAssassin-4.0.2.tar.bz2.asc b/Mail-SpamAssassin-4.0.2.tar.bz2.asc new file mode 100644 index 0000000..f1c1abf --- /dev/null +++ b/Mail-SpamAssassin-4.0.2.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2Ambx54X1+Sbwh4x/eUvQPfTmBQFAmivBcwACgkQ/eUvQPfT +mBRjtQ//Q5J04g8hzaNc/JeUdQRI85eYsgl5cT2qNhsgoAhGHu3l378Z+Qx7jmve +ZelOB4g/1QCpTqRfDxlCdQbux07DQcr1lniP2boYwp3IeqNtBplvXNNIatpcLnWJ +dvmn5FIb8ym1og+6o+emsenEUWHbdHY68YL62+7hjv9ibELh8RDpNjF2ojr0Gmg3 +tOEtI5lkySHBgcHUqUil48wagD6W1CfMOZmTLMG95QQZhUU3lVQIm+2Z6tAYF+Ci +GPEwT6+gPoHJWbK3X7qLtyfh0AZ/n4GLbKOEAwg/Dku4USqtNysftpeVncaVYaAc +2RIg/lFxpclzAIzQEDq0yPRo553VGR0XBC3oLVajG4bAbvy2vEfDcUQ2lyETquI2 +yVOziIX3NoxeCxd2aEii6+mjSc9pMBRsCcxZeIvt+9/8ecRfAgtry+GYJR/lna9q +A5ChtDrlnSMu76CSCAM1qZ65gwQaAgBCS7UWR5gANoHSZIYzL06Su1H72NTG3C80 +ekO4a5gkBM6MDngE02Q+17tJNbEjfifqeuQHZnbzkcUOAOpzoziuUoqpdTyIQsY6 +A0p8yRRE3gl9bm/LBpMJrLLmmW0lPrQZ6lqgHnZ4HvNW0skJbsI8cHLU3SICJa59 +3AUzinzmVPR7z/exdQCH1F0H0fYSOnOFB4de1On1J98NYNWxH30= +=Z20K +-----END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz deleted file mode 100644 index 15c11f6..0000000 --- a/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:381eadfc7e513e5f735389b78173de5af471f3d06fe6ab8f129634a6644b4bf4 -size 362781 diff --git a/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc deleted file mode 100644 index 9d725cc..0000000 --- a/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmYCOFAACgkQbFU5eCT0 -NM7CohAAo9FkqQ+XCtu2v4TyySfTETyigeVJaib4yegDxMKu+JGwOipaanLxZ7hl -hL0LMpwyrju5Ez9vqzWsa+huuqhXpuqZiFpStK9bOFdF5RNnkFaSisAa2tUuHlGK -qLmg/izxD1Ev5gdQ56js5grm1o8+C3Rm/6xcB+KxU27TlXbklw9HaH1ueoZvqV/w -eW0oeGX94MpVR5YPLd5ZDZgAtS3AZ9jOE8Ftad3TgG5OclAzaht2Xoh7APH4Er1G -MVabLflxUCqbfoJg+gpkjquH7jilUk0dQpP2KtNlv5q/ynl1aXYvj6QlOfnOimY6 -AkLSOjZ7z+NzA3knxdm6ZptT0zwoKqqjTOtRnJVTX10lekQpzmaiZZobEGCqGB0c -du4o5pNW6eYgP14yuppYupYn67mcPc/JSaXD1XJK/I97H7BhID9mQ0PU8bMUAmkE -0RY0bwhEAQcLPSbvZ/LNyuHxizSKvbimUx98Korm+qPb3Emvz7yph4AiRRCPWHqH -3mL5tIQ15pxGPcYoYCJPQMWn05IVn0N8rEbvXmRug6scufD2w7DtSuPiWA6ur0Fk -aZFDVYxSGnb/2g5Ud4zQCCDMGkDGiuaf3aTAL3lopInBZRevzFvSK1csp4CB6ozZ -oBqMFCJUOlpW5NkhGozYiOsf9i7gecTJnOPDnywnJqQ6ydP61dE= -=V2Gs ------END PGP SIGNATURE----- diff --git a/Mail-SpamAssassin-rules-4.0.2.r1928015.tgz b/Mail-SpamAssassin-rules-4.0.2.r1928015.tgz new file mode 100644 index 0000000..1fbd871 --- /dev/null +++ b/Mail-SpamAssassin-rules-4.0.2.r1928015.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f82128687117113dbe40bdc4e3141b87f96c2b01519c9022597da47e726a613e +size 371575 diff --git a/Mail-SpamAssassin-rules-4.0.2.r1928015.tgz.asc b/Mail-SpamAssassin-rules-4.0.2.r1928015.tgz.asc new file mode 100644 index 0000000..61ca276 --- /dev/null +++ b/Mail-SpamAssassin-rules-4.0.2.r1928015.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmiuc14ACgkQbFU5eCT0 +NM5uXRAAnO2yAIgKDJpMiiRPrbd8nnO/J2XKf8wua6OUDCf5M6vfqzWdJnP+6PCv +cHElyWrxRUBOnOA6b4F/amzlwTK+CmMJK37kJFEqwA72xlJWXWaGWSnhNTloIHlr +x3x7iDPk0KkcmEZ3WWCEIoIsaGQPUDxJlxmuDgJTKcMEpHfnWTZGsUruvzbX1I5u +YEQevlCK2tPjldFErwUGjZ5cyyBdQ7FJYSx0xS9G2AzQXRElX3IyEcLZvoX6mJzH +rQOyMcLxdASkDPYGWT2S09Qk4F2NNKJMU8zh3QQiD2Zdq3uxLBpJ9G+fA0n+gVpv +igqcwGePFlY4oNPRBw66HiZlloZ7HZnBi8k1FnubwxwouhdPkc64rwjn2xqClqft +SY9epUDQMe0hnJCNmPYlsk2/xToYK5JryzRaTZ6RlY26R3+jgtO8sBkLIhhIZc4F +x7FncfqRY3M1x8XX2eDMYT6lAPKdQyR1cvsajC/ilM0chR6tWeywDAbw/ygi6K05 +Cbtl5ao2aVTdyI+AMqUFPfiAndOfo0GrreVQZ5x21+2ClF5qmYJCWNjf0vTc2utV +vq5T/vXvFvwShD1RRzNesTuMRLv4iG9nsd8naj1+dUejyy6Sv/VUEoyMQAmv6q1X +Q2SqAqTOh6rT1sB0PzczbV8YhEBiJhkXe/ooe/zi4CXmumHwS+8= +=Mbw9 +-----END PGP SIGNATURE----- diff --git a/spamassassin.changes b/spamassassin.changes index 9ea1eb9..1e97379 100644 --- a/spamassassin.changes +++ b/spamassassin.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Sep 2 20:18:33 UTC 2025 - Arjen de Korte + +- update to patch release version 4.0.2 + - Add subs to HeaderEval plugin to detect invalid address headers + - TxRep data when using a SQL backend might be wrong because of + a bug in SpamAssassin 4.0.1, TxRep score can be limited with new + txrep_min_score and txrep_max_score configuration options + or you can remove email entries from TxRep database. + - Redis replication is now supported, Redis connection parameters + are splitted between read_only and read_write. Old syntax is still supported. + - Internal Mail::SpamAssassin::GeoDB module now also supports + IP::Geolocation::MMDB Perl module. + - Improved detection of MIME headers + - Improved parsing of CSS color values + - Added "replace_rules" support to Mail::SpamAssassin::Plugin::HashBL + - CNAME dns records are resolved and domains added to "uri_detail_list" + - New Mail::SpamAssassin::Plugin::Redirectors plugin + This plugin looks for URLs redirected by a list of URL redirector + services. + - improved handling of IDN domains +- Update to spampd 2.62: + - Fixed that SpamPD shares the same socket to redist between children + - Fix option names in configuration parameter validation methods + - Do not set up logging if only showing debug info + ------------------------------------------------------------------- Mon Jan 20 13:29:51 UTC 2025 - Dirk Stoecker diff --git a/spamassassin.spec b/spamassassin.spec index 27c60f9..1f030a1 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -18,11 +18,11 @@ %bcond_without test -%define spd_version 2.61 -%define sa_version 4.0.1 +%define spd_version 2.62 +%define sa_version 4.0.2 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }') %define perl_float %(echo %{perl_version} | awk -F. '{ printf "%d.%03d", $1, $2 }') -%define rules_revision 1916528 +%define rules_revision 1928015 %define SPAMPD spampd-%{spd_version} diff --git a/spampd-2.61.tar.gz b/spampd-2.61.tar.gz deleted file mode 100644 index 7a624fd..0000000 --- a/spampd-2.61.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91e60f10745ea4f9c27b9e57619a1bf246ab9a88ea1b88c4f39f8af607e2dbae -size 246956 diff --git a/spampd-2.62.tar.gz b/spampd-2.62.tar.gz new file mode 100644 index 0000000..6d801db --- /dev/null +++ b/spampd-2.62.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efe016d111f8c2094f4936f2efa16ca6e78c1b485465b269fc5c4273b9c57cf8 +size 249062 -- 2.51.1