From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 759EB138334 for ; Tue, 18 Sep 2018 18:39:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26427E0AAF; Tue, 18 Sep 2018 18:39:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0FB0E0AAF for ; Tue, 18 Sep 2018 18:39:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A38F335D05 for ; Tue, 18 Sep 2018 18:39:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 898833D3 for ; Tue, 18 Sep 2018 18:39:14 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1537295892.27b0dc92ffcd4001fcc8489be7cd48029f259c3d.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/spamassassin/spamassassin-3.4.2-r1.ebuild mail-filter/spamassassin/spamassassin-3.4.2.ebuild X-VCS-Directories: mail-filter/spamassassin/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 27b0dc92ffcd4001fcc8489be7cd48029f259c3d X-VCS-Branch: master Date: Tue, 18 Sep 2018 18:39:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6a63dcb2-d641-4df5-891f-35e056553c20 X-Archives-Hash: 0791e584bc5db82df6ed46e86174e3d4 commit: 27b0dc92ffcd4001fcc8489be7cd48029f259c3d Author: Michael Orlitzky gentoo org> AuthorDate: Tue Sep 18 18:28:21 2018 +0000 Commit: Michael Orlitzky gentoo 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() {