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 e98c7b538b516dc907d04d5a6e9d0b34

Browse Source
This commit is contained in:
Adrian Schröter
2025-02-26 11:52:59 +01:00
parent 1192f22dc4
commit 8807e6fc51
8 changed files with 180 additions and 121 deletions
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.9.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

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

@@ -1,53 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-4.2.9.tar.xz: 45045592 bytes
SHA256(wireshark-4.2.9.tar.xz)=62c2b6652d7f9a50668867bd57b21609c9a9b6950f26e7f30a24b2de0e72ded3
SHA1(wireshark-4.2.9.tar.xz)=d1abbe110451dab9e57c9ee1fe0892e0d6a7d515
Wireshark-4.2.9-x64.exe: 86497240 bytes
SHA256(Wireshark-4.2.9-x64.exe)=3eb1d48fb4b5db39154ad9f73778c7fce0d749393a406775cbe24cefb0476f5d
SHA1(Wireshark-4.2.9-x64.exe)=75dc0bf4f750b9e17be4a29fcebf67aba1d14e8a
Wireshark-4.2.9-arm64.exe: 68046416 bytes
SHA256(Wireshark-4.2.9-arm64.exe)=4cd708cc401e0b538a93dba725ab3e1e798350498ff1713be5907e959f7c56ee
SHA1(Wireshark-4.2.9-arm64.exe)=eb76a49b37564d0e034b7f0818c8b44a50e29327
Wireshark-4.2.9-x64.msi: 63156224 bytes
SHA256(Wireshark-4.2.9-x64.msi)=58acadf82c1f1dcb28bf0a3bab5d5a82107a80ee8eab476ab150d78abea710ed
SHA1(Wireshark-4.2.9-x64.msi)=47a33a9f9c553b364f28dc0c2e12390b599a7c4c
WiresharkPortable64_4.2.9.paf.exe: 53703032 bytes
SHA256(WiresharkPortable64_4.2.9.paf.exe)=06dc3cd2bcc2045ffebc4e4781d20702c6fa1f7ecec0da168f474e15fc901eb0
SHA1(WiresharkPortable64_4.2.9.paf.exe)=f6e9ee6de841b2dd5e3afef1f0d9d1c2368f6550
Wireshark 4.2.9 Arm 64.dmg: 65704617 bytes
SHA256(Wireshark 4.2.9 Arm 64.dmg)=9dafd0d3eb9ca5d0372eb4ef00b264dd457cce3c22bb430aadeafa054853cad6
SHA1(Wireshark 4.2.9 Arm 64.dmg)=66386fc3cbd9d3a3c7a95993f301b8f8a4410697
Wireshark 4.2.9 Intel 64.dmg: 69462238 bytes
SHA256(Wireshark 4.2.9 Intel 64.dmg)=64f5a653d812f4c248fcdb17f2dd43ab227880992ceed77994fd2b3604ff6997
SHA1(Wireshark 4.2.9 Intel 64.dmg)=106897e7269b092f2721a5da0f6655ef446abe63
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+ruoFAmc+N7wACgkQgiRKeOb+
ruqZcxAAunRDwrlYkcpJ4NE58yuZcfsbPb1ZGXsQlfLR6C6trRsCg+6koEdHv42A
S7V2wkS/fyITs/Wt89qnRkBO773q9N+9zRIhVMrnPOmeCbEmjqB842UiLNlTUG9s
tIAxu/T9/sJrK03eFG26Ro5L6ZEapF/FLTPV9r3uvb2dp411a9S0TYUOGoCwnc7m
SDxltI3WHzbIX13sYMY1NIDi/M8N+3TC60IBFJmiRmbr+UmS19kVgvywPzSWZWQu
/6vCVmm7m6kFFV1D+kRWAYileJLhNu9ZoWmC9ScBIpNRnikdD/QXSxhrWHKllYOl
h7juJY/5zKJuk9YxYHOlcGc13t723+ahCLCLfA1ZAs9CCFLueyHKUm5hh5aHv6+o
MDG4MgnZp1EhhQg5Zk92aW5wNdL1MZbEUM2TxDLMm9pvRm3GOcZ4PP6ZRW+I473I
Of/olwWbHUMk6q7awJpgevLNBNkkXnETHrFoe6JFN5klqhV73McjZyTzhTMJotkz
ujodCjPiMsgEspLBoigr741pBXtjvYy1qw1uIRiDfLA6CvJbYRRNgkvCphTFTnv0
U3r6tkW+12vFZD2QCr6NULLI+Pxn2WiCQp09JnW9QJdYNTBE2rozahejmNNhCCTg
oXDemfDT0dqjewS/b+UkLDx1I3phw6SeM/7Q0kzf+86HIGGaKLU=
=+Jo4
-----END PGP SIGNATURE-----

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

Binary file not shown.

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

