diff options
Diffstat (limited to 'net-analyzer/wireshark')
-rw-r--r-- | net-analyzer/wireshark/Manifest | 6 | ||||
-rw-r--r-- | net-analyzer/wireshark/metadata.xml | 1 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild (renamed from net-analyzer/wireshark/wireshark-4.0.0.ebuild) | 26 | ||||
-rw-r--r-- | net-analyzer/wireshark/wireshark-9999.ebuild | 26 |
4 files changed, 40 insertions, 19 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 82bea8574e84..baaddeafefa3 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -4,6 +4,6 @@ AUX wireshark-9999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361f DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B 8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db SHA512 c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a DIST wireshark-4.0.0.tar.xz 41323336 BLAKE2B a3e619dae784d28ed659acf6b2f4710e320806ebbf7c700370558ae81eb0cfdd68ec6cce4c8ae90f43c449e118b7993a78d02bbb1dc7a259a437d34ef6299d60 SHA512 d16b67bacca479af419f47e000800bbc33098a00cdb56c789e6c0f354fbd4f13c3d25c496239a8836c4e5754af2e36d4baf5e8ae55eae71f80c93630b78128bc EBUILD wireshark-3.6.8.ebuild 7285 BLAKE2B e3a3d761ccf7b6ab9ce27d427f78c39f9866c340cbc7c9ae04ae8df4fb650ac1b59d9d3377bbb1fdbf001afb408ac920bb7dda93a0b8e6fdd89daf86a0ac5ac1 SHA512 641e5d557c9c32cad48d8051e560852ed962d79a51dee1a292e5893ac73effc7897b43726fd4399aa2fb07b11f37a6b0d0c63038e9ac4f805fe7d548123e0efd -EBUILD wireshark-4.0.0.ebuild 7895 BLAKE2B 97cf71f2f275ba7bdebdaed1e4320005e8f2287b0a1605102c5e34ae9119234a227f1c2f2924170e97d04d8dde6d580437f3cbb0e210fc688906cf0fbed4ff5b SHA512 9e0406fa12878226489dfa923489263d7a3fd965f2985e29156d45765e0f41f6a7531677469b7bdb4e7aa84d31de0bbaae353c21b325997c9b4210961cf8aecd -EBUILD wireshark-9999.ebuild 7895 BLAKE2B 97cf71f2f275ba7bdebdaed1e4320005e8f2287b0a1605102c5e34ae9119234a227f1c2f2924170e97d04d8dde6d580437f3cbb0e210fc688906cf0fbed4ff5b SHA512 9e0406fa12878226489dfa923489263d7a3fd965f2985e29156d45765e0f41f6a7531677469b7bdb4e7aa84d31de0bbaae353c21b325997c9b4210961cf8aecd -MISC metadata.xml 5459 BLAKE2B b70c4a0bad70faa4307870203662510479fbdad88e526b3cef966483406918a53c10fd3c134640e5b7f9280140a3ddf63c5ab50ec12b681233cb746dc4ac17bb SHA512 506c668b0fc6d0d1a2e4b6a09fef39c92fd4a9c03ed51968156c184a47c5ea14af4d794c17751edf58302c889e4278d7ab1b5b0ecdfa7ae76d90b7206af11069 +EBUILD wireshark-4.0.0-r2.ebuild 7956 BLAKE2B 6750771da48fece064650a04123d9969152a00d43bf864ae1cd020202844b44e912406bb946366e5c112f7f6979df81b042cca228f1745345606731233427109 SHA512 da835234705cc2f168697cc21fd309e044595aa56fce92dc1feedf31719c5cfb44a238bbe41935c76c870c9a581bd6c55f4991462cd20a992501c29d3fa01344 +EBUILD wireshark-9999.ebuild 7956 BLAKE2B 6750771da48fece064650a04123d9969152a00d43bf864ae1cd020202844b44e912406bb946366e5c112f7f6979df81b042cca228f1745345606731233427109 SHA512 da835234705cc2f168697cc21fd309e044595aa56fce92dc1feedf31719c5cfb44a238bbe41935c76c870c9a581bd6c55f4991462cd20a992501c29d3fa01344 +MISC metadata.xml 5539 BLAKE2B 4e97a3917fa442bab7f6afcb659091ed711c6fabda61fd9a76e20626cb721c3256731a185dc74c99a74579172440031afd0a35c22f20885cf4f74078df1a434d SHA512 ff1bea7805c79be1e9db765a92cf3b83449d2938cea59a5ddad734814b071520cf749527ca62ed1f2432516fe8378cc8f527b6fd57c29a8d0af32e4611df8502 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 @@ <flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag> <flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag> <flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag> + <flag name="wifi">Install wifidump, to dump and analyse 802.11 traffic</flag> </use> <upstream> <remote-id type="github">wireshark/wireshark</remote-id> diff --git a/net-analyzer/wireshark/wireshark-4.0.0.ebuild b/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild index 04f139078c66..08b136066287 100644 --- a/net-analyzer/wireshark/wireshark-4.0.0.ebuild +++ b/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild @@ -27,16 +27,16 @@ 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 plugin-ifdemo +pcap qt6 +randpkt" +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} ) - plugin-ifdemo? ( plugins )" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" RESTRICT="!test? ( test )" -# TODO: wifidump/libssh automagic? # bug #753062 for speexdsp RDEPEND=" acct-group/pcap @@ -47,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:= ) @@ -69,6 +69,7 @@ RDEPEND=" ) !qt6? ( dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 @@ -82,10 +83,18 @@ 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:= ) " -DEPEND="${RDEPEND}" +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=" @@ -207,11 +216,12 @@ src_configure() { -DENABLE_OPUS=$(usex opus) -DENABLE_PCAP=$(usex pcap) -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) + -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) ) diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 04f139078c66..08b136066287 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -27,16 +27,16 @@ 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 plugin-ifdemo +pcap qt6 +randpkt" +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} ) - plugin-ifdemo? ( plugins )" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" RESTRICT="!test? ( test )" -# TODO: wifidump/libssh automagic? # bug #753062 for speexdsp RDEPEND=" acct-group/pcap @@ -47,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:= ) @@ -69,6 +69,7 @@ RDEPEND=" ) !qt6? ( dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 @@ -82,10 +83,18 @@ 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:= ) " -DEPEND="${RDEPEND}" +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=" @@ -207,11 +216,12 @@ src_configure() { -DENABLE_OPUS=$(usex opus) -DENABLE_PCAP=$(usex pcap) -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) + -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) ) |