Remove unused BuildRequires: update-desktop-files. #1

Open
sbrabec wants to merge 6 commits from sbrabec/wireshark:factory into factory
9 changed files with 105 additions and 120 deletions

3
_scmsync.obsinfo Normal file
View File

@@ -0,0 +1,3 @@
mtime: 1761328595
commit: fec82b2fd0424f63812325d822d3119be74ad900a07be882e26b3eb13277d0c6
url: https://src.opensuse.org/rfrohl/wireshark

3
build.specials.obscpio Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92ebf1cd212ff709466198965f4e5ae59a3d9daaff03403e14e6779a5120b04e
size 256

View File

@@ -1,45 +0,0 @@
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.
---
capture/capture_sync.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
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>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <grp.h>
+
#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);
+ char * grp_warning = calloc(1, 256);
+ if (errno == EPERM || errno == EACCES) {
+ struct stat statbuf;
+ struct group *grp;
+ if(stat("/usr/bin/dumpcap", &statbuf) == 0) {
+ if ((grp = getgrgid(statbuf.st_gid)) != NULL) {
+ snprintf(grp_warning , 256, "\nYou need to be a member of the '%s' group. Try running\n'usermod -a -G %s <YOUR_USERNAME>' as root.", grp->gr_name, grp->gr_name);
+ }
+ }
+ }
+ free(grp_warning);
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

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd648c5c5994843205cd73e57d6673f6f4e12718e1c558c674cb8bdafeacde47
size 46826268

View File

@@ -1,53 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-4.4.8.tar.xz: 46826268 bytes
SHA256(wireshark-4.4.8.tar.xz)=dd648c5c5994843205cd73e57d6673f6f4e12718e1c558c674cb8bdafeacde47
SHA1(wireshark-4.4.8.tar.xz)=5c42c2c02082dccb000975f1765c386fe498a0b4
Wireshark-4.4.8-x64.exe: 87399752 bytes
SHA256(Wireshark-4.4.8-x64.exe)=8e31aa3deda2708887c732ded9b984a9771c7254a257274bbbb8dabd4959df4e
SHA1(Wireshark-4.4.8-x64.exe)=6ecedc6df628d389fee46d69ad342b6fb1936ea1
Wireshark-4.4.8-arm64.exe: 68854864 bytes
SHA256(Wireshark-4.4.8-arm64.exe)=0e0f5b593a07bb86b2910e009fafc7704592749140ee9e2c6cd3b790d919a10d
SHA1(Wireshark-4.4.8-arm64.exe)=53238a78fcf062baeaaeeef675c2177b43b41c16
Wireshark-4.4.8-x64.msi: 63942656 bytes
SHA256(Wireshark-4.4.8-x64.msi)=c4c18fb334a4983de71d1c849974a820624d54e3e273c9b7398df02ef691dbd5
SHA1(Wireshark-4.4.8-x64.msi)=512775b5a3372e9eee61edea9508788e97332d0a
WiresharkPortable64_4.4.8.paf.exe: 64483024 bytes
SHA256(WiresharkPortable64_4.4.8.paf.exe)=49e81cfbc5726c305156f5470656e49f1e4bf95970671b25e280f0b15c19c185
SHA1(WiresharkPortable64_4.4.8.paf.exe)=5f8663bcf9176faca4da05c532db729465397652
Wireshark 4.4.8 Arm 64.dmg: 65508150 bytes
SHA256(Wireshark 4.4.8 Arm 64.dmg)=7d14e092c177b2282a1b4bbc34fc720f21f0b967ee038dc7ca55f3885de04735
SHA1(Wireshark 4.4.8 Arm 64.dmg)=ad1dcdd412c58957a29e6e708589a9cbe5c446b7
Wireshark 4.4.8 Intel 64.dmg: 69209625 bytes
SHA256(Wireshark 4.4.8 Intel 64.dmg)=293bd2888c37d7bab1936515e09660a4860f531de6990feb07287ba4b6b8f021
SHA1(Wireshark 4.4.8 Intel 64.dmg)=aa7a5bc8be5cdc1f1ea7b17f79ee745a4a3411c3
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+ruoFAmh4BOYACgkQgiRKeOb+
ruq2eQ//c38VMGfpZ7XaknMtX7RuuPDrK4Ry1w+WNVMDykW9EJfIVODGZngK0nBw
JK3EGWhu615Cg6zud2nIZcY46WT9nFgLUq4YRWpavZoHBI77l/I1lhsrV3N5ZySP
G1tDlTsuq68+b9KLAjbN5DiccQGOg4ojF7bZPWzU3YZxKTbBLe2eIoMX1sUWz0H4
Jk4Xe0etQiaYJeJRu0kdkp5dLfVuilpZ0RU7XgKEK4/r8CAsJiuT41wbZUx35PCu
RMjtObHGE7Mf64PSMKFvb2/sOKGP8Wb1uehMv8XX3IXYFJLPeY71XJB4Jy1Iwmca
iKETjc7BDzDCnwzl/Bd3BJIjw3Fu43DkAOrh2jbVls+5gh/12Wb/Yp4KHcmBlqBM
0eCjZvO0ZjqV8oPBqaV25XKg9EklOzg93Jpb6KeJG/O4hLBooZVFkmA13LV2fJ8A
GFiZlM0XtbLcQI9q7v54ooDSgykEhFuBg+tdwa8KTWTXA8dG4vujVWb+fqSxEuFy
SeK4LQqWHz1hW8LyAC/2fG7RLI7tQYVTXJjfTjMGBa+3f5KsHmGjLoPNuvpSPm99
uNf/UVfXbloHnz1Y/iU/W/j3fJQZ4nhftZ5udWyDcxqiEN2phyAQxKOCGtOMo9i9
vHn5R5Mf0b85rJLgjJrmsn0DsDaedrctEHPsjRr+wvtbhiEH2dE=
=ogjy
-----END PGP SIGNATURE-----

