diff --git a/Mail-SpamAssassin-4.0.0.tar.bz2 b/Mail-SpamAssassin-4.0.0.tar.bz2 deleted file mode 100644 index da12270..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.1.tar.bz2 b/Mail-SpamAssassin-4.0.1.tar.bz2 new file mode 100644 index 0000000..1b90730 --- /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-rules-4.0.0.r1905950.tgz b/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz deleted file mode 100644 index 69e2e64..0000000 Binary files a/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz and /dev/null differ 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..f51757e Binary files /dev/null and b/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz differ diff --git a/spamassassin-4.0.0-add-logfile-homedir-options.patch b/spamassassin-4.0.1-add-logfile-homedir-options.patch similarity index 64% rename from spamassassin-4.0.0-add-logfile-homedir-options.patch rename to spamassassin-4.0.1-add-logfile-homedir-options.patch index 4e5c7cf..d51ff6d 100644 --- a/spamassassin-4.0.0-add-logfile-homedir-options.patch +++ b/spamassassin-4.0.1-add-logfile-homedir-options.patch @@ -1,7 +1,7 @@ -diff -ruN Mail-SpamAssassin-4.0.0.old/lib/Mail/SpamAssassin/Plugin/Razor2.pm Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/Razor2.pm ---- Mail-SpamAssassin-4.0.0.old/lib/Mail/SpamAssassin/Plugin/Razor2.pm 2023-02-14 10:53:50.114090965 +0000 -+++ Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/Razor2.pm 2023-02-14 10:57:47.790054543 +0000 -@@ -185,7 +185,9 @@ +diff -ruN Mail-SpamAssassin-4.0.1.old/lib/Mail/SpamAssassin/Plugin/Razor2.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Razor2.pm +--- Mail-SpamAssassin-4.0.1.old/lib/Mail/SpamAssassin/Plugin/Razor2.pm 2024-03-26 05:52:10.000000001 +0100 ++++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Razor2.pm 2025-02-20 17:39:18.198143207 +0100 +@@ -212,7 +212,9 @@ $rc->{opt} = { debug => (would_log('dbg', $debug) > 1), foreground => 1, @@ -12,9 +12,9 @@ diff -ruN Mail-SpamAssassin-4.0.0.old/lib/Mail/SpamAssassin/Plugin/Razor2.pm Mai }; # no facility prefix on this die $rc->do_conf() or die "$debug: " . $rc->errstr; -diff -ruN Mail-SpamAssassin-4.0.0.old/spamd/spamd.raw Mail-SpamAssassin-4.0.0/spamd/spamd.raw ---- Mail-SpamAssassin-4.0.0.old/spamd/spamd.raw 2023-02-14 10:53:50.110090898 +0000 -+++ Mail-SpamAssassin-4.0.0/spamd/spamd.raw 2023-02-14 10:59:43.150978995 +0000 +diff -ruN Mail-SpamAssassin-4.0.1.old/spamd/spamd.raw Mail-SpamAssassin-4.0.1/spamd/spamd.raw +--- Mail-SpamAssassin-4.0.1.old/spamd/spamd.raw 2024-03-26 05:52:25.000000001 +0100 ++++ Mail-SpamAssassin-4.0.1/spamd/spamd.raw 2025-02-20 17:38:28.793754043 +0100 @@ -378,6 +378,8 @@ # Parse the command line Getopt::Long::Configure("bundling"); diff --git a/spamassassin-4.0.0-gnupg2.patch b/spamassassin-4.0.1-gnupg2.patch similarity index 55% rename from spamassassin-4.0.0-gnupg2.patch rename to spamassassin-4.0.1-gnupg2.patch index 5b82943..5a72869 100644 --- a/spamassassin-4.0.0-gnupg2.patch +++ b/spamassassin-4.0.1-gnupg2.patch @@ -1,7 +1,7 @@ -diff -ruN Mail-SpamAssassin-4.0.0.old/sa-update.raw Mail-SpamAssassin-4.0.0/sa-update.raw ---- Mail-SpamAssassin-4.0.0.old/sa-update.raw 2023-02-14 10:53:50.117091015 +0000 -+++ Mail-SpamAssassin-4.0.0/sa-update.raw 2023-02-14 10:54:37.222875579 +0000 -@@ -361,7 +361,7 @@ +diff -ruN Mail-SpamAssassin-4.0.1.old/sa-update.raw Mail-SpamAssassin-4.0.1/sa-update.raw +--- Mail-SpamAssassin-4.0.1.old/sa-update.raw 2025-02-20 17:12:19.134223838 +0100 ++++ Mail-SpamAssassin-4.0.1/sa-update.raw 2025-02-20 17:13:14.189668167 +0100 +@@ -362,7 +362,7 @@ if ($GPG_ENABLED || $opt{'import'}) { # find GPG in the PATH # bug 4958: for *NIX it's "gpg", in Windows it's "gpg.exe" diff --git a/spamassassin.spec b/spamassassin.spec index cc4e374..ad4aa31 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -58,14 +58,14 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin -Version: 4.0.0 +Version: 4.0.1 #Release: 0.8.%%{prerev}%%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} License: ASL 2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 #Source0: %%{real_name}-%%{version}-%%{prerev}.tar.bz2 -Source1: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1905950.tgz +Source1: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1916528.tgz #Source1: %%{real_name}-rules-%%{version}.%%{prerev}.tgz Source2: redhat_local.cf Source3: spamassassin-default.rc @@ -89,8 +89,8 @@ Source17: sa-update.timer # https://bugzilla.redhat.com/show_bug.cgi?id=1055593 # Switch to using gnupg2 instead of gnupg1 -Patch0: spamassassin-4.0.0-gnupg2.patch -Patch1: spamassassin-4.0.0-add-logfile-homedir-options.patch +Patch0: spamassassin-4.0.1-gnupg2.patch +Patch1: spamassassin-4.0.1-add-logfile-homedir-options.patch # Patches 100+ are SVN backports (DO NOT REUSE!) # end of patches @@ -400,6 +400,10 @@ exit 0 %endif %changelog + +* Thu Feb 20 2025 John Crisp 4.0.1-1 +- Update to 4.0.1 [SME: 12345] + * Fri Jul 14 2023 BogusDateBot - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, by assuming the date is correct and changing the weekday.