Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] wireshark: update to 3.6.1.
@ 2022-01-05  1:23 tsndqst
  2022-01-05  8:35 ` unspecd
                   ` (28 more replies)
  0 siblings, 29 replies; 30+ messages in thread
From: tsndqst @ 2022-01-05  1:23 UTC (permalink / raw)
  To: ml

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

There is a new 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)


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: 3328 bytes --]

From 4a98f0621f8e78b0b0faa3f7c7520940ee313842 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] 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 <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"
@@ -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
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
@ 2022-01-05  8:35 ` unspecd
  2022-01-06 15:12 ` [PR PATCH] [Updated] " tsndqst
                   ` (27 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: unspecd @ 2022-01-05  8:35 UTC (permalink / raw)
  To: ml

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

New comment by unspecd on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#issuecomment-1005482658

Comment:
> configure_args="-DCMAKE_BUILD_TYPE=None"

I think this line is no longer needed, see 1af5a29d87a011232ae665d1c5f910f9b73588fd.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
  2022-01-05  8:35 ` unspecd
@ 2022-01-06 15:12 ` tsndqst
  2022-01-06 15:44 ` tsndqst
                   ` (26 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-01-06 15:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1080 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)


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: 4645 bytes --]

From a042f10b5df56f3fcd708033e7616d7a28d57eb3 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] wireshark: update to 3.6.1.

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

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/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..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 <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"
@@ -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
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
  2022-01-05  8:35 ` unspecd
  2022-01-06 15:12 ` [PR PATCH] [Updated] " tsndqst
@ 2022-01-06 15:44 ` tsndqst
  2022-01-07  4:37 ` [PR PATCH] [Updated] " tsndqst
                   ` (25 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-01-06 15:44 UTC (permalink / raw)
  To: ml

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

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#issuecomment-1006692687

Comment:
> I think this line is no longer needed, see [1af5a29](https://github.com/void-linux/void-packages/commit/1af5a29d87a011232ae665d1c5f910f9b73588fd).

@unspecd Oops, I missed this. I was focused on getting cross-compilation working.  I'll include this change when I work on the test failures.

Speaking of test failures, I have a feeling the failures are due to running tests in a container in GitHub Actions.  The tests work locally for me.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (2 preceding siblings ...)
  2022-01-06 15:44 ` tsndqst
@ 2022-01-07  4:37 ` tsndqst
  2022-01-07  4:39 ` tsndqst
                   ` (24 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-01-07  4:37 UTC (permalink / raw)
  To: ml

[-- 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: 5090 bytes --]

From 413a6e3f7c7d1122478e7b2e5f62bcb2c956d23f 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] 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 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/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..ad7114561001 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"
 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
+}
+
 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
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (3 preceding siblings ...)
  2022-01-07  4:37 ` [PR PATCH] [Updated] " tsndqst
@ 2022-01-07  4:39 ` tsndqst
  2022-01-07 14:37 ` tsndqst
                   ` (23 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-01-07  4:39 UTC (permalink / raw)
  To: ml

[-- 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: 5090 bytes --]

From d0edaebce4d3736bad40def3639da00ed9898037 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] 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 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/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..ad7114561001 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"
 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
+}
+
 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
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (4 preceding siblings ...)
  2022-01-07  4:39 ` tsndqst
@ 2022-01-07 14:37 ` tsndqst
  2022-01-07 14:59 ` tsndqst
                   ` (22 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-01-07 14:37 UTC (permalink / raw)
  To: ml

[-- 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: 6592 bytes --]

From d4fad2caee61ba9c0fd0e3a4c76671c02e953cc7 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 1/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 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/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..32410571d12c 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
+}
+
 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
 	}
 }

From 78801fb7f52a2a7a2f00f9918d893148a97d797c 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 2/2] New package: python3-pytest-xdist-2.5.0

---
 srcpkgs/python3-pytest-xdist/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 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..b7c8e8c5fe61
