whireshark: update to 12.5

PATCH Superseded Armin Kuster 2 participants 3 messages May 15, 2015 – May 18, 2015

lore

Share & tools

lore

Armin Kuster

author

2015-05-15 20:27 UTC #0 lore raw

PATCH 1/1 whireshark: update to 12.5

fixed broken url and cleaned up the PACKAGECONFIG
removed patch as it is included in this release
update SECTION name

The following vulnerabilities have been fixed.
* [1]wnpa-sec-2015-12
The LBMR dissector could go into an infinite loop. ([2]Bug 11036) [3]CVE-2015-3808 [4]CVE-2015-3809

* [5]wnpa-sec-2015-13
The WebSocket dissector could recurse excessively. ([6]Bug 10989) [7]CVE-2015-3810

* [8]wnpa-sec-2015-14
The WCP dissector could crash while decompressing data. ([9]Bug 10978) [10]CVE-2015-3811

* [11]wnpa-sec-2015-15
The X11 dissector could leak memory. ([12]Bug 11088) [13]CVE-2015-3812

* [14]wnpa-sec-2015-16
The packet reassembly code could leak memory. ([15]Bug 11129) [16]CVE-2015-3813

* [17]wnpa-sec-2015-17
The IEEE 802.11 dissector could go into an infinite loop. ([18]Bug 11110) [19]CVE-2015-3814

* [20]wnpa-sec-2015-18
The Android Logcat file parser could crash. Discovered by Hanno Böck. ([21]Bug 11188) [22]CVE-2015-3815

Signed-off-by Armin Kuster <[email protected]>

---
 .../{wireshark_1.12.4.bb => wireshark_1.12.5.bb}   | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_1.12.4.bb => wireshark_1.12.5.bb} (65%)

meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb +12 ~~-14~~

similarity index 65%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb
rename to meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb
index 6833216..21a7ce9 100644
@@ -1,20 +1,17 @@
 DESCRIPTION = "wireshark - a popular network protocol analyzer"
 HOMEPAGE = "http://www.wireshark.org"
-SECTION = "network"
+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 = " \
-    http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \
-    file://Do-not-set-CC_FOR_BUILD-flags.patch \
-"
+SRC_URI = "https://2.na.dl.wireshark.org/src/wireshark-${PV}.tar.bz2"
 
 PE = "1"
 
-SRC_URI[md5sum] = "acfa156fd35cb66c867b1ace992e4b5b"
-SRC_URI[sha256sum] = "de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312"
+SRC_URI[md5sum] = "9ee199dde4f36a3d71f7b81dd6764e93"
+SRC_URI[sha256sum] = "d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82"
 
 inherit autotools pkgconfig

@@ -23,14 +20,15 @@ ARM_INSTRUCTION_SET = "arm"
 # Works with either gtk+ or gtk3.
 WHICH_GTK = "gtk3"
 
