summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2018-09-18 14:28:21 -0400
committerMichael Orlitzky <mjo@gentoo.org>2018-09-18 14:38:12 -0400
commit27b0dc92ffcd4001fcc8489be7cd48029f259c3d (patch)
tree32c4cf46e5dbe2a9fe3943f56db6c32de2ff4837 /mail-filter/spamassassin
parentmedia-libs/lcms: Cleanup vulnerable (diff)
downloadgentoo-27b0dc92ffcd4001fcc8489be7cd48029f259c3d.tar.gz
gentoo-27b0dc92ffcd4001fcc8489be7cd48029f259c3d.tar.bz2
gentoo-27b0dc92ffcd4001fcc8489be7cd48029f259c3d.zip
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
Diffstat (limited to 'mail-filter/spamassassin')
-rw-r--r--mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild (renamed from mail-filter/spamassassin/spamassassin-3.4.2.ebuild)8
1 files 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
index 340edb07078a..2fd2d38d2b86 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() {