--- /dev/null
+++ b/srcpkgs/python3-pytest-xdist/template
@@ -0,0 +1,25 @@
+# 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-pip python3-wheel"
+depends="python3-pytest"
+checkdepends="${depends} tox python3-packaging python3-attrs python3-toml python3-pluggy python3-parsing"
+short_desc="pytest plugin for distributed testing and loop-on-failures testing modes"
+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
+}
+
+# adding do_check since the tests depend on this package
+do_check() {
+	python setup.py install
+	pytest
+}

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (5 preceding siblings ...)
  2022-01-07 14:37 ` tsndqst
@ 2022-01-07 14:59 ` tsndqst
  2022-01-07 15:21 ` tsndqst
                   ` (21 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-01-07 14:59 UTC (permalink / raw)
  To: ml

[-- 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: 6557 bytes --]

From d4fad2caee61ba9c0fd0e3a4c76671c02e953cc7 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 1/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 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/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..32410571d12c 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
+}
+
 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
 	}
 }

From 03545490d3e3129ff8506437c704eb910a3cbf1a 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 2/2] New package: python3-pytest-xdist-2.5.0

---
 srcpkgs/python3-pytest-xdist/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 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..594201efd0a2
--- /dev/null
+++ b/srcpkgs/python3-pytest-xdist/template
@@ -0,0 +1,25 @@
+# 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-pip python3-wheel"
+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
+}
+
+# adding do_check since the tests depend on this package
+do_check() {
+	python setup.py install
+	pytest
+}

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (6 preceding siblings ...)
  2022-01-07 14:59 ` tsndqst
@ 2022-01-07 15:21 ` tsndqst
  2022-01-07 21:02 ` tsndqst
                   ` (20 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-01-07 15:21 UTC (permalink / raw)
  To: ml

[-- 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: 6557 bytes --]

From d4fad2caee61ba9c0fd0e3a4c76671c02e953cc7 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 1/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 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/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..32410571d12c 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
+}
+
 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
 	}
 }

From e3fad73378990187c495ca318eee6b6205a1fd6d 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 2/2] New package: python3-pytest-xdist-2.5.0

---
 srcpkgs/python3-pytest-xdist/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 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..5d661cd6ea38
