From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 126F2158041 for ; Thu, 4 Apr 2024 02:45:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3FA9E2A76; Thu, 4 Apr 2024 02:45:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CED7EE2A76 for ; Thu, 4 Apr 2024 02:45:05 +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 E376B34312F for ; Thu, 4 Apr 2024 02:45:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AB6F14C3 for ; Thu, 4 Apr 2024 02:45:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1712197622.0050375f3b5870a1db7ac065f3a3395e043d748e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/Manifest net-analyzer/wireshark/metadata.xml net-analyzer/wireshark/wireshark-4.0.14.ebuild net-analyzer/wireshark/wireshark-4.1.0.ebuild net-analyzer/wireshark/wireshark-4.2.4.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0050375f3b5870a1db7ac065f3a3395e043d748e X-VCS-Branch: master Date: Thu, 4 Apr 2024 02:45:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d723a4da-b1f9-478d-adc0-d59648524073 X-Archives-Hash: 5891acb36ed3f15ebe83c3e28c9f48b2 commit: 0050375f3b5870a1db7ac065f3a3395e043d748e Author: Christopher Fore posteo net> AuthorDate: Thu Apr 4 01:28:01 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 4 02:27:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0050375f net-analyzer/wireshark: add 4.0.14, 4.2.4, drop 4.1.0 - 4.0.14 security bump, also add 4.2.4 - New USE flag for 4.2.x, http3 - Unkeyword 4.2.4 to match net-libs/http3 - Drop 4.1.0 since it was a dev release Bug: https://bugs.gentoo.org/921528 Signed-off-by: Christopher Fore posteo.net> Closes: https://github.com/gentoo/gentoo/pull/34685 Signed-off-by: Sam James gentoo.org> net-analyzer/wireshark/Manifest | 6 ++++-- net-analyzer/wireshark/metadata.xml | 1 + ...eshark-4.1.0.ebuild => wireshark-4.0.14.ebuild} | 24 +++++++++++----------- ...reshark-4.1.0.ebuild => wireshark-4.2.4.ebuild} | 11 +++++----- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index d6827f8a458e..3959fedc5576 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,4 +1,6 @@ DIST wireshark-4.0.11-signatures.txt 2521 BLAKE2B 3fce906f2050fb990d80b912919c46d0e6e087c66a36bc18e8c57fa19d7ef7e966a26842770370e1211c4e4644deed31091ec929c53c80bfcdb1e472b149bd7c SHA512 d9b15d14b8e061bf2f4aaf0121c295db1992b7cbbb56e67b48fff4110e897f4f0d40304bdeaced2031bc802796a6f3ea7ba62a730f82d7469658924313f301a4 DIST wireshark-4.0.11.tar.xz 43153680 BLAKE2B 1a90b9c20773758dbcfad85ea9a5c180e846307701ce75a471699544507b6dcf7cab611b5d71056d68ec1646a951729d7df416ef1a9a473bf96d9bf5a7066ebc SHA512 c027b279f9bc761c5c701131df9e57d3f2568129f63c919cd744f6626843eb0e000caebc3e01c9a10eedad35874c01c880d2c736b62f8e841da35c375a37c53f -DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34 SHA512 ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a -DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627 SHA512 d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0 +DIST wireshark-4.0.14-signatures.txt 2521 BLAKE2B 371bf67dc0f36fe46848fef77194e221879db1ff422420949ba0fce4280fb9ee84ca18363046a0ce6fd1e7879ba336c1c16c9bdea13b8d14f14137f59d76212e SHA512 f084d454d1756be35e1e1ed4636cb994bd9c49bd4666d355ce3719d526bf71f9e3cc929b4dca311231d43b046711b223a379c6d915aa260966f0b7bab8a8e352 +DIST wireshark-4.0.14.tar.xz 43186416 BLAKE2B 1b67079cc0f9cdc33ce7e2fce0b49deb4d3016db79099a3bd2003099477a3bac43d4e31d4820c72a92135cca14572ac46406f41e477d794a63e96a6329d30199 SHA512 e88a4b2f41489f3ffe82c4c79c9c89ec521d931a716a5dacaede28c03b0625a0603935e723d5d869f801cfcab440a7d2f310c910707e15f9b0bca0c131398d73 +DIST wireshark-4.2.4-signatures.txt 2706 BLAKE2B 169c7eea2d89f4eedc58e833512cf813dfe76cbb76eb505d47153c1dc55f6d838b7a0187fdee4dae214ea04a3e062dd13f64df460fb16c042a889aac28e4428e SHA512 273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9 +DIST wireshark-4.2.4.tar.xz 44986232 BLAKE2B 03806a167a4b055409fadbc54ba338c9d2790df3ac2b9fb547c640c67d7bee6a3f8f19d30549228e494cabf8d303cef42ff098a9e1f45b092589643e568632f5 SHA512 963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6 diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index c9327b01fd97..50ce497801f7 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -36,6 +36,7 @@ Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers Install dumpcap, to dump network traffic from inside wireshark Install editcap, to edit and/or translate the format of capture files + Install net-libs/nghttp3 for enhanced HTTP3 analysis Build with iLBC support in RTP Player using media-libs/libilbc Use dev-libs/libxml2 for handling XML configuration in dissectors Use dev-libs/libmaxminddb for IP address geolocation diff --git a/net-analyzer/wireshark/wireshark-4.1.0.ebuild b/net-analyzer/wireshark/wireshark-4.0.14.ebuild similarity index 93% copy from net-analyzer/wireshark/wireshark-4.1.0.ebuild copy to net-analyzer/wireshark/wireshark-4.0.14.ebuild index 17400f26949a..808132d6248f 100644 --- a/net-analyzer/wireshark/wireshark-4.1.0.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.14.ebuild @@ -4,10 +4,9 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) -# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..11} ) -inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake +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/" @@ -23,10 +22,9 @@ else SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" S="${WORKDIR}/${P/_/}" - # 4.1.x is an experimental release until 4.2 - #if [[ ${PV} != *_rc* ]] ; then - # KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86" - #fi + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86" + fi fi LICENSE="GPL-2" @@ -41,7 +39,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=" @@ -140,6 +140,7 @@ fi PATCHES=( "${FILESDIR}"/${PN}-2.6.0-redhat.patch + "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch ) python_check_deps() { @@ -243,7 +244,6 @@ src_configure() { # 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) @@ -324,6 +324,8 @@ src_install() { if [[ -d "${ED}"/usr/share/appdata ]] ; then rm -r "${ED}"/usr/share/appdata || die fi + + readme.gentoo_create_doc } pkg_postinst() { @@ -338,7 +340,5 @@ pkg_postinst() { "${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." + readme.gentoo_print_elog } diff --git a/net-analyzer/wireshark/wireshark-4.1.0.ebuild b/net-analyzer/wireshark/wireshark-4.2.4.ebuild similarity index 97% rename from net-analyzer/wireshark/wireshark-4.1.0.ebuild rename to net-analyzer/wireshark/wireshark-4.2.4.ebuild index 17400f26949a..85a551d53184 100644 --- a/net-analyzer/wireshark/wireshark-4.1.0.ebuild +++ b/net-analyzer/wireshark/wireshark-4.2.4.ebuild @@ -23,16 +23,15 @@ else SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" S="${WORKDIR}/${P/_/}" - # 4.1.x is an experimental release until 4.2 - #if [[ ${PV} != *_rc* ]] ; then - # KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86" - #fi + 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 ilbc kerberos libxml2 lua lz4 maxminddb" +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" @@ -56,6 +55,7 @@ RDEPEND=" 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 ) @@ -248,6 +248,7 @@ src_configure() { -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)