wireshark: bump to version 4.0.0 (#7327)

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

@@ -1,6 +1,29 @@
-From 713b8e31ab7e1a0bc406bba462771276a961c99f Mon Sep 17 00:00:00 2001
+From 04c5a22ffb687760b5b03918eb9bc2b92521988e Mon Sep 17 00:00:00 2001
 From: David Karoly <david.karoly@outlook.com>
-Date: Thu, 27 Jan 2022 21:50:52 +0000
+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 f7f0d2e..fee8651 100644
+--- a/wsutil/cpu_info.c
++++ b/wsutil/cpu_info.c
+@@ -413,7 +413,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.37.3
+
+
+From bd388fa669cd6ccf484a59908a04c4e9459c7c54 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
 
 
@@ -17,20 +40,20 @@ index d12f747..80597f0 100644
  
  #ifdef HAVE_UNISTD_H
 -- 
-2.30.2
+2.37.3
 
 
-From 1154f5c98484cc71cad89d863e712dee4c346f62 Mon Sep 17 00:00:00 2001
+From 64c102739f5ad1959347be9722fd863a86143bee 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
 
 
 diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
-index 355ce74..d1dec14 100644
+index 4d749da..ab0220f 100644
 --- a/wsutil/filesystem.c
 +++ b/wsutil/filesystem.c
-@@ -668,6 +668,12 @@ init_progfile_dir(
+@@ -726,6 +726,12 @@ configuration_init(
          }
      }
  
@@ -44,20 +67,20 @@ index 355ce74..d1dec14 100644
       * OK, we have what we think is the pathname
       * of the program.
 -- 
-2.30.2
+2.37.3
 
 
-From 07f29269c4637b16a2167e3049b838d2ab56394c Mon Sep 17 00:00:00 2001
+From 66291b84f692d6a9277653057b40b163aa716df1 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
 
 
 diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
-index d1dec14..8b0b5fb 100644
+index ab0220f..2027fa7 100644
 --- a/wsutil/filesystem.c
 +++ b/wsutil/filesystem.c
-@@ -1152,6 +1152,8 @@ get_systemfile_dir(void)
+@@ -1214,6 +1214,8 @@ get_systemfile_dir(void)
  {
  #ifdef _WIN32
      return get_datafile_dir();
@@ -67,56 +90,10 @@ index d1dec14..8b0b5fb 100644
      return "/etc";
  #endif
 -- 
-2.30.2
+2.37.3
 
 
-From b77da686e79b16729753ca5129ecf5a83a9f4ae2 Mon Sep 17 00:00:00 2001
-From: David Karoly <david.karoly@outlook.com>
-Date: Sun, 5 Dec 2021 21:19:38 +0000
-Subject: adjust user dirs for Haiku
-
-
-diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
-index 8b0b5fb..000c537 100644
---- a/wsutil/filesystem.c
-+++ b/wsutil/filesystem.c
-@@ -38,6 +38,10 @@
- #endif
- #include <pwd.h>
- #endif /* _WIN32 */
-+#ifdef __HAIKU__
-+#include <FindDirectory.h>
-+#include <fs_info.h>
-+#endif
- 
- #include "filesystem.h"
- #include <wsutil/report_message.h>
-@@ -1003,6 +1007,8 @@ init_plugin_pers_dir(void)
- #if defined(HAVE_PLUGINS) || defined(HAVE_LUA)
- #ifdef _WIN32
-     plugin_pers_dir = get_persconffile_path(PLUGINS_DIR_NAME, FALSE);
-+#elif __HAIKU__
-+    plugin_pers_dir = get_persconffile_path(PLUGINS_DIR_NAME, FALSE);
- #else
-     plugin_pers_dir = g_build_filename(g_get_home_dir(), ".local/lib/wireshark/" PLUGINS_DIR_NAME, (gchar *)NULL);
- #endif
-@@ -1310,6 +1316,11 @@ get_persconffile_dir_no_profile(void)
-      */
-     persconffile_dir = g_build_filename("C:", "Wireshark", NULL);
-     return persconffile_dir;
-+#elif __HAIKU__
-+	char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
-+	find_directory(B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), true, buffer, sizeof(buffer));
-+	persconffile_dir = g_build_filename(buffer, "wireshark", NULL);
-+	return persconffile_dir;
- #else
-     char *xdg_path, *path;
-     struct passwd *pwd;
--- 
-2.30.2
-
-
-From d95609cd85ba5e11631b315733f11d04d771b3bd Mon Sep 17 00:00:00 2001
+From 00c98ea18a56361165a13934ea4d8c42c09a3712 Mon Sep 17 00:00:00 2001
 From: David Karoly <david.karoly@outlook.com>
 Date: Thu, 25 Nov 2021 18:24:45 +0000
 Subject: remove prefix from PLUGIN_DIR, EXTCAP_DIR, DATA_DIR as they already
@@ -124,7 +101,7 @@ Subject: remove prefix from PLUGIN_DIR, EXTCAP_DIR, DATA_DIR as they already
 
 
 diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
-index 6140701..d275a8b 100644
+index a55086c..6d82b11 100644
 --- a/wsutil/CMakeLists.txt
 +++ b/wsutil/CMakeLists.txt
 @@ -7,9 +7,9 @@
@@ -141,5 +118,51 @@ index 6140701..d275a8b 100644
  add_subdirectory(wmem)
  
 -- 
-2.30.2
+2.37.3
+
+
+From f73f607e1576bae7d424ccdc75b78f880b7f6840 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
+
+
+diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
+index 2027fa7..02bddb1 100644
+--- a/wsutil/filesystem.c
++++ b/wsutil/filesystem.c
+@@ -39,6 +39,10 @@
+ #endif
+ #include <pwd.h>
+ #endif /* _WIN32 */
++#ifdef __HAIKU__
++#include <FindDirectory.h>
++#include <fs_info.h>
++#endif
+ 
+ #include <wsutil/report_message.h>
+ #include <wsutil/privileges.h>
+@@ -1063,6 +1067,8 @@ init_plugin_pers_dir(void)
+ #if defined(HAVE_PLUGINS) || defined(HAVE_LUA)
+ #ifdef _WIN32
+     plugin_pers_dir = get_persconffile_path(PLUGINS_DIR_NAME, FALSE);
++#elif __HAIKU__
++    plugin_pers_dir = get_persconffile_path(PLUGINS_DIR_NAME, FALSE);
+ #else
+     plugin_pers_dir = g_build_filename(g_get_home_dir(), ".local/lib",
+                                        CONFIGURATION_NAMESPACE_LOWER, PLUGINS_DIR_NAME, (gchar *)NULL);
+@@ -1374,6 +1380,11 @@ get_persconffile_dir_no_profile(void)
+      */
+     persconffile_dir = g_build_filename("C:", persconf_namespace, NULL);
+     return persconffile_dir;
++#elif __HAIKU__
++	char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
++	find_directory(B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), true, buffer, sizeof(buffer));
++	persconffile_dir = g_build_filename(buffer, "wireshark", NULL);
++	return persconffile_dir;
+ #else
+     char *xdg_path, *path;
+     struct passwd *pwd;
+-- 
+2.37.3
 

