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 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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