From f316c4a32686e57c4b65e659fbf7d7936ac39ff6 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Wed, 8 Jun 2016 00:44:48 -0700 Subject: wireshark: update to 2.0.4 The following vulnerabilities have been fixed: * [1]wnpa-sec-2016-29 The SPOOLS dissector could go into an infinite loop. Discovered by the CESG. * [2]wnpa-sec-2016-30 The IEEE 802.11 dissector could crash. ([3]Bug 11585) * [4]wnpa-sec-2016-31 The IEEE 802.11 dissector could crash. Discovered by Mateusz Jurczyk. ([5]Bug 12175) * [6]wnpa-sec-2016-32 The UMTS FP dissector could crash. ([7]Bug 12191) * [8]wnpa-sec-2016-33 Some USB dissectors could crash. Discovered by Mateusz Jurczyk. ([9]Bug 12356) * [10]wnpa-sec-2016-34 The Toshiba file parser could crash. Discovered by iDefense Labs. ([11]Bug 12394) * [12]wnpa-sec-2016-35 The CoSine file parser could crash. Discovered by iDefense Labs. ([13]Bug 12395) * [14]wnpa-sec-2016-36 The NetScreen file parser could crash. Discovered by iDefense Labs. ([15]Bug 12396) * [16]wnpa-sec-2016-37 The Ethernet dissector could crash. ([17]Bug 12440) Signed-off-by: Armin Kuster Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../recipes-support/wireshark/wireshark_2.0.3.bb | 60 ---------------------- .../recipes-support/wireshark/wireshark_2.0.4.bb | 60 ++++++++++++++++++++++ 2 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 meta-networking/recipes-support/wireshark/wireshark_2.0.3.bb create mode 100644 meta-networking/recipes-support/wireshark/wireshark_2.0.4.bb diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.0.3.bb b/meta-networking/recipes-support/wireshark/wireshark_2.0.3.bb deleted file mode 100644 index 76cb30a915..0000000000 --- a/meta-networking/recipes-support/wireshark/wireshark_2.0.3.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "wireshark - a popular network protocol analyzer" -HOMEPAGE = "http://www.wireshark.org" -SECTION = "net" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0" - -DEPENDS = "perl-native pcre expat glib-2.0 sbc" - -SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" - -SRC_URI[md5sum] = "62dc20f5a77542feed2e38f18db8ae3b" -SRC_URI[sha256sum] = "e196376e75fe21fdef41b4eaa27ce2e1b2b561e7f7b20328a8e96657cc4465fc" - -PE = "1" - -inherit autotools pkgconfig - -ARM_INSTRUCTION_SET = "arm" - -# Works with either gtk+ or gtk3. -WHICH_GTK = "gtk+" - -PACKAGECONFIG ?= "libpcap gnutls libnl libcap" -PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" -PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" -#PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" - -PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap" -PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_LIBDIR} --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default , libpcap" -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[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" -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" -PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" - -# 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 --enable-rawshark" - -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" - -FILES_${PN} += "${datadir}*" diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.0.4.bb b/meta-networking/recipes-support/wireshark/wireshark_2.0.4.bb new file mode 100644 index 0000000000..8aec230edd --- /dev/null +++ b/meta-networking/recipes-support/wireshark/wireshark_2.0.4.bb @@ -0,0 +1,60 @@ +DESCRIPTION = "wireshark - a popular network protocol analyzer" +HOMEPAGE = "http://www.wireshark.org" +SECTION = "net" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0" + +DEPENDS = "perl-native pcre expat glib-2.0 sbc" + +SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" + +SRC_URI[md5sum] = "622928dc6cb31c227c672ec3ec697f28" +SRC_URI[sha256sum] = "9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5" + +PE = "1" + +inherit autotools pkgconfig + +ARM_INSTRUCTION_SET = "arm" + +# Works with either gtk+ or gtk3. +WHICH_GTK = "gtk+" + +PACKAGECONFIG ?= "libpcap gnutls libnl libcap" +PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" +PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" +#PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" + +PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap" +PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_LIBDIR} --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default , libpcap" +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[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" +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" +PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" + +# 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 --enable-rawshark" + +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" + +FILES_${PN} += "${datadir}*" -- cgit 1.2.3-korg