haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: update to 4.2.0 (#9853)

Browse Source
This commit is contained in:
davidkaroly
2023-12-08 14:55:25 +01:00
committed by GitHub
parent c84ed37d9a
commit a87e7a3e46
2 changed files with 50 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
net-analyzer/wireshark/patches/wireshark-4.0.11.patchset → net-analyzer/wireshark/patches/wireshark-4.2.0.patchset
View File

@@ -1,14 +1,14 @@
From 9c6502a444c6bc4c08d723e7a4378cc3e3aedf2d Mon Sep 17 00:00:00 2001
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 f7f0d2e..fee8651 100644
index f9e6aa2..800a9a2 100644
--- a/wsutil/cpu_info.c
+++ b/wsutil/cpu_info.c
@@ -413,7 +413,7 @@ get_cpu_info(GString *str)
@@ -412,7 +412,7 @@ get_cpu_info(GString *str)
ws_cpuid(CPUInfo, 0x80000004);
memcpy(CPUBrandString + 32, CPUInfo, sizeof(CPUInfo));
@@ -18,10 +18,10 @@ index f7f0d2e..fee8651 100644
#endif
--
2.37.3
2.42.1
From d86d35869ee27d522915f1a7d4ba74b53f1de6ae Mon Sep 17 00:00:00 2001
From aeaf476bfe3848251820b0993c3059fb390e039f 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,20 +40,20 @@ index d12f747..80597f0 100644
#ifdef HAVE_UNISTD_H
--
2.37.3
2.42.1
From 88936274fa8e28a473b614400369a10267aa5196 Mon Sep 17 00:00:00 2001
From bbb73c7b5159eb745e414a142bac185db8ff807b 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 1eca4ce..138a1bf 100644
index 065cdd3..e264576 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -741,6 +741,12 @@ configuration_init(
@@ -804,6 +804,12 @@ configuration_init_posix(const char* arg0)
}
}
@@ -67,20 +67,20 @@ index 1eca4ce..138a1bf 100644
* OK, we have what we think is the pathname
* of the program.
--
2.37.3
2.42.1
From e4f4b6acf0316f7b6d769f9a75a290b24304d3d4 Mon Sep 17 00:00:00 2001
From f825e34c1ccca4fd3b16ab4069e30ad87f320959 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 138a1bf..b412dbc 100644
index e264576..102bc17 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -1230,6 +1230,8 @@ get_systemfile_dir(void)
@@ -1420,6 +1420,8 @@ get_systemfile_dir(void)
{
#ifdef _WIN32
return get_datafile_dir();
@@ -90,47 +90,17 @@ index 138a1bf..b412dbc 100644
return "/etc";
#endif
--
2.37.3
2.42.1
From 0effbf8f12ed324049bd9bbd3f108cf627b5308d Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Thu, 25 Nov 2021 18:24:45 +0000
Subject: use full path for PLUGIN_DIR, EXTCAP_DIR, DATA_DIR
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index a55086c..3b51243 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -7,9 +7,12 @@
# SPDX-License-Identifier: GPL-2.0-or-later
#
-add_definitions(-DPLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_LIBDIR}\")
-add_definitions(-DEXTCAP_DIR=\"${CMAKE_INSTALL_PREFIX}/${EXTCAP_INSTALL_LIBDIR}\")
-add_definitions(-DDATA_DIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}\")
+GNUInstallDirs_get_absolute_install_dir(PLUGIN_INSTALL_FULL_LIBDIR PLUGIN_INSTALL_LIBDIR LIBDIR)
+GNUInstallDirs_get_absolute_install_dir(EXTCAP_INSTALL_FULL_LIBDIR EXTCAP_INSTALL_LIBDIR LIBDIR)
+
+add_definitions(-DPLUGIN_DIR=\"${PLUGIN_INSTALL_FULL_LIBDIR}\")
+add_definitions(-DEXTCAP_DIR=\"${EXTCAP_INSTALL_FULL_LIBDIR}\")
+add_definitions(-DDATA_DIR=\"${CMAKE_INSTALL_FULL_DATADIR}\")
add_subdirectory(wmem)
--
2.37.3
From ecf04cfad15ba4f1eff71ad937a74b157be0e116 Mon Sep 17 00:00:00 2001
From 68ee2e00fd1b8310804fb40c2ce7014bb0e01633 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 b412dbc..30ea574 100644
index 102bc17..3ba8390 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -39,6 +39,10 @@
@@ -144,16 +114,16 @@ index b412dbc..30ea574 100644
#include <wsutil/report_message.h>
#include <wsutil/privileges.h>
@@ -1079,6 +1083,8 @@ init_plugin_pers_dir(void)
@@ -1240,6 +1244,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);
plugin_pers_dir = get_persconffile_path(PLUGINS_DIR_NAME, false);
+#elif __HAIKU__
+ plugin_pers_dir = get_persconffile_path(PLUGINS_DIR_NAME, FALSE);
+ 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);
@@ -1390,6 +1396,11 @@ get_persconffile_dir_no_profile(void)
CONFIGURATION_NAMESPACE_LOWER, PLUGINS_DIR_NAME, (char *)NULL);
@@ -1580,6 +1586,11 @@ get_persconffile_dir_no_profile(void)
*/
persconffile_dir = g_build_filename("C:", persconf_namespace, NULL);
return persconffile_dir;
@@ -166,20 +136,20 @@ index b412dbc..30ea574 100644
char *xdg_path, *path;
struct passwd *pwd;
--
2.37.3
2.42.1
From 91b6c820710ad5039d43cb31d2f732c76b3b9c4b Mon Sep 17 00:00:00 2001
From 6837b9f3fbc966a98fa60922720a72cbacb2c994 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 6db2e46..78ef1df 100644
index 4836838..9eaaa47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,6 +240,12 @@ if(WIN32)
@@ -289,6 +289,12 @@ if(WIN32 AND NOT USE_MSYSTEM)
set(CMAKE_INSTALL_INCLUDEDIR "include")
set(CMAKE_INSTALL_DATADIR ".")
set(CMAKE_INSTALL_DOCDIR ".")
@@ -193,20 +163,20 @@ index 6db2e46..78ef1df 100644
# By default INSTALL_DATADIR is set to INSTALL_DATAROOTDIR, set the
# proper value here.
--
2.37.3
2.42.1
From 681db79f9d0024ce964f3b23dd4032b54ba31688 Mon Sep 17 00:00:00 2001
From 2de9c94633a517c04cbea183e9353d2dff907107 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 87c02a9..e27a8af 100644
index eef4e44..5144dae 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -128,6 +128,7 @@ void exit_application(int status) {
@@ -129,6 +129,7 @@ void exit_application(int status) {
if (wsApp) {
wsApp->quit();
}
@@ -215,33 +185,5 @@ index 87c02a9..e27a8af 100644
}
--
2.37.3
From 8b0028c571061f5844ea7be6a0d0a1b31bad2de0 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Fri, 4 Aug 2023 21:21:58 +0200
Subject: AUTHORS-SHORT should not depend on asciidoctor
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78ef1df..5a0b9e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2004,9 +2004,12 @@ if (BUILD_logray)
)
endif()
+list(APPEND INSTALL_FILES
+ ${CMAKE_BINARY_DIR}/doc/AUTHORS-SHORT
+)
+
if (ASCIIDOCTOR_FOUND)
list(APPEND INSTALL_FILES
- ${CMAKE_BINARY_DIR}/doc/AUTHORS-SHORT
${CMAKE_BINARY_DIR}/doc/androiddump.html
${CMAKE_BINARY_DIR}/doc/udpdump.html
${CMAKE_BINARY_DIR}/doc/capinfos.html
--
2.37.3
2.42.1

35
net-analyzer/wireshark/wireshark-4.0.11.recipe → net-analyzer/wireshark/wireshark-4.2.0.recipe
View File

@@ -24,20 +24,20 @@ COPYRIGHT="1998-2023 Gerald Combs"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://www.wireshark.org/download/src/all-versions/wireshark-$portVersion.tar.xz"
CHECKSUM_SHA256="4c341cc33a6c512d983f4126e6f3e5c249f604e14ab7f337d38b1cbe58199e3d"
CHECKSUM_SHA256="0e428492f4c3625d61a7ccff008dc0e429d16ab8caccad4403157ea92b48a75b"
ADDITIONAL_FILES="wireshark.rdef.in"
PATCHES="wireshark-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libwiresharkLibVersion="16.0.11"
libwiresharkLibVersion="17.0.0"
libwiresharkLibVersionCompat="$libwiresharkLibVersion compat >= ${libwiresharkLibVersion%%.*}"
libwiretapLibVersion="13.0.11"
libwiretapLibVersion="14.0.0"
libwiretapLibVersionCompat="$libwiretapLibVersion compat >= ${libwiretapLibVersion%%.*}"
libwsutilLibVersion="14.0.0"
libwsutilLibVersion="15.0.0"
libwsutilLibVersionCompat="$libwsutilLibVersion compat >= ${libwsutilLibVersion%%.*}"
PROVIDES="
@@ -72,6 +72,7 @@ REQUIRES="
lib:libintl$secondaryArchSuffix
lib:libpcap$secondaryArchSuffix
lib:libpcre2_8$secondaryArchSuffix
lib:libspeexdsp$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -87,11 +88,13 @@ REQUIRES_gui="
lib:libgmodule_2.0$secondaryArchSuffix
lib:libpcap$secondaryArchSuffix
lib:libpcre2_8$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Multimedia$secondaryArchSuffix
lib:libQt5PrintSupport$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt6Core$secondaryArchSuffix
lib:libQt6Core5Compat$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Multimedia$secondaryArchSuffix
lib:libQt6PrintSupport$secondaryArchSuffix
lib:libQt6Widgets$secondaryArchSuffix
lib:libspeexdsp$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -103,11 +106,13 @@ BUILD_REQUIRES="
devel:libglib_2.0$secondaryArchSuffix
devel:libgpg_error$secondaryArchSuffix
devel:libpcap$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix
devel:libQt5Multimedia$secondaryArchSuffix
devel:libQt5PrintSupport$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Core5Compat$secondaryArchSuffix
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Multimedia$secondaryArchSuffix
devel:libQt6PrintSupport$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
devel:libspeexdsp$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:bison
@@ -115,11 +120,11 @@ BUILD_PREREQUIRES="
cmd:flex
cmd:gcc$secondaryArchSuffix
cmd:libtoolize
cmd:lrelease$secondaryArchSuffix >= 5
cmd:ninja
cmd:pkg_config$secondaryArchSuffix
cmd:python3
cmd:strip$secondaryArchSuffix
qt6_tools${secondaryArchSuffix}_devel
"
BUILD()