gentoo auto-resync : 27:12:2022 - 14:10:05

4 files changed, 51 insertions, 4 deletions

diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index de5982ba9e60..8a43df5aa5f8 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,6 +1,8 @@
 AUX 3.4.1-spamd.conf-r1 1257 BLAKE2B bbdeeda731965dcd863c2a9bc615295b7d48e0110994dac66bfccb4ee1d84c9c50e6c2fd6649b09b7206e16120ed7e55b387ba76afdf0fe7e629bc767d87a80c SHA512 b2233d9330fa06d13dc8d222fa16198a1f81dcb9c87ca93961db54d9f2514cdabd824d0f25c0cca678495f271f48f601ee14363c2a2f833100facae307226beb
 AUX 3.4.1-spamd.init-r3 1180 BLAKE2B c7290e6016b27247610b050f77368fcbf3dd3f4ab0a72a933b3819f35dfe9f9085f13f73be95b1169e04d3a09bc4cec6284e87963059ac047d5908df3458fb2b SHA512 2c968750da3252e8dcce4cebf105a26a9dbc471e39bda7d66180e0fbf930b11dd3a98337d7c387026375918b660768c637c2f2031d6624ce3237d9cc8cd88a02
 AUX 3.4.6-configure-clang16.patch 1452 BLAKE2B 72c9cf2b411e54c955c9bfbe10b234e43ba5969d4daef21d3a1aeb95ee32fe337c47cc91375dcca9922f65d0f09ab3eaeeb7b3113002f6036b9f1c260fe0d196 SHA512 0ec2a51263d5211cfca405bcff10a589bd616d1c652f5b07e669d34c3a7c22eff6921836161fa174884d324a6964c89036b0bf1a9d86bd130fcbadec70dac989
+AUX 4.0.0-tests-dnsbl_subtests.t.patch 376 BLAKE2B 8df7bf985504bb76461cdbbe402863c1d66f9179dc6974a1d269f062d84ff4b7361697b24b7bc81446abd13f4a99754e0f721692f6c8c1987bfd6e4df13fa2ec SHA512 7a3739f4286c15e15f91244311253d466ff7fb783fe10a12fc4c8f342ac028bb14b4f4e3c535ac8e678eab576876531d45590f4905d572ef962ac4c920769b5e
+AUX 4.0.0-tests-strip2.t.patch 579 BLAKE2B c874e1efebe9b6f2a80ff63b116facbfc55fd05abe0c9e02665764509991d26b029b4bd9e7c03a368a7a1f072ce7e843859a0570b807a7bdc18779bff75a0a2a SHA512 bd5206d77cfa67dcb870cbcdf586457fa287d20555a1972ff3dc89d52ffdca4a57eb5011e734a5c6ca4c0017cb8fc9116c9f8e468db599c91d5fa1ba8a510151
 AUX geoip.cf 2228 BLAKE2B 71d525f3f2abb9372cb1be7bb2698cf3d6495c142acaa96d69083d44108c8d514d23afc4f106c51e00704e24567465eaa76404cf5d586a6117afbe2e3f017eda SHA512 624b90487c426ffc46ca5b091b5a0591c0db8378820dee0cb684fd365336f4cef2c388d51c74bf284ed0a39b16c3cbca4aaf8dbc2dcf43b3dbea175185609aa4
 AUX mention-geoip.cf-in-init.pre.patch 438 BLAKE2B 1ddce693e1df24632b2cfd6f8309bc66b1ee1420f84e253e7a68934ab532c3aecd31fd62d88d679ad688bec559cc58faabbc625238c26d92a15e3b71c0ca6a63 SHA512 b62abc243b46757fc7277227e5d15a5455f21416bef16a3beaccdc5887e8957e7fec821779fc1b1fb86f22aa030b355f45087e568768df80790cfd9fb067422e
 AUX secrets.cf 664 BLAKE2B a501fb93369743e3c9139cc780f166168313613c840857bc0e72def5b3e168f235afc16a1dc34afa0e839ffa9da6c0c360c9a93a126d9dd711b4473e0a19ebcc SHA512 bb6992098a44e16147be46b75b70e3fb81672285dd71a30719606e2cab556720fc9dd318c7a80832ceaf2e6d9c98c2dd7434f48242feede1922c3e1073559edb
@@ -9,6 +11,7 @@ AUX spamassassin.service.conf-r2 120 BLAKE2B cdefa5d73234be5331f7ff7cc646f10365a
 AUX update-spamassassin-rules-r1.cron 1555 BLAKE2B 3c83a1d3f951c5a7004c6ca838aba6ae76502de9e3dad0104537c819ea02652a920e5f549e4ef5c6fa4a36b9cf32e5ef9cd31d421dece002fc99d3e6227ea578 SHA512 5ea9aeff563589991fecde6e4530da36953c55d462d00882a5aa164936c71c947edf6bbb533fc4a2858a29cb3ac08388dac15d37aeb4d090889385c8b431676d
 DIST Mail-SpamAssassin-3.4.6.tar.bz2 6166807 BLAKE2B aa25c9e81f570d35e8594ba6d6da70c7b846737513bd4d6d2d410872c58ab7cbe7ade6a109a71bdbb6dbaf7aee8eb48520e7de929b27e83546401f3692aeb0c3 SHA512 bb53ba928917b02071b2e6690a11240e1af503334f292c870a8c49c24b0a58b44c78f827e2f43e71a3ce920481fa0e1e62b78a39452658c57d18f4e11daeb593
 DIST Mail-SpamAssassin-4.0.0.tar.bz2 6371055 BLAKE2B 86f2167f6250a10a6bf871cc291f63ee9ee2d853b4183a637b4267e6979209196155be1b26e5e5b1093cf63841f9819a249de65e7002414a7e790ee1b67e5206 SHA512 a0fe5f6953c9df355bfa011e8a617101687eb156831a057504656921fe76c2a4eb37b5383861aac579e66a20c4454068e81a39826a35eb0266148771567bad5f
