Update to libxslt-1.1.37

NEWS

@@ -1,5 +1,19 @@
 NEWS file for libxslt
 
+v1.1.37: Aug 29 2022
+
+### Improvements
+
+- Don't use deprecated libxml2 macros
+- Don't mess with xmlDefaultSAXHandler
+
+### Build system
+
+- Require automake-1.16.3 or later
+- Remove generated files from distribution
+- Add missing compile definition for static builds to Autotools (Mike Dalessio)
+
+
 v1.1.36: Aug 17 2022
 
 ### Removals and deprecations

README.md

@@ -2,7 +2,7 @@
 
 libxslt Windows build with Visual Studio.
 
-This version is libxslt-1.1.36.
+This version is libxslt-1.1.37.
 
 To build, simply open the required solution file, and
 you know how to use Visual Studio, right?

distfiles/download.url

@@ -1 +1 @@
-https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.36.tar.xz
+https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.37.tar.xz

distfiles/libxslt-1.1.36-import.md5 → distfiles/libxslt-1.1.37-import.md5

@@ -3,7 +3,7 @@
 0cd9a07afbeb24026c9b03aecfeba458  Copyright
 0d9bd2fa90bd3a631ca9d9aabd801345  FEATURES
 0204c456fe221f77aff226b90e9aab06  INSTALL
-f2bc189a2c56c6edf335bb2ff8724eff  NEWS
+bfe7ae3f107a7cc9d8ba2f2ca272ede4  NEWS
 2cd5c413477c4cca5f58c844b24318ee  README.libxslt
 1671e62be479162b8d9a012c81bc235e  TODO
 8912730100a2f79c41f5dd2723a9a32b  libexslt/common.c
@@ -28,26 +28,26 @@ bb43105c3f470d13f4dcd6815ca8ebb7  libxslt/extensions.c
 45e4867f0daebf1eb905471a4be5184c  libxslt/extensions.h
 e203d3012061029953db472adc29f3d3  libxslt/extra.c
 94fe9ce1c0c47724aae4a1bcb8c29433  libxslt/extra.h
-b72e5c742d2e605c9c85c8f239b30d5d  libxslt/functions.c
+4c2350efda4c8306a8e5bdb01cbea64a  libxslt/functions.c
 052fd28e9971416b2bbebdc3d1103c4e  libxslt/functions.h
 8a545af914f1af6e3c04f51ef2d990b9  libxslt/imports.c
 66e26ad969e3c37fdeedcbc2716d7cf3  libxslt/imports.h
-67f1d18268f1631dcfa41cbbca9ba6f3  libxslt/keys.c
+b38ca3ac9714ce141a81d3d744385fbd  libxslt/keys.c
 77a11ee3de841d02d3461b829cfcc11e  libxslt/keys.h
 ae222b9c12da991dca0f511bbff72bed  libxslt/libxslt.h
 e36c1ec3153a21e117c539ab6895bce9  libxslt/namespaces.c
 c784b4b8e80274491fe023ce26d4847b  libxslt/namespaces.h
-9f3a520124680b2fc07cf31110b22856  libxslt/numbers.c
+9f8e790d17cceb5f86ea1c8cf381b663  libxslt/numbers.c
 27c2c21ab1535f84710fe1c8c8829018  libxslt/numbersInternals.h
-be86344f85c37f9c94a50d6a3903566f  libxslt/pattern.c
+da3f950984b9600b4c93049e222e4652  libxslt/pattern.c
 adf6b78e6c68a7d34ae680f6dc3f5240  libxslt/pattern.h
 85a671580a9c2f6ec532bb541b232d2c  libxslt/preproc.c
 43092de4393f5033e08aea3b9ecb9012  libxslt/preproc.h
 a1c159b8ef369644004c880130c1e875  libxslt/security.c
 1b24b61ea6afe01d18c647c94b1245c7  libxslt/security.h
 be7fdf91a108b1665cc9444ba77dcb48  libxslt/templates.c
 6901f4c8fad239b588b9f6d4cdfef5ac  libxslt/templates.h
-171a4c5886118dd774bce3645a97dfd4  libxslt/transform.c
+ab3bbf86bebe1777cab10bf62cd4393f  libxslt/transform.c
 ccbcce4553f3231003b1944002814246  libxslt/transform.h
 7da7b1fcf378330699c7ecdd96908641  libxslt/trio.h
 e41149b088de4a04c067c85969f4db3c  libxslt/triodef.h

