Update spamassassin to version 4.0.2 and spampd to version 2.62

- 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-4.0.1.tar.bz2

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

Mail-SpamAssassin-4.0.1.tar.bz2.asc

@@ -1,16 +0,0 @@
------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-4.0.2.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2Ambx54X1+Sbwh4x/eUvQPfTmBQFAmivBcwACgkQ/eUvQPfT
+mBRjtQ//Q5J04g8hzaNc/JeUdQRI85eYsgl5cT2qNhsgoAhGHu3l378Z+Qx7jmve
+ZelOB4g/1QCpTqRfDxlCdQbux07DQcr1lniP2boYwp3IeqNtBplvXNNIatpcLnWJ
+dvmn5FIb8ym1og+6o+emsenEUWHbdHY68YL62+7hjv9ibELh8RDpNjF2ojr0Gmg3
+tOEtI5lkySHBgcHUqUil48wagD6W1CfMOZmTLMG95QQZhUU3lVQIm+2Z6tAYF+Ci
+GPEwT6+gPoHJWbK3X7qLtyfh0AZ/n4GLbKOEAwg/Dku4USqtNysftpeVncaVYaAc
+2RIg/lFxpclzAIzQEDq0yPRo553VGR0XBC3oLVajG4bAbvy2vEfDcUQ2lyETquI2
+yVOziIX3NoxeCxd2aEii6+mjSc9pMBRsCcxZeIvt+9/8ecRfAgtry+GYJR/lna9q
+A5ChtDrlnSMu76CSCAM1qZ65gwQaAgBCS7UWR5gANoHSZIYzL06Su1H72NTG3C80
+ekO4a5gkBM6MDngE02Q+17tJNbEjfifqeuQHZnbzkcUOAOpzoziuUoqpdTyIQsY6
+A0p8yRRE3gl9bm/LBpMJrLLmmW0lPrQZ6lqgHnZ4HvNW0skJbsI8cHLU3SICJa59
+3AUzinzmVPR7z/exdQCH1F0H0fYSOnOFB4de1On1J98NYNWxH30=
+=Z20K
+-----END PGP SIGNATURE-----

Mail-SpamAssassin-rules-4.0.1.r1916528.tgz

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

Mail-SpamAssassin-rules-4.0.1.r1916528.tgz.asc

@@ -1,16 +0,0 @@
------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-----

Mail-SpamAssassin-rules-4.0.2.r1928015.tgz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEDCsdcXW4UsZLPNxxbFU5eCT0NM4FAmiuc14ACgkQbFU5eCT0
+NM5uXRAAnO2yAIgKDJpMiiRPrbd8nnO/J2XKf8wua6OUDCf5M6vfqzWdJnP+6PCv
+cHElyWrxRUBOnOA6b4F/amzlwTK+CmMJK37kJFEqwA72xlJWXWaGWSnhNTloIHlr
+x3x7iDPk0KkcmEZ3WWCEIoIsaGQPUDxJlxmuDgJTKcMEpHfnWTZGsUruvzbX1I5u
+YEQevlCK2tPjldFErwUGjZ5cyyBdQ7FJYSx0xS9G2AzQXRElX3IyEcLZvoX6mJzH
+rQOyMcLxdASkDPYGWT2S09Qk4F2NNKJMU8zh3QQiD2Zdq3uxLBpJ9G+fA0n+gVpv
+igqcwGePFlY4oNPRBw66HiZlloZ7HZnBi8k1FnubwxwouhdPkc64rwjn2xqClqft
+SY9epUDQMe0hnJCNmPYlsk2/xToYK5JryzRaTZ6RlY26R3+jgtO8sBkLIhhIZc4F
+x7FncfqRY3M1x8XX2eDMYT6lAPKdQyR1cvsajC/ilM0chR6tWeywDAbw/ygi6K05
+Cbtl5ao2aVTdyI+AMqUFPfiAndOfo0GrreVQZ5x21+2ClF5qmYJCWNjf0vTc2utV
+vq5T/vXvFvwShD1RRzNesTuMRLv4iG9nsd8naj1+dUejyy6Sv/VUEoyMQAmv6q1X
+Q2SqAqTOh6rT1sB0PzczbV8YhEBiJhkXe/ooe/zi4CXmumHwS+8=
+=Mbw9
+-----END PGP SIGNATURE-----

README.md

