package/wireshark: fix build with uclibc
PATCH 1/2 package/wireshark: fix build with uclibc
Fixes:
- http://autobuild.buildroot.org/results/c41d42fe3489bc63c42e7ce7a9eccb1b4ca7b9b2
--- ...acket-gtp.c-rename-_header-to-_ext_header.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/wireshark/0001-packet-gtp.c-rename-_header-to-_ext_header.patch
package/wireshark/0001-packet-gtp.c-rename-_header-to-_ext_header.patch new file +46 -0
@@ -0,0 +1,46 @@ +From 76ff5f9ffa1807aa2bf37a565e583e6c18bd3017 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Tue, 5 Mar 2019 21:32:17 +0100 +Subject: [PATCH] packet-gtp.c: rename _header to _ext_header + +In uclibc, _header is already in sigcontext.h: + +packet-gtp.c:2361:16: error: redefinition of 'struct _header' + typedef struct _header { + ^~~~~~~ +In file included from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/bits/sigcontext.h:30:0, + from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/signal.h:311, + from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, + from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib.h:34, + from ../../epan/proto.h:28, + from ../../epan/packet.h:14, + from packet-gtp.c:43: +/home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/asm/sigcontext.h:173:8: note: originally defined here + struct _header { + +Fixes: + - http://autobuild.buildroot.org/results/c41d42fe3489bc63c42e7ce7a9eccb1b4ca7b9b2 + +Change-Id: I78116233c2a8dd7c54723b7cb558254bd5143bd2 +Signed-off-by: Fabrice Fontaine <[email protected]> +[Upstream status: https://code.wireshark.org/review/#/c/32335/] +--- + epan/dissectors/packet-gtp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c +index 4c40e7aa54..2ff31d6573 100644 +--- a/epan/dissectors/packet-gtp.c ++++ b/epan/dissectors/packet-gtp.c +@@ -2661,7 +2661,7 @@ id_to_str(tvbuff_t *tvb, gint offset) + /* Next definitions and function check_field_presence checks if given field + * in GTP packet is compliant with ETSI + */ +-typedef struct _header { ++typedef struct _ext_header { + guint8 code; + guint8 presence; + } ext_header; +-- +2.14.1 +
Signature · 1 line
2.14.1
PATCH 2/2 package/wireshark: security bump to version 2.6.7
Fixes CVE-2019-9208, CVE-2019-9209 and CVE-2019-9214
--- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
package/wireshark/wireshark.hash +2 -2
@@ -1,4 +1,4 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.6.6.txt -sha256 487933ea075bdbb25d8df06017d9c4f49fc20eb7f6ec80af086718ed5550e863 wireshark-2.6.6.tar.xz +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.6.7.txt +sha256 747b3e7a37414942959f76f198be49dcbcca936bda538c4408942ce71bfd2b71 wireshark-2.6.7.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING
package/wireshark/wireshark.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.6.6 +WIRESHARK_VERSION = 2.6.7 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH 2/2 package/wireshark: security bump to version 2.6.7
Quoted 7 lines · On Tue, 5 Mar 2019 22:05:46 +0100 Fabrice Fontaine…
Fixes CVE-2019-9208, CVE-2019-9209 and CVE-2019-9214
Signed-off-by Fabrice Fontaine <[email protected]>--- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/2 package/wireshark: security bump to version 2.6.7
In reply to Fabrice FontaineQuoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Fixes CVE-2019-9208, CVE-2019-9209 and CVE-2019-9214
Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2018.02.x, 2018.11.x and 2019.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 package/wireshark: fix build with uclibc
In reply to Fabrice FontaineQuoted 8 lines · On Tue, 5 Mar 2019 22:05:45 +0100 Fabrice Fontaine…
Fixes:
- http://autobuild.buildroot.org/results/c41d42fe3489bc63c42e7ce7a9eccb1b4ca7b9b2Signed-off-by Fabrice Fontaine <[email protected]>--- ...acket-gtp.c-rename-_header-to-_ext_header.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/wireshark/0001-packet-gtp.c-rename-_header-to-_ext_header.patch
Could you resend this patch, updated to use the patch that was accepted upstream ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com