update to 1.1.26

changes:
-fix for CVE-2008-2935 (was patched in pkgsrc)
-misc fixes and improvements

6 files changed, 51 insertions, 215 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index d59265223ad..c63b3e53c11 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.83 2010/01/21 23:32:10 heinz Exp $
+# $NetBSD: Makefile,v 1.84 2010/04/13 16:14:03 drochner Exp $
 
-DISTNAME=	libxslt-1.1.24
-PKGREVISION=	1
+DISTNAME=	libxslt-1.1.26
 CATEGORIES=	textproc
 MASTER_SITES+=	ftp://xmlsoft.org/libxslt/
 #MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxslt/1.1/}
@@ -22,6 +21,7 @@ PKGCONFIG_OVERRIDE+=	libexslt.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--without-python
+CONFIGURE_ARGS+=	--with-html-subdir=libxslt
 
 TEST_TARGET=		check
 
diff --git a/textproc/libxslt/PLIST b/textproc/libxslt/PLIST
index 0fe8b4a061e..09cb8935abe 100644
--- a/textproc/libxslt/PLIST
+++ b/textproc/libxslt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2009/06/14 21:36:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.40 2010/04/13 16:14:03 drochner Exp $
 bin/xslt-config
 bin/xsltproc
 include/libexslt/exslt.h
@@ -23,6 +23,7 @@ include/libxslt/xslt.h
 include/libxslt/xsltInternals.h
 include/libxslt/xsltconfig.h
 include/libxslt/xsltexports.h
+include/libxslt/xsltlocale.h
 include/libxslt/xsltutils.h
 lib/libexslt.la
 lib/libxslt.la
@@ -36,6 +37,10 @@ share/aclocal/libxslt.m4
 share/doc/libxslt/API.html
 share/doc/libxslt/APIchunk0.html
 share/doc/libxslt/APIchunk1.html
+share/doc/libxslt/APIchunk10.html
+share/doc/libxslt/APIchunk11.html
+share/doc/libxslt/APIchunk12.html
+share/doc/libxslt/APIchunk13.html
 share/doc/libxslt/APIchunk2.html
 share/doc/libxslt/APIchunk3.html
 share/doc/libxslt/APIchunk4.html
@@ -44,10 +49,6 @@ share/doc/libxslt/APIchunk6.html
 share/doc/libxslt/APIchunk7.html
 share/doc/libxslt/APIchunk8.html
 share/doc/libxslt/APIchunk9.html
-share/doc/libxslt/APIchunk10.html
-share/doc/libxslt/APIchunk11.html
-share/doc/libxslt/APIchunk12.html
-share/doc/libxslt/APIchunk13.html
 share/doc/libxslt/APIconstructors.html
 share/doc/libxslt/APIfiles.html
 share/doc/libxslt/APIfunctions.html
@@ -98,6 +99,7 @@ share/doc/libxslt/html/libxslt-variables.html
 share/doc/libxslt/html/libxslt-xslt.html
 share/doc/libxslt/html/libxslt-xsltInternals.html
 share/doc/libxslt/html/libxslt-xsltexports.html
+share/doc/libxslt/html/libxslt-xsltlocale.html
 share/doc/libxslt/html/libxslt-xsltutils.html
 share/doc/libxslt/html/right.png
 share/doc/libxslt/html/up.png
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index ba5fe028b19..ad5dd764043 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.50 2008/08/07 10:47:43 drochner Exp $
+$NetBSD: distinfo,v 1.51 2010/04/13 16:14:03 drochner Exp $
 
-SHA1 (libxslt-1.1.24.tar.gz) = b5402e24abff5545ed76f6a55049cbebc664bd58
-RMD160 (libxslt-1.1.24.tar.gz) = 41e7721eeed722c45310877d045422b47ab32973
-Size (libxslt-1.1.24.tar.gz) = 3363961 bytes
-SHA1 (patch-aa) = 7351945ab86addef9b5a69be887252fc0b3c1aa5
+SHA1 (libxslt-1.1.26.tar.gz) = 69f74df8228b504a87e2b257c2d5238281c65154
+RMD160 (libxslt-1.1.26.tar.gz) = fc7630352ae5772d25fc8132a373d477fb8d8d5f
+Size (libxslt-1.1.26.tar.gz) = 3401513 bytes
+SHA1 (patch-aa) = 6a6b05d3166ce722a6da867fa1701179b9bfa6c2
 SHA1 (patch-ae) = ea154e23704cbd73e3199271e2d0d4a80b2832e8
