From f310b6410abd25d7a252eaea24abdf789d6a316f6ad67b3a8c45bd5e048c0034 Mon Sep 17 00:00:00 2001 From: Robert Frohl Date: Sat, 31 Aug 2024 13:53:03 +0000 Subject: [PATCH] wireshark 4.4.0 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=448 --- ...0-wsutil-implicit_declaration_memcpy.patch | 14 ----- ...shark-0010-dumpcap-permission-denied.patch | 38 ++++++------- wireshark-4.2.7.tar.xz | 3 -- wireshark-4.2.7.tar.xz.hash | 53 ------------------- wireshark-4.4.0.tar.xz | 3 ++ wireshark-4.4.0.tar.xz.hash | 53 +++++++++++++++++++ wireshark.changes | 20 +++++++ wireshark.spec | 12 ++--- 8 files changed, 101 insertions(+), 95 deletions(-) delete mode 100644 wireshark-0000-wsutil-implicit_declaration_memcpy.patch delete mode 100644 wireshark-4.2.7.tar.xz delete mode 100644 wireshark-4.2.7.tar.xz.hash create mode 100644 wireshark-4.4.0.tar.xz create mode 100644 wireshark-4.4.0.tar.xz.hash diff --git a/wireshark-0000-wsutil-implicit_declaration_memcpy.patch b/wireshark-0000-wsutil-implicit_declaration_memcpy.patch deleted file mode 100644 index 2c9e9fe..0000000 --- a/wireshark-0000-wsutil-implicit_declaration_memcpy.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: wireshark-4.2.0rc2/wsutil/glib-compat.h -=================================================================== ---- wireshark-4.2.0rc2.orig/wsutil/glib-compat.h -+++ wireshark-4.2.0rc2/wsutil/glib-compat.h -@@ -23,6 +23,9 @@ extern "C" { - #endif /* __cplusplus */ - - #if !GLIB_CHECK_VERSION(2, 68, 0) -+ -+#include -+ - static inline void * - g_memdup2(gconstpointer mem, size_t byte_size) - { diff --git a/wireshark-0010-dumpcap-permission-denied.patch b/wireshark-0010-dumpcap-permission-denied.patch index 64b5173..c4793dd 100644 --- a/wireshark-0010-dumpcap-permission-denied.patch +++ b/wireshark-0010-dumpcap-permission-denied.patch @@ -1,14 +1,17 @@ -commit acac613af7d702dae533cbdf9ef49cef803d0559 -Author: Robert Frohl -Date: Tue Sep 12 14:53:17 2023 +0200 +From 4eea0eafa31274294832821d7adb13f13be30564 Mon Sep 17 00:00:00 2001 +From: Robert Frohl +Date: Fri, 30 Aug 2024 20:03:20 +0200 +Subject: [PATCH] Warn if user can't access dumpcap. - Warn if user can't access dumpcap. +--- + capture/capture_sync.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) -Index: wireshark-4.2.0rc2/capture/capture_sync.c -=================================================================== ---- wireshark-4.2.0rc2.orig/capture/capture_sync.c -+++ wireshark-4.2.0rc2/capture/capture_sync.c -@@ -24,6 +24,10 @@ +diff --git a/capture/capture_sync.c b/capture/capture_sync.c +index 2a5db8bc73..f75e82e2e2 100644 +--- a/capture/capture_sync.c ++++ b/capture/capture_sync.c +@@ -26,6 +26,10 @@ #include #include @@ -19,15 +22,11 @@ Index: wireshark-4.2.0rc2/capture/capture_sync.c #ifdef _WIN32 #include #include -@@ -530,10 +534,21 @@ sync_pipe_open_command(char* const argv[ - ws_close(data_pipe[PIPE_READ]); - ws_close(data_pipe[PIPE_WRITE]); - } -+ char * grp_warning = calloc(1, 256); - dup2(sync_pipe[PIPE_WRITE], 2); - ws_close(sync_pipe[PIPE_READ]); - ws_close(sync_pipe[PIPE_WRITE]); +@@ -597,6 +601,17 @@ sync_pipe_open_command(char **argv, int *data_read_fd, + argv = sync_pipe_add_arg(argv, &argc, sync_id); + #endif execv(argv[0], argv); ++ char * grp_warning = calloc(1, 256); + if (errno == EPERM || errno == EACCES) { + struct stat statbuf; + struct group *grp; @@ -38,6 +37,9 @@ Index: wireshark-4.2.0rc2/capture/capture_sync.c + } + } + free(grp_warning); - sync_pipe_write_int_msg(2, SP_EXEC_FAILED, errno); + sync_pipe_write_int_msg(sync_pipe[PIPE_WRITE], SP_EXEC_FAILED, errno); /* Exit with "_exit()", so that we don't close the connection +-- +2.46.0 + diff --git a/wireshark-4.2.7.tar.xz b/wireshark-4.2.7.tar.xz deleted file mode 100644 index f237aa0..0000000 --- a/wireshark-4.2.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86 -size 45017312 diff --git a/wireshark-4.2.7.tar.xz.hash b/wireshark-4.2.7.tar.xz.hash deleted file mode 100644 index 5415ec3..0000000 --- a/wireshark-4.2.7.tar.xz.hash +++ /dev/null @@ -1,53 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -wireshark-4.2.7.tar.xz: 45017312 bytes -SHA256(wireshark-4.2.7.tar.xz)=2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86 -SHA1(wireshark-4.2.7.tar.xz)=90624e262733bcb111081927d1e60a35301251b9 - -Wireshark-4.2.7-x64.exe: 86501096 bytes -SHA256(Wireshark-4.2.7-x64.exe)=a85375070cba58c1c53c051e85643651ea37840022eb13358c54bbc6fb83193f -SHA1(Wireshark-4.2.7-x64.exe)=e9d7ce19a037421008449a372e47b18219ca196e - -Wireshark-4.2.7-arm64.exe: 67998504 bytes -SHA256(Wireshark-4.2.7-arm64.exe)=19773c593b6a1bda9921c57407f96f85a19ad0c83a1e40541982b1e61b81e49c -SHA1(Wireshark-4.2.7-arm64.exe)=54dbb2a22348148140cbe421bf52fb88ee35f2dc - -Wireshark-4.2.7-x64.msi: 63148032 bytes -SHA256(Wireshark-4.2.7-x64.msi)=5afa8e3a146c70a62e9922e7c7136ff6274baa8a145a823521fa1fcdb01779fb -SHA1(Wireshark-4.2.7-x64.msi)=353e8fa795a365dbae4d4a9d47e89d20e7f64a02 - -WiresharkPortable64_4.2.7.paf.exe: 53663376 bytes -SHA256(WiresharkPortable64_4.2.7.paf.exe)=9955764524973f2d35b80b2904c3413e391d40ddfdbb42e47a45ef1fa49241eb -SHA1(WiresharkPortable64_4.2.7.paf.exe)=5be19351f0c15edcc1c8f2875dcde53dd653c254 - -Wireshark 4.2.7 Arm 64.dmg: 65582345 bytes -SHA256(Wireshark 4.2.7 Arm 64.dmg)=3853a900941df1d13be64ff2bebc47da5ffe81328650f7ab7546011792aa1c29 -SHA1(Wireshark 4.2.7 Arm 64.dmg)=f7e31c4a0f199ef82dd9f3ddababe97794d12b36 - -Wireshark 4.2.7 Intel 64.dmg: 69349139 bytes -SHA256(Wireshark 4.2.7 Intel 64.dmg)=21d1bb5fa3e79328c5790de1374a81ca1975d11d2d695cd90469e8032b729844 -SHA1(Wireshark 4.2.7 Intel 64.dmg)=a1d8c9025fccf4d8837fd05314613b4517003690 - -You can validate these hashes using the following commands (among others): - - Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256 - Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz - macOS: shasum -a 256 "Wireshark x.y.z Arm 64.dmg" - Other: openssl sha256 wireshark-x.y.z.tar.xz ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmbPm2MACgkQgiRKeOb+ -ruo/LRAAjgOV5ZhbWPA8HwTYsGXfWOKCkne7/l3IM+PQRdN/iBDg/jW1CLqbTyk/ -zGgxcpYdyh8m2iBqDrWpFv2TZXRNUjcUrxcjyW2JXUXdqu/XCegHVgcr9pL4r61x -QwTbe68kofUy+cgqrRp/dPqLaNmxRZyGeig6dOnc/y+O9XwAShEUuwkMwhpK526r -j1Hs4GdvTciOTVM0178VSlHV9ORfzxEBOKCu3KNYMEbBHUy57LideUWJK3wnhcG/ -nQZnewCZ3cz4Pz0UjcOU21yLWqY3aXWJQ9VMWf8fo/T/q7/2B7Pu2wAcZQW4vZvf -0jzIeVpTG0aaEELenESXvQDG8V2mVulfDqT3v0iJ7MeaT/mTe8uTp05W0BERpRKf -s3SCR/yBDgzNCCW2rHFPuJlYzpLxMzZkp1mAD+DdtDH5wWLgOJcjyCAg1JryXR3e -Duv4/CCyvDDLMhvwZB2x8VaOrUzV76nax3ygd/tHulO5S+irDFopXTjuqFhvaUI9 -q1kDdpg7ZjEuja4NkPyS1Oe08+OUnQaBa4UYRo9fju+eCv6usKZvIpPbkD3jWWNt -C0lnY/LX3QmUU2aBPbNoX0eutTxKQ0x0tVsDG6XDUtXpfxoHFL0rKw63mFBdfPpH -Rmilpi9MR5H5xNL58HMAisjC+5p9xIEyFyAbW+HDSutSRJAYICI= -=2g4W ------END PGP SIGNATURE----- diff --git a/wireshark-4.4.0.tar.xz b/wireshark-4.4.0.tar.xz new file mode 100644 index 0000000..936bfb2 --- /dev/null +++ b/wireshark-4.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ead5cdcc08529a2e7ce291e01defc3b0f8831ba24c938db0762b1ebc59c71269 +size 46786568 diff --git a/wireshark-4.4.0.tar.xz.hash b/wireshark-4.4.0.tar.xz.hash new file mode 100644 index 0000000..80aff0b --- /dev/null +++ b/wireshark-4.4.0.tar.xz.hash @@ -0,0 +1,53 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +wireshark-4.4.0.tar.xz: 46786568 bytes +SHA256(wireshark-4.4.0.tar.xz)=ead5cdcc08529a2e7ce291e01defc3b0f8831ba24c938db0762b1ebc59c71269 +SHA1(wireshark-4.4.0.tar.xz)=4869b9fbfab3f1b02801a38f83ef8f6f740f9277 + +Wireshark-4.4.0-x64.exe: 87262448 bytes +SHA256(Wireshark-4.4.0-x64.exe)=f635e68ef536fe85b2c0d5ac12a1197ba015cacc0c866c1995ae75b2b5d957fd +SHA1(Wireshark-4.4.0-x64.exe)=22ffbb76ea80bcd35cc4d5153d85ed4e493f7dcf + +Wireshark-4.4.0-arm64.exe: 68671040 bytes +SHA256(Wireshark-4.4.0-arm64.exe)=c6dd8e0300fd3b12ba56184e0f9e2c6b91861e73f795d80e4fddb748390bd83f +SHA1(Wireshark-4.4.0-arm64.exe)=36ddd3ef612fb739df33ae01ea95dd8810932e7b + +Wireshark-4.4.0-x64.msi: 63766528 bytes +SHA256(Wireshark-4.4.0-x64.msi)=6518c93481d2269d04158c7a632ddf912e6eb332b0e4da4fd247d6e0e3d7d363 +SHA1(Wireshark-4.4.0-x64.msi)=ac73a59b92d7f4f9c9d01d26145dd081a4d90773 + +WiresharkPortable64_4.4.0.paf.exe: 73410312 bytes +SHA256(WiresharkPortable64_4.4.0.paf.exe)=01fef28f7896da47f552ac859954bb086291006b0424a70b0d30689af2354da7 +SHA1(WiresharkPortable64_4.4.0.paf.exe)=3acc608ef3bf66241b86b6111e5e7023a1ae6ce9 + +Wireshark 4.4.0 Arm 64.dmg: 65304242 bytes +SHA256(Wireshark 4.4.0 Arm 64.dmg)=13349959456d29b9b5d2214ba7bfd8d88016f5ac24bf5a7a5a4945ff46584a29 +SHA1(Wireshark 4.4.0 Arm 64.dmg)=781f76c7216f8bf06697ddf49b23d18607b23191 + +Wireshark 4.4.0 Intel 64.dmg: 68727761 bytes +SHA256(Wireshark 4.4.0 Intel 64.dmg)=edb07ee6afbce6b5231d08b301bab31c0ba6c31f7277f1a74bd370ec59369ef7 +SHA1(Wireshark 4.4.0 Intel 64.dmg)=c5300f53d02f14f1f2415a3d35409d8dd65fcec2 + +You can validate these hashes using the following commands (among others): + + Windows: certutil -hashfile Wireshark-win64-x.y.z.exe SHA256 + Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz + macOS: shasum -a 256 "Wireshark x.y.z Arm 64.dmg" + Other: openssl sha256 wireshark-x.y.z.tar.xz +-----BEGIN PGP SIGNATURE----- + +iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmbPm1YACgkQgiRKeOb+ +ruoobg/+IPA6gYd5MFCFTjeoyC/iMk3OEHsnAJnNMCpJOPkGNeMzVeR/uGGBfb6o +JLH13A1Z+N9iHg7+GqkdNeUxmpttauEcS8daqmVXGjaRxc3Le1Q7petnPcFVJzrj +wMT2Pi/oIt1tTV5IIsa58b5xVpys2sUodrXDMXA0Aw+E2+V8E3SYCGld5qRDmZNo +3xioXiyz70PH7HTxwYZxWb5ffWKw3bSYW5hJMi0X6Muw0dAx48Ee9qjaGjuB6W7l +4aSHWtDikqnL3BFChbt1UUaS5Yam0QGGqiHFuGyTgmNS9NeBBTkTcMeu7vDhSd/Z +M6NzjhYo8trStZHhfKk3ahslsBllAu6QkI2QlUu9TsNbIQCSzsPXuSuAnjx5hyeg +k8uDQ99Zewr1pPdAUpMdJUg3idOu6GCKFkNnjqTTvCK8R6fLp0/FqxltuGE9gDxA +JezR9GDn+W2DLyV9Aw2jUex80oQrN+yaZCFPuGY6Jctbnvj4/nxHzlfGjNlWgJ+l +8XoBFMfGhnEBGamHjOeiDYNZolcyTvlunetWBfFEMSMaSMEcxqSSz4G3hjwg4tTZ +jTr25xj2A4hJIZuNMXw2MkZwI/63OOrMcaCi+8GP43lZHtl89+zbgB8Ol9oZ0fV3 +LhcwhkOA/7zwcWmPdhZ/8tt3BD0liCcQ8epgwwfN1tlKOpOXc2U= +=/Q2c +-----END PGP SIGNATURE----- diff --git a/wireshark.changes b/wireshark.changes index 3332152..bcef2de 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Aug 30 16:08:14 UTC 2024 - Robert Frohl + +- Wireshark 4.4.0 + * Many improvements and fixes to the graphing dialogs, including I/O Graphs, + Flow Graph / VoIP Calls, and TCP Stream Graphs + * Custom columns can be defined using any valid field expression, such as + display filter functions, packet slices, arithmetic calculations, logical + tests, raw byte addressing, and protocol layer modifiers + * Wireshark now supports automatic profile switching. You can associate a + display filter with a configuration profile, and when you open a capture + file that matches the filter, Wireshark will automatically switch to that + profile. + * Improved display filter support for value strings (optional string + representations for numeric fields). +- Many more features, bug fixes and updated protocol support as listed in: + https://www.wireshark.org/docs/relnotes/wireshark-4.4.0.html +- drop wireshark-0000-wsutil-implicit_declaration_memcpy.patch: included upstream +- update wireshark-0010-dumpcap-permission-denied.patch + ------------------------------------------------------------------- Thu Aug 29 07:09:42 UTC 2024 - Robert Frohl diff --git a/wireshark.spec b/wireshark.spec index a60096f..8f7113a 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -18,9 +18,9 @@ # define libraries -%define libtap libwiretap14 -%define libutil libwsutil15 -%define libwire libwireshark17 +%define libtap libwiretap15 +%define libutil libwsutil16 +%define libwire libwireshark18 %define org_name org.wireshark.Wireshark %if 0%{?suse_version} >= 1500 %bcond_without lz4 @@ -29,7 +29,7 @@ %endif %bcond_without qt5 Name: wireshark -Version: 4.2.7 +Version: 4.4.0 Release: 0 Summary: A Network Traffic Analyser License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -38,8 +38,6 @@ URL: https://www.wireshark.org/ Source: https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz Source2: https://www.wireshark.org/download/SIGNATURES-%{version}.txt#/%{name}-%{version}.tar.xz.hash Source3: https://www.wireshark.org/download/gerald_at_wireshark_dot_org.gpg#/wireshark.keyring -# PATCH-FIX-UPSTREAM wireshark-0000-wsutil-implicit_declaration_memcpy.patch -Patch0: wireshark-0000-wsutil-implicit_declaration_memcpy.patch # PATCH-FEATURE-SLE wireshark-0010-dumpcap-permission-denied.patch bsc#1180102 Patch10: wireshark-0010-dumpcap-permission-denied.patch BuildRequires: %{rb_default_ruby_suffix}-rubygem-asciidoctor @@ -247,7 +245,7 @@ exit 0 %files %license COPYING -%doc AUTHORS NEWS README.md README.linux +%doc AUTHORS README.md README.linux %{_mandir}/man1/[^i]* %{_mandir}/man4/* %{_bindir}/capinfos