开源软件构建与测试

_service:tar_scm:libxslt.spec Changed

@@ -1,19 +1,12 @@
 Name:     libxslt
-Version:  1.1.34
-Release:  7
+Version:  1.1.37
+Release:  1
 Summary:  XSLT Transformation Library
 License:  MIT
 URL:      http://xmlsoft.org/libxslt/
 Source0:  https://github.com/GNOME/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM bug-fix https://github.com/GNOME/libxslt/
 Patch0: CVE-2015-9019.patch
-Patch1: Fix-variable-syntax-in-Python-configuration.patch
-Patch2: Fix-clang-Wconditional-uninitialized-warning-in-libx.patch
-Patch3: Fix-clang-Wimplicit-int-conversion-warning.patch
-Patch4: Fix-implicit-int-conversion-warning-in-exslt-crypto..patch
-Patch5: Fix-quadratic-runtime-with-text-and-xsl-message.patch
-Patch6: Fix-double-free-with-stylesheets-containing-entity-n.patch
-Patch7: Fix-use-after-free-in-xsltApplyTemplates.patch
 
 BuildRequires: gcc make libtool autoconf automake libgcrypt-devel pkgconfig(libxml-2.0) >= 2.6.27
 
@@ -30,6 +23,24 @@
 (or HTML, text, and more) using the standard XSLT stylesheet
 transformation mechanism.
 
+%package -n python3-libxslt
+Summary:Python 3 bindings for %{name}
+BuildRequires:  python3-devel python3-libxml2
+Requires: %{name} = %{version}-%{release}
+Requires: python3-libxml2 >= 2.6.27
+Requires: libxml2 >= 2.6.27
+%{?python_provide:%python_provide python3-%{name}}
+
+%description -n python3-libxslt
+The libxslt-python package contains a module that permits applications
+written in the Python programming language to use the interface
+supplied by the libxslt library to apply XSLT transformations.
+
+This library allows to parse sytlesheets, uses the libxml2-python
+to load and save XML and HTML files. Direct access to XPath and
+the XSLT transformation context are possible to extend the XSLT language
+with XPath functions written in Python.
+
 %package_help
 
 %prep
@@ -56,7 +67,7 @@
 
 %files
 %defattr(-,root,root)
-%doc ChangeLog NEWS README FEATURES AUTHORS
+%doc NEWS README FEATURES AUTHORS
 %license Copyright
 %{_bindir}/xsltproc
 %{_libdir}/libxslt.so.*
@@ -68,20 +79,33 @@
 %{_libdir}/libxslt.so
 %{_libdir}/libexslt.so
 %{_libdir}/xsltConf.sh
+%{_libdir}/cmake/libxslt/
 %{_datadir}/aclocal/libxslt.m4
+%{_datadir}/gtk-doc/
 %{_includedir}/libxslt/
 %{_includedir}/libexslt/
 %{_libdir}/pkgconfig/libxslt.pc
 %{_libdir}/pkgconfig/libexslt.pc
 %{_bindir}/xslt-config
 
+%files -n python3-libxslt
+%{python3_sitelib}/libxslt.py*
+%{python3_sitearch}/libxsltmod.so
+%{python3_sitelib}/__pycache__/libxslt*
+
 %files help
