commit:     11d357718ec192403193260fe033e93973c3aa5f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 06:29:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 06:30:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d35771

Revert "net-analyzer/wireshark: drop 3.4.10, 3.4.11, 3.6.0-r1"

This reverts commit c2f163b2438b412dffa637ae892000c2913d546f.

Needed by stable libvirt.

Bug: https://bugs.gentoo.org/830343
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/wireshark/Manifest                    |   3 +
 .../files/wireshark-3.6.0-fix-no-tshark.patch      |  32 +++
 net-analyzer/wireshark/wireshark-3.4.10.ebuild     | 283 ++++++++++++++++++++
 net-analyzer/wireshark/wireshark-3.4.11.ebuild     | 285 +++++++++++++++++++++
 net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild   | 272 ++++++++++++++++++++
 5 files changed, 875 insertions(+)

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index b3b50a90c00b..df169bc81082 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,5 @@
+DIST wireshark-3.4.10.tar.xz 32344804 BLAKE2B 
fe2ececd4a02530176725d62524fe000816f7f12dd58082d4966dfe7e5e0b90be669ed216c5a664f6496e74cb5dc5e4fb5beeaf513570ae503e3181692635563
 SHA512 
8a57d5279e9f3821b6ba3dceba89ad77fa8d0cf8cf421eab4d32e039497b429444c147b31abebd65b11b0b3ff73cf10d484480bcf0aedb206011819df8ab0257
+DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 
3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd
 SHA512 
cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
+DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 
17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7
 SHA512 
7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
 DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B 
49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0
 SHA512 
8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
 DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B 
585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156
 SHA512 
cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070

