SLFO-pool/wireshark
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main wireshark revision 5b8a6458dd79841d7de4c55246014891

Browse Source
This commit is contained in:
Adrian Schröter 2024-10-18 15:47:48 +02:00
parent 4bdcb435b8
commit 655a5b0d69
8 changed files with 111 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wireshark-0000-wsutil-implicit_declaration_memcpy.patch
View File

@ -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 <string.h>
+
static inline void *
g_memdup2(gconstpointer mem, size_t byte_size)
{

38
wireshark-0010-dumpcap-permission-denied.patch
View File

@ -1,14 +1,17 @@
commit acac613af7d702dae533cbdf9ef49cef803d0559
Author: Robert Frohl <rfrohl@suse.com>
Date: Tue Sep 12 14:53:17 2023 +0200
From 4eea0eafa31274294832821d7adb13f13be30564 Mon Sep 17 00:00:00 2001
From: Robert Frohl <rfrohl@suse.com>
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 <wsutil/strtoi.h>
#include <wsutil/ws_assert.h>
@ -19,15 +22,11 @@ Index: wireshark-4.2.0rc2/capture/capture_sync.c
#ifdef _WIN32
#include <wsutil/unicode-utils.h>
#include <wsutil/win32-utils.h>
@@ -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

BIN
wireshark-4.2.7.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

53
wireshark-4.2.7.tar.xz.hash
View File

@ -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-----

BIN
wireshark-4.4.1.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

53
wireshark-4.4.1.tar.xz.hash Normal file
View File

@ -0,0 +1,53 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-4.4.1.tar.xz: 46748700 bytes
SHA256(wireshark-4.4.1.tar.xz)=2b9e96572a7002c3e53b79683cf92f8172217e64c17ecaaf612eb68c2a7556ec
SHA1(wireshark-4.4.1.tar.xz)=18672f1faaf5bdd878a45fc8af9d527fd034152e
Wireshark-4.4.1-x64.exe: 87258896 bytes
SHA256(Wireshark-4.4.1-x64.exe)=456aec8658baee56ff4add4bcfd95ed532219536b568b5e45106a0120921e58d
SHA1(Wireshark-4.4.1-x64.exe)=2ec7a04154538d63dad26e9e527ad55fa50ccf01
Wireshark-4.4.1-arm64.exe: 68740880 bytes
SHA256(Wireshark-4.4.1-arm64.exe)=f6e58d24f6fd9aa6ef158265891afdafb4bdf92faa6e6503edd4da9df20c48e3
SHA1(Wireshark-4.4.1-arm64.exe)=6ab12a224ceb8cc6114cc068d9e1e46b04af6649
Wireshark-4.4.1-x64.msi: 63778816 bytes
SHA256(Wireshark-4.4.1-x64.msi)=4b96f32a423bd9a28e817a231663d647337762819cb6ebc2fb63ec84377c78c6
SHA1(Wireshark-4.4.1-x64.msi)=ab992814ae379cce4c4c11db7c6db9a0014e03a5
WiresharkPortable64_4.4.1.paf.exe: 73417384 bytes
SHA256(WiresharkPortable64_4.4.1.paf.exe)=4ab5316baac1532fd9a6977698f856cb704c1d1606f055b07f5cd8868d1daef2
SHA1(WiresharkPortable64_4.4.1.paf.exe)=2e3d0e066adf0c32eb25e5d846e561534807522b
Wireshark 4.4.1 Arm 64.dmg: 65319719 bytes
SHA256(Wireshark 4.4.1 Arm 64.dmg)=0b401cfc149d20858ef602e90edd98f8bad9795320d0953ed78b9e72f9e88fc8
SHA1(Wireshark 4.4.1 Arm 64.dmg)=eca528f9750eee6d35776101958932461d89c455
Wireshark 4.4.1 Intel 64.dmg: 69042117 bytes
SHA256(Wireshark 4.4.1 Intel 64.dmg)=267dcb2dd19d1ebb483e3cff150ad613b18437089c110754fe2ed74dc6c0e978
SHA1(Wireshark 4.4.1 Intel 64.dmg)=254c35571cbb75415982dccdb198957c58e249a8
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+ruoFAmcG5xcACgkQgiRKeOb+
rupK+Q/8Dwf+dMQJT5FfHb10NSIUeuLlfNyjytjBJbnUD8U2BK1HPTQbPYFYfUBA
4vvarOfwyB2kAV14pJEaVIT5IQ9a2LNCI961XjIJ2GP8rKCkiuYZ7oaT4jm8RMYL
YoJERqH4U07FGoXaXaa4Sn8KuZiWWxpwsHN08dxJzjWxRbnIbbRhdIa3xz3x5hB3
yY7QrQIIPKw/CzCIoe3JT9VXdSwsEEuIgr5G88sPNMn6rQX9NiLqAm31q9MirUuH
KzYL7C01aQsEMf/S1yKRGzBwU5Ek1gHJZcv2bNis+peU7w0PpACSqP2FmCeOauUF
hsUcUl4PrO+MyLKrsPydxkNySz2Kj3HMtQyckCBnifW6K+MLiOJ1tFgVf7uRpK0s
hYgQOQCB/4U91S/Y4ndPvSGYp/zVMKekkW4lM/f6uSQXEbg9om+9YRWPHxp+Xr1a
GF/bDn1rFn2DoQM1U8HqZOC426/CfUwn7F/+J/gOV6U2Vo1Q1c3F+j/+nFWYbuPk
Kk0yBuN49D3aHE7/08kZWIsiY4ESilIJrpd+LJMQ4lhrDIJWX4ObJKw1yn8Nen17
xWclbav45BUoxG8z4zX0e+UgYjqfpcn+LsJk+WmFGpJQnzIcjY9oIEeW70sd+Hii
aIqbEtYRKwTCVKuGv3NSl7bL5p8R/MGC/XATUIrzvmOafTLRMw4=
=djPY
-----END PGP SIGNATURE-----

31
wireshark.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Thu Oct 10 07:50:19 UTC 2024 - Robert Frohl <rfrohl@suse.com>
- Wireshark 4.4.1
* CVE-2024-9780: ITS dissector crash (boo#1231475).
* CVE-2024-9781: AppleTalk and RELOAD Framing dissector crashes (boo#1231476).
- Many more features, bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-4.4.1.html
-------------------------------------------------------------------
Fri Aug 30 16:08:14 UTC 2024 - Robert Frohl <rfrohl@suse.com>
- 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 <rfrohl@suse.com>
@ -10,7 +39,7 @@ Thu Aug 29 07:09:42 UTC 2024 - Robert Frohl <rfrohl@suse.com>
Wed Jul 10 20:06:41 UTC 2024 - Robert Frohl <rfrohl@suse.com>
- Wireshark 4.2.6 (jsc#PED-8517):
* SPRT dissector crash.
* CVE-2024-8645: SPRT dissector crash (boo#1230372).
- Further features, bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-4.2.6.html

12
wireshark.spec
View File

@ -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.1
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