net-analyzer/wireshark: Check for USE='dumpcap pcap' when setting dumpcap caps (bug...

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index f91e77ad25ffd1daeef6d2074970053b371c13c6..730f9e0a9b89d6f9e663a4aebf8b58cbe153cc7c 100644 (file)
--- 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 ab242e2e09e6ddb1fc4567ac218c56c7eb4ffa50..48af1f016059c4cc9c4f3836341985f25e5d64a8 100644 (file)
--- 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 238129487be2609653ef055cf4efaac647856509..553bffd3d23ba6c7001a7c788eceeab6287e55b4 100644 (file)
--- 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 bb1724389ab47ba33a21df433302d1166f7bd116..59a4a67005b52d3ff91427deba04ddebe35c499b 100644 (file)
--- 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