@@ -0,0 +1,53 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-4.4.4.tar.xz: 46845832 bytes
SHA256(wireshark-4.4.4.tar.xz)=5154d2b741ec928b1bdb5eba60e29536f78907b21681a7fe18c652f4db44b1f1
SHA1(wireshark-4.4.4.tar.xz)=f9eae804b248bbfb928eb36bae8c31a96998771c
Wireshark-4.4.4-arm64.exe: 68763208 bytes
SHA256(Wireshark-4.4.4-arm64.exe)=68c6d3ab4656e8d8d0f4e63a9000aeaf6d7f0a61493f4031e891618a189298b0
SHA1(Wireshark-4.4.4-arm64.exe)=9e2eebd9d24d4ac6d5e81fc4eb1a9c9d9041eb1a
Wireshark-4.4.4-x64.exe: 87303952 bytes
SHA256(Wireshark-4.4.4-x64.exe)=7511107872088965cc781fe877f79371fee441bdcfeae28ab78faa591f780a51
SHA1(Wireshark-4.4.4-x64.exe)=0065bf07c94426a3210e1b2314dfbe8de458507d
Wireshark-4.4.4-x64.msi: 63881216 bytes
SHA256(Wireshark-4.4.4-x64.msi)=425e2175bb5b31a2cfe60f34696cfacfdee73ff13692bea1c2eddc1e859c5db1
SHA1(Wireshark-4.4.4-x64.msi)=f51c8687c283e2111473490c8626e6375f3e7aac
WiresharkPortable64_4.4.4.paf.exe: 64449856 bytes
SHA256(WiresharkPortable64_4.4.4.paf.exe)=863aa32ebc8090dfb358345c16467619c284c4303472e37ee0e94fc10d4727ed
SHA1(WiresharkPortable64_4.4.4.paf.exe)=a1a245542356157a86d81f09db2d640f27f99489
Wireshark 4.4.4 Arm 64.dmg: 65447441 bytes
SHA256(Wireshark 4.4.4 Arm 64.dmg)=24cdce2f5869653b98032e8f6f06a08bd4f4899f178a27eb6d751fc27ac9cb47
SHA1(Wireshark 4.4.4 Arm 64.dmg)=6ba4d0c608e709902f9bb8db1e5cb23d8dea6da2
Wireshark 4.4.4 Intel 64.dmg: 69174110 bytes
SHA256(Wireshark 4.4.4 Intel 64.dmg)=46b267bdd78222aa272937a65fa91b09c3755bc0ec01fa52e8b63984699c0afb
SHA1(Wireshark 4.4.4 Intel 64.dmg)=28ed35eb30051820eb4cc1ecc006d4eff0ce2209
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+ruoFAme2OI0ACgkQgiRKeOb+
ruqZXxAAoxsiJ0KSHshPLcT2bhXvJY5hywZD4yfqxn7GvN+PvSg8i9nlZB0C+581
i/aC+RqdkGESfYG2lBEgFfOiTXxO9Oca6ktuIySkTIwYHzfjoAXQIq4riFqlio0u
5zQlElyIssHha7TQC9ruUAKn9iaJI7ABPaNL+WlZfT0V0hhDhzcByaUjyy+TsvZf
Mr2jiE+OVNRxdZczY3ynfJJFrqWWLMUz2gSs0yGdjE17m25Sn0ri/9ANx+vEYKGP
PWxjg7jE9vVpkJC/ByavMkAjNAAxDL2CE7lVE3bhbU8ZDa2FUPYjf85SiBzjKWhg
nAC14GFm34Z9np5w20Z5i1XBs0vJW+3h0csXioFT1EwC3Vmga6pucyJNMDB1J90k
rcKOqd+j1LU6n0GMvVdyXXDNNb0IHcIl9kiLcorBqLzZLZO4fsTBjYoPA3BOxMPz
btXxwA5fidDlB5I/uYt+WDBWBLdVo4A7damBPTNleG+s1ebpZ6Go0CHIynBHvx3X
DPlZe4tEedkinb06TxJF/cm0xQLhLo0otYmiV3eGTgseLYrbXVfkVehuErmdgKuv
3eEAtUct1fa10aRUwbnDLoJ4Gb8g9lsZkOOBRDLUhUKIdbE8uY5mAOvtanHv6n0t
tDLrdjQMWWr82JPQ2A7LNkaB4z2zV499/u9mq/pyRujnjc/T4tc=
=In84
-----END PGP SIGNATURE-----

81
wireshark.changes
View File