-%doc %{_docdir}/%{name}-%{version}
+%doc %{_docdir}/%{name}
 %doc %{_mandir}/man3/*
-%exclude %{_docdir}/%{name}/{ChangeLog,NEWS,README,FEATURES,AUTHORS}
-%exclude %{_docdir}/../licenses/Copyright
+%exclude %{_docdir}/%{name}/{NEWS,README,FEATURES,AUTHORS}
+%exclude %{_docdir}/../licenses/libxslt/Copyright
 
 %changelog
+* Sat Nov 05 2022 shixuantong <shixuantong1@huawei.com> - 1.1.37-1
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:upgrade version to 1.1.37
+
 * Fri Jul 01 2022 fuanan <fuanan3@h-partners.com> - 1.1.34-7
 - Type:CVE
 - ID:CVE-2021-30560

_service:tar_scm:CVE-2015-9019.patch Changed

_service:tar_scm:Fix-clang-Wconditional-uninitialized-warning-in-libx.patch Deleted

_service:tar_scm:Fix-clang-Wimplicit-int-conversion-warning.patch Deleted

_service:tar_scm:Fix-double-free-with-stylesheets-containing-entity-n.patch Deleted

@@ -1,36 +0,0 @@
-From 3e8bbcdec8d2318ca8ab27a2a4a509a5d9bb2d51 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Tue, 2 Feb 2021 04:28:15 +0100
-Subject: PATCH Fix double-free with stylesheets containing entity nodes
-
-Fix broken logic to make sure that entity nodes are deleted from the
-stylesheet. Note that stylesheets parsed with XML_PARSE_NOENT, which
-is included in XSLT_PARSE_OPTIONS, aren't affected.
-
-Found by OSS-Fuzz.
----
- libxslt/xslt.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/libxslt/xslt.c b/libxslt/xslt.c
-index 7a1ce01..69116f2 100644
---- a/libxslt/xslt.c
-+++ b/libxslt/xslt.c
-@@ -3656,12 +3656,8 @@ xsltPreprocessStylesheet(xsltStylesheetPtr style, xmlNodePtr cur)
- 	    (!xsltCheckExtURI(style, cur->ns->href))) {
- 	    goto skip_children;
- 	} else if (cur->children != NULL) {
--	    if ((cur->children->type != XML_ENTITY_DECL) &&
--		(cur->children->type != XML_ENTITY_REF_NODE) &&
--		(cur->children->type != XML_ENTITY_NODE)) {
--		cur = cur->children;
--		continue;
--	    }
-+	    cur = cur->children;
-+	    continue;
- 	}
- 
- skip_children:
--- 
-1.8.3.1
-

_service:tar_scm:Fix-implicit-int-conversion-warning-in-exslt-crypto..patch Deleted

_service:tar_scm:Fix-quadratic-runtime-with-text-and-xsl-message.patch Deleted

@@ -1,49 +0,0 @@
-From 4ccc06b56b8b6d39c29932c92cd1ed82f6698d6f Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Sun, 20 Sep 2020 15:14:47 +0200
-Subject: PATCH 33/37 Fix quadratic runtime with text and <xsl:message>
-
-Backup and restore "last text" data in xsltEvalTemplateString.
-Otherwise, optimization of string concatenation would be disabled
-whenever an xsl:message was processed.
-
-Found by OSS-Fuzz.
----
- libxslt/templates.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/libxslt/templates.c b/libxslt/templates.c
-index 48b73a5..4108ed2 100644
---- a/libxslt/templates.c
-+++ b/libxslt/templates.c
-@@ -210,6 +210,8 @@ xsltEvalTemplateString(xsltTransformContextPtr ctxt,
- {
-     xmlNodePtr oldInsert, insert = NULL;
-     xmlChar *ret;
-+    const xmlChar *oldLastText;
-+    int oldLastTextSize, oldLastTextUse;
- 
-     if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL) ||
-         (inst->type != XML_ELEMENT_NODE))
-@@ -233,12 +235,18 @@ xsltEvalTemplateString(xsltTransformContextPtr ctxt,
-     }
-     oldInsert = ctxt->insert;
-     ctxt->insert = insert;
-+    oldLastText = ctxt->lasttext;
-+    oldLastTextSize = ctxt->lasttsize;
-+    oldLastTextUse = ctxt->lasttuse;
-     /*
-     * OPTIMIZE TODO: if inst->children consists only of text-nodes.
-     */
-     xsltApplyOneTemplate(ctxt, contextNode, inst->children, NULL, NULL);
- 
-     ctxt->insert = oldInsert;
-+    ctxt->lasttext = oldLastText;
-+    ctxt->lasttsize = oldLastTextSize;
-+    ctxt->lasttuse = oldLastTextUse;
- 
-     ret = xmlNodeGetContent(insert);
-     if (insert != NULL)
--- 
-1.8.3.1
-

_service:tar_scm:Fix-use-after-free-in-xsltApplyTemplates.patch Deleted