libxslt/functions.c

@@ -608,7 +608,8 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
 
     switch (nargs) {
     case 3:
-	CAST_TO_STRING;
+        if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_STRING))
+            xmlXPathStringFunction(ctxt, 1);
 	decimalObj = valuePop(ctxt);
         ncname = xsltSplitQName(sheet->dict, decimalObj->stringval, &prefix);
         if (prefix != NULL) {
@@ -634,13 +635,16 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
 	}
 	/* Intentional fall-through */
     case 2:
-	CAST_TO_STRING;
+        if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_STRING))
+            xmlXPathStringFunction(ctxt, 1);
 	formatObj = valuePop(ctxt);
-	CAST_TO_NUMBER;
+        if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_NUMBER))
+            xmlXPathNumberFunction(ctxt, 1);
 	numberObj = valuePop(ctxt);
 	break;
     default:
-	XP_ERROR(XPATH_INVALID_ARITY);
+	xmlXPathErr(ctxt, XPATH_INVALID_ARITY);
+        return;
     }
 
     if (formatValues != NULL) {

libxslt/keys.c

@@ -310,7 +310,7 @@ xsltAddKey(xsltStylesheetPtr style, const xmlChar *name,
     current = end = 0;
     while (match[current] != 0) {
 	start = current;
-	while (IS_BLANK_CH(match[current]))
+	while (xmlIsBlank_ch(match[current]))
 	    current++;
 	end = current;
 	while ((match[end] != 0) && (match[end] != '|')) {

libxslt/numbers.c

@@ -92,6 +92,12 @@ xsltUTF8Charcmp(xmlChar *utf1, xmlChar *utf2) {
     return xmlStrncmp(utf1, utf2, len);
 }
 
+static int
+xsltIsLetterDigit(int val) {
+    return xmlIsBaseCharQ(val) || xmlIsIdeographicQ(val) ||
+           xmlIsDigitQ(val);
+}
+
 /***** Stop temp insert *****/
 /************************************************************************
  *									*
@@ -347,8 +353,8 @@ xsltNumberFormatTokenize(const xmlChar *format,
      * Insert initial non-alphanumeric token.
      * There is always such a token in the list, even if NULL
      */
-    while (! (IS_LETTER(val=xmlStringCurrentChar(NULL, format+ix, &len)) ||
-	      IS_DIGIT(val)) ) {
+    while (!xsltIsLetterDigit(val = xmlStringCurrentChar(NULL, format+ix,
+                                                         &len))) {
 	if (format[ix] == 0)		/* if end of format string */
 	    break; /* while */
 	ix += len;
@@ -414,7 +420,7 @@ xsltNumberFormatTokenize(const xmlChar *format,
 	 * to correspond to the Letter and Digit classes from XML (and
 	 * one wonders why XSLT doesn't refer to these instead).
 	 */
-	while (IS_LETTER(val) || IS_DIGIT(val)) {
+	while (xsltIsLetterDigit(val)) {
 	    ix += len;
 	    val = xmlStringCurrentChar(NULL, format+ix, &len);
 	}
@@ -423,7 +429,7 @@ xsltNumberFormatTokenize(const xmlChar *format,
 	 * Insert temporary non-alphanumeric final tooken.
 	 */
 	j = ix;
-	while (! (IS_LETTER(val) || IS_DIGIT(val))) {
+	while (!xsltIsLetterDigit(val)) {
 	    if (val == 0)
 		break; /* while */
 	    ix += len;

libxslt/pattern.c

@@ -1192,7 +1192,7 @@ xsltCompMatchClearCache(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp) {
 #define CUR_PTR ctxt->cur
 
 #define SKIP_BLANKS							\
-    while (IS_BLANK_CH(CUR)) NEXT
+    while (xmlIsBlank_ch(CUR)) NEXT
 
 #define CURRENT (*ctxt->cur)
 #define NEXT ((*ctxt->cur) ?  ctxt->cur++: ctxt->cur)
@@ -1235,11 +1235,11 @@ xsltScanLiteral(xsltParserContextPtr ctxt) {
         NEXT;
 	cur = q = CUR_PTR;
 	val = xmlStringCurrentChar(NULL, cur, &len);
-	while ((IS_CHAR(val)) && (val != '"')) {
+	while ((xmlIsCharQ(val)) && (val != '"')) {
 	    cur += len;
 	    val = xmlStringCurrentChar(NULL, cur, &len);
 	}
-	if (!IS_CHAR(val)) {
+	if (!xmlIsCharQ(val)) {
 	    ctxt->error = 1;
 	    return(NULL);
 	} else {
@@ -1251,11 +1251,11 @@ xsltScanLiteral(xsltParserContextPtr ctxt) {
         NEXT;
 	cur = q = CUR_PTR;
 	val = xmlStringCurrentChar(NULL, cur, &len);
-	while ((IS_CHAR(val)) && (val != '\'')) {
+	while ((xmlIsCharQ(val)) && (val != '\'')) {
 	    cur += len;
 	    val = xmlStringCurrentChar(NULL, cur, &len);
 	}
-	if (!IS_CHAR(val)) {
+	if (!xmlIsCharQ(val)) {
 	    ctxt->error = 1;
 	    return(NULL);
 	} else {
@@ -1264,7 +1264,6 @@ xsltScanLiteral(xsltParserContextPtr ctxt) {
 	cur += len;
 	CUR_PTR = cur;
     } else {
-	/* XP_ERROR(XPATH_START_LITERAL_ERROR); */
 	ctxt->error = 1;
 	return(NULL);
     }
@@ -1290,14 +1289,15 @@ xsltScanNCName(xsltParserContextPtr ctxt) {
 
     cur = q = CUR_PTR;
     val = xmlStringCurrentChar(NULL, cur, &len);
-    if (!IS_LETTER(val) && (val != '_'))
+    if (!xmlIsBaseCharQ(val) && !xmlIsIdeographicQ(val) && (val != '_'))
 	return(NULL);
 
-    while ((IS_LETTER(val)) || (IS_DIGIT(val)) ||
+    while (xmlIsBaseCharQ(val) || xmlIsIdeographicQ(val) ||
+           xmlIsDigitQ(val) ||
            (val == '.') || (val == '-') ||
 	   (val == '_') ||
-	   (IS_COMBINING(val)) ||
-	   (IS_EXTENDER(val))) {
+	   xmlIsCombiningQ(val) ||
+	   xmlIsExtenderQ(val)) {
 	cur += len;
 	val = xmlStringCurrentChar(NULL, cur, &len);
     }
@@ -1853,7 +1853,7 @@ xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc,
     current = end = 0;
     while (pattern[current] != 0) {
 	start = current;
-	while (IS_BLANK_CH(pattern[current]))
+	while (xmlIsBlank_ch(pattern[current]))
 	    current++;
 	end = current;
 	level = 0;

libxslt/transform.c

@@ -3637,12 +3637,12 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node,
 
 	element = elements;
 	while (*element != 0) {
-	    while (IS_BLANK_CH(*element))
+	    while (xmlIsBlank_ch(*element))
 		element++;
 	    if (*element == 0)
 		break;
 	    end = element;
-	    while ((*end != 0) && (!IS_BLANK_CH(*end)))
+	    while ((*end != 0) && (!xmlIsBlank_ch(*end)))
 		end++;
 	    element = xmlStrndup(element, end - element);
 	    if (element) {

libxslt/xsltconfig.h

@@ -20,21 +20,21 @@ extern "C" {
  *
  * the version string like "1.2.3"
  */
-#define LIBXSLT_DOTTED_VERSION "1.1.36"
+#define LIBXSLT_DOTTED_VERSION "1.1.37"
 
 /**
  * LIBXSLT_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXSLT_VERSION 10136
+#define LIBXSLT_VERSION 10137
 
 /**
  * LIBXSLT_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXSLT_VERSION_STRING "10136"
+#define LIBXSLT_VERSION_STRING "10137"
 
 /**
  * LIBXSLT_VERSION_EXTRA:

win32/rcVersion.h

@@ -1,7 +1,7 @@
 #define LIBXSLT_MAJOR_VERSION 1
 #define LIBXSLT_MINOR_VERSION 1
-#define LIBXSLT_MICRO_VERSION 36
-#define LIBXSLT_DOTTED_VERSION "1.1.36"
+#define LIBXSLT_MICRO_VERSION 37
+#define LIBXSLT_DOTTED_VERSION "1.1.37"
 
 #define LIBEXSLT_MAJOR_VERSION 0
 #define LIBEXSLT_MINOR_VERSION 8