commit: c5a50ef856f3b1e311eb84cf7d29665493935d61
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 8 20:41:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 8 20:42:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a50ef8
net-analyzer/wireshark: add 4.0.0, drop 4.0.0_rc2
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 2 +-
.../{wireshark-4.0.0_rc2.ebuild => wireshark-4.0.0.ebuild} | 7 ++++++-
net-analyzer/wireshark/wireshark-9999.ebuild | 7 ++++++-
profiles/arch/ia64/package.use.mask | 3 ++-
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 4bdd30fffb51..c1f87360fc7f 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,4 +2,4 @@ DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B
3e08d01f2d89f5ddd74c4e2215e6852f30
DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B
3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd
SHA512
4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B
cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1
SHA512
c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B
8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db
SHA512
c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
-DIST wireshark-4.0.0rc2.tar.xz 41318448 BLAKE2B
e4f3a9aca102a2f9fa519e429ad262f24df6a67fbd6debf9a9320ae0eb1e8753f65783ca19b5e4b224cf7af368af2a2cedc8065c7cc97216b4ced224fa9ffcaf
SHA512
524722f7093af3d9cbb1e355fdeafb653917eabfb1d8d7d7c480a35853b0a777c8f5043d367955d01b7ca16b3f90569dcbafc1025bbeeb57a29ff486066840b8
+DIST wireshark-4.0.0.tar.xz 41323336 BLAKE2B
a3e619dae784d28ed659acf6b2f4710e320806ebbf7c700370558ae81eb0cfdd68ec6cce4c8ae90f43c449e118b7993a78d02bbb1dc7a259a437d34ef6299d60
SHA512
d16b67bacca479af419f47e000800bbc33098a00cdb56c789e6c0f354fbd4f13c3d25c496239a8836c4e5754af2e36d4baf5e8ae55eae71f80c93630b78128bc
diff --git a/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
b/net-analyzer/wireshark/wireshark-4.0.0.ebuild
similarity index 97%
rename from net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
rename to net-analyzer/wireshark/wireshark-4.0.0.ebuild
index 9110abbac9e4..04f139078c66 100644
--- a/net-analyzer/wireshark/wireshark-4.0.0_rc2.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.0.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
acct-group/pcap
>=dev-libs/glib-2.50.0:2
dev-libs/libpcre2
- >=net-dns/c-ares-1.14.0:=
+ >=net-dns/c-ares-1.13.0:=
>=dev-libs/libgcrypt-1.8.0:=
media-libs/speexdsp
bcg729? ( media-libs/bcg729 )
@@ -222,6 +222,11 @@ 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 \
diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild
b/net-analyzer/wireshark/wireshark-9999.ebuild
index 9110abbac9e4..04f139078c66 100644
--- a/net-analyzer/wireshark/wireshark-9999.ebuild
+++ b/net-analyzer/wireshark/wireshark-9999.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
acct-group/pcap
>=dev-libs/glib-2.50.0:2
dev-libs/libpcre2
- >=net-dns/c-ares-1.14.0:=
+ >=net-dns/c-ares-1.13.0:=
>=dev-libs/libgcrypt-1.8.0:=
media-libs/speexdsp
bcg729? ( media-libs/bcg729 )
@@ -222,6 +222,11 @@ 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 \
diff --git a/profiles/arch/ia64/package.use.mask
b/profiles/arch/ia64/package.use.mask
index db6b6881c340..d800ea69b950 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -135,7 +135,8 @@ media-libs/libsdl2 fcitx4
# Sergei Trofimovich <sly...@gentoo.org> (2020-09-18)
# media-libs/libilbc is not ported to ia64
-net-analyzer/wireshark ilbc
+# nor is Qt
+net-analyzer/wireshark gui ilbc
# Matt Turner <matts...@gentoo.org> (2020-08-11)
# No drivers on this architecture support Vulkan
