From 0dda22e570c813b1f1d85a0d8c9a8a6768a46609 Mon Sep 17 00:00:00 2001
From: Thomas Penteker <tek@serverop.de>
Date: Thu, 13 Nov 2014 22:00:51 +0100
Subject: [PATCH] wireshark: disable qt4 builds, enable gtk3 builds and
 root-less setups

---
 wireshark/.footprint   |  1 -
 wireshark/Pkgfile      | 39 ++++++++++++++++++++-------------------
 wireshark/post-install | 12 ++++++++++++
 3 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100755 wireshark/post-install

diff --git a/wireshark/.footprint b/wireshark/.footprint
index c1ffbee80..ddb6885c4 100644
--- a/wireshark/.footprint
+++ b/wireshark/.footprint
@@ -12,7 +12,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/text2pcap
 -rwxr-xr-x	root/root	usr/bin/tshark
 -rwxr-xr-x	root/root	usr/bin/wireshark
--rwxr-xr-x	root/root	usr/bin/wireshark-qt
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libfiletap.la
 lrwxrwxrwx	root/root	usr/lib/libfiletap.so -> libfiletap.so.0.0.1
diff --git a/wireshark/Pkgfile b/wireshark/Pkgfile
index 282d0e07a..ce3a3389c 100644
--- a/wireshark/Pkgfile
+++ b/wireshark/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.wireshark.org
 # Maintainer:  Thomas Penteker, tek at serverop dot de
 # Packager: Martin Opel, mo at obbl-net dot de
-# Depends on: gtk libpcap libpcre
+# Depends on: gtk3 libpcap libpcre
 
 name=wireshark
 version=1.12.1
@@ -10,26 +10,27 @@ release=1
 source=(http://www.$name.org/download/src/all-versions/$name-$version.tar.bz2)
 
 build() {
-	cd $name-$version
+  cd $name-$version
 
-	./configure --prefix=/usr \
-	            --mandir=/usr/man \
-	            --with-plugins=/usr/lib/$name/plugins \
-	            --disable-nls \
-	            --enable-snmp \
-	            --enable-gtk2 \
-	            --disable-gcry \
-	            --without-krb5
+  ./configure --prefix=/usr \
+              --mandir=/usr/man \
+              --with-plugins=/usr/lib/$name/plugins \
+              --disable-nls \
+              --enable-snmp \
+              --disable-gcry \
+              --without-krb5 \
+              --with-qt4=no \
+              --with-gtk3=yes
 
-	make
-	make DESTDIR=$PKG install
+  make
+  make DESTDIR=$PKG install
 
-	# install some icons
-	install -d $PKG/usr/share/$name/pixmaps
-	install -m 644 \
-		image/{hi,lo}{16,32,48}-app-$name.png \
-		$PKG/usr/share/$name/pixmaps
+  # install some icons
+  install -d $PKG/usr/share/$name/pixmaps
+  install -m 644 \
+    image/{hi,lo}{16,32,48}-app-$name.png \
+    $PKG/usr/share/$name/pixmaps
 
-	# Don't remove these files, they are read by wireshark's about box.
-	#rm -f $PKG/usr/share/$name/{AUTHORS-SHORT,COPYING}
+  # Don't remove these files, they are read by wireshark's about box.
+  #rm -f $PKG/usr/share/$name/{AUTHORS-SHORT,COPYING}
 }
diff --git a/wireshark/post-install b/wireshark/post-install
new file mode 100755
index 000000000..ac8bd166a
--- /dev/null
+++ b/wireshark/post-install
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# Add your users to the wireshark group and allow them to capture network data
+# as non-root users.
+#
+
+
+getent group wireshark >/dev/null || groupadd -r wireshark
+
+chgrp wireshark /usr/bin/dumpcap
+chmod 754 /usr/sbin/dumpcap
+setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' /usr/bin/dumpcap