Accepting request 1174484 from network:utilities

OBS-URL: https://build.opensuse.org/request/show/1174484
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=218

wireshark-4.2.4.tar.xz

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

wireshark-4.2.4.tar.xz.hash

@@ -1,53 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-wireshark-4.2.4.tar.xz: 44986232 bytes
-SHA256(wireshark-4.2.4.tar.xz)=46bd0f4474337144b30816fb2d8f14e72a26d0391f24fe0b7b619acdcdad8c0c
-SHA1(wireshark-4.2.4.tar.xz)=a9979b052652c69d3ca308fb1f2d369b820bb007
-
-Wireshark-4.2.4-x64.exe: 86455240 bytes
-SHA256(Wireshark-4.2.4-x64.exe)=b621718ffe64748590ea9568fbbed0f3d86b0939906dc9f7fe064e20ce385492
-SHA1(Wireshark-4.2.4-x64.exe)=caa0849461201937fa995afc5d2b80986c506891
-
-Wireshark-4.2.4-arm64.exe: 67927072 bytes
-SHA256(Wireshark-4.2.4-arm64.exe)=f6f94f8628d1d4f830c79ee4a9962c36b4497a6219c7ca9e3527c48a0f424eac
-SHA1(Wireshark-4.2.4-arm64.exe)=5880810dd02c68c00454f29747e560b9b68989d7
-
-Wireshark-4.2.4-x64.msi: 62881792 bytes
-SHA256(Wireshark-4.2.4-x64.msi)=2449ca54220cf3c4e66c49c136762cf8b944713fbd488e5fd76c79fba36e4a7e
-SHA1(Wireshark-4.2.4-x64.msi)=f2c3238283c09b3c55be2865526aa678d09cda39
-
-WiresharkPortable64_4.2.4.paf.exe: 53606272 bytes
-SHA256(WiresharkPortable64_4.2.4.paf.exe)=f949f0cc98d1201a233913ce9cd5007bddf7980722ac0835bddfaa3e750d3b8c
-SHA1(WiresharkPortable64_4.2.4.paf.exe)=80a1e625eed7ac2b25b0171beb14c5a95d6288a2
-
-Wireshark 4.2.4 Arm 64.dmg: 65626764 bytes
-SHA256(Wireshark 4.2.4 Arm 64.dmg)=93c874a00c3f436bb0a234dd170e30fb3a966736aea7590013e48a1eeb612a01
-SHA1(Wireshark 4.2.4 Arm 64.dmg)=531b786e90bc3b119d442e6bcf34f4f7f44151a3
-
-Wireshark 4.2.4 Intel 64.dmg: 69408431 bytes
-SHA256(Wireshark 4.2.4 Intel 64.dmg)=00f6f08652263d4a93249ff1ba8fdff28de16806184d9d26e0dba1ab8b9ed604
-SHA1(Wireshark 4.2.4 Intel 64.dmg)=ea887db33f1a8f8af0db3c2ca7380844b5a68b26
-
-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+ruoFAmYEi88ACgkQgiRKeOb+
-ruog5A/5AbZMbwCZjByuJSeGiayetH/tjKIey4iLnGluGuvmKsKmxyqtkL/PwUEd
-slEpp+RjSDAONkbxDsFTebXYk2nUqy0wsMAk5NFXxCodIShN5hzAfvKWiGe7fJ5g
-0kIMxO1b2Zn/JSzb3BBfENjHSF51NjxB0syIh3Q+avqkizl6Tjeq7uP+BtGAFWVf
-gXZL9zIRS6BvDImcGJwq/TJaZ9hLWWENzohp9kcCPsavbrqxCIKOuKUzh5eNAXGN
-GRk0S0eJaogkgXR7vkfH9ASW04u8DC/IeafIuU0cklK0SvagZjfwi1WHLtuWvWcr
-5OG0DhsBJN2s8Gp9n6wnvck2+4PPAeIy1HHRBwFPVIooJVSgPXFl999Pc3TCzVAZ
-wlTJPtjjGqwaBvnNTz+nxdbO8J49+5gi36Jc00YuTBg0NbkgwTygGwY/1cywnh2R
-WTHGkP6c+5LsTY7BXuIxgB0w9b304klBqj07wfUeo+CyG5GcFrZbpsPZBGurWo+G
-33QvuHkT3kiCxkpcJqlJvoEhXxV7rByRMVZDLaUeYyQ/pqqv6VFaQOhrKdFfv1zN
-wt4+ocsMEry4GFmtJR058A7frur0MTkI6okJY5I3Exubdmmy4EHpXLJheX4MJK/P
-UQ27iguQYlXuex3cdp4giKWR6LirpyF34EBumbyOg88W+gOfKko=
-=Tets
------END PGP SIGNATURE-----

