commit: c98d6f0172fd022899ce5d89e8d6c9fa0c70cad6 Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Tue Apr 8 08:38:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Apr 8 09:01:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c98d6f01
net-analyzer/wireshark: revert to old zlib due to conflict with minizip-ng Discussion of bug #953390 has revealed that Wireshark's minizip-ng feature currently relies on it being built with minizip compatibility, which is unfortunately not easily possible at the moment. Technically this could be solved by linking both zlib[minizip] and zlib-ng, but down that path lies madness, so just consistently revert to zlib/minizip. Closes: https://bugs.gentoo.org/953390 Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Signed-off-by: Sam James <sam <AT> gentoo.org> .../{wireshark-4.4.5.ebuild => wireshark-4.4.5-r1.ebuild} | 9 +++++---- net-analyzer/wireshark/wireshark-9999.ebuild | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/net-analyzer/wireshark/wireshark-4.4.5.ebuild b/net-analyzer/wireshark/wireshark-4.4.5-r1.ebuild similarity index 98% rename from net-analyzer/wireshark/wireshark-4.4.5.ebuild rename to net-analyzer/wireshark/wireshark-4.4.5-r1.ebuild index 556d77b3d23e..f18d49f4d352 100644 --- a/net-analyzer/wireshark/wireshark-4.4.5.ebuild +++ b/net-analyzer/wireshark/wireshark-4.4.5-r1.ebuild @@ -61,7 +61,7 @@ RDEPEND=" lua? ( ${LUA_DEPS} ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) - minizip? ( sys-libs/minizip-ng ) + minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) @@ -80,7 +80,7 @@ RDEPEND=" sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) - zlib? ( sys-libs/zlib-ng ) + zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) " DEPEND=" @@ -217,6 +217,7 @@ src_configure() { -DLUA_FIND_VERSIONS="${ELUA#lua}" -DENABLE_LZ4=$(usex lz4) -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_MINIZIPNG=OFF -DENABLE_NETLINK=$(usex netlink) -DENABLE_NGHTTP2=$(usex http2) -DENABLE_NGHTTP3=$(usex http3) @@ -229,8 +230,8 @@ src_configure() { -DENABLE_SNAPPY=$(usex snappy) -DENABLE_SPANDSP=$(usex spandsp) -DBUILD_wifidump=$(usex wifi) - -DENABLE_ZLIB=OFF - -DENABLE_ZLIBNG=$(usex zlib) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZLIBNG=OFF -DENABLE_ZSTD=$(usex zstd) ) diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index a35aa8ff912d..a4ec92a36db3 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -61,7 +61,7 @@ RDEPEND=" lua? ( ${LUA_DEPS} ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) - minizip? ( sys-libs/minizip-ng ) + minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) @@ -80,7 +80,7 @@ RDEPEND=" sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) - zlib? ( sys-libs/zlib-ng ) + zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) " DEPEND=" @@ -215,6 +215,7 @@ src_configure() { -DLUA_FIND_VERSIONS="${ELUA#lua}" -DENABLE_LZ4=$(usex lz4) -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_MINIZIPNG=OFF -DENABLE_NETLINK=$(usex netlink) -DENABLE_NGHTTP2=$(usex http2) -DENABLE_NGHTTP3=$(usex http3) @@ -227,8 +228,8 @@ src_configure() { -DENABLE_SNAPPY=$(usex snappy) -DENABLE_SPANDSP=$(usex spandsp) -DBUILD_wifidump=$(usex wifi) - -DENABLE_ZLIB=OFF - -DENABLE_ZLIBNG=$(usex zlib) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZLIBNG=OFF -DENABLE_ZSTD=$(usex zstd) )
