Thu Sep 12 01:42:53 PDT 2013

3 files changed, 18 insertions, 33 deletions

diff --git a/extra/wireshark/01_fix_pod_file.patch b/extra/wireshark/01_fix_pod_file.patch
deleted file mode 100644
index f75f4c0bf..000000000
--- a/extra/wireshark/01_fix_pod_file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/doc/reordercap.pod	2013/05/20 05:45:32	49435
-+++ trunk/doc/reordercap.pod	2013/05/20 14:56:18	49436
-@@ -40,6 +40,8 @@
- When the B<-n> option is used, B<reordercap> will not write out the output
- file if it finds that the input file is already in order.
- 
-+=back
-+
- =head1 SEE ALSO
- 
- pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1),
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index d8136a396..cb7e84cc2 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,25 +1,21 @@
-# $Id: PKGBUILD 191608 2013-07-27 17:57:23Z guillaume $
+# $Id: PKGBUILD 194226 2013-09-11 02:06:50Z eric $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.10.1
+pkgver=1.10.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
-             'libgcrypt' 'lua51' 'python')
+makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls'
+             'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
 url='http://www.wireshark.org/'
 options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        01_fix_pod_file.patch)
-sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc'
-            '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
+sha256sums=('b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  patch -p1 <${srcdir}/01_fix_pod_file.patch
+  cd ${pkgbase}-${pkgver}
 
   ./autogen.sh
   ./configure \
@@ -33,11 +29,11 @@ build() {
 
 package_wireshark-cli() {
   pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
-  depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51')
+  depends=('krb5' 'libpcap' 'bash' 'gnutls'  'glib2' 'lua')
   install=wireshark.install
   conflicts=(wireshark)
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
 
@@ -47,11 +43,11 @@ package_wireshark-cli() {
   rm "${pkgdir}/usr/bin/wireshark"
 
   # Headers
-  install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
 
   install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
   for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do
-    install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d}
+    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
   done
 }
 
@@ -62,7 +58,7 @@ package_wireshark-gtk() {
   replaces=(wireshark)
   conflicts=(wireshark)
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
 
   install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
   for d in 16 32 48; do
diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install
index 001bd0c58..719171d9e 100644
--- a/extra/wireshark/wireshark.install
+++ b/extra/wireshark/wireshark.install
@@ -1,18 +1,18 @@
 post_install() {
-    /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
 
-    /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
     echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
 }
 
 post_upgrade() {
-    /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
 
-    /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
 }
 
 post_remove() {
-    if /usr/bin/getent group wireshark >/dev/null 2>&1; then
-        /usr/sbin/groupdel wireshark
+    if getent group wireshark >/dev/null 2>&1; then
+        groupdel wireshark
     fi
 }