commit: 63333469c659d24b7ce58469fd48283d894ffb92
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 08:43:42 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 08:44:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63333469
net-analyzer/wireshark: Version 3.3.0
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/wireshark/Manifest | 1 +
net-analyzer/wireshark/metadata.xml | 2 ++
...eshark-99999999.ebuild => wireshark-3.3.0.ebuild} | 20 +++++++++++++-------
net-analyzer/wireshark/wireshark-99999999.ebuild | 13 +++++++++----
4 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 6e4e811b090..8e958e7a7d9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
DIST wireshark-3.2.5.tar.xz 31626148 BLAKE2B
46341b0c703913abaf49c55d2d40be36e4f2d74ab0326d0b893288fb15e27246249234243f68b184b5854cdd4a6c8690c350d5fad231db1dda1620fe76b94c93
SHA512
3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277
DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B
216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442
SHA512
71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78
+DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B
1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece
SHA512
1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a
diff --git a/net-analyzer/wireshark/metadata.xml
b/net-analyzer/wireshark/metadata.xml
index 95f198ad6c4..940a96ed59a 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -38,7 +38,9 @@ be exported to XML, PostScript®, CSV, or plain text.
<flag name="dumpcap">Install dumpcap, to dump network traffic from inside
wireshark</flag>
<flag name="editcap">Install editcap, to edit and/or translate the format of
capture files</flag>
<flag name="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag>
+<flag name="ilbc">Build with iLBC support in RTP Player using
<pkg>media-libs/libilbc</pkg></flag>
<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML
configuration in dissectors</flag>
+<flag name="lto">Enable link time optimization</flag>
<flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address
geolocation</flag>
<flag name="mergecap">Install mergecap, to merge two or more capture files
into one</flag>
<flag name="minizip">Build with zip file compression support</flag>
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild
b/net-analyzer/wireshark/wireshark-3.3.0.ebuild
similarity index 90%
copy from net-analyzer/wireshark/wireshark-99999999.ebuild
copy to net-analyzer/wireshark/wireshark-3.3.0.ebuild
index 0fca7d96422..77a2a9acc83 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.3.0.ebuild
@@ -3,21 +3,21 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user
xdg-utils cmake
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils
cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/";
-EGIT_REPO_URI="https://code.wireshark.org/review/wireshark";
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz";
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
dpauxmon
- +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
- +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+randpktdump
- +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
- test +text2pcap tfshark +tshark +udpdump zlib
+ +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+ +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+ +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump
ssl
+ sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
"
S=${WORKDIR}/${P/_/}
@@ -30,6 +30,7 @@ CDEPEND="
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? ( >=dev-lang/lua-5.1:* )
@@ -54,6 +55,7 @@ CDEPEND="
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
@@ -86,6 +88,7 @@ RDEPEND="
REQUIRED_USE="
plugin-ifdemo? ( plugins )
"
+RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-redhat.patch
"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch
@@ -151,8 +154,10 @@ src_configure() {
-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)
@@ -166,6 +171,7 @@ src_configure() {
-DENABLE_SNAPPY=$(usex snappy)
-DENABLE_SPANDSP=$(usex spandsp)
-DENABLE_ZLIB=$(usex zlib)
+ -DENABLE_ZSTD=$(usex zstd)
)
cmake_src_configure
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild
b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 0fca7d96422..58b92ffea15 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -14,10 +14,10 @@ SLOT="0/${PV}"
KEYWORDS=""
IUSE="
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc
dpauxmon
- +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap
- +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+randpktdump
- +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal
- test +text2pcap tfshark +tshark +udpdump zlib
+ +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb
+ +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt
+ +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump
ssl
+ sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd
"
S=${WORKDIR}/${P/_/}
@@ -30,6 +30,7 @@ CDEPEND="
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? ( >=dev-lang/lua-5.1:* )
@@ -54,6 +55,7 @@ CDEPEND="
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
@@ -151,8 +153,10 @@ src_configure() {
-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)
@@ -166,6 +170,7 @@ src_configure() {
-DENABLE_SNAPPY=$(usex snappy)
-DENABLE_SPANDSP=$(usex spandsp)
-DENABLE_ZLIB=$(usex zlib)
+ -DENABLE_ZSTD=$(usex zstd)
)
cmake_src_configure