+DIST Mail-SpamAssassin-4.0.0.tar.bz2.asc 833 BLAKE2B 44170d411d9eb656d67bf4080807ad3c3fd9eff9f2eadadadbfde828e542bc57b5cdcfb062c7f210be4d721bdf9cf85aec9b1fb491076165453b000b47990f0d SHA512 b87a80d2b0b802f52df75e485878c53cc4fad52935ca2b14b1b06e46d334b52c673e66d61cc2155b5e812fa6a486f8e61f6a87794be2524acea1fd8ac42e7d6a
 EBUILD spamassassin-3.4.6-r2.ebuild 9839 BLAKE2B 3cfc005672dcf0ef16ad03dfe7316555b8623fcd2ef3a7a89f4921bf99da3a90e73b090207936091d467dfcaf5b956f27c2844fbca0762e25eec40aeb2aeef45 SHA512 28d27a5e1a14f9f2559731508c0c6114a3c4741e32c86a617a065c686ce094fb3c04c3372c3d87e24c7bcfbdb1421474af3af2966593066735c44dfd32c67b40
-EBUILD spamassassin-4.0.0.ebuild 9747 BLAKE2B f1f2b7da22de02ea2cf858fb73e48e228ccfec2e9c06b4075fb89bebbf58a8a250f95d8af9f64ae430e6fa84b8afc70cf482e91de719417e05e8e02a1d3a8442 SHA512 70509ada058570ef66b53df457eb1d88c64348be1705f120260c096eba2fa4d771d3df16a8da74a6eefe9fd374b851464fe8dd20b5485ceb593a62f9937fff20
+EBUILD spamassassin-4.0.0.ebuild 10103 BLAKE2B 57d73d22f1d62909a54d022d75995547020e3f740f039aec12cb70d5f3e7c72d4a729bc9b53f2ff947f473e0afe92d0dd73a1cf58bfae45679f970a70f2ecb75 SHA512 91c9ef64000e79fc925ef6f9466cb6b885d5f12028c36e5ec16f8e745acfcbb038cea36435bc6eeabc3d1081b17f6043f11b921f5e5bea424fcc489360774560
 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.patch
new file mode 100644
index 000000000000..6f2a4db0ad5c
--- /dev/null
+++ b/mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t.patch
@@ -0,0 +1,14 @@
+https://bz.apache.org/SpamAssassin/show_bug.cgi?id=8095
+--- a/t/dnsbl_subtests.t
++++ b/t/dnsbl_subtests.t
+@@ -20,6 +20,10 @@
+ 
+ use Mail::SpamAssassin;
+ 
++tstpre ("
++  loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
++");
++
+ # Bug 5761 (no 127.0.0.1 in jail, use SPAMD_LOCALHOST if specified)
+ my $dns_server_localaddr = $ENV{'SPAMD_LOCALHOST'};
+ if (!$dns_server_localaddr) {
diff --git a/mail-filter/spamassassin/files/4.0.0-tests-strip2.t.patch b/mail-filter/spamassassin/files/4.0.0-tests-strip2.t.patch
new file mode 100644
index 000000000000..94e1059259b5
--- /dev/null
+++ b/mail-filter/spamassassin/files/4.0.0-tests-strip2.t.patch
@@ -0,0 +1,20 @@
+https://bz.apache.org/SpamAssassin/show_bug.cgi?id=8096
+--- a/t/strip2.t
++++ b/t/strip2.t
+@@ -4,14 +4,15 @@
+ use SATest; sa_t_init("strip2");
+ 
+ use Test::More;
++use constant HAS_TEXTDIFF => eval { require Text::Diff; };
+ plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests');
++plan skip_all => 'Need Text::Diff' unless HAS_TEXTDIFF;
+ plan tests => 98;
+ 
+ # ---------------------------------------------------------------------------
+ 
+ use File::Copy;
+ use File::Compare qw(compare_text);
+-use Text::Diff;
+ 
+ my @files = qw(
+ 	data/nice/crlf-endings
diff --git a/mail-filter/spamassassin/spamassassin-4.0.0.ebuild b/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
index c4cc36b5754f..1799185e12fa 100644
--- a/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
+++ b/mail-filter/spamassassin/spamassassin-4.0.0.ebuild
@@ -3,12 +3,16 @@
 
 EAPI=8
 
-inherit perl-functions systemd toolchain-funcs
+inherit perl-functions systemd toolchain-funcs verify-sig
 
 MY_P="Mail-SpamAssassin-${PV//_/-}"
 DESCRIPTION="An extensible mail filter which can identify and tag spam"
 HOMEPAGE="https://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
+SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2
+	verify-sig? (
+		https://downloads.apache.org/spamassassin/source/${MY_P}.tar.bz2.asc
+	)
+"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0 GPL-2"
@@ -79,12 +83,18 @@ DEPEND="${REQDEPEND}
 		virtual/perl-Test-Harness
 	)"
 RDEPEND="${REQDEPEND} ${OPTDEPEND}"
+BDEPEND="${RDEPEND}
+	verify-sig? ( sec-keys/openpgp-keys-spamassassin )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/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-strip2.t.patch"
 )
 
-# There are a few renames and use-dependent ones in src_istall as well.
+# There are a few renames and use-dependent ones in src_install as well.
 DOCS=(
 	NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes
 	sql/README.awl procmailrc.example sample-nonspam.txt