BIN
wireshark-4.6.0.tar.xz LFS Normal file

Binary file not shown.

View File

@@ -0,0 +1,49 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
wireshark-4.6.0.tar.xz: 50726944 bytes
SHA256(wireshark-4.6.0.tar.xz)=ab016463062bb635285b9678dd45ddd84c65938911fd40b3cca9a903a08ad8d9
SHA1(wireshark-4.6.0.tar.xz)=9440b807951ecc9b46f261a64b33e3cd4d0b17fa
Wireshark-4.6.0-x64.exe: 95881032 bytes
SHA256(Wireshark-4.6.0-x64.exe)=aaec7abd3b79e0f336722ab86b193bbf5175fed125d7b8e2629ccdfc9a763aa1
SHA1(Wireshark-4.6.0-x64.exe)=f69c7f93dd5c9e1a1a9e8a76163930822dc7cbf6
Wireshark-4.6.0-arm64.exe: 72440152 bytes
SHA256(Wireshark-4.6.0-arm64.exe)=92e040f3c9b158743b29d349bb6e3ddb9d5e5bf18dbb97a657cd5e7eedd72343
SHA1(Wireshark-4.6.0-arm64.exe)=1fff55e1a9706d799b7249b2b736bd0058977d15
Wireshark-4.6.0-x64.msi: 73359360 bytes
SHA256(Wireshark-4.6.0-x64.msi)=2747ec671d9c0434ffeb12cfe89ec9a0733a6712693ea73701e6ce6adb2551a1
SHA1(Wireshark-4.6.0-x64.msi)=7e3418a902160a3ba922dc8dcb997027c1f73f28
WiresharkPortable64_4.6.0.paf.exe: 82281328 bytes
SHA256(WiresharkPortable64_4.6.0.paf.exe)=9f3d82eabd4739a953e55cd1bdc8e547ef6d0848557eae24730c8ee8fc2671bf
SHA1(WiresharkPortable64_4.6.0.paf.exe)=3977ff97c42075152f3ee4aa648835c1cf47e8a3
Wireshark 4.6.0.dmg: 141110973 bytes
SHA256(Wireshark 4.6.0.dmg)=79eda54875cb8f9a8e53e876574a9a2fccaba039c21c1a1e38971c398ca1e3f2
SHA1(Wireshark 4.6.0.dmg)=a1b02e3a3d04e8482295b9cc9aef946644d7ac3a
You can validate these hashes using the following commands (among others):
Windows: certutil -hashfile Wireshark-x.y.z-x64.exe SHA256
Linux (GNU Coreutils): sha256sum wireshark-x.y.z.tar.xz
macOS: shasum -a 256 "Wireshark x.y.z.dmg"
Other: openssl sha256 wireshark-x.y.z.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEWlrbp9vqbD+HIk8ZgiRKeOb+ruoFAmjnEe8ACgkQgiRKeOb+
rurGUhAAiYPMQNE2wWVXTw4NPfgWOm0svtd2lbpCfItM7ou7Lzl235xJv7SKMF80
izZ1h30nptjLInO/aejCq14EDKhlnDxJP47935s6M+rCNTCvIppl+EtYJsnQXRUx
EVs/mrRFUpxJjclIZofEQ+3LLJELZMHoLMN0i2IKcWfMGE4w+cmCJGcfsEEM489h
UR61lDC5s5VUQj+bQvKJonU2LaQN0PsX7fjCUu12iGkrLNeLcRMBGMF6uBbQ1SSW
+XE2knDiQNWg9ASakjU/UFylWDo465v9F+RKvZ32Uby2EGd6Ca2I3BQEBJGXeDCW
Owjr3zcFtKU5wPaL5MxH6TZRpfVgbJY2aXNcxOMl8C/086tIsRSvKYgfLSu8oojv
efNSUeEIegH1pMU7onY3pxA3tT1nOAkdaRQlaGBlV6EdTPHRWKUr2s2z24/kbjr5
IWg28Nh9pV3OAIT9E0gS6YfPcGZAyJ60jFJpdA97M18deDIzprQfAS6ThRl7HXyB
kcLAmc+GjTl6MX8fz28SFkoSL/Yk3BiiKDLSjpwhib2PaI4/Q0oTBY4ihRcDV9WC
Mr86PfLDwGh7USDexYlZjjG6MzgYnQM8QibrMxw9aFb/FziCqUu9lHC/KaBiUTJX
Gai95WVA3r4xZQiKAC6BAEf2T5+MPjYJW4UoTLxlmxhVYM8gI6s=
=VtvJ
-----END PGP SIGNATURE-----

