gentoo auto-resync : 04:06:2024 - 00:07:50

4 files changed, 19 insertions, 1 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 34f9fd2ae857..6c36f2506c13 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index aecb15c45f23..bbd4e979892c 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -6,6 +6,7 @@ AUX 4.0.0-sa-update-rdatastr.patch 588 BLAKE2B 2740ffdb0d3080259e7cd31362385176c
 AUX 4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch 376 BLAKE2B 8df7bf985504bb76461cdbbe402863c1d66f9179dc6974a1d269f062d84ff4b7361697b24b7bc81446abd13f4a99754e0f721692f6c8c1987bfd6e4df13fa2ec SHA512 7a3739f4286c15e15f91244311253d466ff7fb783fe10a12fc4c8f342ac028bb14b4f4e3c535ac8e678eab576876531d45590f4905d572ef962ac4c920769b5e
 AUX 4.0.0-tests-dnsbl_subtests.t_002_no-net.patch 489 BLAKE2B 4f77a6de8dfc406e9a2faf5fbb0f803f4e33d58c5d8ebe07aab8146822dc7fa5b79e3b82011a50ba0b047f9f89acd4fc1535ce8d12ac9bf54eb29f3714abb4b3 SHA512 8b6e4cbf9aca26b10b834adab372ddc3fadc52782ceeb70d0cc8459939740a17f0666a65896bf7443836e532762f06d697cf60ec6a14063db1b10804b23f0a0f
 AUX 4.0.0-tests-strip2.t.patch 579 BLAKE2B c874e1efebe9b6f2a80ff63b116facbfc55fd05abe0c9e02665764509991d26b029b4bd9e7c03a368a7a1f072ce7e843859a0570b807a7bdc18779bff75a0a2a SHA512 bd5206d77cfa67dcb870cbcdf586457fa287d20555a1972ff3dc89d52ffdca4a57eb5011e734a5c6ca4c0017cb8fc9116c9f8e468db599c91d5fa1ba8a510151
+AUX 4.0.1-tests-sa_txrep.t-no-dbm.patch 439 BLAKE2B ba907324cf69cd970132d27df8a64560e0e58c87258f11f0a49b4345f027aa219a8f04121b250901b6367c66e946802d5244402070ab0628999669174cf3affe SHA512 fd3af96e395432c1886f1370fef7ffe6ec6819d7695be30277e381db75828b9c3bd9127067a4d33611aee7919b0c9c2c20655008a4017b758efbee7192f84f5b
 AUX geoip-4.0.0.cf 2608 BLAKE2B 903672505fb9c8b6a05b100b81b7c6786cd7242065c812c871df8bfe2080644fa53fd762c60587fca8aa8b4c79fe0641f27160bd1f14d16285c0eee5c24cc018 SHA512 f313ac34dd79a577ddec59e6623a27b3645401fcf3375c73f3634ca92f20658d6101a10554c8da1210da8e8116441624c01d2dc88c7dd61f1a2ed5fc8ab192e7
 AUX geoip.cf 2228 BLAKE2B 71d525f3f2abb9372cb1be7bb2698cf3d6495c142acaa96d69083d44108c8d514d23afc4f106c51e00704e24567465eaa76404cf5d586a6117afbe2e3f017eda SHA512 624b90487c426ffc46ca5b091b5a0591c0db8378820dee0cb684fd365336f4cef2c388d51c74bf284ed0a39b16c3cbca4aaf8dbc2dcf43b3dbea175185609aa4
 AUX mention-geoip.cf-in-init.pre.patch 438 BLAKE2B 1ddce693e1df24632b2cfd6f8309bc66b1ee1420f84e253e7a68934ab532c3aecd31fd62d88d679ad688bec559cc58faabbc625238c26d92a15e3b71c0ca6a63 SHA512 b62abc243b46757fc7277227e5d15a5455f21416bef16a3beaccdc5887e8957e7fec821779fc1b1fb86f22aa030b355f45087e568768df80790cfd9fb067422e
