From a332475736b3466e31e2b371f735eb33336b42cc Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 4 Jan 2025 09:52:05 +0300 Subject: [PATCH] import spamassassin-4.0.1-4.el10 --- .gitignore | 4 +- .spamassassin.metadata | 4 +- SOURCES/KEYS | 229 ++++++++++++++++ SOURCES/Mail-SpamAssassin-4.0.1.tar.bz2.asc | 16 ++ ...-SpamAssassin-rules-4.0.1.r1916528.tgz.asc | 16 ++ SOURCES/README.RHEL.Fedora | 34 +-- ...in-3.4.1-add-logfile-homedir-options.patch | 43 --- ...in-4.0.0-add-logfile-homedir-options.patch | 35 +++ ....patch => spamassassin-4.0.0-gnupg2.patch} | 8 +- SPECS/spamassassin.spec | 245 ++++++++---------- 10 files changed, 409 insertions(+), 225 deletions(-) create mode 100644 SOURCES/KEYS create mode 100644 SOURCES/Mail-SpamAssassin-4.0.1.tar.bz2.asc create mode 100644 SOURCES/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc delete mode 100644 SOURCES/spamassassin-3.4.1-add-logfile-homedir-options.patch create mode 100644 SOURCES/spamassassin-4.0.0-add-logfile-homedir-options.patch rename SOURCES/{spamassassin-3.3.2-gnupg2.patch => spamassassin-4.0.0-gnupg2.patch} (54%) diff --git a/.gitignore b/.gitignore index b1e78dc..b67ccaf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/Mail-SpamAssassin-3.4.6.tar.bz2 -SOURCES/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz +SOURCES/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz +SOURCES/Mail-SpamAssassin-4.0.1.tar.bz2 diff --git a/.spamassassin.metadata b/.spamassassin.metadata index 00d5b3d..9623065 100644 --- a/.spamassassin.metadata +++ b/.spamassassin.metadata @@ -1,2 +1,2 @@ -26390aa8c9176c7d280252e4f01defe031373d32 SOURCES/Mail-SpamAssassin-3.4.6.tar.bz2 -bc4a64ed49f6df75d6bce8396fa476548a66d755 SOURCES/Mail-SpamAssassin-rules-3.4.6.r1888502.tgz +9c17f722809534525a2b839a5873ef2de7a0066a SOURCES/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz +415c11983b76248e55eb7439e73578a64bc17bb5 SOURCES/Mail-SpamAssassin-4.0.1.tar.bz2 diff --git a/SOURCES/KEYS b/SOURCES/KEYS new file mode 100644 index 0000000..07a412d --- /dev/null +++ b/SOURCES/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/Mail-SpamAssassin-4.0.1.tar.bz2.asc b/SOURCES/Mail-SpamAssassin-4.0.1.tar.bz2.asc new file mode 100644 index 0000000..02dbe4f --- /dev/null +++ b/SOURCES/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/SOURCES/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc b/SOURCES/Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc new file mode 100644 index 0000000..e798600 --- /dev/null +++ b/SOURCES/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/SOURCES/README.RHEL.Fedora b/SOURCES/README.RHEL.Fedora index c4f64e0..e3caa8f 100644 --- a/SOURCES/README.RHEL.Fedora +++ b/SOURCES/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. - -/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 +A systemd timer unit/service is provided to do this daily. -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/SOURCES/spamassassin-3.4.1-add-logfile-homedir-options.patch b/SOURCES/spamassassin-3.4.1-add-logfile-homedir-options.patch deleted file mode 100644 index 1aedc44..0000000 --- a/SOURCES/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/SOURCES/spamassassin-4.0.0-add-logfile-homedir-options.patch b/SOURCES/spamassassin-4.0.0-add-logfile-homedir-options.patch new file mode 100644 index 0000000..6066c66 --- /dev/null +++ b/SOURCES/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/SOURCES/spamassassin-3.3.2-gnupg2.patch b/SOURCES/spamassassin-4.0.0-gnupg2.patch similarity index 54% rename from SOURCES/spamassassin-3.3.2-gnupg2.patch rename to SOURCES/spamassassin-4.0.0-gnupg2.patch index da9acab..f2ab478 100644 --- a/SOURCES/spamassassin-3.3.2-gnupg2.patch +++ b/SOURCES/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/SPECS/spamassassin.spec b/SPECS/spamassassin.spec index 6f167ec..1fb9766 100644 --- a/SPECS/spamassassin.spec +++ b/SPECS/spamassassin.spec @@ -1,49 +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 @@ -53,19 +10,19 @@ %define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} -%global saversion 3.004006 +%global saversion 4.000001 #%%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.1 #Release: 0.8.%%{prerev}%%{?dist} -Release: 5%{?dist} -License: ASL 2.0 +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 #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}.r1916528.tgz #Source1: %%{real_name}-rules-%%{version}.%%{prerev}.tgz Source2: redhat_local.cf Source3: spamassassin-default.rc @@ -78,27 +35,28 @@ 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 +# 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 +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 -Patch0: spamassassin-3.3.2-gnupg2.patch -Patch1: spamassassin-3.4.1-add-logfile-homedir-options.patch +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 Requires(post): diffutils BuildRequires: make BuildRequires: gcc +BuildRequires: gnupg2 BuildRequires: perl-interpreter >= 2:5.8.0 BuildRequires: perl-generators BuildRequires: perl(Net::DNS) @@ -113,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) @@ -126,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 @@ -153,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::INET6) -BuildRequires: perl(IO::Socket::INET6) -%endif -%if %{perl_devel} +Requires: perl(IO::Socket::IP) +BuildRequires: perl(IO::Socket::IP) 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 @@ -204,11 +142,27 @@ 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}' %setup -q -n Mail-SpamAssassin-%{version} # Patches 0-99 are RH specific -%patch0 -p1 -%patch1 -p1 +%patch 0 -p1 +%patch 1 -p1 # end of patches echo "RHEL=%{?rhel} FEDORA=%{?fedora}" @@ -227,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 @@ -249,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 @@ -277,6 +216,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" @@ -301,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 @@ -315,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 -%post -%if %{use_systemd} == 0 -/sbin/chkconfig --add spamassassin -%endif +%files compile +%{_bindir}/sa-compile +%{_mandir}/man1/sa-compile.1.gz -%if %{use_systemd} +%post %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 @@ -349,58 +283,81 @@ 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 ||: +%changelog +* Sat Jan 04 2025 Arkady L. Shane - 4.0.1-4 +- Rebuilt for MSVSphere 10 -# 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 +* Sat Jul 20 2024 Fedora Release Engineering - 4.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild -%changelog -* Mon Jan 17 2022 Martin Osvald - 3.4.6-5 -- Forgot to reference CVE-2020-1946 as fixed after rebase to 3.4.6 +* 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 + +* 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 + +* 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 + +* 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 + + +* 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 + +* 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 + +* 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 + +* Wed Jun 01 2022 Jitka Plesnikova - 3.4.6-6 +- Perl 5.36 rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3.4.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Tue Aug 10 2021 Mohan Boddu - 3.4.6-4 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Tue Sep 14 2021 Sahana Prasad - 3.4.6-4 +- Rebuilt with OpenSSL 3.0.0 -* Wed Jun 16 2021 Mohan Boddu - 3.4.6-3 -- Rebuilt for RHEL 9 BETA for openssl 3.0 - Related: rhbz#1971065 +* Fri Jul 23 2021 Fedora Release Engineering - 3.4.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Fri Apr 16 2021 Mohan Boddu - 3.4.6-2 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Sat May 22 2021 Jitka Plesnikova - 3.4.6-2 +- Perl 5.34 rebuild * Wed Apr 14 2021 Pavel Zhukov - 3.4.6-1 - New release 3.4.6 (#1948520)