gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

mail-filter/spamassassin: Fix dnsbl_subtests.t test w/o net

Browse Source 
Fix pulled from upstream's 4.0.1 commit:
20c6a5a78e

Since we now have two patches to dnsbl_subtests.t, I've renamed the
pre-existing patch file and adjusted the 4.0.x ebuilds to use the new
name.

Closes: https://bugs.gentoo.org/931289
Closes: https://github.com/gentoo/gentoo/pull/36955
Signed-off-by: Philippe Chaintreuil <gentoo_bugs_peep@parallaxshift.com>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Philippe Chaintreuil
2024-06-01 13:33:41 -04:00
committed by Sam James
parent 336a046ddd
commit d60e190a70
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t.patch → mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_001_load-URIDNSBL.patch
View File

12
mail-filter/spamassassin/files/4.0.0-tests-dnsbl_subtests.t_002_no-net.patch Normal file
View File

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

5
mail-filter/spamassassin/spamassassin-4.0.0-r3.ebuild
View File

@@ -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"
)

5
mail-filter/spamassassin/spamassassin-4.0.0-r4.ebuild
View File

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

2
mail-filter/spamassassin/spamassassin-4.0.1.ebuild
View File

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