-SHA1 (patch-af) = 9d4ac9266323a0127bc466d4c3e5e1d814142f96
+SHA1 (patch-ag) = 956ad89edc6dbbca499fb5b82cf2ed98589362a9
diff --git a/textproc/libxslt/patches/patch-aa b/textproc/libxslt/patches/patch-aa
index 1e430109d58..2ca802abab0 100644
--- a/textproc/libxslt/patches/patch-aa
+++ b/textproc/libxslt/patches/patch-aa
@@ -1,26 +1,20 @@
-$NetBSD: patch-aa,v 1.19 2008/04/18 20:43:55 bjs Exp $
+$NetBSD: patch-aa,v 1.20 2010/04/13 16:14:03 drochner Exp $
 
---- doc/Makefile.in.orig	2008-04-08 13:18:24.000000000 -0400
+--- doc/Makefile.in.orig	2009-09-24 14:43:14.000000000 +0000
 +++ doc/Makefile.in
-@@ -210,7 +210,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+@@ -546,9 +546,9 @@ eapi:	EXSLT/libexslt-api.xml EXSLT/libex
+ web: $(PAGES) $(EPAGES)
  
- # The name of the module.
--DOC_MODULE = libxslt-$(VERSION)
-+DOC_MODULE = libxslt
- 
- # The top-level SGML file.
- DOC_MAIN_XML_FILE = libxslt.xml
-@@ -220,7 +220,7 @@ DOC_SOURCE_DIR = ..
- 
- # A file in win32 depends upon two of the doc files
- WIN32_DIR = $(top_srcdir)/win32
--TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
-+TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- PAGES = API.html bugs.html contribs.html FAQ.html docs.html \
-          downloads.html help.html index.html intro.html news.html \
- 	 xsltproc.html xsltproc2.html
-@@ -498,9 +498,9 @@ $(PAGES): xslt.html $(srcdir)/site.xsl
+ $(PAGES): xslt.html $(srcdir)/site.xsl
+-	-@(if [ -x $(bindir)/xsltproc ] ; then \
++	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+ 	  echo "Rebuilding the HTML Web pages from xslt.html" ; \
+-	  $(bindir)/xsltproc --nonet --html $(srcdir)/site.xsl \
++	  $(top_srcdir)/xsltproc/xsltproc --nonet --html $(srcdir)/site.xsl \
+ 	    xslt.html > index.html ; fi )
+ 	-@(if [ -x $(bindir)/xmllint ] ; then \
+ 	  echo "Validating the HTML Web pages" ; \
+@@ -557,9 +557,9 @@ $(PAGES): xslt.html $(srcdir)/site.xsl
  $(EPAGES): EXSLT/exslt.html $(srcdir)/site.xsl
  	 -@(if [ ! -d EXSLT/html ] ; then \
  	   mkdir -p EXSLT/html ; fi )
@@ -29,10 +23,10 @@ $NetBSD: patch-aa,v 1.19 2008/04/18 20:43:55 bjs Exp $
  	   echo "Rebuilding the HTML Web pages from exslt.html" ; \
 -	   $(bindir)/xsltproc --nonet --html \
 +	   $(top_srcdir)/xsltproc/xsltproc --nonet --html \
- 	   	--stringparam dirname EXSLT/ \
+ 		--stringparam dirname EXSLT/ \
  		--stringparam libname libexslt \
  		--stringparam logo_base ../ \
-@@ -511,20 +511,20 @@ $(EPAGES): EXSLT/exslt.html $(srcdir)/si
+@@ -570,20 +570,20 @@ $(EPAGES): EXSLT/exslt.html $(srcdir)/si
  	   $(bindir)/xmllint --nonet --valid --noout $(EPAGES) ; fi );
  
  ../NEWS: $(srcdir)/news.xsl news.html
@@ -59,7 +53,7 @@ $NetBSD: patch-aa,v 1.19 2008/04/18 20:43:55 bjs Exp $
  			     $(srcdir)/api.xsl \
  			     xslt.html ; fi );
  	-@(if [ -x $(bindir)/xmllint ] ; then \
-@@ -532,9 +532,9 @@ $(APIPAGES): libxslt-refs.xml site.xsl a
+@@ -591,9 +591,9 @@ $(APIPAGES): libxslt-refs.xml site.xsl a
  	  $(bindir)/xmllint --nonet --valid --noout API*.html; fi );
  
  $(EAPIPAGES): EXSLT/libexslt-refs.xml site.xsl api.xsl
