[gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/

[Jeroen Roovers]

commit:     945b9db69ac69beefa9642e3c86b91d2e7c8c708
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 21:54:39 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 21:54:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945b9db6

net-analyzer/wireshark: Check for USE='dumpcap pcap' when setting dumpcap caps 
(bug 650812 by Rolf Eike Beer).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-analyzer/wireshark/wireshark-2.4.5.ebuild    | 2 +-
 net-analyzer/wireshark/wireshark-2.5.0.ebuild    | 2 +-
 net-analyzer/wireshark/wireshark-2.5.1.ebuild    | 2 +-
 net-analyzer/wireshark/wireshark-99999999.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild 
b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index f91e77ad25f..730f9e0a9b8 100644
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
@@ -275,7 +275,7 @@ pkg_postinst() {
        # Add group for users allowed to sniff.
        enewgroup wireshark
 
-       if use pcap; then
+       if use dumpcap && use pcap; then
                fcaps -o 0 -g wireshark -m 4710 -M 0710 \
                        cap_dac_read_search,cap_net_raw,cap_net_admin \
                        "${EROOT}"/usr/bin/dumpcap

diff --git a/net-analyzer/wireshark/wireshark-2.5.0.ebuild 
b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
index ab242e2e09e..48af1f01605 100644
--- a/net-analyzer/wireshark/wireshark-2.5.0.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.5.0.ebuild
@@ -267,7 +267,7 @@ pkg_postinst() {
        # Add group for users allowed to sniff.
        enewgroup wireshark
 
-       if use pcap; then
+       if use dumpcap && use pcap; then
                fcaps -o 0 -g wireshark -m 4710 -M 0710 \
                        cap_dac_read_search,cap_net_raw,cap_net_admin \
                        "${EROOT}"/usr/bin/dumpcap

diff --git a/net-analyzer/wireshark/wireshark-2.5.1.ebuild 
b/net-analyzer/wireshark/wireshark-2.5.1.ebuild
index 238129487be..553bffd3d23 100644
--- a/net-analyzer/wireshark/wireshark-2.5.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.5.1.ebuild
@@ -243,7 +243,7 @@ pkg_postinst() {
        # Add group for users allowed to sniff.
        enewgroup wireshark
 
-       if use pcap; then
+       if use dumpcap && use pcap; then
                fcaps -o 0 -g wireshark -m 4710 -M 0710 \
                        cap_dac_read_search,cap_net_raw,cap_net_admin \
                        "${EROOT}"/usr/bin/dumpcap

diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild 
b/net-analyzer/wireshark/wireshark-99999999.ebuild
index bb1724389ab..59a4a67005b 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -271,7 +271,7 @@ pkg_postinst() {
        # Add group for users allowed to sniff.
        enewgroup wireshark
 
-       if use pcap; then
+       if use dumpcap && use pcap; then
                fcaps -o 0 -g wireshark -m 4710 -M 0710 \
                        cap_dac_read_search,cap_net_raw,cap_net_admin \
                        "${EROOT}"/usr/bin/dumpcap