[gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/

[Michael Orlitzky]

commit:     27b0dc92ffcd4001fcc8489be7cd48029f259c3d
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 18:28:21 2018 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 18:38:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b0dc92

mail-filter/spamassassin: disable a network test and drop RESTRICT=test.

I originally added RESTRICT=test to spamassassin-3.4.2.ebuild because
a test was failing, I didn't know why, and we needed to get the new
version out to address multiple CVEs. It turns out that the one
failing test is not respecting the fact that network access should be
disabled in the test suite (upstream bug 7622).

In the new revision, we kill that one test in src_prepare(). The rest
of the tests should pass, so RESTRICT=test has been removed.

Bug: https://bugs.gentoo.org/666348
Bug: https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7622
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../{spamassassin-3.4.2.ebuild => spamassassin-3.4.2-r1.ebuild}   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mail-filter/spamassassin/spamassassin-3.4.2.ebuild b/mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild
similarity index 97%
rename from mail-filter/spamassassin/spamassassin-3.4.2.ebuild
rename to mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild
index 340edb07078..2fd2d38d2b8 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.2.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild
@@ -16,9 +16,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 
-# Upstream bug 7622.
-RESTRICT=test
-
 # The Makefile.PL script checks for dependencies, but only fails if a
 # required (i.e. not optional) dependency is missing. We therefore
 # require most of the optional modules only at runtime.
@@ -93,6 +90,11 @@ src_prepare() {
 	# spamd tests themselves -- see src_test), so use a crude
 	# workaround.
 	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
+
+	# Upstream bug 7622: this thing needs network access but doesn't
+	# respect the 'run_net_tests' setting.
+	perl_rm_files t/urilocalbl_geoip.t \
+		|| die 'failed to remove urilocalbl_geoip tests'
 }
 
 src_configure() {