diff options
-rw-r--r-- | patches/libxml2-2.9.7/0100-Out-of-bounds-read-in-htmlParseTryOrFinish.patch | 31 | ||||
-rw-r--r-- | patches/libxml2-2.9.7/series | 7 | ||||
-rw-r--r-- | patches/libxml2-2.9.9/0200-xml2-config-is-not-SYSROOT-aware.patch (renamed from patches/libxml2-2.9.7/0200-xml2-config-is-not-SYSROOT-aware.patch) | 0 | ||||
-rw-r--r-- | patches/libxml2-2.9.9/series | 5 | ||||
-rw-r--r-- | rules/libxml2.make | 4 |
5 files changed, 7 insertions, 40 deletions
diff --git a/patches/libxml2-2.9.7/0100-Out-of-bounds-read-in-htmlParseTryOrFinish.patch b/patches/libxml2-2.9.7/0100-Out-of-bounds-read-in-htmlParseTryOrFinish.patch deleted file mode 100644 index c23cb47e5..000000000 --- a/patches/libxml2-2.9.7/0100-Out-of-bounds-read-in-htmlParseTryOrFinish.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Marcus Meissner <meissner@suse.de> -Date: Wed, 3 Jan 2018 14:43:41 +0100 -Subject: [PATCH] Out-of-bounds read in htmlParseTryOrFinish - -Origin: vendor, https://bugzilla.novell.com/attachment.cgi?id=732309 -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=775200 -Bug-Debian: https://bugs.debian.org/862450 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-8872 -Bug-SUSE: https://bugzilla.novell.com/show_bug.cgi?id=1038444 -Forwarded: yes, https://bugzilla.gnome.org/attachment.cgi?id=366193 -Reviewed-by: Salvatore Bonaccorso <carnil@debian.org> -Last-Update: 2018-01-03 ---- - 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; - } - } - diff --git a/patches/libxml2-2.9.7/series b/patches/libxml2-2.9.7/series deleted file mode 100644 index 07fceed7b..000000000 --- a/patches/libxml2-2.9.7/series +++ /dev/null @@ -1,7 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -#tag:debian --start-number 100 -0100-Out-of-bounds-read-in-htmlParseTryOrFinish.patch -#tag:ptx --start-number 200 -0200-xml2-config-is-not-SYSROOT-aware.patch -# 5b451bf42a96789ecd1e84388af58f95 - git-ptx-patches magic diff --git a/patches/libxml2-2.9.7/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.9.9/0200-xml2-config-is-not-SYSROOT-aware.patch index 81a76383b..81a76383b 100644 --- a/patches/libxml2-2.9.7/0200-xml2-config-is-not-SYSROOT-aware.patch +++ b/patches/libxml2-2.9.9/0200-xml2-config-is-not-SYSROOT-aware.patch diff --git a/patches/libxml2-2.9.9/series b/patches/libxml2-2.9.9/series new file mode 100644 index 000000000..198075fbf --- /dev/null +++ b/patches/libxml2-2.9.9/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +#tag:ptx --start-number 200 +0200-xml2-config-is-not-SYSROOT-aware.patch +# 9a7de85eef8cb30919e83bc9b2e42cd9 - git-ptx-patches magic diff --git a/rules/libxml2.make b/rules/libxml2.make index ab8c6f561..234e85f3e 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2 # # Paths and names # -LIBXML2_VERSION := 2.9.7 -LIBXML2_MD5 := 896608641a08b465098a40ddf51cefba +LIBXML2_VERSION := 2.9.9 +LIBXML2_MD5 := c04a5a0a042eaa157e8e8c9eabe76bd6 LIBXML2 := libxml2-$(LIBXML2_VERSION) LIBXML2_SUFFIX := tar.gz LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX) |