5 files changed, 62 insertions, 26 deletions
diff --git a/abs/extra/wireshark/PKGBUILD b/abs/extra/wireshark/PKGBUILD
index 3d6b90e..31fec18 100644
--- a/abs/extra/wireshark/PKGBUILD
+++ b/abs/extra/wireshark/PKGBUILD
@@ -1,29 +1,38 @@
-# $Id: PKGBUILD 94904 2010-10-12 06:47:49Z guillaume $
-# Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
+# $Id: PKGBUILD 168916 2012-10-16 14:27:05Z guillaume $
+# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=(wireshark-cli wireshark-gtk)
+pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.4.1
-pkgrel=1
+pkgver=1.8.3
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'heimdal' 'libpcap' 'bash' 'gnutls' 'libcap')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
+             'libgcrypt' 'lua' 'python2' )
 url="http://www.wireshark.org/"
 options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('1719d20a10990e7c2cb261df7021aab6')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+        enable_version.patch)
+sha1sums=('3e1322eea5794c71de752b7923af9379bcc95299'
+          '9a56a9153b6903e508b0375cde4f6e57ffc544e6')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  export CFLAGS="-fno-unit-at-a-time ${CFLAGS}"
 
-  ./configure --prefix=/usr --with-ssl
+  patch -p0 < ${srcdir}/enable_version.patch
+
+  ./autogen.sh
+  ./configure \
+      --prefix=/usr \
+      --with-ssl \
+      --with-zlib=yes \
+      --with-lua 
   make all
 }
 
 package_wireshark-cli() {
   pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version"
-  depends=('heimdal' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2')
+  depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua' )
   install=wireshark.install
   conflicts=(wireshark)
 
@@ -34,21 +43,35 @@ package_wireshark-cli() {
   #wireshark uid group is 150
   chgrp 150 "${pkgdir}/usr/bin/dumpcap"
   chmod 754 "${pkgdir}/usr/bin/dumpcap"
-  rm "$pkgdir/usr/bin/wireshark"
+  rm "${pkgdir}/usr/bin/wireshark"
+
+  # Headers
+  install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil}
+
+  install -m644 color.h config.h register.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}
+  done
 }
 
 package_wireshark-gtk() {
   pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - GTK frontend"
-  depends=('gtk2' 'wireshark-cli')
+  depends=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme')
   install=wireshark-gtk.install
   replaces=(wireshark)
   conflicts=(wireshark)
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  install -Dm755 .libs/wireshark "$pkgdir/usr/bin/wireshark"
+  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
   for d in 16 32 48; do
-      install -Dm644 image/hi${d}-app-wireshark.png ${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png
+    install -Dm644 image/hi${d}-app-wireshark.png  \
+                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png"
+  done
+
+  for d in 16 24 32 48 64 128 256 ; do
+    install -Dm644 image/WiresharkDoc-${d}.png \
+                   "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png"
   done
-  install -Dm644 wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop
+  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
 }
diff --git a/abs/extra/wireshark/__changelog b/abs/extra/wireshark/__changelog
new file mode 100644
index 0000000..50a34f6
--- /dev/null
+++ b/abs/extra/wireshark/__changelog
@@ -0,0 +1 @@
+removed portaudio
diff --git a/abs/extra/wireshark/enable_version.patch b/abs/extra/wireshark/enable_version.patch
new file mode 100644
index 0000000..18ad14b
--- /dev/null
+++ b/abs/extra/wireshark/enable_version.patch
@@ -0,0 +1,12 @@
+--- configure.in.init	2012-05-24 20:08:15.040038922 +0000
++++ configure.in	2012-05-24 20:08:27.869944008 +0000
+@@ -185,7 +185,7 @@
+ 		  [use gnutls library @<:@default=yes@:>@]),
+   with_gnutls="$withval", with_gnutls="yes")
+ if test "x$with_gnutls" = "xyes"; then
+-  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3],
++  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0],
+         [
+                 echo "gnuTLS found, enabling ssl decryption"
+                 AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use gnutls library])
+
diff --git a/abs/extra/wireshark/wireshark-gtk.install b/abs/extra/wireshark/wireshark-gtk.install
index 6b1b64b..771e497 100644
--- a/abs/extra/wireshark/wireshark-gtk.install
+++ b/abs/extra/wireshark/wireshark-gtk.install
@@ -1,5 +1,6 @@
 post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/abs/extra/wireshark/wireshark.install b/abs/extra/wireshark/wireshark.install
index 8936256..69adcc4 100644
--- a/abs/extra/wireshark/wireshark.install
+++ b/abs/extra/wireshark/wireshark.install
@@ -1,19 +1,18 @@
 post_install() {
-    if getent group wireshark >/dev/null 2>&1; then
-        groupmod -g 150 wireshark &>/dev/null
-    else
-        groupadd -g 150 wireshark &>/dev/null
-    fi
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+    /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
+
+    /usr/sbin/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() {
-    post_install $1
+    /usr/bin/getent group wireshark >/dev/null 2>&1 ||  usr/sbin/groupadd -g 150 wireshark &>/dev/null
+    
+    /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
 }
 
 post_remove() {
-    if getent group wireshark >/dev/null 2>&1; then
-        groupdel wireshark
+    if /usr/bin/getent group wireshark >/dev/null 2>&1; then
+        /usr/sbin/groupdel wireshark
     fi
 }