summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-12-06 06:33:37 +0000
committerTim Harder <radhermit@gentoo.org>2013-12-06 06:33:37 +0000
commit3591cab1afb64322a4398a76a8694b9cbf1bdb10 (patch)
treea6f1d452dcbd2ee05e3f2c54fe3eb470d576db17 /net-analyzer/tcpdump
parentBump (diff)
downloadgentoo-2-3591cab1afb64322a4398a76a8694b9cbf1bdb10.tar.gz
gentoo-2-3591cab1afb64322a4398a76a8694b9cbf1bdb10.tar.bz2
gentoo-2-3591cab1afb64322a4398a76a8694b9cbf1bdb10.zip
Use better workaround for bug #488522.
(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.5.1-r1.ebuild6
2 files changed, 6 insertions, 5 deletions
diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 9a9b1818d579..160f86c627ac 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.177 2013/12/06 04:43:27 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.178 2013/12/06 06:33:37 radhermit Exp $
+
+ 06 Dec 2013; Tim Harder <radhermit@gentoo.org> tcpdump-4.5.1-r1.ebuild:
+ Use better workaround for bug #488522.
*tcpdump-4.5.1-r1 (06 Dec 2013)
diff --git a/net-analyzer/tcpdump/tcpdump-4.5.1-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.5.1-r1.ebuild
index d55c57db1bf0..c0284b717f9f 100644
--- a/net-analyzer/tcpdump/tcpdump-4.5.1-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.5.1-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.5.1-r1.ebuild,v 1.1 2013/12/06 04:43:27 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.5.1-r1.ebuild,v 1.2 2013/12/06 06:33:37 radhermit Exp $
EAPI=5
@@ -53,8 +53,6 @@ pkg_setup() {
src_prepare() {
sed -i aclocal.m4 -e 's|\"-O2\"|\"\"|g' || die
- sed -i configure.in -e \
- 's|-z \"$with_user\" ;|-z \"$with_user\" \&\& test \"$with_user\" != \"no\" ;|g' || die
eautoconf
}
src_configure() {
@@ -76,7 +74,7 @@ src_configure() {
$(use_with drop-root chroot '') \
$(use_with smi) \
$(use_with ssl crypto "${EPREFIX}/usr") \
- $(use_with drop-root user tcpdump)
+ $(usex drop-root "--with-user=tcpdump" "")
}
src_test() {