From 623cad8c6c3e9a55adfb47561a48cd5635ec13cf270e2437d6e141ec80a79a37 Mon Sep 17 00:00:00 2001 From: Robert Frohl Date: Thu, 20 Feb 2025 15:45:49 +0000 Subject: [PATCH] wireshark 4.4.4: with references and qt switch fixed OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=469 --- wireshark.changes | 2 +- wireshark.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wireshark.changes b/wireshark.changes index 49da592..84ebb1b 100644 --- a/wireshark.changes +++ b/wireshark.changes @@ -2,7 +2,7 @@ Wed Feb 19 21:05:06 UTC 2025 - Robert Frohl - Wireshark 4.4.4 - * Bundle Protocol and CBOR dissector crash. + * 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 diff --git a/wireshark.spec b/wireshark.spec index d23f4d4..d0936ca 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -27,8 +27,12 @@ %else %bcond_with lz4 %endif -# have an option to still build with 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.4.4 Release: 0 @@ -188,7 +192,7 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA256 | head -n1 | cut export CC=gcc-13 export CXX=g++-13 %endif -%if %{with qt5} +%if %{without qt6} %cmake -DCMAKE_INSTALL_LIBDIR='%{_lib}/' -DUSE_qt6=OFF %else %cmake -DCMAKE_INSTALL_LIBDIR='%{_lib}/'