--- /dev/null
+++ b/srcpkgs/python3-pytest-xdist/template
@@ -0,0 +1,25 @@
+# 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-pip python3-wheel"
+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
+}
+
+# adding do_check since the tests depend on this package
+do_check() {
+	python setup.py install
+	pytest
+}

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (7 preceding siblings ...)
  2022-01-07 15:21 ` tsndqst
@ 2022-01-07 21:02 ` tsndqst
  2022-01-19 13:28 ` [PR PATCH] [Updated] " tsndqst
                   ` (19 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-01-07 21:02 UTC (permalink / raw)
  To: ml

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

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#issuecomment-1007738252

Comment:
I'm not sure what to do to get tests working in GitHub Actions.  The tests work locally for me.  My most recent push changed the do_check function to run `pytest` instead of the default but that didn't help either.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (8 preceding siblings ...)
  2022-01-07 21:02 ` tsndqst
@ 2022-01-19 13:28 ` tsndqst
  2022-03-05 17:41 ` [PR REVIEW] " paper42
                   ` (18 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-01-19 13:28 UTC (permalink / raw)
  To: ml

[-- 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: 6575 bytes --]

From 9089603187f2f4f597658174a024047c7287e267 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 | 25 +++++++++++++++++++++++++
 1 file changed, 25 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..5d661cd6ea38
--- /dev/null
+++ b/srcpkgs/python3-pytest-xdist/template
@@ -0,0 +1,25 @@
+# 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-pip python3-wheel"
+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
+}
+
+# adding do_check since the tests depend on this package
+do_check() {
+	python setup.py install
+	pytest
+}

From d3287f87f742494c2f1c265ba8b0a87ce1cd42a4 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 b07e14379e28..f63d4493bb2c 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/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
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (9 preceding siblings ...)
  2022-01-19 13:28 ` [PR PATCH] [Updated] " tsndqst
@ 2022-03-05 17:41 ` paper42
  2022-03-05 17:42 ` paper42
                   ` (17 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: paper42 @ 2022-03-05 17:41 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#discussion_r820130404

Comment:
```suggestion
hostmakedepends="python3-setuptools"
```
pip just hides dependency issues, please fix this properly without pip

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (10 preceding siblings ...)
  2022-03-05 17:41 ` [PR REVIEW] " paper42
@ 2022-03-05 17:42 ` paper42
  2022-03-05 19:50 ` tsndqst
                   ` (16 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: paper42 @ 2022-03-05 17:42 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#discussion_r820130502

Comment:
I don't think this is necessary, does the default do_check not work?

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (11 preceding siblings ...)
  2022-03-05 17:42 ` paper42
@ 2022-03-05 19:50 ` tsndqst
  2022-03-05 19:56 ` tsndqst
                   ` (15 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-05 19:50 UTC (permalink / raw)
  To: ml

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

New review comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#discussion_r820141794

Comment:
Correct. Checks work locally but not in CI. This was my attempt to get it working. It looked like pytest tests had more configuration options.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (12 preceding siblings ...)
  2022-03-05 19:50 ` tsndqst
@ 2022-03-05 19:56 ` tsndqst
  2022-03-05 20:20 ` tsndqst
                   ` (14 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-05 19:56 UTC (permalink / raw)
  To: ml

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

New review comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#discussion_r820141794

Comment:
Correct. Checks work locally but not in CI. This was my attempt to get it working. It looked like pytest tests had more configuration options.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (13 preceding siblings ...)
  2022-03-05 19:56 ` tsndqst
@ 2022-03-05 20:20 ` tsndqst
  2022-03-05 20:21 ` tsndqst
                   ` (13 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-05 20:20 UTC (permalink / raw)
  To: ml

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

New review comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#discussion_r820144348

Comment:
Thanks @paper42.  I think I misread the error message when I was working on this before.  I think I found the correct dependency this time.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (14 preceding siblings ...)
  2022-03-05 20:20 ` tsndqst
@ 2022-03-05 20:21 ` tsndqst
  2022-03-05 20:25 ` [PR PATCH] [Updated] " tsndqst
                   ` (12 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-05 20:21 UTC (permalink / raw)
  To: ml

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

New review comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#discussion_r820144396

Comment:
I added this because it appeared that pytest needed the xdist plugin installed to perform the tests.  It seemed odd but this solved the issue.  I removed it.  It worked locally.  We'll see if it works in CI.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (15 preceding siblings ...)
  2022-03-05 20:21 ` tsndqst
@ 2022-03-05 20:25 ` tsndqst
  2022-03-05 20:27 ` tsndqst
                   ` (11 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-05 20:25 UTC (permalink / raw)
  To: ml

[-- 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 dfba7e29edb0e09819c7ba95a7edb74a8585e621 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 4871436edbb4402443742baf51e7cd2f1af737a6 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 b07e14379e28..f63d4493bb2c 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/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
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (16 preceding siblings ...)
  2022-03-05 20:25 ` [PR PATCH] [Updated] " tsndqst
@ 2022-03-05 20:27 ` tsndqst
  2022-03-06  4:09 ` tsndqst
                   ` (10 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-05 20:27 UTC (permalink / raw)
  To: ml

[-- 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
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (17 preceding siblings ...)
  2022-03-05 20:27 ` tsndqst
@ 2022-03-06  4:09 ` tsndqst
  2022-03-06 18:26 ` tsndqst
                   ` (9 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-06  4:09 UTC (permalink / raw)
  To: ml

[-- 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: 4645 bytes --]

From e00fd5ab3adf3c10d283d5b8779bb4328e4dafd5 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] wireshark: update to 3.6.2.

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

diff --git a/common/shlibs b/common/shlibs
index 250e1e0b8cb5..f2d93c9b36c0 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 <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..2cc5c1f95c6d 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,7 +16,7 @@ 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=5d901a5572aef953f04adc253ed2a0699d4c62779d3249021e1e8541a024c30e
 system_groups="wireshark"
 
 CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
@@ -77,6 +76,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
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (18 preceding siblings ...)
  2022-03-06  4:09 ` tsndqst
@ 2022-03-06 18:26 ` tsndqst
  2022-03-12 22:33 ` 0x5c
                   ` (8 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-06 18:26 UTC (permalink / raw)
  To: ml

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

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#issuecomment-1060014695

Comment:
I went back to the default test framework. It had fewer dependencies. Most of the tests fail in CI but they pass locally.  It's going to take some time to track down the issues.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (19 preceding siblings ...)
  2022-03-06 18:26 ` tsndqst
@ 2022-03-12 22:33 ` 0x5c
  2022-03-13 21:50 ` paper42
                   ` (7 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: 0x5c @ 2022-03-12 22:33 UTC (permalink / raw)
  To: ml

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

New comment by 0x5c on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#issuecomment-1065976929

Comment:
This potentially obsoletes https://github.com/void-linux/void-packages/pull/34471

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (20 preceding siblings ...)
  2022-03-12 22:33 ` 0x5c
@ 2022-03-13 21:50 ` paper42
  2022-03-13 21:52 ` tsndqst
                   ` (6 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: paper42 @ 2022-03-13 21:50 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#issuecomment-1066188874

Comment:
> I went back to the default test framework. It had fewer dependencies. Most of the tests fail in CI but they pass locally. It's going to take some time to track down the issues.

We can disable tests in CI with `make_check=ci-skip`. Ideally if only some tests fail in CI, we could disable only those and let CI run the tests, but this is a good enough solution for now.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (21 preceding siblings ...)
  2022-03-13 21:50 ` paper42
@ 2022-03-13 21:52 ` tsndqst
  2022-03-13 22:01 ` [PR PATCH] [Updated] " tsndqst
                   ` (5 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-13 21:52 UTC (permalink / raw)
  To: ml

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

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#issuecomment-1066189115

Comment:
I just came up with a solution I'm testing now locally.  I should be able to push it soon. Unfortunately the test framework allows listing the tests to run, not the tests to skip.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (22 preceding siblings ...)
  2022-03-13 21:52 ` tsndqst
@ 2022-03-13 22:01 ` tsndqst
  2022-03-13 22:08 ` wireshark: update to 3.6.2 tsndqst
                   ` (4 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-13 22:01 UTC (permalink / raw)
  To: ml

[-- 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: 5371 bytes --]

From ca84169a4d1b4e1ecb5ed39aeb0e3dc8e6e51195 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] 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 <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..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 <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=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
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: wireshark: update to 3.6.2.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (23 preceding siblings ...)
  2022-03-13 22:01 ` [PR PATCH] [Updated] " tsndqst
@ 2022-03-13 22:08 ` tsndqst
  2022-04-02 21:08 ` [PR REVIEW] " paper42
                   ` (3 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-03-13 22:08 UTC (permalink / raw)
  To: ml

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

New comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#issuecomment-1066191689

Comment:
I have some code I can use to invert the test list.  I can manually create the list of failing tests, compare that list to the list of all tests programatically, and use the list of non-failing tests in the call to `test/test.py`.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] wireshark: update to 3.6.2.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (24 preceding siblings ...)
  2022-03-13 22:08 ` wireshark: update to 3.6.2 tsndqst
@ 2022-04-02 21:08 ` paper42
  2022-04-02 21:16 ` tsndqst
                   ` (2 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: paper42 @ 2022-04-02 21:08 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#discussion_r841119569

Comment:
Is this left here by mistake?

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] wireshark: update to 3.6.2.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (25 preceding siblings ...)
  2022-04-02 21:08 ` [PR REVIEW] " paper42
@ 2022-04-02 21:16 ` tsndqst
  2022-04-02 21:19 ` [PR PATCH] [Updated] " tsndqst
  2022-04-03  8:21 ` [PR PATCH] [Merged]: " paper42
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-04-02 21:16 UTC (permalink / raw)
  To: ml

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

New review comment by tsndqst on void-packages repository

https://github.com/void-linux/void-packages/pull/34860#discussion_r841120288

Comment:
yes


^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] wireshark: update to 3.6.2.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (26 preceding siblings ...)
  2022-04-02 21:16 ` tsndqst
@ 2022-04-02 21:19 ` tsndqst
  2022-04-03  8:21 ` [PR PATCH] [Merged]: " paper42
  28 siblings, 0 replies; 30+ messages in thread
From: tsndqst @ 2022-04-02 21:19 UTC (permalink / raw)
  To: ml

[-- 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.2.
<!-- 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: 5306 bytes --]

From e2cb7f44e05a430842f522c3d091d225ebfbd2cc 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] wireshark: update to 3.6.3.

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

diff --git a/common/shlibs b/common/shlibs
index 7079375524fc..4ff1e35455e1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1573,9 +1573,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.3_1
+libwireshark.so.15 libwireshark-3.6.3_1
+libwsutil.so.13 libwireshark-3.6.3_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..4d0d23c7ed50 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.3
 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 +16,7 @@ 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=b60364a4c0068a10811ab3fd075ca6c1eb0e75d44600271b88a20ed93a2ef631
 system_groups="wireshark"
 
 CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
@@ -33,6 +32,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 +96,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
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Merged]: wireshark: update to 3.6.2.
  2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
                   ` (27 preceding siblings ...)
  2022-04-02 21:19 ` [PR PATCH] [Updated] " tsndqst
@ 2022-04-03  8:21 ` paper42
  28 siblings, 0 replies; 30+ messages in thread
From: paper42 @ 2022-04-03  8:21 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

wireshark: update to 3.6.2.
https://github.com/void-linux/void-packages/pull/34860

Description:
<!-- 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)


^ permalink raw reply	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2022-04-03  8:21 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-05  1:23 [PR PATCH] wireshark: update to 3.6.1 tsndqst
2022-01-05  8:35 ` unspecd
2022-01-06 15:12 ` [PR PATCH] [Updated] " tsndqst
2022-01-06 15:44 ` tsndqst
2022-01-07  4:37 ` [PR PATCH] [Updated] " tsndqst
2022-01-07  4:39 ` tsndqst
2022-01-07 14:37 ` tsndqst
2022-01-07 14:59 ` tsndqst
2022-01-07 15:21 ` tsndqst
2022-01-07 21:02 ` tsndqst
2022-01-19 13:28 ` [PR PATCH] [Updated] " tsndqst
2022-03-05 17:41 ` [PR REVIEW] " paper42
2022-03-05 17:42 ` paper42
2022-03-05 19:50 ` tsndqst
2022-03-05 19:56 ` tsndqst
2022-03-05 20:20 ` tsndqst
2022-03-05 20:21 ` tsndqst
2022-03-05 20:25 ` [PR PATCH] [Updated] " tsndqst
2022-03-05 20:27 ` tsndqst
2022-03-06  4:09 ` tsndqst
2022-03-06 18:26 ` tsndqst
2022-03-12 22:33 ` 0x5c
2022-03-13 21:50 ` paper42
2022-03-13 21:52 ` tsndqst
2022-03-13 22:01 ` [PR PATCH] [Updated] " tsndqst
2022-03-13 22:08 ` wireshark: update to 3.6.2 tsndqst
2022-04-02 21:08 ` [PR REVIEW] " paper42
2022-04-02 21:16 ` tsndqst
2022-04-02 21:19 ` [PR PATCH] [Updated] " tsndqst
2022-04-03  8:21 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).