Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 01/11] libxslt: update to 1.1.33
@ 2019-01-17 16:26 Alexander Kanavin
  2019-01-17 16:26 ` [PATCH 02/11] liburcu: upgrade 0.10.1 -> 0.10.2 Alexander Kanavin
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Alexander Kanavin @ 2019-01-17 16:26 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 .../libxslt/libxslt/fix-rvts-handling.patch   | 80 -------------------
 .../{libxslt_1.1.32.bb => libxslt_1.1.33.bb}  |  8 +-
 2 files changed, 3 insertions(+), 85 deletions(-)
 delete mode 100644 meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch
 rename meta/recipes-support/libxslt/{libxslt_1.1.32.bb => libxslt_1.1.33.bb} (83%)

diff --git a/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch b/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch
deleted file mode 100644
index ea3ae51e937..00000000000
--- a/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-libxslt-1.1.32: Fix handling of RVTs returned from nested EXSLT functions
-
-[No upstream tracking] -- https://bugzilla.gnome.org/show_bug.cgi?id=792580
-
-Set the context variable to NULL when evaluating EXSLT functions.
-Fixes potential use-after-free errors or memory leaks.
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxslt/commit/8bd32f7753ac253a54279a0b6a88d15a57076bb0]
-bug: 792580
-Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
-
-diff --git a/libexslt/functions.c b/libexslt/functions.c
-index dc794e3..8511cb0 100644
---- a/libexslt/functions.c
-+++ b/libexslt/functions.c
-@@ -280,6 +280,7 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) {
-     exsltFuncFunctionData *func;
-     xmlNodePtr paramNode, oldInsert, fake;
-     int oldBase;
-+    void *oldCtxtVar;
-     xsltStackElemPtr params = NULL, param;
-     xsltTransformContextPtr tctxt = xsltXPathGetTransformContext(ctxt);
-     int i, notSet;
-@@ -418,11 +419,14 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) {
-     fake = xmlNewDocNode(tctxt->output, NULL,
- 			 (const xmlChar *)"fake", NULL);
-     oldInsert = tctxt->insert;
-+    oldCtxtVar = tctxt->contextVariable;
-     tctxt->insert = fake;
-+    tctxt->contextVariable = NULL;
-     xsltApplyOneTemplate (tctxt, tctxt->node,
- 			  func->content, NULL, NULL);
-     xsltLocalVariablePop(tctxt, tctxt->varsBase, -2);
-     tctxt->insert = oldInsert;
-+    tctxt->contextVariable = oldCtxtVar;
-     tctxt->varsBase = oldBase;	/* restore original scope */
-     if (params != NULL)
- 	xsltFreeStackElemList(params);
-diff --git a/tests/docs/bug-209.xml b/tests/docs/bug-209.xml
-new file mode 100644
-index 0000000..69d62f2
---- /dev/null
-+++ b/tests/docs/bug-209.xml
-@@ -0,0 +1 @@
-+<doc/>
-diff --git a/tests/general/bug-209.out b/tests/general/bug-209.out
-new file mode 100644
-index 0000000..e829790
---- /dev/null
-+++ b/tests/general/bug-209.out
-@@ -0,0 +1,2 @@
-+<?xml version="1.0"?>
-+<result/>
-diff --git a/tests/general/bug-209.xsl b/tests/general/bug-209.xsl
-new file mode 100644
-index 0000000..fe69ac6
---- /dev/null
-+++ b/tests/general/bug-209.xsl
-@@ -0,0 +1,21 @@
-+<xsl:stylesheet
-+    version="1.0"
-+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-+    xmlns:func="http://exslt.org/functions"
-+    extension-element-prefixes="func">
-+
-+    <xsl:template match="/">
-+        <xsl:variable name="v" select="func:a()" />
-+        <xsl:copy-of select="$v"/>
-+    </xsl:template>
-+
-+    <func:function name="func:a">
-+        <func:result select="func:b()" />
-+    </func:function>
-+
-+    <func:function name="func:b">
-+        <func:result>
-+            <result/>
-+        </func:result>
-+    </func:function>
-+</xsl:stylesheet>
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.32.bb b/meta/recipes-support/libxslt/libxslt_1.1.33.bb
similarity index 83%
rename from meta/recipes-support/libxslt/libxslt_1.1.32.bb
rename to meta/recipes-support/libxslt/libxslt_1.1.33.bb
index f0fa5e723ff..0e0c10d8168 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.32.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.33.bb
@@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458"
 SECTION = "libs"
 DEPENDS = "libxml2"
 
-SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz \
-           file://fix-rvts-handling.patch \
-           "
+SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "1fc72f98e98bf4443f1651165f3aa146"
-SRC_URI[sha256sum] = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"
+SRC_URI[md5sum] = "b3bd254a03e46d58f8ad1e4559cd2c2f"
+SRC_URI[sha256sum] = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"
 
 UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"
 
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-01-17 16:27 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-17 16:26 [PATCH 01/11] libxslt: update to 1.1.33 Alexander Kanavin
2019-01-17 16:26 ` [PATCH 02/11] liburcu: upgrade 0.10.1 -> 0.10.2 Alexander Kanavin
2019-01-17 16:26 ` [PATCH 03/11] libfm-extra: upgrade 1.3.0.2 -> 1.3.1 Alexander Kanavin
2019-01-17 16:26 ` [PATCH 04/11] libfm: " Alexander Kanavin
2019-01-17 16:26 ` [PATCH 05/11] pcmanfm: upgrade 1.3.0 " Alexander Kanavin
2019-01-17 16:26 ` [PATCH 06/11] mobile-broadband-provider-info: upgrade 20170310 -> 20190116 Alexander Kanavin
2019-01-17 16:26 ` [PATCH 07/11] vala: update to 0.42.4 Alexander Kanavin
2019-01-17 16:26 ` [PATCH 08/11] powertop: update to 2.10 Alexander Kanavin
2019-01-17 16:26 ` [PATCH 09/11] ed: upgrade 1.14.2 -> 1.15 Alexander Kanavin
2019-01-17 16:26 ` [PATCH 10/11] libsecret: upgrade 0.18.6 -> 0.18.7 Alexander Kanavin
2019-01-17 16:26 ` [PATCH 11/11] gobject-introspection: upgrade 1.58.2 -> 1.58.3 Alexander Kanavin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox