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 F2D57158094 for ; Mon, 10 Oct 2022 16:18:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C147E08EB; Mon, 10 Oct 2022 16:18:59 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA827E08EB for ; Mon, 10 Oct 2022 16:18:58 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14751341005 for ; Mon, 10 Oct 2022 16:18:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95577607 for ; Mon, 10 Oct 2022 16:18:56 +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: <1665418727.1cddeb3f7e1449529d4f979304ab9e20b979403b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/wireshark/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/wireshark/metadata.xml net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild net-analyzer/wireshark/wireshark-9999.ebuild X-VCS-Directories: net-analyzer/wireshark/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1cddeb3f7e1449529d4f979304ab9e20b979403b X-VCS-Branch: master Date: Mon, 10 Oct 2022 16:18:56 +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: 0c94bceb-8d0a-4e81-9bbc-d0334df725dc X-Archives-Hash: 9f3c8d40de688b4e7cd87c3c5b14a2ef commit: 1cddeb3f7e1449529d4f979304ab9e20b979403b Author: Sam James gentoo org> AuthorDate: Mon Oct 10 16:18:37 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 10 16:18:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cddeb3f net-analyzer/wireshark: fix automagic libssh dep for wifidump Signed-off-by: Sam James gentoo.org> net-analyzer/wireshark/metadata.xml | 1 + net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild | 5 +++-- net-analyzer/wireshark/wireshark-9999.ebuild | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index ceb09bd64731..bd841198d5ad 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -66,6 +66,7 @@ Install tfshark, a terminal-based version of the FileShark capability Install tshark, to dump and analyzer network traffic from the command line Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file + Install wifidump, to dump and analyse 802.11 traffic wireshark/wireshark diff --git a/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild b/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild index 96b63b7190c2..f402d1fc68c0 100644 --- a/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.0-r1.ebuild @@ -29,7 +29,7 @@ IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmo 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 zlib +zstd" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) @@ -37,7 +37,6 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" -# TODO: wifidump/libssh automagic? # bug #753062 for speexdsp RDEPEND=" acct-group/pcap @@ -84,6 +83,7 @@ RDEPEND=" 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:= ) " @@ -219,6 +219,7 @@ src_configure() { -DENABLE_SMI=$(usex smi) -DENABLE_SNAPPY=$(usex snappy) -DENABLE_SPANDSP=$(usex spandsp) + -DBUILD_wifidump=$(usex wifi) -DENABLE_ZLIB=$(usex zlib) -DENABLE_ZSTD=$(usex zstd) ) diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index bf6499163094..f402d1fc68c0 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -29,7 +29,7 @@ IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmo 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 zlib +zstd" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) @@ -37,7 +37,6 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" -# TODO: wifidump/libssh automagic? # bug #753062 for speexdsp RDEPEND=" acct-group/pcap @@ -48,7 +47,7 @@ RDEPEND=" media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) - ciscodump? ( >=net-libs/libssh-0.6 ) + ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) @@ -84,6 +83,7 @@ RDEPEND=" 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:= ) " @@ -219,6 +219,7 @@ src_configure() { -DENABLE_SMI=$(usex smi) -DENABLE_SNAPPY=$(usex snappy) -DENABLE_SPANDSP=$(usex spandsp) + -DBUILD_wifidump=$(usex wifi) -DENABLE_ZLIB=$(usex zlib) -DENABLE_ZSTD=$(usex zstd) )