@@ -71,7 +65,7 @@ $NetBSD: patch-aa,v 1.19 2008/04/18 20:43:55 bjs Exp $
  			     --stringparam libname libexslt \
  			     --stringparam dirname EXSLT/ \
  			     --stringparam logo_base ../ \
-@@ -542,9 +542,9 @@ $(EAPIPAGES): EXSLT/libexslt-refs.xml si
+@@ -601,9 +601,9 @@ $(EAPIPAGES): EXSLT/libexslt-refs.xml si
  			     EXSLT/exslt.html ; fi );
  
  html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl
@@ -80,10 +74,10 @@ $NetBSD: patch-aa,v 1.19 2008/04/18 20:43:55 bjs Exp $
  	  echo "Rebuilding the HTML pages from the XSLT API" ; \
 -	  $(bindir)/xsltproc --nonet \
 +	  $(top_srcdir)/xsltproc/xsltproc --nonet \
- 			     $(srcdir)/newapi.xsl libxslt-api.xml ; fi ); 
+ 			     $(srcdir)/newapi.xsl libxslt-api.xml ; fi );
  	-@(if [ -x $(bindir)/xmllint ] ; then \
  	  echo "Validating the resulting XHTML pages" ; \
-@@ -557,9 +557,9 @@ wiki: libxslt-api.xml $(srcdir)/wiki.xsl
+@@ -616,9 +616,9 @@ wiki: libxslt-api.xml $(srcdir)/wiki.xsl
  
  EXSLT/html/index.html: EXSLT/libexslt-api.xml \
  	$(srcdir)/newapi.xsl
@@ -92,10 +86,10 @@ $NetBSD: patch-aa,v 1.19 2008/04/18 20:43:55 bjs Exp $
  	  echo "Rebuilding the HTML pages from the EXSLT API" ; \
 -	  $(bindir)/xsltproc --nonet --output EXSLT/ \
 +	  $(top_srcdir)/xsltproc/xsltproc --nonet --output EXSLT/ \
- 	  		     --stringparam libname libexslt \
+ 			     --stringparam libname libexslt \
  			     --stringparam dirname EXSLT/ \
  			     --stringparam logo_base ../../ \
-@@ -581,22 +581,22 @@ xsltproc.1: xsltproc.xml
+@@ -642,22 +642,22 @@ xsltproc.1: xsltproc.xml
  # Note that in the following, xmllint output is piped to xsltproc
  search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \
              $(srcdir)/search.xml $(srcdir)/search.php.inc
diff --git a/textproc/libxslt/patches/patch-af b/textproc/libxslt/patches/patch-af
deleted file mode 100644
index 4efca0f43a7..00000000000
--- a/textproc/libxslt/patches/patch-af
+++ /dev/null
@@ -1,173 +0,0 @@
-$NetBSD: patch-af,v 1.3 2008/08/07 10:47:43 drochner Exp $
-
---- libexslt/crypto.c.orig	2007-01-17 14:17:25.000000000 +0100
-+++ libexslt/crypto.c
-@@ -317,13 +317,13 @@ exsltCryptoCryptoApiRc4Decrypt (xmlXPath
- #define PLATFORM_MD5 GCRY_MD_MD5
- #define PLATFORM_SHA1 GCRY_MD_SHA1
- 
--#ifdef HAVE_SYS_TYPES_H                                                        
--# include <sys/types.h>                                                        
--#endif                                                                         
--#ifdef HAVE_STDINT_H                                                           
--# include <stdint.h>                                                           
--#endif                                                                         
--  
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h>		/* needed by gcrypt.h 4 Jul 04 */
- #endif
-@@ -595,11 +595,13 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     int str_len = 0, bin_len = 0, hex_len = 0;
-     xmlChar *key = NULL, *str = NULL, *padkey = NULL;
-     xmlChar *bin = NULL, *hex = NULL;
-+    xsltTransformContextPtr tctxt = NULL;
- 
--    if ((nargs < 1) || (nargs > 3)) {
-+    if (nargs != 2) {
- 	xmlXPathSetArityError (ctxt);
- 	return;
-     }
-+    tctxt = xsltXPathGetTransformContext(ctxt);
- 
-     str = xmlXPathPopString (ctxt);
-     str_len = xmlUTF8Strlen (str);
-@@ -611,7 +613,7 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     }
- 
-     key = xmlXPathPopString (ctxt);
--    key_len = xmlUTF8Strlen (str);
-+    key_len = xmlUTF8Strlen (key);
- 
-     if (key_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -620,15 +622,33 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
- 	return;
-     }
- 
--    padkey = xmlMallocAtomic (RC4_KEY_LENGTH);
-+    padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1);
-+    if (padkey == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-+    memset(padkey, 0, RC4_KEY_LENGTH + 1);
-+
-     key_size = xmlUTF8Strsize (key, key_len);
-+    if ((key_size > RC4_KEY_LENGTH) || (key_size < 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);
--    memset (padkey + key_size, '\0', sizeof (padkey));
- 
- /* encrypt it */
-     bin_len = str_len;
-     bin = xmlStrdup (str);
-     if (bin == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate string\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
- 	xmlXPathReturnEmptyString (ctxt);
- 	goto done;
-     }
-@@ -638,6 +658,9 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
-     hex_len = str_len * 2 + 1;
-     hex = xmlMallocAtomic (hex_len);
-     if (hex == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate result\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
- 	xmlXPathReturnEmptyString (ctxt);
- 	goto done;
-     }
-@@ -670,11 +693,13 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
-     int str_len = 0, bin_len = 0, ret_len = 0;
-     xmlChar *key = NULL, *str = NULL, *padkey = NULL, *bin =
- 	NULL, *ret = NULL;
-+    xsltTransformContextPtr tctxt = NULL;
- 
--    if ((nargs < 1) || (nargs > 3)) {
-+    if (nargs != 2) {
- 	xmlXPathSetArityError (ctxt);
- 	return;
-     }
-+    tctxt = xsltXPathGetTransformContext(ctxt);
- 
-     str = xmlXPathPopString (ctxt);
-     str_len = xmlUTF8Strlen (str);
-@@ -686,7 +711,7 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
-     }
- 
-     key = xmlXPathPopString (ctxt);
--    key_len = xmlUTF8Strlen (str);
-+    key_len = xmlUTF8Strlen (key);
- 
-     if (key_len == 0) {
- 	xmlXPathReturnEmptyString (ctxt);
-@@ -695,22 +720,51 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
- 	return;
-     }
- 
--    padkey = xmlMallocAtomic (RC4_KEY_LENGTH);
-+    padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1);
-+    if (padkey == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-+    memset(padkey, 0, RC4_KEY_LENGTH + 1);
-     key_size = xmlUTF8Strsize (key, key_len);
-+    if ((key_size > RC4_KEY_LENGTH) || (key_size < 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);
--    memset (padkey + key_size, '\0', sizeof (padkey));
- 
- /* decode hex to binary */
-     bin_len = str_len;
-     bin = xmlMallocAtomic (bin_len);
-+    if (bin == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate string\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     ret_len = exsltCryptoHex2Bin (str, str_len, bin, bin_len);
- 
- /* decrypt the binary blob */
-     ret = xmlMallocAtomic (ret_len);
-+    if (ret == NULL) {
-+	xsltTransformError(tctxt, NULL, tctxt->inst,
-+	    "exsltCryptoRc4EncryptFunction: Failed to allocate result\n");
-+	tctxt->state = XSLT_STATE_STOPPED;
-+	xmlXPathReturnEmptyString (ctxt);
-+	goto done;
-+    }
-     PLATFORM_RC4_DECRYPT (ctxt, padkey, bin, ret_len, ret, ret_len);
- 
-     xmlXPathReturnString (ctxt, ret);
- 
-+done:
-     if (key != NULL)
- 	xmlFree (key);
-     if (str != NULL)
diff --git a/textproc/libxslt/patches/patch-ag b/textproc/libxslt/patches/patch-ag
new file mode 100644
index 00000000000..5df4831fa42
--- /dev/null
+++ b/textproc/libxslt/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2010/04/13 16:14:03 drochner Exp $
+
+--- configure.orig	2010-04-08 21:24:55.000000000 +0000
++++ configure
+@@ -13401,7 +13401,7 @@ done
+ VERSION_SCRIPT_FLAGS=
+ $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
+     VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+-test "`uname`" == "SunOS" && \
++test "`uname`" = "SunOS" && \
+     VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+ 
+  if test -n "$VERSION_SCRIPT_FLAGS"; then