summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2010-12-21 10:33:25 +0000
committerPeter Volkov <pva@gentoo.org>2010-12-21 10:33:25 +0000
commit65642dca278adcd6d3421401a7d26d6030a8f951 (patch)
tree1d227f06bda635eec42348b3fa22d88d472118db /net-analyzer
parentx86 stable wrt security bug #348344 (diff)
downloadgentoo-2-65642dca278adcd6d3421401a7d26d6030a8f951.tar.gz
gentoo-2-65642dca278adcd6d3421401a7d26d6030a8f951.tar.bz2
gentoo-2-65642dca278adcd6d3421401a7d26d6030a8f951.zip
Fixed build issue, bug #349231, thank Nathan Caldwell for report and Rafał Mużyło for preliminary investigations.
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/wireshark/ChangeLog6
-rw-r--r--net-analyzer/wireshark/wireshark-1.4.2.ebuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 4f1925d528ea..9f37ba43567d 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.264 2010/12/05 17:40:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.265 2010/12/21 10:33:25 pva Exp $
+
+ 21 Dec 2010; Peter Volkov <pva@gentoo.org> wireshark-1.4.2.ebuild:
+ Fixed build issue, bug #349231, thank Nathan Caldwell for report and Rafał
+ Mużyło for preliminary investigations.
05 Dec 2010; Raúl Porcel <armin76@gentoo.org> wireshark-1.4.2.ebuild:
Add ~alpha/~ia64/~sparc wrt #347259
diff --git a/net-analyzer/wireshark/wireshark-1.4.2.ebuild b/net-analyzer/wireshark/wireshark-1.4.2.ebuild
index 2404772dcfef..fb64b479cd34 100644
--- a/net-analyzer/wireshark/wireshark-1.4.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.2.ebuild,v 1.6 2010/12/05 17:40:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.2.ebuild,v 1.7 2010/12/21 10:33:25 pva Exp $
EAPI=2
PYTHON_DEPEND="python? 2"
@@ -160,8 +160,8 @@ src_configure() {
$(use_with portaudio) \
$(use_with python) \
$(use_with caps libcap) \
- $(use_enable caps setcap-install) \
- $(use caps || use_enable pcap setuid-install) \
+ $(use pcap && use_enable caps setcap-install) \
+ $(use pcap && use_enable !caps setuid-install) \
--sysconfdir=/etc/wireshark \
--with-dumpcap-group=wireshark \
--disable-extra-gcc-checks \