| 1 |
commit: 63333469c659d24b7ce58469fd48283d894ffb92 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 16 08:43:42 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 16 08:44:48 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63333469 |
| 7 |
|
| 8 |
net-analyzer/wireshark: Version 3.3.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
|
| 13 |
net-analyzer/wireshark/Manifest | 1 + |
| 14 |
net-analyzer/wireshark/metadata.xml | 2 ++ |
| 15 |
...eshark-99999999.ebuild => wireshark-3.3.0.ebuild} | 20 +++++++++++++------- |
| 16 |
net-analyzer/wireshark/wireshark-99999999.ebuild | 13 +++++++++---- |
| 17 |
4 files changed, 25 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest |
| 20 |
index 6e4e811b090..8e958e7a7d9 100644 |
| 21 |
--- a/net-analyzer/wireshark/Manifest |
| 22 |
+++ b/net-analyzer/wireshark/Manifest |
| 23 |
@@ -1,2 +1,3 @@ |
| 24 |
DIST wireshark-3.2.5.tar.xz 31626148 BLAKE2B 46341b0c703913abaf49c55d2d40be36e4f2d74ab0326d0b893288fb15e27246249234243f68b184b5854cdd4a6c8690c350d5fad231db1dda1620fe76b94c93 SHA512 3dc785a6e857f66a9ae3c172bf6a09c2199fe914646ade7b81f0ee18bd3addae57facad898f57675ea4d7177a4315d6a6cdac46e2da063727a83f9bee6994277 |
| 25 |
DIST wireshark-3.2.6.tar.xz 31635628 BLAKE2B 216623d4f357e755b9c032bef45b30c373bb0e2de773daabb78725491bd8eb0290d25a9016081dc62844c1be63e3afd273a8a6b8d16e70e589465fd837cc7442 SHA512 71905836370b916a92e7a76e4f93cb10a658374c7a95aa47b607b2b142abebdb0d1562f642782a5a946a167dfb28169572330a7603cf0d7ab6016ce7f12fac78 |
| 26 |
+DIST wireshark-3.3.0.tar.xz 32795500 BLAKE2B 1f5b7711e76464403a9ed11f2f72a858716e177334b036bf5f2b2aa9f41b197fded04ff18a3841f3d6fdab9acf331a5bc4dfee3adc8eca775c4eeedbbc163ece SHA512 1ca59d951b3b3c18f55f21023a775124639fbc99a0396e3b2ecf3569213659a039836c6bdaf82b802668b5108f455106a22e83ab26ee18ed882dfa564594df5a |
| 27 |
|
| 28 |
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml |
| 29 |
index 95f198ad6c4..940a96ed59a 100644 |
| 30 |
--- a/net-analyzer/wireshark/metadata.xml |
| 31 |
+++ b/net-analyzer/wireshark/metadata.xml |
| 32 |
@@ -38,7 +38,9 @@ be exported to XML, PostScript®, CSV, or plain text. |
| 33 |
<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag> |
| 34 |
<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag> |
| 35 |
<flag name="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag> |
| 36 |
+<flag name="ilbc">Build with iLBC support in RTP Player using <pkg>media-libs/libilbc</pkg></flag> |
| 37 |
<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag> |
| 38 |
+<flag name="lto">Enable link time optimization</flag> |
| 39 |
<flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag> |
| 40 |
<flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag> |
| 41 |
<flag name="minizip">Build with zip file compression support</flag> |
| 42 |
|
| 43 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-3.3.0.ebuild |
| 44 |
similarity index 90% |
| 45 |
copy from net-analyzer/wireshark/wireshark-99999999.ebuild |
| 46 |
copy to net-analyzer/wireshark/wireshark-3.3.0.ebuild |
| 47 |
index 0fca7d96422..77a2a9acc83 100644 |
| 48 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 49 |
+++ b/net-analyzer/wireshark/wireshark-3.3.0.ebuild |
| 50 |
@@ -3,21 +3,21 @@ |
| 51 |
|
| 52 |
EAPI=7 |
| 53 |
PYTHON_COMPAT=( python3_{6,7} ) |
| 54 |
-inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user xdg-utils cmake |
| 55 |
+inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake |
| 56 |
|
| 57 |
DESCRIPTION="A network protocol analyzer formerly known as ethereal" |
| 58 |
HOMEPAGE="https://www.wireshark.org/" |
| 59 |
-EGIT_REPO_URI="https://code.wireshark.org/review/wireshark" |
| 60 |
+SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" |
| 61 |
LICENSE="GPL-2" |
| 62 |
|
| 63 |
SLOT="0/${PV}" |
| 64 |
-KEYWORDS="" |
| 65 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" |
| 66 |
IUSE=" |
| 67 |
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon |
| 68 |
- +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap |
| 69 |
- +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump |
| 70 |
- +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal |
| 71 |
- test +text2pcap tfshark +tshark +udpdump zlib |
| 72 |
+ +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb |
| 73 |
+ +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt |
| 74 |
+ +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl |
| 75 |
+ sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd |
| 76 |
" |
| 77 |
S=${WORKDIR}/${P/_/} |
| 78 |
|
| 79 |
@@ -30,6 +30,7 @@ CDEPEND=" |
| 80 |
ciscodump? ( >=net-libs/libssh-0.6 ) |
| 81 |
filecaps? ( sys-libs/libcap ) |
| 82 |
http2? ( net-libs/nghttp2 ) |
| 83 |
+ ilbc? ( media-libs/libilbc ) |
| 84 |
kerberos? ( virtual/krb5 ) |
| 85 |
libxml2? ( dev-libs/libxml2 ) |
| 86 |
lua? ( >=dev-lang/lua-5.1:* ) |
| 87 |
@@ -54,6 +55,7 @@ CDEPEND=" |
| 88 |
sshdump? ( >=net-libs/libssh-0.6 ) |
| 89 |
ssl? ( net-libs/gnutls:= ) |
| 90 |
zlib? ( sys-libs/zlib ) |
| 91 |
+ zstd? ( app-arch/zstd ) |
| 92 |
" |
| 93 |
# We need perl for `pod2html`. The rest of the perl stuff is to block older |
| 94 |
# and broken installs. #455122 |
| 95 |
@@ -86,6 +88,7 @@ RDEPEND=" |
| 96 |
REQUIRED_USE=" |
| 97 |
plugin-ifdemo? ( plugins ) |
| 98 |
" |
| 99 |
+RESTRICT="test" |
| 100 |
PATCHES=( |
| 101 |
"${FILESDIR}"/${PN}-2.6.0-redhat.patch |
| 102 |
"${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch |
| 103 |
@@ -151,8 +154,10 @@ src_configure() { |
| 104 |
-DENABLE_BROTLI=$(usex brotli) |
| 105 |
-DENABLE_CAP=$(usex filecaps caps) |
| 106 |
-DENABLE_GNUTLS=$(usex ssl) |
| 107 |
+ -DENABLE_ILBC=$(usex ilbc) |
| 108 |
-DENABLE_KERBEROS=$(usex kerberos) |
| 109 |
-DENABLE_LIBXML2=$(usex libxml2) |
| 110 |
+ -DENABLE_LTO=$(usex lto) |
| 111 |
-DENABLE_LUA=$(usex lua) |
| 112 |
-DENABLE_LZ4=$(usex lz4) |
| 113 |
-DENABLE_MINIZIP=$(usex minizip) |
| 114 |
@@ -166,6 +171,7 @@ src_configure() { |
| 115 |
-DENABLE_SNAPPY=$(usex snappy) |
| 116 |
-DENABLE_SPANDSP=$(usex spandsp) |
| 117 |
-DENABLE_ZLIB=$(usex zlib) |
| 118 |
+ -DENABLE_ZSTD=$(usex zstd) |
| 119 |
) |
| 120 |
|
| 121 |
cmake_src_configure |
| 122 |
|
| 123 |
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 124 |
index 0fca7d96422..58b92ffea15 100644 |
| 125 |
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 126 |
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild |
| 127 |
@@ -14,10 +14,10 @@ SLOT="0/${PV}" |
| 128 |
KEYWORDS="" |
| 129 |
IUSE=" |
| 130 |
androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon |
| 131 |
- +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap |
| 132 |
- +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump |
| 133 |
- +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal |
| 134 |
- test +text2pcap tfshark +tshark +udpdump zlib |
| 135 |
+ +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb |
| 136 |
+ +mergecap +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt |
| 137 |
+ +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl |
| 138 |
+ sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd |
| 139 |
" |
| 140 |
S=${WORKDIR}/${P/_/} |
| 141 |
|
| 142 |
@@ -30,6 +30,7 @@ CDEPEND=" |
| 143 |
ciscodump? ( >=net-libs/libssh-0.6 ) |
| 144 |
filecaps? ( sys-libs/libcap ) |
| 145 |
http2? ( net-libs/nghttp2 ) |
| 146 |
+ ilbc? ( media-libs/libilbc ) |
| 147 |
kerberos? ( virtual/krb5 ) |
| 148 |
libxml2? ( dev-libs/libxml2 ) |
| 149 |
lua? ( >=dev-lang/lua-5.1:* ) |
| 150 |
@@ -54,6 +55,7 @@ CDEPEND=" |
| 151 |
sshdump? ( >=net-libs/libssh-0.6 ) |
| 152 |
ssl? ( net-libs/gnutls:= ) |
| 153 |
zlib? ( sys-libs/zlib ) |
| 154 |
+ zstd? ( app-arch/zstd ) |
| 155 |
" |
| 156 |
# We need perl for `pod2html`. The rest of the perl stuff is to block older |
| 157 |
# and broken installs. #455122 |
| 158 |
@@ -151,8 +153,10 @@ src_configure() { |
| 159 |
-DENABLE_BROTLI=$(usex brotli) |
| 160 |
-DENABLE_CAP=$(usex filecaps caps) |
| 161 |
-DENABLE_GNUTLS=$(usex ssl) |
| 162 |
+ -DENABLE_ILBC=$(usex ilbc) |
| 163 |
-DENABLE_KERBEROS=$(usex kerberos) |
| 164 |
-DENABLE_LIBXML2=$(usex libxml2) |
| 165 |
+ -DENABLE_LTO=$(usex lto) |
| 166 |
-DENABLE_LUA=$(usex lua) |
| 167 |
-DENABLE_LZ4=$(usex lz4) |
| 168 |
-DENABLE_MINIZIP=$(usex minizip) |
| 169 |
@@ -166,6 +170,7 @@ src_configure() { |
| 170 |
-DENABLE_SNAPPY=$(usex snappy) |
| 171 |
-DENABLE_SPANDSP=$(usex spandsp) |
| 172 |
-DENABLE_ZLIB=$(usex zlib) |
| 173 |
+ -DENABLE_ZSTD=$(usex zstd) |
| 174 |
) |
| 175 |
|
| 176 |
cmake_src_configure |
Archives