[arch-commits] Commit in wireshark/repos (12 files)

Timothy Redaelli tredaelli at archlinux.org
Fri Oct 28 09:52:11 UTC 2016


    Date: Friday, October 28, 2016 @ 09:52:10
  Author: tredaelli
Revision: 193881

archrelease: copy trunk to community-i686, community-x86_64

Added:
  wireshark/repos/community-i686/PKGBUILD
    (from rev 193880, wireshark/trunk/PKGBUILD)
  wireshark/repos/community-i686/do_not_use_svn_version.patch
    (from rev 193880, wireshark/trunk/do_not_use_svn_version.patch)
  wireshark/repos/community-i686/wireshark.install
    (from rev 193880, wireshark/trunk/wireshark.install)
  wireshark/repos/community-x86_64/PKGBUILD
    (from rev 193880, wireshark/trunk/PKGBUILD)
  wireshark/repos/community-x86_64/do_not_use_svn_version.patch
    (from rev 193880, wireshark/trunk/do_not_use_svn_version.patch)
  wireshark/repos/community-x86_64/wireshark.install
    (from rev 193880, wireshark/trunk/wireshark.install)
Deleted:
  wireshark/repos/community-i686/PKGBUILD
  wireshark/repos/community-i686/do_not_use_svn_version.patch
  wireshark/repos/community-i686/wireshark.install
  wireshark/repos/community-x86_64/PKGBUILD
  wireshark/repos/community-x86_64/do_not_use_svn_version.patch
  wireshark/repos/community-x86_64/wireshark.install

-----------------------------------------------+
 /PKGBUILD                                     |  202 ++++++++++++++++++++++++
 /do_not_use_svn_version.patch                 |   26 +++
 /wireshark.install                            |   36 ++++
 community-i686/PKGBUILD                       |  101 ------------
 community-i686/do_not_use_svn_version.patch   |   13 -
 community-i686/wireshark.install              |   18 --
 community-x86_64/PKGBUILD                     |  101 ------------
 community-x86_64/do_not_use_svn_version.patch |   13 -
 community-x86_64/wireshark.install            |   18 --
 9 files changed, 264 insertions(+), 264 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-10-28 09:51:59 UTC (rev 193880)
+++ community-i686/PKGBUILD	2016-10-28 09:52:10 UTC (rev 193881)
@@ -1,101 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt')
-pkgbase=wireshark
-pkgver=2.2.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('c-ares' 'geoip' 'qt5-tools' 'qt5-multimedia' 'gtk3' 'krb5' 'libpcap' 'bash' 'libssh'
-             'gnutls' 'portaudio' 'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
-options=(!emptydirs)
-url='https://www.wireshark.org/'
-source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        do_not_use_svn_version.patch)
-sha1sums=('4b47bf8e2053073585318646e27d2aa9dc7c7238'
-          '489a176a7b90f7ae6f0985510c0c9038de54d9d6')
-
-prepare() {
-  cd ${pkgbase}-${pkgver}
-
-  # Avoid ugly "svn rev unknown from unknown" version string
-  patch -p1 < "$srcdir"/do_not_use_svn_version.patch
-}
-
-build() {
-  cd ${pkgbase}-${pkgver}
-
-  ./autogen.sh
-  ./configure \
-      --prefix=/usr \
-      --with-qt=5 \
-      --with-gtk3=yes \
-      --with-pcap \
-      --with-zlib \
-      --with-lua \
-      --with-portaudio \
-      --with-ssl \
-      --with-krb5 \
-      --with-c-ares \
-      --with-geoip
-  make all
-}
-
-package_wireshark-cli() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
-  depends=('c-ares' 'geoip' 'krb5' 'libgcrypt' 'libcap' 'libpcap' 'gnutls' 'glib2' 'lua52' 'libssh')
-  install=wireshark.install
-  conflicts=(wireshark)
-
-  cd ${pkgbase}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" uninstall-local
-
-  #wireshark uid group is 150
-  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
-  chmod 754 "${pkgdir}/usr/bin/dumpcap"
-  rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-gtk"
-
-  # Headers
-  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
-
-  install -m644 config.h register.h ws_diag_control.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
-  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
-    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
-  done
-}
-
-package_wireshark-common() {
-  pkgdesc='Common files used by wireshark-gtk and wireshark-qt'
-  depends=('hicolor-icon-theme' 'shared-mime-info' 'xdg-utils')
-
-  cd ${pkgbase}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install-data-local
-  rm "${pkgdir}"/usr/share/applications/wireshark{,-gtk}.desktop
-}
-
-package_wireshark-gtk() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
-  depends=('desktop-file-utils' 'gtk3' 'portaudio' 'wireshark-cli' 'wireshark-common')
-  replaces=(wireshark)
-  conflicts=(wireshark)
-
-  cd ${pkgbase}-${pkgver}
-
-  install -Dm755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
-  install -Dm644 wireshark-gtk.desktop "${pkgdir}/usr/share/applications/wireshark-gtk.desktop"
-}
-
-package_wireshark-qt() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
-  depends=('desktop-file-utils' 'qt5-multimedia' 'wireshark-cli' 'wireshark-common')
-
-  cd ${pkgbase}-${pkgver}
-
-  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
-  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
-}

