diff --git a/net-analyzer/wireshark/patches/wireshark-2.6.20.patchset b/net-analyzer/wireshark/patches/wireshark-2.6.20.patchset new file mode 100644 index 000000000..37459ef0c --- /dev/null +++ b/net-analyzer/wireshark/patches/wireshark-2.6.20.patchset @@ -0,0 +1,150 @@ +From f5367bd9194891b76d91fcc9675f58866a3ab51b Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Tue, 2 Nov 2021 20:11:25 +0100 +Subject: fix build with glib 2.68 + + +diff --git a/caputils/capture_ifinfo.h b/caputils/capture_ifinfo.h +index 8e42b64..0e2c792 100644 +--- a/caputils/capture_ifinfo.h ++++ b/caputils/capture_ifinfo.h +@@ -10,12 +10,12 @@ + #ifndef __CAPTURE_IFINFO_H__ + #define __CAPTURE_IFINFO_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include +- + typedef enum { + IF_WIRED, + IF_AIRPCAP, +diff --git a/epan/conversation.h b/epan/conversation.h +index cd8d416..cb7c62f 100644 +--- a/epan/conversation.h ++++ b/epan/conversation.h +@@ -13,6 +13,8 @@ + + #include "ws_symbol_export.h" + ++#include "packet.h" /* for conversation dissector type */ ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ +@@ -46,8 +48,6 @@ extern "C" { + /* Flags to handle endpoints */ + #define USE_LAST_ENDPOINT 0x08 /* Use last endpoint created, regardless of type */ + +-#include "packet.h" /* for conversation dissector type */ +- + /* Types of port numbers Wireshark knows about. */ + typedef enum { + ENDPOINT_NONE, /* no endpoint */ +diff --git a/epan/epan.h b/epan/epan.h +index 67e54dc..95f47f8 100644 +--- a/epan/epan.h ++++ b/epan/epan.h +@@ -10,11 +10,12 @@ + #ifndef __EPAN_H__ + #define __EPAN_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include + #include + #include + #include +diff --git a/epan/epan_dissect.h b/epan/epan_dissect.h +index 956a147..9279892 100644 +--- a/epan/epan_dissect.h ++++ b/epan/epan_dissect.h +@@ -10,11 +10,12 @@ + #ifndef EPAN_DISSECT_H + #define EPAN_DISSECT_H + ++#include "epan.h" ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include "epan.h" + #include "tvbuff.h" + #include "proto.h" + #include "packet_info.h" +diff --git a/epan/prefs.h b/epan/prefs.h +index 2147a70..1a621d9 100644 +--- a/epan/prefs.h ++++ b/epan/prefs.h +@@ -11,12 +11,12 @@ + #ifndef __PREFS_H__ + #define __PREFS_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include +- + #include + #include + +diff --git a/ui/recent.h b/ui/recent.h +index cfafcc6..a29b681 100644 +--- a/ui/recent.h ++++ b/ui/recent.h +@@ -12,11 +12,12 @@ + #ifndef __RECENT_H__ + #define __RECENT_H__ + ++#include ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ + +-#include + #include + #include "epan/timestamp.h" + #include "ui/ws_ui_util.h" +-- +2.30.2 + + +From b6c2f3657eb5e3fff7738a594285fcd526198fd3 Mon Sep 17 00:00:00 2001 +From: David Karoly +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 19ea4e4..ac9069f 100644 +--- a/wsutil/filesystem.c ++++ b/wsutil/filesystem.c +@@ -630,6 +630,12 @@ init_progfile_dir(const char *arg0 + } + } + ++ static char buffer[PATH_MAX + 1]; ++ char *res = realpath(prog_pathname, buffer); ++ if (res != NULL) { ++ prog_pathname = buffer; ++ } ++ + /* + * OK, we have what we think is the pathname + * of the program. +-- +2.30.2 + diff --git a/net-analyzer/wireshark/wireshark-2.6.5.recipe b/net-analyzer/wireshark/wireshark-2.6.20.recipe similarity index 74% rename from net-analyzer/wireshark/wireshark-2.6.5.recipe rename to net-analyzer/wireshark/wireshark-2.6.20.recipe index 2a9d3d3cd..9a2f91319 100644 --- a/net-analyzer/wireshark/wireshark-2.6.5.recipe +++ b/net-analyzer/wireshark/wireshark-2.6.20.recipe @@ -11,17 +11,30 @@ files and write the packets from that capture file, possibly in a \ different capture file format, and with some packets possibly removed \ from the capture." HOMEPAGE="https://www.wireshark.org" -COPYRIGHT="1998-2018 Gerald Combs" +COPYRIGHT="1998-2020 Gerald Combs" LICENSE="GNU GPL v2" -REVISION="4" +REVISION="1" SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz" -CHECKSUM_SHA256="47e15281b767f6fd09b72d8ddb9c392c1a56ca601b1b3483d9c9b6e479c7b997" +CHECKSUM_SHA256="2af24e851f050f4a4570d59fb3455a9b92046c3faf0db7f81f443578397b88c9" SOURCE_DIR="wireshark-wireshark-$portVersion" ADDITIONAL_FILES="wireshark.rdef" +PATCHES="wireshark-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2 ?x86" SECONDARY_ARCHITECTURES="x86" +libwiresharkLibVersion="10.1.20" +libwiresharkLibVersionCompat="$libwiresharkLibVersion compat >= ${libwiresharkLibVersion%%.*}" + +libwiretapLibVersion="8.0.20" +libwiretapLibVersionCompat="$libwiretapLibVersion compat >= ${libwiretapLibVersion%%.*}" + +libwscodecsLibVersion="2.0.0" +libwscodecsLibVersionCompat="$libwscodecsLibVersion compat >= ${libwscodecsLibVersion%%.*}" + +libwsutilLibVersion="9.0.0" +libwsutilLibVersionCompat="$libwsutilLibVersion compat >= ${libwsutilLibVersion%%.*}" + PROVIDES=" wireshark$secondaryArchSuffix = $portVersion cmd:capinfos @@ -36,14 +49,14 @@ PROVIDES=" cmd:sharkd cmd:text2pcap cmd:tshark - devel:libwireshark$secondaryArchSuffix = 10.1.2 compat >= 10 - devel:libwiretap$secondaryArchSuffix = 8.0.2 compat >= 8 - devel:libwscodecs$secondaryArchSuffix = 2.1.0 compat >= 2 - devel:libwsutil$secondaryArchSuffix = 9.0.0 compat >= 9 - lib:libwireshark$secondaryArchSuffix = 10.1.2 compat >= 10 - lib:libwiretap$secondaryArchSuffix = 8.0.2 compat >= 8 - lib:libwscodecs$secondaryArchSuffix = 2.1.0 compat >= 2 - lib:libwsutil$secondaryArchSuffix = 9.0.0 compat >= 9 + devel:libwireshark$secondaryArchSuffix = $libwiresharkLibVersionCompat + devel:libwiretap$secondaryArchSuffix = $libwiretapLibVersionCompat + devel:libwscodecs$secondaryArchSuffix = $libwscodecsLibVersionCompat + devel:libwsutil$secondaryArchSuffix = $libwsutilLibVersionCompat + lib:libwireshark$secondaryArchSuffix = $libwiresharkLibVersionCompat + lib:libwiretap$secondaryArchSuffix = $libwiretapLibVersionCompat + lib:libwscodecs$secondaryArchSuffix = $libwscodecsLibVersionCompat + lib:libwsutil$secondaryArchSuffix = $libwsutilLibVersionCompat " REQUIRES=" haiku$secondaryArchSuffix