aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2014-09-16 16:50:19 -0700
committerJoe MacDonald <joe_macdonald@mentor.com>2014-09-23 22:00:01 -0400
commit1fbaf1ca73b18d723991b337086859d7b367a78c (patch)
tree2ac4c0e27fefb2199aaa41ab1ba6b58ade3c2afb
parent2fab4b8902320d0323e3a59ea72e743f24eb36c9 (diff)
downloadmeta-openembedded-contrib-1fbaf1ca73b18d723991b337086859d7b367a78c.tar.gz
wireshark: update to 12.1
following security fixes included: MEGACO dissector infinite loop. (Bug 10333) CVE-2014-6423 Netflow dissector crash. (Bug 10370) CVE-2014-6424 CUPS dissector crash. (Bug 10353) CVE-2014-6425 HIP dissector infinite loop. CVE-2014-6426 RTSP dissector crash. (Bug 10381) CVE-2014-6427 SES dissector crash. (Bug 10454) CVE-2014-6428 Sniffer file parser crash. (Bug 10461) CVE-2014-6429 CVE-2014-6430 CVE-2014-6431 CVE-2014-6432 re-org'd dd file to be more in-line with style guide. Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb (renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb)21
1 files changed, 10 insertions, 11 deletions
diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb
index 39a24dc786..71cc0823a0 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb
@@ -2,9 +2,19 @@ DESCRIPTION = "wireshark - a popular network protocol analyzer"
HOMEPAGE = "http://www.wireshark.org"
SECTION = "network"
LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0"
DEPENDS = "perl-native libcap libpcap pcre expat glib-2.0 libnl sbc"
+SRC_URI = " \
+ http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \
+"
+
+PE = "1"
+
+SRC_URI[md5sum] = "14b3e3d8979d1eb27ff085bb5f400e67"
+SRC_URI[sha256sum]= "82b26bd416ec15903b27785e35a622687008a743342054e96eaaeaa249be584b"
+
inherit autotools pkgconfig
ARM_INSTRUCTION_SET = "arm"
@@ -27,16 +37,6 @@ PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark --with-c-ares=no"
-LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0"
-SRC_URI = " \
- http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0.tar.bz2 \
-"
-
-PE = "1"
-
-SRC_URI[md5sum] = "8dcfe451d8769901129809d2e19c1fb7"
-SRC_URI[sha256sum]= "0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7"
-
do_configure_prepend() {
# force to use fallback
sed -i -e '/^glib_prefix/s/=.*$/=""/' ${S}/aclocal-flags
@@ -44,4 +44,3 @@ do_configure_prepend() {
ALLOW_EMPTY_${PN} = "1"
INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-