From ee6bb0cc763507b165674dbe03c6ae5d26c8da5c Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Sun, 15 Nov 2015 14:16:57 -0500
Subject: gnu: libxml2: Add fixes for CVE-2015-{1819,7941,7942,8035} and other
 bugs.

* gnu/packages/patches/libxml2-CVE-2015-1819.patch,
  gnu/packages/patches/libxml2-CVE-2015-7941-pt1.patch,
  gnu/packages/patches/libxml2-CVE-2015-7941-pt2.patch,
  gnu/packages/patches/libxml2-CVE-2015-7942-pt1.patch,
  gnu/packages/patches/libxml2-CVE-2015-7942-pt2.patch,
  gnu/packages/patches/libxml2-CVE-2015-8035.patch,
  gnu/packages/patches/libxml2-bug-737840.patch,
  gnu/packages/patches/libxml2-bug-738805.patch,
  gnu/packages/patches/libxml2-bug-746048.patch,
  gnu/packages/patches/libxml2-bug-747437.patch,
  gnu/packages/patches/libxml2-bug-751603.patch,
  gnu/packages/patches/libxml2-bug-751631.patch,
  gnu/packages/patches/libxml2-bug-754946.patch,
  gnu/packages/patches/libxml2-bug-754947.patch,
  gnu/packages/patches/libxml2-bug-755857.patch,
  gnu/packages/patches/libxml2-fix-catalog-corruption.patch,
  gnu/packages/patches/libxml2-id-attrs-in-xmlSetTreeDoc.patch,
  gnu/packages/patches/libxml2-node-sort-order-pt1.patch,
  gnu/packages/patches/libxml2-node-sort-order-pt2.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/xml.scm (libxml2)[source]: Add patches.
---
 .../patches/libxml2-node-sort-order-pt1.patch      | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 gnu/packages/patches/libxml2-node-sort-order-pt1.patch

(limited to 'gnu/packages/patches/libxml2-node-sort-order-pt1.patch')

diff --git a/gnu/packages/patches/libxml2-node-sort-order-pt1.patch b/gnu/packages/patches/libxml2-node-sort-order-pt1.patch
new file mode 100644
index 0000000000..181a0727ec
--- /dev/null
+++ b/gnu/packages/patches/libxml2-node-sort-order-pt1.patch
@@ -0,0 +1,33 @@
+From ba58f23c60862f2158b457f4d30031761bf4dde1 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Sun, 8 Mar 2015 16:44:11 +0100
+Subject: [PATCH] Fix order of root nodes
+
+Make sure root nodes are sorted before other nodes.
+---
+ xpath.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xpath.c b/xpath.c
+index ffd2a48..e9f5bf9 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -361,13 +361,13 @@ turtle_comparison:
+     /*
+      * compute depth to root
+      */
+-    for (depth2 = 0, cur = node2;cur->parent != NULL;cur = cur->parent) {
++    for (depth2 = 0, cur = node2; cur != NULL; cur = cur->parent) {
+ 	if (cur == node1)
+ 	    return(1);
+ 	depth2++;
+     }
+     root = cur;
+-    for (depth1 = 0, cur = node1;cur->parent != NULL;cur = cur->parent) {
++    for (depth1 = 0, cur = node1; cur != NULL; cur = cur->parent) {
+ 	if (cur == node2)
+ 	    return(-1);
+ 	depth1++;
+-- 
+2.6.3
+
-- 
cgit v1.2.3