Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.

[tsndqst <tsndqst@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1197 bytes --]

There is an updated pull request by tsndqst against master on the void-packages repository

https://github.com/tsndqst/void-packages wireshark
https://github.com/void-linux/void-packages/pull/34860

wireshark: update to 3.6.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-glibc (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/34860.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wireshark-34860.patch --]
[-- Type: text/x-diff, Size: 6454 bytes --]

From 6d81fe234dff058501eabd9c4f1d1752d03646ff Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 7 Jan 2022 08:37:03 -0600
Subject: [PATCH 1/2] New package: python3-pytest-xdist-2.5.0

---
 srcpkgs/python3-pytest-xdist/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-pytest-xdist/template

diff --git a/srcpkgs/python3-pytest-xdist/template b/srcpkgs/python3-pytest-xdist/template
new file mode 100644
index 000000000000..7845a277f3e7
--- /dev/null
+++ b/srcpkgs/python3-pytest-xdist/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytest-xdist'
+pkgname=python3-pytest-xdist
+version=2.5.0
+revision=1
+wrksrc="pytest-xdist-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-pytest"
+checkdepends="${depends} tox python3-packaging python3-attrs python3-toml python3-pluggy python3-parsing"
+short_desc="Pytest plugin for distributed testing"
+maintainer="Tim Sandquist <tim.sandquist@gmail.com>"
+license="MIT"
+homepage="https://github.com/pytest-dev/pytest-xdist/"
+distfiles="${PYPI_SITE}/p/pytest-xdist/pytest-xdist-${version}.tar.gz"
+checksum=4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf
+
+post_install() {
+	vlicense LICENSE
+}

From b435241a5bdc869f61f012294cb3e2204b7c6b80 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 4 Jan 2022 19:19:19 -0600
Subject: [PATCH 2/2] wireshark: update to 3.6.1.

---
 common/shlibs                                 |  6 ++--
 .../patches/HAVE_C99_VSNPRINTF.patch          | 35 +++++++++++++++++++
 srcpkgs/wireshark/patches/cross.patch         |  2 +-
 srcpkgs/wireshark/template                    | 14 +++++---
 4 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch

diff --git a/common/shlibs b/common/shlibs
index 250e1e0b8cb5..1fc8503a742c 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.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/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 <stdio.h>
+-	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 $<TARGET_FILE:lemon>
 +         COMMAND ${EXECUTABLE_OUTPUT_PATH}/lemon
             -T${_lemonpardir}/lempar.c
             -d.
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index fae420888bfe..a09c8c0db665 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,23 +1,23 @@
 # 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
  nghttp2-devel qt5-devel qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
  minizip-devel libzstd-devel brotli-devel speexdsp-devel"
 depends="libcap-progs"
+checkdepends="python3-pytest python3-pytest-xdist"
 short_desc="Network protocol analyzer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
@@ -33,6 +33,10 @@ pre_check() {
 	ninja -C build test-programs
 }
 
+do_check() {
+	cd build && pytest --disable-capture
+}
+
 post_install() {
 	rm -f -- "${DESTDIR}/usr/bin/lemon"
 	rm -f -- "${DESTDIR}/usr/lib/wireshark/cmake/UseLemon.cmake"
@@ -77,6 +81,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
 	}
 }