@@ -1,198 +0,0 @@
-From 50f9c9cd3b7dfe9b3c8c795247752d1fdcadcac8 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Sat, 12 Jun 2021 20:02:53 +0200
-Subject: PATCH Fix use-after-free in xsltApplyTemplates
-
-xsltApplyTemplates without a select expression could delete nodes in
-the source document.
-
-1. Text nodes with strippable whitespace
-
-Whitespace from input documents is already stripped, so there's no
-need to strip it again. Under certain circumstances, xsltApplyTemplates
-could be fooled into deleting text nodes that are still referenced,
-resulting in a use-after-free.
-
-2. The DTD
-
-The DTD was only unlinked, but there's no good reason to do this just
-now. Maybe it was meant as a micro-optimization.
-
-3. Unknown nodes
-
-Useless and dangerous as well, especially with XInclude nodes.
-See https://gitlab.gnome.org/GNOME/libxml2/-/issues/268
-
-Simply stop trying to uselessly delete nodes when applying a template.
-This part of the code is probably a leftover from a time where
-xsltApplyStripSpaces wasn't implemented yet. Also note that
-xsltApplyTemplates with a select expression never tried to delete
-nodes.
-
-Also stop xsltDefaultProcessOneNode from deleting nodes for the same
-reasons.
-
-This fixes CVE-2021-30560.
----
- libxslt/transform.c | 119 +++-----------------------------------------
- 1 file changed, 7 insertions(+), 112 deletions(-)
-
-diff --git a/libxslt/transform.c b/libxslt/transform.c
-index 04522154..3aba354f 100644
---- a/libxslt/transform.c
-+++ b/libxslt/transform.c
-@@ -1895,7 +1895,7 @@ static void
- xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node,
- 			  xsltStackElemPtr params) {
-     xmlNodePtr copy;
--    xmlNodePtr delete = NULL, cur;
-+    xmlNodePtr cur;
-     int nbchild = 0, oldSize;
-     int childno = 0, oldPos;
-     xsltTemplatePtr template;
-@@ -1968,54 +1968,13 @@ xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node,
- 	    return;
-     }
-     /*
--     * Handling of Elements: first pass, cleanup and counting
-+     * Handling of Elements: first pass, counting
-      */
-     cur = node->children;
-     while (cur != NULL) {
--	switch (cur->type) {
--	    case XML_TEXT_NODE:
--	    case XML_CDATA_SECTION_NODE:
--	    case XML_DOCUMENT_NODE:
--	    case XML_HTML_DOCUMENT_NODE:
--	    case XML_ELEMENT_NODE:
--	    case XML_PI_NODE:
--	    case XML_COMMENT_NODE:
--		nbchild++;
--		break;
--            case XML_DTD_NODE:
--		/* Unlink the DTD, it's still reachable using doc->intSubset */
--		if (cur->next != NULL)
--		    cur->next->prev = cur->prev;
--		if (cur->prev != NULL)
--		    cur->prev->next = cur->next;
--		break;
--	    default:
--#ifdef WITH_XSLT_DEBUG_PROCESS
--		XSLT_TRACE(ctxt,XSLT_TRACE_PROCESS_NODE,xsltGenericDebug(xsltGenericDebugContext,
--		 "xsltDefaultProcessOneNode: skipping node type %d\n",
--		                 cur->type));
--#endif
--		delete = cur;
--	}
-+	if (IS_XSLT_REAL_NODE(cur))
-+	    nbchild++;
- 	cur = cur->next;
--	if (delete != NULL) {
--#ifdef WITH_XSLT_DEBUG_PROCESS
--	    XSLT_TRACE(ctxt,XSLT_TRACE_PROCESS_NODE,xsltGenericDebug(xsltGenericDebugContext,
--		 "xsltDefaultProcessOneNode: removing ignorable blank node\n"));
--#endif
--	    xmlUnlinkNode(delete);
--	    xmlFreeNode(delete);
--	    delete = NULL;
--	}
--    }
--    if (delete != NULL) {
--#ifdef WITH_XSLT_DEBUG_PROCESS
--	XSLT_TRACE(ctxt,XSLT_TRACE_PROCESS_NODE,xsltGenericDebug(xsltGenericDebugContext,
--	     "xsltDefaultProcessOneNode: removing ignorable blank node\n"));
--#endif
--	xmlUnlinkNode(delete);
--	xmlFreeNode(delete);
--	delete = NULL;
-     }
- 
-     /*
-@@ -4864,7 +4823,7 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node,
-     xsltStylePreCompPtr comp = (xsltStylePreCompPtr) castedComp;
- #endif
-     int i;
--    xmlNodePtr cur, delNode = NULL, oldContextNode;
-+    xmlNodePtr cur, oldContextNode;
-     xmlNodeSetPtr list = NULL, oldList;
-     xsltStackElemPtr withParams = NULL;
-     int oldXPProximityPosition, oldXPContextSize;
-@@ -4998,73 +4957,9 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node,
- 	else
- 	    cur = NULL;
- 	while (cur != NULL) {
--	    switch (cur->type) {
--		case XML_TEXT_NODE:
--		    if ((IS_BLANK_NODE(cur)) &&
--			(cur->parent != NULL) &&
--			(cur->parent->type == XML_ELEMENT_NODE) &&
--			(ctxt->style->stripSpaces != NULL)) {
--			const xmlChar *val;
--
--			if (cur->parent->ns != NULL) {
--			    val = (const xmlChar *)
--				  xmlHashLookup2(ctxt->style->stripSpaces,
--						 cur->parent->name,
--						 cur->parent->ns->href);
--			    if (val == NULL) {
--				val = (const xmlChar *)
--				  xmlHashLookup2(ctxt->style->stripSpaces,
--						 BAD_CAST "*",
--						 cur->parent->ns->href);
--			    }
--			} else {
--			    val = (const xmlChar *)
--				  xmlHashLookup2(ctxt->style->stripSpaces,
--						 cur->parent->name, NULL);
--			}
--			if ((val != NULL) &&
--			    (xmlStrEqual(val, (xmlChar *) "strip"))) {
--			    delNode = cur;
--			    break;
--			}
--		    }
--		    /* Intentional fall-through */
--		case XML_ELEMENT_NODE:
--		case XML_DOCUMENT_NODE:
--		case XML_HTML_DOCUMENT_NODE:
--		case XML_CDATA_SECTION_NODE:
--		case XML_PI_NODE:
--		case XML_COMMENT_NODE:
--		    xmlXPathNodeSetAddUnique(list, cur);
--		    break;
--		case XML_DTD_NODE:
--		    /* Unlink the DTD, it's still reachable
--		     * using doc->intSubset */
--		    if (cur->next != NULL)
--			cur->next->prev = cur->prev;
--		    if (cur->prev != NULL)
--			cur->prev->next = cur->next;
--		    break;
--		case XML_NAMESPACE_DECL:
--		    break;
--		default:
--#ifdef WITH_XSLT_DEBUG_PROCESS
--		    XSLT_TRACE(ctxt,XSLT_TRACE_APPLY_TEMPLATES,xsltGenericDebug(xsltGenericDebugContext,
--		     "xsltApplyTemplates: skipping cur type %d\n",
--				     cur->type));
--#endif
--		    delNode = cur;
--	    }
-+            if (IS_XSLT_REAL_NODE(cur))
-+		xmlXPathNodeSetAddUnique(list, cur);
- 	    cur = cur->next;
--	    if (delNode != NULL) {
--#ifdef WITH_XSLT_DEBUG_PROCESS
--		XSLT_TRACE(ctxt,XSLT_TRACE_APPLY_TEMPLATES,xsltGenericDebug(xsltGenericDebugContext,
--		     "xsltApplyTemplates: removing ignorable blank cur\n"));
--#endif
--		xmlUnlinkNode(delNode);
--		xmlFreeNode(delNode);
--		delNode = NULL;
--	    }
- 	}
-     }
- 
--- 
-GitLab
-

