diff options
| author |   Peter Volkov <pva@gentoo.org> | 2010-12-21 10:33:25 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2010-12-21 10:33:25 +0000 |
| commit | c5d10597aa97373f9d2cdfa3302385a5817464c4 (patch) | |
| tree | 9cb56580cd19d398879b379ed0b9c2c049d7ee05 /net-analyzer | |
| parent | x86 stable wrt security bug #348344 (diff) | |
| download | historical-c5d10597aa97373f9d2cdfa3302385a5817464c4.tar.gz historical-c5d10597aa97373f9d2cdfa3302385a5817464c4.tar.bz2 historical-c5d10597aa97373f9d2cdfa3302385a5817464c4.zip | |
Fixed build issue, bug #349231, thank Nathan Caldwell for report and Rafał Mużyło for preliminary investigations.
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/wireshark/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/wireshark/Manifest | 4 | ||||
| -rw-r--r-- | net-analyzer/wireshark/wireshark-1.4.2.ebuild | 6 |
3 files changed, 10 insertions, 6 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/Manifest b/net-analyzer/wireshark/Manifest index b560dec477bf..266a1b43f24e 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -10,6 +10,6 @@ DIST wireshark-1.2.13.tar.gz 19512648 RMD160 ebdc29f83546391cb8eb4056ef686f3ced2 DIST wireshark-1.4.2.tar.bz2 20208792 RMD160 5f0c1a9c52347782fcdcd6c11e24d21cfe89f7e2 SHA1 03eb2bcd1de93fd0b45d6f1346e97d5f03a47c3e SHA256 44c6e1ec328fa8e1e7b3838b2f25d51c36b38c562fc0d097ba464205fdb049b2 EBUILD wireshark-1.2.12.ebuild 4573 RMD160 17bd50d666f9b4d77144ddcfdc8f29f1c9eca8f3 SHA1 514105e7cb0c3c8fb5674fe92b87687a8f8342bb SHA256 aaa6626f481386cc001940aa693ead322bfaf9a65cdf8144e91a1c104e935838 EBUILD wireshark-1.2.13.ebuild 4574 RMD160 c3af6ca63c5c5e5154a77edecdb59f1469f85b4c SHA1 c49121f138824b9d9bdd1ebb8a2448db3edb0cf2 SHA256 2a05ceb54e9018dd3aa53beb0db69038550e074b45aac18c426ff58ae5110549 -EBUILD wireshark-1.4.2.ebuild 6345 RMD160 e97eb635ee1a94017fb6242b223cd0b6017bd7e7 SHA1 7b38547d009d71490710adba978c1f61eb022c1f SHA256 c4cf46060f3522abe8a074f2b74568997e12b792f97a0dcc0ff9246342676c22 -MISC ChangeLog 38457 RMD160 625e917f65ace833b2c0b6819f7c91d8d82ed3bd SHA1 bbe4bf5bc3b09c5ebe05ae56152fc3705eece7eb SHA256 94a14b851fe57594813c20a5522dbcd0e0c18ed844021be1ca464ec1d2153383 +EBUILD wireshark-1.4.2.ebuild 6354 RMD160 36300b21839541f994edb04f33febe074e270fbd SHA1 80286171fc1e807980f1c085ea096bba00209e9b SHA256 77b6168e1b833fd737ab9276a09369b710fc037cc4427e3684fb17d4da6b5e3d +MISC ChangeLog 38644 RMD160 a323cef59bfd6b279374606bac6b54f3cbc51aae SHA1 39389efcfd0d13d292e7f8dcf0746b5f93756d56 SHA256 494dd27057a25d14f71bb9c5a2553e10cf5a4a0b07ae3b9d398330913ab7f899 MISC metadata.xml 2242 RMD160 66dbbb758acc194df17217183b60a56f61fced38 SHA1 4498ea4c0f0f04213fd1cba2fd3de44565058f7d SHA256 2dfaef45c385c37c7ae8af96f5d8c58d9bff8f6186d55be8f2d034ebd0c60869 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 \ |