From ca84169a4d1b4e1ecb5ed39aeb0e3dc8e6e51195 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.2. --- common/shlibs | 6 ++-- .../patches/HAVE_C99_VSNPRINTF.patch | 35 +++++++++++++++++++ srcpkgs/wireshark/patches/cross.patch | 2 +- srcpkgs/wireshark/template | 30 +++++++++++++--- 4 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch diff --git a/common/shlibs b/common/shlibs index f26b9bab58fd..b0aae63e1539 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1572,9 +1572,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.2_1 +libwireshark.so.15 libwireshark-3.6.2_1 +libwsutil.so.13 libwireshark-3.6.2_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/HAVE_C99_VSNPRINTF.patch b/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch new file mode 100644 index 000000000000..b500598fd360 --- /dev/null +++ b/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch @@ -0,0 +1,35 @@ +--- a/ConfigureChecks.cmake 2021-12-29 13:12:48.000000000 -0600 ++++ b/ConfigureChecks.cmake 2022-01-06 06:45:07.907628761 -0600 +@@ -104,32 +104,6 @@ + check_symbol_exists(tzname "time.h" HAVE_TZNAME) + + # +-# Check if the libc vsnprintf() conforms to C99. If this fails we may +-# need to fall-back on GLib I/O. +-# +-check_c_source_runs(" +- #include +- int main(void) +- { +- /* Check that snprintf() and vsnprintf() don't return +- * -1 if the buffer is too small. C99 says this value +- * is the length that would be written not including +- * the nul byte. */ +- char buf[3]; +- return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1; +- }" +- HAVE_C99_VSNPRINTF +-) +-if (NOT HAVE_C99_VSNPRINTF) +- message(FATAL_ERROR +-"Building Wireshark requires a C99 compliant vsnprintf() and this \ +-target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \ +-using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \ +-developers at wireshark-dev@wireshark.org." +- ) +-endif() +- +-# + # *If* we found libnl, check if we can use nl80211 stuff with it. + # + if (NL_FOUND) diff --git a/srcpkgs/wireshark/patches/cross.patch b/srcpkgs/wireshark/patches/cross.patch index 46dcc949c72e..d454505b8279 100644 --- a/srcpkgs/wireshark/patches/cross.patch +++ b/srcpkgs/wireshark/patches/cross.patch @@ -33,7 +33,7 @@ Upstream: no # These files are generated as side-effect ${_out}.h ${_out}.out -- COMMAND lemon +- COMMAND $ + COMMAND ${EXECUTABLE_OUTPUT_PATH}/lemon -T${_lemonpardir}/lempar.c -d. diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template index fae420888bfe..9a55e960560c 100644 --- a/srcpkgs/wireshark/template +++ b/srcpkgs/wireshark/template @@ -1,11 +1,10 @@ # Template file for 'wireshark' pkgname=wireshark -version=3.4.5 +version=3.6.2 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,8 +16,9 @@ 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=5d901a5572aef953f04adc253ed2a0699d4c62779d3249021e1e8541a024c30e system_groups="wireshark" +# CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2" CXXFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2" @@ -33,6 +33,26 @@ pre_check() { ninja -C build test-programs } +if [ "${XBPS_ALLOW_CHROOT_BREAKOUT}" = "yes" ]; then +do_check() { + # Many tests fail when run as root (i.e. in CI) + test/test.py --disable-capture -p build/run \ + suite_decryption \ + suite_dissectors.group_asterix \ + suite_extcaps \ + suite_fileformats \ + suite_follow \ + suite_follow_dccp \ + suite_follow_multistream \ + suite_io \ + suite_mergecap \ + suite_netperfmeter \ + suite_release \ + suite_text2pcap \ + suite_unittests +} +fi + post_install() { rm -f -- "${DESTDIR}/usr/bin/lemon" rm -f -- "${DESTDIR}/usr/lib/wireshark/cmake/UseLemon.cmake" @@ -77,6 +97,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 } }