[arch-commits] Commit in wireshark/repos/community-x86_64 (8 files)
Levente Polyak
anthraxx at archlinux.org
Wed Jan 9 22:40:14 UTC 2019
Date: Wednesday, January 9, 2019 @ 22:40:12
Author: anthraxx
Revision: 421319
archrelease: copy trunk to community-x86_64
Added:
wireshark/repos/community-x86_64/PKGBUILD
(from rev 421318, wireshark/trunk/PKGBUILD)
wireshark/repos/community-x86_64/do_not_use_svn_version.patch
(from rev 421318, wireshark/trunk/do_not_use_svn_version.patch)
wireshark/repos/community-x86_64/wireshark.install
(from rev 421318, wireshark/trunk/wireshark.install)
wireshark/repos/community-x86_64/wireshark.sysusers
(from rev 421318, 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, 124 insertions(+), 124 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-09 22:40:03 UTC (rev 421318)
+++ PKGBUILD 2019-01-09 22:40:12 UTC (rev 421319)
@@ -1,102 +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>
-
-pkgbase=wireshark
-pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt')
-pkgver=2.6.5
-pkgrel=1
-pkgdesc='Network traffic and protocol analyzer/sniffer'
-url='https://www.wireshark.org/'
-arch=('x86_64')
-license=('GPL2')
-makedepends=('c-ares' 'libmaxminddb' 'qt5-tools' 'qt5-multimedia' 'gtk3' 'krb5' 'libpcap' 'bash' 'libssh'
- 'gnutls' 'portaudio' 'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
-options=('!emptydirs')
-source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.xz
- wireshark.sysusers
- do_not_use_svn_version.patch)
-sha512sums=('fed2d08bb0ba06496c22a5d45946faf2ff4ca19c59faf758c668c583193faeec3c4379b64750478469fede91562891e9b6991591a09a3da8d2193cb64718d02f'
- '3956c1226e64f0ce4df463f80b55b15eed06ecd9b8703b3e8309d4236a6e1ca84e43007336f3987bc862d8a5e7cfcaaf6653125d2a34999a0f1357c52e7c4990'
- '847eac73c789b02f57f0ec378d086aea5a103cf0c6525c227d168ad67db08703686d4df37ed2ac95f47125cfcd5cafd472e2988f7f743428b291dc2aebe0f435')
-
-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-maxmind
- make all
-}
-
-package_wireshark-cli() {
- pkgdesc+=' - CLI version'
- depends=('c-ares' 'libmaxminddb' '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'
- 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+=' - 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+=' - 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 421318, wireshark/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-01-09 22:40:12 UTC (rev 421319)
@@ -0,0 +1,102 @@
+# 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>
+
+pkgbase=wireshark
+pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt')
+pkgver=2.6.6
+pkgrel=1
+pkgdesc='Network traffic and protocol analyzer/sniffer'
+url='https://www.wireshark.org/'
+arch=('x86_64')
+license=('GPL2')
+makedepends=('c-ares' 'libmaxminddb' 'qt5-tools' 'qt5-multimedia' 'gtk3' 'krb5' 'libpcap' 'bash' 'libssh'
+ 'gnutls' 'portaudio' 'lua52' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
+options=('!emptydirs')
+source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.xz
+ wireshark.sysusers
+ do_not_use_svn_version.patch)
+sha512sums=('b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56'
+ '3956c1226e64f0ce4df463f80b55b15eed06ecd9b8703b3e8309d4236a6e1ca84e43007336f3987bc862d8a5e7cfcaaf6653125d2a34999a0f1357c52e7c4990'
+ '847eac73c789b02f57f0ec378d086aea5a103cf0c6525c227d168ad67db08703686d4df37ed2ac95f47125cfcd5cafd472e2988f7f743428b291dc2aebe0f435')
+
+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-maxmind
+ make all
+}
+
+package_wireshark-cli() {
+ pkgdesc+=' - CLI version'
+ depends=('c-ares' 'libmaxminddb' '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'
+ 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+=' - 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+=' - 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 2019-01-09 22:40:03 UTC (rev 421318)
+++ do_not_use_svn_version.patch 2019-01-09 22:40:12 UTC (rev 421319)
@@ -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 421318, wireshark/trunk/do_not_use_svn_version.patch)
===================================================================
--- do_not_use_svn_version.patch (rev 0)
+++ do_not_use_svn_version.patch 2019-01-09 22:40:12 UTC (rev 421319)
@@ -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 2019-01-09 22:40:03 UTC (rev 421318)
+++ wireshark.install 2019-01-09 22:40:12 UTC (rev 421319)
@@ -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 421318, wireshark/trunk/wireshark.install)
===================================================================
--- wireshark.install (rev 0)
+++ wireshark.install 2019-01-09 22:40:12 UTC (rev 421319)
@@ -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 2019-01-09 22:40:03 UTC (rev 421318)
+++ wireshark.sysusers 2019-01-09 22:40:12 UTC (rev 421319)
@@ -1 +0,0 @@
-g wireshark 150 - -
Copied: wireshark/repos/community-x86_64/wireshark.sysusers (from rev 421318, wireshark/trunk/wireshark.sysusers)
===================================================================
--- wireshark.sysusers (rev 0)
+++ wireshark.sysusers 2019-01-09 22:40:12 UTC (rev 421319)
@@ -0,0 +1 @@
+g wireshark 150 - -
More information about the arch-commits
mailing list