From 334f632b160384bb3c8670a9aaf8d5a7f66cdd3e Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 27 Nov 2022 16:06:01 +0100 Subject: [PATCH 01/25] Port configure script to C99 Related to: --- spamassassin-configure-c99.patch | 62 ++++++++++++++++++++++++++++++++ spamassassin.spec | 7 +++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 spamassassin-configure-c99.patch diff --git a/spamassassin-configure-c99.patch b/spamassassin-configure-c99.patch new file mode 100644 index 0000000..1e51d5c --- /dev/null +++ b/spamassassin-configure-c99.patch @@ -0,0 +1,62 @@ +Avoid implicit function declarations in the configure script. +The undeclared exit function comes from autoconf-generated code. +The SHUT_RD and h_errno checks are specific to the spamassassin +package. + +Submitted upstream: + +diff --git a/spamc/configure b/spamc/configure +index d8e5dcf8a21d6a3d..5472d2b009fb9083 100755 +--- a/spamc/configure ++++ b/spamc/configure +@@ -2624,8 +2624,8 @@ main () + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext +@@ -3553,6 +3553,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include + #include + #include + int +@@ -4252,6 +4253,7 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include + #include + int + main () +diff --git a/spamc/configure.in b/spamc/configure.in +index 42cc998412075086..96769105ef640bc8 100644 +--- a/spamc/configure.in ++++ b/spamc/configure.in +@@ -47,7 +47,8 @@ dnl ---------------------------------------------------------------------- + + AC_CACHE_CHECK([for SHUT_RD], + shutrd, [ +- AC_TRY_COMPILE([#include ++ AC_TRY_COMPILE([#include ++#include + #include ], + [printf ("%d", SHUT_RD); return 0;], + [shutrd=yes], +@@ -89,7 +90,8 @@ dnl ---------------------------------------------------------------------- + + AC_CACHE_CHECK([for h_errno], + herrno, [ +- AC_TRY_COMPILE([#include ], ++ AC_TRY_COMPILE([#include ++#include ], + [printf ("%d", h_errno); return 0;], + [herrno=yes], + [herrno=no]), diff --git a/spamassassin.spec b/spamassassin.spec index a3f3223..310e979 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -60,7 +60,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 3.4.6 #Release: 0.8.%%{prerev}%%{?dist} -Release: 7%{?dist} +Release: 8%{?dist} License: ASL 2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -90,6 +90,7 @@ Source17: sa-update.timer # Switch to using gnupg2 instead of gnupg1 Patch0: spamassassin-3.3.2-gnupg2.patch Patch1: spamassassin-3.4.1-add-logfile-homedir-options.patch +Patch2: spamassassin-configure-c99.patch # end of patches Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %if %{use_systemd} == 0 @@ -209,6 +210,7 @@ To filter spam for all users, add that line to /etc/procmailrc # Patches 0-99 are RH specific %patch0 -p1 %patch1 -p1 +%patch2 -p1 # end of patches echo "RHEL=%{?rhel} FEDORA=%{?fedora}" @@ -388,6 +390,9 @@ exit 0 %endif %changelog +* Sun Nov 27 2022 Florian Weimer - 3.4.6-8 +- Port configure script to C99 + * Sat Jul 23 2022 Fedora Release Engineering - 3.4.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b880b43049f1fa4b14010be66ffa4eec5f667040 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 19 Dec 2022 14:27:45 -0800 Subject: [PATCH 02/25] Update to 4.0.0. Fixes rhbz#2154501 --- ...2.patch => spamassassin-4.0.0-gnupg2.patch | 8 +-- spamassassin-configure-c99.patch | 62 ------------------- spamassassin.spec | 17 ++--- 3 files changed, 13 insertions(+), 74 deletions(-) rename spamassassin-3.3.2-gnupg2.patch => spamassassin-4.0.0-gnupg2.patch (54%) delete mode 100644 spamassassin-configure-c99.patch diff --git a/spamassassin-3.3.2-gnupg2.patch b/spamassassin-4.0.0-gnupg2.patch similarity index 54% rename from spamassassin-3.3.2-gnupg2.patch rename to spamassassin-4.0.0-gnupg2.patch index da9acab..f2ab478 100644 --- a/spamassassin-3.3.2-gnupg2.patch +++ b/spamassassin-4.0.0-gnupg2.patch @@ -1,7 +1,7 @@ -diff -Nur Mail-SpamAssassin-3.3.2.orig/sa-update.raw Mail-SpamAssassin-3.3.2/sa-update.raw ---- Mail-SpamAssassin-3.3.2.orig/sa-update.raw 2011-06-06 17:59:19.000000000 -0600 -+++ Mail-SpamAssassin-3.3.2/sa-update.raw 2014-01-28 13:29:33.933526585 -0700 -@@ -281,7 +281,7 @@ +diff --color -Nur Mail-SpamAssassin-4.0.0.orig/sa-update.raw Mail-SpamAssassin-4.0.0/sa-update.raw +--- Mail-SpamAssassin-4.0.0.orig/sa-update.raw 2022-12-13 22:03:27.000000000 -0800 ++++ Mail-SpamAssassin-4.0.0/sa-update.raw 2022-12-19 12:28:57.058533774 -0800 +@@ -361,7 +361,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-configure-c99.patch b/spamassassin-configure-c99.patch deleted file mode 100644 index 1e51d5c..0000000 --- a/spamassassin-configure-c99.patch +++ /dev/null @@ -1,62 +0,0 @@ -Avoid implicit function declarations in the configure script. -The undeclared exit function comes from autoconf-generated code. -The SHUT_RD and h_errno checks are specific to the spamassassin -package. - -Submitted upstream: - -diff --git a/spamc/configure b/spamc/configure -index d8e5dcf8a21d6a3d..5472d2b009fb9083 100755 ---- a/spamc/configure -+++ b/spamc/configure -@@ -2624,8 +2624,8 @@ main () - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext -@@ -3553,6 +3553,7 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include - #include - #include - int -@@ -4252,6 +4253,7 @@ _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include - #include - int - main () -diff --git a/spamc/configure.in b/spamc/configure.in -index 42cc998412075086..96769105ef640bc8 100644 ---- a/spamc/configure.in -+++ b/spamc/configure.in -@@ -47,7 +47,8 @@ dnl ---------------------------------------------------------------------- - - AC_CACHE_CHECK([for SHUT_RD], - shutrd, [ -- AC_TRY_COMPILE([#include -+ AC_TRY_COMPILE([#include -+#include - #include ], - [printf ("%d", SHUT_RD); return 0;], - [shutrd=yes], -@@ -89,7 +90,8 @@ dnl ---------------------------------------------------------------------- - - AC_CACHE_CHECK([for h_errno], - herrno, [ -- AC_TRY_COMPILE([#include ], -+ AC_TRY_COMPILE([#include -+#include ], - [printf ("%d", h_errno); return 0;], - [herrno=yes], - [herrno=no]), diff --git a/spamassassin.spec b/spamassassin.spec index 310e979..3605789 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -53,19 +53,19 @@ %define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} -%global saversion 3.004006 +%global saversion 4.000000 #%%global prerev rc2 Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin -Version: 3.4.6 +Version: 4.0.0 #Release: 0.8.%%{prerev}%%{?dist} -Release: 8%{?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}.r1888502.tgz +Source1: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1905950.tgz #Source1: %%{real_name}-rules-%%{version}.%%{prerev}.tgz Source2: redhat_local.cf Source3: spamassassin-default.rc @@ -88,9 +88,8 @@ Source17: sa-update.timer # Patches 0-99 are RH specific # https://bugzilla.redhat.com/show_bug.cgi?id=1055593 # Switch to using gnupg2 instead of gnupg1 -Patch0: spamassassin-3.3.2-gnupg2.patch +Patch0: spamassassin-4.0.0-gnupg2.patch Patch1: spamassassin-3.4.1-add-logfile-homedir-options.patch -Patch2: spamassassin-configure-c99.patch # end of patches Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %if %{use_systemd} == 0 @@ -209,8 +208,6 @@ To filter spam for all users, add that line to /etc/procmailrc %setup -q -n Mail-SpamAssassin-%{version} # Patches 0-99 are RH specific %patch0 -p1 -%patch1 -p1 -%patch2 -p1 # end of patches echo "RHEL=%{?rhel} FEDORA=%{?fedora}" @@ -279,6 +276,7 @@ cd - find $RPM_BUILD_ROOT/usr -type f -print | sed "s@^$RPM_BUILD_ROOT@@g" | grep -v perllocal.pod | + grep -v %{_unitdir} | grep -v "\.packlist" > %{name}-%{version}-filelist if [ "$(cat %{name}-%{version}-filelist)X" = "X" ] ; then echo "ERROR: EMPTY FILE LIST" @@ -390,6 +388,9 @@ exit 0 %endif %changelog +* Sat Dec 17 2022 Kevin Fenzi - 4.0.0-1 +- Update to 4.0.0. Fixes rhbz#2154501 + * Sun Nov 27 2022 Florian Weimer - 3.4.6-8 - Port configure script to C99 From 611550bb6ed06353bdc2dda949b82e83003dac3a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 19 Dec 2022 15:25:23 -0800 Subject: [PATCH 03/25] also commit sources Signed-off-by: Kevin Fenzi --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a36792e..895b16d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Mail-SpamAssassin-3.4.6.tar.bz2) = bb53ba928917b02071b2e6690a11240e1af503334f292c870a8c49c24b0a58b44c78f827e2f43e71a3ce920481fa0e1e62b78a39452658c57d18f4e11daeb593 -SHA512 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 29167c2ab50de26954181ad53395d4270b8b15b7d3bb13d6c62aa2f13ed3bb7a54adcda944bbd4c8d0cf4fe918a2eb0f542ef420af2bd96a121cb3d9b55dd572 +SHA512 (Mail-SpamAssassin-4.0.0.tar.bz2) = a0fe5f6953c9df355bfa011e8a617101687eb156831a057504656921fe76c2a4eb37b5383861aac579e66a20c4454068e81a39826a35eb0266148771567bad5f +SHA512 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 8ff0e68e18dc52a88fec83239bb9dc3a1d34f2dcb4c03cd6c566b97fa91242e3c8d006612aeb4df0acf43929eaaa59d542eb5cf904498343adf5eadefcb89255 From 5d7ea08ffb8882f272be0b850319fcc4eaa4c51f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 21 Dec 2022 12:27:35 -0800 Subject: [PATCH 04/25] Rebase razor homedir/logfile patch. --- ...in-3.4.1-add-logfile-homedir-options.patch | 43 ------------------- ...in-4.0.0-add-logfile-homedir-options.patch | 35 +++++++++++++++ spamassassin.spec | 9 +++- 3 files changed, 42 insertions(+), 45 deletions(-) delete mode 100644 spamassassin-3.4.1-add-logfile-homedir-options.patch create mode 100644 spamassassin-4.0.0-add-logfile-homedir-options.patch diff --git a/spamassassin-3.4.1-add-logfile-homedir-options.patch b/spamassassin-3.4.1-add-logfile-homedir-options.patch deleted file mode 100644 index 1aedc44..0000000 --- a/spamassassin-3.4.1-add-logfile-homedir-options.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit bb177c93c8852417fc5a522cbcc45abbab4b3c3d -Author: Tomas Korbar -Date: Thu Jun 7 20:57:07 2018 +0200 - - Add razor log path and home directory option - -diff --git a/lib/Mail/SpamAssassin/Plugin/Razor2.pm b/lib/Mail/SpamAssassin/Plugin/Razor2.pm -index e24252c..935b3ac 100644 ---- a/lib/Mail/SpamAssassin/Plugin/Razor2.pm -+++ b/lib/Mail/SpamAssassin/Plugin/Razor2.pm -@@ -165,7 +165,9 @@ sub razor2_access { - $rc->{opt} = { - debug => (would_log('dbg', $debug) > 1), - foreground => 1, -- config => $self->{main}->{conf}->{razor_config} -+ config => $self->{main}->{conf}->{razor_config}, -+ logfile => $self->{main}->{razor_log_file}, -+ razorhome => $self->{main}->{razor_home_dir} - }; - # no facility prefix on this die - $rc->do_conf() or die "$debug: " . $rc->errstr; -diff --git a/spamd/spamd.raw b/spamd/spamd.raw -index 821f658..2afd6bb 100755 ---- a/spamd/spamd.raw -+++ b/spamd/spamd.raw -@@ -361,6 +361,8 @@ prepare_for_sighup_restart(); - # Parse the command line - Getopt::Long::Configure("bundling"); - GetOptions( -+ 'razor-home-dir=s' => \$opt{'razor_home_dir'}, -+ 'razor-log-file=s' => \$opt{'razor_log_file'}, - 'allow-tell' => \$opt{'tell'}, - 'allowed-ips|A=s' => \@{ $opt{'allowed-ip'} }, - 'auth-ident' => \$opt{'auth-ident'}, -@@ -1149,6 +1151,8 @@ if ( defined $opt{'pidfile'} ) { - - my $spamtest = Mail::SpamAssassin->new( - { -+ razor_home_dir => $opt{'razor_home_dir'}, -+ razor_log_file => $opt{'razor_log_file'}, - dont_copy_prefs => $dontcopy, - rules_filename => ( $opt{'configpath'} || 0 ), - site_rules_filename => ( $opt{'siteconfigpath'} || 0 ), diff --git a/spamassassin-4.0.0-add-logfile-homedir-options.patch b/spamassassin-4.0.0-add-logfile-homedir-options.patch new file mode 100644 index 0000000..6066c66 --- /dev/null +++ b/spamassassin-4.0.0-add-logfile-homedir-options.patch @@ -0,0 +1,35 @@ +diff --color -Nur Mail-SpamAssassin-4.0.0.orig/lib/Mail/SpamAssassin/Plugin/Razor2.pm Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/Razor2.pm +--- Mail-SpamAssassin-4.0.0.orig/lib/Mail/SpamAssassin/Plugin/Razor2.pm 2022-12-13 22:03:20.000000000 -0800 ++++ Mail-SpamAssassin-4.0.0/lib/Mail/SpamAssassin/Plugin/Razor2.pm 2022-12-21 12:14:41.978518595 -0800 +@@ -185,7 +185,9 @@ + $rc->{opt} = { + debug => (would_log('dbg', $debug) > 1), + foreground => 1, +- config => $self->{main}->{conf}->{razor_config} ++ config => $self->{main}->{conf}->{razor_config}, ++ logfile => $self->{main}->{razor_log_file}, ++ razorhome => $self->{main}->{razor_home_dir} + }; + # no facility prefix on this die + $rc->do_conf() or die "$debug: " . $rc->errstr; +diff --color -Nur Mail-SpamAssassin-4.0.0.orig/spamd/spamd.raw Mail-SpamAssassin-4.0.0/spamd/spamd.raw +--- Mail-SpamAssassin-4.0.0.orig/spamd/spamd.raw 2022-12-13 22:03:27.000000000 -0800 ++++ Mail-SpamAssassin-4.0.0/spamd/spamd.raw 2022-12-21 12:13:38.426637129 -0800 +@@ -378,6 +378,8 @@ + # Parse the command line + Getopt::Long::Configure("bundling"); + GetOptions( ++ 'razor-home-dir=s' => \$opt{'razor_home_dir'}, ++ 'razor-log-file=s' => \$opt{'razor_log_file'}, + 'allow-tell' => \$opt{'tell'}, + 'allowed-ips|A=s' => \@{ $opt{'allowed-ip'} }, + 'configpath|C=s' => \$opt{'configpath'}, +@@ -1195,6 +1197,8 @@ + + my $spamtest = Mail::SpamAssassin->new( + { ++ razor_home_dir => ( $opt{'razor_home_dir'} || 0), ++ razor_log_file => ( $opt{'razor_log_file'} || 0), + dont_copy_prefs => $dontcopy, + rules_filename => ( $opt{'configpath'} || 0 ), + site_rules_filename => ( $opt{'siteconfigpath'} || 0 ), diff --git a/spamassassin.spec b/spamassassin.spec index 3605789..5763eb1 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -60,7 +60,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.0 #Release: 0.8.%%{prerev}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -89,7 +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-3.4.1-add-logfile-homedir-options.patch +# add a logfile and homedir for razor +Patch1: spamassassin-4.0.0-add-logfile-homedir-options.patch # end of patches Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %if %{use_systemd} == 0 @@ -208,6 +209,7 @@ To filter spam for all users, add that line to /etc/procmailrc %setup -q -n Mail-SpamAssassin-%{version} # Patches 0-99 are RH specific %patch0 -p1 +%patch1 -p1 # end of patches echo "RHEL=%{?rhel} FEDORA=%{?fedora}" @@ -388,6 +390,9 @@ exit 0 %endif %changelog +* Wed Dec 21 2022 Kevin Fenzi - 4.0.0-2 +- Rebase razor homedir/logfile patch. + * Sat Dec 17 2022 Kevin Fenzi - 4.0.0-1 - Update to 4.0.0. Fixes rhbz#2154501 From 26aaba98bba7ad3e01645570a4d17609c4cd6d70 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 21:14:55 +0100 Subject: [PATCH 05/25] Remove perl(MODULE_COMPAT), it will be replaced by generators --- spamassassin.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/spamassassin.spec b/spamassassin.spec index 5763eb1..1a80977 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -92,7 +92,6 @@ Patch0: spamassassin-4.0.0-gnupg2.patch # add a logfile and homedir for razor Patch1: spamassassin-4.0.0-add-logfile-homedir-options.patch # end of patches -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %if %{use_systemd} == 0 Requires: /sbin/chkconfig /sbin/service %endif From a749ef4cfea8ad484ef456c3b89a4bae712c78cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:45:10 +0000 Subject: [PATCH 06/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- spamassassin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spamassassin.spec b/spamassassin.spec index 1a80977..737955b 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -60,7 +60,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.0 #Release: 0.8.%%{prerev}%%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -389,6 +389,9 @@ exit 0 %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 21 2022 Kevin Fenzi - 4.0.0-2 - Rebase razor homedir/logfile patch. From 0cbad9f6a0c3a6eb2e504e7b1769307ddf1bb92d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Thu, 12 Dec 2019 10:47:44 -0500 Subject: [PATCH 07/25] Verify upstream source signatures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per the packaging guidelines¹. While updating the git ignore rules, anchor the patterns to the top-level and ignore expanded source directories. ¹ https://docs.fedoraproject.org/en-US/packaging-guidelines/#_verifying_signatures --- .gitignore | 5 +- KEYS | 229 ++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 + spamassassin.spec | 13 ++- 4 files changed, 246 insertions(+), 3 deletions(-) create mode 100644 KEYS diff --git a/.gitignore b/.gitignore index b6411c1..6169d24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -Mail-SpamAssassin-*.tar.bz2 -Mail-SpamAssassin-rules-*.tgz +/Mail-SpamAssassin-*/ +/Mail-SpamAssassin-*.tar.bz2* +/Mail-SpamAssassin-rules-*.tgz* diff --git a/KEYS b/KEYS new file mode 100644 index 0000000..07a412d --- /dev/null +++ b/KEYS @@ -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/sources b/sources index 895b16d..c3bd050 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ SHA512 (Mail-SpamAssassin-4.0.0.tar.bz2) = a0fe5f6953c9df355bfa011e8a617101687eb156831a057504656921fe76c2a4eb37b5383861aac579e66a20c4454068e81a39826a35eb0266148771567bad5f +SHA512 (Mail-SpamAssassin-4.0.0.tar.bz2.asc) = b87a80d2b0b802f52df75e485878c53cc4fad52935ca2b14b1b06e46d334b52c673e66d61cc2155b5e812fa6a486f8e61f6a87794be2524acea1fd8ac42e7d6a SHA512 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 8ff0e68e18dc52a88fec83239bb9dc3a1d34f2dcb4c03cd6c566b97fa91242e3c8d006612aeb4df0acf43929eaaa59d542eb5cf904498343adf5eadefcb89255 +SHA512 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc) = 517dbf83b4cf984036cb7cbf92a290ea0c8eea1da87f80d202275e71d2823b7b2eed4efff2f71742ca28090d355a690346f1bf97cfc15a3ea26a6d52792b1882 diff --git a/spamassassin.spec b/spamassassin.spec index 737955b..3444ea7 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -60,7 +60,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.0 #Release: 0.8.%%{prerev}%%{?dist} -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -85,6 +85,11 @@ Source15: spamassassin.sysconfig.el Source16: sa-update.service Source17: sa-update.timer +# GPG Keys and source signatures +Source100: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2.asc +Source101: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1905950.tgz.asc +Source102: https://www.apache.org/dist/spamassassin/KEYS + # Patches 0-99 are RH specific # https://bugzilla.redhat.com/show_bug.cgi?id=1055593 # Switch to using gnupg2 instead of gnupg1 @@ -99,6 +104,7 @@ Requires(post): diffutils BuildRequires: make BuildRequires: gcc +BuildRequires: gnupg2 BuildRequires: perl-interpreter >= 2:5.8.0 BuildRequires: perl-generators BuildRequires: perl(Net::DNS) @@ -205,6 +211,8 @@ To filter spam for all users, add that line to /etc/procmailrc (creating if necessary). %prep +%{gpgverify} --keyring='%{SOURCE102}' --signature='%{SOURCE100}' --data='%{SOURCE0}' +%{gpgverify} --keyring='%{SOURCE102}' --signature='%{SOURCE101}' --data='%{SOURCE1}' %setup -q -n Mail-SpamAssassin-%{version} # Patches 0-99 are RH specific %patch0 -p1 @@ -389,6 +397,9 @@ exit 0 %endif %changelog +* Sun Apr 02 2023 Todd Zullinger - 4.0.0-4 +- Verify upstream source signatures + * Sat Jan 21 2023 Fedora Release Engineering - 4.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a071ef653fa7813e25b9a713f38832e49d3d2eaf Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 27 Jun 2023 15:02:06 +0200 Subject: [PATCH 08/25] Replace IO::Socket::INET6 by recommended IO::Socket::IP --- spamassassin.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/spamassassin.spec b/spamassassin.spec index 3444ea7..e5585b0 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -60,7 +60,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.0 #Release: 0.8.%%{prerev}%%{?dist} -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -164,8 +164,8 @@ BuildRequires: perl-Razor-Agent Requires: perl(IO::Socket::SSL) BuildRequires: perl(IO::Socket::SSL) # Needed for IPv6 -Requires: perl(IO::Socket::INET6) -BuildRequires: perl(IO::Socket::INET6) +Requires: perl(IO::Socket::IP) +BuildRequires: perl(IO::Socket::IP) %endif %if %{perl_devel} BuildRequires: perl-devel @@ -397,6 +397,9 @@ exit 0 %endif %changelog +* Tue Jun 27 2023 Jitka Plesnikova - 4.0.0-5 +- Replace IO::Socket::INET6 by recommended IO::Socket::IP + * Sun Apr 02 2023 Todd Zullinger - 4.0.0-4 - Verify upstream source signatures From b7cdf74dc4f99db17119de15d4e73efc7b3fdb31 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 29 Jun 2023 07:55:20 +0200 Subject: [PATCH 09/25] Fixes rhbz#2218100 --- spamassassin.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spamassassin.spec b/spamassassin.spec index e5585b0..9da41ae 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -398,7 +398,8 @@ exit 0 %changelog * Tue Jun 27 2023 Jitka Plesnikova - 4.0.0-5 -- Replace IO::Socket::INET6 by recommended IO::Socket::IP +- Replace IO::Socket::INET6 by recommended IO::Socket::IP. Fixes rhbz#2218100 + * Sun Apr 02 2023 Todd Zullinger - 4.0.0-4 - Verify upstream source signatures From 2b37274226ff572ce5d4d7ff20e6a56ebff30ec1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:11:59 +0000 Subject: [PATCH 10/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- spamassassin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spamassassin.spec b/spamassassin.spec index 9da41ae..ca92d1d 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -60,7 +60,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.0 #Release: 0.8.%%{prerev}%%{?dist} -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -397,6 +397,9 @@ exit 0 %endif %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 27 2023 Jitka Plesnikova - 4.0.0-5 - Replace IO::Socket::INET6 by recommended IO::Socket::IP. Fixes rhbz#2218100 From 6d3fa1c0e7c5ec11460a6bf82c4192147b995c37 Mon Sep 17 00:00:00 2001 From: Martin Osvald Date: Thu, 21 Sep 2023 13:09:55 +0200 Subject: [PATCH 11/25] Migrate License: field to SPDX format --- spamassassin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spamassassin.spec b/spamassassin.spec index ca92d1d..d3910ab 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -60,8 +60,8 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.0 #Release: 0.8.%%{prerev}%%{?dist} -Release: 6%{?dist} -License: ASL 2.0 +Release: 7%{?dist} +License: Apache-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 @@ -397,6 +397,9 @@ exit 0 %endif %changelog +* Thu Sep 21 2023 Martin Osvald - 4.0.0-7 +- SPDX migration + * Sat Jul 22 2023 Fedora Release Engineering - 4.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 78f14cdc7ace242a955341b8831faad8d636ec8b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 19 Dec 2023 14:51:40 +0100 Subject: [PATCH 12/25] Bring back still needed part of configure C compatibility fix --- spamassassin-configure-c99.patch | 28 ++++++++++++++++++++++++++++ spamassassin.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 spamassassin-configure-c99.patch diff --git a/spamassassin-configure-c99.patch b/spamassassin-configure-c99.patch new file mode 100644 index 0000000..740308b --- /dev/null +++ b/spamassassin-configure-c99.patch @@ -0,0 +1,28 @@ +Fix autoconf 2.59 bug that results in an incorrect definition of +STDC_HEADERS with some compilers. + +Raised upstream: + +diff -ur Mail-SpamAssassin-4.0.0.orig/spamc/configure Mail-SpamAssassin-4.0.0/spamc/configure +--- Mail-SpamAssassin-4.0.0.orig/spamc/configure 2022-12-14 07:03:27.000000000 +0100 ++++ Mail-SpamAssassin-4.0.0/spamc/configure 2023-12-19 14:34:05.414644959 +0100 +@@ -2119,7 +2119,7 @@ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ +- '' \ ++ '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ +@@ -2624,8 +2624,8 @@ + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) +- exit(2); +- exit (0); ++ return 2; ++ return 0; + } + _ACEOF + rm -f conftest$ac_exeext diff --git a/spamassassin.spec b/spamassassin.spec index d3910ab..af2db5c 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -60,7 +60,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.0 #Release: 0.8.%%{prerev}%%{?dist} -Release: 7%{?dist} +Release: 8%{?dist} License: Apache-2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -96,6 +96,7 @@ Source102: https://www.apache.org/dist/spamassassin/KEYS Patch0: spamassassin-4.0.0-gnupg2.patch # add a logfile and homedir for razor Patch1: spamassassin-4.0.0-add-logfile-homedir-options.patch +Patch2: spamassassin-configure-c99.patch # end of patches %if %{use_systemd} == 0 Requires: /sbin/chkconfig /sbin/service @@ -217,6 +218,7 @@ To filter spam for all users, add that line to /etc/procmailrc # Patches 0-99 are RH specific %patch0 -p1 %patch1 -p1 +%patch2 -p1 # end of patches echo "RHEL=%{?rhel} FEDORA=%{?fedora}" @@ -397,6 +399,9 @@ exit 0 %endif %changelog +* Tue Dec 19 2023 Florian Weimer - 4.0.0-8 +- Bring back still needed part of configure C compatibility fix + * Thu Sep 21 2023 Martin Osvald - 4.0.0-7 - SPDX migration From d19d3f2cfe854a7afefb4406ae151c0dd93dba29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 04:02:16 +0000 Subject: [PATCH 13/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- spamassassin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spamassassin.spec b/spamassassin.spec index af2db5c..948d12d 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -60,7 +60,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.0 #Release: 0.8.%%{prerev}%%{?dist} -Release: 8%{?dist} +Release: 9%{?dist} License: Apache-2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -399,6 +399,9 @@ exit 0 %endif %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.0.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 19 2023 Florian Weimer - 4.0.0-8 - Bring back still needed part of configure C compatibility fix From 85428ca4a2a4a02036ce826efad7b0e2dd73364a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 6 Apr 2024 09:58:49 -0700 Subject: [PATCH 14/25] Update to 4.0.1. Fixes rhbz#2272189 --- sources | 8 ++++---- spamassassin-configure-c99.patch | 28 ---------------------------- spamassassin.spec | 17 +++++++++-------- 3 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 spamassassin-configure-c99.patch diff --git a/sources b/sources index c3bd050..33bc870 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (Mail-SpamAssassin-4.0.0.tar.bz2) = a0fe5f6953c9df355bfa011e8a617101687eb156831a057504656921fe76c2a4eb37b5383861aac579e66a20c4454068e81a39826a35eb0266148771567bad5f -SHA512 (Mail-SpamAssassin-4.0.0.tar.bz2.asc) = b87a80d2b0b802f52df75e485878c53cc4fad52935ca2b14b1b06e46d334b52c673e66d61cc2155b5e812fa6a486f8e61f6a87794be2524acea1fd8ac42e7d6a -SHA512 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz) = 8ff0e68e18dc52a88fec83239bb9dc3a1d34f2dcb4c03cd6c566b97fa91242e3c8d006612aeb4df0acf43929eaaa59d542eb5cf904498343adf5eadefcb89255 -SHA512 (Mail-SpamAssassin-rules-4.0.0.r1905950.tgz.asc) = 517dbf83b4cf984036cb7cbf92a290ea0c8eea1da87f80d202275e71d2823b7b2eed4efff2f71742ca28090d355a690346f1bf97cfc15a3ea26a6d52792b1882 +SHA512 (Mail-SpamAssassin-4.0.1.tar.bz2) = 66183e356b07d1049cf5598fc1e563e4aab580dfca04bf8ec37781dfb57ef568d33c6f6455076f54f940947f5a5dfefa7a08d233833deea5fe5ea18b669cd790 +SHA512 (Mail-SpamAssassin-4.0.1.tar.bz2.asc) = b180080c1692684014680a6873f42ed07d1640c40a6e3e330cfb43235bb3e3008f5e21018fbc0e9cba67ab6d9ba5b87cc2d98c3bed15c9503164dacdfdaef9df +SHA512 (Mail-SpamAssassin-rules-4.0.1.r1916528.tgz) = 7e6093c8514e1b18f3b47215dc97d51b7b70142ca2fe7242362c021bf770b2c1c1e99a8227d1c5b9b5d303e405ab9e6a7c67a60b5b03dcb6588bd68c733e2448 +SHA512 (Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc) = d9e83656021f65a5272c1881f13e83534bff1f6250e1abfbbed72054161d70a8fafd7695ea7477384677ee02dfcca4951ae97c94010ce443faafa6f705325ac7 diff --git a/spamassassin-configure-c99.patch b/spamassassin-configure-c99.patch deleted file mode 100644 index 740308b..0000000 --- a/spamassassin-configure-c99.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix autoconf 2.59 bug that results in an incorrect definition of -STDC_HEADERS with some compilers. - -Raised upstream: - -diff -ur Mail-SpamAssassin-4.0.0.orig/spamc/configure Mail-SpamAssassin-4.0.0/spamc/configure ---- Mail-SpamAssassin-4.0.0.orig/spamc/configure 2022-12-14 07:03:27.000000000 +0100 -+++ Mail-SpamAssassin-4.0.0/spamc/configure 2023-12-19 14:34:05.414644959 +0100 -@@ -2119,7 +2119,7 @@ - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ -- '' \ -+ '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ -@@ -2624,8 +2624,8 @@ - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext diff --git a/spamassassin.spec b/spamassassin.spec index 948d12d..a947a49 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: 9%{?dist} +Release: 1%{?dist} License: Apache-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 @@ -87,7 +87,7 @@ Source17: sa-update.timer # GPG Keys and source signatures Source100: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2.asc -Source101: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1905950.tgz.asc +Source101: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1916528.tgz.asc Source102: https://www.apache.org/dist/spamassassin/KEYS # Patches 0-99 are RH specific @@ -96,7 +96,6 @@ Source102: https://www.apache.org/dist/spamassassin/KEYS Patch0: spamassassin-4.0.0-gnupg2.patch # add a logfile and homedir for razor Patch1: spamassassin-4.0.0-add-logfile-homedir-options.patch -Patch2: spamassassin-configure-c99.patch # end of patches %if %{use_systemd} == 0 Requires: /sbin/chkconfig /sbin/service @@ -216,9 +215,8 @@ To filter spam for all users, add that line to /etc/procmailrc %{gpgverify} --keyring='%{SOURCE102}' --signature='%{SOURCE101}' --data='%{SOURCE1}' %setup -q -n Mail-SpamAssassin-%{version} # Patches 0-99 are RH specific -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch 0 -p1 +%patch 1 -p1 # end of patches echo "RHEL=%{?rhel} FEDORA=%{?fedora}" @@ -399,6 +397,9 @@ exit 0 %endif %changelog +* Sat Apr 06 2024 Kevin Fenzi - 4.0.1-1 +- Update to 4.0.1. Fixes rhbz#2272189 + * Sat Jan 27 2024 Fedora Release Engineering - 4.0.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a22ed5378f5d253fcc026a5c4665f2bc88b3f057 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 13 Apr 2024 10:56:06 -0700 Subject: [PATCH 15/25] Fix saversion for 4.0.1 --- spamassassin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spamassassin.spec b/spamassassin.spec index a947a49..b052e82 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -53,14 +53,14 @@ %define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} -%global saversion 4.000000 +%global saversion 4.000001 #%%global prerev rc2 Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.1 #Release: 0.8.%%{prerev}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: Apache-2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -397,6 +397,9 @@ exit 0 %endif %changelog +* Sat Apr 13 2024 Kevin Fenzi - 4.0.1-2 +- Fix saversion for 4.0.1 + * Sat Apr 06 2024 Kevin Fenzi - 4.0.1-1 - Update to 4.0.1. Fixes rhbz#2272189 From cd40ad63fc8aa5a4a0c3830db96354968eac9699 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 20 May 2023 11:06:38 -0700 Subject: [PATCH 16/25] small whitespace change to test Signed-off-by: Kevin Fenzi --- spamassassin.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/spamassassin.spec b/spamassassin.spec index b052e82..2b8bd30 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,3 +1,4 @@ + # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG #%%define rhel 4 From 57877fdb5329aac53d93d41dd36c7edfa9e0a764 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 May 2024 10:47:12 -0700 Subject: [PATCH 17/25] Moderize spec and split sa-compile off to reduce deps There was a bunch of rhel5/6/7 conditions that are no longer needed. There's no need to keep shipping non systemd setup and it was removed. Updated the readme to talk about the systemd timer unit instead of cronjob. Moved sa-compile out to a subpackage. This reduces deps quite a lot (from ~55 to ~30). See rhbz#2283026 Signed-off-by: Kevin Fenzi --- README.RHEL.Fedora | 34 ++-------- spamassassin.spec | 150 ++++++++------------------------------------- 2 files changed, 29 insertions(+), 155 deletions(-) diff --git a/README.RHEL.Fedora b/README.RHEL.Fedora index c4f64e0..e3caa8f 100644 --- a/README.RHEL.Fedora +++ b/README.RHEL.Fedora @@ -1,43 +1,17 @@ Notes for Spamassassin for RHEL or Fedora ========================================= -spamassassin-3.3.x RPM package for RHEL 5+ or Fedora 11+ contains some new -functionality beyond the upstream spamassassin documentation. - -Upstream spamassassin-3.3.0 is no longer distributed with rules. Our package +Upstream spamassassin is no longer distributed with rules. Our package contains rules in order to be less of a surprise to system administrators. However just as you wouldn't rely on antivirus software without signature updates, spamassassin cannot be relied upon without regular rule updates. -1) For these reasons, our RPM package now runs nightly sa-update by default. +A systemd timer unit/service is provided to do this daily. -/etc/cron.d/sa-update -The default cron runs sa-update once every night. You may edit this cron -file to change the schedule of sa-update or to disable it entirely. If you -had modified this file in the past you may need to restore the new file -from /etc/cron.d/sa-update.rpmnew - -2) /usr/share/spamassassin/sa-update.cron -This script is executed by cron. It runs sa-update only if a known spam +Note that the update script runs sa-update only if a known spam daemon is running: spamd, amavisd, or mimedefang. If you do not run any of these spam daemons but wish to have nightly sa-update, you may override the daemon check in /etc/sysconfig/sa-update -3) /etc/mail/spamassassin/channel.d +/etc/mail/spamassassin/channel.d All sa-update channels are defined in files contained in this directory. See the existing config files as examples for writing your own config file. - -General Warnings -================ -* DO NOT USE SARE or OpenProtect rules. They are old and outdated, and - can be dangerous. Many of the useful rules have been integrated into - upstream spamassassin. - -Note about -d option -==================== - -With spamassassin 3.4.0, this package has switched the way spamd is started. -You should no longer use the '-d' option in /etc/sysconfig/spamassassin. Doing -so will result in spamd starting and stopping in a loop. The default -/etc/sysconfig/spamassassin file has been adjusted for this, please merge -this change into that file if you have made any changes to it. - diff --git a/spamassassin.spec b/spamassassin.spec index 2b8bd30..1b4ae1d 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,50 +1,6 @@ - -# OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG -#%%define rhel 4 - -# Define dist tags for old RHEL releases -%if 0%{?rhel} == 4 -%define dist .el4 -%endif -%if 0%{?rhel} == 5 -%define dist .el5 -%endif -%if 0%{?rhel} == 6 -%define dist .el6 -%endif - # Define variables to use in conditionals -%define option_ssl 0 -%define perl_devel 0 -%define dkim_deps 0 %global patricia_deps 0 %global razor_deps 0 -%define require_encode_detect 0 -%define use_systemd 0 - -# SSL and IPv6 (FC6+, RHEL5+) -%if 0%{?fedora} > 5 || 0%{?rhel} >= 5 -%define option_ssl 1 -%endif - -# Split perl-devel (FC7+ and RHEL-8+) -%if 0%{?fedora} > 6 || 0%{?rhel} > 7 -%define perl_devel 1 -%endif - -# Encode::Detect, not strictly required but helpful if you enable language detection (FC7+) -%if 0%{?fedora} > 6 || 0%{?rhel} >= 6 -%define require_encode_detect 1 -%endif - -# Mail::DKIM by default (F11+) -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -%define dkim_deps 1 -%endif - -%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 -%define use_systemd 1 -%endif %if ! 0%{?rhel} %global patricia_deps 1 @@ -61,7 +17,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.1 #Release: 0.8.%%{prerev}%%{?dist} -Release: 2%{?dist} +Release: 3%{?dist} License: Apache-2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -79,9 +35,7 @@ Source9: sa-update.force-sysconfig Source10: spamassassin-helper.sh Source11: spamassassin-official.conf Source13: README.RHEL.Fedora -%if %{use_systemd} Source14: spamassassin.service -%endif Source15: spamassassin.sysconfig.el Source16: sa-update.service Source17: sa-update.timer @@ -98,9 +52,6 @@ Patch0: spamassassin-4.0.0-gnupg2.patch # add a logfile and homedir for razor Patch1: spamassassin-4.0.0-add-logfile-homedir-options.patch # end of patches -%if %{use_systemd} == 0 -Requires: /sbin/chkconfig /sbin/service -%endif Requires(post): diffutils BuildRequires: make @@ -120,11 +71,7 @@ BuildRequires: perl(Net::CIDR::Lite) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Digest::SHA1) BuildRequires: perl(Test::More) -# Fedora package needs fixing before we can depend on it -#BuildRequires: re2c -%if %{use_systemd} BuildRequires: systemd-units -%endif Requires: perl(HTTP::Date) Requires: perl(LWP::UserAgent) @@ -133,16 +80,10 @@ Requires: perl(Time::HiRes) Requires: perl(DB_File) Requires: perl(Mail::SPF) Requires: perl(Net::CIDR::Lite) -%if %{require_encode_detect} Requires: perl(Encode::Detect) -%endif Requires: perl(BSD::Resource) Requires: procmail Requires: gnupg2 -Requires: perl(XSLoader) -Requires: perl(ExtUtils::MakeMaker) -# Fedora package needs fixing before we can depend on it -#Requires: re2c # Hard requirements BuildRequires: perl-HTML-Parser >= 3.43 @@ -160,29 +101,19 @@ Requires: perl-Razor-Agent BuildRequires: perl-Razor-Agent %endif -%if %{option_ssl} -# Needed for spamc/spamd SSL Requires: perl(IO::Socket::SSL) BuildRequires: perl(IO::Socket::SSL) # Needed for IPv6 Requires: perl(IO::Socket::IP) BuildRequires: perl(IO::Socket::IP) -%endif -%if %{perl_devel} BuildRequires: perl-devel -%endif -# Mail::DKIM for F12+, works from RHEL5+ from EPEL5 but we don't require them -%if %{dkim_deps} Requires: perl(Mail::DKIM) BuildRequires: perl(Mail::DKIM) -%endif -%if %{use_systemd} Requires(post): systemd-units Requires(post): systemd-sysv Requires(preun): systemd-units Requires(postun): systemd-units -%endif # For completeness, explicitly require perl modules already # pulled in by perl-interpreter @@ -211,6 +142,20 @@ INCLUDERC=/etc/mail/spamassassin/spamassassin-default.rc To filter spam for all users, add that line to /etc/procmailrc (creating if necessary). + +%package compile +Summary: Spamassassin sa-compile + +BuildRequires: re2c +Requires: re2c +Requires: perl(XSLoader) +Requires: perl(ExtUtils::MakeMaker) +Requires: %{name} = %{version}-%{release} + +%description compile +This subpackage provides the 'sa-compile' tool. +sa-compile uses "re2c" to compile the site-wide parts of the SpamAssassin ruleset. + %prep %{gpgverify} --keyring='%{SOURCE102}' --signature='%{SOURCE100}' --data='%{SOURCE0}' %{gpgverify} --keyring='%{SOURCE102}' --signature='%{SOURCE101}' --data='%{SOURCE1}' @@ -236,20 +181,11 @@ rm -rf $RPM_BUILD_ROOT LOCAL_RULES_DIR=%{buildroot}/etc/mail/spamassassin chmod 755 %buildroot/%{_bindir}/* # allow stripping -%if %{use_systemd} == 0 -install -d %buildroot/%{_initrddir} -install -m 0755 spamd/redhat-rc-script.sh %buildroot/%{_initrddir}/spamassassin -%endif - mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/local.cf -%if %{use_systemd} install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/spamassassin -%else -install -m644 %{SOURCE15} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/spamassassin -%endif install -m 0644 %{SOURCE3} %buildroot/etc/mail/spamassassin install -m 0644 %{SOURCE4} %buildroot/etc/mail/spamassassin @@ -258,19 +194,13 @@ install -m 0755 %{SOURCE10} %buildroot/etc/mail/spamassassin install -m 0644 %{SOURCE6} %buildroot/etc/logrotate.d/sa-update -%if %{use_systemd} == 0 -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.d -install -m 0644 %{SOURCE7} %buildroot/etc/cron.d/sa-update -%endif install -m 0644 %{SOURCE9} %buildroot%{_sysconfdir}/sysconfig/sa-update # installed mode 744 as non root users can't run it, but can read it. install -m 0744 %{SOURCE8} %buildroot%{_datadir}/spamassassin/sa-update.cron -%if %{use_systemd} mkdir -p %buildroot%{_unitdir} install -m 0644 %{SOURCE14} %buildroot%{_unitdir}/spamassassin.service install -m 0644 %{SOURCE16} %buildroot%{_unitdir}/sa-update.service install -m 0644 %{SOURCE17} %buildroot%{_unitdir}/sa-update.timer -%endif [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress @@ -311,10 +241,6 @@ mkdir -m 0700 -p $RPM_BUILD_ROOT%{_sharedstatedir}/razor/ %doc LICENSE NOTICE CREDITS Changes README TRADEMARK UPGRADE %doc USAGE sample-nonspam.txt sample-spam.txt %doc README.RHEL.Fedora -%if %{use_systemd} == 0 -%{_initrddir}/spamassassin -%{_sysconfdir}/cron.d/sa-update -%endif %dir %{_sysconfdir}/mail %config(noreplace) %{_sysconfdir}/mail/spamassassin %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin @@ -325,21 +251,19 @@ mkdir -m 0700 -p $RPM_BUILD_ROOT%{_sharedstatedir}/razor/ %dir %{_sharedstatedir}/razor %endif %config(noreplace) %{_sysconfdir}/logrotate.d/sa-update -%if %{use_systemd} %{_unitdir}/spamassassin.service %{_unitdir}/sa-update.service %{_unitdir}/sa-update.timer -%endif +%exclude %{_bindir}/sa-compile +%exclude %{_mandir}/man1/sa-compile.1.gz + +%files compile +%{_bindir}/sa-compile +%{_mandir}/man1/sa-compile.1.gz %post -%if %{use_systemd} == 0 -/sbin/chkconfig --add spamassassin -%endif - -%if %{use_systemd} %systemd_post spamassassin.service %systemd_post sa-update.timer -%endif # -a and --auto-whitelist options were removed from 3.0.0 # prevent service startup failure @@ -359,45 +283,21 @@ if [ -f /etc/mail/spamassassin.cf ]; then fi %postun -%if %{use_systemd} == 0 -if [ "$1" -ge "1" ]; then - /sbin/service spamassassin condrestart > /dev/null 2>&1 -fi -exit 0 -%endif - -%if %{use_systemd} %systemd_postun spamassassin.service %systemd_postun sa-update.timer -%endif %preun %if %{razor_deps} rm -f %{_sharedstatedir}/razor/* %endif -%if %{use_systemd} == 0 -if [ $1 = 0 ] ; then - /sbin/service spamassassin stop >/dev/null 2>&1 - /sbin/chkconfig --del spamassassin -fi -exit 0 -%endif - -%if %{use_systemd} %systemd_preun spamassassin.service %systemd_preun sa-update.timer -%endif - -%if %{use_systemd} -%triggerun -- spamassassin < 3.3.2-2 -%{_bindir}/systemd-sysv-convert --save spamassassin >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del spamassassin >/dev/null 2>&1 || : -/bin/systemctl try-restart spamassassin.service >/dev/null 2>&1 || : -%endif %changelog +* Mon May 27 2024 Kevin Fenzi - 4.0.1-3 +- CLean up and modernize spec +- Move sa-compile to a subpackage to reduce deps + * Sat Apr 13 2024 Kevin Fenzi - 4.0.1-2 - Fix saversion for 4.0.1 From e0b542e8c46f7f73fdb74b9868da0e529e63eced Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:07:40 +0000 Subject: [PATCH 18/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- spamassassin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spamassassin.spec b/spamassassin.spec index 1b4ae1d..0810e2a 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -17,7 +17,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.1 #Release: 0.8.%%{prerev}%%{?dist} -Release: 3%{?dist} +Release: 4%{?dist} License: Apache-2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -294,6 +294,9 @@ rm -f %{_sharedstatedir}/razor/* %systemd_preun sa-update.timer %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon May 27 2024 Kevin Fenzi - 4.0.1-3 - CLean up and modernize spec - Move sa-compile to a subpackage to reduce deps From 8ef592065150c5ed33cd70f4e4b12675aaf17833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= Date: Fri, 29 Nov 2024 10:25:27 +0100 Subject: [PATCH 19/25] Remove dependency to Digest::SHA1 --- ...ssin-4.0.1-remove_dep_to_digest_sha1.patch | 44 +++++++++++++++++++ spamassassin.spec | 9 +++- 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 spamassassin-4.0.1-remove_dep_to_digest_sha1.patch diff --git a/spamassassin-4.0.1-remove_dep_to_digest_sha1.patch b/spamassassin-4.0.1-remove_dep_to_digest_sha1.patch new file mode 100644 index 0000000..b0c1b1a --- /dev/null +++ b/spamassassin-4.0.1-remove_dep_to_digest_sha1.patch @@ -0,0 +1,44 @@ +diff -u -r Mail-SpamAssassin-4.0.1.orig/INSTALL Mail-SpamAssassin-4.0.1/INSTALL +--- Mail-SpamAssassin-4.0.1.orig/INSTALL 2024-11-28 15:46:04.746114884 +0100 ++++ Mail-SpamAssassin-4.0.1/INSTALL 2024-11-28 15:46:41.689348148 +0100 +@@ -410,13 +410,6 @@ + If you do not plan to use this plugin, be sure to comment out its + loadplugin line in "/etc/mail/spamassassin/v310.pre". + +- - Digest::SHA1 (from CPAN) +- +- An external perl module razor-agents-2.84 as used by a Razor2 plugin +- seems to be the only remaining component depending on Digest::SHA1 (note +- that a packager may ship a patched version of razor-agents which can use +- Digest::SHA instead) +- + - LWP::UserAgent (aka libwww-perl) (from CPAN) + + Can be used by sa-update to retrieve update archives, as alternative to +diff -u -r Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Util/DependencyInfo.pm +--- Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Util/DependencyInfo.pm 2024-11-28 15:46:04.773115054 +0100 ++++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Util/DependencyInfo.pm 2024-11-29 09:39:44.359950894 +0100 +@@ -91,12 +91,6 @@ + + our @OPTIONAL_MODULES = ( + { +- 'module' => 'Digest::SHA1', +- 'version' => 0, +- 'desc' => 'The Digest::SHA1 module is still required by the Razor2 plugin. +- Other modules prefer Digest::SHA, which is a Perl base module.', +-}, +-{ + module => 'MIME::Base64', + version => 0, + desc => 'This module is highly recommended to increase the speed with which +diff -u -r Mail-SpamAssassin-4.0.1.orig/t/rule_names.t Mail-SpamAssassin-4.0.1/t/rule_names.t +--- Mail-SpamAssassin-4.0.1.orig/t/rule_names.t 2024-11-28 15:46:04.750114909 +0100 ++++ Mail-SpamAssassin-4.0.1/t/rule_names.t 2024-11-28 15:47:21.093596927 +0100 +@@ -8,7 +8,6 @@ + + BEGIN { + eval { require Digest::SHA; Digest::SHA->import(qw(sha1)); 1 } +- or do { require Digest::SHA1; Digest::SHA1->import(qw(sha1)) } + } + + our $RUN_THIS_TEST; diff --git a/spamassassin.spec b/spamassassin.spec index 0810e2a..33e813f 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -17,7 +17,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.1 #Release: 0.8.%%{prerev}%%{?dist} -Release: 4%{?dist} +Release: 5%{?dist} License: Apache-2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -51,6 +51,8 @@ Source102: https://www.apache.org/dist/spamassassin/KEYS Patch0: spamassassin-4.0.0-gnupg2.patch # add a logfile and homedir for razor Patch1: spamassassin-4.0.0-add-logfile-homedir-options.patch +# Removing of Digest::SHA1 dependency, perl-Razor-Agent hasn't this in Fedora +Patch2: spamassassin-4.0.1-remove_dep_to_digest_sha1.patch # end of patches Requires(post): diffutils @@ -69,7 +71,6 @@ BuildRequires: perl(DB_File) BuildRequires: perl(Mail::SPF) BuildRequires: perl(Net::CIDR::Lite) BuildRequires: perl(LWP::UserAgent) -BuildRequires: perl(Digest::SHA1) BuildRequires: perl(Test::More) BuildRequires: systemd-units @@ -163,6 +164,7 @@ sa-compile uses "re2c" to compile the site-wide parts of the SpamAssassin rulese # Patches 0-99 are RH specific %patch 0 -p1 %patch 1 -p1 +%patch 2 -p1 # end of patches echo "RHEL=%{?rhel} FEDORA=%{?fedora}" @@ -294,6 +296,9 @@ rm -f %{_sharedstatedir}/razor/* %systemd_preun sa-update.timer %changelog +* Fri Nov 29 2024 Michal Josef Špaček - 4.0.1-5 +- Remove dependency to Digest::SHA1 + * Sat Jul 20 2024 Fedora Release Engineering - 4.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e20e7456ab245cae03276080b145da6e3fdc412c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= Date: Fri, 29 Nov 2024 10:34:17 +0100 Subject: [PATCH 20/25] Remove duplicite requires, they are generated --- spamassassin.spec | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/spamassassin.spec b/spamassassin.spec index 33e813f..1281c68 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -76,8 +76,6 @@ BuildRequires: systemd-units Requires: perl(HTTP::Date) Requires: perl(LWP::UserAgent) -Requires: perl(Net::DNS) -Requires: perl(Time::HiRes) Requires: perl(DB_File) Requires: perl(Mail::SPF) Requires: perl(Net::CIDR::Lite) @@ -116,16 +114,6 @@ Requires(post): systemd-sysv Requires(preun): systemd-units Requires(postun): systemd-units -# For completeness, explicitly require perl modules already -# pulled in by perl-interpreter -Requires: perl(Digest::SHA) -Requires: perl(Socket) -Requires: perl(Data::Dumper) -Requires: perl(Digest::MD5) -Requires: perl(Errno) -Requires: perl(Exporter) -Requires: perl(List::Util) - %description SpamAssassin provides you with a way to reduce if not completely eliminate Unsolicited Commercial Email (SPAM) from your incoming email. It can @@ -298,6 +286,7 @@ rm -f %{_sharedstatedir}/razor/* %changelog * Fri Nov 29 2024 Michal Josef Špaček - 4.0.1-5 - Remove dependency to Digest::SHA1 +- Remove duplicite requires, they are generated * Sat Jul 20 2024 Fedora Release Engineering - 4.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d0330b5de63d60786dbe17416aa13a4e1469d347 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:17:36 +0000 Subject: [PATCH 21/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- spamassassin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spamassassin.spec b/spamassassin.spec index 1281c68..ba8ad75 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -17,7 +17,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.1 #Release: 0.8.%%{prerev}%%{?dist} -Release: 5%{?dist} +Release: 6%{?dist} License: Apache-2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -284,6 +284,9 @@ rm -f %{_sharedstatedir}/razor/* %systemd_preun sa-update.timer %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 29 2024 Michal Josef Špaček - 4.0.1-5 - Remove dependency to Digest::SHA1 - Remove duplicite requires, they are generated From 1b0be61ed22238f1f6c9ec1510ac88afb81510c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:34:25 +0000 Subject: [PATCH 22/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- spamassassin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spamassassin.spec b/spamassassin.spec index ba8ad75..902ee53 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -17,7 +17,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.1 #Release: 0.8.%%{prerev}%%{?dist} -Release: 6%{?dist} +Release: 7%{?dist} License: Apache-2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -284,6 +284,9 @@ rm -f %{_sharedstatedir}/razor/* %systemd_preun sa-update.timer %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 4.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 44b5eed0c34cc3258fba56e215c0111c72e08e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= Date: Tue, 12 Aug 2025 10:14:49 +0200 Subject: [PATCH 23/25] Update of fmf plans --- ci.fmf | 1 + gating.yaml | 19 ++++++++++++++----- plans.fmf | 35 +++++++++++++++++++++++++++++++++++ plans/all.fmf | 6 ------ 4 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 ci.fmf create mode 100644 plans.fmf delete mode 100644 plans/all.fmf diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml index 195c6fe..8085288 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,16 +1,25 @@ --- !Policy product_versions: - fedora-* -decision_contexts: [bodhi_update_push_testing] +decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} -#gating rawhide +#Rawhide --- !Policy product_versions: - fedora-* -decision_contexts: [bodhi_update_push_stable] +decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} \ No newline at end of file + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional} + +#gating rhel +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional} diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..f8a75ab --- /dev/null +++ b/plans.fmf @@ -0,0 +1,35 @@ +/tier1-internal: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/spamassassin.git + name: /plans/tier1/internal + +/tier1-public: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/spamassassin.git + name: /plans/tier1/public + +/tier2-tier3-internal: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/spamassassin.git + name: /plans/tier2-tier3/internal + +/tier2-tier3-public: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/spamassassin.git + name: /plans/tier2-tier3/public + +/others-internal: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/spamassassin.git + name: /plans/others/internal + +/others-public: + plan: + import: + url: https://gitlab.com/redhat/centos-stream/tests/spamassassin.git + name: /plans/others/public \ No newline at end of file diff --git a/plans/all.fmf b/plans/all.fmf deleted file mode 100644 index a0fc2bb..0000000 --- a/plans/all.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: Test plan with all Fedora tests -discover: - how: fmf - url: https://src.fedoraproject.org/tests/spamassassin.git -execute: - how: tmt From eb0e945f7c884f18327d19b80ea613cccbfcc8e0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 4 Sep 2025 16:32:17 -0700 Subject: [PATCH 24/25] Update to 4.0.2. Fixes rhbz#2392141 --- sources | 8 ++++---- spamassassin.spec | 13 ++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sources b/sources index 33bc870..9cba6c5 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (Mail-SpamAssassin-4.0.1.tar.bz2) = 66183e356b07d1049cf5598fc1e563e4aab580dfca04bf8ec37781dfb57ef568d33c6f6455076f54f940947f5a5dfefa7a08d233833deea5fe5ea18b669cd790 -SHA512 (Mail-SpamAssassin-4.0.1.tar.bz2.asc) = b180080c1692684014680a6873f42ed07d1640c40a6e3e330cfb43235bb3e3008f5e21018fbc0e9cba67ab6d9ba5b87cc2d98c3bed15c9503164dacdfdaef9df -SHA512 (Mail-SpamAssassin-rules-4.0.1.r1916528.tgz) = 7e6093c8514e1b18f3b47215dc97d51b7b70142ca2fe7242362c021bf770b2c1c1e99a8227d1c5b9b5d303e405ab9e6a7c67a60b5b03dcb6588bd68c733e2448 -SHA512 (Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc) = d9e83656021f65a5272c1881f13e83534bff1f6250e1abfbbed72054161d70a8fafd7695ea7477384677ee02dfcca4951ae97c94010ce443faafa6f705325ac7 +SHA512 (Mail-SpamAssassin-4.0.2.tar.bz2) = 05917f1a897e22569ab9e5130d4f91cb546db2e28fceed7bd904ea211f2684d863cf30960db750e2c99f2ea4f3119b61353714760257a3f57e898f0d11ce6cdb +SHA512 (Mail-SpamAssassin-4.0.2.tar.bz2.asc) = e4f09fcfcdaf5faea287daf385f6ccad961a18e422c7535ea0c3d7a47ccd205fde9fdb818fa5d9ccd118238c8a35dd51e17ab0718e9ea6373c3e5f89897893c2 +SHA512 (Mail-SpamAssassin-rules-4.0.2.r1928015.tgz) = 5d51b127602b314a5f4e583f4341ebb0e76f6c43deb9a5f489d9781ece7a8d42bff21eac75b1ce248a03c376168b3c89002336070bc19475ec048d1064650266 +SHA512 (Mail-SpamAssassin-rules-4.0.2.r1928015.tgz.asc) = 8f79ef812fbac456872d7e39b7fd0409f7d6989619e0c03aacd359c6c44a3ecd66d24ef7c54d1bd9f6770e095c4473112606f3aeea38ef11b8607faa8ff54fbd diff --git a/spamassassin.spec b/spamassassin.spec index 902ee53..f4818fe 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -10,19 +10,19 @@ %define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} -%global saversion 4.000001 +%global saversion 4.000002 #%%global prerev rc2 Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin -Version: 4.0.1 +Version: 4.0.2 #Release: 0.8.%%{prerev}%%{?dist} -Release: 7%{?dist} +Release: 1%{?dist} License: Apache-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}.r1916528.tgz +Source1: https://downloads.apache.org/%{name}/source/%{real_name}-rules-%{version}.r1928015.tgz #Source1: %%{real_name}-rules-%%{version}.%%{prerev}.tgz Source2: redhat_local.cf Source3: spamassassin-default.rc @@ -42,7 +42,7 @@ Source17: sa-update.timer # GPG Keys and source signatures Source100: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2.asc -Source101: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1916528.tgz.asc +Source101: https://www.apache.org/dist/%{name}/source/%{real_name}-rules-%{version}.r1928015.tgz.asc Source102: https://www.apache.org/dist/spamassassin/KEYS # Patches 0-99 are RH specific @@ -284,6 +284,9 @@ rm -f %{_sharedstatedir}/razor/* %systemd_preun sa-update.timer %changelog +* Thu Sep 04 2025 Kevin Fenzi - 4.0.2-1 +- Update to 4.0.2. Fixes rhbz#2392141 + * Fri Jul 25 2025 Fedora Release Engineering - 4.0.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 93edb2375b3e54cca1a8a1d43c3e4982a5809b29 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 3 Jan 2026 11:15:43 -0800 Subject: [PATCH 25/25] Add perl-Mail-DMARC requirement to enable DMARC plugin. Fixes rhbz#2316684 --- spamassassin.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spamassassin.spec b/spamassassin.spec index f4818fe..ab891e9 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -17,7 +17,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 4.0.2 #Release: 0.8.%%{prerev}%%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} License: Apache-2.0 URL: https://spamassassin.apache.org/ Source0: https://www.apache.org/dist/%{name}/source/%{real_name}-%{version}.tar.bz2 @@ -108,6 +108,8 @@ BuildRequires: perl(IO::Socket::IP) BuildRequires: perl-devel Requires: perl(Mail::DKIM) BuildRequires: perl(Mail::DKIM) +BuildRequires: perl(Mail::DMARC) +Requires: perl(Mail::DMARC) Requires(post): systemd-units Requires(post): systemd-sysv @@ -284,6 +286,9 @@ rm -f %{_sharedstatedir}/razor/* %systemd_preun sa-update.timer %changelog +* Sat Jan 03 2026 Kevin Fenzi - 4.0.2-2 +- Add perl-Mail-DMARC requirement to enable DMARC plugin. Fixes rhbz#2316684 + * Thu Sep 04 2025 Kevin Fenzi - 4.0.2-1 - Update to 4.0.2. Fixes rhbz#2392141