From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1697835-garchives=archives.gentoo.org@lists.gentoo.org> 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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E8525158245 for <garchives@archives.gentoo.org>; Sat, 7 Dec 2024 02:41:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC7ADE09DF; Sat, 7 Dec 2024 02:41:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 19FB8E09DF for <gentoo-commits@lists.gentoo.org>; Sat, 7 Dec 2024 02:41:51 +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 EA08A341256 for <gentoo-commits@lists.gentoo.org>; Sat, 7 Dec 2024 02:41:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5572D1F42 for <gentoo-commits@lists.gentoo.org>; Sat, 7 Dec 2024 02:41:48 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1733539200.e47587f23018afc80c039e350e4aae864ed93158.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/wireshark-2.6.0-redhat.patch net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch net-analyzer/wireshark/wireshark-4.0.17.ebuild X-VCS-Directories: net-analyzer/wireshark/ net-analyzer/wireshark/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e47587f23018afc80c039e350e4aae864ed93158 X-VCS-Branch: master Date: Sat, 7 Dec 2024 02:41:48 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 31a25731-d34c-4d52-bcb3-78bb01e2565b X-Archives-Hash: dfab61311a5bc6391d327c251c2bc77e commit: e47587f23018afc80c039e350e4aae864ed93158 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Dec 7 02:40:00 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 7 02:40:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47587f2 net-analyzer/wireshark: drop 4.0.17 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/wireshark/Manifest | 2 - .../wireshark/files/wireshark-2.6.0-redhat.patch | 11 - .../files/wireshark-3.4.2-cmake-lua-version.patch | 11 - .../files/wireshark-4.2.5-http2-test.patch | 31 -- ...shark-4.4.0-fix-filesystem-absolute-paths.patch | 98 ------ net-analyzer/wireshark/wireshark-4.0.17.ebuild | 344 --------------------- 6 files changed, 497 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 1df540b60ff6..b77801affca0 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,5 +1,3 @@ -DIST wireshark-4.0.17-signatures.txt 2521 BLAKE2B 9f855e5c66572b62b46518f3c5be90351a69ba1283b1792057bac4fd8bbc492b1b7d6f7adacb114888543b1c44d6dc52ab10c8e842a44d283f8daae2f0db2d6c SHA512 6671ffd4f7de2d0835d33287c159acfb62db739ce58ba3b81bb602b3e4e2f7a969dc4444459c37718d69aa7a1f2e1ab370bd843b62ba59e9e37ae61301b3f3a7 -DIST wireshark-4.0.17.tar.xz 43210400 BLAKE2B 818d518e84ac9bc4814df1d907cfe239c2cfb2a659ecb546f03e1b0e77e101cc0b0c3728d9b9e9626a0dd10ce3dfabba30a6b808f31561f84a8cf3da70cc8d24 SHA512 c7eb6375df60009a6f2efd02385d959cffcfd565fc7254cd0d6aa595127266799d0d296894f8a2ff626103ecc64b763bc617543f7718b8788578711609e29797 DIST wireshark-4.2.8-signatures.txt 2706 BLAKE2B 10128023609008d18a502e09ec8f77898db557fe08340bd242c07f0b9802da6c326f7391b363764800debf5e0ef8aa5df73771bad5881f875a32e0faba5907a6 SHA512 031ab84ab1232a74108ad37ae03f8fe1eb3728fc04b20887e89343ebff985a27b7b04653599a4ba03a3e98dfff33a38adbc1671d0519fc73c2677d82702f4542 DIST wireshark-4.2.8.tar.xz 45032832 BLAKE2B 315926efc0b53b5ca2a35dc2dedf66f14150a6f06eac18816d12defcba2ba9e136abc63fe1042a9d3a93820f5854f8375638bef86c7a95d0315494edda290470 SHA512 4c132d8760ca7bc4976ee5f5b3f4904610d7e2129e10653d3d3fc6ca371b1891c8de2981324bd3113e5bf9302add0370f97b041314b3f6c508da46815a40a562 DIST wireshark-4.2.9-signatures.txt 2706 BLAKE2B 5f1f30a8fce3c967cab165667a4f27bc1a8e425d41d6df42f91a1249bc3934e8fbae29f0e13e53f7f821e1b1b4420564b482e882cfaef66d5f05c5a54bdaa0b8 SHA512 9a259c8e1a9f7308348bf8c45023d9c6d3a6e51f05c89c500c4232267b4d13f8fd18803e78ed45646c73c66769f13bdaf7f071df98e92d2d63c432d176a946eb diff --git a/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch b/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch deleted file mode 100644 index fe17609bf619..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.6.0-redhat.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3019,7 +3019,7 @@ - - endif() - --if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -+if(CMAKE_SYSTEM_NAME STREQUAL "Red Hat") - find_program(RPMBUILD_EXECUTABLE rpmbuild) - find_program(GIT_EXECUTABLE git) - endif() diff --git a/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch deleted file mode 100644 index 18f663b7d814..000000000000 --- a/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/modules/FindLUA.cmake -+++ b/cmake/modules/FindLUA.cmake -@@ -19,7 +19,7 @@ - - if(NOT WIN32) - find_package(PkgConfig) -- pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51) -+ pkg_search_module(LUA lua) - if(NOT LUA_FOUND) - pkg_search_module(LUA "lua<=5.2.99") - endif() diff --git a/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch b/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch deleted file mode 100644 index f32109237d6d..000000000000 --- a/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://gitlab.com/wireshark/wireshark/-/merge_requests/15824 - -From cc8264d68f638c72ada1e94a9913902462c1a25a Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sat, 1 Jun 2024 02:25:05 +0100 -Subject: [PATCH] test: skip test_sharkd_req_follow_http2 test if no http2 - support - -Originally reported downstream in Gentoo at https://bugs.gentoo.org/933290. - -This is the same kind of thing as https://gitlab.com/wireshark/wireshark/-/merge_requests/9029. ---- a/test/suite_sharkd.py -+++ b/test/suite_sharkd.py -@@ -1174,7 +1174,13 @@ class TestSharkd: - }, - )) - -- def test_sharkd_req_follow_http2(self, check_sharkd_session, capture_file): -+ def test_sharkd_req_follow_http2(self, check_sharkd_session, capture_file, features): -+ # If we don't have nghttp2, we output the compressed headers. -+ # We could test against the expected output in that case, but -+ # just skip for now. -+ if not features.have_nghttp2: -+ pytest.skip('Requires nghttp2.') -+ - check_sharkd_session(( - {"jsonrpc":"2.0", "id":1, "method":"load", - "params":{"file": capture_file('quic-with-secrets.pcapng')} --- -2.45.1 - 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 deleted file mode 100644 index ff7a8f25591c..000000000000 --- a/net-analyzer/wireshark/files/wireshark-4.4.0-fix-filesystem-absolute-paths.patch +++ /dev/null @@ -1,98 +0,0 @@ - -Patch from https://gitlab.com/wireshark/wireshark/-/merge_requests/17202 - -From ac7e2e846ed8cbcaf7938d3bda3e289068af743c Mon Sep 17 00:00:00 2001 -From: John Thacker <johnthacker@gmail.com> -Date: Mon, 9 Sep 2024 08:49:44 -0400 -Subject: [PATCH] filesystem: Work around CMake absolute paths - -CMake recommends that the various CMAKE_INSTALL_<dir> 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-4.0.17.ebuild b/net-analyzer/wireshark/wireshark-4.0.17.ebuild deleted file mode 100644 index ad1bce936375..000000000000 --- a/net-analyzer/wireshark/wireshark-4.0.17.ebuild +++ /dev/null @@ -1,344 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{10..11} ) - -inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake - -DESCRIPTION="Network protocol analyzer (sniffer)" -HOMEPAGE="https://www.wireshark.org/" - -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc - inherit verify-sig - - SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" - SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" - S="${WORKDIR}/${P/_/}" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 arm arm64 ~hppa ppc64 ~riscv x86" - fi -fi - -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" -IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lua lz4 maxminddb" -IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" -IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" -IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" - -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) -" - -# Tests restricted for now because rely on pytest internals w/ >=3.11 -# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740. -RESTRICT="!test? ( test ) test" - -# bug #753062 for speexdsp -RDEPEND=" - acct-group/pcap - >=dev-libs/glib-2.50.0:2 - dev-libs/libpcre2 - >=net-dns/c-ares-1.13.0:= - >=dev-libs/libgcrypt-1.8.0:= - media-libs/speexdsp - bcg729? ( media-libs/bcg729 ) - brotli? ( app-arch/brotli:= ) - ciscodump? ( >=net-libs/libssh-0.6:= ) - filecaps? ( sys-libs/libcap ) - http2? ( >=net-libs/nghttp2-1.11.0:= ) - ilbc? ( media-libs/libilbc:= ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( ${LUA_DEPS} ) - lz4? ( app-arch/lz4:= ) - maxminddb? ( dev-libs/libmaxminddb:= ) - minizip? ( sys-libs/zlib[minizip] ) - netlink? ( dev-libs/libnl:3 ) - opus? ( media-libs/opus ) - pcap? ( net-libs/libpcap ) - gui? ( - x11-misc/xdg-utils - qt6? ( - dev-qt/qtbase:6[concurrent,dbus,gui,widgets] - dev-qt/qt5compat:6 - dev-qt/qtmultimedia:6 - ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtconcurrent:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - ) - ) - sbc? ( media-libs/sbc ) - sdjournal? ( sys-apps/systemd:= ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy:= ) - spandsp? ( media-libs/spandsp:= ) - sshdump? ( >=net-libs/libssh-0.6:= ) - ssl? ( >=net-libs/gnutls-3.5.8:= ) - wifi? ( >=net-libs/libssh-0.6:= ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - gui? ( - !qt6? ( - dev-qt/qtdeclarative:5 - ) - ) -" -# TODO: 4.0.0_rc1 release notes say: -# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." -BDEPEND=" - ${PYTHON_DEPS} - dev-lang/perl - app-alternatives/lex - sys-devel/gettext - virtual/pkgconfig - doc? ( - app-text/doxygen - dev-ruby/asciidoctor - ) - gui? ( - qt6? ( - dev-qt/qttools:6[linguist] - ) - !qt6? ( - dev-qt/linguist-tools:5 - ) - ) - test? ( - $(python_gen_any_dep ' - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ') - ) -" -RDEPEND=" - ${RDEPEND} - gui? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" - -if [[ ${PV} != *9999* ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch -) - -python_check_deps() { - use test || return 0 - - python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" && - python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use lua && lua-single_pkg_setup - - python-any-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999* ]] ; then - git-r3_src_unpack - else - if use verify-sig ; then - cd "${DISTDIR}" || die - verify-sig_verify_signed_checksums \ - ${P}-signatures.txt \ - openssl-dgst \ - ${P}.tar.xz - cd "${WORKDIR}" || die - fi - - default - fi -} - -src_configure() { - local mycmakeargs - - python_setup - - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos ; then - case $(krb5-config --libs) in - *-lcrypto*) - ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." - ewarn "Note there are annoying license incompatibilities between the OpenSSL" - ewarn "license and the GPL, so do your check before distributing such package." - mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) - ;; - esac - fi - - if use gui ; then - append-cxxflags -fPIC -DPIC - fi - - # crashes at runtime - # https://bugs.gentoo.org/754021 - filter-lto - - mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) - - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex gui MOC=$(qt5_get_bindir)/moc '') - $(usex gui RCC=$(qt5_get_bindir)/rcc '') - $(usex gui UIC=$(qt5_get_bindir)/uic '') - - -DBUILD_androiddump=$(usex androiddump) - -DBUILD_capinfos=$(usex capinfos) - -DBUILD_captype=$(usex captype) - -DBUILD_ciscodump=$(usex ciscodump) - -DBUILD_dftest=$(usex dftest) - -DBUILD_dpauxmon=$(usex dpauxmon) - -DBUILD_dumpcap=$(usex dumpcap) - -DBUILD_editcap=$(usex editcap) - -DBUILD_mergecap=$(usex mergecap) - -DBUILD_mmdbresolve=$(usex maxminddb) - -DBUILD_randpkt=$(usex randpkt) - -DBUILD_randpktdump=$(usex randpktdump) - -DBUILD_reordercap=$(usex reordercap) - -DBUILD_sdjournal=$(usex sdjournal) - -DBUILD_sharkd=$(usex sharkd) - -DBUILD_sshdump=$(usex sshdump) - -DBUILD_text2pcap=$(usex text2pcap) - -DBUILD_tfshark=$(usex tfshark) - -DBUILD_tshark=$(usex tshark) - -DBUILD_udpdump=$(usex udpdump) - - -DBUILD_wireshark=$(usex gui) - -DUSE_qt6=$(usex qt6) - - -DENABLE_WERROR=OFF - -DENABLE_BCG729=$(usex bcg729) - -DENABLE_BROTLI=$(usex brotli) - -DENABLE_CAP=$(usex filecaps caps) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_ILBC=$(usex ilbc) - -DENABLE_KERBEROS=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - # only appends -flto - -DENABLE_LTO=OFF - -DENABLE_LUA=$(usex lua) - -DENABLE_LZ4=$(usex lz4) - -DENABLE_MINIZIP=$(usex minizip) - -DENABLE_NETLINK=$(usex netlink) - -DENABLE_NGHTTP2=$(usex http2) - -DENABLE_OPUS=$(usex opus) - -DENABLE_PCAP=$(usex pcap) - -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_PLUGIN_IFDEMO=OFF - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DBUILD_wifidump=$(usex wifi) - -DENABLE_ZLIB=$(usex zlib) - -DENABLE_ZSTD=$(usex zstd) - ) - - cmake_src_configure -} - -src_test() { - cmake_build test-programs - - EPYTEST_DESELECT=( - # TODO: investigate - suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream - ) - - # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html - epytest \ - --disable-capture \ - --skip-missing-programs=all \ - --program-path "${BUILD_DIR}"/run -} - -src_install() { - cmake_src_install - - # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* - - # install headers - insinto /usr/include/wireshark - doins "${BUILD_DIR}"/config.h - - # If trying to remove this, try build e.g. libvirt first! - # At last check, Fedora is still doing this too. - local dir dirs=( - epan - epan/crypt - epan/dfilter - epan/dissectors - epan/ftypes - wiretap - wsutil - wsutil/wmem - ) - - for dir in "${dirs[@]}" ; do - insinto /usr/include/wireshark/${dir} - doins ${dir}/*.h - done - - if use gui ; then - local s - - for s in 16 32 48 64 128 256 512 1024 ; do - insinto /usr/share/icons/hicolor/${s}x${s}/apps - newins resources/icons/wsicon${s}.png wireshark.png - done - - for s in 16 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes - newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png - done - fi - - if [[ -d "${ED}"/usr/share/appdata ]] ; then - rm -r "${ED}"/usr/share/appdata || die - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - - # Add group for users allowed to sniff. - chgrp pcap "${EROOT}"/usr/bin/dumpcap - - if use dumpcap && use pcap ; then - fcaps -o 0 -g pcap -m 4710 -M 0710 \ - cap_dac_read_search,cap_net_raw,cap_net_admin \ - "${EROOT}"/usr/bin/dumpcap - fi - - readme.gentoo_print_elog -}