wireshark-4.2.5.tar.xz.hash

@@ -0,0 +1,53 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+wireshark-4.2.5.tar.xz: 45014156 bytes
+SHA256(wireshark-4.2.5.tar.xz)=55e793ab87a9a73aac44336235c92cb76c52180c469b362ed3a54f26fbb1261f
+SHA1(wireshark-4.2.5.tar.xz)=03293699260d2492166ac805ef0c10b8a6b531e6
+
+Wireshark-4.2.5-x64.exe: 86489296 bytes
+SHA256(Wireshark-4.2.5-x64.exe)=3d921ee584d0984f694f60a771a6581a6f32a9de995a5cd4bca1931185a4e618
+SHA1(Wireshark-4.2.5-x64.exe)=0e3c7b4dcd5c247c8f9726195a4d5a70b99f8b1b
+
+Wireshark-4.2.5-arm64.exe: 67980200 bytes
+SHA256(Wireshark-4.2.5-arm64.exe)=331a0925ee1e4d6d1b16af6982972631335fc238afe626903ed122e146830c5a
+SHA1(Wireshark-4.2.5-arm64.exe)=e0b5789980c0f12e344f6b8820f49facd5b379c6
+
+Wireshark-4.2.5-x64.msi: 62894080 bytes
+SHA256(Wireshark-4.2.5-x64.msi)=65413e0733192979e168f8a11940828d1c2410ae21862f2e7012a3edb7e22ee1
+SHA1(Wireshark-4.2.5-x64.msi)=e925d3cee2e604ab659e4da42df0880a6531151f
+
+WiresharkPortable64_4.2.5.paf.exe: 53647808 bytes
+SHA256(WiresharkPortable64_4.2.5.paf.exe)=1706e3c2d5e198270707641bbbde3042d8921cb95d2683633dd855fee921847d
+SHA1(WiresharkPortable64_4.2.5.paf.exe)=ef0c034a38d77ead057dbb6444cce70f9a07815c
+
+Wireshark 4.2.5 Arm 64.dmg: 65573656 bytes
+SHA256(Wireshark 4.2.5 Arm 64.dmg)=72d670ad068ac46c1d16ffb5fc8e6b582136a0eed6fc278b9f36877311e4e4af
+SHA1(Wireshark 4.2.5 Arm 64.dmg)=84fe8ed0cf40b861f8039d811a1bb1704f9e57db
+
+Wireshark 4.2.5 Intel 64.dmg: 69328176 bytes
+SHA256(Wireshark 4.2.5 Intel 64.dmg)=67a1ea88226c2f5699c3c6c36fb0006d84c62bdbfe5474dccff30860fd9f81b7
+SHA1(Wireshark 4.2.5 Intel 64.dmg)=a72a8034474e42c4e20a0f05e464ddb1f3616c66
+
+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+ruoFAmZFCq4ACgkQgiRKeOb+
+ruoxyQ/+PWOKU9/4HVVhI+fKlfUfuzH5F8ABE+aH4wasbh6Yzw8rYy3d/bvpXimc
+Cc3YKGNoQ/7ErwIvE2dF+fCaIo95mSDtQcrGn/gznSExGLXAPoBzfpchGm2qmqV9
+/qVKLPo9SR0ucwY054XyDcncIa2g2iXi9x2T5fsbLdNWoUZAkj5rk3bq0scQA1Pa
+yt/F6M+alQpA2sUS2Lebq/1UVZtfGRbEP8ustmN7FeqlTZNfZezaFK2h0uVekJ0e
+DqQJWh9Tvb/UIVusWh509HwfcuS8aQU5bJ/fN4JS5aNp41Aup5guiAIs+c96TPuy
+EfrkHilFwvZsHJDsA+wH1Mq317Xjh/RiheDjUh/Gn1f9bubL6nkU2f3AOon3fAtX
+xpRjNymEhvwiZYNTRv3PaGo21lsS4Oxggt/eZhmy0tntnB/fq3Ylrogn6SbOm0p7
+wuRfhl09Pb6m2Ol0pfkxck7OEiLn28RTqJmYwAiood0TMD8X6HNnNITqhPQq5ihb
+96MNRfna6ES8mAmjFdiMSsUX+9jZYSDogQ/jxz1n+fcYLXXOMnPEYsyPt+xSMp6o
+7CjIikcjTZ1cCKAuienirJWBt58PSjsewpVMVyDVkNeNniLtS+QB6Q2uW6W2UcHj
+KhqMLvrX18YuTgdO/ZrxN33+H4nqyq07uS2n/E+cMAaAD2qVOKc=
+=pOkW
+-----END PGP SIGNATURE-----

