# HG changeset patch
# User Petr Sumbera <petr.sumbera@oracle.com>
# Date 1345193044 25200
# Node ID ca69cdd365db26059d153d8232a498dc93813014
# Parent  cb53236158bb7edc8662d3a0cd90d8b7d9e6048f
7192237 wireshark and tshark binaries don't require extra privileges

diff -r cb53236158bb -r ca69cdd365db components/wireshark/exec_attr.tshark
--- a/components/wireshark/exec_attr.tshark	Tue Aug 14 16:39:52 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Network Management:solaris:cmd:RO::/usr/sbin/tshark:privs=net_rawaccess
diff -r cb53236158bb -r ca69cdd365db components/wireshark/exec_attr.wireshark
--- a/components/wireshark/exec_attr.wireshark	Tue Aug 14 16:39:52 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Network Management:solaris:cmd:RO::/usr/sbin/wireshark:privs=net_rawaccess
diff -r cb53236158bb -r ca69cdd365db components/wireshark/patches/DesktopEntry.patch
--- a/components/wireshark/patches/DesktopEntry.patch	Tue Aug 14 16:39:52 2012 +0200
+++ b/components/wireshark/patches/DesktopEntry.patch	Fri Aug 17 01:44:04 2012 -0700
@@ -7,7 +7,7 @@
 -TryExec=wireshark
 -Exec=wireshark %f
 +TryExec=/usr/sbin/wireshark
-+Exec=/usr/sbin/wireshark %f
++Exec=pfexec /usr/sbin/wireshark %f
  Terminal=false
  MimeType=application/vnd.tcpdump.pcap;
  # Categorie entry according to version 1.0 of
diff -r cb53236158bb -r ca69cdd365db components/wireshark/tshark.p5m
--- a/components/wireshark/tshark.p5m	Tue Aug 14 16:39:52 2012 +0200
+++ b/components/wireshark/tshark.p5m	Fri Aug 17 01:44:04 2012 -0700
@@ -32,14 +32,10 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=etc
-dir path=etc/security
-dir path=etc/security/exec_attr.d
 dir path=usr/sbin
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file exec_attr.tshark path=etc/security/exec_attr.d/diagnostic:wireshark:tshark
 file path=usr/sbin/tshark
 file path=usr/share/man/man1/tshark.1
 
diff -r cb53236158bb -r ca69cdd365db components/wireshark/wireshark.p5m
--- a/components/wireshark/wireshark.p5m	Tue Aug 14 16:39:52 2012 +0200
+++ b/components/wireshark/wireshark.p5m	Fri Aug 17 01:44:04 2012 -0700
@@ -32,9 +32,6 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=etc
-dir path=etc/security
-dir path=etc/security/exec_attr.d
 dir path=usr
 dir path=usr/sbin
 dir path=usr/share
@@ -42,7 +39,6 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/pixmaps
-file exec_attr.wireshark path=etc/security/exec_attr.d/diagnostic:wireshark
 file path=usr/sbin/wireshark
 file wireshark-$(IPS_COMPONENT_VERSION)/wireshark.desktop \
     path=usr/share/applications/wireshark.desktop