-PACKAGECONFIG ??= "libcap gnutls libnl"
+PACKAGECONFIG ?= "libpcap gnutls libnl libcap"
 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[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,"

@@ -39,14 +37,14 @@ 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[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"
+EXTRA_OECONF += "--with-qt=no --enable-usr-local=no --enable-tshark --enable-rawshark"
 
 do_configure_prepend() {
     # force to use fallback

Signature · 1 line

2.3.5

Martin Jansa

2015-05-17 07:55 UTC #1 lore raw

Quoted 79 lines · Armin Kuster

fixed broken url and cleaned up the PACKAGECONFIG
removed patch as it is included in this release
update SECTION name
The following vulnerabilities have been fixed.
* [1]wnpa-sec-2015-12
The LBMR dissector could go into an infinite loop. ([2]Bug 11036) [3]CVE-2015-3808 [4]CVE-2015-3809
* [5]wnpa-sec-2015-13
The WebSocket dissector could recurse excessively. ([6]Bug 10989) [7]CVE-2015-3810
* [8]wnpa-sec-2015-14
The WCP dissector could crash while decompressing data. ([9]Bug 10978) [10]CVE-2015-3811
* [11]wnpa-sec-2015-15
The X11 dissector could leak memory. ([12]Bug 11088) [13]CVE-2015-3812
* [14]wnpa-sec-2015-16
The packet reassembly code could leak memory. ([15]Bug 11129) [16]CVE-2015-3813
* [17]wnpa-sec-2015-17
The IEEE 802.11 dissector could go into an infinite loop. ([18]Bug 11110) [19]CVE-2015-3814
* [20]wnpa-sec-2015-18
The Android Logcat file parser could crash. Discovered by Hanno Böck. ([21]Bug 11188) [22]CVE-2015-3815
Signed-off-by Armin Kuster <[email protected]>
---
 .../{wireshark_1.12.4.bb => wireshark_1.12.5.bb}   | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_1.12.4.bb => wireshark_1.12.5.bb} (65%)
meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb +5 -8
similarity index 65%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb
rename to meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb
index 6833216..21a7ce9 100644
@@ -1,20 +1,17 @@
 DESCRIPTION = "wireshark - a popular network protocol analyzer"
 HOMEPAGE = "http://www.wireshark.org"
-SECTION = "network"
+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 = " \
-    http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \
-    file://Do-not-set-CC_FOR_BUILD-flags.patch \
-"
+SRC_URI = "https://2.na.dl.wireshark.org/src/wireshark-${PV}.tar.bz2"
 
 PE = "1"
 
-SRC_URI[md5sum] = "acfa156fd35cb66c867b1ace992e4b5b"
-SRC_URI[sha256sum] = "de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312"
+SRC_URI[md5sum] = "9ee199dde4f36a3d71f7b81dd6764e93"
+SRC_URI[sha256sum] = "d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82"
 
 inherit autotools pkgconfig
 
@@ -23,14 +20,15 @@ ARM_INSTRUCTION_SET = "arm"
 # Works with either gtk+ or gtk3.
 WHICH_GTK = "gtk3"
 
-PACKAGECONFIG ??= "libcap gnutls libnl"
+PACKAGECONFIG ?= "libpcap gnutls libnl libcap"
 PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${WHICH_GTK}  graphics", "", d)}"
 PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"

meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb ARM_INSTRUCTION_SET = "arm" · line 31

Quoted 10 lines

meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb +5 -4

 
-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[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"

Why do you add leading space before first --with?

meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" · line 40

Quoted 9 lines

meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb +1 -1

 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,"

@@ -39,14 +37,14 @@ 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[zlib] = " -with-zlib=yes, --with-zlib=no, zlib"

This doesn't look correct

I've removed leading spaces before --with and added - here when cherry-picking to master-next (if you agree you don't need to resend).

Quoted 19 lines

meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb +1 -1

 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"
+EXTRA_OECONF += "--with-qt=no --enable-usr-local=no --enable-tshark --enable-rawshark"
 
 do_configure_prepend() {
     # force to use fallback

Signature · 7 lines

2.3.5

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

akuster808

author

2015-05-18 02:58 UTC #2 lore raw

Quoted 81 lines · Martin Jansa

Quoted 80 lines · Armin Kuster
fixed broken url and cleaned up the PACKAGECONFIG
removed patch as it is included in this release
update SECTION name
The following vulnerabilities have been fixed.
* [1]wnpa-sec-2015-12
The LBMR dissector could go into an infinite loop. ([2]Bug 11036) [3]CVE-2015-3808 [4]CVE-2015-3809
* [5]wnpa-sec-2015-13
The WebSocket dissector could recurse excessively. ([6]Bug 10989) [7]CVE-2015-3810
* [8]wnpa-sec-2015-14
The WCP dissector could crash while decompressing data. ([9]Bug 10978) [10]CVE-2015-3811
* [11]wnpa-sec-2015-15
The X11 dissector could leak memory. ([12]Bug 11088) [13]CVE-2015-3812
* [14]wnpa-sec-2015-16
The packet reassembly code could leak memory. ([15]Bug 11129) [16]CVE-2015-3813
* [17]wnpa-sec-2015-17
The IEEE 802.11 dissector could go into an infinite loop. ([18]Bug 11110) [19]CVE-2015-3814
* [20]wnpa-sec-2015-18
The Android Logcat file parser could crash. Discovered by Hanno Böck. ([21]Bug 11188) [22]CVE-2015-3815
Signed-off-by Armin Kuster <[email protected]>
---
 .../{wireshark_1.12.4.bb => wireshark_1.12.5.bb}   | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_1.12.4.bb => wireshark_1.12.5.bb} (65%)
meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb +5 -8
similarity index 65%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb
rename to meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb
index 6833216..21a7ce9 100644
@@ -1,20 +1,17 @@
 DESCRIPTION = "wireshark - a popular network protocol analyzer"
 HOMEPAGE = "http://www.wireshark.org"
-SECTION = "network"
+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 = " \
-    http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \
-    file://Do-not-set-CC_FOR_BUILD-flags.patch \
-"
+SRC_URI = "https://2.na.dl.wireshark.org/src/wireshark-${PV}.tar.bz2"
 
 PE = "1"
 
-SRC_URI[md5sum] = "acfa156fd35cb66c867b1ace992e4b5b"
-SRC_URI[sha256sum] = "de804e98e252e4b795d28d6ac2d48d7f5aacd9b046ee44d44266983795ebc312"
+SRC_URI[md5sum] = "9ee199dde4f36a3d71f7b81dd6764e93"
+SRC_URI[sha256sum] = "d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82"
 
 inherit autotools pkgconfig
 
@@ -23,14 +20,15 @@ ARM_INSTRUCTION_SET = "arm"
 # Works with either gtk+ or gtk3.
 WHICH_GTK = "gtk3"
 
-PACKAGECONFIG ??= "libcap gnutls libnl"
+PACKAGECONFIG ?= "libpcap gnutls libnl libcap"
 PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${WHICH_GTK}  graphics", "", d)}"
 PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
 

Quoted 10 lines

meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb ARM_INSTRUCTION_SET = "arm" · line 31

Quoted 9 lines

meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb +5 -4

-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[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"

Why do you add leading space before first --with?

I am a dork.

Quoted 11 lines

meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" · line 40
Quoted 10 lines
meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb +1 -1
 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,"
@@ -39,14 +37,14 @@ 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[zlib] = " -with-zlib=yes, --with-zlib=no, zlib"
This doesn't look correct

You are correct. that is not right.

Quoted 3 lines

I've removed leading spaces before --with and added - here when cherry-picking to master-next (if you agree you don't need to resend).

I agree.

Many thanks,
Armin

Quoted 20 lines

meta-networking/recipes-support/wireshark/wireshark_1.12.5.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.4.bb +1 -1

 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"
+EXTRA_OECONF += "--with-qt=no --enable-usr-local=no --enable-tshark --enable-rawshark"
 
 do_configure_prepend() {
     # force to use fallback

Signature · 7 lines

2.3.5

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel