gentoo auto-resync : 03:06:2024 - 00:07:25

7 files changed, 24 insertions, 9 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 3ae902bc1fb5..34f9fd2ae857 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index b375f186fb15..aecb15c45f23 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -3,7 +3,8 @@ AUX 3.4.1-spamd.init-r3 1180 BLAKE2B c7290e6016b27247610b050f77368fcbf3dd3f4ab0a
 AUX 3.4.6-configure-clang16.patch 1452 BLAKE2B 72c9cf2b411e54c955c9bfbe10b234e43ba5969d4daef21d3a1aeb95ee32fe337c47cc91375dcca9922f65d0f09ab3eaeeb7b3113002f6036b9f1c260fe0d196 SHA512 0ec2a51263d5211cfca405bcff10a589bd616d1c652f5b07e669d34c3a7c22eff6921836161fa174884d324a6964c89036b0bf1a9d86bd130fcbadec70dac989
 AUX 4.0.0-DnsResolver-udpsize.patch 685 BLAKE2B cea6e3b795bf1a43d975fe33a6b90e03355c1807d79f62b9e25254a88c297190313d0d5ea307f61d4b1e909f22a661389aa9a8a898a6dde8a9f75fd3a15130fc SHA512 a3194f268534984643bd1870de81eb0eba8df07fee5e0cd79954edd3b54e646bb985cd0d141bd272e8c3035348d0d4c8b5b896ac2ead07edd465175bb26b5bdc
 AUX 4.0.0-sa-update-rdatastr.patch 588 BLAKE2B 2740ffdb0d3080259e7cd31362385176c7d5a65928192918fd89d6bd69d5f5ca60aee5ebaad5695301cf4446b778bde0ff553a929dbe15a1f88e50d46741864e SHA512 ce1064fa38ba4d849e3610c3122db12234bf6f04f27c2f74c9437f0fe53657138a8cbd37080df17be331e35006a73884d2b834f3edcb633b015261952cf47f05
-AUX 4.0.0-tests-dnsbl_subtests.t.patch 376 BLAKE2B 8df7bf985504bb76461cdbbe402863c1d66f9179dc6974a1d269f062d84ff4b7361697b24b7bc81446abd13f4a99754e0f721692f6c8c1987bfd6e4df13fa2ec SHA512 7a3739f4286c15e15f91244311253d466ff7fb783fe10a12fc4c8f342ac028bb14b4f4e3c535ac8e678eab576876531d45590f4905d572ef962ac4c920769b5e
+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 geoip-4.0.0.cf 2608 BLAKE2B 903672505fb9c8b6a05b100b81b7c6786cd7242065c812c871df8bfe2080644fa53fd762c60587fca8aa8b4c79fe0641f27160bd1f14d16285c0eee5c24cc018 SHA512 f313ac34dd79a577ddec59e6623a27b3645401fcf3375c73f3634ca92f20658d6101a10554c8da1210da8e8116441624c01d2dc88c7dd61f1a2ed5fc8ab192e7
 AUX geoip.cf 2228 BLAKE2B 71d525f3f2abb9372cb1be7bb2698cf3d6495c142acaa96d69083d44108c8d514d23afc4f106c51e00704e24567465eaa76404cf5d586a6117afbe2e3f017eda SHA512 624b90487c426ffc46ca5b091b5a0591c0db8378820dee0cb684fd365336f4cef2c388d51c74bf284ed0a39b16c3cbca4aaf8dbc2dcf43b3dbea175185609aa4
@@ -18,7 +19,7 @@ DIST Mail-SpamAssassin-4.0.0.tar.bz2.asc 833 BLAKE2B 44170d411d9eb656d67bf408080
 DIST Mail-SpamAssassin-4.0.1.tar.bz2 6379932 BLAKE2B 303c54d8731cf0ccb622e3e78efbc6be983fc87c7a71107ea700daa54e7ffb85dbb59696188d8ac666067499b1bc7477e31edb36f6e99c9749288a8f921a36b1 SHA512 66183e356b07d1049cf5598fc1e563e4aab580dfca04bf8ec37781dfb57ef568d33c6f6455076f54f940947f5a5dfefa7a08d233833deea5fe5ea18b669cd790
 DIST Mail-SpamAssassin-4.0.1.tar.bz2.asc 833 BLAKE2B 9a7dd3a3a59b6a85139fe6db461da9a4a23ed9d1b3110aba70df60145252c3307c526bb5b5c129e2c4ee74427b2b59e421b80bc8d6ca71b89a0c6f608ca02ab9 SHA512 b180080c1692684014680a6873f42ed07d1640c40a6e3e330cfb43235bb3e3008f5e21018fbc0e9cba67ab6d9ba5b87cc2d98c3bed15c9503164dacdfdaef9df
 EBUILD spamassassin-3.4.6-r2.ebuild 9832 BLAKE2B aeae24c04e90169b1e87605b53c23e57d3a14a825c023c39dae7a316860fd4f2a9393c68a5963838e4b39bb231db9cf94f417bc0baf9ab0f6752f842424cb523 SHA512 7fb3fdcf03bb93b8e8534dab572408a895c519e6dfcf4fc9016471d539f5ec00220cd5a4246c738d288a553273db78769b2c3feba4ce91548777293604cc44d1
