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.0.2 (#7537)

Browse Source
This commit is contained in:
davidkaroly
2022-12-10 08:46:35 +01:00
committed by GitHub
parent cf8d730d9e
commit f68078d65a
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net-analyzer/wireshark/patches/wireshark-4.0.1.patchset → net-analyzer/wireshark/patches/wireshark-4.0.2.patchset
View File

@@ -1,4 +1,4 @@
From 04c5a22ffb687760b5b03918eb9bc2b92521988e Mon Sep 17 00:00:00 2001
From 21ad69433cebbe4b62b210b91814657c32c7d264 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
@@ -21,7 +21,7 @@ index f7f0d2e..fee8651 100644
2.37.3
From bd388fa669cd6ccf484a59908a04c4e9459c7c54 Mon Sep 17 00:00:00 2001
From e76a3327c7faa6d55e1b4bb63d70b2b6e799f3a9 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
@@ -43,14 +43,14 @@ index d12f747..80597f0 100644
2.37.3
From 64c102739f5ad1959347be9722fd863a86143bee Mon Sep 17 00:00:00 2001
From 69a204828073f2cb8bf6c0c42c6e641d1a66ac45 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 4d749da..ab0220f 100644
index 4d749da..bde264b 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -726,6 +726,12 @@ configuration_init(
@@ -60,7 +60,7 @@ index 4d749da..ab0220f 100644
+ static char buffer[PATH_MAX + 1];
+ char *res = realpath(prog_pathname, buffer);
+ if (res != NULL) {
+ prog_pathname = buffer;
+ prog_pathname = g_strdup(buffer);
+ }
+
/*
@@ -70,14 +70,14 @@ index 4d749da..ab0220f 100644
2.37.3
From 66291b84f692d6a9277653057b40b163aa716df1 Mon Sep 17 00:00:00 2001
From 10b5fe99f7dec64772763261a158589f8e419219 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 ab0220f..2027fa7 100644
index bde264b..f89fc95 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -1214,6 +1214,8 @@ get_systemfile_dir(void)
@@ -93,7 +93,7 @@ index ab0220f..2027fa7 100644
2.37.3
From 00c98ea18a56361165a13934ea4d8c42c09a3712 Mon Sep 17 00:00:00 2001
From ab35e5e212b297e168091a3b79a84c74664cd1af 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
@@ -121,14 +121,14 @@ index a55086c..6d82b11 100644
2.37.3
From f73f607e1576bae7d424ccdc75b78f880b7f6840 Mon Sep 17 00:00:00 2001
From c327fc69fa07979d615db1cdbd7522fa7cf614c2 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
index f89fc95..3cb4f76 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -39,6 +39,10 @@

8
net-analyzer/wireshark/wireshark-4.0.1.recipe → net-analyzer/wireshark/wireshark-4.0.2.recipe
View File

@@ -22,9 +22,9 @@ library, and libpcap, a packet capture and filtering library."
HOMEPAGE="https://www.wireshark.org"
COPYRIGHT="1998-2022 Gerald Combs"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/wireshark/wireshark/archive/wireshark-$portVersion.tar.gz"
CHECKSUM_SHA256="87b0f41a8158f27a695936c5fdd14bd0c85544dcd584313deea404215d62561c"
CHECKSUM_SHA256="a474957af77e160b440daf8c0e8c86a61ba169bdc624dcc8a37276757d9f9102"
SOURCE_DIR="wireshark-wireshark-$portVersion"
ADDITIONAL_FILES="wireshark.rdef.in"
PATCHES="wireshark-$portVersion.patchset"
@@ -32,10 +32,10 @@ PATCHES="wireshark-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libwiresharkLibVersion="16.0.0"
libwiresharkLibVersion="16.0.2"
libwiresharkLibVersionCompat="$libwiresharkLibVersion compat >= ${libwiresharkLibVersion%%.*}"
libwiretapLibVersion="13.0.0"
libwiretapLibVersion="13.0.2"
libwiretapLibVersionCompat="$libwiretapLibVersion compat >= ${libwiretapLibVersion%%.*}"
libwsutilLibVersion="14.0.0"