From 4a98f0621f8e78b0b0faa3f7c7520940ee313842 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Tue, 4 Jan 2022 19:19:19 -0600 Subject: [PATCH] wireshark: update to 3.6.1. --- common/shlibs | 6 +++--- srcpkgs/wireshark/patches/cross.patch | 13 ------------- srcpkgs/wireshark/template | 8 ++++---- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/common/shlibs b/common/shlibs index 999d3ad714b8..abc580cd0266 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1569,9 +1569,9 @@ libdovecot-compression.so.0 dovecot-2.3.13_3 libdovecot-sql.so.0 dovecot-2.3.13_3 libdovecot-storage.so.0 dovecot-2.3.13_3 libdovecot-lda.so.0 dovecot-2.3.13_3 -libwiretap.so.11 libwireshark-3.4.0_1 -libwireshark.so.14 libwireshark-3.4.0_1 -libwsutil.so.12 libwireshark-3.4.0_1 +libwiretap.so.12 libwireshark-3.6.1_1 +libwireshark.so.15 libwireshark-3.6.1_1 +libwsutil.so.13 libwireshark-3.6.1_1 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1 libKF5Prison.so.5 prison-5.43.0_1 diff --git a/srcpkgs/wireshark/patches/cross.patch b/srcpkgs/wireshark/patches/cross.patch index 46dcc949c72e..566febce8530 100644 --- a/srcpkgs/wireshark/patches/cross.patch +++ b/srcpkgs/wireshark/patches/cross.patch @@ -26,16 +26,3 @@ Upstream: no # # Editor modelines - https://www.wireshark.org/tools/modelines.html # - ---- a/cmake/modules/UseLemon.cmake 2019-02-28 18:56:38.000000000 +0100 -+++ b/cmake/modules/UseLemon.cmake 2019-03-11 21:19:28.352163076 +0100 -@@ -13,7 +13,7 @@ - # These files are generated as side-effect - ${_out}.h - ${_out}.out -- COMMAND lemon -+ COMMAND ${EXECUTABLE_OUTPUT_PATH}/lemon - -T${_lemonpardir}/lempar.c - -d. - ${_in} - diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index fae420888bfe..cd6f44f1675e 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,11 +1,11 @@ # Template file for 'wireshark' pkgname=wireshark -version=3.4.5 +version=3.6.1 revision=1 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None" hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel -qt5-tools qt5-host-tools qt5-qmake" +qt5-tools qt5-host-tools qt5-qmake ruby-asciidoctor" makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-devel libxml2-devel libssh-devel libnl3-devel spandsp-devel tiff-devel libcap-progs liblz4-devel @@ -17,7 +17,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.wireshark.org" distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz" -checksum=de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333 +checksum=0434eda8fb6bf88e2b42a67eb5d1de254a67d505bec3bb51fee9d7cad7925a38 system_groups="wireshark" CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2" @@ -77,6 +77,6 @@ wireshark-qt_package() { pkg_install() { vmove usr/bin/wireshark vmove usr/share/man/man1/wireshark.1 - vmove usr/share/applications/wireshark.desktop + vmove usr/share/applications/org.wireshark.Wireshark.desktop } }