@@ -21,5 +22,5 @@ DIST Mail-SpamAssassin-4.0.1.tar.bz2.asc 833 BLAKE2B 9a7dd3a3a59b6a85139fe6db461
 EBUILD spamassassin-3.4.6-r2.ebuild 9832 BLAKE2B aeae24c04e90169b1e87605b53c23e57d3a14a825c023c39dae7a316860fd4f2a9393c68a5963838e4b39bb231db9cf94f417bc0baf9ab0f6752f842424cb523 SHA512 7fb3fdcf03bb93b8e8534dab572408a895c519e6dfcf4fc9016471d539f5ec00220cd5a4246c738d288a553273db78769b2c3feba4ce91548777293604cc44d1
 EBUILD spamassassin-4.0.0-r3.ebuild 10551 BLAKE2B 4bd1c8ff07f7ad88d4829615a40eb4fdb25f0a9b837de38acc77d7b8c1e7d73d6ba5da113285381aaab8ccba9036be3fea46f8d30f3702d6318a7e437b80fa32 SHA512 e880889e534e64998a86a05f4ae12d03a876b7f6d81d1abe2b7d3a9d0cb71d234412eb998175b9a2e2f5202ba4a9da81fda51d57e954703b105ea9a6eb0f75f4
 EBUILD spamassassin-4.0.0-r4.ebuild 10604 BLAKE2B a2047e73941026c6944f4b4211bde32a91cce4e13fb3722e8a63d40973a20422f7471333cda3e43b38eebf1f4756485b265641e51782063470a9171650f9e43b SHA512 c30b44b87e417dcb2124bde59cbf57b0838b56b2445c2a18adc6616383070b1bce6d923fc87d71fb946120f19e9fe7937d21574428808a4ce0c7ac5958d785e0
-EBUILD spamassassin-4.0.1.ebuild 10415 BLAKE2B ae2560bc304f3d5bd8c454bbf1581e031f08435f47f59523ef950668961cf9be6e8de197d23a7c0c119ce317933315c8f82fce90623b40f47c9c7861ad7a1e06 SHA512 b32e52304b4bdb9f04e66281c72ea293adf0ca3994c687745d31a0cffc25ece3b139aba89569542a361fc3a490a492663d48196cb3f5bf1d3c8a8f5aee93df6a
+EBUILD spamassassin-4.0.1.ebuild 10466 BLAKE2B 63ac515aad49617626a2c9e13459497c3fa36a0e30cec445969c62557163e22e54841f09e13d3d7d951b15ab7ce32656e4323a4ce77979e7768cf38a0c8e72fe SHA512 89840670ce1f8e2c1f059f99bf293c6614772d512d7e1869c6944c6ecd687c7636ecebaa129c3bde0499f0bb590c6b33071a1030d7d7b5fdef9302323907ab4d
 MISC metadata.xml 698 BLAKE2B 09a986c93fde495aceb1370ed7440e2d141d83a3b631e050d09571441637029d5beda9fed264d6d65fe094c99fc27c91a6ba350f55d6aa6136c484b2acbd874b SHA512 1bd90e2b4339e685ebc4af7ddd6f371cebd566610fe8cc256c5bf3d120ae9bb527da633c38fff9a9e1dbd7b4949ccd78dab6cb1016311ee23e143426ed61e515
diff --git a/mail-filter/spamassassin/files/4.0.1-tests-sa_txrep.t-no-dbm.patch b/mail-filter/spamassassin/files/4.0.1-tests-sa_txrep.t-no-dbm.patch
new file mode 100644
index 000000000000..6d6b4dd9a024
--- /dev/null
+++ b/mail-filter/spamassassin/files/4.0.1-tests-sa_txrep.t-no-dbm.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/933406
+--- a/t/sa_txrep.t
++++ b/t/sa_txrep.t
+@@ -4,7 +4,11 @@ use lib '.'; use lib 't';
+ use SATest; sa_t_init("sa_txrep");
+ 
+ 
+-use Test::More tests => 8;
++use Test::More;
++
++my @dbmods = grep eval "require $_", ('DB_File', 'GDBM_File', 'SDBM_File');
++plan skip_all => "No db module is available" unless @dbmods;
++plan tests => 8;
+ 
+ # ---------------------------------------------------------------------------
+ 
diff --git a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
index d778722d02cc..4e04f9b1ff8d 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
@@ -91,6 +91,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/spamassassin.apache.org.asc
 PATCHES=(
 	"${FILESDIR}/mention-geoip.cf-in-init.pre.patch"
 	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch"
+	"${FILESDIR}/4.0.1-tests-sa_txrep.t-no-dbm.patch"
 )
 
 # There are a few renames and use-dependent ones in src_install as well.