From fdcc4f460a504e8f26f237cd86c2e86d1d224525 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Wed, 4 Mar 2015 14:20:43 -0800 Subject: wireshark: update to 12.4 The following vulnerabilities have been fixed. * [1]wnpa-sec-2015-06 The ATN-CPDLC dissector could crash. ([2]Bug 9952) [3]CVE-2015-2187 * [4]wnpa-sec-2015-07 The WCP dissector could crash. ([5]Bug 10844) [6]CVE-2015-2188 * [7]wnpa-sec-2015-08 The pcapng file parser could crash. ([8]Bug 10895) [9]CVE-2015-2189 * [10]wnpa-sec-2015-09 The LLDP dissector could crash. ([11]Bug 10983) [12]CVE-2015-2190 * [13]wnpa-sec-2015-10 The TNEF dissector could go into an infinite loop. Discovered by Vlad Tsyrklevich. ([14]Bug 11023) [15]CVE-2015-2191 * [16]wnpa-sec-2015-11 The SCSI OSD dissector could go into an infinite loop. Discovered by Vlad Tsyrklevich. ([17]Bug 11024) [18]CVE-2015-2192 For more information see https://www.wireshark.org/docs/relnotes/wireshark-1.12.4.html Signed-off-by: Armin Kuster Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald Signed-off-by: Armin Kuster --- .../recipes-support/wireshark/wireshark_1.12.3.bb | 57 ---------------------- .../recipes-support/wireshark/wireshark_1.12.4.bb | 57 ++++++++++++++++++++++ 2 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 meta-networking/recipes-support/wireshark/wireshark_1.12.3.bb create mode 100644 meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb (limited to 'meta-networking/recipes-support') diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.3.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.3.bb deleted file mode 100644 index f16d0f68fa..0000000000 --- a/meta-networking/recipes-support/wireshark/wireshark_1.12.3.bb +++ /dev/null @@ -1,57 +0,0 @@ -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 pcre expat glib-2.0 sbc" - -SRC_URI = " \ - http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \ - file://Do-not-set-CC_FOR_BUILD-flags.patch \ -" - -PE = "1" - -SRC_URI[md5sum] = "e6318b8451d4e56d39bd911da296ef19" -SRC_URI[sha256sum] = "69950b9dcb1a630982b5f680554d73d27ee0dc856fc6aeef88c8d04eb5ac33ea" - -inherit autotools pkgconfig - -ARM_INSTRUCTION_SET = "arm" - -# Works with either gtk+ or gtk3. -WHICH_GTK = "gtk3" - -PACKAGECONFIG ??= "libcap gnutls libnl" -PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${WHICH_GTK} graphics", "", d)}" -PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" - -PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_DIR_HOST}, --with-libcap=no, libcap" -PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" -PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" -PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" -PACKAGECONFIG[gtk2] = "--with-gtk2=yes, --with-gtk2=no, gtk+" -PACKAGECONFIG[gtk3] = "--with-gtk3=yes, --with-gtk3=no, gtk+3" -PACKAGECONFIG[graphics] = "--enable-wireshark, --disable-wireshark," -PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6," -PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" -PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" -PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5" -PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua" -PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib" -PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" - -# these next two options require addional layers -PACKAGECONFIG[adns] = "--with-adns=yes, --with-adns=no, adns" -PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" - -EXTRA_OECONF += "--with-qt=no --enable-usr-local=no --enable-tshark --with-pcap=no --enable-pcap-ng-default" - -do_configure_prepend() { - # force to use fallback - sed -i -e '/^glib_prefix/s/=.*$/=""/' ${S}/aclocal-flags -} - -ALLOW_EMPTY_${PN} = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb new file mode 100644 index 0000000000..683321657b --- /dev/null +++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb @@ -0,0 +1,57 @@ +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 pcre expat glib-2.0 sbc" + +SRC_URI = " \ + http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \ + file://Do-not-set-CC_FOR_BUILD-flags.patch \ +" + +PE = "1" + +SRC_URI[md5sum] = "acfa156fd35cb66c867b1ace992e4b5b" +SRC_URI[sha256sum] = "de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" + +# Works with either gtk+ or gtk3. +WHICH_GTK = "gtk3" + +PACKAGECONFIG ??= "libcap gnutls libnl" +PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${WHICH_GTK} graphics", "", d)}" +PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" + +PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_DIR_HOST}, --with-libcap=no, libcap" +PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" +PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" +PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" +PACKAGECONFIG[gtk2] = "--with-gtk2=yes, --with-gtk2=no, gtk+" +PACKAGECONFIG[gtk3] = "--with-gtk3=yes, --with-gtk3=no, gtk+3" +PACKAGECONFIG[graphics] = "--enable-wireshark, --disable-wireshark," +PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6," +PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" +PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" +PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5" +PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua" +PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib" +PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" + +# these next two options require addional layers +PACKAGECONFIG[adns] = "--with-adns=yes, --with-adns=no, adns" +PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" + +EXTRA_OECONF += "--with-qt=no --enable-usr-local=no --enable-tshark --with-pcap=no --enable-pcap-ng-default" + +do_configure_prepend() { + # force to use fallback + sed -i -e '/^glib_prefix/s/=.*$/=""/' ${S}/aclocal-flags +} + +ALLOW_EMPTY_${PN} = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -- cgit 1.2.3-korg