Accepting request 1239052 from devel:languages:perl

- drop iXHash plugin (last provider stopped operation)
  * remove iXhash2-4.00.tar.gz
  * remove iXhash2-meta-rules.patch

OBS-URL: https://build.opensuse.org/request/show/1239052
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/spamassassin?expand=0&rev=93

Mail-SpamAssassin-3.4.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc4875f3e4bb5979f0c10283213a512c4c9646220ae0132a78c8e3af94789610
-size 6166807

Mail-SpamAssassin-3.4.6.tar.bz2.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIVAwUAYHAQ1P3lL0D305gUAQqzQxAAin7EQj+5CzIlasxABJBl6LpcMZQRReXv
-w38sJqe2uMHNvzKdwxA8ncYYj77InyuU/T0T0J+E4UJ3UMGMFD7aTivQm6c08QyG
-iF1BR72YnNxRJ+Bw8pWHl1BRa35Xk4Y16wDW3U6OD0RC6KDnQ7UjcX1dLGNDZ5Jt
-9RgEHyIyu1a/iEY2MXb/v6XxVItrBjw9SHzSbOme2JB/RC8raAqtFIjC/CEQD0L8
-Ld1y+hIre7D4t20nJYzju3JwvuHKkFmDAaoMiSKUFDm4Okeq3ih/any9tAd/hEld
-RYIu9w3dZFVx4OoD+SJYJlHNhfziIbbXgpyuoAUSVMXmLbgz5MQn7vaiTeYXyxgZ
-IBG0M5lZnXDcrH0hrDijRuTExcwbPRNRoOQ2ii7KesJ67JxUjvUMGrIEt1DM9Foh
-TWeKQV9cYlzg3dXM5QPR2smmPf84KYIrGUJ4WULHCmOGjuN6S0zcmHiiWYWNl2Ev
-w9B1Xg6jWqDtiFV99Hsd9ZP2bz+Jc8gKodsw1LuF6bI2RFZQP2pb7ZrmBpw9aG4e
-ptTig5yFLxxN8Xw2joVcDN63QFk6L7lsHT6kN2oRslwuiwD7EaxF9bW94EJDjQ5q
-ARN1zWEdLsIjNVLW+61K8fCb4lm0f5lsryHz+F3wpGf8JMdRsuiV9KdEoCayZoX9
-wJfn3/67OXE=
-=gWSm
------END PGP SIGNATURE-----

Mail-SpamAssassin-4.0.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9775ed7559e83ec3e6c03edb2be8ffc7f15cc405fb13e85c148eb0bf191721a8
+size 6379932

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-----

Mail-SpamAssassin-rules-3.4.6.r1888502.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1efcdc57e6b100735855e24ee8391b0857327d70e1e1d2c2757d5f66e8a1ce6
-size 369768

Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmBvxTwACgkQbFU5eCT0
-NM7PQA//V+Xkx0ay33lnvei2E6K42Yu9AyNZI9QrZLwyQyQAbdgAmLboCCUnOs4X
-4snWkBJfJAeAAXFq3boCWLvQRKjSlVTu0IgQHg8oRGUndKP5r0E8pwws3/y7GWKG
-ymdbStL81Mg9GX8/Dkka1jyAGINcgBwvrDVwLAMyeuW5zCotK2gKw7Yj1S3/eS94
-5xYoOrhKZPPoXwgOUIiKMhFmtLPbNKMaHUhQAi+VQ79BNPIPsCkHDAkQ2IBZVRVi
-LgL5R9V2EfYXlq5aOVxlSXN6aaRR2swTNqDZ2Yk5XKyVKN6sUbNv+ZGb+22+38Az
-XsNsYNU3kgFIf5c+O2B1dUzv/lkXgcZSN8JhmPXLy8n8lrz/k/wiwYtP+Qg9Tbhn
-weVlegXhadK/p23mQiucI+J/5LfNhTYB/nMKojIpchibHWXvt5LOAkwncHakPTTT
-y32XyvJQKKJnT8zB8AM0O3lOHCfSdBj8Hs+fHIooWAjuFAJbWPWk39WGzkuzDYTr
-352Wk6SLwKni1oclJO/ds+nzqiqTbi/mxweqiLWkQozitTsVJzBzJHPdHuofxKBE
-bsO/P79d7zygZVKR0ugQhYtnU+6IfoGggQ9o8TdyiMnobuxVf2cuQFYk/bmWV6bO
-LlR3zMmQLNXMVNk1slsqxHSfIsBIja8HpHFjRZuwm3nTm8lyX7o=
-=O25N
------END PGP SIGNATURE-----

