wireshark: update to 2.6.0

wireshark/PKGBUILD

@@ -1,22 +1,25 @@
 pkgname=wireshark
-pkgver=2.4.5
+pkgver=2.6.0
 pkgrel=1
 pkgdesc='A free network protocol analyzer for Unix/Linux and Windows'
 arch=('x86_64')
 license=('GPL2')
 depends=('libpcap' 'libcap' 'krb5' 'glib2' 'desktop-file-utils' 'hicolor-icon-theme' 'libssh'
-         'lua52' 'libgcrypt' 'qt5-base' 'qt5-multimedia' 'harfbuzz' 'portaudio' 'bash' 'gnutls')
+         'lua52' 'libgcrypt' 'qt5-base' 'qt5-multimedia' 'harfbuzz' 'portaudio' 'bash' 'gnutls' 'geoip')
 makedepends=('bison' 'flex' 'qt5-tools' 'python2')
 url='http://www.wireshark.org/'
 screenshot='https://blog.wireshark.org/wp-content/uploads/2015/11/Main-window-2.0.0rc2.png'
 install=${pkgname}.install
-source=(http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.xz)
+source=(http://www.wireshark.org/download/src/${pkgname}-${pkgver}.tar.xz
+        wireshark.sysusers
+        do_not_use_svn_version.patch)
 sha256sums=('b3b2ec29fba0f4a3a590438abe4054e56f19108d440fc2d61492db9d8ff16fd7')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  
+
-  sed -i 's/Exec=wireshark/Exec=wireshark-qt/g' wireshark.desktop
+  # Avoid ugly "svn rev unknown from unknown" version string
+  patch -p1 < "${srcdir}/do_not_use_svn_version.patch"
 }
 
 build() {
@@ -32,7 +35,8 @@ build() {
       --with-zlib \
       --with-lua \
       --with-krb5 \
-      --with-portaudio
+      --with-portaudio \
+      --with-geoip
   make all
 }
 
@@ -41,13 +45,16 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 
-  #wireshark uid group is 150
+  # wireshark uid group is 150
+  install -Dm644 "${srcdir}/wireshark.sysusers" "${pkgdir}/usr/lib/sysusers.d/wireshark.conf"
   chgrp 150 "${pkgdir}/usr/bin/dumpcap"
   chmod 754 "${pkgdir}/usr/bin/dumpcap"
-  #rm "${pkgdir}/usr/bin/wireshark"
 
-  # Headers
+  # headers
-  install -dm755 ${pkgdir}/usr/include/${pkgname}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
+  install -Dm 644 *.h -t "${pkgdir}/usr/include/${pkgname}"
+  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
+    install -Dm 644 ${d}/*.h -t "${pkgdir}/usr/include/${pkgname}/${d}"
+  done
 
   install -m644 cfile.h config.h file.h register.h ws_diag_control.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgname}"
   for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
@@ -65,8 +72,7 @@ package() {
                    "${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 -Dm 755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
-  sed -i s!wireshark-qt!wireshark! \
+  install -Dm 644 wireshark.desktop -t "${pkgdir}/usr/share/applications"
-  ${pkgdir}/usr/share/applications/wireshark.desktop
   rm "${pkgdir}/usr/share/applications/wireshark-gtk.desktop"
 }

wireshark/do_not_use_svn_version.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index e2a3cc5..b6ec684 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -711,7 +711,7 @@ am__v_PERL_0 = @echo "  PERL    " $@;
+ am__v_PERL_1 =
+ 
+ version.h: FORCE
+-	$(AM_V_PERL)$(PERL) $(srcdir)/make-version.pl $(srcdir)
++	touch $@
+ 
+ #
+ # Build shell scripts by doing variable substitution.

wireshark/wireshark.sysusers

@@ -0,0 +1 @@
+g wireshark 150 - -