wireshark, bump to 4.2.6 (#12442)

net-analyzer/wireshark/patches/wireshark-4.2.6.patchset

@@ -1,27 +1,4 @@
-From 6fdc080dc1c8daee7edaed74ad86dfb0fd96b16b Mon Sep 17 00:00:00 2001
-From: David Karoly <david.karoly@outlook.com>
-Date: Tue, 25 Oct 2022 21:11:55 +0200
-Subject: fix build for cpu_info.c
-
-
-diff --git a/wsutil/cpu_info.c b/wsutil/cpu_info.c
-index f9e6aa2..800a9a2 100644
---- a/wsutil/cpu_info.c
-+++ b/wsutil/cpu_info.c
-@@ -412,7 +412,7 @@ get_cpu_info(GString *str)
-     ws_cpuid(CPUInfo, 0x80000004);
-     memcpy(CPUBrandString + 32, CPUInfo, sizeof(CPUInfo));
- 
--    model_name = g_strdup(g_strstrip(CPUBrandString));
-+    char *model_name = g_strdup(g_strstrip(CPUBrandString));
-     g_tree_insert(model_names, model_name, NULL);
- #endif
- 
--- 
-2.42.1
-
-
-From aeaf476bfe3848251820b0993c3059fb390e039f Mon Sep 17 00:00:00 2001
+From 2fa3acea90577370dfa72241894f2804945491d6 Mon Sep 17 00:00:00 2001
 From: David Karoly <david.karoly@outlook.com>
 Date: Tue, 25 Oct 2022 21:14:59 +0200
 Subject: fix include sys/time.h
@@ -40,10 +17,10 @@ index d12f747..80597f0 100644
  
  #ifdef HAVE_UNISTD_H
 -- 
-2.42.1
+2.48.1
 
 
-From bbb73c7b5159eb745e414a142bac185db8ff807b Mon Sep 17 00:00:00 2001
+From 1cb9611ac9eede57ccd630c9256f9856351f9693 Mon Sep 17 00:00:00 2001
 From: David Karoly <david.karoly@outlook.com>
 Date: Mon, 15 Nov 2021 10:26:33 +0000
 Subject: use realpath in init_progfile_dir
@@ -67,10 +44,10 @@ index 065cdd3..e264576 100644
       * OK, we have what we think is the pathname
       * of the program.
 -- 
-2.42.1
+2.48.1
 
 
-From f825e34c1ccca4fd3b16ab4069e30ad87f320959 Mon Sep 17 00:00:00 2001
+From 3f21dc1c820fdd50c420e3d4084661f5b14b60a5 Mon Sep 17 00:00:00 2001
 From: David Karoly <david.karoly@outlook.com>
 Date: Thu, 25 Nov 2021 18:41:24 +0000
 Subject: adjust get_systemfile_dir for Haiku
@@ -90,10 +67,10 @@ index e264576..102bc17 100644
      return "/etc";
  #endif
 -- 
-2.42.1
+2.48.1
 
 
-From 68ee2e00fd1b8310804fb40c2ce7014bb0e01633 Mon Sep 17 00:00:00 2001
+From 01b6dc2f6f2e38ad611989de631a6636b08eae7d Mon Sep 17 00:00:00 2001
 From: David Karoly <david.karoly@outlook.com>
 Date: Tue, 25 Oct 2022 22:00:34 +0200
 Subject: adjust user dirs for Haiku
@@ -136,17 +113,17 @@ index 102bc17..3ba8390 100644
      char *xdg_path, *path;
      struct passwd *pwd;
 -- 
-2.42.1
+2.48.1
 
 
-From 6837b9f3fbc966a98fa60922720a72cbacb2c994 Mon Sep 17 00:00:00 2001
+From 967126f83ac18401a8e4262a62f3ac4ca7c8dfba Mon Sep 17 00:00:00 2001
 From: David Karoly <david.karoly@outlook.com>
 Date: Tue, 7 Mar 2023 15:42:01 +0100
 Subject: Haiku: adjust default value for INSTALL_DATADIR
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4836838..9eaaa47 100644
+index c9f844d..2e29ed0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -289,6 +289,12 @@ if(WIN32 AND NOT USE_MSYSTEM)
@@ -163,17 +140,17 @@ index 4836838..9eaaa47 100644
  	# By default INSTALL_DATADIR is set to INSTALL_DATAROOTDIR, set the
  	# proper value here.
 -- 
-2.42.1
+2.48.1
 
 
-From 2de9c94633a517c04cbea183e9353d2dff907107 Mon Sep 17 00:00:00 2001
+From b35c362f25fb4660b2236b7ecf4d8aa746c3191b Mon Sep 17 00:00:00 2001
 From: David Karoly <david.karoly@outlook.com>
 Date: Sun, 23 Apr 2023 19:18:49 +0000
 Subject: deregister log writer on exit
 
 
 diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
-index eef4e44..5144dae 100644
+index 582855f..4f97318 100644
 --- a/ui/qt/main.cpp
 +++ b/ui/qt/main.cpp
 @@ -129,6 +129,7 @@ void exit_application(int status) {
@@ -185,5 +162,5 @@ index eef4e44..5144dae 100644
  }
  
 -- 
-2.42.1
+2.48.1
 

net-analyzer/wireshark/wireshark-4.2.6.recipe

@@ -22,19 +22,19 @@ library, and libpcap, a packet capture and filtering library."
 HOMEPAGE="https://www.wireshark.org"
 COPYRIGHT="1998-2024 Gerald Combs"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://www.wireshark.org/download/src/all-versions/wireshark-$portVersion.tar.xz"
-CHECKSUM_SHA256="958bd5996f543d91779b1a4e7e952dcd7b0245fe82194202c3333a8f78795811"
+CHECKSUM_SHA256="5ec6028df29068d889c98489bf194a884b00831106fea1e921fea3c65f2003f5"
 ADDITIONAL_FILES="wireshark.rdef.in"
 PATCHES="wireshark-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libwiresharkLibVersion="17.0.3"
+libwiresharkLibVersion="17.0.6"
 libwiresharkLibVersionCompat="$libwiresharkLibVersion compat >= ${libwiresharkLibVersion%%.*}"
 
-libwiretapLibVersion="14.1.3"
+libwiretapLibVersion="14.1.6"
 libwiretapLibVersionCompat="$libwiretapLibVersion compat >= ${libwiretapLibVersion%%.*}"
 
 libwsutilLibVersion="15.0.0"
@@ -67,9 +67,6 @@ REQUIRES="
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libglib_2.0$secondaryArchSuffix
 	lib:libgmodule_2.0$secondaryArchSuffix
-	lib:libgpg_error$secondaryArchSuffix
-	lib:libgthread_2.0$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
 	lib:libpcap$secondaryArchSuffix
 	lib:libpcre2_8$secondaryArchSuffix
 	lib:libspeexdsp$secondaryArchSuffix
@@ -84,18 +81,13 @@ PROVIDES_gui="
 REQUIRES_gui="
 	haiku$secondaryArchSuffix
 	wireshark${secondaryArchSuffix} == $portVersion base
-	lib:libgcrypt$secondaryArchSuffix
-	lib:libgmodule_2.0$secondaryArchSuffix
-	lib:libpcap$secondaryArchSuffix
-	lib:libpcre2_8$secondaryArchSuffix
+	$REQUIRES
 	lib:libQt6Core$secondaryArchSuffix
 	lib:libQt6Core5Compat$secondaryArchSuffix
 	lib:libQt6Gui$secondaryArchSuffix
 	lib:libQt6Multimedia$secondaryArchSuffix
 	lib:libQt6PrintSupport$secondaryArchSuffix
 	lib:libQt6Widgets$secondaryArchSuffix
-	lib:libspeexdsp$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -119,7 +111,9 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:msgfmt$secondaryArchSuffix
+	cmd:msgmerge$secondaryArchSuffix
 	cmd:ninja
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python3
@@ -150,7 +144,12 @@ INSTALL()
 {
 	cmake --install build
 
-	prepareInstalledDevelLibs libwireshark libwiretap libwsutil
+	# cleanup
+	rm -rf $dataDir/{applications,icons,metainfo}
+
+	prepareInstalledDevelLibs libwireshark \
+		libwiretap \
+		libwsutil
 	fixPkgconfig
 
 	mkdir -p $appsDir