Mail-SpamAssassin-rules-4.0.1.r1916528.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:381eadfc7e513e5f735389b78173de5af471f3d06fe6ab8f129634a6644b4bf4
+size 362781

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-----

basic-lint-without-sandbox.patch

@@ -1,7 +1,8 @@
-diff -purN a/t/basic_lint_without_sandbox.t b/t/basic_lint_without_sandbox.t
---- a/t/basic_lint_without_sandbox.t	2020-01-25 03:51:14.000000000 +0100
-+++ b/t/basic_lint_without_sandbox.t	2020-11-10 22:58:02.294809138 +0100
-@@ -25,7 +25,7 @@ my $sandboxfile = "log/test_rules_copy/7
+Index: Mail-SpamAssassin-4.0.0/t/basic_lint_without_sandbox.t
+===================================================================
+--- Mail-SpamAssassin-4.0.0.orig/t/basic_lint_without_sandbox.t
++++ Mail-SpamAssassin-4.0.0/t/basic_lint_without_sandbox.t
+@@ -23,7 +23,7 @@ my $sandboxfile = "$localrules/70_sandbo
  # so we can use that to tell if this is the case
  SKIP: {
      skip( "Not on a sandbox", 2 ) unless -f $scoresfile;

bnc#582111.diff

@@ -1,10 +1,12 @@
---- spamd/spamd.raw.orig	2010-06-24 11:28:10.047109188 +0200
-+++ spamd/spamd.raw	2010-06-24 11:28:57.942234270 +0200
-@@ -174,6 +174,7 @@
+Index: spamd/spamd.raw
+===================================================================
+--- spamd/spamd.raw.orig
++++ spamd/spamd.raw
+@@ -339,6 +339,7 @@ sub print_usage_and_exit {
  
  # defaults
  my %opt = (
 +  'syslog-socket' => 'unix',	
    'user-config'   => 1,
-   'ident-timeout' => 5.0,
    # scaling settings; some of these aren't actually settable via cmdline
+   'server-scale-period' => 2,   # how often to scale the # of kids, secs

iXhash2-2.05.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8d51fe8661bf407433db6c0fa12e3c6c66a1cd626751f51b170990089dc966a8
-size 7871

iXhash2-meta-rules.patch

@@ -1,56 +0,0 @@
-diff -ur iXhash2-2.05.orig/iXhash2.cf iXhash2-2.05/iXhash2.cf
---- iXhash2-2.05.orig/iXhash2.cf	2012-07-08 13:29:31.000000000 +0200
-+++ iXhash2-2.05/iXhash2.cf	2012-09-26 13:41:11.874466944 +0200
-@@ -1,20 +1,40 @@
- 
- # Note: loadplugin should really go into local.pre or so
--loadplugin Mail::SpamAssassin::Plugin::iXhash2 iXhash2.pm
-+loadplugin Mail::SpamAssassin::Plugin::iXhash2 
- 
- ifplugin Mail::SpamAssassin::Plugin::iXhash2
- 
--ixhashdnsbl	GENERIC_IXHASH  generic.ixhash.net.
--body		GENERIC_IXHASH  eval:check_ixhash('GENERIC_IXHASH')
--tflags		GENERIC_IXHASH  net
--
--ixhashdnsbl	NIXSPAM_IXHASH  ix.dnsbl.manitu.net.
--body		NIXSPAM_IXHASH  eval:check_ixhash('NIXSPAM_IXHASH')
--tflags		NIXSPAM_IXHASH  net
--
--ixhashdnsbl	SEM_IXHASH  ixhash.spameatingmonkey.net.
--body		SEM_IXHASH  eval:check_ixhash('SEM_IXHASH')
--tflags		SEM_IXHASH  net
-+ixhashdnsbl	__GENERIC_IXHASH  generic.ixhash.net.
-+body		   __GENERIC_IXHASH  eval:check_ixhash('GENERIC_IXHASH')
-+tflags		__GENERIC_IXHASH  net
-+
-+ixhashdnsbl	__NIXSPAM_IXHASH  ix.dnsbl.manitu.net.
-+body		   __NIXSPAM_IXHASH  eval:check_ixhash('NIXSPAM_IXHASH')
-+tflags		__NIXSPAM_IXHASH  net
-+
-+ixhashdnsbl	__SEM_IXHASH  ixhash.spameatingmonkey.net.
-+body		   __SEM_IXHASH  eval:check_ixhash('SEM_IXHASH')
-+tflags		__SEM_IXHASH  net
-+
-+ixhashdnsbl __HOSTEUROPE_IXHASH  hosteurope.ixhash.net.
-+body        __HOSTEUROPE_IXHASH  eval:check_ixhash('HOSTEUROPE_IXHASH')
-+tflags      __HOSTEUROPE_IXHASH  net
-+
-+ixhashdnsbl __JUNKMAIL_IXHASH  ixhash.junkemailfilter.com.
-+body        __JUNKMAIL_IXHASH  eval:check_ixhash('JUNKMAIL_IXHASH')
-+tflags      __JUNKMAIL_IXHASH  net
-+
-+meta            IXHASH_X1       (__GENERIC_IXHASH + __NIXSPAM_IXHASH + __SEM_IXHASH + __HOSTEUROPE_IXHASH + __JUNKMAIL_IXHASH) == 1
-+describe        IXHASH_X1       iXhash listed on one server
-+score           IXHASH_X1       1.5
-+
-+meta            IXHASH_X2       (__GENERIC_IXHASH + __NIXSPAM_IXHASH + __SEM_IXHASH + __HOSTEUROPE_IXHASH + __JUNKMAIL_IXHASH) == 2
-+describe        IXHASH_X2       iXhash listed on two servers
-+score           IXHASH_X2       2.5
-+
-+meta            IXHASH_X3       (__GENERIC_IXHASH + __NIXSPAM_IXHASH + __SEM_IXHASH + __HOSTEUROPE_IXHASH + __JUNKMAIL_IXHASH) > 2
-+describe        IXHASH_X3       iXhash listed on more than two servers
-+score           IXHASH_X3       3.5
- 
- endif
- 

patch-PgSQL

@@ -1,6 +1,8 @@
---- lib/Mail/SpamAssassin/BayesStore/PgSQL.pm	2010-01-21 13:14:34.000000000 +0100
-+++ lib/Mail/SpamAssassin/BayesStore/PgSQL.pm	2010-03-17 08:44:19.000000000 +0100
-@@ -941,7 +941,7 @@
+Index: lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
+===================================================================
+--- lib/Mail/SpamAssassin/BayesStore/PgSQL.pm.orig
++++ lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
+@@ -987,7 +987,7 @@ sub _put_token {
    }
  
    my $escaped_token = _quote_bytea($token);
@@ -9,7 +11,7 @@
  
    unless (defined($sth)) {
      dbg("bayes: _put_token: SQL error: ".$self->{_dbh}->errstr());
-@@ -1004,7 +1004,7 @@
+@@ -1050,7 +1050,7 @@ sub _put_tokens {
  
    my $tokenarray = join(",", map { '"' . _quote_bytea($_) . '"' } sort keys %{$tokens});
  

patch-SQL_ASCII_SORT

@@ -1,20 +0,0 @@
---- lib/Mail/SpamAssassin/Conf/SQL.pm	2006-09-29 15:06:39.000000000 +0200
-+++ lib/Mail/SpamAssassin/Conf/SQL.pm 	2007-02-09 16:48:42.000000000 +0100
-@@ -139,9 +139,14 @@
-        $sql =~ s/_DOMAIN_/$quoted_domain/g;
-      }
-      else {
--       $sql = "select $f_preference, $f_value  from $f_table where ". 
--        "$f_username = ".$dbh->quote($username).
--        " or $f_username = '\@GLOBAL' order by $f_username asc";
-+       $sql = "select $f_preference, $f_value, ascii(username) as user_asci from $f_table where ".
-+       "$f_username = ".$dbh->quote($username).
-+       " or $f_username = '\@GLOBAL' order by user_asci asc";
-+       # changed by varkoly@novell.com on 09.02.2007 suggested by 
-+       # Charles Camello <charles@integrasul.inf.br>
-+       #$sql = "select $f_preference, $f_value  from $f_table where ". 
-+       #"$f_username = ".$dbh->quote($username).
-+       #" or $f_username = '\@GLOBAL' order by $f_username asc";
-      }
-      dbg("config: Conf::SQL: executing SQL: $sql");
-      my $sth = $dbh->prepare($sql);

patch-URIDNSBL

@@ -1,10 +1,10 @@
-diff -ur Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Mail-SpamAssassin-3.4.0_fix/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
---- Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2014-02-07 09:36:27.000000000 +0100
-+++ Mail-SpamAssassin-3.4.0_fix/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2014-02-13 17:24:09.259369721 +0100
-@@ -416,6 +416,8 @@
-   while (my($uri, $info) = each %{$uris}) {
-     # we want to skip mailto: uris
-     next if ($uri =~ /^mailto:/i);
+diff -ur Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Mail-SpamAssassin-4.0.1_fix/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
+--- Mail-SpamAssassin-4.0.1/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2024-03-26 05:52:09.000000000 +0100
++++ Mail-SpamAssassin-4.0.1_fix/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	2024-04-09 15:42:31.054588924 +0200
+@@ -430,6 +430,8 @@
+     if ($conf->{uridnsbl_skip_mailto}) {
+       next if ($uri =~ /^mailto:/i);
+     }
 +    # we want to skip so-files, they are not url's
 +    next if ($uri =~ /\.so$/);
  

spamassassin-rpmlintrc

@@ -1,3 +1,2 @@
-addFilter("no-dependency-on perl-base")
 addFilter("systemd-service-without-service_.* sa-update.service")
-addFilter("suse-missing-rclink sa-update")
+addFilter("spamassassin.* no-binary")

spamassassin.changes

@@ -1,3 +1,123 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:29:51 UTC 2025 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- drop iXHash plugin (last provider stopped operation)
+  * remove iXhash2-4.00.tar.gz
+  * remove iXhash2-meta-rules.patch
+
+-------------------------------------------------------------------
+Wed Apr 10 08:25:53 UTC 2024 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- fix iXhash2-meta-rules.patch
+
+-------------------------------------------------------------------
+Tue Apr  9 13:31:41 UTC 2024 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- update to patch release version 4.0.1
+  - Incompatibilities with some versions of perl and some perl modules
+    that have been released since the release of SpamAssassin 4.0.0
+  - Problems using cpan to install SpamAssassin when certain required
+    or optional modules are not already installed
+  - Support for space characters in the path name of some executables
+    used by certain plugins
+  - Improved handling of URL shortener link redirects
+  - Improved TxRep locking management
+  - Added Mail::SpamAssassin::Plugin::AuthRes plugin to use
+    Authentication-Results header fields in other plugins
+  - Added a Pyzor Perl implementation
+  - Perl crash when certain uri_detail rules processed some messages
+    with UTF-8 characters
+  - Inconsistent handling of newlines in header rules
+  - Text or HTML content placed in octet-stream attachments by
+    spammers to bypass SpamAssassin scanning
+  - Implemented TCP fallback for truncated DNS UDP replies
+- Refresh patch-URIDNSBL
+- Drop undocumented patch-SQL_ASCII_SORT breaking sqlite
+- Drop most of iXhash2-meta-rules.patch (additional services no longer exist)
+
+-------------------------------------------------------------------
+Mon Feb 26 13:33:28 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Tue Jan  2 21:58:50 UTC 2024 - Pedro Monreal <pmonreal@suse.com>
+
+- Remove the dependency on perl(IO::Socket::INET6) as it has been
+  deprecated by upstream, is no longer suitable for use and its not
+  being maintained. A compatible replacement for this package is
+  perl(IO::Socket::IP) which is shipped by the perl-base package.
+
+-------------------------------------------------------------------
+Sat Dec 24 18:01:29 UTC 2022 - Arjen de Korte <suse+build@de-korte.org>
+
+- Add BuildRequires Text::Diff that was accidentally removed from
+  original submission
+- Update known warnings
+  % spamassassin-rpmlintrc
+
+-------------------------------------------------------------------
+Thu Dec 22 10:08:30 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to spamassissin 4.0.0:
+  * Notable internal changes:
+    - Meta rules no longer use priority values, they are evaluated
+      dynamically when the rules they depend on are finished
+    - DNS and other asynchronous lookups like DCC or Razor2 plugins
+      are now launched when priority -100 is reached. This allows
+      short circuiting at lower priority without sending unneeded
+      DNS queries
+    - New internal Mail::SpamAssassin::GeoDB module supporting
+      RelayCountry and URILocalBL plugins provides a unified
+      interface to Geographic IP modules. These include:
+        MaxMind::DB::Reader (GeoIP2)
+        Geo::IP
+        IP::Country::DB_File
+        IP::Country::Fast.
+  * New plugins:
+    - Mail::SpamAssassin::Plugin::ExtractText
+    - Mail::SpamAssassin::Plugin::DMARC
+    - Mail::SpamAssassin::Plugin::DecodeShortURLs
+  * HashCash module has been removed completely
+  * Full detailed changelog:
+    https://svn.apache.org/repos/asf/spamassassin/trunk/Changes
+- Update to iXhash2 4.00:
+  * Minimum required version: SpamAssassin 4.0.0
+- Update to spampd 2.61:
+  * Performance and diagnostic improvements, quicker startups, and
+    a lot of documentation updates.
+  * Add support for configuration files (examples included in /misc
+    folder and in POD).
+  * Add optional "scalable mode" using Net::Server::PreFork module
+    (16-year TODO!). More info in POD.
+  * Add --logfile option to control logging destination(s) (syslog,
+    stderr, and/or file/device).
+  * Add --logident, --logfacility options for syslog.
+  * Add multiple levels of help, including full "man" output with
+    optional HTML formatting.
+  * Add --show <thing> argument for printing default option values
+    and other debug.
+  * Fix SpamAssassin debug logging with versions 3.1+ (output
+    was going to stderr/wrong syslog/null).
+  * Fix for IPv6 addresses being used on --host and --relayhost
+    options (was not possible due to ":<port>" check).
+  * SIGHUP will now reload SpamAssassin and SpamPD configuration files
+    (and all module code), still with graceful child process shutdown.
+  * Use SpamAssassin::Logger module (with SA 3.1+) for all logging.
+  * Log to stderr by default if running non-daemonized
+  * Child processes are now renamed to "spampd child"
+    to distinguish them from the parent in task lists.
+  * Now requires Net::Server v0.89+ (though latest 2.009 is recommended).
+  * The --auto-whitelist option is no longer allowed with SpamAssassin v3+.
+  * Improve --debug option, adding ability to specify
+    SpamAssassin (v3.1+) debug areas (aka channels/facilities).
+  * All boolean options can take 0/1 argument and be negated
+    with "no-" prefix.
+  * The --children (-c) option is now more formally named
+    --max-servers (-mxs), but still accepted.
+  * IO::Socket::UNIX and ::IP are only required if actually
+    needed for --relaysocket / --relayhost options.
+
 -------------------------------------------------------------------
 Wed Jan 19 15:39:37 UTC 2022 - Johannes Segitz <jsegitz@suse.com>
 

spamassassin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package spamassassin
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,12 @@
 
 %bcond_without test
 
-%define ix_version 2.05
-%define spd_version 2.53
-%define sa_version 3.4.6
+%define spd_version 2.61
+%define sa_version 4.0.1
 %define sa_float %(echo %{sa_version} | awk -F. '{ printf "%d.%03d%03d", $1, $2, $3 }')
 %define perl_float %(echo %{perl_version} | awk -F. '{ printf "%d.%03d", $1, $2 }')
-%define rules_revision 1888502
+%define rules_revision 1916528
 
-%define IXHASH iXhash2-%{ix_version}
 %define SPAMPD spampd-%{spd_version}
 
 Name:           spamassassin
@@ -37,7 +35,6 @@ Group:          Productivity/Networking/Email/Utilities
 URL:            https://spamassassin.apache.org/
 Source0:        https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-%{sa_version}.tar.bz2
 Source1:        https://downloads.apache.org/spamassassin/source/Mail-SpamAssassin-rules-%{sa_version}.r%{rules_revision}.tgz
-Source2:        https://mailfud.org/iXhash2/%{IXHASH}.tar.gz
 Source3:        https://github.com/mpaperno/spampd/archive/%{spd_version}.tar.gz#/%{SPAMPD}.tar.gz
 Source10:       local.cf
 Source11:       README.SUSE
@@ -55,11 +52,8 @@ Source102:      spamassassin.keyring
 Source103:      %{name}-rpmlintrc
 Patch1:         patch-PgSQL
 Patch2:         patch-URIDNSBL
-Patch3:         patch-SQL_ASCII_SORT
 Patch6:         bnc#582111.diff
 Patch7:         basic-lint-without-sandbox.patch
-Patch10:        iXhash2-meta-rules.patch
-BuildRequires:  perl(Error)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)
 # optional, but want them for build (test)
@@ -114,7 +108,7 @@ BuildRequires:  perl(HTML::Parser) >= 3.43
 BuildRequires:  perl(IO::Zlib) >= 1.04
 BuildRequires:  perl(MIME::Base64)
 BuildRequires:  perl(Mail::DKIM) >= 0.37
-BuildRequires:  perl(Net::DNS) >= 0.58
+BuildRequires:  perl(Net::DNS) >= 0.69
 BuildRequires:  perl(Net::SMTP)
 BuildRequires:  perl(NetAddr::IP) >= 4.010
 BuildRequires:  perl(Pod::Usage) >= 1.10
@@ -122,15 +116,22 @@ BuildRequires:  perl(Sys::Hostname)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Time::HiRes)
 BuildRequires:  perl(Time::Local)
+# required for tests
+BuildRequires:  perl(Devel::Cycle)
+#BuildRequires:  perl(Perl::Critic::Policy::Perlsecret)
+BuildRequires:  perl(Perl::Critic::Policy::TestingAndDebugging::ProhibitNoStrict)
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Text::Diff)
 # optional, but want them for build (test)
 BuildRequires:  perl(Archive::Zip)
 BuildRequires:  perl(BSD::Resource)
-BuildRequires:  perl(DBD::mysql)
+BuildRequires:  perl(DBD::SQLite)
 BuildRequires:  perl(DBI)
 BuildRequires:  perl(Devel::Cycle)
-BuildRequires:  perl(Encode::Detect)
+BuildRequires:  perl(Email::Address::XS)
+BuildRequires:  perl(Encode::Detect::Detector)
 BuildRequires:  perl(HTTP::Date)
-BuildRequires:  perl(IO::Socket::INET6)
+BuildRequires:  perl(IO::Socket::IP)
 BuildRequires:  perl(IO::Socket::SSL) >= 1.76
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(IP::Country::Fast)
@@ -138,6 +139,7 @@ BuildRequires:  perl(LWP::UserAgent)
 BuildRequires:  perl(Mail::SPF) >= 2.001
 BuildRequires:  perl(Net::CIDR::Lite)
 BuildRequires:  perl(Net::Ident)
+BuildRequires:  perl(Net::LibIDN)
 BuildRequires:  perl(Net::Patricia) >= 1.16
 BuildRequires:  perl(Razor2::Client::Agent) >= 2.61
 #
@@ -148,7 +150,7 @@ Requires:       perl(File::Copy) >= 2.02
 Requires:       perl(File::Spec) >= 0.8
 Requires:       perl(HTML::Parser) >= 3.43
 Requires:       perl(Mail::DKIM) >= 0.31
-Requires:       perl(Net::DNS) >= 0.34
+Requires:       perl(Net::DNS) >= 0.69
 Requires:       perl(NetAddr::IP) >= 4.010
 Requires:       perl(Pod::Usage) >= 1.10
 Requires:       perl(Sys::Hostname)
@@ -158,10 +160,11 @@ Recommends:     perl(Archive::Tar) >= 1.23
 Recommends:     perl(BSD::Resource)
 Recommends:     perl(Compress::Zlib)
 Recommends:     perl(DB_File)
-Recommends:     perl(Encode::Detect)
+Recommends:     perl(Email::Address::XS)
+Recommends:     perl(Encode::Detect::Detector)
 Recommends:     perl(Getopt::Long) >= 2.32
 Recommends:     perl(HTTP::Date)
-Recommends:     perl(IO::Socket::INET6)
+Recommends:     perl(IO::Socket::IP)
 Recommends:     perl(IO::Socket::SSL) >= 1.76
 Recommends:     perl(IO::String)
 Recommends:     perl(IO::Zlib) >= 1.04
@@ -173,6 +176,7 @@ Recommends:     perl(Mail::SPF) >= 2.001
 Recommends:     perl(Net::CIDR::Lite)
 Recommends:     perl(Net::DNS) >= 0.58
 Recommends:     perl(Net::Ident)
+Recommends:     perl(Net::LibIDN)
 Recommends:     perl(Net::Patricia) >= 1.16
 Recommends:     perl(Net::SMTP)
 Recommends:     perl(Razor2::Client::Agent) >= 2.61
@@ -191,36 +195,13 @@ This package contains the perl modules for the spamassassin, including
 the filter rules. This package is required for the package
 "spamassassin", the commandline tool.
 
-%package -n perl-Mail-SpamAssassin-Plugin-iXhash2
-Version:        %{ix_version}
-Release:        0
-Summary:        The iXhash plugin for SpamAssassin
-Group:          Development/Libraries/Perl
-Requires:       perl(Digest::MD5)
-Requires:       perl(Mail::SpamAssassin) = %{sa_float}
-Provides:       perl-Mail-SpamAssassin-Plugin-iXhash = %{ix_version}
-Obsoletes:      perl-Mail-SpamAssassin-Plugin-iXhash < %{ix_version}
-BuildArch:      noarch
-%{perl_requires}
-
-%description -n perl-Mail-SpamAssassin-Plugin-iXhash2
-This archive contains the iXhash2 plugin for the SpamAssassin spam filtering
-software, along with an example config file.
-
-Basically the plugin provides a network-based test just as razor2, pyzor
-and DCC do. Working solely on the body of an email, it removes parts of it
-and computes a hash value from the rest. These values will then be looked up
-via DNS using the domains given in the config file(s).
-
 %prep
-%setup -q -n Mail-SpamAssassin-%{sa_version} -a 2 -a 3
+%setup -q -n Mail-SpamAssassin-%{sa_version} -a 3
 tar -zxf %{SOURCE1} -C rules
-%patch1
-%patch2 -p1
-%patch3
-%patch6
-%patch7 -p1
-%patch10
+%patch -P 1
+%patch -P 2 -p1
+%patch -P 6
+%patch -P 7 -p1
 cp %{SOURCE11} ./
 
 %build
@@ -253,15 +234,11 @@ sed -i -e "/\/usr\/bin/d" %{name}.files
 # package only %%{_mandir}/man3
 sed -i -e "s,%{_mandir}/man?,%{_mandir}/man3," %{name}.files
 #
-## perl-Mail-SpamAssassin-Plugin-iXhash2 stuff
-install -d %{buildroot}%{_sysconfdir}/mail/spamassassin
-cp %{IXHASH}/iXhash2.pm %{buildroot}%{perl_vendorlib}/Mail/SpamAssassin/Plugin
-cp %{IXHASH}/iXhash2.cf %{buildroot}%{_sysconfdir}/mail/spamassassin/iXhash2.cf
-#
 ## spamassassin stuff
 install -D -m0755 %{SPAMPD}/spampd.pl %{buildroot}%{_sbindir}/spampd
 install -m 0755 %{SOURCE15} %{buildroot}%{_sbindir}/
 mv %{buildroot}%{_bindir}/spamd %{buildroot}%{_sbindir}/
+install -d %{buildroot}%{_sysconfdir}/mail/spamassassin
 install -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/mail/spamassassin/local.cf
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspamd
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcspampd
@@ -346,15 +323,8 @@ fi
 %doc ldap sql
 %dir %{_sysconfdir}/mail
 %config(noreplace) %{_sysconfdir}/mail/spamassassin
-%exclude %{_sysconfdir}/mail/spamassassin/iXhash2.cf
 %exclude %{perl_vendorarch}
 %dir %{_datadir}/spamassassin
 %{_datadir}/spamassassin/*
 
-%files -n perl-Mail-SpamAssassin-Plugin-iXhash2
-%license %{IXHASH}/LICENSE
-%doc %{IXHASH}/CHANGELOG %{IXHASH}/README
-%config(noreplace) %{_sysconfdir}/mail/spamassassin/iXhash2.cf
-%{perl_vendorlib}/Mail/SpamAssassin/Plugin/iXhash2.pm
-
 %changelog

spampd-2.53.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58f37e61bac99a0423605c7db23cf8d1e4389681fe50d7e37ce2e31d46e27a88
-size 217945

spampd-2.61.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91e60f10745ea4f9c27b9e57619a1bf246ab9a88ea1b88c4f39f8af607e2dbae
+size 246956