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

wireshark: update to 4.0.7 (#9149)

Browse Source
This commit is contained in:
davidkaroly
2023-08-05 07:32:17 +02:00
committed by GitHub
parent d886dbdf27
commit 5cad745dc3
2 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
net-analyzer/wireshark/patches/wireshark-4.0.6.patchset → net-analyzer/wireshark/patches/wireshark-4.0.7.patchset
View File

@@ -1,4 +1,4 @@
From 455dd0f50fac170f11a460c0da84c67c7e630e36 Mon Sep 17 00:00:00 2001
From 9c6502a444c6bc4c08d723e7a4378cc3e3aedf2d 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 77270532c5f24643437df84f3d88ebb8309b2dc6 Mon Sep 17 00:00:00 2001
From d86d35869ee27d522915f1a7d4ba74b53f1de6ae 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,7 +43,7 @@ index d12f747..80597f0 100644
2.37.3
From 1c5916889b834f74c02e59e516cd3fdf982d000e Mon Sep 17 00:00:00 2001
From 88936274fa8e28a473b614400369a10267aa5196 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
@@ -70,7 +70,7 @@ index 1eca4ce..138a1bf 100644
2.37.3
From 0c6e5da70e407e82c0bee26ec1fc1b35d1df65a5 Mon Sep 17 00:00:00 2001
From e4f4b6acf0316f7b6d769f9a75a290b24304d3d4 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
@@ -93,7 +93,7 @@ index 138a1bf..b412dbc 100644
2.37.3
From 97fed6ab10ed30ebe314be8e4a4886374cdf464f Mon Sep 17 00:00:00 2001
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
@@ -123,7 +123,7 @@ index a55086c..3b51243 100644
2.37.3
From 342b5ec5eb7bf588f05011e4931aa15fbc73f6be Mon Sep 17 00:00:00 2001
From ecf04cfad15ba4f1eff71ad937a74b157be0e116 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
@@ -169,14 +169,14 @@ index b412dbc..30ea574 100644
2.37.3
From 609f2159bf94ab871a2bcc2b98548099cc32314b Mon Sep 17 00:00:00 2001
From 91b6c820710ad5039d43cb31d2f732c76b3b9c4b 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 271fee9..b70b051 100644
index 6db2e46..78ef1df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,6 +240,12 @@ if(WIN32)
@@ -196,7 +196,7 @@ index 271fee9..b70b051 100644
2.37.3
From 8c52a01cc6c82a735a1d9f77fd0f2d18656e7803 Mon Sep 17 00:00:00 2001
From 681db79f9d0024ce964f3b23dd4032b54ba31688 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
@@ -217,3 +217,31 @@ 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

6
net-analyzer/wireshark/wireshark-4.0.6.recipe → net-analyzer/wireshark/wireshark-4.0.7.recipe
View File

@@ -24,17 +24,17 @@ 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="0079097a1b17ebc7250a73563f984c13327dac5016b7d53165810fbcca4bd884"
CHECKSUM_SHA256="a79f7b04cbff823e30452abf4bcb86773d8583eb62d5f71f16c09f019f8a8777"
ADDITIONAL_FILES="wireshark.rdef.in"
PATCHES="wireshark-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libwiresharkLibVersion="16.0.6"
libwiresharkLibVersion="16.0.7"
libwiresharkLibVersionCompat="$libwiresharkLibVersion compat >= ${libwiresharkLibVersion%%.*}"
libwiretapLibVersion="13.0.6"
libwiretapLibVersion="13.0.7"
libwiretapLibVersionCompat="$libwiretapLibVersion compat >= ${libwiretapLibVersion%%.*}"
libwsutilLibVersion="14.0.0"