wireshark.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed May 15 19:55:19 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Wireshark 4.2.5:
+  * CVE-2024-4854: MONGO and ZigBee TLV dissector infinite loops
+    (wnpa-sec-2024-07 boo#1224274)
+  * CVE-2024-4853: The editcap command line utility could crash
+    when chopping bytes from the beginning of a packet
+    (wnpa-sec-2024-08 boo#1224259)
+  * CVE-2024-4855: The editcap command line utility could crash
+    when injecting secrets while writing multiple files
+    (wnpa-sec-2024-09 boo#1224276)
+- Further features, bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-4.2.5.html
+
 -------------------------------------------------------------------
 Thu Mar 28 06:48:56 UTC 2024 - Robert Frohl <rfrohl@suse.com>
 

wireshark.spec

@@ -2,6 +2,7 @@
 # spec file for package wireshark
 #
 # Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2024 Andreas Stieger <Andreas.Stieger@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,14 +22,14 @@
 %define libutil libwsutil15
 %define libwire libwireshark17
 %define org_name org.wireshark.Wireshark
-%bcond_without qt5
 %if 0%{?suse_version} >= 1500
 %bcond_without lz4
 %else
 %bcond_with lz4
 %endif
+%bcond_without qt5
 Name:           wireshark
-Version:        4.2.4
+Version:        4.2.5
 Release:        0
 Summary:        A Network Traffic Analyser
 License:        GPL-2.0-or-later AND GPL-3.0-or-later
@@ -66,6 +67,20 @@ BuildRequires:  spandsp-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(libmaxminddb)
+BuildRequires:  pkgconfig(libnghttp2)
+BuildRequires:  pkgconfig(libnl-3.0)
+BuildRequires:  pkgconfig(libssh) >= 0.6.0
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(minizip)
+BuildRequires:  pkgconfig(opus)
+BuildRequires:  pkgconfig(sbc)
+BuildRequires:  pkgconfig(speexdsp)
+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
@@ -86,20 +101,6 @@ BuildRequires:  pkgconfig(Qt6PrintSupport)
 BuildRequires:  pkgconfig(Qt6Svg)
 BuildRequires:  pkgconfig(Qt6Widgets)
 %endif
-BuildRequires:  pkgconfig(libmaxminddb)
-BuildRequires:  pkgconfig(libnghttp2)
-BuildRequires:  pkgconfig(libnl-3.0)
-BuildRequires:  pkgconfig(libssh) >= 0.6.0
-BuildRequires:  pkgconfig(libsystemd)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(minizip)
-BuildRequires:  pkgconfig(opus)
-BuildRequires:  pkgconfig(sbc)
-BuildRequires:  pkgconfig(speexdsp)
-Requires(pre):  permissions
-Requires(pre):  shadow
-Recommends:     wireshark-ui = %{version}
-Provides:       group(wireshark)
 %if 0%{?is_opensuse} && 0%{?suse_version} >= 1550
 # enable ITU G.729 Annex A/B speech codec only in Tumbleweed
 BuildRequires:  pkgconfig(libbcg729)
@@ -199,9 +200,9 @@ echo "`grep %{name}-%{version}.tar.xz %{SOURCE2} | grep SHA256 | head -n1 | cut
 %cmake_install
 cmake --install build --component Development --prefix %{buildroot}%{_prefix}
 
-cmakedocdir=/usr/share/doc/packages/wireshark
+cmakedocdir=%{_docdir}/wireshark
-if [ -d  %{buildroot}/usr/share/doc/wireshark ]; then
+if [ -d  %{buildroot}%{_datadir}/doc/wireshark ]; then
-   cmakedocdir=/usr/share/doc/wireshark
+   cmakedocdir=%{_datadir}/doc/wireshark
 fi
 # removing doc files that are not needed
 rm %{buildroot}/${cmakedocdir}/COPYING
@@ -215,7 +216,7 @@ install -d -m 0755 %{buildroot}%{_mandir}/man1/
 # desktop file
 cp resources/freedesktop/%{org_name}.desktop %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop
 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 %f|Exec=xdg-su -c wireshark %f|g' %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop
+sed -i -e 's|Exec=wireshark %{f}|Exec=xdg-su -c wireshark %{f}|g' %{buildroot}%{_datadir}/applications/%{org_name}-su.desktop
 
 %suse_update_desktop_file %{org_name}
 %suse_update_desktop_file %{org_name}-su
@@ -232,12 +233,17 @@ getent group wireshark >/dev/null || groupadd -r wireshark
 %set_permissions %{_bindir}/dumpcap
 exit 0
 
-%post -n %{libutil} -p /sbin/ldconfig
+%post ui-qt
-%postun -n %{libutil} -p /sbin/ldconfig
+%desktop_database_post
-%post -n %{libwire} -p /sbin/ldconfig
+%icon_theme_cache_post
-%postun -n %{libwire} -p /sbin/ldconfig
+
-%post -n %{libtap} -p /sbin/ldconfig
+%postun ui-qt
-%postun -n %{libtap} -p /sbin/ldconfig
+%desktop_database_postun
+%icon_theme_cache_postun
+
+%ldconfig_scriptlets -n %{libutil}
+%ldconfig_scriptlets -n %{libwire}
+%ldconfig_scriptlets -n %{libtap}
 
 %files
 %license COPYING
@@ -261,21 +267,26 @@ exit 0
 %{_datadir}/wireshark/
 
 %files -n %{libutil}
+%license COPYING
 %{_libdir}/libwsutil*.so.*
 
 %files -n %{libwire}
+%license COPYING
 %{_libdir}/libwireshark.so.*
 
 %files -n %{libtap}
+%license COPYING
 %{_libdir}/libwiretap.so.*
 
 %files devel
+%license COPYING
 %{_includedir}/wireshark/
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/wireshark.pc
 %{_libdir}/cmake/wireshark/
 
 %files ui-qt
+%license COPYING
 %{_bindir}/wireshark
 %{_datadir}/applications/%{org_name}.desktop
 %{_datadir}/applications/%{org_name}-su.desktop
@@ -284,12 +295,4 @@ exit 0
 %{_datadir}/mime/packages/%{org_name}.xml
 %{_datadir}/metainfo/%{org_name}.metainfo.xml
 
-%post ui-qt
-%desktop_database_post
-%icon_theme_cache_post
-
-%postun ui-qt
-%desktop_database_postun
-%icon_theme_cache_postun
-
 %changelog