summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Tom Briden <tom@decompile.me.uk> 2018-09-13 17:10:50 +0100
committerAvatar Tom Briden <tom@decompile.me.uk> 2018-09-16 17:38:27 +0100
commit86e91edd40c034a42e60633bf606de69c169e6fa (patch)
tree723f8838ad89ec2c280b846cb08bd21855d18425
parentd19f6ac52d605f4a389ca38aeac93bf57f978c3f (diff)
downloadnet-86e91edd40c034a42e60633bf606de69c169e6fa.tar.gz
net-86e91edd40c034a42e60633bf606de69c169e6fa.tar.xz
wireshark: version bump to 2.6.3
-rw-r--r--metadata/repository_mask.conf8
-rw-r--r--packages/net-analyzer/wireshark/wireshark-2.6.3.exheres-0 (renamed from packages/net-analyzer/wireshark/wireshark-2.4.4.exheres-0)0
-rw-r--r--packages/net-analyzer/wireshark/wireshark.exlib16
3 files changed, 12 insertions, 12 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 907fbcd..b488ee5 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -138,11 +138,11 @@ net-analyzer/tcpdump[<4.9.2] [[
description = [ Multiple CVEs ]
]]
-net-analyzer/wireshark[<2.4.4] [[
- author = [ Timo Gurr tgurr@exherbo.org> ]
- date = [ 15 Jan 2018 ]
+net-analyzer/wireshark[<2.6.3] [[
+ author = [ Tom Briden <tom@decompile.me.uk> ]
+ date = [ 13 Sep 2018 ]
token = security
- description = [ CVE-2018-5334, CVE-2018-5335, CVE-2018-5336 ]
+ description = [ CVE-2018-16056, CVE-2018-16057, CVE-2018-16058 ]
]]
net/net-snmp[<5.7.3] [[
diff --git a/packages/net-analyzer/wireshark/wireshark-2.4.4.exheres-0 b/packages/net-analyzer/wireshark/wireshark-2.6.3.exheres-0
index 87766f6..87766f6 100644
--- a/packages/net-analyzer/wireshark/wireshark-2.4.4.exheres-0
+++ b/packages/net-analyzer/wireshark/wireshark-2.6.3.exheres-0
diff --git a/packages/net-analyzer/wireshark/wireshark.exlib b/packages/net-analyzer/wireshark/wireshark.exlib
index 4b97370..bd4b09b 100644
--- a/packages/net-analyzer/wireshark/wireshark.exlib
+++ b/packages/net-analyzer/wireshark/wireshark.exlib
@@ -24,6 +24,7 @@ UPSTREAM_DOCUMENTATION="${HOMEPAGE}/docs"
LICENCES="GPL-2"
SLOT="0"
MYOPTIONS="
+ bcg729 [[ description = [ Enable support for G.729 codec in the RTP player ] ]]
c-ares [[ description = [ Use the GNU c-ares library to resolve DNS names ] ]]
caps
geoip [[ description = [ Enable support for GeoIP location data ] ]]
@@ -42,7 +43,7 @@ MYOPTIONS="
DEPENDENCIES="
build:
- app-doc/asciidoc
+ app-text/asciidoctor[>=1.5]
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
dev-libs/libxslt [[ note = [ xsltproc ] ]]
@@ -62,9 +63,10 @@ DEPENDENCIES="
dev-perl/Parse-Yapp [[ note = [ HTTP header TPG plugin ] ]]
group/${PN}
sys-libs/zlib
+ bcg729? ( media-sound/bcg729 )
caps? ( sys-libs/libcap )
c-ares? ( net-dns/c-ares[>=1.5] )
- geoip? ( net-libs/GeoIP )
+ geoip? ( net-libs/libmaxminddb )
gnutls? ( dev-libs/gnutls[>=3.1.10] )
lz4? ( app-arch/lz4 )
providers:gtk2? (
@@ -110,15 +112,11 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DENABLE_APPLICATION_BUNDLE:BOOL=FALSE
-DENABLE_CCACHE:BOOL=FALSE
-DENABLE_CHECKHF_CONFLICT:BOOL=FALSE
- -DENABLE_CHM_GUIDES:BOOL=FALSE
- -DENABLE_EXTCAP:BOOL=TRUE
-DENABLE_EXTRA_COMPILER_WARNINGS:BOOL=FALSE
- -DENABLE_HTML_GUIDES:BOOL=FALSE
-DENABLE_LIBXML2:BOOL=TRUE
-DENABLE_NETLINK:BOOL=TRUE
-DENABLE_PCAP:BOOL=TRUE
-DENABLE_PCAP_NG_DEFAULT:BOOL=TRUE
- -DENABLE_PDF_GUIDES:BOOL=FALSE
-DENABLE_PLUGIN_IFDEMO:BOOL=FALSE
-DENABLE_PLUGINS:BOOL=TRUE
-DENABLE_SBC:BOOL=FALSE
@@ -127,12 +125,11 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DENABLE_UBSAN:BOOL=FALSE
-DENABLE_WINSPARKLE:BOOL=FALSE
-DENABLE_ZLIB:BOOL=TRUE
- -DWANT_PACKET_EDITOR:BOOL=TRUE
)
CMAKE_SRC_CONFIGURE_OPTION_ENABLES=(
+ "bcg729 BCG729"
"c-ares CARES"
"caps CAP"
- "geoip GEOIP"
"gnutls GNUTLS"
"kerberos KERBEROS"
"lua LUA"
@@ -142,6 +139,9 @@ CMAKE_SRC_CONFIGURE_OPTION_ENABLES=(
"smi SMI"
"snappy SNAPPY"
)
+CMAKE_SRC_CONFIGURE_OPTION_BUILDS=(
+ "geoip mmdbresolve"
+)
wireshark_src_prepare() {
# TODO: report upstream