-EBUILD spamassassin-4.0.0-r3.ebuild 10472 BLAKE2B f52a8cd19c705929bd832549be459084a8d234394811a9c30282778986416d938bb133735d1f49657a55196c9000a74813c237451c4eb26c35edd45630a51bd2 SHA512 7be7363b797c21599fa9c2a431702d502fd0e361d6c3d8ae4a9c17492c5ca2a61fd3181945d00b9add251d62e04eac481fded57f3486333fca89331823f439fd
-EBUILD spamassassin-4.0.0-r4.ebuild 10525 BLAKE2B f43b0494ca7b1f1a2d9f172873b579f184d128db6c00848a845678530394f260ca1a6319393d05727b1dba7c9f60573548e3aa1e8fc4c2872fdd6d4c34366737 SHA512 04fe901960a03ffae1423dd9e65956ae892a87f75488827c00bab3a7f211d13c92919b7a9efd1fa1b74f3a000b4c6eba18155d29c663e737bc382fe5d62374f1
-EBUILD spamassassin-4.0.1.ebuild 10397 BLAKE2B 0fa11e9fd5fdc909e7f1769d855f8f47a8720c746f8fc3566aa93de62e1fa1ddb39636566732a0b7ff42365d81bd1db42a09bbd601d0791855f77690d343fe67 SHA512 754e591196a3b7a42cdd6bd41a7ca41d0195d0cb4db0e7f8c697f8437ba4bba7d9d73d48ae74f61d7ef4f5ef32fdcb7ae4bb3d4e7a03f199eca460d509335d2d
+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
 MISC metadata.xml 698 BLAKE2B 09a986c93fde495aceb1370ed7440e2d141d83a3b631e050d09571441637029d5beda9fed264d6d65fe094c99fc27c91a6ba350f55d6aa6136c484b2acbd874b SHA512 1bd90e2b4339e685ebc4af7ddd6f371cebd566610fe8cc256c5bf3d120ae9bb527da633c38fff9a9e1dbd7b4949ccd78dab6cb1016311ee23e143426ed61e515
diff --git a/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t.patch b/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch
index 6f2a4db0ad5c..6f2a4db0ad5c 100644
--- a/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t.patch
+++ b/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch
diff --git a/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch b/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch
new file mode 100644
index 000000000000..47bfea21b617
--- /dev/null
+++ b/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch
@@ -0,0 +1,12 @@
+https://github.com/apache/spamassassin/commit/20c6a5a78e31877b3d4fa379d6a011d6112aabb9
+--- a/t/dnsbl_subtests.t
++++ b/t/dnsbl_subtests.t
+@@ -14,6 +14,8 @@ use Test::More;
+ 
+ use Errno qw(EADDRINUSE EACCES);
+ 
++plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
++
+ use constant HAS_NET_DNS_NAMESERVER => eval { require Net::DNS::Nameserver; };
+ plan skip_all => "Net::DNS::Nameserver in unavailable on this system" unless (HAS_NET_DNS_NAMESERVER);
+ plan  tests => 46;
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild
index ecbdfeb2c745..089338322055 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -90,7 +90,8 @@ 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.patch"
+	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch"
+	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch"
 	"${FILESDIR}/4.0.0-tests-strip2.t.patch"
 	"${FILESDIR}/4.0.0-DnsResolver-udpsize.patch"
 )
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild
index c08c4884139a..a72db00639cb 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -90,7 +90,8 @@ 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.patch"
+	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch"
+	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch"
 	"${FILESDIR}/4.0.0-tests-strip2.t.patch"
 	"${FILESDIR}/4.0.0-DnsResolver-udpsize.patch"
 	"${FILESDIR}/4.0.0-sa-update-rdatastr.patch"
diff --git a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
index 7ab67f06441d..d778722d02cc 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.1.ebuild
@@ -90,7 +90,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.patch"
+	"${FILESDIR}/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch"
 )
 
 # There are a few renames and use-dependent ones in src_install as well.