Copied: wireshark/repos/community-i686/PKGBUILD (from rev 193880, wireshark/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-10-28 09:52:10 UTC (rev 193881)
@@ -0,0 +1,101 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
+pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt')
+pkgbase=wireshark
+pkgver=2.2.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('c-ares' 'geoip' 'qt5-tools' 'qt5-multimedia' 'gtk3' 'krb5' 'libpcap' 'bash' 'libssh'
+             'gnutls' 'portaudio' 'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
+options=(!emptydirs)
+url='https://www.wireshark.org/'
+source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+        do_not_use_svn_version.patch)
+sha1sums=('fe07ab3582f39111ce5c78f5de6f44a8667000ac'
+          '489a176a7b90f7ae6f0985510c0c9038de54d9d6')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+
+  # Avoid ugly "svn rev unknown from unknown" version string
+  patch -p1 < "$srcdir"/do_not_use_svn_version.patch
+}
+
+build() {
+  cd ${pkgbase}-${pkgver}
+
+  ./autogen.sh
+  ./configure \
+      --prefix=/usr \
+      --with-qt=5 \
+      --with-gtk3=yes \
+      --with-pcap \
+      --with-zlib \
+      --with-lua \
+      --with-portaudio \
+      --with-ssl \
+      --with-krb5 \
+      --with-c-ares \
+      --with-geoip
+  make all
+}
+
+package_wireshark-cli() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
+  depends=('c-ares' 'geoip' 'krb5' 'libgcrypt' 'libcap' 'libpcap' 'gnutls' 'glib2' 'lua52' 'libssh')
+  install=wireshark.install
+  conflicts=(wireshark)
+
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" uninstall-local
+
+  #wireshark uid group is 150
+  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+  chmod 754 "${pkgdir}/usr/bin/dumpcap"
+  rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-gtk"
+
+  # Headers
+  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
+
+  install -m644 config.h register.h ws_diag_control.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
+  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
+    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
+  done
+}
+
+package_wireshark-common() {
+  pkgdesc='Common files used by wireshark-gtk and wireshark-qt'
+  depends=('hicolor-icon-theme' 'shared-mime-info' 'xdg-utils')
+
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install-data-local
+  rm "${pkgdir}"/usr/share/applications/wireshark{,-gtk}.desktop
+}
+
+package_wireshark-gtk() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
+  depends=('desktop-file-utils' 'gtk3' 'portaudio' 'wireshark-cli' 'wireshark-common')
+  replaces=(wireshark)
+  conflicts=(wireshark)
+
+  cd ${pkgbase}-${pkgver}
+
+  install -Dm755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
+  install -Dm644 wireshark-gtk.desktop "${pkgdir}/usr/share/applications/wireshark-gtk.desktop"
+}
+
+package_wireshark-qt() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
+  depends=('desktop-file-utils' 'qt5-multimedia' 'wireshark-cli' 'wireshark-common')
+
+  cd ${pkgbase}-${pkgver}
+
+  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
+}

Deleted: community-i686/do_not_use_svn_version.patch
===================================================================
--- community-i686/do_not_use_svn_version.patch	2016-10-28 09:51:59 UTC (rev 193880)
+++ community-i686/do_not_use_svn_version.patch	2016-10-28 09:52:10 UTC (rev 193881)
@@ -1,13 +0,0 @@
-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.

Copied: wireshark/repos/community-i686/do_not_use_svn_version.patch (from rev 193880, wireshark/trunk/do_not_use_svn_version.patch)
===================================================================
--- community-i686/do_not_use_svn_version.patch	                        (rev 0)
+++ community-i686/do_not_use_svn_version.patch	2016-10-28 09:52:10 UTC (rev 193881)
@@ -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.

Deleted: community-i686/wireshark.install
===================================================================
--- community-i686/wireshark.install	2016-10-28 09:51:59 UTC (rev 193880)
+++ community-i686/wireshark.install	2016-10-28 09:52:10 UTC (rev 193881)
@@ -1,18 +0,0 @@
-post_install() {
-    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
-
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
-    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
-}
-
-post_upgrade() {
-    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
-
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
-}
-
-post_remove() {
-    if getent group wireshark >/dev/null 2>&1; then
-        groupdel wireshark
-    fi
-}