_service:tar_scm:Fix-variable-syntax-in-Python-configuration.patch Deleted

@@ -1,50 +0,0 @@
-From b90e1063a83d9c0328d2559cdb6e9455da9747c7 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Fri, 10 Jan 2020 12:58:35 +0100
-Subject: PATCH 08/24 Fix variable syntax in Python configuration
-
-Resolves #30.
----
- configure.ac | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 585b9d7..d676b12 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -272,17 +272,17 @@ except: print 0"`
- 	   -d $with_python/lib/python$PYTHON_VERSION/site-packages
- 	then
- 	    PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
--	    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+	    PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
- 	else
- 	    if test -r $prefix/include/python$PYTHON_VERSION/Python.h
- 	    then
- 	        PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
--		PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+		PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
- 	    else
- 		if test -r /usr/include/python$PYTHON_VERSION/Python.h
- 		then
- 		    PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
--		    PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+		    PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
- 		else
- 		    echo could not find python$PYTHON_VERSION/Python.h
- 		fi
-@@ -296,9 +296,9 @@ except: print 0"`
-     fi
-     if test "$with_python" != ""
-     then
--        pythondir='$(PYTHON_SITE_PACKAGES)'
-+        pythondir=$PYTHON_SITE_PACKAGES
-     else
--        pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-+        pythondir=$libdir/python$PYTHON_VERSION/site-packages
-     fi
- fi
- AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
--- 
-1.8.3.1
-

_service Changed

_service:tar_scm:libxslt-1.1.34.tar.gz -> _service:tar_scm:libxslt-1.1.37.tar.gz Changed

_service:tar_scm:libxslt.yaml Changed

Changes of Revision 2