From 450feea77bce0e696169f3f01bc76c59d9524e1f Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 22 Apr 2024 20:10:54 +0200 Subject: [PATCH] - updated to 4.0.1 --- bug_771408_perl_version | 15 -- config-dir.patch | 337 ++++++++++++++++++++++------------------ spamassassin.spec | 32 ++-- 3 files changed, 202 insertions(+), 182 deletions(-) delete mode 100644 bug_771408_perl_version diff --git a/bug_771408_perl_version b/bug_771408_perl_version deleted file mode 100644 index f51e0bf..0000000 --- a/bug_771408_perl_version +++ /dev/null @@ -1,15 +0,0 @@ -upstream fix for bug #771408 -Index: spamassassin-3.4.1/lib/Mail/SpamAssassin/Conf/Parser.pm -=================================================================== ---- spamassassin-3.4.1.orig/lib/Mail/SpamAssassin/Conf/Parser.pm -+++ spamassassin-3.4.1/lib/Mail/SpamAssassin/Conf/Parser.pm -@@ -536,6 +536,9 @@ sub handle_conditional { - elsif ($token eq 'perl_version') { - $eval .= $]." "; - } -+ elsif ($token eq 'perl_version') { -+ $eval .= $]." "; -+ } - elsif ($token =~ /^\w[\w\:]+$/) { # class name - my $u = untaint_var($token); - $eval .= '"' . $u . '" '; diff --git a/config-dir.patch b/config-dir.patch index fa70eb2..a7a01f4 100644 --- a/config-dir.patch +++ b/config-dir.patch @@ -1,18 +1,27 @@ -diff -ur Mail-SpamAssassin-3.4.2.orig/INSTALL Mail-SpamAssassin-3.4.2/INSTALL ---- Mail-SpamAssassin-3.4.2.orig/INSTALL 2018-09-14 03:27:51.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/INSTALL 2019-01-26 00:07:45.957000000 +0100 -@@ -462,7 +462,7 @@ - perl interpreter. Version 2.83 or later fixes this. - - If you do not plan to use this plugin, be sure to comment out -- its loadplugin line in "/etc/mail/spamassassin/v310.pre". -+ its loadplugin line in "/etc/spamassassin/v310.pre". - - - What Next? -diff -ur Mail-SpamAssassin-3.4.2.orig/ldap/README Mail-SpamAssassin-3.4.2/ldap/README ---- Mail-SpamAssassin-3.4.2.orig/ldap/README 2018-09-14 03:27:55.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/ldap/README 2019-01-26 00:07:45.958000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/INSTALL Mail-SpamAssassin-4.0.1/INSTALL +--- Mail-SpamAssassin-4.0.1.orig/INSTALL 2024-03-26 05:52:27.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/INSTALL 2024-04-22 18:04:33.805233800 +0200 +@@ -153,7 +153,7 @@ + /var/lib/spamassassin), you can find out the default directory with + sa-update --help (look for --updatedir). Same needs to be done for + LOCAL_RULES_DIR/sa-update-keys (usually: chown -R user:user +-/etc/mail/spamassassin/sa-update-keys), the directory can be found with ++/etc/spamassassin/sa-update-keys), the directory can be found with + spamassassin --help (look for --siteconfigpath). + + If you wish to install rules from downloaded files, rather than "live" from +@@ -408,7 +408,7 @@ + interpreter. Version 2.83 or later fixes this. + + If you do not plan to use this plugin, be sure to comment out its +- loadplugin line in "/etc/mail/spamassassin/v310.pre". ++ loadplugin line in "/etc/spamassassin/v310.pre". + + - Digest::SHA1 (from CPAN) + +diff -ur Mail-SpamAssassin-4.0.1.orig/ldap/README Mail-SpamAssassin-4.0.1/ldap/README +--- Mail-SpamAssassin-4.0.1.orig/ldap/README 2024-03-26 05:52:28.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/ldap/README 2024-04-22 18:03:02.480038799 +0200 @@ -13,7 +13,7 @@ database or LDAP server. @@ -22,9 +31,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/ldap/README Mail-SpamAssassin-3.4.2/ldap/R user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__ user_scores_ldap_username bind dn -diff -ur Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Conf.pm Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Conf.pm ---- Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Conf.pm 2018-09-14 03:27:51.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Conf.pm 2019-01-26 00:07:45.958000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Conf.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Conf.pm +--- Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Conf.pm 2024-03-26 05:52:09.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Conf.pm 2024-04-22 18:03:02.480038799 +0200 @@ -40,7 +40,7 @@ =head1 DESCRIPTION @@ -34,7 +43,7 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Conf.pm Mail-SpamAss directories. The following web page lists the most important configuration settings -@@ -2673,7 +2673,7 @@ +@@ -2846,7 +2846,7 @@ These settings differ from the ones above, in that they are considered 'privileged'. Only users running C from their procmailrc's or @@ -43,9 +52,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Conf.pm Mail-SpamAss use them. C users cannot use them in their C files, for security and efficiency reasons, unless C is enabled (and then, they may only add rules from below). -diff -ur Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Phishing.pm ---- Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm 2018-09-14 03:27:51.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Phishing.pm 2019-01-26 00:08:01.418000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Phishing.pm +--- Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm 2024-03-26 05:52:09.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Phishing.pm 2024-04-22 18:03:02.480038799 +0200 @@ -29,8 +29,8 @@ loadplugin Mail::SpamAssassin::Plugin::Phishing @@ -57,9 +66,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm M body URI_PHISHING eval:check_phishing() describe URI_PHISHING Url match phishing in feed endif -diff -ur Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Test.pm Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Test.pm ---- Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Test.pm 2018-09-14 03:27:51.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Test.pm 2019-01-26 00:07:45.958000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Test.pm Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Test.pm +--- Mail-SpamAssassin-4.0.1.orig/lib/Mail/SpamAssassin/Plugin/Test.pm 2024-03-26 05:52:10.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/Test.pm 2024-04-22 18:03:02.480038799 +0200 @@ -27,7 +27,7 @@ =head1 DESCRIPTION @@ -69,9 +78,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Test.pm Mail- =cut -diff -ur Mail-SpamAssassin-3.4.2.orig/lib/spamassassin-run.pod Mail-SpamAssassin-3.4.2/lib/spamassassin-run.pod ---- Mail-SpamAssassin-3.4.2.orig/lib/spamassassin-run.pod 2018-09-14 03:27:51.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/lib/spamassassin-run.pod 2019-01-26 00:07:45.958000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/lib/spamassassin-run.pod Mail-SpamAssassin-4.0.1/lib/spamassassin-run.pod +--- Mail-SpamAssassin-4.0.1.orig/lib/spamassassin-run.pod 2024-03-26 05:52:11.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/lib/spamassassin-run.pod 2024-04-22 18:03:02.480038799 +0200 @@ -41,7 +41,7 @@ -p prefs, --prefspath=file, --prefs-file=file Set user preferences file @@ -79,9 +88,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/lib/spamassassin-run.pod Mail-SpamAssassin - (def: /etc/mail/spamassassin) + (def: /etc/spamassassin) --cf='config line' Additional line of configuration + --pre='config line' Additional line of ".pre" (prepended to configuration) -x, --nocreate-prefs Don't create user preferences file - -e, --exit-code Exit with a non-zero exit code if the -@@ -240,7 +240,7 @@ +@@ -269,7 +269,7 @@ =item B<--siteconfigpath>=I Use the specified path for locating site-specific configuration files. Ignore @@ -90,9 +99,21 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/lib/spamassassin-run.pod Mail-SpamAssassin =item B<--cf='config line'> -diff -ur Mail-SpamAssassin-3.4.2.orig/README Mail-SpamAssassin-3.4.2/README ---- Mail-SpamAssassin-3.4.2.orig/README 2018-09-14 03:27:52.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/README 2019-01-26 00:07:45.957000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/PACKAGING Mail-SpamAssassin-4.0.1/PACKAGING +--- Mail-SpamAssassin-4.0.1.orig/PACKAGING 2024-03-26 05:52:28.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/PACKAGING 2024-04-22 18:04:14.196977227 +0200 +@@ -73,7 +73,7 @@ + Samples: + This will install the spamassassin apps in /foo/bin, the libs in + /foo/lib/perl5, the shared stuff in /foo/share/spamassassin and make +- SpamAssassin look for config files in /foo/etc/mail/spamassassin: ++ SpamAssassin look for config files in /foo/etc/spamassassin: + perl Makefile.PL PREFIX=/foo + + LIB: +diff -ur Mail-SpamAssassin-4.0.1.orig/README Mail-SpamAssassin-4.0.1/README +--- Mail-SpamAssassin-4.0.1.orig/README 2024-03-26 05:52:27.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/README 2024-04-22 18:03:02.480038799 +0200 @@ -114,13 +114,13 @@ not modify these, as they are overwritten when you run "sa-update". @@ -135,9 +156,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/README Mail-SpamAssassin-3.4.2/README just a template, which will be copied to a user's home directory for them to change. -diff -ur Mail-SpamAssassin-3.4.2.orig/rules/init.pre Mail-SpamAssassin-3.4.2/rules/init.pre ---- Mail-SpamAssassin-3.4.2.orig/rules/init.pre 2017-03-18 14:05:04.000000000 +0100 -+++ Mail-SpamAssassin-3.4.2/rules/init.pre 2019-01-26 00:09:43.345000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/init.pre Mail-SpamAssassin-4.0.1/rules/init.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/init.pre 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/init.pre 2024-04-22 18:03:02.480038799 +0200 @@ -8,7 +8,7 @@ # already have a file in place called "init.pre". # @@ -147,9 +168,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/rules/init.pre Mail-SpamAssassin-3.4.2/rul # read. Now both "init.pre", "v310.pre", and any other files ending in # ".pre" will be read. As future releases are made, new plugins will be # added to new files, named according to the release they're added in. -diff -ur Mail-SpamAssassin-3.4.2.orig/rules/user_prefs.template Mail-SpamAssassin-3.4.2/rules/user_prefs.template ---- Mail-SpamAssassin-3.4.2.orig/rules/user_prefs.template 2017-03-18 14:05:04.000000000 +0100 -+++ Mail-SpamAssassin-3.4.2/rules/user_prefs.template 2019-01-26 00:07:45.958000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/user_prefs.template Mail-SpamAssassin-4.0.1/rules/user_prefs.template +--- Mail-SpamAssassin-4.0.1.orig/rules/user_prefs.template 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/user_prefs.template 2024-04-22 18:03:02.480038799 +0200 @@ -5,7 +5,7 @@ #* directory. At runtime, if a user has no preferences in their home directory #* already, it will be copied for them, allowing them to perform personalised @@ -159,9 +180,45 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/rules/user_prefs.template Mail-SpamAssassi ########################################################################### # How many points before a mail is considered spam. -diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v310.pre Mail-SpamAssassin-3.4.2/rules/v310.pre ---- Mail-SpamAssassin-3.4.2.orig/rules/v310.pre 2017-03-18 14:05:04.000000000 +0100 -+++ Mail-SpamAssassin-3.4.2/rules/v310.pre 2019-01-26 00:09:51.945000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v310.pre Mail-SpamAssassin-4.0.1/rules/v310.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/v310.pre 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/v310.pre 2024-04-22 18:03:02.480038799 +0200 +@@ -10,7 +10,7 @@ + # if you so wish. + # + # There are now multiple files read to enable plugins in the +-# /etc/mail/spamassassin directory; previously only one, "init.pre" was ++# /etc/spamassassin directory; previously only one, "init.pre" was + # read. Now both "init.pre", "v310.pre", and any other files ending in + # ".pre" will be read. As future releases are made, new plugins will be + # added to new files, named according to the release they're added in. +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v312.pre Mail-SpamAssassin-4.0.1/rules/v312.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/v312.pre 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/v312.pre 2024-04-22 18:03:02.480038799 +0200 +@@ -10,7 +10,7 @@ + # if you so wish. + # + # There are now multiple files read to enable plugins in the +-# /etc/mail/spamassassin directory; previously only one, "init.pre" was ++# /etc/spamassassin directory; previously only one, "init.pre" was + # read. Now both "init.pre", "v310.pre", and any other files ending in + # ".pre" will be read. As future releases are made, new plugins will be + # added to new files, named according to the release they're added in. +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v320.pre Mail-SpamAssassin-4.0.1/rules/v320.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/v320.pre 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/v320.pre 2024-04-22 18:03:02.480038799 +0200 +@@ -10,7 +10,7 @@ + # if you so wish. + # + # There are now multiple files read to enable plugins in the +-# /etc/mail/spamassassin directory; previously only one, "init.pre" was ++# /etc/spamassassin directory; previously only one, "init.pre" was + # read. Now both "init.pre", "v310.pre", and any other files ending in + # ".pre" will be read. As future releases are made, new plugins will be + # added to new files, named according to the release they're added in. +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v330.pre Mail-SpamAssassin-4.0.1/rules/v330.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/v330.pre 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/v330.pre 2024-04-22 18:03:02.556039793 +0200 @@ -10,7 +10,7 @@ # if you so wish. # @@ -171,9 +228,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v310.pre Mail-SpamAssassin-3.4.2/rul # read. Now both "init.pre", "v310.pre", and any other files ending in # ".pre" will be read. As future releases are made, new plugins will be # added to new files, named according to the release they're added in. -diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v312.pre Mail-SpamAssassin-3.4.2/rules/v312.pre ---- Mail-SpamAssassin-3.4.2.orig/rules/v312.pre 2017-03-18 14:05:04.000000000 +0100 -+++ Mail-SpamAssassin-3.4.2/rules/v312.pre 2019-01-26 00:09:47.217000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v340.pre Mail-SpamAssassin-4.0.1/rules/v340.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/v340.pre 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/v340.pre 2024-04-22 18:03:02.556039793 +0200 @@ -10,7 +10,7 @@ # if you so wish. # @@ -183,9 +240,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v312.pre Mail-SpamAssassin-3.4.2/rul # read. Now both "init.pre", "v310.pre", and any other files ending in # ".pre" will be read. As future releases are made, new plugins will be # added to new files, named according to the release they're added in. -diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v320.pre Mail-SpamAssassin-3.4.2/rules/v320.pre ---- Mail-SpamAssassin-3.4.2.orig/rules/v320.pre 2017-03-18 14:05:04.000000000 +0100 -+++ Mail-SpamAssassin-3.4.2/rules/v320.pre 2019-01-26 00:09:36.398000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v341.pre Mail-SpamAssassin-4.0.1/rules/v341.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/v341.pre 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/v341.pre 2024-04-22 18:03:02.556039793 +0200 @@ -10,7 +10,7 @@ # if you so wish. # @@ -195,9 +252,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v320.pre Mail-SpamAssassin-3.4.2/rul # read. Now both "init.pre", "v310.pre", and any other files ending in # ".pre" will be read. As future releases are made, new plugins will be # added to new files, named according to the release they're added in. -diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v330.pre Mail-SpamAssassin-3.4.2/rules/v330.pre ---- Mail-SpamAssassin-3.4.2.orig/rules/v330.pre 2017-03-18 14:05:04.000000000 +0100 -+++ Mail-SpamAssassin-3.4.2/rules/v330.pre 2019-01-26 00:09:49.197000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v342.pre Mail-SpamAssassin-4.0.1/rules/v342.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/v342.pre 2024-03-26 05:52:13.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/v342.pre 2024-04-22 18:03:02.556039793 +0200 @@ -10,7 +10,7 @@ # if you so wish. # @@ -207,9 +264,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v330.pre Mail-SpamAssassin-3.4.2/rul # read. Now both "init.pre", "v310.pre", and any other files ending in # ".pre" will be read. As future releases are made, new plugins will be # added to new files, named according to the release they're added in. -diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v340.pre Mail-SpamAssassin-3.4.2/rules/v340.pre ---- Mail-SpamAssassin-3.4.2.orig/rules/v340.pre 2017-03-18 14:05:04.000000000 +0100 -+++ Mail-SpamAssassin-3.4.2/rules/v340.pre 2019-01-26 00:09:45.297000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v343.pre Mail-SpamAssassin-4.0.1/rules/v343.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/v343.pre 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/v343.pre 2024-04-22 18:04:48.613427568 +0200 @@ -10,7 +10,7 @@ # if you so wish. # @@ -219,9 +276,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v340.pre Mail-SpamAssassin-3.4.2/rul # read. Now both "init.pre", "v310.pre", and any other files ending in # ".pre" will be read. As future releases are made, new plugins will be # added to new files, named according to the release they're added in. -diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v341.pre Mail-SpamAssassin-3.4.2/rules/v341.pre ---- Mail-SpamAssassin-3.4.2.orig/rules/v341.pre 2017-03-18 14:05:04.000000000 +0100 -+++ Mail-SpamAssassin-3.4.2/rules/v341.pre 2019-01-26 00:09:34.297000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v400.pre Mail-SpamAssassin-4.0.1/rules/v400.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/v400.pre 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/v400.pre 2024-04-22 18:04:51.097460068 +0200 @@ -10,7 +10,7 @@ # if you so wish. # @@ -231,9 +288,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v341.pre Mail-SpamAssassin-3.4.2/rul # read. Now both "init.pre", "v310.pre", and any other files ending in # ".pre" will be read. As future releases are made, new plugins will be # added to new files, named according to the release they're added in. -diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v342.pre Mail-SpamAssassin-3.4.2/rules/v342.pre ---- Mail-SpamAssassin-3.4.2.orig/rules/v342.pre 2018-09-01 05:55:41.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/rules/v342.pre 2019-01-26 00:09:38.537000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/rules/v401.pre Mail-SpamAssassin-4.0.1/rules/v401.pre +--- Mail-SpamAssassin-4.0.1.orig/rules/v401.pre 2024-03-26 05:52:15.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/rules/v401.pre 2024-04-22 18:04:46.201396005 +0200 @@ -10,7 +10,7 @@ # if you so wish. # @@ -243,10 +300,10 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/rules/v342.pre Mail-SpamAssassin-3.4.2/rul # read. Now both "init.pre", "v310.pre", and any other files ending in # ".pre" will be read. As future releases are made, new plugins will be # added to new files, named according to the release they're added in. -diff -ur Mail-SpamAssassin-3.4.2.orig/sa-compile.raw Mail-SpamAssassin-3.4.2/sa-compile.raw ---- Mail-SpamAssassin-3.4.2.orig/sa-compile.raw 2018-09-14 03:27:51.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/sa-compile.raw 2019-01-26 00:07:45.959000000 +0100 -@@ -678,7 +678,7 @@ +diff -ur Mail-SpamAssassin-4.0.1.orig/sa-compile.raw Mail-SpamAssassin-4.0.1/sa-compile.raw +--- Mail-SpamAssassin-4.0.1.orig/sa-compile.raw 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/sa-compile.raw 2024-04-22 18:03:02.556039793 +0200 +@@ -679,7 +679,7 @@ -p prefs, --prefspath=file, --prefs-file=file Set user preferences file --siteconfigpath=path Path for site configs @@ -255,7 +312,7 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/sa-compile.raw Mail-SpamAssassin-3.4.2/sa- --updatedir=path Directory to place updates (default: @@LOCAL_STATE_DIR@@/compiled//@@VERSION@@) --cf='config line' Additional line of configuration -@@ -743,7 +743,7 @@ +@@ -744,7 +744,7 @@ =item B<--siteconfigpath>=I Use the specified path for locating site-specific configuration files. Ignore @@ -264,19 +321,19 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/sa-compile.raw Mail-SpamAssassin-3.4.2/sa- =item B<--updatedir> -diff -ur Mail-SpamAssassin-3.4.2.orig/sa-learn.raw Mail-SpamAssassin-3.4.2/sa-learn.raw ---- Mail-SpamAssassin-3.4.2.orig/sa-learn.raw 2018-09-14 03:27:56.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/sa-learn.raw 2019-01-26 00:07:45.959000000 +0100 -@@ -655,7 +655,7 @@ +diff -ur Mail-SpamAssassin-4.0.1.orig/sa-learn.raw Mail-SpamAssassin-4.0.1/sa-learn.raw +--- Mail-SpamAssassin-4.0.1.orig/sa-learn.raw 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/sa-learn.raw 2024-04-22 18:03:02.556039793 +0200 +@@ -661,7 +661,7 @@ -p prefs, --prefspath=file, --prefs-file=file Set user preferences file --siteconfigpath=path Path for site configs - (default: @@PREFIX@@/etc/mail/spamassassin) + (default: @@PREFIX@@/etc/spamassassin) --cf='config line' Additional line of configuration - -D, --debug [area=n,...] Print debugging messages + -D, --debug [area,...] Print debugging messages -V, --version Print version -@@ -815,7 +815,7 @@ +@@ -825,7 +825,7 @@ =item B<--siteconfigpath>=I Use the specified path for locating site-specific configuration files. Ignore @@ -285,10 +342,10 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/sa-learn.raw Mail-SpamAssassin-3.4.2/sa-le =item B<--cf='config line'> -diff -ur Mail-SpamAssassin-3.4.2.orig/spamc/spamc.pod Mail-SpamAssassin-3.4.2/spamc/spamc.pod ---- Mail-SpamAssassin-3.4.2.orig/spamc/spamc.pod 2018-09-14 03:27:52.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/spamc/spamc.pod 2019-01-26 00:07:45.959000000 +0100 -@@ -288,8 +288,8 @@ +diff -ur Mail-SpamAssassin-4.0.1.orig/spamc/spamc.pod Mail-SpamAssassin-4.0.1/spamc/spamc.pod +--- Mail-SpamAssassin-4.0.1.orig/spamc/spamc.pod 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/spamc/spamc.pod 2024-04-22 18:03:02.556039793 +0200 +@@ -310,8 +310,8 @@ If the B<-F> switch is specified, that file will be used. Otherwise, C will attempt to load spamc.conf in C (default: @@ -299,9 +356,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/spamc/spamc.pod Mail-SpamAssassin-3.4.2/sp Example: -diff -ur Mail-SpamAssassin-3.4.2.orig/spamd/README Mail-SpamAssassin-3.4.2/spamd/README ---- Mail-SpamAssassin-3.4.2.orig/spamd/README 2018-09-14 03:27:54.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/spamd/README 2019-01-26 00:07:45.959000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/spamd/README Mail-SpamAssassin-4.0.1/spamd/README +--- Mail-SpamAssassin-4.0.1.orig/spamd/README 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/spamd/README 2024-04-22 18:03:02.556039793 +0200 @@ -105,7 +105,7 @@ If you plan to use Bayesian classification (the BAYES rules) with spamd, you will need to either @@ -311,9 +368,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/spamd/README Mail-SpamAssassin-3.4.2/spamd tokens, by setting the 'bayes_path' setting to a path all users can read and write to. You will also need to set the 'bayes_file_mode' setting to 0666 so that created files are shared, too. -diff -ur Mail-SpamAssassin-3.4.2.orig/spamd/README.vpopmail Mail-SpamAssassin-3.4.2/spamd/README.vpopmail ---- Mail-SpamAssassin-3.4.2.orig/spamd/README.vpopmail 2018-09-14 03:27:54.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/spamd/README.vpopmail 2019-01-26 00:07:45.959000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/spamd/README.vpopmail Mail-SpamAssassin-4.0.1/spamd/README.vpopmail +--- Mail-SpamAssassin-4.0.1.orig/spamd/README.vpopmail 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/spamd/README.vpopmail 2024-04-22 18:03:02.556039793 +0200 @@ -43,7 +43,7 @@ /home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs @@ -323,10 +380,10 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/spamd/README.vpopmail Mail-SpamAssassin-3. future enhancement would be to add the capability to have personal AWL db. 6. Of course vpopmail must have the seekable patch installed (see -diff -ur Mail-SpamAssassin-3.4.2.orig/spamd/spamd.raw Mail-SpamAssassin-3.4.2/spamd/spamd.raw ---- Mail-SpamAssassin-3.4.2.orig/spamd/spamd.raw 2018-09-14 03:27:54.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/spamd/spamd.raw 2019-01-26 00:07:45.959000000 +0100 -@@ -3352,7 +3352,7 @@ +diff -ur Mail-SpamAssassin-4.0.1.orig/spamd/spamd.raw Mail-SpamAssassin-4.0.1/spamd/spamd.raw +--- Mail-SpamAssassin-4.0.1.orig/spamd/spamd.raw 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/spamd/spamd.raw 2024-04-22 18:03:02.556039793 +0200 +@@ -3453,7 +3453,7 @@ =item B<--siteconfigpath>=I Use the specified path for locating site-specific configuration files. Ignore @@ -335,9 +392,21 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/spamd/spamd.raw Mail-SpamAssassin-3.4.2/sp =item B<--cf='config line'> -diff -ur Mail-SpamAssassin-3.4.2.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm Mail-SpamAssassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm ---- Mail-SpamAssassin-3.4.2.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm 2018-09-14 03:27:51.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm 2019-01-26 00:11:08.257000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/spamd/suse-ancient-rc-script.sh Mail-SpamAssassin-4.0.1/spamd/suse-ancient-rc-script.sh +--- Mail-SpamAssassin-4.0.1.orig/spamd/suse-ancient-rc-script.sh 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/spamd/suse-ancient-rc-script.sh 2024-04-22 18:04:56.913536172 +0200 +@@ -285,7 +285,7 @@ + ## Optional: Probe for the necessity of a reload, + ## give out the argument which is required for a reload. + +- test /etc/mail/spamassassin/local.cf -nt $SPAMD_PID && echo force-reload ++ test /etc/spamassassin/local.cf -nt $SPAMD_PID && echo force-reload + ;; + *) + echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" +diff -ur Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm +--- Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Apache2/Config.pm 2024-04-22 18:03:02.556039793 +0200 @@ -519,7 +519,7 @@ SAtimeout 25 SAdebug info @@ -356,9 +425,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/ SANew LOCAL_STATE_DIR "/var/lib" LoadModule ident_module /usr/lib/apache/mod_ident.so -diff -ur Mail-SpamAssassin-3.4.2.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm Mail-SpamAssassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm ---- Mail-SpamAssassin-3.4.2.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm 2018-09-14 03:27:51.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm 2019-01-26 00:11:02.357000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm +--- Mail-SpamAssassin-4.0.1.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/spamd-apache2/lib/Mail/SpamAssassin/Spamd/Config.pm 2024-04-22 18:03:02.560039845 +0200 @@ -67,7 +67,7 @@ # substituted at 'make' time PREFIX => '/usr', @@ -368,9 +437,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/spamd-apache2/lib/Mail/SpamAssassin/Spamd/ LOCAL_STATE_DIR => '/var/lib', ); -diff -ur Mail-SpamAssassin-3.4.2.orig/sql/README Mail-SpamAssassin-3.4.2/sql/README ---- Mail-SpamAssassin-3.4.2.orig/sql/README 2018-09-14 03:27:52.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/sql/README 2019-01-26 00:07:45.959000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/sql/README Mail-SpamAssassin-4.0.1/sql/README +--- Mail-SpamAssassin-4.0.1.orig/sql/README 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/sql/README 2024-04-22 18:03:02.560039845 +0200 @@ -18,7 +18,7 @@ SQL preferences. @@ -380,11 +449,11 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/sql/README Mail-SpamAssassin-3.4.2/sql/REA user_scores_dsn DBI:driver:connection user_scores_sql_username dbusername -diff -ur Mail-SpamAssassin-3.4.2.orig/sql/README.awl Mail-SpamAssassin-3.4.2/sql/README.awl ---- Mail-SpamAssassin-3.4.2.orig/sql/README.awl 2018-09-14 03:27:52.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/sql/README.awl 2019-01-26 00:07:45.960000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/sql/README.awl Mail-SpamAssassin-4.0.1/sql/README.awl +--- Mail-SpamAssassin-4.0.1.orig/sql/README.awl 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/sql/README.awl 2024-04-22 18:03:02.560039845 +0200 @@ -15,7 +15,7 @@ - auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList + auto_welcomelist_factory Mail::SpamAssassin::SQLBasedAddrList SpamAssassin will check the global configuration file (ie. any file -matching /etc/mail/spamassassin/*.cf) for the following settings: @@ -392,9 +461,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/sql/README.awl Mail-SpamAssassin-3.4.2/sql user_awl_dsn DBI:driver:database:hostname[:port] user_awl_sql_username dbusername -diff -ur Mail-SpamAssassin-3.4.2.orig/sql/README.txrep Mail-SpamAssassin-3.4.2/sql/README.txrep ---- Mail-SpamAssassin-3.4.2.orig/sql/README.txrep 2018-09-14 03:27:52.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/sql/README.txrep 2019-01-26 00:10:58.257000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/sql/README.txrep Mail-SpamAssassin-4.0.1/sql/README.txrep +--- Mail-SpamAssassin-4.0.1.orig/sql/README.txrep 2024-03-26 05:52:25.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/sql/README.txrep 2024-04-22 18:03:02.560039845 +0200 @@ -16,7 +16,7 @@ txrep_factory Mail::SpamAssassin::SQLBasedAddrList @@ -404,9 +473,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/sql/README.txrep Mail-SpamAssassin-3.4.2/s user_awl_dsn DBI:driver:database:hostname[:port] user_awl_sql_username dbusername -diff -ur Mail-SpamAssassin-3.4.2.orig/t/data/taintcheckplugin.pm Mail-SpamAssassin-3.4.2/t/data/taintcheckplugin.pm ---- Mail-SpamAssassin-3.4.2.orig/t/data/taintcheckplugin.pm 2018-09-14 03:27:52.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/t/data/taintcheckplugin.pm 2019-01-26 00:10:49.817000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/t/data/taintcheckplugin.pm Mail-SpamAssassin-4.0.1/t/data/taintcheckplugin.pm +--- Mail-SpamAssassin-4.0.1.orig/t/data/taintcheckplugin.pm 2024-03-26 05:52:17.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/t/data/taintcheckplugin.pm 2024-04-22 18:03:02.560039845 +0200 @@ -1,6 +1,6 @@ =head1 taintcheckplugin.pm @@ -415,9 +484,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/t/data/taintcheckplugin.pm Mail-SpamAssass loadplugin myTestPlugin header MY_TEST_PLUGIN eval:check_test_plugin() -diff -ur Mail-SpamAssassin-3.4.2.orig/t/data/testplugin2.pm Mail-SpamAssassin-3.4.2/t/data/testplugin2.pm ---- Mail-SpamAssassin-3.4.2.orig/t/data/testplugin2.pm 2018-09-14 03:27:52.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/t/data/testplugin2.pm 2019-01-26 00:10:52.297000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/t/data/testplugin2.pm Mail-SpamAssassin-4.0.1/t/data/testplugin2.pm +--- Mail-SpamAssassin-4.0.1.orig/t/data/testplugin2.pm 2024-03-26 05:52:17.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/t/data/testplugin2.pm 2024-04-22 18:03:02.560039845 +0200 @@ -1,6 +1,6 @@ =head1 testplugin2.pm @@ -426,9 +495,9 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/t/data/testplugin2.pm Mail-SpamAssassin-3. loadplugin myTestPlugin header MY_TEST_PLUGIN eval:check_test_plugin() -diff -ur Mail-SpamAssassin-3.4.2.orig/t/data/testplugin.pm Mail-SpamAssassin-3.4.2/t/data/testplugin.pm ---- Mail-SpamAssassin-3.4.2.orig/t/data/testplugin.pm 2018-09-14 03:27:52.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/t/data/testplugin.pm 2019-01-26 00:07:45.960000000 +0100 +diff -ur Mail-SpamAssassin-4.0.1.orig/t/data/testplugin.pm Mail-SpamAssassin-4.0.1/t/data/testplugin.pm +--- Mail-SpamAssassin-4.0.1.orig/t/data/testplugin.pm 2024-03-26 05:52:17.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/t/data/testplugin.pm 2024-04-22 18:03:02.560039845 +0200 @@ -1,6 +1,6 @@ =head1 testplugin.pm @@ -437,10 +506,10 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/t/data/testplugin.pm Mail-SpamAssassin-3.4 loadplugin myTestPlugin header MY_TEST_PLUGIN eval:check_test_plugin() -diff -ur Mail-SpamAssassin-3.4.2.orig/t/sa_compile.t Mail-SpamAssassin-3.4.2/t/sa_compile.t ---- Mail-SpamAssassin-3.4.2.orig/t/sa_compile.t 2018-09-14 03:27:53.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/t/sa_compile.t 2019-01-26 00:10:40.537000000 +0100 -@@ -46,7 +46,7 @@ +diff -ur Mail-SpamAssassin-4.0.1.orig/t/sa_compile.t Mail-SpamAssassin-4.0.1/t/sa_compile.t +--- Mail-SpamAssassin-4.0.1.orig/t/sa_compile.t 2024-03-26 05:52:17.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/t/sa_compile.t 2024-04-22 18:03:02.560039845 +0200 +@@ -38,7 +38,7 @@ system_or_die "cd $builddir && mv Mail-SpamAssassin-* x"; &new_instdir("basic"); @@ -449,7 +518,7 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/t/sa_compile.t Mail-SpamAssassin-3.4.2/t/s # we now have an "installed" version we can run sa-compile with. Ensure # sarun() will use it appropriately -@@ -147,7 +147,7 @@ +@@ -174,7 +174,7 @@ #Create the dir for the pre file @@ -458,40 +527,10 @@ diff -ur Mail-SpamAssassin-3.4.2.orig/t/sa_compile.t Mail-SpamAssassin-3.4.2/t/s $dir = dirname($file); mkpath($dir); -diff -ur Mail-SpamAssassin-3.4.2.orig/UPGRADE Mail-SpamAssassin-3.4.2/UPGRADE ---- Mail-SpamAssassin-3.4.2.orig/UPGRADE 2018-09-14 03:27:56.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/UPGRADE 2019-01-26 00:07:45.957000000 +0100 -@@ -253,7 +253,7 @@ - perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc) - - - There are now multiple files read to enable plugins in the -- /etc/mail/spamassassin directory; previously only one, "init.pre" was -+ /etc/spamassassin directory; previously only one, "init.pre" was - read. Now both "init.pre", "v310.pre", and any other files ending - in ".pre" will be read. As future releases are made, new plugins - will be added to new files named according to the release they're -@@ -411,7 +411,7 @@ - - If you are using a UNIX machine with all database files on local disks, - and no sharing of those databases across NFS filesystems, you can use a - more efficient, but non-NFS-safe, locking mechanism. Do this by adding -- the line "lock_method flock" to the /etc/mail/spamassassin/local.cf -+ the line "lock_method flock" to the /etc/spamassassin/local.cf - file. This is strongly recommended if you're not using NFS, as it is - much faster than the NFS-safe locker. - -diff -ur Mail-SpamAssassin-3.4.2.orig/USAGE Mail-SpamAssassin-3.4.2/USAGE ---- Mail-SpamAssassin-3.4.2.orig/USAGE 2018-09-14 03:27:55.000000000 +0200 -+++ Mail-SpamAssassin-3.4.2/USAGE 2019-01-26 00:07:45.957000000 +0100 -@@ -117,7 +117,7 @@ - CPU-intensive task before they can send mail to you, so we give that - some bonus points. However, it requires that you list what addresses - you expect to receive mail for, by adding 'hashcash_accept' lines to -- your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf -+ your ~/.spamassassin/user_prefs or /etc/spamassassin/local.cf - files. See the Mail::SpamAssassin::Plugin::Hashcash manual page for - details on how to specify these. - -@@ -129,14 +129,14 @@ +diff -ur Mail-SpamAssassin-4.0.1.orig/USAGE Mail-SpamAssassin-4.0.1/USAGE +--- Mail-SpamAssassin-4.0.1.orig/USAGE 2024-03-26 05:52:27.000000000 +0100 ++++ Mail-SpamAssassin-4.0.1/USAGE 2024-04-22 18:03:02.560039845 +0200 +@@ -120,14 +120,14 @@ - You can create your own system-wide rules files in diff --git a/spamassassin.spec b/spamassassin.spec index e91d45c..4407fbd 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -11,12 +11,12 @@ Summary: A spam filter for email which can be invoked from mail delivery agents Summary(pl.UTF-8): Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA) Name: spamassassin -Version: 3.4.4 +Version: 4.0.1 Release: 1 License: Apache v2.0 Group: Applications/Mail -Source0: http://ftp.man.poznan.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2 -# Source0-md5: ce51fe5665d5838c56db6712846b58bb +Source0: https://dlcdn.apache.org//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2 +# Source0-md5: b42eaf00f2f5a013813ae051ab2c63b6 Source1: %{name}.sysconfig Source2: %{name}-spamd.init Source3: %{name}-default.rc @@ -24,8 +24,7 @@ Source4: %{name}-spamc.rc Source5: sa-update.sh Source6: sa-update.cron Source7: spamassassin-official.conf -Patch0: bug_771408_perl_version -Patch1: config-dir.patch +Patch0: config-dir.patch URL: http://spamassassin.apache.org/ BuildRequires: openssl-devel >= 0.9.7d BuildRequires: perl(ExtUtils::MakeMaker) >= 6.16 @@ -33,6 +32,7 @@ BuildRequires: perl-Archive-Tar BuildRequires: perl-DBI BuildRequires: perl-DB_File BuildRequires: perl-Digest-SHA1 >= 2.10 +BuildRequires: perl-Geo-IP BuildRequires: perl-HTML-Parser >= 3 BuildRequires: perl-IO-Socket-INET6 >= 2.51 BuildRequires: perl-IO-Socket-SSL @@ -41,8 +41,13 @@ BuildRequires: perl-IP-Country BuildRequires: perl-Mail-SPF-Query BuildRequires: perl-Net-DNS >= 0.65-3 BuildRequires: perl-Net-Ident +BuildRequires: perl-Net-LibIDN +BuildRequires: perl-Net-LibIDN2 +BuildRequires: perl-Net-Patricia BuildRequires: perl-NetAddr-IP >= 4.000 +BuildRequires: perl-Perl-Critic-Policy-Perlsecret #BuildRequires: perl-Razor2 +BuildRequires: perl-Text-Diff BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: perl-libwww BuildRequires: re2c @@ -59,6 +64,7 @@ BuildRequires: perl-Mail-DomainKeys BuildRequires: perl-Mail-SPF BuildRequires: perl-MailTools BuildRequires: perl-Razor > 2.61 +BuildRequires: tesseract-data-lang-en %endif Requires: perl-Mail-SpamAssassin = %{version}-%{release} Obsoletes: SpamAssassin @@ -111,9 +117,9 @@ Requires(post,preun): /sbin/chkconfig Requires: perl-Mail-SpamAssassin = %{version}-%{release} Requires: rc-scripts Suggests: perl-Apache-Test +Suggests: perl-IO-Socket-INET6 Suggests: perl-IO-Socket-IP Suggests: perl-IO-Socket-SSL -Suggests: perl-IO-Socket-INET6 Suggests: perl-Net-Ident %description spamd @@ -173,9 +179,9 @@ Group: Applications/Mail Requires: gcc Requires: glibc-devel Requires: make -Requires: perl(ExtUtils::MakeMaker) Requires: perl-Mail-SpamAssassin = %{version}-%{release} Requires: perl-devel +Requires: perl-devel Requires: re2c >= 0.10 %description compile @@ -261,17 +267,6 @@ aplikacji do czytania poczty. %prep %setup -q -n %{pdir}-%{pnam}-%{version} %patch0 -p1 -%patch1 -p1 - -# disable broken test -%{__mv} t/sa_compile.t{,.disabled} - -# this test needs network, does not work on builders -%{__mv} t/dnsbl_subtests.t{,.disabled} - -# temporary disable problematic tests -%{__mv} t/trust_path.t{,.disabled} -%{__mv} t/urilocalbl_geoip.t{,.disabled} %build # for spamc/configure @@ -387,6 +382,7 @@ fi # It's needed for help of spamassassin command. %{perl_vendorlib}/spamassassin-run.pod +%{_mandir}/man1/sa-check_spamd.1* %{_mandir}/man1/sa-learn.1* %{_mandir}/man1/spamassassin.1* %{_mandir}/man1/spamassassin-run.1* -- 2.46.0