Copied: wireshark/repos/community-i686/wireshark.install (from rev 193880, wireshark/trunk/wireshark.install)
===================================================================
--- community-i686/wireshark.install	                        (rev 0)
+++ community-i686/wireshark.install	2016-10-28 09:52:10 UTC (rev 193881)
@@ -0,0 +1,18 @@
+post_install() {
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
+
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
+    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
+}
+
+post_upgrade() {
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
+
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
+}
+
+post_remove() {
+    if getent group wireshark >/dev/null 2>&1; then
+        groupdel wireshark
+    fi
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2016-10-28 09:51:59 UTC (rev 193880)
+++ community-x86_64/PKGBUILD	2016-10-28 09:52:10 UTC (rev 193881)
@@ -1,101 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
-pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt')
-pkgbase=wireshark
-pkgver=2.2.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL2')
-makedepends=('c-ares' 'geoip' 'qt5-tools' 'qt5-multimedia' 'gtk3' 'krb5' 'libpcap' 'bash' 'libssh'
-             'gnutls' 'portaudio' 'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
-options=(!emptydirs)
-url='https://www.wireshark.org/'
-source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        do_not_use_svn_version.patch)
-sha1sums=('4b47bf8e2053073585318646e27d2aa9dc7c7238'
-          '489a176a7b90f7ae6f0985510c0c9038de54d9d6')
-
-prepare() {
-  cd ${pkgbase}-${pkgver}
-
-  # Avoid ugly "svn rev unknown from unknown" version string
-  patch -p1 < "$srcdir"/do_not_use_svn_version.patch
-}
-
-build() {
-  cd ${pkgbase}-${pkgver}
-
-  ./autogen.sh
-  ./configure \
-      --prefix=/usr \
-      --with-qt=5 \
-      --with-gtk3=yes \
-      --with-pcap \
-      --with-zlib \
-      --with-lua \
-      --with-portaudio \
-      --with-ssl \
-      --with-krb5 \
-      --with-c-ares \
-      --with-geoip
-  make all
-}
-
-package_wireshark-cli() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
-  depends=('c-ares' 'geoip' 'krb5' 'libgcrypt' 'libcap' 'libpcap' 'gnutls' 'glib2' 'lua52' 'libssh')
-  install=wireshark.install
-  conflicts=(wireshark)
-
-  cd ${pkgbase}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" uninstall-local
-
-  #wireshark uid group is 150
-  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
-  chmod 754 "${pkgdir}/usr/bin/dumpcap"
-  rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-gtk"
-
-  # Headers
-  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
-
-  install -m644 config.h register.h ws_diag_control.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
-  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
-    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
-  done
-}
-
-package_wireshark-common() {
-  pkgdesc='Common files used by wireshark-gtk and wireshark-qt'
-  depends=('hicolor-icon-theme' 'shared-mime-info' 'xdg-utils')
-
-  cd ${pkgbase}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install-data-local
-  rm "${pkgdir}"/usr/share/applications/wireshark{,-gtk}.desktop
-}
-
-package_wireshark-gtk() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
-  depends=('desktop-file-utils' 'gtk3' 'portaudio' 'wireshark-cli' 'wireshark-common')
-  replaces=(wireshark)
-  conflicts=(wireshark)
-
-  cd ${pkgbase}-${pkgver}
-
-  install -Dm755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
-  install -Dm644 wireshark-gtk.desktop "${pkgdir}/usr/share/applications/wireshark-gtk.desktop"
-}
-
-package_wireshark-qt() {
-  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
-  depends=('desktop-file-utils' 'qt5-multimedia' 'wireshark-cli' 'wireshark-common')
-
-  cd ${pkgbase}-${pkgver}
-
-  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
-  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
-}

