update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
From 8b329effb610f4138e4e680f6a6867570f6d6179 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Fri, 9 Feb 2018 10:58:11 +0200
|
||||
Subject: [PATCH] CVE-2017-8872
|
||||
|
||||
Taken from attachment to upstream bug report comment #9.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=775200#c9
|
||||
https://bugzilla.gnome.org/attachment.cgi?id=366193&action=diff
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
parser.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/parser.c b/parser.c
|
||||
index 1c5e036ea265..025111067ae8 100644
|
||||
--- a/parser.c
|
||||
+++ b/parser.c
|
||||
@@ -12467,6 +12467,10 @@ xmlHaltParser(xmlParserCtxtPtr ctxt) {
|
||||
ctxt->input->cur = BAD_CAST"";
|
||||
ctxt->input->base = ctxt->input->cur;
|
||||
ctxt->input->end = ctxt->input->cur;
|
||||
+ if (ctxt->input->buf)
|
||||
+ xmlBufEmpty (ctxt->input->buf->buffer);
|
||||
+ else
|
||||
+ ctxt->input->length = 0;
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.15.1
|
||||
|
||||
6
bsp/buildroot-2017.02.11/package/libxml2/Config.in
Normal file
6
bsp/buildroot-2017.02.11/package/libxml2/Config.in
Normal file
@@ -0,0 +1,6 @@
|
||||
config BR2_PACKAGE_LIBXML2
|
||||
bool "libxml2"
|
||||
help
|
||||
XML C Parser
|
||||
|
||||
http://xmlsoft.org/
|
||||
4
bsp/buildroot-2017.02.11/package/libxml2/libxml2.hash
Normal file
4
bsp/buildroot-2017.02.11/package/libxml2/libxml2.hash
Normal file
@@ -0,0 +1,4 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c libxml2-2.9.7.tar.gz
|
||||
# License files, locally calculated
|
||||
sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING
|
||||
52
bsp/buildroot-2017.02.11/package/libxml2/libxml2.mk
Normal file
52
bsp/buildroot-2017.02.11/package/libxml2/libxml2.mk
Normal file
@@ -0,0 +1,52 @@
|
||||
################################################################################
|
||||
#
|
||||
# libxml2
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBXML2_VERSION = 2.9.7
|
||||
LIBXML2_SITE = ftp://xmlsoft.org/libxml2
|
||||
LIBXML2_INSTALL_STAGING = YES
|
||||
LIBXML2_LICENSE = MIT
|
||||
LIBXML2_LICENSE_FILES = COPYING
|
||||
LIBXML2_CONFIG_SCRIPTS = xml2-config
|
||||
|
||||
# relocation truncated to fit: R_68K_GOT16O
|
||||
ifeq ($(BR2_m68k_cf),y)
|
||||
LIBXML2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot"
|
||||
endif
|
||||
|
||||
LIBXML2_CONF_OPTS = --with-gnu-ld --without-python --without-debug
|
||||
|
||||
HOST_LIBXML2_DEPENDENCIES = host-pkgconf
|
||||
LIBXML2_DEPENDENCIES = host-pkgconf
|
||||
|
||||
HOST_LIBXML2_CONF_OPTS = --without-zlib --without-lzma --without-python
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
LIBXML2_DEPENDENCIES += zlib
|
||||
LIBXML2_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr
|
||||
else
|
||||
LIBXML2_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XZ),y)
|
||||
LIBXML2_DEPENDENCIES += xz
|
||||
LIBXML2_CONF_OPTS += --with-lzma
|
||||
else
|
||||
LIBXML2_CONF_OPTS += --without-lzma
|
||||
endif
|
||||
|
||||
LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
|
||||
ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y)
|
||||
LIBXML2_CONF_OPTS += --with-iconv
|
||||
else
|
||||
LIBXML2_CONF_OPTS += --without-iconv
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
# libxml2 for the host
|
||||
LIBXML2_HOST_BINARY = $(HOST_DIR)/usr/bin/xmllint
|
||||
Reference in New Issue
Block a user