* [Buildroot] [PATCH] wireshark: security bump to version 1.12.5
@ 2015-06-01 15:26 Gustavo Zacarias
2015-06-01 21:54 ` Peter Korsgaard
0 siblings, 1 reply; 2+ messages in thread
From: Gustavo Zacarias @ 2015-06-01 15:26 UTC (permalink / raw)
To: buildroot
Fixes:
CVE-2015-3808 CVE-2015-3809 - The LBMR dissector could go into an
infinite loop.
CVE-2015-3811 - The WCP dissector could crash while decompressing data.
CVE-2015-3812 - The X11 dissector could leak memory.
CVE-2015-3813 - The packet reassembly code could leak memory.
CVE-2015-3814 - The IEEE 802.11 dissector could go into an infinite
loop.
CVE-2015-3815 - The Android Logcat file parser could crash.
Patch upstream so drop and disable autoreconf.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
...001-fix-wrong-cflags-for-build-assumption.patch | 38 ----------------------
package/wireshark/wireshark.hash | 6 ++--
package/wireshark/wireshark.mk | 4 +--
3 files changed, 4 insertions(+), 44 deletions(-)
delete mode 100644 package/wireshark/0001-fix-wrong-cflags-for-build-assumption.patch
diff --git a/package/wireshark/0001-fix-wrong-cflags-for-build-assumption.patch b/package/wireshark/0001-fix-wrong-cflags-for-build-assumption.patch
deleted file mode 100644
index 14cb957..0000000
--- a/package/wireshark/0001-fix-wrong-cflags-for-build-assumption.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-AC_WIRESHARK_GCC_CFLAGS_CHECK checks for valid CFLAGS against CC and pushes
-them into CFLAGS and CFLAGS_FOR_BUILD.
-This is wrong since CC_FOR_BUILD might be wildly different and older than CC
-leading to build errors.
-
-Upstream status: reported in tracker
-https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9507
-
-Patch status: Interim to fix:
-http://autobuild.buildroot.net/results/2b1/2b1a0654b649618422d65edf370b82476ba84491/
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura wireshark-1.12.0.orig/acinclude.m4 wireshark-1.12.0/acinclude.m4
---- wireshark-1.12.0.orig/acinclude.m4 2014-09-04 15:45:38.365255309 -0300
-+++ wireshark-1.12.0/acinclude.m4 2014-09-04 15:46:23.349810353 -0300
-@@ -1755,10 +1755,6 @@
- # just the new option.
- #
- CFLAGS="$CFLAGS_saved $GCC_OPTION"
-- #
-- # Add it to the flags we use when building build tools.
-- #
-- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
- ],
- [
- AC_MSG_RESULT(yes)
-@@ -1771,10 +1767,6 @@
- # just the new option.
- #
- CFLAGS="$CFLAGS_saved $GCC_OPTION"
-- #
-- # Add it to the flags we use when building build tools.
-- #
-- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
- fi
- ],
- [
diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash
index fa4cf18..35eb1a2 100644
--- a/package/wireshark/wireshark.hash
+++ b/package/wireshark/wireshark.hash
@@ -1,3 +1,3 @@
-# From https://www.wireshark.org/download/SIGNATURES-1.12.4.txt
-md5 acfa156fd35cb66c867b1ace992e4b5b wireshark-1.12.4.tar.bz2
-sha1 dbbd4090c02fe170f35b26fa26d8aba0b399c659 wireshark-1.12.4.tar.bz2
+# From https://www.wireshark.org/download/SIGNATURES-1.12.5.txt
+md5 9ee199dde4f36a3d71f7b81dd6764e93 wireshark-1.12.5.tar.bz2
+sha1 379686f0b6355ae2e6b3f7055578317a07ce5590 wireshark-1.12.5.tar.bz2
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 434687c..eb56808 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -4,14 +4,12 @@
#
################################################################################
-WIRESHARK_VERSION = 1.12.4
+WIRESHARK_VERSION = 1.12.5
WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
WIRESHARK_LICENSE = wireshark license
WIRESHARK_LICENSE_FILES = COPYING
WIRESHARK_DEPENDENCIES = libpcap libgcrypt libglib2
-# For wrong cflags patch
-WIRESHARK_AUTORECONF = YES
WIRESHARK_CONF_ENV = \
LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
--
2.3.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] wireshark: security bump to version 1.12.5
2015-06-01 15:26 [Buildroot] [PATCH] wireshark: security bump to version 1.12.5 Gustavo Zacarias
@ 2015-06-01 21:54 ` Peter Korsgaard
0 siblings, 0 replies; 2+ messages in thread
From: Peter Korsgaard @ 2015-06-01 21:54 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
> Fixes:
> CVE-2015-3808 CVE-2015-3809 - The LBMR dissector could go into an
> infinite loop.
> CVE-2015-3811 - The WCP dissector could crash while decompressing data.
> CVE-2015-3812 - The X11 dissector could leak memory.
> CVE-2015-3813 - The packet reassembly code could leak memory.
> CVE-2015-3814 - The IEEE 802.11 dissector could go into an infinite
> loop.
> CVE-2015-3815 - The Android Logcat file parser could crash.
> Patch upstream so drop and disable autoreconf.
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-01 21:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-01 15:26 [Buildroot] [PATCH] wireshark: security bump to version 1.12.5 Gustavo Zacarias
2015-06-01 21:54 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.