View File

@@ -1,3 +1,34 @@
-------------------------------------------------------------------
Sat Nov 22 21:41:25 CET 2025 - Stanislav Brabec <sbrabec@suse.com>
- Remove unused BuildRequires: update-desktop-files.
-------------------------------------------------------------------
Wed Oct 15 13:12:46 UTC 2025 - Robert Frohl <rfrohl@suse.com>
- Wireshark 4.6.0
* There are new features, bug fixes and updated protocol
support. For an exhaustive list please refer to:
https://www.wireshark.org/docs/relnotes/wireshark-4.6.0.html
- dropped wireshark-0010-dumpcap-permission-denied.patch:
functionality not needed anymore, provided natively by the project.
-------------------------------------------------------------------
Thu Oct 9 09:19:17 UTC 2025 - Robert Frohl <rfrohl@suse.com>
- Wireshark 4.4.10
* CVE-2025-11626: MONGO dissector infinite loop (bsc#1251933).
- Many more features, bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-4.4.10.html
-------------------------------------------------------------------
Tue Sep 2 08:44:09 UTC 2025 - Robert Frohl <rfrohl@suse.com>
- Wireshark 4.4.9
* CVE-2025-9817: SSH dissector crash (bsc#1249090).
- Many more features, bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-4.4.9.html
-------------------------------------------------------------------
Wed Jul 16 21:37:22 UTC 2025 - Robert Frohl <rfrohl@suse.com>

View File

@@ -18,9 +18,9 @@
# define libraries
%define libtap libwiretap15
%define libutil libwsutil16
%define libwire libwireshark18
%define libtap libwiretap16
%define libutil libwsutil17
%define libwire libwireshark19
%define org_name org.wireshark.Wireshark
%if 0%{?suse_version} >= 1500
%bcond_without lz4
@@ -34,7 +34,7 @@
%bcond_with qt6
%endif
Name: wireshark
Version: 4.4.8
Version: 4.6.0
Release: 0
Summary: A Network Traffic Analyser
License: GPL-2.0-or-later AND GPL-3.0-or-later
@@ -43,8 +43,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-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
@@ -75,7 +73,6 @@ BuildRequires: portaudio-devel
BuildRequires: snappy-devel
BuildRequires: spandsp-devel
BuildRequires: tcpd-devel
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
BuildRequires: pkgconfig(libmaxminddb)
BuildRequires: pkgconfig(libnghttp2)
@@ -170,7 +167,7 @@ from a live network or from a capture file on disk.
Summary: A Network Traffic Analyser - Qt UI
Group: Productivity/Networking/Diagnostic
Requires: %{name} = %{version}
Requires: hicolor-icon-theme
Requires: hicolor-icon-theme >= 0.17
Requires: xdg-utils
Provides: %{name}-ui = %{version}
# gtk is the deprecated ui so ensure its uninstall
@@ -232,9 +229,6 @@ cp resources/freedesktop/%{org_name}.desktop %{buildroot}%{_datadir}/application
sed -i -e 's|Name=Wireshark|Name=Wireshark - Super User Mode|g' %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop
sed -i -e 's|^Exec=wireshark|Exec=xdg-su -c wireshark|g' %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop
%suse_update_desktop_file %{org_name}
%suse_update_desktop_file %{org_name}-su
rm -f %{buildroot}${cmakedocdir}/*.html
%pre
@@ -247,14 +241,6 @@ getent group wireshark >/dev/null || groupadd -r wireshark
%set_permissions %{_bindir}/dumpcap
exit 0
%post ui-qt
%desktop_database_post
%icon_theme_cache_post
%postun ui-qt
%desktop_database_postun
%icon_theme_cache_postun
%ldconfig_scriptlets -n %{libutil}
%ldconfig_scriptlets -n %{libwire}
%ldconfig_scriptlets -n %{libtap}
@@ -266,6 +252,7 @@ exit 0
%{_mandir}/man4/*
%{_bindir}/capinfos
%{_bindir}/captype
%{_bindir}/dftest
%{_bindir}/editcap
%{_bindir}/idl2wrs
%{_bindir}/mergecap
@@ -279,6 +266,16 @@ exit 0
%verify(not mode caps) %attr(0750,root,wireshark) %caps(cap_net_raw,cap_net_admin=ep) %{_bindir}/dumpcap
%{_libdir}/wireshark/
%{_datadir}/wireshark/
%{_libexecdir}/wireshark
%{_libexecdir}/wireshark/extcap
%{_libexecdir}/wireshark/extcap/androiddump
%{_libexecdir}/wireshark/extcap/ciscodump
%{_libexecdir}/wireshark/extcap/dpauxmon
%{_libexecdir}/wireshark/extcap/randpktdump
%{_libexecdir}/wireshark/extcap/sdjournal
%{_libexecdir}/wireshark/extcap/sshdump
%{_libexecdir}/wireshark/extcap/udpdump
%{_libexecdir}/wireshark/extcap/wifidump
%files -n %{libutil}
%license COPYING