diff --git a/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch 
b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
new file mode 100644
index 000000000000..dd497c51391c
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-3.6.0-fix-no-tshark.patch
@@ -0,0 +1,32 @@
+https://gitlab.com/wireshark/wireshark/-/commit/411df7ca34027d87fe6ecc06a07c816a401c4cb5
+https://gitlab.com/wireshark/wireshark/-/issues/17766
+https://bugs.gentoo.org/823720
+
+From: Gerald Combs <ger...@wireshark.org>
+Date: Mon, 6 Dec 2021 19:01:10 -0800
+Subject: [PATCH] CMake: Remove the update_tools_help target.
+
+Remove the update_tools_help target. Despite the comment, the weekly
+update job doesn't use it, we don't have targets for our other update
+scripts, and it currently causes issues if BUILD_tshark is disabled.
+Fixes #17766.
+--- a/docbook/CMakeLists.txt
++++ b/docbook/CMakeLists.txt
+@@ -33,16 +33,6 @@ set(COMMON_GRAPHICS
+ 
+ set(GUIDE_INSTALL_DIRS)
+ 
+-# This is automatically updated each week. You probably don't need to run it
+-# or depend on it.
+-add_custom_target(update_tools_help
+-      COMMAND ${CMAKE_COMMAND} -E env PYTHONIOENCODING=UTF-8
+-              ${PYTHON_EXECUTABLE} 
${CMAKE_SOURCE_DIR}/tools/update-tools-help.py
+-              --program-path $<TARGET_FILE_DIR:tshark>
+-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-)
+-set_docbook_target_properties(update_tools_help)
+-
+ set(WSUG_TITLE "Wireshark User's Guide")
+ 
+ set(WSUG_FILES
+GitLab

diff --git a/net-analyzer/wireshark/wireshark-3.4.10.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
new file mode 100644
index 000000000000..c3e28e4115a4
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.10.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/";
+
+if [[ ${PV} == *9999* ]] ; then
+       EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
+       inherit git-r3
+else
+       
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
+       S="${WORKDIR}/${P/_/}"
+
+       KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+
+RESTRICT="!test? ( test )"
+
+# bug #753062 for speexdsp
+CDEPEND="
+       acct-group/pcap
+       >=dev-libs/glib-2.32:2
+       >=net-dns/c-ares-1.5:=
+       dev-libs/libgcrypt:=
+       media-libs/speexdsp
+       bcg729? ( media-libs/bcg729 )
+       brotli? ( app-arch/brotli:= )
+       ciscodump? ( >=net-libs/libssh-0.6 )
+       filecaps? ( sys-libs/libcap )
+       http2? ( net-libs/nghttp2:= )
+       ilbc? ( media-libs/libilbc )
+       kerberos? ( virtual/krb5 )
+       libxml2? ( dev-libs/libxml2 )
+       lua? ( ${LUA_DEPS} )
+       lz4? ( app-arch/lz4:= )
+       maxminddb? ( dev-libs/libmaxminddb:= )
+       minizip? ( sys-libs/zlib[minizip] )
+       netlink? ( dev-libs/libnl:3 )
+       opus? ( media-libs/opus )
+       pcap? ( net-libs/libpcap )
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtmultimedia:5
+               dev-qt/qtprintsupport:5
+               dev-qt/qtwidgets:5
+               x11-misc/xdg-utils
+       )
+       sbc? ( media-libs/sbc )
+       sdjournal? ( sys-apps/systemd )
+       smi? ( net-libs/libsmi )
+       snappy? ( app-arch/snappy )
+       spandsp? ( media-libs/spandsp )
+       sshdump? ( >=net-libs/libssh-0.6 )
+       ssl? ( net-libs/gnutls:= )
+       zlib? ( sys-libs/zlib )
+       zstd? ( app-arch/zstd:= )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+       ${CDEPEND}
+       ${PYTHON_DEPS}
+"
+BDEPEND="
+       dev-lang/perl
+       sys-devel/bison
+       sys-devel/flex
+       virtual/pkgconfig
+       doc? (
+               app-doc/doxygen
+               dev-ruby/asciidoctor
+       )
+       qt5? (
+               dev-qt/linguist-tools:5
+       )
+       test? (
+               dev-python/pytest
+               dev-python/pytest-xdist
+       )
+"
+RDEPEND="
+       ${CDEPEND}
+       qt5? ( virtual/freedesktop-icon-theme )
+       selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+       lua? ( ${LUA_REQUIRED_USE} )
+       plugin-ifdemo? ( plugins )
+"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+       "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+       "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+       use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+       local mycmakeargs
+
+       # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+       # --with-ssl to ./configure. (Mimics code from acinclude.m4).
+       if use kerberos; then
+               case $(krb5-config --libs) in
+                       *-lcrypto*)
+                               ewarn "Kerberos was built with ssl support: 
linkage with openssl is enabled."
+                               ewarn "Note there are annoying license 
incompatibilities between the OpenSSL"
+                               ewarn "license and the GPL, so do your check 
before distributing such package."
+                               mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+                               ;;
+               esac
+       fi
+
+       if use qt5; then
+               export QT_MIN_VERSION=5.3.0
+               append-cxxflags -fPIC -DPIC
+       fi
+
+       python_setup
+
+       mycmakeargs+=(
+               $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+               $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+               $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+               $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+               -DBUILD_androiddump=$(usex androiddump)
+               -DBUILD_capinfos=$(usex capinfos)
+               -DBUILD_captype=$(usex captype)
+               -DBUILD_ciscodump=$(usex ciscodump)
+               -DBUILD_dftest=$(usex dftest)
+               -DBUILD_dpauxmon=$(usex dpauxmon)
+               -DBUILD_dumpcap=$(usex dumpcap)
+               -DBUILD_editcap=$(usex editcap)
+               -DBUILD_mergecap=$(usex mergecap)
+               -DBUILD_mmdbresolve=$(usex maxminddb)
+               -DBUILD_randpkt=$(usex randpkt)
+               -DBUILD_randpktdump=$(usex randpktdump)
+               -DBUILD_reordercap=$(usex reordercap)
+               -DBUILD_sdjournal=$(usex sdjournal)
+               -DBUILD_sharkd=$(usex sharkd)
+               -DBUILD_sshdump=$(usex sshdump)
+               -DBUILD_text2pcap=$(usex text2pcap)
+               -DBUILD_tfshark=$(usex tfshark)
+               -DBUILD_tshark=$(usex tshark)
+               -DBUILD_udpdump=$(usex udpdump)
+               -DBUILD_wireshark=$(usex qt5)
+               -DDISABLE_WERROR=yes
+               -DENABLE_BCG729=$(usex bcg729)
+               -DENABLE_BROTLI=$(usex brotli)
+               -DENABLE_CAP=$(usex filecaps caps)
+               -DENABLE_GNUTLS=$(usex ssl)
+               -DENABLE_ILBC=$(usex ilbc)
+               -DENABLE_KERBEROS=$(usex kerberos)
+               -DENABLE_LIBXML2=$(usex libxml2)
+               -DENABLE_LTO=$(usex lto)
+               -DENABLE_LUA=$(usex lua)
+               -DENABLE_LZ4=$(usex lz4)
+               -DENABLE_MINIZIP=$(usex minizip)
+               -DENABLE_NETLINK=$(usex netlink)
+               -DENABLE_NGHTTP2=$(usex http2)
+               -DENABLE_OPUS=$(usex opus)
+               -DENABLE_PCAP=$(usex pcap)
+               -DENABLE_PLUGINS=$(usex plugins)
+               -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+               -DENABLE_SBC=$(usex sbc)
+               -DENABLE_SMI=$(usex smi)
+               -DENABLE_SNAPPY=$(usex snappy)
+               -DENABLE_SPANDSP=$(usex spandsp)
+               -DENABLE_ZLIB=$(usex zlib)
+               -DENABLE_ZSTD=$(usex zstd)
+       )
+
+       cmake_src_configure
+}
+
+src_test() {
+       cmake_build test-programs
+
+       myctestargs=(
+               --disable-capture
+               --skip-missing-programs=all
+               --verbose
+
+               # Skip known failing tests
+               -E "(suite_decryption|suite_extcaps|suite_nameres)"
+       )
+
+       cmake_src_test
+}
+
+src_install() {
+       cmake_src_install
+
+       # FAQ is not required as is installed from help/faq.txt
+       dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+       # install headers
+       insinto /usr/include/wireshark
+       doins ws_diag_control.h ws_symbol_export.h \
+               "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+       local dir dirs=(
+               epan
+               epan/crypt
+               epan/dfilter
+               epan/dissectors
+               epan/ftypes
+               epan/wmem
+               wiretap
+               wsutil
+       )
+
+       for dir in "${dirs[@]}" ; do
+               insinto /usr/include/wireshark/${dir}
+               doins ${dir}/*.h
+       done
+
+       #with the above this really shouldn't be needed, but things may be 
looking
+       # in wiretap/ instead of wireshark/wiretap/
+       insinto /usr/include/wiretap
+       doins wiretap/wtap.h
+
+       if use qt5; then
+               local s
+               for s in 16 32 48 64 128 256 512 1024; do
+                       insinto /usr/share/icons/hicolor/${s}x${s}/apps
+                       newins image/wsicon${s}.png wireshark.png
+               done
+               for s in 16 24 32 48 64 128 256 ; do
+                       insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+                       newins image/WiresharkDoc-${s}.png 
application-vnd.tcpdump.pcap.png
+               done
+       fi
+
+       if [[ -d "${ED}"/usr/share/appdata ]]; then
+               rm -r "${ED}"/usr/share/appdata || die
+       fi
+}
+
+pkg_postinst() {
+       xdg_desktop_database_update
+       xdg_icon_cache_update
+       xdg_mimeinfo_database_update
+
+       # Add group for users allowed to sniff.
+       chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+       if use dumpcap && use pcap; then
+               fcaps -o 0 -g pcap -m 4710 -M 0710 \
+                       cap_dac_read_search,cap_net_raw,cap_net_admin \
+                       "${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."
+}
+
+pkg_postrm() {
+       xdg_desktop_database_update
+       xdg_icon_cache_update
+       xdg_mimeinfo_database_update
+}

diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild 
b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
new file mode 100644
index 000000000000..d1c09690a523
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/";
+
+if [[ ${PV} == *9999* ]] ; then
+       EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
+       inherit git-r3
+else
+       
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
+       S="${WORKDIR}/${P/_/}"
+
+       KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+
+RESTRICT="!test? ( test )"
+
+# bug #753062 for speexdsp
+CDEPEND="
+       acct-group/pcap
+       >=dev-libs/glib-2.32:2
+       >=net-dns/c-ares-1.5:=
+       dev-libs/libgcrypt:=
+       media-libs/speexdsp
+       bcg729? ( media-libs/bcg729 )
+       brotli? ( app-arch/brotli:= )
+       ciscodump? ( >=net-libs/libssh-0.6 )
+       filecaps? ( sys-libs/libcap )
+       http2? ( net-libs/nghttp2:= )
+       ilbc? ( media-libs/libilbc )
+       kerberos? ( virtual/krb5 )
+       libxml2? ( dev-libs/libxml2 )
+       lua? ( ${LUA_DEPS} )
+       lz4? ( app-arch/lz4:= )
+       maxminddb? ( dev-libs/libmaxminddb:= )
+       minizip? ( sys-libs/zlib[minizip] )
+       netlink? ( dev-libs/libnl:3 )
+       opus? ( media-libs/opus )
+       pcap? ( net-libs/libpcap )
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtmultimedia:5
+               dev-qt/qtprintsupport:5
+               dev-qt/qtwidgets:5
+               x11-misc/xdg-utils
+       )
+       sbc? ( media-libs/sbc )
+       sdjournal? ( sys-apps/systemd )
+       smi? ( net-libs/libsmi )
+       snappy? ( app-arch/snappy )
+       spandsp? ( media-libs/spandsp )
+       sshdump? ( >=net-libs/libssh-0.6 )
+       ssl? ( net-libs/gnutls:= )
+       zlib? ( sys-libs/zlib )
+       zstd? ( app-arch/zstd:= )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+       ${CDEPEND}
+       ${PYTHON_DEPS}
+"
+BDEPEND="
+       dev-lang/perl
+       sys-devel/bison
+       sys-devel/flex
+       virtual/pkgconfig
+       doc? (
+               app-doc/doxygen
+               dev-ruby/asciidoctor
+       )
+       qt5? (
+               dev-qt/linguist-tools:5
+       )
+       test? (
+               dev-python/pytest
+               dev-python/pytest-xdist
+       )
+"
+RDEPEND="
+       ${CDEPEND}
+       qt5? ( virtual/freedesktop-icon-theme )
+       selinux? ( sec-policy/selinux-wireshark )
+"
+REQUIRED_USE="
+       lua? ( ${LUA_REQUIRED_USE} )
+       plugin-ifdemo? ( plugins )
+"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+       "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+       "${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
+)
+
+pkg_setup() {
+       use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+       local mycmakeargs
+
+       # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+       # --with-ssl to ./configure. (Mimics code from acinclude.m4).
+       if use kerberos; then
+               case $(krb5-config --libs) in
+                       *-lcrypto*)
+                               ewarn "Kerberos was built with ssl support: 
linkage with openssl is enabled."
+                               ewarn "Note there are annoying license 
incompatibilities between the OpenSSL"
+                               ewarn "license and the GPL, so do your check 
before distributing such package."
+                               mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+                               ;;
+               esac
+       fi
+
+       if use qt5; then
+               export QT_MIN_VERSION=5.3.0
+               append-cxxflags -fPIC -DPIC
+       fi
+
+       python_setup
+
+       mycmakeargs+=(
+               $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+               $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+               $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+               $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+               -DBUILD_androiddump=$(usex androiddump)
+               -DBUILD_capinfos=$(usex capinfos)
+               -DBUILD_captype=$(usex captype)
+               -DBUILD_ciscodump=$(usex ciscodump)
+               -DBUILD_dftest=$(usex dftest)
+               -DBUILD_dpauxmon=$(usex dpauxmon)
+               -DBUILD_dumpcap=$(usex dumpcap)
+               -DBUILD_editcap=$(usex editcap)
+               -DBUILD_mergecap=$(usex mergecap)
+               -DBUILD_mmdbresolve=$(usex maxminddb)
+               -DBUILD_randpkt=$(usex randpkt)
+               -DBUILD_randpktdump=$(usex randpktdump)
+               -DBUILD_reordercap=$(usex reordercap)
+               -DBUILD_sdjournal=$(usex sdjournal)
+               -DBUILD_sharkd=$(usex sharkd)
+               -DBUILD_sshdump=$(usex sshdump)
+               -DBUILD_text2pcap=$(usex text2pcap)
+               -DBUILD_tfshark=$(usex tfshark)
+               -DBUILD_tshark=$(usex tshark)
+               -DBUILD_udpdump=$(usex udpdump)
+               -DBUILD_wireshark=$(usex qt5)
+               -DDISABLE_WERROR=yes
+               -DENABLE_BCG729=$(usex bcg729)
+               -DENABLE_BROTLI=$(usex brotli)
+               -DENABLE_CAP=$(usex filecaps caps)
+               -DENABLE_GNUTLS=$(usex ssl)
+               -DENABLE_ILBC=$(usex ilbc)
+               -DENABLE_KERBEROS=$(usex kerberos)
+               -DENABLE_LIBXML2=$(usex libxml2)
+               -DENABLE_LTO=$(usex lto)
+               -DENABLE_LUA=$(usex lua)
+               -DENABLE_LZ4=$(usex lz4)
+               -DENABLE_MINIZIP=$(usex minizip)
+               -DENABLE_NETLINK=$(usex netlink)
+               -DENABLE_NGHTTP2=$(usex http2)
+               -DENABLE_OPUS=$(usex opus)
+               -DENABLE_PCAP=$(usex pcap)
+               -DENABLE_PLUGINS=$(usex plugins)
+               -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+               -DENABLE_SBC=$(usex sbc)
+               -DENABLE_SMI=$(usex smi)
+               -DENABLE_SNAPPY=$(usex snappy)
+               -DENABLE_SPANDSP=$(usex spandsp)
+               -DENABLE_ZLIB=$(usex zlib)
+               -DENABLE_ZSTD=$(usex zstd)
+       )
+
+       cmake_src_configure
+}
+
+src_test() {
+       cmake_build test-programs
+
+       myctestargs=(
+               --disable-capture
+               --skip-missing-programs=all
+               --verbose
+
+               # Skip known failing tests
+               # extcaps needs a bunch of external programs
+               # decryption/nameres seem to be fixed in 3.6.x
+               -E "(suite_decryption|suite_extcaps|suite_nameres)"
+       )
+
+       cmake_src_test
+}
+
+src_install() {
+       cmake_src_install
+
+       # FAQ is not required as is installed from help/faq.txt
+       dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+       # install headers
+       insinto /usr/include/wireshark
+       doins ws_diag_control.h ws_symbol_export.h \
+               "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+       local dir dirs=(
+               epan
+               epan/crypt
+               epan/dfilter
+               epan/dissectors
+               epan/ftypes
+               epan/wmem
+               wiretap
+               wsutil
+       )
+
+       for dir in "${dirs[@]}" ; do
+               insinto /usr/include/wireshark/${dir}
+               doins ${dir}/*.h
+       done
+
+       #with the above this really shouldn't be needed, but things may be 
looking
+       # in wiretap/ instead of wireshark/wiretap/
+       insinto /usr/include/wiretap
+       doins wiretap/wtap.h
+
+       if use qt5; then
+               local s
+               for s in 16 32 48 64 128 256 512 1024; do
+                       insinto /usr/share/icons/hicolor/${s}x${s}/apps
+                       newins image/wsicon${s}.png wireshark.png
+               done
+               for s in 16 24 32 48 64 128 256 ; do
+                       insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+                       newins image/WiresharkDoc-${s}.png 
application-vnd.tcpdump.pcap.png
+               done
+       fi
+
+       if [[ -d "${ED}"/usr/share/appdata ]]; then
+               rm -r "${ED}"/usr/share/appdata || die
+       fi
+}
+
+pkg_postinst() {
+       xdg_desktop_database_update
+       xdg_icon_cache_update
+       xdg_mimeinfo_database_update
+
+       # Add group for users allowed to sniff.
+       chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+       if use dumpcap && use pcap; then
+               fcaps -o 0 -g pcap -m 4710 -M 0710 \
+                       cap_dac_read_search,cap_net_raw,cap_net_admin \
+                       "${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."
+}
+
+pkg_postrm() {
+       xdg_desktop_database_update
+       xdg_icon_cache_update
+       xdg_mimeinfo_database_update
+}

diff --git a/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild 
b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
new file mode 100644
index 000000000000..520a2dc646a6
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/";
+
+if [[ ${PV} == *9999* ]] ; then
+       EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark";
+       inherit git-r3
+else
+       
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
+       S="${WORKDIR}/${P/_/}"
+
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc 
dpauxmon"
+IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
+IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 
+randpkt"
+IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp 
sshdump ssl"
+IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+       plugin-ifdemo? ( plugins )"
+
+RESTRICT="!test? ( test )"
+
+# bug #753062 for speexdsp
+RDEPEND="acct-group/pcap
+       >=dev-libs/glib-2.38:2
+       >=net-dns/c-ares-1.5:=
+       dev-libs/libgcrypt:=
+       media-libs/speexdsp
+       bcg729? ( media-libs/bcg729 )
+       brotli? ( app-arch/brotli:= )
+       ciscodump? ( >=net-libs/libssh-0.6 )
+       filecaps? ( sys-libs/libcap )
+       http2? ( net-libs/nghttp2:= )
+       ilbc? ( media-libs/libilbc )
+       kerberos? ( virtual/krb5 )
+       libxml2? ( dev-libs/libxml2 )
+       lua? ( ${LUA_DEPS} )
+       lz4? ( app-arch/lz4:= )
+       maxminddb? ( dev-libs/libmaxminddb:= )
+       minizip? ( sys-libs/zlib[minizip] )
+       netlink? ( dev-libs/libnl:3 )
+       opus? ( media-libs/opus )
+       pcap? ( net-libs/libpcap )
+       qt5? (
+               dev-qt/qtcore:5
+               dev-qt/qtgui:5
+               dev-qt/qtmultimedia:5
+               dev-qt/qtprintsupport:5
+               dev-qt/qtwidgets:5
+               x11-misc/xdg-utils
+       )
+       sbc? ( media-libs/sbc )
+       sdjournal? ( sys-apps/systemd )
+       smi? ( net-libs/libsmi )
+       snappy? ( app-arch/snappy )
+       spandsp? ( media-libs/spandsp )
+       sshdump? ( >=net-libs/libssh-0.6 )
+       ssl? ( net-libs/gnutls:= )
+       zlib? ( sys-libs/zlib )
+       zstd? ( app-arch/zstd:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+       dev-lang/perl
+       sys-devel/flex
+       sys-devel/gettext
+       virtual/pkgconfig
+       doc? (
+               app-doc/doxygen
+               dev-ruby/asciidoctor
+       )
+       qt5? (
+               dev-qt/linguist-tools:5
+       )
+       test? (
+               dev-python/pytest
+               dev-python/pytest-xdist
+       )"
+RDEPEND="${RDEPEND}
+       qt5? ( virtual/freedesktop-icon-theme )
+       selinux? ( sec-policy/selinux-wireshark )"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+       "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
+       "${FILESDIR}"/${PN}-3.6.0-fix-no-tshark.patch
+)
+
+pkg_setup() {
+       use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+       local mycmakeargs
+
+       # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+       # --with-ssl to ./configure. (Mimics code from acinclude.m4).
+       if use kerberos ; then
+               case $(krb5-config --libs) in
+                       *-lcrypto*)
+                               ewarn "Kerberos was built with ssl support: 
linkage with openssl is enabled."
+                               ewarn "Note there are annoying license 
incompatibilities between the OpenSSL"
+                               ewarn "license and the GPL, so do your check 
before distributing such package."
+                               mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+                               ;;
+               esac
+       fi
+
+       if use qt5 ; then
+               export QT_MIN_VERSION=5.3.0
+               append-cxxflags -fPIC -DPIC
+       fi
+
+       python_setup
+
+       mycmakeargs+=(
+               -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
+               $(use androiddump && use pcap && echo 
-DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+               $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+               $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+               $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+               $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+               -DBUILD_androiddump=$(usex androiddump)
+               -DBUILD_capinfos=$(usex capinfos)
+               -DBUILD_captype=$(usex captype)
+               -DBUILD_ciscodump=$(usex ciscodump)
+               -DBUILD_dftest=$(usex dftest)
+               -DBUILD_dpauxmon=$(usex dpauxmon)
+               -DBUILD_dumpcap=$(usex dumpcap)
+               -DBUILD_editcap=$(usex editcap)
+               -DBUILD_mergecap=$(usex mergecap)
+               -DBUILD_mmdbresolve=$(usex maxminddb)
+               -DBUILD_randpkt=$(usex randpkt)
+               -DBUILD_randpktdump=$(usex randpktdump)
+               -DBUILD_reordercap=$(usex reordercap)
+               -DBUILD_sdjournal=$(usex sdjournal)
+               -DBUILD_sharkd=$(usex sharkd)
+               -DBUILD_sshdump=$(usex sshdump)
+               -DBUILD_text2pcap=$(usex text2pcap)
+               -DBUILD_tfshark=$(usex tfshark)
+               -DBUILD_tshark=$(usex tshark)
+               -DBUILD_udpdump=$(usex udpdump)
+               -DBUILD_wireshark=$(usex qt5)
+               -DDISABLE_WERROR=yes
+               -DENABLE_BCG729=$(usex bcg729)
+               -DENABLE_BROTLI=$(usex brotli)
+               -DENABLE_CAP=$(usex filecaps caps)
+               -DENABLE_GNUTLS=$(usex ssl)
+               -DENABLE_ILBC=$(usex ilbc)
+               -DENABLE_KERBEROS=$(usex kerberos)
+               -DENABLE_LIBXML2=$(usex libxml2)
+               -DENABLE_LTO=$(usex lto)
+               -DENABLE_LUA=$(usex lua)
+               -DENABLE_LZ4=$(usex lz4)
+               -DENABLE_MINIZIP=$(usex minizip)
+               -DENABLE_NETLINK=$(usex netlink)
+               -DENABLE_NGHTTP2=$(usex http2)
+               -DENABLE_OPUS=$(usex opus)
+               -DENABLE_PCAP=$(usex pcap)
+               -DENABLE_PLUGINS=$(usex plugins)
+               -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
+               -DENABLE_SBC=$(usex sbc)
+               -DENABLE_SMI=$(usex smi)
+               -DENABLE_SNAPPY=$(usex snappy)
+               -DENABLE_SPANDSP=$(usex spandsp)
+               -DENABLE_ZLIB=$(usex zlib)
+               -DENABLE_ZSTD=$(usex zstd)
+       )
+
+       cmake_src_configure
+}
+
+src_test() {
+       cmake_build test-programs
+
+       myctestargs=(
+               --disable-capture
+               --skip-missing-programs=all
+               --verbose
+
+               # Skip known failing tests
+               -E "(suite_decryption|suite_extcaps|suite_nameres)"
+       )
+
+       cmake_src_test
+}
+
+src_install() {
+       cmake_src_install
+
+       # FAQ is not required as is installed from help/faq.txt
+       dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+       # install headers
+       insinto /usr/include/wireshark
+       doins ws_diag_control.h ws_symbol_export.h \
+               "${BUILD_DIR}"/config.h
+
+       # If trying to remove this, try build e.g. libvirt first!
+       # At last check, Fedora is still doing this too.
+       local dir dirs=(
+               epan
+               epan/crypt
+               epan/dfilter
+               epan/dissectors
+               epan/ftypes
+               wiretap
+               wsutil
+               wsutil/wmem
+       )
+
+       for dir in "${dirs[@]}" ; do
+               insinto /usr/include/wireshark/${dir}
+               doins ${dir}/*.h
+       done
+
+       if use qt5 ; then
+               local s
+
+               for s in 16 32 48 64 128 256 512 1024 ; do
+                       insinto /usr/share/icons/hicolor/${s}x${s}/apps
+                       newins image/wsicon${s}.png wireshark.png
+               done
+
+               for s in 16 24 32 48 64 128 256 ; do
+                       insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+                       newins image/WiresharkDoc-${s}.png 
application-vnd.tcpdump.pcap.png
+               done
+       fi
+
+       if [[ -d "${ED}"/usr/share/appdata ]] ; then
+               rm -r "${ED}"/usr/share/appdata || die
+       fi
+}
+
+pkg_postinst() {
+       xdg_desktop_database_update
+       xdg_icon_cache_update
+       xdg_mimeinfo_database_update
+
+       # Add group for users allowed to sniff.
+       chgrp pcap "${EROOT}"/usr/bin/dumpcap
+
+       if use dumpcap && use pcap ; then
+               fcaps -o 0 -g pcap -m 4710 -M 0710 \
+                       cap_dac_read_search,cap_net_raw,cap_net_admin \
+                       "${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."
+}
+
+pkg_postrm() {
+       xdg_desktop_database_update
+       xdg_icon_cache_update
+       xdg_mimeinfo_database_update
+}

Reply via email to