[arch-commits] Commit in wireshark/repos/community-x86_64 (6 files)
Levente Polyak
anthraxx at archlinux.org
Sat May 23 21:33:33 UTC 2020
Date: Saturday, May 23, 2020 @ 21:33:32
Author: anthraxx
Revision: 632603
archrelease: copy trunk to community-x86_64
Added:
wireshark/repos/community-x86_64/PKGBUILD
(from rev 632602, wireshark/trunk/PKGBUILD)
wireshark/repos/community-x86_64/wireshark.install
(from rev 632602, wireshark/trunk/wireshark.install)
wireshark/repos/community-x86_64/wireshark.sysusers
(from rev 632602, wireshark/trunk/wireshark.sysusers)
Deleted:
wireshark/repos/community-x86_64/PKGBUILD
wireshark/repos/community-x86_64/wireshark.install
wireshark/repos/community-x86_64/wireshark.sysusers
--------------------+
PKGBUILD | 184 ++++++++++++++++++++++++++-------------------------
wireshark.install | 16 ++--
wireshark.sysusers | 2
3 files changed, 106 insertions(+), 96 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-23 21:33:25 UTC (rev 632602)
+++ PKGBUILD 2020-05-23 21:33:32 UTC (rev 632603)
@@ -1,87 +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>
-# Contributor: Peter Wu <peter at lekensteyn.nl>
-
-pkgbase=wireshark
-pkgname=('wireshark-cli' 'wireshark-qt')
-pkgver=3.2.3
-pkgrel=1
-pkgdesc='Network traffic and protocol analyzer/sniffer'
-url='https://www.wireshark.org/'
-arch=('x86_64')
-license=('GPL2')
-makedepends=('cmake' 'ninja' 'c-ares' 'libmaxminddb' 'qt5-tools' 'qt5-svg'
- 'qt5-multimedia' 'krb5' 'libpcap' 'libssh' 'libxml2' 'libnghttp2'
- 'snappy' 'lz4' 'spandsp' 'gnutls' 'lua52' 'python' 'libcap'
- 'glib2' 'libgcrypt' 'sbc' 'bcg729' 'desktop-file-utils'
- 'hicolor-icon-theme')
-options=('!emptydirs')
-source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.xz
- wireshark.sysusers)
-sha512sums=('6e13f5aba9c3f531fab94c9f19e85856278ff534d02e406143c0c134c9b37a76d372105b43f51e95f319e31d742fc17c2812defe377886bd8f7ed03f743f9e9a'
- '3956c1226e64f0ce4df463f80b55b15eed06ecd9b8703b3e8309d4236a6e1ca84e43007336f3987bc862d8a5e7cfcaaf6653125d2a34999a0f1357c52e7c4990')
-
-prepare() {
- cd ${pkgbase}-${pkgver}
- sed 's| Rev Unknown from unknown||' -i tools/make-version.pl
-}
-
-build() {
- cd ${pkgbase}-${pkgver}
- cmake . -GNinja \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_INSTALL_RPATH= \
- -DCMAKE_SKIP_RPATH=ON
- ninja
-}
-
-package_wireshark-cli() {
- pkgdesc+=' - CLI tools and data files'
- depends=('c-ares' 'libmaxminddb' 'krb5' 'libgcrypt' 'libcap' 'libpcap'
- 'gnutls' 'glib2' 'lua52' 'libssh' 'libxml2' 'libnghttp2' 'snappy'
- 'lz4' 'spandsp' 'sbc' 'bcg729')
- install=wireshark.install
- conflicts=(wireshark)
- provides=(libwireshark.so libwiretap.so libwsutil.so)
-
- cd ${pkgbase}-${pkgver}
- DESTDIR="${pkgdir}" ninja install
-
- # wireshark uid group is 150
- install -Dm 644 "${srcdir}/wireshark.sysusers" "${pkgdir}/usr/lib/sysusers.d/wireshark.conf"
- chgrp 150 "${pkgdir}/usr/bin/dumpcap"
- chmod 754 "${pkgdir}/usr/bin/dumpcap"
-
- cd "${pkgdir}"
- rm -r usr/share/mime \
- usr/share/icons \
- usr/share/man/man1/wireshark.1 \
- usr/bin/wireshark \
- usr/share/applications/wireshark.desktop \
- usr/share/appdata/wireshark.appdata.xml
-}
-
-package_wireshark-qt() {
- pkgdesc+=' - Qt GUI'
- depends=('desktop-file-utils' 'qt5-multimedia' 'qt5-svg' 'wireshark-cli'
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils')
- replaces=(wireshark wireshark-gtk wireshark-common)
- conflicts=(wireshark wireshark-gtk wireshark-common)
-
- cd ${pkgbase}-${pkgver}
- install -d "${srcdir}/staging"
- DESTDIR="${srcdir}/staging" ninja install
-
- install -Dm 755 run/wireshark -t "${pkgdir}/usr/bin"
- install -Dm 644 wireshark.desktop -t "${pkgdir}/usr/share/applications"
- install -Dm 644 doc/wireshark.1 -t "${pkgdir}/usr/share/man/man1"
- install -Dm 644 wireshark.appdata.xml -t "${pkgdir}/usr/share/appdata"
- install -Dm 644 wireshark-mime-package.xml "${pkgdir}/usr/share/mime/packages/wireshark.xml"
- mv "${srcdir}/staging/usr/share/icons" "${pkgdir}/usr/share/icons"
-}
-
-# vim: ts=2 sw=2 et:
Copied: wireshark/repos/community-x86_64/PKGBUILD (from rev 632602, wireshark/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-05-23 21:33:32 UTC (rev 632603)
@@ -0,0 +1,97 @@
+# 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>
+# Contributor: Peter Wu <peter at lekensteyn.nl>
+
+pkgbase=wireshark
+pkgname=('wireshark-cli' 'wireshark-qt')
+pkgver=3.2.4
+pkgrel=1
+pkgdesc='Network traffic and protocol analyzer/sniffer'
+url='https://www.wireshark.org/'
+arch=('x86_64')
+license=('GPL2')
+makedepends=('glibc' 'cmake' 'ninja' 'c-ares' 'libmaxminddb' 'qt5-tools' 'qt5-svg'
+ 'qt5-multimedia' 'krb5' 'libpcap' 'libssh' 'libxml2' 'libnghttp2'
+ 'snappy' 'lz4' 'spandsp' 'gnutls' 'lua52' 'python' 'libcap' 'libnl'
+ 'glib2' 'libgcrypt' 'sbc' 'bcg729' 'desktop-file-utils' 'libxslt'
+ 'hicolor-icon-theme' 'zstd' 'zlib' 'gcc-libs' 'brotli' 'asciidoctor'
+ 'doxygen' 'minizip' 'speexdsp')
+options=('!emptydirs')
+source=(https://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.xz
+ wireshark.sysusers)
+sha512sums=('67d20a248c0f4e63a58fd3a4191ede75542e9cfd09b0baa5c0016f72a435527d8f95d34f2d35ef1957c1a9c66844d530162379bfcf9e51b64d0d220b381cb097'
+ '3956c1226e64f0ce4df463f80b55b15eed06ecd9b8703b3e8309d4236a6e1ca84e43007336f3987bc862d8a5e7cfcaaf6653125d2a34999a0f1357c52e7c4990')
+b2sums=('c40c19fde09726192119efe358892157d17e28ab87afa9a5b91203e11d3079b718d8e200522294886613d63d19283198de1256561eaf83436742db3898019e89'
+ '3cebcc993f51eaf0e09673c77e0436598593ef5eff306d880415ccc8eecb32fee93c9a6986f1a7bb0835ab7f9732369d7c5a07e6c053d6293e73a1ea84c58a5c')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ sed 's| Rev Unknown from unknown||' -i tools/make-version.pl
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
+ cmake \
+ -B build \
+ -G Ninja \
+ -DCMAKE_BUILD_TYPE=None \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DCMAKE_INSTALL_RPATH= \
+ -DCMAKE_SKIP_RPATH=ON \
+ -Wno-dev
+ ninja -C build -v
+}
+
+package_wireshark-cli() {
+ pkgdesc+=' - CLI tools and data files'
+ depends=('glibc' 'c-ares' 'libmaxminddb' 'krb5' 'libgcrypt' 'libcap' 'libpcap'
+ 'gnutls' 'glib2' 'lua52' 'libssh' 'libxml2' 'libnghttp2' 'snappy'
+ 'lz4' 'spandsp' 'sbc' 'bcg729' 'zstd' 'zlib' 'brotli' 'speexdsp')
+ install=wireshark.install
+ conflicts=(wireshark)
+ provides=(libwireshark.so libwiretap.so libwsutil.so)
+
+ cd ${pkgbase}-${pkgver}
+ DESTDIR="${pkgdir}" ninja -C build install
+
+ # wireshark uid group is 150
+ install -Dm 644 "${srcdir}/wireshark.sysusers" "${pkgdir}/usr/lib/sysusers.d/wireshark.conf"
+ chgrp 150 "${pkgdir}/usr/bin/dumpcap"
+ chmod 754 "${pkgdir}/usr/bin/dumpcap"
+
+ cd "${pkgdir}"
+ rm -r usr/share/mime \
+ usr/share/icons \
+ usr/share/man/man1/wireshark.1 \
+ usr/share/doc/wireshark/wireshark.html \
+ usr/bin/wireshark \
+ usr/share/applications/wireshark.desktop \
+ usr/share/appdata/wireshark.appdata.xml
+}
+
+package_wireshark-qt() {
+ pkgdesc+=' - Qt GUI'
+ depends=('glibc' 'desktop-file-utils' 'qt5-multimedia' 'qt5-svg'
+ 'wireshark-cli' 'libwireshark.so' 'libwiretap.so' 'libwsutil.so'
+ 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gcc-libs'
+ 'zlib' 'libpcap' 'libgcrypt' 'libnl' 'minizip')
+ replaces=(wireshark wireshark-gtk wireshark-common)
+ conflicts=(wireshark wireshark-gtk wireshark-common)
+
+ cd ${pkgbase}-${pkgver}
+ install -d "${srcdir}/staging"
+ DESTDIR="${srcdir}/staging" ninja -C build install
+
+ install -Dm 755 build/run/wireshark -t "${pkgdir}/usr/bin"
+ install -Dm 644 build/doc/wireshark.1 -t "${pkgdir}/usr/share/man/man1"
+ install -Dm 644 build/doc/wireshark.html -t "${pkgdir}/usr/share/doc/wireshark"
+ install -Dm 644 wireshark.desktop -t "${pkgdir}/usr/share/applications"
+ install -Dm 644 wireshark.appdata.xml -t "${pkgdir}/usr/share/appdata"
+ install -Dm 644 wireshark-mime-package.xml "${pkgdir}/usr/share/mime/packages/wireshark.xml"
+ mv "${srcdir}/staging/usr/share/icons" "${pkgdir}/usr/share/icons"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: wireshark.install
===================================================================
--- wireshark.install 2020-05-23 21:33:25 UTC (rev 632602)
+++ wireshark.install 2020-05-23 21:33:32 UTC (rev 632603)
@@ -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,cap_net_admin,cap_dac_override+eip usr/bin/dumpcap
-}
Copied: wireshark/repos/community-x86_64/wireshark.install (from rev 632602, wireshark/trunk/wireshark.install)
===================================================================
--- wireshark.install (rev 0)
+++ wireshark.install 2020-05-23 21:33:32 UTC (rev 632603)
@@ -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,cap_net_admin,cap_dac_override+eip usr/bin/dumpcap
+}
Deleted: wireshark.sysusers
===================================================================
--- wireshark.sysusers 2020-05-23 21:33:25 UTC (rev 632602)
+++ wireshark.sysusers 2020-05-23 21:33:32 UTC (rev 632603)
@@ -1 +0,0 @@
-g wireshark 150 - -
Copied: wireshark/repos/community-x86_64/wireshark.sysusers (from rev 632602, wireshark/trunk/wireshark.sysusers)
===================================================================
--- wireshark.sysusers (rev 0)
+++ wireshark.sysusers 2020-05-23 21:33:32 UTC (rev 632603)
@@ -0,0 +1 @@
+g wireshark 150 - -
More information about the arch-commits
mailing list