net-analyzer/wireshark/wireshark-4.0.0.recipe

@@ -15,7 +15,7 @@ COPYRIGHT="1998-2022 Gerald Combs"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz"
-CHECKSUM_SHA256="ccf06e60dc1c954bd1f0ac26da59c4ae0d026cec3f0a81ca9609cb1812c0963e"
+CHECKSUM_SHA256="bbe48bc5ced08832dbfee4a5bc89eadcc8de9b10d654be78851646b4fbda41b5"
 SOURCE_DIR="wireshark-wireshark-$portVersion"
 ADDITIONAL_FILES="wireshark.rdef"
 PATCHES="wireshark-$portVersion.patchset"
@@ -23,13 +23,13 @@ PATCHES="wireshark-$portVersion.patchset"
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libwiresharkLibVersion="15.0.8"
+libwiresharkLibVersion="16.0.0"
 libwiresharkLibVersionCompat="$libwiresharkLibVersion compat >= ${libwiresharkLibVersion%%.*}"
 
-libwiretapLibVersion="12.0.8"
+libwiretapLibVersion="13.0.0"
 libwiretapLibVersionCompat="$libwiretapLibVersion compat >= ${libwiretapLibVersion%%.*}"
 
-libwsutilLibVersion="13.1.0"
+libwsutilLibVersion="14.0.0"
 libwsutilLibVersionCompat="$libwsutilLibVersion compat >= ${libwsutilLibVersion%%.*}"
 
 PROVIDES="
@@ -63,6 +63,7 @@ REQUIRES="
 	lib:libgthread_2.0$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libpcap$secondaryArchSuffix
+	lib:libpcre2_8$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -77,6 +78,7 @@ REQUIRES_gui="
 	lib:libgcrypt$secondaryArchSuffix
 	lib:libgmodule_2.0$secondaryArchSuffix
 	lib:libpcap$secondaryArchSuffix
+	lib:libpcre2_8$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Multimedia$secondaryArchSuffix