diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-12-03 17:18:24 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-12-07 09:54:01 -0500 |
| commit | 821060f3f66a45acd8b5726e8f7ecdd879754341 (patch) | |
| tree | 977a3a46b044806118250135a9ca48d4bda1a163 /gnu/packages/patches/libxml2-bug-737840.patch | |
| parent | 86c8f1daf8ed10f13f2b1e973a28845629b8ce47 (diff) | |
| download | guix-821060f3f66a45acd8b5726e8f7ecdd879754341.tar guix-821060f3f66a45acd8b5726e8f7ecdd879754341.tar.gz | |
gnu: libxml2: Update to 2.9.3.
* 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: Delete files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/xml.scm (libxml2): Update to 2.9.3. Remove patches.
Diffstat (limited to 'gnu/packages/patches/libxml2-bug-737840.patch')
| -rw-r--r-- | gnu/packages/patches/libxml2-bug-737840.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/gnu/packages/patches/libxml2-bug-737840.patch b/gnu/packages/patches/libxml2-bug-737840.patch deleted file mode 100644 index 2a2d62c583..0000000000 --- a/gnu/packages/patches/libxml2-bug-737840.patch +++ /dev/null @@ -1,88 +0,0 @@ -From ef709ce2f7b792d5fb69ed142796d743fb1eb388 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Thu, 10 Sep 2015 19:41:41 +0800 -Subject: [PATCH] Fix the spurious ID already defined error - -For https://bugzilla.gnome.org/show_bug.cgi?id=737840 -the fix for 724903 introduced a regression on external entities carrying -IDs, revert that patch in part and add a specific test to avoid readding it ---- - result/valid/737840.xml | 10 ++++++++++ - result/valid/737840.xml.err | 0 - result/valid/737840.xml.err.rdr | 0 - test/valid/737840.xml | 10 ++++++++++ - test/valid/dtds/737840.ent | 1 + - valid.c | 6 ++++-- - 6 files changed, 25 insertions(+), 2 deletions(-) - create mode 100644 result/valid/737840.xml - create mode 100644 result/valid/737840.xml.err - create mode 100644 result/valid/737840.xml.err.rdr - create mode 100644 test/valid/737840.xml - create mode 100644 test/valid/dtds/737840.ent - -diff --git a/result/valid/737840.xml b/result/valid/737840.xml -new file mode 100644 -index 0000000..433c6d6 ---- /dev/null -+++ b/result/valid/737840.xml -@@ -0,0 +1,10 @@ -+<?xml version="1.0"?> -+<!DOCTYPE root [ -+<!ELEMENT root (elem)> -+<!ELEMENT elem (#PCDATA)> -+<!ATTLIST elem id ID #IMPLIED> -+<!ENTITY target SYSTEM "dtds/737840.ent"> -+]> -+<root> -+ ⌖ -+</root> -diff --git a/result/valid/737840.xml.err b/result/valid/737840.xml.err -new file mode 100644 -index 0000000..e69de29 -diff --git a/result/valid/737840.xml.err.rdr b/result/valid/737840.xml.err.rdr -new file mode 100644 -index 0000000..e69de29 -diff --git a/test/valid/737840.xml b/test/valid/737840.xml -new file mode 100644 -index 0000000..2d27b73 ---- /dev/null -+++ b/test/valid/737840.xml -@@ -0,0 +1,10 @@ -+<!DOCTYPE root [ -+<!ELEMENT root (elem)> -+<!ELEMENT elem (#PCDATA)> -+<!ATTLIST elem id ID #IMPLIED> -+<!ENTITY target SYSTEM "dtds/737840.ent"> -+]> -+ -+<root> -+ ⌖ -+</root> -diff --git a/test/valid/dtds/737840.ent b/test/valid/dtds/737840.ent -new file mode 100644 -index 0000000..e972132 ---- /dev/null -+++ b/test/valid/dtds/737840.ent -@@ -0,0 +1 @@ -+<elem id="id0"/> -\ No newline at end of file -diff --git a/valid.c b/valid.c -index 409aa81..45a3f70 100644 ---- a/valid.c -+++ b/valid.c -@@ -2634,8 +2634,10 @@ xmlAddID(xmlValidCtxtPtr ctxt, xmlDocPtr doc, const xmlChar *value, - /* - * The id is already defined in this DTD. - */ -- xmlErrValidNode(ctxt, attr->parent, XML_DTD_ID_REDEFINED, -- "ID %s already defined\n", value, NULL, NULL); -+ if (ctxt != NULL) { -+ xmlErrValidNode(ctxt, attr->parent, XML_DTD_ID_REDEFINED, -+ "ID %s already defined\n", value, NULL, NULL); -+ } - #endif /* LIBXML_VALID_ENABLED */ - xmlFreeID(ret); - return(NULL); --- -2.6.3 - |