[arch-commits] Commit in wireshark/repos/community-x86_64 (8 files)

Levente Polyak anthraxx at archlinux.org
Thu Feb 8 13:56:01 UTC 2018


    Date: Thursday, February 8, 2018 @ 13:56:00
  Author: anthraxx
Revision: 290290

archrelease: copy trunk to community-x86_64

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

------------------------------+
 PKGBUILD                     |  204 ++++++++++++++++++++---------------------
 do_not_use_svn_version.patch |   26 ++---
 wireshark.install            |   16 +--
 wireshark.sysusers           |    2 
 4 files changed, 123 insertions(+), 125 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-08 13:55:52 UTC (rev 290289)
+++ PKGBUILD	2018-02-08 13:56:00 UTC (rev 290290)
@@ -1,103 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: 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.4.4
-pkgrel=1
-arch=('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.xz
-        wireshark.sysusers
-        do_not_use_svn_version.patch)
-sha256sums=('049a758e39422dcd536d7f75cebbfaa44e4f305d602bf22964d6459821126f58'
-            'df07748152443c7d727bd51cd57af950c345b7141986b4f0e476cd6aa3623ac4'
-            '3981bb46f592e319f9c679c5e215ae0af828044a3b64d49d2cf0305ecacf4691')
-
-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-gtk=3 \
-      --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' 'libxml2' 'libnghttp2')
-  install=wireshark.install
-  conflicts=(wireshark)
-
-  cd ${pkgbase}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-  make DESTDIR="${pkgdir}" uninstall-local
-
-  # 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" "${pkgdir}/usr/bin/wireshark-gtk"
-
-  # headers
-  install -Dm 644 config.h register.h ws_diag_control.h ws_symbol_export.h -t "${pkgdir}/usr/include/${pkgbase}"
-  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/${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 -Dm 755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
-  install -Dm 644 wireshark-gtk.desktop -t "${pkgdir}/usr/share/applications"
-}
-
-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 -Dm 755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
-  install -Dm 644 wireshark.desktop -t "${pkgdir}/usr/share/applications"
-}
-
-# vim: ts=2 sw=2 et:

Copied: wireshark/repos/community-x86_64/PKGBUILD (from rev 290289, wireshark/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-02-08 13:56:00 UTC (rev 290290)
@@ -0,0 +1,101 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: 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.5.0
+pkgrel=1
+arch=('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.xz
+        wireshark.sysusers
+        do_not_use_svn_version.patch)
+sha256sums=('3da390e6874cb89bf885c284016fddd6db08543ef4c28747a92f95738618bc28'
+            'df07748152443c7d727bd51cd57af950c345b7141986b4f0e476cd6aa3623ac4'
+            '3981bb46f592e319f9c679c5e215ae0af828044a3b64d49d2cf0305ecacf4691')
+
+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-gtk=3 \
+      --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' 'libxml2' 'libnghttp2')
+  install=wireshark.install
+  conflicts=(wireshark)
+
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" uninstall-local
+
+  # 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" "${pkgdir}/usr/bin/wireshark-gtk"
+
+  # headers
+  install -Dm 644 *.h -t "${pkgdir}/usr/include/${pkgbase}"
+  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/${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 -Dm 755 .libs/wireshark-gtk "${pkgdir}/usr/bin/wireshark-gtk"
+  install -Dm 644 wireshark-gtk.desktop -t "${pkgdir}/usr/share/applications"
+}
+
+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 -Dm 755 .libs/wireshark "${pkgdir}/usr/bin/wireshark"
+  install -Dm 644 wireshark.desktop -t "${pkgdir}/usr/share/applications"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: do_not_use_svn_version.patch
===================================================================
--- do_not_use_svn_version.patch	2018-02-08 13:55:52 UTC (rev 290289)
+++ do_not_use_svn_version.patch	2018-02-08 13:56:00 UTC (rev 290290)
@@ -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 290289, wireshark/trunk/do_not_use_svn_version.patch)
===================================================================
--- do_not_use_svn_version.patch	                        (rev 0)
+++ do_not_use_svn_version.patch	2018-02-08 13:56:00 UTC (rev 290290)
@@ -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: wireshark.install
===================================================================
--- wireshark.install	2018-02-08 13:55:52 UTC (rev 290289)
+++ wireshark.install	2018-02-08 13:56:00 UTC (rev 290290)
@@ -1,8 +0,0 @@
-post_install() {
-    post_upgrade
-    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
-}
-
-post_upgrade() {
-    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
-}

Copied: wireshark/repos/community-x86_64/wireshark.install (from rev 290289, wireshark/trunk/wireshark.install)
===================================================================
--- wireshark.install	                        (rev 0)
+++ wireshark.install	2018-02-08 13:56:00 UTC (rev 290290)
@@ -0,0 +1,8 @@
+post_install() {
+    post_upgrade
+    echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group"
+}
+
+post_upgrade() {
+    setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip CAP_DAC_OVERRIDE+eip' usr/bin/dumpcap
+}

Deleted: wireshark.sysusers
===================================================================
--- wireshark.sysusers	2018-02-08 13:55:52 UTC (rev 290289)
+++ wireshark.sysusers	2018-02-08 13:56:00 UTC (rev 290290)
@@ -1 +0,0 @@
-g wireshark 150 - -

Copied: wireshark/repos/community-x86_64/wireshark.sysusers (from rev 290289, wireshark/trunk/wireshark.sysusers)
===================================================================
--- wireshark.sysusers	                        (rev 0)
+++ wireshark.sysusers	2018-02-08 13:56:00 UTC (rev 290290)
@@ -0,0 +1 @@
+g wireshark 150 - -



More information about the arch-commits mailing list