From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1010683-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 656B61382C5
for <garchives@archives.gentoo.org>; Sun, 18 Mar 2018 21:55:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 760E4E08C9;
Sun, 18 Mar 2018 21:54:59 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 367FDE08C9
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Mar 2018 21:54:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E9B78335D4A
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Mar 2018 21:54:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 82873242
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Mar 2018 21:54:55 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1521410093.945b9db69ac69beefa9642e3c86b91d2e7c8c708.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-analyzer/wireshark/wireshark-2.4.5.ebuild net-analyzer/wireshark/wireshark-2.5.0.ebuild net-analyzer/wireshark/wireshark-2.5.1.ebuild net-analyzer/wireshark/wireshark-99999999.ebuild
X-VCS-Directories: net-analyzer/wireshark/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 945b9db69ac69beefa9642e3c86b91d2e7c8c708
X-VCS-Branch: master
Date: Sun, 18 Mar 2018 21:54:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b64f0723-eb6f-471f-af8b-676cfafe86cf
X-Archives-Hash: 4e9348ab87f4f388eeb58dc5f594fa1b
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