diff --git a/Mail-SpamAssassin-3.4.5.tar.bz2 b/Mail-SpamAssassin-3.4.5.tar.bz2 deleted file mode 100644 index b64be68..0000000 Binary files a/Mail-SpamAssassin-3.4.5.tar.bz2 and /dev/null differ diff --git a/Mail-SpamAssassin-4.0.0.tar.bz2 b/Mail-SpamAssassin-4.0.0.tar.bz2 new file mode 100644 index 0000000..25c469c Binary files /dev/null and b/Mail-SpamAssassin-4.0.0.tar.bz2 differ diff --git a/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz b/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz deleted file mode 100644 index 1152aab..0000000 Binary files a/Mail-SpamAssassin-rules-3.4.5.r1887800.tgz and /dev/null differ diff --git a/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz b/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz new file mode 100644 index 0000000..69e2e64 Binary files /dev/null and b/Mail-SpamAssassin-rules-4.0.0.r1905950.tgz differ diff --git a/sa-update.service b/sa-update.service index 4bb016f..b8098e6 100644 --- a/sa-update.service +++ b/sa-update.service @@ -10,6 +10,19 @@ Description=Spamassassin Rules Update Documentation=man:sa-update(1) [Service] +# Note that the opposite of "yes" is the empty string, NOT "no" +# Options for the actual sa-update command +# These are added to the channel configuration from +# /etc/mail/spamassassin/channel.d/*.conf Environment=OPTIONS=-v + +# Debug script - send mail even if no update available +#Environment=DEBUG=yes + +# Send mail when updates successfully processed +# Default: send mail only on error +#Environment=NOTIFY_UPD=yes + ExecStart=/usr/share/spamassassin/sa-update.cron + SuccessExitStatus=1 diff --git a/sa-update.timer b/sa-update.timer index 6e5cba0..4abc552 100644 --- a/sa-update.timer +++ b/sa-update.timer @@ -13,4 +13,4 @@ Documentation=man:sa-update(1) OnCalendar=daily [Install] -WantedBy=spamassassin.service +WantedBy=timers.target 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-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-helper.sh b/spamassassin-helper.sh old mode 100755 new mode 100644 diff --git a/spamassassin.spec b/spamassassin.spec index f0cc733..bc4b992 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,11 +1,11 @@ Name: spamassassin -Version: 3.4.5 -Release: 2 +Version: 4.0.0 +Release: 1 Summary: A program used for e-mail spam filtering License: ASL 2.0 URL: https://spamassassin.apache.org/ -Source0: http://mirror.bit.edu.cn/apache//%{name}/source/Mail-SpamAssassin-%{version}.tar.bz2 -Source1: http://mirror.bit.edu.cn/apache//%{name}/source/Mail-SpamAssassin-rules-%{version}.r1887800.tgz +Source0: https://www.apache.org/dist/%{name}/source/Mail-SpamAssassin-%{version}.tar.bz2 +Source1: https://www.apache.org/dist/%{name}/source/Mail-SpamAssassin-rules-%{version}.r1905950.tgz Source2: openeuler_local.cf Source3: spamassassin-default.rc Source4: spamassassin-spamc.rc @@ -20,8 +20,8 @@ Source12: spamassassin.service Source13: sa-update.service Source14: sa-update.timer -Patch0001: spamassassin-3.3.2-gnupg2.patch -Patch0002: spamassassin-3.4.1-add-logfile-homedir-options.patch +Patch0001: spamassassin-4.0.0-gnupg2.patch +Patch0002: spamassassin-4.0.0-add-logfile-homedir-options.patch BuildRequires: gcc openssl-devel perl-devel perl-generators perl-HTML-Parser >= 3.43 BuildRequires: perl-interpreter >= 2:5.8.0 perl(Archive::Tar) perl(DB_File) @@ -155,6 +155,9 @@ fi %{_mandir}/man[13]/* %changelog +* Thu Apr 13 2023 yaoxin - 4.0.0-1 +- Update to 4.0.0 + * Tue Dec 13 2022 liyanan - 3.4.5-2 - add requires systemd-pam