Date: Thursday, March 21, 2019 @ 00:07:46 Author: anthraxx Revision: 442993
upgpkg: wireshark 3.0.0-1 Modified: wireshark/trunk/PKGBUILD wireshark/trunk/wireshark.install Deleted: wireshark/trunk/do_not_use_svn_version.patch ------------------------------+ PKGBUILD | 106 +++++++++++++++++------------------------ do_not_use_svn_version.patch | 13 ----- wireshark.install | 6 +- 3 files changed, 48 insertions(+), 77 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-20 22:42:33 UTC (rev 442992) +++ PKGBUILD 2019-03-21 00:07:46 UTC (rev 442993) @@ -2,101 +2,85 @@ # Contributor: Timothy Redaelli <[email protected]> # Contributor: Guillaume ALAUX <[email protected]> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> +# Contributor: Peter Wu <[email protected]> pkgbase=wireshark -pkgname=('wireshark-cli' 'wireshark-common' 'wireshark-gtk' 'wireshark-qt') -pkgver=2.6.6 +pkgname=('wireshark-cli' 'wireshark-qt') +pkgver=3.0.0 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') +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 - do_not_use_svn_version.patch) -sha512sums=('b781c3b34dc76a3d8e60dc2b9b4e46a11994440b8df7b56134521ea9a77b27b0719a600db60d7f3d65f15972a5db2a7e85a8bf60d7217fce498fb5668de8fe56' - '3956c1226e64f0ce4df463f80b55b15eed06ecd9b8703b3e8309d4236a6e1ca84e43007336f3987bc862d8a5e7cfcaaf6653125d2a34999a0f1357c52e7c4990' - '847eac73c789b02f57f0ec378d086aea5a103cf0c6525c227d168ad67db08703686d4df37ed2ac95f47125cfcd5cafd472e2988f7f743428b291dc2aebe0f435') + wireshark.sysusers) +sha512sums=('917708b5edc25609536c7bd7cf4ae32a901fd99118302138dc0bf6f1ad092a8e5069a917cc8cf6cb77190f54e50623a4eba1ee10ffc225ee3051b50cf02a0963' + '3956c1226e64f0ce4df463f80b55b15eed06ecd9b8703b3e8309d4236a6e1ca84e43007336f3987bc862d8a5e7cfcaaf6653125d2a34999a0f1357c52e7c4990') prepare() { cd ${pkgbase}-${pkgver} - # Avoid ugly "svn rev unknown from unknown" version string - patch -p1 < "${srcdir}/do_not_use_svn_version.patch" + sed 's| Rev Unknown from unknown||' -i tools/make-version.pl } 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 + 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 version' - depends=('c-ares' 'libmaxminddb' 'krb5' 'libgcrypt' 'libcap' 'libpcap' 'gnutls' 'glib2' 'lua52' 'libssh' 'libxml2' 'libnghttp2') + 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) cd ${pkgbase}-${pkgver} + DESTDIR="${pkgdir}" ninja install - 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" + 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" - 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 + 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-common() { - pkgdesc+=' - common files' - depends=('hicolor-icon-theme' 'shared-mime-info' 'xdg-utils') +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 - 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 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/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: Deleted: do_not_use_svn_version.patch =================================================================== --- do_not_use_svn_version.patch 2019-03-20 22:42:33 UTC (rev 442992) +++ do_not_use_svn_version.patch 2019-03-21 00:07:46 UTC (rev 442993) @@ -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. Modified: wireshark.install =================================================================== --- wireshark.install 2019-03-20 22:42:33 UTC (rev 442992) +++ wireshark.install 2019-03-21 00:07:46 UTC (rev 442993) @@ -1,8 +1,8 @@ post_install() { - post_upgrade - echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" + 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 + setcap cap_net_raw,cap_net_admin,cap_dac_override+eip usr/bin/dumpcap }