Copied: wireshark/repos/community-x86_64/PKGBUILD (from rev 193880, wireshark/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-10-28 09:52:10 UTC (rev 193881)
@@ -0,0 +1,101 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
+pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt')
+pkgbase=wireshark
+pkgver=2.2.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL2')
+makedepends=('c-ares' 'geoip' 'qt5-tools' 'qt5-multimedia' 'gtk3' 'krb5' 'libpcap' 'bash' 'libssh'
+             'gnutls' 'portaudio' 'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
+options=(!emptydirs)
+url='https://www.wireshark.org/'
+source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+        do_not_use_svn_version.patch)
+sha1sums=('fe07ab3582f39111ce5c78f5de6f44a8667000ac'
+          '489a176a7b90f7ae6f0985510c0c9038de54d9d6')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+
+  # Avoid ugly "svn rev unknown from unknown" version string
+  patch -p1 < "$srcdir"/do_not_use_svn_version.patch
+}
+
+build() {
+  cd ${pkgbase}-${pkgver}
+
+  ./autogen.sh
+  ./configure \
+      --prefix=/usr \
+      --with-qt=5 \
+      --with-gtk3=yes \
+      --with-pcap \
+      --with-zlib \
+      --with-lua \
+      --with-portaudio \
+      --with-ssl \
+      --with-krb5 \
+      --with-c-ares \
+      --with-geoip
+  make all
+}
+
+package_wireshark-cli() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
+  depends=('c-ares' 'geoip' 'krb5' 'libgcrypt' 'libcap' 'libpcap' 'gnutls' 'glib2' 'lua52' 'libssh')
+  install=wireshark.install
+  conflicts=(wireshark)
+
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" uninstall-local
+
+  #wireshark uid group is 150
+  chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+  chmod 754 "${pkgdir}/usr/bin/dumpcap"
+  rm "${pkgdir}/usr/bin/wireshark" "${pkgdir}/usr/bin/wireshark-gtk"
+
+  # Headers
+  install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes,wmem},wiretap,wsutil}
+
+  install -m644 config.h register.h ws_diag_control.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}"
+  for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes epan/wmem wiretap wsutil; do
+    install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d}
+  done
+}
+
+package_wireshark-common() {
+  pkgdesc='Common files used by wireshark-gtk and wireshark-qt'
+  depends=('hicolor-icon-theme' 'shared-mime-info' 'xdg-utils')
+
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install-data-local
+  rm "${pkgdir}"/usr/share/applications/wireshark{,-gtk}.desktop
+}
+
+package_wireshark-gtk() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend'
+  depends=('desktop-file-utils' 'gtk3' 'portaudio' 'wireshark-cli' 'wireshark-common')
+  replaces=(wireshark)
+  conflicts=(wireshark)
+
+  cd ${pkgbase}-${pkgver}
+
+  install -Dm755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
+  install -Dm644 wireshark-gtk.desktop "${pkgdir}/usr/share/applications/wireshark-gtk.desktop"
+}
+
+package_wireshark-qt() {
+  pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - Qt frontend'
+  depends=('desktop-file-utils' 'qt5-multimedia' 'wireshark-cli' 'wireshark-common')
+
+  cd ${pkgbase}-${pkgver}
+
+  install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+  install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop"
+}

Deleted: community-x86_64/do_not_use_svn_version.patch
===================================================================
--- community-x86_64/do_not_use_svn_version.patch	2016-10-28 09:51:59 UTC (rev 193880)
+++ community-x86_64/do_not_use_svn_version.patch	2016-10-28 09:52:10 UTC (rev 193881)
@@ -1,13 +0,0 @@
-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.

Copied: wireshark/repos/community-x86_64/do_not_use_svn_version.patch (from rev 193880, wireshark/trunk/do_not_use_svn_version.patch)
===================================================================
--- community-x86_64/do_not_use_svn_version.patch	                        (rev 0)
+++ community-x86_64/do_not_use_svn_version.patch	2016-10-28 09:52:10 UTC (rev 193881)
@@ -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.

Deleted: community-x86_64/wireshark.install
===================================================================
--- community-x86_64/wireshark.install	2016-10-28 09:51:59 UTC (rev 193880)
+++ community-x86_64/wireshark.install	2016-10-28 09:52:10 UTC (rev 193881)
@@ -1,18 +0,0 @@
-post_install() {
-    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
-
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
-    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
-}
-
-post_upgrade() {
-    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
-
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
-}
-
-post_remove() {
-    if getent group wireshark >/dev/null 2>&1; then
-        groupdel wireshark
-    fi
-}

Copied: wireshark/repos/community-x86_64/wireshark.install (from rev 193880, wireshark/trunk/wireshark.install)
===================================================================
--- community-x86_64/wireshark.install	                        (rev 0)
+++ community-x86_64/wireshark.install	2016-10-28 09:52:10 UTC (rev 193881)
@@ -0,0 +1,18 @@
+post_install() {
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
+
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
+    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
+}
+
+post_upgrade() {
+    getent group wireshark >/dev/null 2>&1 ||  groupadd -g 150 wireshark &>/dev/null
+
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
+}
+
+post_remove() {
+    if getent group wireshark >/dev/null 2>&1; then
+        groupdel wireshark
+    fi
+}



More information about the arch-commits mailing list