From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 006EC15808B for ; Sat, 5 Oct 2024 07:22:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAA05E29B9; Sat, 5 Oct 2024 07:22:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1B78E29B9 for ; Sat, 5 Oct 2024 07:22:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB54F34300B for ; Sat, 5 Oct 2024 07:22:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 50E411F64 for ; Sat, 5 Oct 2024 07:22:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1728112925.690de938f65c99ed989b56877bd2c983bf6adec1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/files/, net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/Manifest net-analyzer/wireshark/files/release-notes.html net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch net-analyzer/wireshark/wireshark-4.4.0.ebuild net-analyzer/wireshark/wireshark-9999.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 690de938f65c99ed989b56877bd2c983bf6adec1 X-VCS-Branch: master Date: Sat, 5 Oct 2024 07:22:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4bbfd593-01ba-4a82-8987-a7c6988b2c1a X-Archives-Hash: 50bf70e65e4405f5b5c7ece76805cb7c commit: 690de938f65c99ed989b56877bd2c983bf6adec1 Author: Holger Hoffstätte applied-asynchrony com> AuthorDate: Fri Sep 27 15:42:37 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 5 07:22:05 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=690de938 net-analyzer/wireshark: add 4.4.0, fix handling of release notes Closes: https://bugs.gentoo.org/939195 Signed-off-by: Holger Hoffstätte applied-asynchrony.com> Signed-off-by: Sam James gentoo.org> net-analyzer/wireshark/Manifest | 2 + net-analyzer/wireshark/files/release-notes.html | 6 ++ ...shark-4.4.0-fix-filesystem-absolute-paths.patch | 98 ++++++++++++++++++++++ ...ireshark-9999.ebuild => wireshark-4.4.0.ebuild} | 24 +++++- net-analyzer/wireshark/wireshark-9999.ebuild | 20 ++++- 5 files changed, 143 insertions(+), 7 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 90f0c130154f..7612e63f7625 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -8,3 +8,5 @@ DIST wireshark-4.2.5-signatures.txt 2706 BLAKE2B d10f6e9b4d8bcd8f0a30501bbbfee9e DIST wireshark-4.2.5.tar.xz 45014156 BLAKE2B 536743a7e402f7a511d7612454d9770f0e67a0f2ebc1ab49912b12965e605f2082eff37f41f7642b89859257926ce13d88728194b79cbe5dcf6b15d72516c5fc SHA512 92a8fb08af5a1da30ca469fa45bd982638069907d289fa716068ac71141b7d9726ca0b01adc2910da4c928db23760da75a1c6a7c2eb795ac66ba003a90abb87b DIST wireshark-4.2.6-signatures.txt 2706 BLAKE2B b9666d6aaef774e08ec903bbda90067adaa357cee65cdd6b711b6caef7b1cd540290a93d80d2f3f29c861d212c97793303e51fc8f297d7945c379a237acfa3f8 SHA512 287342d1ccb36326a9bab5e50c48442a41b599e258611e9046eedb078a84f2840d16f29f91b1259b3b4d37486e48d85596192ea5c6b9d1fa7ad3e78543193e0b DIST wireshark-4.2.6.tar.xz 45015272 BLAKE2B 880acf82c7e535b89ce8b41293c90197825ffe1132720337e77b3dcee0eaf476cb3faa6f9b42d3864e9f6892e624d0b286afdaf6bbe7e6b60483296d087a4bc3 SHA512 265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516 +DIST wireshark-4.4.0-signatures.txt 2706 BLAKE2B 46337f24dfe32b1ff39f8a0b1f30c29a43d7a02a4e8e787833dde47a98206f36501b3e7fe449cc874f81733f8a7b2a16b4e5b07a2fae20d7ddae0121adbc8f98 SHA512 1725790d0671d31814b92508079a135d328df58bd94305e2406a3edf9e08bc5e2bb4ac487045b99684acb8cc8343422cececa32319bbcb36712bb3b2c860cb0c +DIST wireshark-4.4.0.tar.xz 46786568 BLAKE2B 679b774e780201d1d188f5ce2ec1eb21d98250d2dd45b37b741a3cd5d6dc59d983e473a3f87e3ae1b8eef0b0f9b0c02227eecee644697ec19b6c3b2a21a5ad31 SHA512 a00275ffcc7c5bdf546e3e1c95a2fa77b86232d008f77b1b2f3de8e63f1862321d7a439cba2d136be4407131e07e20071d972a4efb7db2bc55388a347f47ce9e diff --git a/net-analyzer/wireshark/files/release-notes.html b/net-analyzer/wireshark/files/release-notes.html new file mode 100644 index 000000000000..fae4810cc97c --- /dev/null +++ b/net-analyzer/wireshark/files/release-notes.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch b/net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch new file mode 100644 index 000000000000..ff7a8f25591c --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch @@ -0,0 +1,98 @@ + +Patch from https://gitlab.com/wireshark/wireshark/-/merge_requests/17202 + +From ac7e2e846ed8cbcaf7938d3bda3e289068af743c Mon Sep 17 00:00:00 2001 +From: John Thacker +Date: Mon, 9 Sep 2024 08:49:44 -0400 +Subject: [PATCH] filesystem: Work around CMake absolute paths + +CMake recommends that the various CMAKE_INSTALL_ variables +be relative paths, and we have been assuming that they are. +Absolute paths are technically allowed. + +Work around absolute paths, and just don't look for the doc +dir, etc. in relocated paths if they are. + +Fix #20055 +--- + wsutil/CMakeLists.txt | 5 +++++ + wsutil/filesystem.c | 26 +++++++++++++++++++++----- + 2 files changed, 26 insertions(+), 5 deletions(-) + +diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt +index 2daf371ca2f..976446bcfe7 100644 +--- a/wsutil/CMakeLists.txt ++++ b/wsutil/CMakeLists.txt +@@ -7,6 +7,11 @@ + # SPDX-License-Identifier: GPL-2.0-or-later + # + ++# CMake says that these paths should be relative to the install prefix ++# https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html ++# Things generally work if they're not, but it becomes impossible ++# to relocate paths. Work around that, and just don't try to support ++# relocation. + file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}" PATH_INSTALL_PREFIX) + string(REPLACE "\\" "\\\\" PATH_INSTALL_PREFIX "${PATH_INSTALL_PREFIX}") + file(TO_NATIVE_PATH "${CMAKE_INSTALL_DATADIR}" PATH_DATA_DIR) +diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c +index bec1cea25b6..942a8c7dcf0 100644 +--- a/wsutil/filesystem.c ++++ b/wsutil/filesystem.c +@@ -1107,7 +1107,11 @@ get_datafile_dir(void) + */ + datafile_dir = g_strdup(progfile_dir); + } else { +- datafile_dir = g_build_filename(install_prefix, DATA_DIR, CONFIGURATION_NAMESPACE_LOWER, (char *)NULL); ++ if (g_path_is_absolute(DATA_DIR)) { ++ datafile_dir = g_build_filename(DATA_DIR, CONFIGURATION_NAMESPACE_LOWER, (char *)NULL); ++ } else { ++ datafile_dir = g_build_filename(install_prefix, DATA_DIR, CONFIGURATION_NAMESPACE_LOWER, (char *)NULL); ++ } + } + #endif + return datafile_dir; +@@ -1159,7 +1163,11 @@ get_doc_dir(void) + */ + doc_dir = g_strdup(progfile_dir); + } else { +- doc_dir = g_build_filename(install_prefix, DOC_DIR, (char *)NULL); ++ if (g_path_is_absolute(DOC_DIR)) { ++ doc_dir = g_strdup(DOC_DIR); ++ } else { ++ doc_dir = g_build_filename(install_prefix, DOC_DIR, (char *)NULL); ++ } + } + #endif + return doc_dir; +@@ -1246,7 +1254,11 @@ init_plugin_dir(void) + */ + plugin_dir = g_build_filename(get_progfile_dir(), "plugins", (char *)NULL); + } else { +- plugin_dir = g_build_filename(install_prefix, PLUGIN_DIR, (char *)NULL); ++ if (g_path_is_absolute(PLUGIN_DIR)) { ++ plugin_dir = g_strdup(PLUGIN_DIR); ++ } else { ++ plugin_dir = g_build_filename(install_prefix, PLUGIN_DIR, (char *)NULL); ++ } + } + #endif // HAVE_MSYSTEM / _WIN32 + #endif /* defined(HAVE_PLUGINS) || defined(HAVE_LUA) */ +@@ -1379,8 +1391,12 @@ init_extcap_dir(void) + CONFIGURATION_NAMESPACE_LOWER, (char *)NULL); + } + else { +- extcap_dir = g_build_filename(install_prefix, +- is_packet_configuration_namespace() ? EXTCAP_DIR : LOG_EXTCAP_DIR, (char *)NULL); ++ if (g_path_is_absolute(EXTCAP_DIR)) { ++ extcap_dir = g_strdup(is_packet_configuration_namespace() ? EXTCAP_DIR : LOG_EXTCAP_DIR); ++ } else { ++ extcap_dir = g_build_filename(install_prefix, ++ is_packet_configuration_namespace() ? EXTCAP_DIR : LOG_EXTCAP_DIR, (char *)NULL); ++ } + } + #endif // HAVE_MSYSTEM / _WIN32 + } +-- +GitLab + diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-4.4.0.ebuild similarity index 92% copy from net-analyzer/wireshark/wireshark-9999.ebuild copy to net-analyzer/wireshark/wireshark-4.4.0.ebuild index 1a49b2ff63b7..475384795063 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-4.4.0.ebuild @@ -3,8 +3,7 @@ EAPI=8 -LUA_COMPAT=( lua5-{1..2} ) -# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 +LUA_COMPAT=( lua5-{3..4} ) PYTHON_COMPAT=( python3_{10..13} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -24,7 +23,7 @@ else S="${WORKDIR}/${P/_/}" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86" fi fi @@ -139,6 +138,8 @@ if [[ ${PV} != *9999* ]] ; then BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" fi +PATCHES=( "${FILESDIR}/wireshark-4.4.0-fix-filesystem-absolute-paths.patch" ) + python_check_deps() { use test || return 0 @@ -284,8 +285,23 @@ src_install() { # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd cmake_src_install install-headers + # prepare Relase Notes redirector if necessary (bug #939195) + local relnotes="doc/release-notes.html" + + if ! use doc; then + # by default create a link for our specific version + local relversion="wireshark-${PV}.html" + + # for 9999 we link to the release notes index page + if [[ ${PV} == *9999* ]] ; then + relversion="" + fi + + sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die + fi + # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + dodoc AUTHORS ChangeLog README* doc/randpkt.txt doc/README* ${relnotes} # install headers insinto /usr/include/wireshark diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 1a49b2ff63b7..ec60ad18b9d9 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -3,8 +3,7 @@ EAPI=8 -LUA_COMPAT=( lua5-{1..2} ) -# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 +LUA_COMPAT=( lua5-{3..4} ) PYTHON_COMPAT=( python3_{10..13} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -284,8 +283,23 @@ src_install() { # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd cmake_src_install install-headers + # prepare Relase Notes redirector if necessary (bug #939195) + local relnotes="doc/release-notes.html" + + if ! use doc; then + # by default create a link for our specific version + local relversion="wireshark-${PV}.html" + + # for 9999 we link to the release notes index page + if [[ ${PV} == *9999* ]] ; then + relversion="" + fi + + sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die + fi + # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + dodoc AUTHORS ChangeLog README* doc/randpkt.txt doc/README* ${relnotes} # install headers insinto /usr/include/wireshark