summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-11-28 05:07:55 +0000
committerTim Harder <radhermit@gentoo.org>2013-11-28 05:07:55 +0000
commitb44dcc0d2f896dde0137fe2c03ad6ba71b40de29 (patch)
tree658587f430fbaf2979495d53b451383dc580fd78 /net-analyzer/tcpdump
parentDisable user support when drop-root is disabled (bug #488522). (diff)
downloadgentoo-2-b44dcc0d2f896dde0137fe2c03ad6ba71b40de29.tar.gz
gentoo-2-b44dcc0d2f896dde0137fe2c03ad6ba71b40de29.tar.bz2
gentoo-2-b44dcc0d2f896dde0137fe2c03ad6ba71b40de29.zip
Fix test logic (bug #482374).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'net-analyzer/tcpdump')
-rw-r--r--net-analyzer/tcpdump/ChangeLog5
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index d95341644cca..5d7e17b1acbe 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/tcpdump
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.175 2013/11/28 05:05:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.176 2013/11/28 05:07:55 radhermit Exp $
+
+ 28 Nov 2013; Tim Harder <radhermit@gentoo.org> tcpdump-4.4.0-r1.ebuild:
+ Fix test logic (bug #482374).
28 Nov 2013; Tim Harder <radhermit@gentoo.org> tcpdump-4.5.1.ebuild:
Disable user support when drop-root is disabled (bug #488522).
diff --git a/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild
index 628c97b03c43..efbceb6ff604 100644
--- a/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild,v 1.6 2013/06/04 08:09:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.4.0-r1.ebuild,v 1.7 2013/11/28 05:07:55 radhermit Exp $
EAPI=5
@@ -78,7 +78,7 @@ src_configure() {
}
src_test() {
- if has !userpriv ${FEATURES} && use drop-root; then
+ if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
sed -i '/^\(espudp1\|eapon1\)/d;' -i tests/TESTLIST
emake check
else