@@ -0,0 +1,12 @@
+
+## Build Results
+
+Current state of perl in openSUSE:Factory is
+
+![Factory build results](https://br.opensuse.org/status/openSUSE:Factory/spamassassin/standard)
+
+The current state of perl in the devel project build (devel:languages:perl)
+
+![Devel project build results](https://br.opensuse.org/status/devel:languages:perl/spamassassin)
+
+

iXhash2-4.00.tar.gz

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

iXhash2-meta-rules.patch

@@ -1,21 +0,0 @@
-diff -u iXhash2-4.00/iXhash2.cf iXhash2-4.00_fix/iXhash2.cf
---- iXhash2-4.00/iXhash2.cf	2019-04-30 16:49:39.000000000 +0200
-+++ iXhash2-4.00_fix/iXhash2.cf	2024-04-10 10:25:00.975919467 +0200
-@@ -1,15 +1,8 @@
--
--# Note: loadplugin should really go into local.pre or so
--loadplugin Mail::SpamAssassin::Plugin::iXhash2 iXhash2.pm
--
--ifplugin Mail::SpamAssassin::Plugin::iXhash2
-+loadplugin Mail::SpamAssassin::Plugin::iXhash2
- 
- ixhashdnsbl   IXHASH_IX  ix.dnsbl.manitu.net.
- body          IXHASH_IX  eval:check_ixhash('IXHASH_IX')
--describe      IXHASH_IX  http://www.ixhash.net/listinfo.html
-+describe      IXHASH_IX  https://www.nixspam.net/
- tflags        IXHASH_IX  net
- score         IXHASH_IX  1.5
- reuse         IXHASH_IX
--
--endif
--

spamassassin.changes

@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Tue Sep  2 20:18:33 UTC 2025 - Arjen de Korte <suse+build@de-korte.org>
+
+- update to patch release version 4.0.2
+  - Add subs to HeaderEval plugin to detect invalid address headers
+  - TxRep data when using a SQL backend might be wrong because of
+    a bug in SpamAssassin 4.0.1, TxRep score can be limited with new
+    txrep_min_score and txrep_max_score configuration options
+    or you can remove email entries from TxRep database.
+  - Redis replication is now supported, Redis connection parameters
+    are splitted between read_only and read_write. Old syntax is still supported.
+  - Internal Mail::SpamAssassin::GeoDB module now also supports
+    IP::Geolocation::MMDB Perl module.
+  - Improved detection of MIME headers
+  - Improved parsing of CSS color values
+  - Added "replace_rules" support to Mail::SpamAssassin::Plugin::HashBL
+  - CNAME dns records are resolved and domains added to "uri_detail_list"
+  - New Mail::SpamAssassin::Plugin::Redirectors plugin
+    This plugin looks for URLs redirected by a list of URL redirector
+    services.
+  - improved handling of IDN domains
+- Update to spampd 2.62:
+  - Fixed that SpamPD shares the same socket to redist between children
+  - Fix option names in configuration parameter validation methods
+  - Do not set up logging if only showing debug info
+
+-------------------------------------------------------------------
+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>
 

spamassassin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package spamassassin
 #
-# Copyright (c) 2024 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 4.00
+%define spd_version 2.62
-%define spd_version 2.61
+%define sa_version 4.0.2
-%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 1916528
+%define rules_revision 1928015
 
-%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
@@ -53,12 +50,11 @@ Source101:      https://downloads.apache.org/spamassassin/source/Mail-SpamAssass
 # Keyring downloaded from https://www.apache.org/dist/spamassassin/KEYS
 Source102:      spamassassin.keyring
 Source103:      %{name}-rpmlintrc
+Source104:      README.md
 Patch1:         patch-PgSQL
 Patch2:         patch-URIDNSBL
 Patch6:         bnc#582111.diff
 Patch7:         basic-lint-without-sandbox.patch
-# PATCH-FIX-OPENSUSE adapt ixHash config to RPM package
-Patch10:        iXhash2-meta-rules.patch
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)
 # optional, but want them for build (test)
@@ -200,35 +196,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
 %patch -P 1
 %patch -P 2 -p1
 %patch -P 6
 %patch -P 7 -p1
-%patch -P 10 -p0
 cp %{SOURCE11} ./
 
 %build
@@ -261,15 +235,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
@@ -354,15 +324,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.61.tar.gz

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