Skip to contentSkip to conversation

wireshark: update to 12.1

PATCH In review Armin Kuster 2 participants 3 messages Sep 16, 2014 – Sep 24, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 .../{wireshark_1.12.0.bb => wireshark_1.12.1.bb}    | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_1.12.0.bb => wireshark_1.12.1.bb} (90%)
meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb +10 -11
similarity index 90%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb
rename to meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb
index 39a24dc..71cc082 100644
@@ -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"
-
Signature · 1 line
1.9.1
#1 lore raw

Merged, thanks Armin. I also included Roy's patch for the BUILD_CFLAGS since, looking at my own build logs when cross-building, it looks like it is required, but please let me know if you think it's inappropriate.

Thanks,
-J.

Quoted 69 lines · [[oe] [meta-networking][PATCH] wireshark: update to 12.1] On 14.09.16 (Tue…

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.

---
 .../{wireshark_1.12.0.bb => wireshark_1.12.1.bb}    | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
 rename meta-networking/recipes-support/wireshark/{wireshark_1.12.0.bb => wireshark_1.12.1.bb} (90%)
meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb +10 -11
similarity index 90%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb
rename to meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb
index 39a24dc..71cc082 100644
@@ -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"
-
Signature · 1 line
1.9.1
Signature · 2 lines
-Joe MacDonald.
:wq
author
#2 lore raw
Quoted 1 line · Joe MacDonald

Merged, thanks Armin.

Thanks.

I also included Roy's patch for the BUILD_CFLAGS

Quoted 2 lines

since, looking at my own build logs when cross-building, it looks like it is required, but please let me know if you think it's inappropriate.

no problems here.

- Armin

Quoted 77 lines

Thanks,
-J.

Quoted 71 lines · [[oe] [meta-networking][PATCH] wireshark: update to 12.1] On 14.09.16 (Tue…

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.

---
  .../{wireshark_1.12.0.bb => wireshark_1.12.1.bb}    | 21 ++++++++++-----------
  1 file changed, 10 insertions(+), 11 deletions(-)

rename meta-networking/recipes-support/wireshark/{wireshark_1.12.0.bb => wireshark_1.12.1.bb} (90%)

meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb renamed from meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb +10 -12
similarity index 90%
rename from meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb
rename to meta-networking/recipes-support/wireshark/wireshark_1.12.1.bb
index 39a24dc..71cc082 100644
@@ -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"
-
--

1.9.1