summaryrefslogtreecommitdiff
path: root/net-analyzer/wireshark
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r--net-analyzer/wireshark/Manifest10
-rw-r--r--net-analyzer/wireshark/files/wireshark-4.4.1-cares.patch48
-rw-r--r--net-analyzer/wireshark/metadata.xml8
-rw-r--r--net-analyzer/wireshark/wireshark-4.4.2-r1.ebuild (renamed from net-analyzer/wireshark/wireshark-4.4.1.ebuild)7
-rw-r--r--net-analyzer/wireshark/wireshark-4.4.2.ebuild343
-rw-r--r--net-analyzer/wireshark/wireshark-9999.ebuild7
6 files changed, 17 insertions, 406 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b372925d1de2..d1700f30d72f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,11 +1,7 @@
AUX README.gentoo 188 BLAKE2B 1734362317f1c09b63ebb946961a3f31e5b785787ac3c4e026d71c95c14367f4f3df752706e0d04e14792c95c33c3829eea704806b3b14a96339819f8c2ad4f7 SHA512 92811e9bb6df95d87058e6b77ed09dd086db922721b71ea87af0fdfcc44e2585ef28cf264095d8645a9b5bb60a3990b21376f892305debac19a3f01518918959
AUX release-notes.html 153 BLAKE2B 5b211857ba0be0d40d218f4bea1fabf7a6034b1219d08307ec958684d194898ef96ef152e8996fe1e4b89acf36faaf3d094763244983372ca8a3a0a47942c5f0 SHA512 056da005da67fa1e7ae76bc2243b63b08ccefd437e24d32a2794ac051d9869b83961f5eaeab1838c92a1a46af7417b6d31d7a7f993717a919cf9f38a57f037fc
-AUX wireshark-4.4.1-cares.patch 1934 BLAKE2B 2b5606e0a2b0fe24a03a3ffac8eadb95ac4805cc52be901cf9977938814b785e5fed247efcbbc09d3343411fc5abfa9e59aeee0ed3f0548259e7ec0e67869428 SHA512 3e857d96b904f5ef142269ba3c8d8121cb9a5a20a8b55057f4002c4dbb0a815d4f7daee3b872e9f683f37a82d353183b65e40fb8e3a1128eda85e1c23f1a6dcb
-DIST wireshark-4.4.1-signatures.txt 2706 BLAKE2B 04458da4aedbefa57f03711781215b999bbf1e8d5f34aefa7d853b18991cb08da29ec9b922fd1b9d8f1092cd9b1a080df8aa41bf0e5981639cc9820c39302b12 SHA512 145c6739d092f0068666c4317b58efdfd34690511ff30797c0fa153abc847f96fb84ea8bde4e09c681ca28b32ddb7dc25683c8e40ccb55b83c23328f2e732f62
-DIST wireshark-4.4.1.tar.xz 46748700 BLAKE2B 747ffe14a7b30c4d7bb435bff1fded11efcf03a8bfcacd48d36141fae7a9cfb7965076b1a807d7f095f66bb99148732c090493d2c3654b4a20355f8dbeac3972 SHA512 66c5e035a5a0d2bbb82fba67b652e0e37c296ab470da59b8ed71ef4e6d6d061d6a2649b5af544b737cdf31d808a7f8f07a64a9e4d805674ce8965eff23081de4
DIST wireshark-4.4.2-signatures.txt 2706 BLAKE2B 3349a3e88782e1326b6c2e1b56d5eefbaeb2dbd6cf33b055e3a49692023b02e77a7e6d26ade7a9018cda783aa29edade997aaa03222fadb06c5bfa106a492459 SHA512 c809085b69c909702b3390b93891a19b8a8c0812d448ac9399eb59991618737b3bfeb737bd569267dcffc46290d59b34664f967e88c1a38b1678faaecd76d445
DIST wireshark-4.4.2.tar.xz 46763620 BLAKE2B ea5c48f06c2aeb5b51f6ba62fd57214e9dd79917f978867d3ae31ffec74eb82ba7c8a2e2dcba415e53d051e531f9f9907aac88c6f29b6746222cf812bb43c85b SHA512 df80c98a2d00ba46a853acfe3aec9dfc0d4484f490a276b8b8390b6d108634b7e0fa38e8f02f8d93afe5c2394c463a0d89611027032898d7d0390d2111b70ca6
-EBUILD wireshark-4.4.1.ebuild 9037 BLAKE2B 0d3e978af1a1012fc73ba47754f7654030b5f7bc3746d12d9dc9ea933b26998d7e22b43bd0b51f1c18474c6922c8f54daf9e65b1cb2d4d221c5e6c0344c5a15c SHA512 130136378a41ea4272b4f2c453386db4b4c8facaa473591643c5f03c03961935efecbbe975811b8f450e9ae6d3f8192d5e91787eb9b08f122a20460d00b30cdd
-EBUILD wireshark-4.4.2.ebuild 8993 BLAKE2B dd9eae95fecaae163e2532656dbb5870968dd26b76d3d6c663b4ac98dc0c487dfde5a23bf6294f6746ab753397722be59f1976c8346a55b458ccceb3ea6759a4 SHA512 d8035ea5a63f6d5600d09071346a223703dade67f41c4ccd5689e7299ac924f5d09d123028ab7451cd8f67c4043f659e2db7039168105fb8f1c679c0b9c98ce0
-EBUILD wireshark-9999.ebuild 8997 BLAKE2B 9ce6be21698d6277140b048ffc9441705d7ec1737442bf2538e8720d0086b5061323d59757169223a8fb38d4cd075939fb8e7f8cac1f8231ce7092d1c816ff18 SHA512 25f45362e1c5221fa81bf13ac1d472deecbf5ec019fc992ca3e7ff6ba4534fefd65fb3af203fd3de304603c0f2a7701c354a744e3ff5a977b9430f81a690d74f
-MISC metadata.xml 5260 BLAKE2B 32891736519005e6dc707dc353eabd1a19250b032628089a57c6f98e0d1e73739cb5fdd29d87abe1f9f50ecefc198e3e2d9027a4dc584995c103d22aa9dd2464 SHA512 51f0089b8e9f6490dc15b66d0f544f48a78f171ab67a8b04d68848e7d14295afb05e3f03ef18bad2eeb9f836ca12bfdbc56866dd0afd9164c0869598788c336c
+EBUILD wireshark-4.4.2-r1.ebuild 9014 BLAKE2B 9ba43f066b286e04c18f3881da033d5d6406c4859e174a7c9a88c5b75f6d0d21ac5ec223f1c7014ff9418625872f8052812a119a60f9675a32e618fdbab12084 SHA512 f208185934c338f7b9e8c330a99624a9e493330c485859468fb6b6a0b6a18e298f18e853cfe0353816a4c367acbf993b6a83e567719cfb58a07cd462348911be
+EBUILD wireshark-9999.ebuild 9019 BLAKE2B 44651993cdd5b70e2d92327c832ec7b8bf0c1adfa05f8395d4274f5f50aa277150114e550c56cb819bbd9436e475fb0c1ecb8eda4b9b120e2c0e86a59cf45470 SHA512 f1b653e9ff71bb5d292b889abb794496d80a6b4127cea4e4c12f9c6b36c9efe063856b8a2b3618f11cd63c0020b8f4423d830507ea46390c97b5447f7054cc1c
+MISC metadata.xml 5531 BLAKE2B 207ea41db99c46e4434a7ad42e40324320387ecae4391425ad82e3f226806adb485a496571c966714eb3ab3713e08d30c8ed5d14cdfaa97bde130b5a88087d5f SHA512 ec77f0f412bf6fafd2e74ab9d5a21bb04a6cda9ea01437dea6fcac3d9ef453775e6a05b77f8c9724dcbc2aa23cb5924518029cf51a6d329a3361bee9fd45f78c
diff --git a/net-analyzer/wireshark/files/wireshark-4.4.1-cares.patch b/net-analyzer/wireshark/files/wireshark-4.4.1-cares.patch
deleted file mode 100644
index ffb388fa6453..000000000000
--- a/net-analyzer/wireshark/files/wireshark-4.4.1-cares.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://gitlab.com/wireshark/wireshark/-/commit/0e120834b0883c9940d31f210a51613f723ad422
-
-From 0e120834b0883c9940d31f210a51613f723ad422 Mon Sep 17 00:00:00 2001
-From: John Thacker <johnthacker@gmail.com>
-Date: Thu, 10 Oct 2024 23:15:18 +0000
-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
-
-
-(cherry picked from commit 7c1418625d2ba5095ef5393abdb2141c990a662c)
-
-Co-authored-by: Gerald Combs <gerald@wireshark.org>
---- 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/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index cbc3c515856e..5148243df1c5 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>holger@applied-asynchrony.com</email>
+ <name>Holger Hoffstätte</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<maintainer type="person">
<email>sam@gentoo.org</email>
<name>Sam James</name>
diff --git a/net-analyzer/wireshark/wireshark-4.4.1.ebuild b/net-analyzer/wireshark/wireshark-4.4.2-r1.ebuild
index 9b0ab0f0cacf..70b917295734 100644
--- a/net-analyzer/wireshark/wireshark-4.4.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -119,10 +119,6 @@ if [[ ${PV} != *9999* ]] ; then
BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )"
fi
-PATCHES=(
- "${FILESDIR}/${P}-cares.patch"
-)
-
python_check_deps() {
use test || return 0
@@ -247,6 +243,7 @@ src_configure() {
-DENABLE_SPANDSP=$(usex spandsp)
-DBUILD_wifidump=$(usex wifi)
-DENABLE_ZLIB=$(usex zlib)
+ -DENABLE_ZLIBNG=OFF
-DENABLE_ZSTD=$(usex zstd)
)
diff --git a/net-analyzer/wireshark/wireshark-4.4.2.ebuild b/net-analyzer/wireshark/wireshark-4.4.2.ebuild
deleted file mode 100644
index f7217d6e97b7..000000000000
--- a/net-analyzer/wireshark/wireshark-4.4.2.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3..4} )
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit fcaps flag-o-matic 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 ~loong 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 http3 ilbc kerberos libxml2 lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap +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} )
-"
-
-RESTRICT="!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:= )
- http3? ( net-libs/nghttp3 )
- 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? (
- dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
- dev-qt/qt5compat:6
- dev-qt/qtdeclarative:6
- dev-qt/qtmultimedia:6
- x11-misc/xdg-utils
- )
- 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}
-"
-# 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
- dev-libs/libxslt
- )
- gui? (
- dev-qt/qttools:6[linguist]
- )
- 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
-
-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)
-
- # Force bundled lemon (bug 933119)
- -DLEMON_EXECUTABLE=
-
- -DRPMBUILD_EXECUTABLE=
- -DGIT_EXECUTABLE=
- -DENABLE_CCACHE=OFF
-
- $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
- $(usex gui LRELEASE=$(qt6_get_bindir)/lrelease '')
- $(usex gui MOC=$(qt6_get_bindir)/moc '')
- $(usex gui RCC=$(qt6_get_bindir)/rcc '')
- $(usex gui UIC=$(qt6_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 gui)
-
- -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)
- -DLUA_FIND_VERSIONS="${ELUA#lua}"
- -DENABLE_LZ4=$(usex lz4)
- -DENABLE_MINIZIP=$(usex minizip)
- -DENABLE_NETLINK=$(usex netlink)
- -DENABLE_NGHTTP2=$(usex http2)
- -DENABLE_NGHTTP3=$(usex http3)
- -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
-
- # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
- epytest \
- --disable-capture \
- --skip-missing-programs=all \
- --program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
- # bug #928577
- # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd
- cmake_src_install install-headers
-
- if ! use doc; then
- # prepare Relase Notes redirector (bug #939195)
- local relnotes="doc/release-notes.html"
-
- # 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
-
- # patch version into redirector & install it
- sed -e "s/#VERSION#/${relversion}/g" < "${FILESDIR}/release-notes.html" > ${relnotes} || die
- dodoc ${relnotes}
- fi
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog 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
-}
-
-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
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the pcap group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild
index 5c5d9c7af028..91ce4666a268 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -61,7 +61,7 @@ RDEPEND="
lua? ( ${LUA_DEPS} )
lz4? ( app-arch/lz4:= )
maxminddb? ( dev-libs/libmaxminddb:= )
- minizip? ( sys-libs/zlib[minizip] )
+ minizip? ( sys-libs/minizip-ng )
netlink? ( dev-libs/libnl:3 )
opus? ( media-libs/opus )
pcap? ( net-libs/libpcap )
@@ -80,7 +80,7 @@ RDEPEND="
sshdump? ( >=net-libs/libssh-0.6:= )
ssl? ( >=net-libs/gnutls-3.5.8:= )
wifi? ( >=net-libs/libssh-0.6:= )
- zlib? ( sys-libs/zlib )
+ zlib? ( sys-libs/zlib-ng )
zstd? ( app-arch/zstd:= )
"
DEPEND="
@@ -242,7 +242,8 @@ src_configure() {
-DENABLE_SNAPPY=$(usex snappy)
-DENABLE_SPANDSP=$(usex spandsp)
-DBUILD_wifidump=$(usex wifi)
- -DENABLE_ZLIB=$(usex zlib)
+ -DENABLE_ZLIB=OFF
+ -DENABLE_ZLIBNG=$(usex zlib)
-DENABLE_ZSTD=$(usex zstd)
)
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 10:46:38 +0000