diff --git a/fix-CVE-2023-45322.patch b/fix-CVE-2023-45322.patch deleted file mode 100644 index 9ae86829676f7cc0b063377e5d9be04de94fc327..0000000000000000000000000000000000000000 --- a/fix-CVE-2023-45322.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Nurw libxml2-2.11.5/tree.c libxml2-2.11.5_new/tree.c ---- libxml2-2.11.5/tree.c 2023-08-09 20:27:38.000000000 +0800 -+++ libxml2-2.11.5_new/tree.c 2023-11-03 14:39:55.019117784 +0800 -@@ -4473,29 +4473,28 @@ - xmlStaticCopyNodeList(xmlNodePtr node, xmlDocPtr doc, xmlNodePtr parent) { - xmlNodePtr ret = NULL; - xmlNodePtr p = NULL,q; -+ xmlDtdPtr newSubset = NULL; - - while (node != NULL) { --#ifdef LIBXML_TREE_ENABLED - if (node->type == XML_DTD_NODE ) { -- if (doc == NULL) { -+#ifdef LIBXML_TREE_ENABLED -+ if ((doc == NULL) || (doc->intSubset != NULL)) { - node = node->next; - continue; - } -- if (doc->intSubset == NULL) { - q = (xmlNodePtr) xmlCopyDtd( (xmlDtdPtr) node ); - if (q == NULL) goto error; - q->doc = doc; - q->parent = parent; -- doc->intSubset = (xmlDtdPtr) q; -- xmlAddChild(parent, q); -- } else { -- q = (xmlNodePtr) doc->intSubset; -- xmlAddChild(parent, q); -- } -- } else -+ newSubset = (xmlDtdPtr) q; -+#else -+ node = node->next; -+ continue; - #endif /* LIBXML_TREE_ENABLED */ -+ } else { - q = xmlStaticCopyNode(node, doc, parent, 1); - if (q == NULL) goto error; -+ } - if (ret == NULL) { - q->prev = NULL; - ret = p = q; -@@ -4507,6 +4506,8 @@ - } - node = node->next; - } -+ if (newSubset != NULL) -+ doc->intSubset = newSubset; - return(ret); - error: - xmlFreeNodeList(ret); diff --git a/libxml2-2.11.5.tar.xz b/libxml2-2.11.5.tar.xz deleted file mode 100644 index 578d7a09247404650198dd977d6fda2bf82a0722..0000000000000000000000000000000000000000 Binary files a/libxml2-2.11.5.tar.xz and /dev/null differ diff --git a/libxml2-2.11.7.tar.xz b/libxml2-2.11.7.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..83c2b82d41fc3979fb2fc10e6b962d661cec538e Binary files /dev/null and b/libxml2-2.11.7.tar.xz differ diff --git a/libxml2.spec b/libxml2.spec index 4b2348a443abf5e165003bf93d57ba9f45dfb341..3eabd2d3fc288ef3a2f49f40e66996663429949a 100644 --- a/libxml2.spec +++ b/libxml2.spec @@ -1,6 +1,6 @@ %define anolis_release 1 Name: libxml2 -Version: 2.11.5 +Version: 2.11.7 Release: %{anolis_release}%{?dist} Summary: Library providing XML and HTML support @@ -11,7 +11,6 @@ Patch0: libxml2-multilib.patch # Patch from openSUSE. # See: https://bugzilla.gnome.org/show_bug.cgi?id=789714 Patch1: libxml2-2.11.1-python3-unicode-errors.patch -Patch2: fix-CVE-2023-45322.patch BuildRequires: cmake-rpm-macros BuildRequires: gcc @@ -157,6 +156,9 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz %doc NEWS README.md %changelog +* Thu Feb 08 2024 mgb01105731 - 2.11.7-1 +- update to 2.11.7 + * Wed Aug 16 2023 David King - 2.11.5-1 - Update to 2.11.5 and fix CVE-2023-45322