@@ -1,19 +1,76 @@
-------------------------------------------------------------------
Mon Nov 25 12:45:43 UTC 2024 - Robert Frohl <rfrohl@suse.com>
Wed Feb 19 21:05:06 UTC 2025 - Robert Frohl <rfrohl@suse.com>
- Wireshark 4.2.9:
* CVE-2024-11595: FiveCo RAP dissector infinite loop (bsc#1233594).
* CVE-2024-11596: ECMP dissector crash (bsc#1233593).
- Further features, bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-4.2.9.html
- Wireshark 4.4.4
* CVE-2025-1492: Bundle Protocol and CBOR dissector crash (boo#1237414).
- Many more features, bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-4.4.4.html
-------------------------------------------------------------------
Wed Nov 6 11:01:57 UTC 2024 - Robert Frohl <rfrohl@suse.com>
Tue Feb 4 10:46:24 UTC 2025 - ecsos <ecsos@opensuse.org>
- Wireshark 4.2.8:
* CVE-2024-9781: AppleTalk and RELOAD Framing dissector crashes (bsc#1231476)
- Further features, bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-4.2.8.html
- Fix build error for Leap.
-------------------------------------------------------------------
Tue Jan 28 08:14:39 UTC 2025 - Robert Frohl <rfrohl@suse.com>
- Default to building with qt6
-------------------------------------------------------------------
Thu Jan 9 08:24:51 UTC 2025 - Robert Frohl <rfrohl@suse.com>
- Wireshark 4.4.3
* Potential mis-match in GSM MAP dissector for uncertainty radius and its
filter key
* The NFSv2 Dissector appears to be swapping Character Special File and
Directory in mode decoding
* VOIP Calls call flow displaying hours
- Many more features, bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-4.4.3.html
- move to default system Lua, instead of using explicit version
-------------------------------------------------------------------
Sat Dec 28 08:21:02 UTC 2024 - J P <opensuse-738561@jspam.de>
- Update Lua from 5.1 to 5.4
-------------------------------------------------------------------
Thu Nov 21 08:27:09 UTC 2024 - Robert Frohl <rfrohl@suse.com>
- Wireshark 4.4.2
* CVE-2024-11595: FiveCo RAP dissector infinite loop (boo#1233594).
* CVE-2024-11596: ECMP dissector crash (boo#1233593).
- Many more features, bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-4.4.2.html
-------------------------------------------------------------------
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>
@@ -27,7 +84,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

56
wireshark.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package wireshark
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -18,18 +18,23 @@
# 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
%else
%bcond_with lz4
%endif
%bcond_without qt5
# have an option to switch qt versions, but with a working default
%if 0%{?suse_version} >= 1600
%bcond_without qt6
%else
%bcond_with qt6
%endif
Name: wireshark
Version: 4.2.9
Version: 4.4.4
Release: 0
Summary: A Network Traffic Analyser
License: GPL-2.0-or-later AND GPL-3.0-or-later
@@ -38,11 +43,16 @@ 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
%if 0%{?suse_version} < 1600
BuildRequires: gcc13
BuildRequires: gcc13-c++
%else
BuildRequires: gcc
BuildRequires: gcc-c++
%endif
BuildRequires: bison
BuildRequires: flex
BuildRequires: glib2-devel >= 2.32
@@ -56,7 +66,7 @@ BuildRequires: libgnutls-devel >= 3.2
BuildRequires: libpcap-devel
BuildRequires: libsmi-devel
BuildRequires: libtool
BuildRequires: lua51-devel
BuildRequires: lua-devel
BuildRequires: net-snmp-devel
BuildRequires: openssl-devel
BuildRequires: pcre2-devel
@@ -81,16 +91,7 @@ Requires(pre): permissions
Requires(pre): shadow
Recommends: wireshark-ui = %{version}
Provides: group(wireshark)
%if %{with qt5}
BuildRequires: libqt5-linguist-devel
BuildRequires: pkgconfig(Qt5Concurrent) >= 5.3.0
BuildRequires: pkgconfig(Qt5Core) >= 5.3.0
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Widgets)
%else
%if %{with qt6}
BuildRequires: qt6-linguist-devel
BuildRequires: qt6-qt5compat-devel
BuildRequires: pkgconfig(Qt6Concurrent)
@@ -100,6 +101,15 @@ BuildRequires: pkgconfig(Qt6Multimedia)
BuildRequires: pkgconfig(Qt6PrintSupport)
BuildRequires: pkgconfig(Qt6Svg)
BuildRequires: pkgconfig(Qt6Widgets)
%else
BuildRequires: libqt5-linguist-devel
BuildRequires: pkgconfig(Qt5Concurrent) >= 5.3.0
BuildRequires: pkgconfig(Qt5Core) >= 5.3.0
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Multimedia)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Widgets)
%endif
%if 0%{?is_opensuse} && 0%{?suse_version} >= 1550
# enable ITU G.729 Annex A/B speech codec only in Tumbleweed
@@ -178,7 +188,11 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA256 | head -n1 | cut
%autosetup -p1
%build
%if %{with qt5}
%if 0%{?suse_version} < 1600
export CC=gcc-13
export CXX=g++-13
%endif
%if %{without qt6}
%cmake -DCMAKE_INSTALL_LIBDIR='%{_lib}/' -DUSE_qt6=OFF
%else
%cmake -DCMAKE_INSTALL_LIBDIR='%{_lib}/'
@@ -247,7 +261,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