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

Compare commits

base: SLFO-pool:655a5b0d694e3647a57a7169dd19c036b498b838c9d0b4d647532d9ab1e45bda
Branches Tags
SLFO-pool:main SLFO-pool:1.1
...
compare: SLFO-pool:1.1
Branches Tags
SLFO-pool:main SLFO-pool:1.1

2 Commits
655a5b0d69 ... 1.1

Author SHA256 Message Date
Adrian Schröter
1192f22dc4 Sync from SUSE:SLFO:1.1 wireshark revision f3351cc4865c61fb2969b31142302132 2025-01-27 14:28:18 +01:00
Adrian Schröter
64bcfc875e Sync from SUSE:SLFO:Main wireshark revision 2e9d6d4d8202155479f45fc1fd61a8ee 2024-12-04 09:29:22 +01:00
8 changed files with 107 additions and 105 deletions
Expand all files Collapse all files

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

@@ -0,0 +1,14 @@
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,17 +1,14 @@
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.
commit acac613af7d702dae533cbdf9ef49cef803d0559
Author: Robert Frohl <rfrohl@suse.com>
Date: Tue Sep 12 14:53:17 2023 +0200
---
capture/capture_sync.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
Warn if user can't access dumpcap.
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 @@
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 @@
#include <wsutil/strtoi.h>
#include <wsutil/ws_assert.h>
@@ -22,11 +19,15 @@ index 2a5db8bc73..f75e82e2e2 100644
#ifdef _WIN32
#include <wsutil/unicode-utils.h>
#include <wsutil/win32-utils.h>
@@ -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);
@@ -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]);
execv(argv[0], argv);
+ if (errno == EPERM || errno == EACCES) {
+ struct stat statbuf;
+ struct group *grp;
@@ -37,9 +38,6 @@ index 2a5db8bc73..f75e82e2e2 100644
+ }
+ }
+ free(grp_warning);
sync_pipe_write_int_msg(sync_pipe[PIPE_WRITE], SP_EXEC_FAILED, errno);
sync_pipe_write_int_msg(2, 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) Normal file
View File

Binary file not shown.

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

@@ -0,0 +1,53 @@
-----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.1.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

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

@@ -1,53 +0,0 @@
-----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-----

36
wireshark.changes
View File

@@ -1,31 +1,19 @@
-------------------------------------------------------------------
Thu Oct 10 07:50:19 UTC 2024 - Robert Frohl <rfrohl@suse.com>
Mon Nov 25 12:45:43 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
- 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
-------------------------------------------------------------------
Fri Aug 30 16:08:14 UTC 2024 - Robert Frohl <rfrohl@suse.com>
Wed Nov 6 11:01:57 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
- 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
-------------------------------------------------------------------
Thu Aug 29 07:09:42 UTC 2024 - Robert Frohl <rfrohl@suse.com>
@@ -39,7 +27,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):
* CVE-2024-8645: SPRT dissector crash (boo#1230372).
* SPRT dissector crash.
- 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 libwiretap15
%define libutil libwsutil16
%define libwire libwireshark18
%define libtap libwiretap14
%define libutil libwsutil15
%define libwire libwireshark17
%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.4.1
Version: 4.2.9
Release: 0
Summary: A Network Traffic Analyser
License: GPL-2.0-or-later AND GPL-3.0-or-later
@@ -38,6 +38,8 @@ 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
@@ -245,7 +247,7 @@ exit 0
%files
%license COPYING
%doc AUTHORS README.md README.linux
%doc AUTHORS NEWS README.md README.linux
%{_mandir}/man1/[^i]*
%{_mandir}/man4/*
%{_bindir}/capinfos