Github messages for voidlinux
 help / color / mirror / Atom feed
From: tsndqst <tsndqst@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] wireshark: update to 3.6.1.
Date: Thu, 06 Jan 2022 16:12:37 +0100	[thread overview]
Message-ID: <20220106151237.yLnyBmyPxb_QynBUHw-KMht8vVrTszXKj65HBL7FetY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34860@inbox.vuxu.org>

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

  parent reply	other threads:[~2022-01-06 15:12 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-05  1:23 [PR PATCH] " tsndqst
2022-01-05  8:35 ` unspecd
2022-01-06 15:12 ` tsndqst [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220106151237.yLnyBmyPxb_QynBUHw-KMht8vVrTszXKj65HBL7FetY@z \
    --to=tsndqst@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).