[packages/wireshark] up to 4.4.8
atler
atler at pld-linux.org
Wed Aug 6 11:38:54 CEST 2025
commit c7d213c1bbd3aef5aa23e298f5f23c62f49b1b05
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Aug 6 11:35:37 2025 +0200
up to 4.4.8
wireshark-cares.patch | 48 --------------------------------------
wireshark-falcosecurity.patch | 54 -------------------------------------------
wireshark.spec | 10 +++-----
3 files changed, 3 insertions(+), 109 deletions(-)
---
diff --git a/wireshark.spec b/wireshark.spec
index 263bd08..a6e0794 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -19,14 +19,12 @@ Summary(pt_BR.UTF-8): Analisador de tráfego de rede
Summary(ru.UTF-8): Анализатор сетевого траффика
Summary(uk.UTF-8): Аналізатор мережевого трафіку
Name: wireshark
-Version: 4.4.1
-Release: 3
+Version: 4.4.8
+Release: 1
License: GPL v2+
Group: Networking/Utilities
Source0: https://2.na.dl.wireshark.org/src/%{name}-%{version}.tar.xz
-# Source0-md5: f6c14c48f2c5fe8d7bd52236a0a4001f
-Patch0: %{name}-cares.patch
-Patch1: %{name}-falcosecurity.patch
+# Source0-md5: bb883527d9975998d2c246a88c30d2ae
URL: https://www.wireshark.org/
BuildRequires: bcg729-devel
BuildRequires: c-ares-devel >= 1.13.0
@@ -305,8 +303,6 @@ Pliki nagłówkowe bibliotek Wiresharka.
%prep
%setup -q
-%patch -P0 -p1
-%patch -P1 -p1
%if %{with falcosecurity}
%{__sed} -i -e 's/CMAKE_CXX_STANDARD 11/CMAKE_CXX_STANDARD 17/' CMakeLists.txt
diff --git a/wireshark-cares.patch b/wireshark-cares.patch
deleted file mode 100644
index 3e64ae9..0000000
--- a/wireshark-cares.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7c1418625d2ba5095ef5393abdb2141c990a662c Mon Sep 17 00:00:00 2001
-From: Gerald Combs <gerald at wireshark.org>
-Date: Thu, 10 Oct 2024 15:47:17 -0700
-Subject: [PATCH] CMake: Fix our c-ares version discovery
-
-c-ares 1.34.0 and later generate ARES_VERSION_STR using a macro, so
-fetch the version from ARES_VERSION_MAJOR, ARES_VERSION_MINOR, and
-ARES_VERSION_PATCH.
-
-Fixes #20125
----
- cmake/modules/FindCARES.cmake | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/FindCARES.cmake b/cmake/modules/FindCARES.cmake
-index f69a2a906bf..5d005b50d4e 100644
---- a/cmake/modules/FindCARES.cmake
-+++ b/cmake/modules/FindCARES.cmake
-@@ -36,11 +36,22 @@ find_library( CARES_LIBRARY
- )
-
- # Try to retrieve version from header if found
-+# Adapted from https://stackoverflow.com/a/47084079/82195
- if(CARES_INCLUDE_DIR)
-- set(_version_regex "^#define[ \t]+ARES_VERSION_STR[ \t]+\"([^\"]+)\".*")
-- file(STRINGS "${CARES_INCLUDE_DIR}/ares_version.h" CARES_VERSION REGEX "${_version_regex}")
-- string(REGEX REPLACE "${_version_regex}" "\\1" CARES_VERSION "${CARES_VERSION}")
-- unset(_version_regex)
-+ file(READ "${CARES_INCLUDE_DIR}/ares_version.h" _ares_version_h)
-+
-+ string(REGEX MATCH "#[\t ]*define[ \t]+ARES_VERSION_MAJOR[ \t]+([0-9]+)" _ ${_ares_version_h})
-+ set(_ares_version_major ${CMAKE_MATCH_1})
-+ string(REGEX MATCH "#[\t ]*define[ \t]+ARES_VERSION_MINOR[ \t]+([0-9]+)" _ ${_ares_version_h})
-+ set(_ares_version_minor ${CMAKE_MATCH_1})
-+ string(REGEX MATCH "#[\t ]*define[ \t]+ARES_VERSION_PATCH[ \t]+([0-9]+)" _ ${_ares_version_h})
-+ set(_ares_version_patch ${CMAKE_MATCH_1})
-+ set(CARES_VERSION ${_ares_version_major}.${_ares_version_minor}.${_ares_version_patch})
-+
-+ unset(_ares_version_h)
-+ unset(_ares_version_major)
-+ unset(_ares_version_minor)
-+ unset(_ares_version_patch)
- endif()
-
- # handle the QUIETLY and REQUIRED arguments and set CARES_FOUND to TRUE if
---
-GitLab
-
diff --git a/wireshark-falcosecurity.patch b/wireshark-falcosecurity.patch
deleted file mode 100644
index aab143b..0000000
--- a/wireshark-falcosecurity.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- wireshark-4.4.1/extcap/falcodump.cpp.orig 2024-10-16 21:35:13.731822931 +0200
-+++ wireshark-4.4.1/extcap/falcodump.cpp 2024-10-16 21:36:20.628127189 +0200
-@@ -1179,7 +1179,7 @@ int main(int argc, char **argv)
- ws_warning("%s", init_err.c_str());
- goto end;
- }
-- inspector.open_plugin(extcap_conf->interface, plugin_source);
-+ inspector.open_plugin(extcap_conf->interface, plugin_source, sinsp_plugin_platform::SINSP_PLATFORM_GENERIC);
- // scap_dump_open handles "-"
- } catch (sinsp_exception &e) {
- ws_warning("%s", e.what());
---- wireshark-4.4.1/plugins/epan/falco_bridge/sinsp-span.cpp.orig 2024-10-16 21:35:13.831253554 +0200
-+++ wireshark-4.4.1/plugins/epan/falco_bridge/sinsp-span.cpp 2024-10-16 22:11:50.924659565 +0200
-@@ -443,13 +443,13 @@ void create_sinsp_syscall_source(sinsp_s
- if (!sfc) {
- continue;
- }
-- if (strcmp(ffi->m_name, "evt.category") == 0) {
-+ if (ffi->m_name == "evt.category") {
- ssi->evt_category_idx = ssi->syscall_filter_fields.size();
- }
-- if (strcmp(ffi->m_name, "evt.cpu") == 0) {
-+ else if (ffi->m_name == "evt.cpu") {
- ssi->cpu_id_idx = (uint16_t) ssi->syscall_filter_fields.size();
- }
-- if (strcmp(ffi->m_name, "proc.pid") == 0) {
-+ else if (ffi->m_name == "proc.pid") {
- ssi->proc_id_idx = (uint16_t) ssi->syscall_filter_fields.size();
- }
- sfc->parse_field_name(ffi->m_name, true, false);
-@@ -559,18 +559,18 @@ bool get_sinsp_source_field_info(sinsp_s
-
- if (ssi->source) {
- ffi = &ssi->source->fields()[field_num];
-- g_strlcpy(field->abbrev, ffi->m_name, sizeof(field->abbrev));
-+ g_strlcpy(field->abbrev, ffi->m_name.c_str(), sizeof(field->abbrev));
- } else {
- ffi = ssi->syscall_filter_fields[field_num];
- if (ssi->field_to_category[field_num] == SSC_OTHER) {
-- snprintf(field->abbrev, sizeof(field->abbrev), FALCO_FIELD_NAME_PREFIX "%s", ffi->m_name);
-+ snprintf(field->abbrev, sizeof(field->abbrev), FALCO_FIELD_NAME_PREFIX "%s", ffi->m_name.c_str());
- } else {
-- g_strlcpy(field->abbrev, ffi->m_name, sizeof(field->abbrev));
-+ g_strlcpy(field->abbrev, ffi->m_name.c_str(), sizeof(field->abbrev));
- }
- }
-
-- g_strlcpy(field->display, ffi->m_display, sizeof(field->display));
-- g_strlcpy(field->description, ffi->m_description, sizeof(field->description));
-+ g_strlcpy(field->display, ffi->m_display.c_str(), sizeof(field->display));
-+ g_strlcpy(field->description, ffi->m_description.c_str(), sizeof(field->description));
-
- field->is_hidden = ffi->m_flags & EPF_TABLE_ONLY;
- field->is_conversation = ffi->m_flags & EPF_CONVERSATION;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wireshark.git/commitdiff/b61b2f33bf7bf1ed9295152ebb20bb575164c722
More information about the pld-cvs-commit
mailing list