From c3d14fe9accdf0b091e42f26a66ed7626ba8c24b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 May 2023 11:19:44 +0100 Subject: gentoo auto-resync : 01:05:2023 - 11:19:44 --- net-analyzer/Manifest.gz | Bin 42908 -> 42912 bytes net-analyzer/wireshark/Manifest | 14 +- net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild | 272 ------------------- net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild | 6 +- net-analyzer/wireshark/wireshark-3.6.13.ebuild | 6 +- net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild | 312 ---------------------- net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild | 6 +- net-analyzer/wireshark/wireshark-4.0.5.ebuild | 6 +- net-analyzer/wireshark/wireshark-9999.ebuild | 6 +- 9 files changed, 25 insertions(+), 603 deletions(-) delete mode 100644 net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild delete mode 100644 net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index c32339222220..b55e7668efc3 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 0171fe0a6d24..cecaef9ed52f 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,17 +1,13 @@ AUX README.gentoo 188 BLAKE2B 1734362317f1c09b63ebb946961a3f31e5b785787ac3c4e026d71c95c14367f4f3df752706e0d04e14792c95c33c3829eea704806b3b14a96339819f8c2ad4f7 SHA512 92811e9bb6df95d87058e6b77ed09dd086db922721b71ea87af0fdfcc44e2585ef28cf264095d8645a9b5bb60a3990b21376f892305debac19a3f01518918959 AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff -DIST wireshark-3.6.11.tar.xz 39967744 BLAKE2B b313be6b2d22f62365f7a840409c49a78ce99d135e6b5f17c73c12dc12a543f5daa298a3df1693dafc79a6f3f1b184de231cc527bca0627e3c37b8ac4ce8e5a3 SHA512 f526e6e8f9435b69b5c3ce3a7d271f7b66365bdd84cd155ac434be0ef899cc140f58dfe55e90295bba91a8a99f28a55280366fb028d13f6ff45051a9ed3625e8 DIST wireshark-3.6.12.tar.xz 39975988 BLAKE2B ca356c0d03d7c82463cc4503d0c1085b80fe621763c1bc369a5944dc6566f25b19fce9615239265b3620f76c92bff7d7c6e958241143c444a1b659b82d319c65 SHA512 a6e05e5a6b1027e3f4650a32f186d9a2cff4fb7adb2317bdeb96a7193ab45fa434572f94253a4d6e5589b0790420a445c4bbd788d8ac53e01019bb88130164f8 DIST wireshark-3.6.13.tar.xz 39982176 BLAKE2B f09005dba37a96a093c4a4ac40ffdf82f929ff25be15bf208ab7f1433b3fb915552151d3a1a95362b7a9ef2e835a21f38c2bb08733e46dca3bf5ad991813286a SHA512 ab6ab6deff410539fe6b5fc9c35a570951719fd040381993e710c3e0447dddda8ec6d8e94a5f46ce9350ac3aa9e300409c2fb3f83c735a2e0cfa1dd8ffa44edb -DIST wireshark-4.0.3.tar.xz 41383164 BLAKE2B 85271a1f52b383db07fdf51f500ae0d6dd9b6f6624176889a88ff51e85e1eb578a7ba43a80018e60cb84ff486aedce850b2b82e127fcabb7f049d479e1d0c3cb SHA512 ef6d20b9b69e1a2b6b6b5bebe5f13545acb73b2faece32198dbe01c4181524d5f8320712b4440c93fc65ef075ab7b6398394581b3dc09a20b1b5b9b90ec2a13c DIST wireshark-4.0.4.tar.xz 41399396 BLAKE2B 4db1b691c0d1775760c85851edd45dba3eabc695aae37fe4145e6207272f37ccb69ec63be509b244d209a4626f3b7e376589458b6583ffd0eddd0e77aafea4db SHA512 e6aa49ba12245ec3ae779fc9b30a783121b6a8298ab512968f408d96d4e73b2962ccb289f2ead68b7b1d6788bfa7e11b28f4a5b4c4b043ecdbc09668bdd4feff DIST wireshark-4.0.5.tar.xz 41401932 BLAKE2B 932c017eaef6d0758a70bba3beb018e7512c41f9355c0948d744899aa79e5259cbbde6522ed216835781acd8f27d2a2b786aec0fadf33735a5b3cd324ab1a5d1 SHA512 fd03b0b382dd68212d173b955d6156bad23a31c4e044bb8120e0ce2622cfa963b3b9f86b469dbb26a3d275f9c426329043ac5e5461b1cbea718cd99a1d557ce9 -EBUILD wireshark-3.6.11-r1.ebuild 7304 BLAKE2B 4d9c6b79475ccb2af4748b4d03dc88e5e8fc0c79a4a36ff640a19015d9dcba2acd816de8d0977d33df88ec3b1915ac86474003657389319da091a1789d30ebfd SHA512 4ebb14dd36cb7d6cbbc1ae0f4aa28819695471bfcb405fc19d0649415b71bf6f1d54db240d1f834d2795f368c3b9b94ed5b3591eca738e8dbc3caf007b05c936 -EBUILD wireshark-3.6.12-r1.ebuild 7304 BLAKE2B 4d9c6b79475ccb2af4748b4d03dc88e5e8fc0c79a4a36ff640a19015d9dcba2acd816de8d0977d33df88ec3b1915ac86474003657389319da091a1789d30ebfd SHA512 4ebb14dd36cb7d6cbbc1ae0f4aa28819695471bfcb405fc19d0649415b71bf6f1d54db240d1f834d2795f368c3b9b94ed5b3591eca738e8dbc3caf007b05c936 -EBUILD wireshark-3.6.13.ebuild 7309 BLAKE2B 0e3407d8acc23148c65e61c1440840e9f444a65804983852e8f25e6416c4c6f52c7e9a8da4523254d85b88045a269e412571207cf9e6ad69c08c07a73792fed5 SHA512 fb2a3f66740a3cc7d5c32deb9716749b709e97167c36c5b2f1f44cdabd5142a85e27615ceb906a235b785b3b18aff13ddf5a94073f39c07954a3e30acb0b303f -EBUILD wireshark-4.0.3-r1.ebuild 7819 BLAKE2B e55672e361f2e49a4d5a7cb40884fe7e91962051c927b9fdb9b1d4202d54df77f2e75dc6d4bf778b1e8d1eab224a480da6a8375831b3c66c2c6f677701d8f89b SHA512 e94c424793bdcfa1025d1323eeabb3998ff3cb4586d326dddbedfad007fb7b90fe7735cef4897e69c2b2e0c0613a491dcd4a6f9b8632b0883ed240500eb5f3bc -EBUILD wireshark-4.0.4-r1.ebuild 7819 BLAKE2B e55672e361f2e49a4d5a7cb40884fe7e91962051c927b9fdb9b1d4202d54df77f2e75dc6d4bf778b1e8d1eab224a480da6a8375831b3c66c2c6f677701d8f89b SHA512 e94c424793bdcfa1025d1323eeabb3998ff3cb4586d326dddbedfad007fb7b90fe7735cef4897e69c2b2e0c0613a491dcd4a6f9b8632b0883ed240500eb5f3bc -EBUILD wireshark-4.0.5.ebuild 7824 BLAKE2B 3f1e2184258d907246349836c55717dec2bb291bee334f00a310823d4522be149b798f239516f352e2cb9562f55eb934ca46a0f01bb2496a8f897be291bcfd78 SHA512 f9aef31ff2b18347390887f614d3b28e4743179e75ada91251d2f8119041d33d9a6e4b02b8104ab4d61dc1325403066fd93c779a26190104d822a3ebb1614535 -EBUILD wireshark-9999.ebuild 7969 BLAKE2B 46629c629a7afcbac4da00e8a51096bc91db794bca1145f1931899287d5c2e9852f1dc0ba944a54b423f75746f3af3cc08e4f78b770e32bec58483f859a27144 SHA512 ad3875fd3d42932ca26c9bb6b016d3fc0aebc86cce83cdd067668e6077ded8699bd986df21e204975cfd09d7d08716814fd3f415c102b66bb23f45e07ede0fde +EBUILD wireshark-3.6.12-r1.ebuild 7456 BLAKE2B 3b2654658b5af556620cd6a1bbf53dd7f29853e255d75933ed90cea393707d556c1b0179b87e86188fe20555aebc01bdc29e8bd22d65837a749045a1569951e1 SHA512 f289d58b96a89f9f3e0bdf5be1cf9eaac7082ac00d2d98ef7431762eee47049152c6248434b936748aaad2ac89a04f01f1dad658165cc392e8f7b3831aef05a3 +EBUILD wireshark-3.6.13.ebuild 7461 BLAKE2B 3b911e408c6c9c4a11a4d9bf358f4433b9e79dc6157b02be906643fbdf38d1cdb3f94e5d937be90849cac2d34251d0dfb99d062b43dd3961e0e8b0cbf2e4baae SHA512 90150b487e62d70e87c7cd597a27fd77098c11de4e6f9c66fc9a2359a7c9b654764aa5f8633db0530fdd30028f1b86cd63c9b69f532737517a322f3453e0ba53 +EBUILD wireshark-4.0.4-r1.ebuild 7971 BLAKE2B 60d8ff6a50c5af252631dadbe6f97fb6f1e4c3182080c78db8910aee02573c78c65b0477220c6f760fe8e3332bfb6b3c2c3e5b74dd7622463c4cc0140e1dea1f SHA512 07210f6a8c5dca8f26c4c5b32939daf8e59d2a23f8ce5831c4e23ea472d4a6771d3606a235e901508715765fe998d27cc779600b57c4e1abc6cb083e290002e8 +EBUILD wireshark-4.0.5.ebuild 7976 BLAKE2B 9f58e2b9fba8275aa34f69455db02e93a7c652a2713e69c608d150b11423d8bf42586760e81786b6d589b2f48260ea8ad1592c82e5c6fbd554624c8b9e57148e SHA512 116836c1a477aaf9e5f7b85bbd0d51ad524edf83251a4787d55c32403d8481f65ddc71eb26db8d4f015f1b0b352d55c322c417ca463b4c3c30960795fd21a7ab +EBUILD wireshark-9999.ebuild 8121 BLAKE2B 895b7a15a0f9bc3a89fce4340ed38be878588389b9f368cdc94b63ba98bdbb213ca042734edf16d44bb5051c0fb93c23efd3b5d306fc791b710c8d9cebe18289 SHA512 17277123fb310f820750060d66fd80a60e658bbc64fc761085996966da66306628c395f1b25ab7a0774545ee2a9469345d84307b3acc252a35e48d3373defdc0 MISC metadata.xml 5488 BLAKE2B d3d216dbc02421c620a6c7fcb04caede1ce604ad134fb9332dfb6f96ee3a7d39d3c2b14dfbd2e0be757f558ad5cd98f2440a415a9d74668fe482a7c18629e199 SHA512 e31157a17c7907f380248fe530114fea29be570f0bc6f2a15a7a898ace88534dd5b9d15ee8cf22920f8330910a629d035ca9afdde06a6b631479b2843c1d30ba diff --git a/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild deleted file mode 100644 index e037030ee391..000000000000 --- a/net-analyzer/wireshark/wireshark-3.6.11-r1.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) - -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 - SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" - S="${WORKDIR}/${P/_/}" - - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86" -fi - -LICENSE="GPL-2" -SLOT="0/${PV}" -IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" -IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb" -IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt" -IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" -IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - plugin-ifdemo? ( plugins qt5 )" - -RESTRICT="!test? ( test )" - -# bug #753062 for speexdsp -RDEPEND="acct-group/pcap - >=dev-libs/glib-2.38:2 - >=net-dns/c-ares-1.5:= - dev-libs/libgcrypt:= - 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:= ) - 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 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - 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:= ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd:= )" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS} - dev-lang/perl - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) - test? ( - $(python_gen_any_dep ' - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ') - )" -RDEPEND="${RDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark )" - -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_configure() { - local mycmakeargs - - # 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 qt5 ; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - python_setup - - mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) - - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') - $(usex qt5 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 qt5) - -DDISABLE_WERROR=ON - -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) - -DENABLE_LTO=$(usex lto) - -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=$(usex plugin-ifdemo) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -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() { - 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 ws_diag_control.h ws_symbol_export.h \ - "${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 qt5 ; 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 image/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 image/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-3.6.12-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild index e037030ee391..0079012cf99c 100644 --- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -32,7 +32,9 @@ IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) plugin-ifdemo? ( plugins qt5 )" -RESTRICT="!test? ( test )" +# 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 diff --git a/net-analyzer/wireshark/wireshark-3.6.13.ebuild b/net-analyzer/wireshark/wireshark-3.6.13.ebuild index 0e8916b20943..1e4730af8694 100644 --- a/net-analyzer/wireshark/wireshark-3.6.13.ebuild +++ b/net-analyzer/wireshark/wireshark-3.6.13.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -32,7 +32,9 @@ IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) plugin-ifdemo? ( plugins qt5 )" -RESTRICT="!test? ( test )" +# 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 diff --git a/net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild b/net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild deleted file mode 100644 index b80599dfacbf..000000000000 --- a/net-analyzer/wireshark/wireshark-4.0.3-r1.ebuild +++ /dev/null @@ -1,312 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) - -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 - SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" - S="${WORKDIR}/${P/_/}" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 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 lto 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:= ) - 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 - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - doc? ( - app-doc/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 ) -" - -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_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 - - 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) - -DENABLE_LTO=$(usex lto) - -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 -} diff --git a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild index b80599dfacbf..6039d7e9573b 100644 --- a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake @@ -35,7 +35,9 @@ REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) " -RESTRICT="!test? ( test )" +# 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=" diff --git a/net-analyzer/wireshark/wireshark-4.0.5.ebuild b/net-analyzer/wireshark/wireshark-4.0.5.ebuild index f22f7cd62c6b..36658422a00e 100644 --- a/net-analyzer/wireshark/wireshark-4.0.5.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.5.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake @@ -35,7 +35,9 @@ REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) " -RESTRICT="!test? ( test )" +# 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=" diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 62593372fe05..2c6116786ce7 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -35,7 +35,9 @@ REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) " -RESTRICT="!test? ( test )" +# 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=" -- cgit v1.2.3