nokogiri 1.6.8.rc3 → 1.6.8

data/patches/libxslt/0008-Fix-direct-pattern-matching.patch

@@ -1,80 +0,0 @@
-From aa250927e6a919ba1a35189635e2e5084416f489 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Sun, 4 Aug 2013 22:25:03 +0200
-Subject: [PATCH 08/14] Fix direct pattern matching
-
-xsltTestCompMatchDirect must match against the original node.
----
- libxslt/pattern.c         |  5 +++--
- tests/REC/test-5.2-22.out |  2 ++
- tests/REC/test-5.2-22.xml |  3 +++
- tests/REC/test-5.2-22.xsl | 13 +++++++++++++
- 4 files changed, 21 insertions(+), 2 deletions(-)
- create mode 100644 tests/REC/test-5.2-22.out
- create mode 100644 tests/REC/test-5.2-22.xml
- create mode 100644 tests/REC/test-5.2-22.xsl
-
-diff --git a/libxslt/pattern.c b/libxslt/pattern.c
-index 414363b..058917a 100644
---- a/libxslt/pattern.c
-+++ b/libxslt/pattern.c
-@@ -906,9 +906,10 @@ xsltTestPredicateMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp,
-  */
- static int
- xsltTestCompMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp,
--	          xmlNodePtr node, const xmlChar *mode,
-+	          xmlNodePtr matchNode, const xmlChar *mode,
- 		  const xmlChar *modeURI) {
-     int i;
-+    xmlNodePtr node = matchNode;
-     xsltStepOpPtr step, sel = NULL;
-     xsltStepStates states = {0, 0, NULL}; /* // may require backtrack */
- 
-@@ -1137,7 +1138,7 @@ restart:
- 			/* Free the rollback states */
- 			xmlFree(states.states);
- 		    }
--		    return(xsltTestCompMatchDirect(ctxt, comp, node,
-+		    return(xsltTestCompMatchDirect(ctxt, comp, matchNode,
- 						   comp->nsList, comp->nsNr));
- 		}
- 
-diff --git a/tests/REC/test-5.2-22.out b/tests/REC/test-5.2-22.out
-new file mode 100644
-index 0000000..951594e
---- /dev/null
-+++ b/tests/REC/test-5.2-22.out
-@@ -0,0 +1,2 @@
-+<?xml version="1.0"?>
-+<doc>success</doc>
-diff --git a/tests/REC/test-5.2-22.xml b/tests/REC/test-5.2-22.xml
-new file mode 100644
-index 0000000..658099d
---- /dev/null
-+++ b/tests/REC/test-5.2-22.xml
-@@ -0,0 +1,3 @@
-+<doc>
-+    <elem/>
-+</doc>
-diff --git a/tests/REC/test-5.2-22.xsl b/tests/REC/test-5.2-22.xsl
-new file mode 100644
-index 0000000..5c1f1f7
---- /dev/null
-+++ b/tests/REC/test-5.2-22.xsl
-@@ -0,0 +1,13 @@
-+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-+
-+    <xsl:template match="doc">
-+        <xsl:copy>
-+            <xsl:apply-templates select="*"/>
-+        </xsl:copy>
-+    </xsl:template>
-+
-+    <xsl:template match="doc[last()][last()]/elem">
-+        <xsl:text>success</xsl:text>
-+    </xsl:template>
-+
-+</xsl:stylesheet>
--- 
-1.8.4.1
-

data/patches/libxslt/0009-Fix-certain-patterns-with-predicates.patch

@@ -1,185 +0,0 @@
-From cd40951e8e8a00e3ea022c2956d352bc131a54ba Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Sun, 4 Aug 2013 22:59:26 +0200
-Subject: [PATCH 09/14] Fix certain patterns with predicates
-
-The optimization for predicates in patterns only supports XSLT_OP_ELEM
-and XSLT_OP_ALL. This commit makes predicates on other ops fall back to
-the slow direct matching code path.
-
-Fixes bugs #531685 and #538580.
----
- libxslt/pattern.c         | 18 ++++++++++++------
- tests/docs/Makefile.am    |  2 ++
- tests/docs/bug-181.xml    |  4 ++++
- tests/docs/bug-182.xml    |  4 ++++
- tests/general/Makefile.am |  2 ++
- tests/general/bug-181.out |  5 +++++
- tests/general/bug-181.xsl | 13 +++++++++++++
- tests/general/bug-182.out |  2 ++
- tests/general/bug-182.xsl | 19 +++++++++++++++++++
- 9 files changed, 63 insertions(+), 6 deletions(-)
- create mode 100644 tests/docs/bug-181.xml
- create mode 100644 tests/docs/bug-182.xml
- create mode 100644 tests/general/bug-181.out
- create mode 100644 tests/general/bug-181.xsl
- create mode 100644 tests/general/bug-182.out
- create mode 100644 tests/general/bug-182.xsl
-
-diff --git a/libxslt/pattern.c b/libxslt/pattern.c
-index 058917a..a97726c 100644
---- a/libxslt/pattern.c
-+++ b/libxslt/pattern.c
-@@ -451,11 +451,14 @@ xsltReverseCompMatch(xsltParserContextPtr ctxt, xsltCompMatchPtr comp) {
-     xsltCompMatchAdd(ctxt, comp, XSLT_OP_END, NULL, NULL, 0);
- 
-     /*
--     * detect consecutive XSLT_OP_PREDICATE indicating a direct
--     * matching should be done.
-+     * Detect consecutive XSLT_OP_PREDICATE and predicates on ops which
-+     * haven't been optimized yet indicating a direct matching should be done.
-      */
-     for (i = 0;i < comp->nbStep - 1;i++) {
--        if ((comp->steps[i].op == XSLT_OP_PREDICATE) &&
-+        xsltOp op = comp->steps[i].op;
-+
-+        if ((op != XSLT_OP_ELEM) &&
-+            (op != XSLT_OP_ALL) &&
- 	    (comp->steps[i + 1].op == XSLT_OP_PREDICATE)) {
- 
- 	    comp->direct = 1;
-@@ -655,8 +658,10 @@ xsltTestPredicateMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp,
-         isRVT = 0;
- 
-     /*
--     * Depending on the last selection, one may need to
--     * recompute contextSize and proximityPosition.
-+     * Recompute contextSize and proximityPosition.
-+     *
-+     * TODO: Make this work for additional ops. Currently, only XSLT_OP_ELEM
-+     * and XSLT_OP_ALL are supported.
-      */
-     oldCS = ctxt->xpathCtxt->contextSize;
-     oldCP = ctxt->xpathCtxt->proximityPosition;
-@@ -1128,7 +1133,8 @@ restart:
- 		break;
- 	    case XSLT_OP_PREDICATE: {
- 		/*
--		 * when there is cascading XSLT_OP_PREDICATE, then use a
-+		 * When there is cascading XSLT_OP_PREDICATE or a predicate
-+		 * after an op which hasn't been optimized yet, then use a
- 		 * direct computation approach. It's not done directly
- 		 * at the beginning of the routine to filter out as much
- 		 * as possible this costly computation.
-diff --git a/tests/docs/Makefile.am b/tests/docs/Makefile.am
-index c5dad4c..e3a4aef 100644
---- a/tests/docs/Makefile.am
-+++ b/tests/docs/Makefile.am
-@@ -179,6 +179,8 @@ EXTRA_DIST =	\
- 	bug-178.xml \
- 	bug-179.xml \
- 	bug-180.xml \
-+	bug-181.xml \
-+	bug-182.xml \
- 	character.xml \
- 	array.xml \
- 	items.xml
-diff --git a/tests/docs/bug-181.xml b/tests/docs/bug-181.xml
-new file mode 100644
-index 0000000..285b69a
---- /dev/null
-+++ b/tests/docs/bug-181.xml
-@@ -0,0 +1,4 @@
-+<Urmel>
-+  <E>1. zwei <F>drei</F> zwei eins</E>
-+  <E a="b">2. zwei <F>drei</F> zwei eins</E>
-+</Urmel>
-diff --git a/tests/docs/bug-182.xml b/tests/docs/bug-182.xml
-new file mode 100644
-index 0000000..02b378d
---- /dev/null
-+++ b/tests/docs/bug-182.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0" encoding="UTF-8" ?>
-+<root>
-+<body><b> b 1 </b> text 1 <b> b 2 </b> text 2 </body>
-+</root>
-diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
-index 0c2ef30..4802a6b 100644
---- a/tests/general/Makefile.am
-+++ b/tests/general/Makefile.am
-@@ -188,6 +188,8 @@ EXTRA_DIST = \
-     bug-178.out bug-178.xsl \
-     bug-179.out bug-179.xsl \
-     bug-180.out bug-180.xsl bug-180.err \
-+    bug-181.out bug-181.xsl \
-+    bug-182.out bug-182.xsl \
-     character.out character.xsl \
-     character2.out character2.xsl \
-     itemschoose.out itemschoose.xsl \
-diff --git a/tests/general/bug-181.out b/tests/general/bug-181.out
-new file mode 100644
-index 0000000..730387a
---- /dev/null
-+++ b/tests/general/bug-181.out
-@@ -0,0 +1,5 @@
-+<?xml version="1.0"?>
-+<Urmel>
-+  <E>1. * zwei <F>drei</F> zwei eins</E>
-+  <E a="b">2. * zwei <F>drei</F> zwei eins</E>
-+</Urmel>
-diff --git a/tests/general/bug-181.xsl b/tests/general/bug-181.xsl
-new file mode 100644
-index 0000000..0c4de71
---- /dev/null
-+++ b/tests/general/bug-181.xsl
-@@ -0,0 +1,13 @@
-+<xsl:transform version="1.0"
-+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-+  <xsl:template match="E/text()[ 1 ]">
-+    <xsl:value-of select="substring-before( . , ' ')"/>
-+    <xsl:text> * </xsl:text>
-+    <xsl:value-of select="substring-after( . , ' ')"/>
-+  </xsl:template>
-+  <xsl:template match="@*|node()">
-+    <xsl:copy>
-+      <xsl:apply-templates select="@*|node()"/>
-+    </xsl:copy>
-+  </xsl:template>
-+</xsl:transform>
-diff --git a/tests/general/bug-182.out b/tests/general/bug-182.out
-new file mode 100644
-index 0000000..93ab15e
---- /dev/null
-+++ b/tests/general/bug-182.out
-@@ -0,0 +1,2 @@
-+<?xml version="1.0"?>
-+<body><p>b[2]:  b 2 </p><p>text()[2]:  text 2 </p></body>
-diff --git a/tests/general/bug-182.xsl b/tests/general/bug-182.xsl
-new file mode 100644
-index 0000000..ecce187
---- /dev/null
-+++ b/tests/general/bug-182.xsl
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8" ?>
-+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-+
-+<xsl:template match="node()"/>
-+
-+<xsl:template match="text()[2]">
-+  <p>text()[2]: <xsl:value-of select="."/></p>
-+</xsl:template>
-+<xsl:template match="b[2]">
-+  <p>b[2]: <xsl:value-of select="."/></p>
-+</xsl:template>
-+
-+<xsl:template match="/">
-+  <body>
-+    <xsl:apply-templates select="/root/body/node()"/>
-+  </body>
-+</xsl:template>
-+
-+</xsl:stylesheet>
--- 
-1.8.4.1
-

data/patches/libxslt/0010-Fix-handling-of-UTF-8-strings-in-EXSLT-crypto-module.patch

@@ -1,126 +0,0 @@
-From 387c26fa4a21eaea74facde3f8628c25361f6f83 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Thu, 1 Aug 2013 17:56:36 +0200
-Subject: [PATCH 10/14] Fix handling of UTF-8 strings in EXSLT crypto module
-
-Fixes bug #692866
----
- libexslt/crypto.c | 27 +++++++++++++--------------
- 1 file changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/libexslt/crypto.c b/libexslt/crypto.c
-index d142bb6..6aa9dd2 100644
---- a/libexslt/crypto.c
-+++ b/libexslt/crypto.c
-@@ -457,7 +457,8 @@ exsltCryptoGcryptRc4Decrypt (xmlXPathParserContextPtr ctxt,
-  * @ctxt: an XPath parser context
-  * @nargs: the number of arguments
-  *
-- * Helper function which checks for and returns first string argument and its length
-+ * Helper function which checks for and returns first string argument and its
-+ * length in bytes.
-  */
- static int
- exsltCryptoPopString (xmlXPathParserContextPtr ctxt, int nargs,
-@@ -471,7 +472,7 @@ exsltCryptoPopString (xmlXPathParserContextPtr ctxt, int nargs,
-     }
- 
-     *str = xmlXPathPopString (ctxt);
--    str_len = xmlUTF8Strlen (*str);
-+    str_len = xmlStrlen (*str);
- 
-     if (str_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -591,7 +592,7 @@ exsltCryptoSha1Function (xmlXPathParserContextPtr ctxt, int nargs) {
- static void
- exsltCryptoRc4EncryptFunction (xmlXPathParserContextPtr ctxt, int nargs) {
- 
--    int key_len = 0, key_size = 0;
-+    int key_len = 0;
-     int str_len = 0, bin_len = 0, hex_len = 0;
-     xmlChar *key = NULL, *str = NULL, *padkey = NULL;
-     xmlChar *bin = NULL, *hex = NULL;
-@@ -604,7 +605,7 @@ exsltCryptoRc4EncryptFunction (xmlXPathParserContextPtr ctxt, int nargs) {
-     tctxt = xsltXPathGetTransformContext(ctxt);
- 
-     str = xmlXPathPopString (ctxt);
--    str_len = xmlUTF8Strlen (str);
-+    str_len = xmlStrlen (str);
- 
-     if (str_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -613,7 +614,7 @@ exsltCryptoRc4EncryptFunction (xmlXPathParserContextPtr ctxt, int nargs) {
-     }
- 
-     key = xmlXPathPopString (ctxt);
--    key_len = xmlUTF8Strlen (key);
-+    key_len = xmlStrlen (key);
- 
-     if (key_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -632,15 +633,14 @@ exsltCryptoRc4EncryptFunction (xmlXPathParserContextPtr ctxt, int nargs) {
-     }
-     memset(padkey, 0, RC4_KEY_LENGTH + 1);
- 
--    key_size = xmlUTF8Strsize (key, key_len);
--    if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) {
-+    if ((key_len > RC4_KEY_LENGTH) || (key_len < 0)) {
- 	xsltTransformError(tctxt, NULL, tctxt->inst,
- 	    "exsltCryptoRc4EncryptFunction: key size too long or key broken\n");
- 	tctxt->state = XSLT_STATE_STOPPED;
- 	xmlXPathReturnEmptyString (ctxt);
- 	goto done;
-     }
--    memcpy (padkey, key, key_size);
-+    memcpy (padkey, key, key_len);
- 
- /* encrypt it */
-     bin_len = str_len;
-@@ -689,7 +689,7 @@ done:
- static void
- exsltCryptoRc4DecryptFunction (xmlXPathParserContextPtr ctxt, int nargs) {
- 
--    int key_len = 0, key_size = 0;
-+    int key_len = 0;
-     int str_len = 0, bin_len = 0, ret_len = 0;
-     xmlChar *key = NULL, *str = NULL, *padkey = NULL, *bin =
- 	NULL, *ret = NULL;
-@@ -702,7 +702,7 @@ exsltCryptoRc4DecryptFunction (xmlXPathParserContextPtr ctxt, int nargs) {
-     tctxt = xsltXPathGetTransformContext(ctxt);
- 
-     str = xmlXPathPopString (ctxt);
--    str_len = xmlUTF8Strlen (str);
-+    str_len = xmlStrlen (str);
- 
-     if (str_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -711,7 +711,7 @@ exsltCryptoRc4DecryptFunction (xmlXPathParserContextPtr ctxt, int nargs) {
-     }
- 
-     key = xmlXPathPopString (ctxt);
--    key_len = xmlUTF8Strlen (key);
-+    key_len = xmlStrlen (key);
- 
-     if (key_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -729,15 +729,14 @@ exsltCryptoRc4DecryptFunction (xmlXPathParserContextPtr ctxt, int nargs) {
- 	goto done;
-     }
-     memset(padkey, 0, RC4_KEY_LENGTH + 1);
--    key_size = xmlUTF8Strsize (key, key_len);
--    if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) {
-+    if ((key_len > RC4_KEY_LENGTH) || (key_len < 0)) {
- 	xsltTransformError(tctxt, NULL, tctxt->inst,
- 	    "exsltCryptoRc4EncryptFunction: key size too long or key broken\n");
- 	tctxt->state = XSLT_STATE_STOPPED;
- 	xmlXPathReturnEmptyString (ctxt);
- 	goto done;
-     }
--    memcpy (padkey, key, key_size);
-+    memcpy (padkey, key, key_len);
- 
- /* decode hex to binary */
-     bin_len = str_len;
--- 
-1.8.4.1
-

data/patches/libxslt/0013-Memory-leak-in-xsltCompileIdKeyPattern-error-path.patch

@@ -1,25 +0,0 @@
-From a976434b620a5d81a1cea8867ebc49d748c93a88 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Mon, 5 Aug 2013 12:37:06 +0200
-Subject: [PATCH 13/14] Memory leak in xsltCompileIdKeyPattern error path
-
-Fix from bug #691548 by Vladimir Marek.
----
- libxslt/pattern.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libxslt/pattern.c b/libxslt/pattern.c
-index a97726c..57f8b9f 100644
---- a/libxslt/pattern.c
-+++ b/libxslt/pattern.c
-@@ -1433,6 +1433,7 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
- 	if (CUR != ',') {
- 	    xsltTransformError(NULL, NULL, NULL,
- 		    "xsltCompileIdKeyPattern : , expected\n");
-+	    xmlFree(lit);
- 	    ctxt->error = 1;
- 	    return;
- 	}
--- 
-1.8.4.1
-

data/patches/libxslt/0014-Fix-for-bug-436589.patch

@@ -1,43 +0,0 @@
-From 02b30799fe2f8a572f6eefb27b2b9f1265fc0db7 Mon Sep 17 00:00:00 2001
-From: Imran Azeezullah <uqsazeez@uq.edu.au>
-Date: Mon, 30 Sep 2013 10:18:03 +0800
-Subject: [PATCH 14/14] Fix for bug 436589
-
-https://bugzilla.gnome.org/show_bug.cgi?id=436589
-
-Need to check availablility of argument before scanning it
----
- xsltproc/xsltproc.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
-index 45adf5d..b22df37 100644
---- a/xsltproc/xsltproc.c
-+++ b/xsltproc/xsltproc.c
-@@ -730,6 +730,11 @@ main(int argc, char **argv)
-             int value;
- 
-             i++;
-+            if (i == argc) {
-+                fprintf(stderr, "XSLT maxdepth value not specified!\n");
-+                return (2);
-+            }
-+
-             if (sscanf(argv[i], "%d", &value) == 1) {
-                 if (value > 0)
-                     xsltMaxDepth = value;
-@@ -748,6 +753,11 @@ main(int argc, char **argv)
-             int value;
- 
-             i++;
-+            if (i == argc) {
-+                fprintf(stderr, "XML maxparserdepth value not specified!\n");
-+                return (2);
-+            }
-+
-             if (sscanf(argv[i], "%d", &value) == 1) {
-                 if (value > 0)
-                     xmlParserMaxDepth = value;
--- 
-1.8.4.1
-