From 9323524b4d44f4ec3dc923bd8e9ea04bdde8a067 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Apr 2024 00:30:33 +0100 Subject: gentoo auto-resync : 06:04:2024 - 00:30:33 --- net-analyzer/Manifest.gz | Bin 43604 -> 43605 bytes net-analyzer/netdata/Manifest | 4 +- net-analyzer/netdata/netdata-1.45.2.ebuild | 10 +- net-analyzer/netdata/netdata-9999.ebuild | 10 +- net-analyzer/wireshark/Manifest | 4 +- net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild | 348 +++++++++++++++++++++++ net-analyzer/wireshark/wireshark-4.2.4.ebuild | 346 ---------------------- net-analyzer/wireshark/wireshark-9999.ebuild | 4 +- 8 files changed, 373 insertions(+), 353 deletions(-) create mode 100644 net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild delete mode 100644 net-analyzer/wireshark/wireshark-4.2.4.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index b2d07719db85..e9a01860116a 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 3bebdc0e6ef6..ff8a6e92c6b6 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -6,6 +6,6 @@ DIST netdata-1.45.2.tar.gz 74879267 BLAKE2B 7dc697657dc1e418bf826ba655544775df10 EBUILD netdata-1.44.0.ebuild 4211 BLAKE2B 7221dc851b930b76f7a90b8062025ee723fe5bff7f64a69afe3e857136d2277a0b0c51b516861b26848df9bd1fe9a0a12dc5c078a814e8c16bc42f63fa03641f SHA512 1d9249bbeddb683e00e2a0116e8452eaa62ca2fbcf78b38f89771e030cb6acd6e34bd610936018b2c63f643ecc425a20f4d30acd57d2b45a8c599086fb5a26a7 EBUILD netdata-1.45.0.ebuild 4121 BLAKE2B 49dfa6968028fd971988f81c8be6486320fb5495be24488699bd74a22eccb3c6bf7fcf39e80494c6a91977802fb2f73aaf6f104eddccacea55561373ed6bb814 SHA512 d5e3844698bad17c232301a399ac43a3b353381382c4992bfce3f6a30f8a97247c8bb8a6e945b2f9b5acd8d10ab6b1acdb8b650e017b32ee9de209cf14b3a7da EBUILD netdata-1.45.1.ebuild 4121 BLAKE2B 49dfa6968028fd971988f81c8be6486320fb5495be24488699bd74a22eccb3c6bf7fcf39e80494c6a91977802fb2f73aaf6f104eddccacea55561373ed6bb814 SHA512 d5e3844698bad17c232301a399ac43a3b353381382c4992bfce3f6a30f8a97247c8bb8a6e945b2f9b5acd8d10ab6b1acdb8b650e017b32ee9de209cf14b3a7da -EBUILD netdata-1.45.2.ebuild 4121 BLAKE2B 49dfa6968028fd971988f81c8be6486320fb5495be24488699bd74a22eccb3c6bf7fcf39e80494c6a91977802fb2f73aaf6f104eddccacea55561373ed6bb814 SHA512 d5e3844698bad17c232301a399ac43a3b353381382c4992bfce3f6a30f8a97247c8bb8a6e945b2f9b5acd8d10ab6b1acdb8b650e017b32ee9de209cf14b3a7da -EBUILD netdata-9999.ebuild 4121 BLAKE2B 49dfa6968028fd971988f81c8be6486320fb5495be24488699bd74a22eccb3c6bf7fcf39e80494c6a91977802fb2f73aaf6f104eddccacea55561373ed6bb814 SHA512 d5e3844698bad17c232301a399ac43a3b353381382c4992bfce3f6a30f8a97247c8bb8a6e945b2f9b5acd8d10ab6b1acdb8b650e017b32ee9de209cf14b3a7da +EBUILD netdata-1.45.2.ebuild 4330 BLAKE2B f5ab535f2c5123de9a75e2456a84a57470d6e2980618d4552e898912245986ef1db79738d7ff5b1c572013539e11228bf4f7d75b6cc82bc04a36a74077a7d930 SHA512 95b61beaac0758a412c88af158f72bb89e1bf130e081c80bfbf337a95089bafc84a65685490356ffe997dcad742f13b1a10bbcb8d6d2f5da144d094920c6e05e +EBUILD netdata-9999.ebuild 4330 BLAKE2B f5ab535f2c5123de9a75e2456a84a57470d6e2980618d4552e898912245986ef1db79738d7ff5b1c572013539e11228bf4f7d75b6cc82bc04a36a74077a7d930 SHA512 95b61beaac0758a412c88af158f72bb89e1bf130e081c80bfbf337a95089bafc84a65685490356ffe997dcad742f13b1a10bbcb8d6d2f5da144d094920c6e05e MISC metadata.xml 1512 BLAKE2B 321d3c1be16a0fd3c64d89f96c510d68ea82fca12730183d2724f7a0f30fdcb94c2be2749a6f9651ae7effdf7c250e977f95cf03c865a20e03e136456429c2b3 SHA512 4bd5583efd1fee4a0f221708fedf6dcf424639852842c8ba1089a2303a57ae58ccfd302fc5fcbfdada65a56efa8c7c949b95eedde0133a770ef68ca6688bbefd diff --git a/net-analyzer/netdata/netdata-1.45.2.ebuild b/net-analyzer/netdata/netdata-1.45.2.ebuild index 2d2fe2aeb560..0d57f53917bc 100644 --- a/net-analyzer/netdata/netdata-1.45.2.ebuild +++ b/net-analyzer/netdata/netdata-1.45.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python{3_9,3_10,3_11} ) -inherit cmake fcaps linux-info optfeature python-single-r1 systemd +inherit cmake fcaps flag-o-matic linux-info optfeature python-single-r1 systemd if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/netdata/${PN}.git" @@ -95,6 +95,14 @@ pkg_setup() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/927174 + # https://github.com/netdata/netdata/issues/17321 + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE -DCMAKE_INSTALL_PREFIX=/ diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 2d2fe2aeb560..0d57f53917bc 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python{3_9,3_10,3_11} ) -inherit cmake fcaps linux-info optfeature python-single-r1 systemd +inherit cmake fcaps flag-o-matic linux-info optfeature python-single-r1 systemd if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/netdata/${PN}.git" @@ -95,6 +95,14 @@ pkg_setup() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/927174 + # https://github.com/netdata/netdata/issues/17321 + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE -DCMAKE_INSTALL_PREFIX=/ diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 897cfd085ced..c1ca3a1a98ab 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -9,6 +9,6 @@ DIST wireshark-4.2.4-signatures.txt 2706 BLAKE2B 169c7eea2d89f4eedc58e833512cf81 DIST wireshark-4.2.4.tar.xz 44986232 BLAKE2B 03806a167a4b055409fadbc54ba338c9d2790df3ac2b9fb547c640c67d7bee6a3f8f19d30549228e494cabf8d303cef42ff098a9e1f45b092589643e568632f5 SHA512 963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6 EBUILD wireshark-4.0.11.ebuild 8629 BLAKE2B 570d1896cdc2a12deca6e12740fd6db574ba4591191541e329c9a9e71bbcd71cf3bc547ef8be4584ee5d7d39715ea4498f6bd558b5169e623cf4f3f68f17a49d SHA512 f8c4693e14e9d7b60832ffacf70b79ecb387abee9abab3f02292ef06f08a270b3580a9e0a7569d27404b22a05adf6159027f6f494bb9c81bccff57fc389befe9 EBUILD wireshark-4.0.14.ebuild 8634 BLAKE2B 9bcd06b8fbbce57d7a599170c19b1ca46901682593fd067b2abad6091cdf8b342c03c6be789b7b0752be5b42db905527ed3a0963d7cc1518449b8e8a7ad0c376 SHA512 27da4af400f64d9a2cf4f0eaa68de6cbc300369b0c769a57ddf8b916d4b8ed57aa18097d2801c65b3289601e46c62c5cd6bd4c6e8b3d0ab1826818c036032183 -EBUILD wireshark-4.2.4.ebuild 8723 BLAKE2B 242c7f63ec26e77946ec390e97368a7bb5ee54428c0b5a8bac28cb31211e14ead22311743abc16c15aa08ee6a0aee1ac6fb16de86f5dfc16ad8ed685266ca903 SHA512 412ce1e47bee9981b1bc97d584a4dbe9e070ad72551be41e53ad80a190870aadd4a51822bf1e9febcf279951947aaf20129c5d0b44bfc66137d8531b00dc7af0 -EBUILD wireshark-9999.ebuild 8723 BLAKE2B 242c7f63ec26e77946ec390e97368a7bb5ee54428c0b5a8bac28cb31211e14ead22311743abc16c15aa08ee6a0aee1ac6fb16de86f5dfc16ad8ed685266ca903 SHA512 412ce1e47bee9981b1bc97d584a4dbe9e070ad72551be41e53ad80a190870aadd4a51822bf1e9febcf279951947aaf20129c5d0b44bfc66137d8531b00dc7af0 +EBUILD wireshark-4.2.4-r1.ebuild 8846 BLAKE2B e642ce7d0da51c69d2ccb3b5fd566e7a6fc16a029e799eddb231028d6beac04981313511863c7795b8df0522c874c4ad932ca9860ce43c99fab8f903ddd9760a SHA512 06ad3c9b44afca7c935e49778648705e88da27abec72a085246eb5ea702ceb61090f6eea958842d816097febe06aee6f2bc3dc8811f5da94c025decf44252785 +EBUILD wireshark-9999.ebuild 8846 BLAKE2B e642ce7d0da51c69d2ccb3b5fd566e7a6fc16a029e799eddb231028d6beac04981313511863c7795b8df0522c874c4ad932ca9860ce43c99fab8f903ddd9760a SHA512 06ad3c9b44afca7c935e49778648705e88da27abec72a085246eb5ea702ceb61090f6eea958842d816097febe06aee6f2bc3dc8811f5da94c025decf44252785 MISC metadata.xml 5352 BLAKE2B 319ae9385ccf49cf52abdc3bb2292a6181f8bad974eecb1863b69dc248e8e1b17d95de5c7267e4e70ee28809bffc82a13f06de3e7d15541d32e2e2ab7ada638f SHA512 15580364ef3f86e9d4020c8b7e2e765a2be97742dc398d11697b87e15085e1a95e951d0200eea71484fb8d124d54b86da8542921c0b8f29d064a26681192d919 diff --git a/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild new file mode 100644 index 000000000000..0e0d86d74067 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild @@ -0,0 +1,348 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..2} ) +# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 +PYTHON_COMPAT=( python3_{10..12} ) + +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 ~arm64 ~hppa" + 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 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} ) +" + +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? ( + 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 + dev-libs/libxslt + ) + 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 +) + +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) + -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 + + 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() { + # bug #928577 + # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd + cmake_src_install install-headers + + # 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 +} + +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-4.2.4.ebuild b/net-analyzer/wireshark/wireshark-4.2.4.ebuild deleted file mode 100644 index 4f2a6bd3fbd9..000000000000 --- a/net-analyzer/wireshark/wireshark-4.2.4.ebuild +++ /dev/null @@ -1,346 +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} ) -# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 -PYTHON_COMPAT=( python3_{10..12} ) - -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 ~arm64 ~hppa" - 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 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} ) -" - -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? ( - 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 - dev-libs/libxslt - ) - 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 -) - -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) - -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 - - 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 -} - -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 4f2a6bd3fbd9..0e0d86d74067 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -282,7 +282,9 @@ src_test() { } src_install() { - cmake_src_install + # bug #928577 + # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd + cmake_src_install install-headers # FAQ is not required as is installed from help/faq.txt dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* -- cgit v1.2.3