7204409 Upgrade libxslt to version 1.1.27
authorPetr Sumbera <petr.sumbera@oracle.com>
Tue, 23 Oct 2012 02:14:33 -0700
changeset 1025 95d154bfbea4
parent 1024 64f927492d58
child 1026 6af2048773a2
7204409 Upgrade libxslt to version 1.1.27 7188914 Problem with library/libxslt
components/libxslt/Makefile
components/libxslt/libxslt.3
components/libxslt/libxslt.p5m
components/libxslt/mapfile.xslt
components/libxslt/patches/CVE-2011-3970.patch
components/libxslt/patches/docbook-test.patch
components/libxslt/patches/lib-run-path-fix.patch
components/libxslt/patches/man.patch
components/libxslt/patches/srcdir-tests.patch
components/libxslt/patches/test.patch
components/libxslt/xsl.license
components/libxslt/xsltproc.1
--- a/components/libxslt/Makefile	Mon Oct 22 11:36:48 2012 -0700
+++ b/components/libxslt/Makefile	Tue Oct 23 02:14:33 2012 -0700
@@ -26,12 +26,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		libxslt
-COMPONENT_VERSION=	1.1.26
+COMPONENT_VERSION=	1.1.27
 COMPONENT_PROJECT_URL=	http://xmlsoft.org/XSLT/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1
+    sha256:b6a8d9a421f2630999ca91d9f8c091ee8ea2d580e6be84c1d21b2a45e11e7e26
 COMPONENT_ARCHIVE_URL=	ftp://xmlsoft.org/libxslt/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
@@ -46,15 +46,14 @@
 
 CONFIGURE_OPTIONS += --disable-static
 CONFIGURE_OPTIONS += --with-pic
-CONFIGURE_OPTIONS += --with-threads
 CONFIGURE_OPTIONS += --with-python=$(PYTHON.$(BITS))
 CONFIGURE_OPTIONS += --without-crypto
+CONFIGURE_OPTIONS += --with-html-dir=/usr/share/lib/xslt/doc
+CONFIGURE_OPTIONS += --with-html-subdir=html
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)"
 CONFIGURE_OPTIONS += PYTHON_VENDOR_PACKAGES=$(PYTHON_VENDOR_PACKAGES)
 
-COMPONENT_TEST_TARGETS = tests
-
 COMPONENT_PREP_ACTION = \
 	(cd $(@D) ; cp ../mapfile.xslt libxslt/libxslt.syms ; \
 		    $(RM) libxslt/xsltconfig.h libexslt/exsltconfig.h ; \
--- a/components/libxslt/libxslt.3	Mon Oct 22 11:36:48 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-.TH libxslt 3 "17 Jul 2002"
-.SH NAME
-libxslt \- library for transforming XML documents
-.SH DESCRIPTION
-The
-.I libxslt
-library is the XSLT library developed for the Gnome project.  XSLT
-itself is a declarative language for transforming XML documents into other
-XML documents, or arbitrary text output using a stylesheet.
-
-.LP
-The
-.I libxslt
-library is based on
-.I libxml2 
-library developed for the Gnome project.  It also implements most
-of the EXSLT set of processor-portable extensions functions and some of Saxon's
-evaluate and expressions extensions.
-
-.SH FILES
-.TP 2.2i
-.B /usr/lib/libxslt.so
-shared object library
-.TP
-.B /usr/lib/libexslt.so
-shared object library
-.TP
-.B /usr/bin/xsltproc
-command line XSLT processor
-.TP
-.B /usr/bin/xslt-config
-binary application for printing library configuration
-.TP
-.B /usr/include/libxslt
-header files
-.TP
-.B /usr/share/lib/xml/style
-stylesheets
-
-.SH AUTHORS
-Daniel Veillard (dani[email protected]).
-
-.SH SEE ALSO
-.IR xsltproc (1),
-.IR xslt-config (1),
-.IR libxml (3)
--- a/components/libxslt/libxslt.p5m	Mon Oct 22 11:36:48 2012 -0700
+++ b/components/libxslt/libxslt.p5m	Tue Oct 23 02:14:33 2012 -0700
@@ -43,10 +43,18 @@
 dir path=usr/lib/pkgconfig
 dir path=usr/share
 dir path=usr/share/aclocal
+dir path=usr/share/lib
+dir path=usr/share/lib/xslt
+dir path=usr/share/lib/xslt/doc
+dir path=usr/share/lib/xslt/doc/html
+dir path=usr/share/lib/xslt/doc/html/EXSLT
+dir path=usr/share/lib/xslt/doc/html/html
+dir path=usr/share/lib/xslt/doc/html/tutorial
+dir path=usr/share/lib/xslt/doc/html/tutorial2
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man3
-file path=usr/bin/xslt-config
+file path=usr/bin/xslt-config facet.devel=true
 file path=usr/bin/xsltproc
 file path=usr/include/libexslt/exslt.h
 file path=usr/include/libexslt/exsltconfig.h
@@ -87,9 +95,99 @@
 file path=usr/lib/pkgconfig/libexslt.pc
 file path=usr/lib/pkgconfig/libxslt.pc
 file path=usr/share/aclocal/libxslt.m4
-file xslt-config.1 path=usr/share/man/man1/xslt-config.1
-file xsltproc.1 path=usr/share/man/man1/xsltproc.1
-file libxslt.3 path=usr/share/man/man3/libxslt.3
+file path=usr/share/lib/xslt/doc/html/API.html
+file path=usr/share/lib/xslt/doc/html/APIchunk0.html
+file path=usr/share/lib/xslt/doc/html/APIchunk1.html
+file path=usr/share/lib/xslt/doc/html/APIchunk10.html
+file path=usr/share/lib/xslt/doc/html/APIchunk11.html
+file path=usr/share/lib/xslt/doc/html/APIchunk12.html
+file path=usr/share/lib/xslt/doc/html/APIchunk13.html
+file path=usr/share/lib/xslt/doc/html/APIchunk2.html
+file path=usr/share/lib/xslt/doc/html/APIchunk3.html
+file path=usr/share/lib/xslt/doc/html/APIchunk4.html
+file path=usr/share/lib/xslt/doc/html/APIchunk5.html
+file path=usr/share/lib/xslt/doc/html/APIchunk6.html
+file path=usr/share/lib/xslt/doc/html/APIchunk7.html
+file path=usr/share/lib/xslt/doc/html/APIchunk8.html
+file path=usr/share/lib/xslt/doc/html/APIchunk9.html
+file path=usr/share/lib/xslt/doc/html/APIconstructors.html
+file path=usr/share/lib/xslt/doc/html/APIfiles.html
+file path=usr/share/lib/xslt/doc/html/APIfunctions.html
+file path=usr/share/lib/xslt/doc/html/APIsymbols.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/APIchunk0.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/APIconstructors.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/APIfiles.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/APIfunctions.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/APIsymbols.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/bugs.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/docs.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/downloads.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/exslt.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/help.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/index.html
+file path=usr/share/lib/xslt/doc/html/EXSLT/intro.html
+file path=usr/share/lib/xslt/doc/html/FAQ.html
+file path=usr/share/lib/xslt/doc/html/Libxslt-Logo-180x168.gif
+file path=usr/share/lib/xslt/doc/html/Libxslt-Logo-90x34.gif
+file path=usr/share/lib/xslt/doc/html/bugs.html
+file path=usr/share/lib/xslt/doc/html/contexts.gif
+file path=usr/share/lib/xslt/doc/html/contribs.html
+file path=usr/share/lib/xslt/doc/html/docbook.html
+file path=usr/share/lib/xslt/doc/html/docs.html
+file path=usr/share/lib/xslt/doc/html/downloads.html
+file path=usr/share/lib/xslt/doc/html/extensions.html
+file path=usr/share/lib/xslt/doc/html/help.html
+file path=usr/share/lib/xslt/doc/html/html/book1.html
+file path=usr/share/lib/xslt/doc/html/html/home.png
+file path=usr/share/lib/xslt/doc/html/html/index.html
+file path=usr/share/lib/xslt/doc/html/html/left.png
+file path=usr/share/lib/xslt/doc/html/html/libxslt-attributes.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-documents.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-extensions.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-extra.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-functions.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-imports.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-keys.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-lib.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-namespaces.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-numbersInternals.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-pattern.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-preproc.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-security.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-templates.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-transform.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-variables.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-xslt.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-xsltInternals.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-xsltexports.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-xsltlocale.html
+file path=usr/share/lib/xslt/doc/html/html/libxslt-xsltutils.html
+file path=usr/share/lib/xslt/doc/html/html/right.png
+file path=usr/share/lib/xslt/doc/html/html/up.png
+file path=usr/share/lib/xslt/doc/html/index.html
+file path=usr/share/lib/xslt/doc/html/internals.html
+file path=usr/share/lib/xslt/doc/html/intro.html
+file path=usr/share/lib/xslt/doc/html/news.html
+file path=usr/share/lib/xslt/doc/html/node.gif
+file path=usr/share/lib/xslt/doc/html/object.gif
+file path=usr/share/lib/xslt/doc/html/processing.gif
+file path=usr/share/lib/xslt/doc/html/python.html
+file path=usr/share/lib/xslt/doc/html/smallfootonly.gif
+file path=usr/share/lib/xslt/doc/html/stylesheet.gif
+file path=usr/share/lib/xslt/doc/html/templates.gif
+file path=usr/share/lib/xslt/doc/html/tutorial/libxslt_tutorial.c
+file path=usr/share/lib/xslt/doc/html/tutorial/libxslttutorial.html
+file path=usr/share/lib/xslt/doc/html/tutorial/libxslttutorial.xml
+file path=usr/share/lib/xslt/doc/html/tutorial2/libxslt_pipes.c
+file path=usr/share/lib/xslt/doc/html/tutorial2/libxslt_pipes.html
+file path=usr/share/lib/xslt/doc/html/tutorial2/libxslt_pipes.xml
+file path=usr/share/lib/xslt/doc/html/xslt.html
+file path=usr/share/lib/xslt/doc/html/xsltproc.html
+file path=usr/share/lib/xslt/doc/html/xsltproc2.html
+file xslt-config.1 path=usr/share/man/man1/xslt-config.1 facet.devel=true
+file path=usr/share/man/man1/xsltproc.1
+file path=usr/share/man/man3/libexslt.3
+file path=usr/share/man/man3/libxslt.3
 legacy pkg=SUNWlxsl desc="The XSLT library" name="The XSLT library"
 license xsl.license license=SUNWlxsl.copyright
 link path=usr/lib/$(MACH64)/libexslt.so target=libexslt.so.0
--- a/components/libxslt/mapfile.xslt	Mon Oct 22 11:36:48 2012 -0700
+++ b/components/libxslt/mapfile.xslt	Tue Oct 23 02:14:33 2012 -0700
@@ -15,6 +15,13 @@
 #
 $mapfile_version 2
 
+SYMBOL_VERSION SUNW_1.5 {
+	global:
+		xsltMaxVars;
+		xsltFreeLocales;
+		xsltXPathCompileFlags;
+} SUNW_1.4;
+
 SYMBOL_VERSION SUNW_1.4 {
 	global:
 		xsltCheckExtURI;
--- a/components/libxslt/patches/CVE-2011-3970.patch	Mon Oct 22 11:36:48 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- libxslt-1.1.26/libxslt/pattern.c.orig	2012-07-03 10:07:47.903679049 -0700
-+++ libxslt-1.1.26/libxslt/pattern.c	2012-07-03 10:08:43.621787188 -0700
[email protected]@ -1864,6 +1864,8 @@
- 		while ((pattern[end] != 0) && (pattern[end] != '"'))
- 		    end++;
- 	    }
-+	    if (pattern[end] == 0)
-+		break;
- 	    end++;
- 	}
- 	if (current == end) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/patches/docbook-test.patch	Tue Oct 23 02:14:33 2012 -0700
@@ -0,0 +1,14 @@
+The new line at the end need to be added here to mitigated differences
+between Solaris and GNU grep commands. Where GNU grep will add new line
+at the end when used on file without it.
+
+--- libxslt-1.1.27/tests/docbook/Makefile.am	Fri Sep  7 00:49:41 2012
++++ libxslt-1.1.27/tests/docbook/Makefile.am	Thu Oct 11 00:39:36 2012
[email protected]@ -73,6 +73,7 @@
+ 	  xhtml=result/xhtml/`basename $$i .xml`.xhtml; \
+ 	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nonet \
+ 		$(srcdir)/xhtml/docbook.xsl $$i > $$out ; \
++	  echo '' >> $$out ; \
+ 	  if [ -f $(srcdir)/$$xhtml ] ; then \
+ 	      grep -v id < $(srcdir)/$$xhtml > $$xhtml.noid ; \
+ 	      grep -v id < $$out > $$out.noid ; \
--- a/components/libxslt/patches/lib-run-path-fix.patch	Mon Oct 22 11:36:48 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
---- libxslt-1.1.26/libxslt.pc.in.orig	2012-02-28 08:52:25.350596427 -0800
-+++ libxslt-1.1.26/libxslt.pc.in	2012-02-28 08:53:36.436859739 -0800
[email protected]@ -8,5 +8,5 @@
- Version: @[email protected]
- Description: XSLT library version 2.
- Requires: libxml-2.0
--Libs: @[email protected] @[email protected]
-+Libs: -L${libdir} -lxslt
- Cflags: @[email protected]
---- libxslt-1.1.26/libexslt.pc.in.orig	2012-02-28 08:52:18.790178751 -0800
-+++ libxslt-1.1.26/libexslt.pc.in	2012-02-28 08:53:21.141163457 -0800
[email protected]@ -8,5 +8,5 @@
- Version: @[email protected]
- Description: EXSLT Extension library
- Requires: libxml-2.0
--Libs: @[email protected] @[email protected]
-+Libs: -L${libdir} -lexslt
- Cflags: @[email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/patches/man.patch	Tue Oct 23 02:14:33 2012 -0700
@@ -0,0 +1,69 @@
+Few man pages modifications for Solaris.
+
+Note that xsltproc.xml used for generation of xsltproc.1 needs to be
+tweaked little bit to fit output for Solaris nroff.
+
+--- libxslt-1.1.27/libxslt/libxslt.3	Mon May 11 23:29:34 2009
++++ libxslt-1.1.27/libxslt/libxslt.3	Tue Oct  9 04:34:52 2012
[email protected]@ -10,13 +10,10 @@
+ .LP
+ .SH FILES
+ .TP 2.2i
+-.B /usr/lib/libxslt_1.0.0/libxslt.a
+-static library
+-.TP
+-.B /usr/lib/libxslt_1.0.0/libxslt.so
++.B /usr/lib/libxslt.so
+ sharable library
+ .TP
+-.B /usr/package/libxslt_1.0.0/bin/xsltproc
++.B /usr/bin/xsltproc
+ binary application to do XSL transformations on the command line
+ .SH AUTHORS
+ Daniel Veillard ([email protected]).
+--- libxslt-1.1.27/libexslt/libexslt.3	Mon May 11 23:29:34 2009
++++ libxslt-1.1.27/libexslt/libexslt.3	Tue Oct  9 04:44:18 2012
[email protected]@ -255,9 +255,6 @@
+ .I /usr/bin/xslt-config
+ shell script giving pre-processor and linker flags.
+ .TP
+-.I /usr/lib/libexslt.a
+-static library
+-.TP
+ .I /usr/lib/libexslt.so
+ sharable library
+ .SH AUTHORS
+--- libxslt-1.1.27/doc/xsltproc.xml	Tue Sep 11 23:35:50 2012
++++ libxslt-1.1.27/doc/xsltproc.xml	Thu Oct 11 01:45:40 2012
[email protected]@ -26,7 +26,7 @@
+ 		</affiliation>
+ 	</author>
+ 	<!-- date should be the date of the latest change or the release version -->
+-	<date>$Date$</date>
++	<date>12 Sep 2012</date>
+ 	<!-- still a bit buggy output, will talk to docbook-xsl upstream to fix this -->
+ 	<!-- <releaseinfo>This is release 0.4 of the xsltproc Manual.</releaseinfo> -->
+ 	<!-- <edition>0.4</edition> -->
[email protected]@ -408,7 +408,7 @@
+ 		<para>
+ 			Process the input document using the XInclude specification. More
+ 			details on this can be found in the XInclude
+-			specification: <ulink url="http://www.w3.org/TR/xinclude/"/>
++			specification: http://www.w3.org/TR/xinclude/
+ 		</para>
+ 	</listitem>
+ 		</varlistentry>
[email protected]@ -559,11 +559,11 @@
+ 				<para><citerefentry>
+ 						<refentrytitle>libxml</refentrytitle>
+ 						<manvolnum>3</manvolnum>
+-					</citerefentry> web page <ulink url="http://www.xmlsoft.org/"/>
++					</citerefentry> web page http://www.xmlsoft.org/
+ 				</para>
+ 			</listitem>
+ 			<listitem>
+-				<para>W3C <acronym>XSLT</acronym> page <ulink url="http://www.w3.org/TR/xslt"/>
++				<para>W3C <acronym>XSLT</acronym> http://www.w3.org/TR/xslt
+ 				</para>
+ 			</listitem>
+ 		</itemizedlist>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/patches/srcdir-tests.patch	Tue Oct 23 02:14:33 2012 -0700
@@ -0,0 +1,94 @@
+Allows to produce clean test run even when XSLT is configured outside of
+source directory.
+
+--- libxslt-1.1.27/tests/plugins/Makefile.am	Tue Sep  4 07:26:23 2012
++++ libxslt-1.1.27/tests/plugins/Makefile.am	Thu Oct 11 06:25:06 2012
[email protected]@ -29,8 +29,8 @@
+ test tests: $(top_builddir)/xsltproc/xsltproc test-logall $(noinst_LTLIBRARIES)
+ 	@LD_LIBRARY_PATH=$(plugindir):$(top_builddir)/libxslt/.libs:$(LD_LIBRARY_PATH) \
+ 	 LIBXSLT_PLUGINS_PATH=$(plugindir) \
+-	 $(top_builddir)/xsltproc/xsltproc plugin.xsl plugin.xml > plugin.res
+-	@diff plugin.out plugin.res
++	 $(top_builddir)/xsltproc/xsltproc $(srcdir)/plugin.xsl $(srcdir)/plugin.xml > plugin.res
++	@diff $(srcdir)/plugin.out plugin.res
+ 	@rm plugin.res
+ 
+ else
+--- libxslt-1.1.27/tests/documents/Makefile.am	Tue Sep  4 07:26:23 2012
++++ libxslt-1.1.27/tests/documents/Makefile.am	Thu Oct 11 06:54:44 2012
[email protected]@ -27,6 +27,7 @@
+ 	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
+ 	rm -f result)
+ 	@($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/test.xsl $(srcdir)/test_bad.xml > result 2>err ; \
++	sed 's|$(srcdir)/||' err > err.tmp; mv err.tmp err; \
+ 	diff $(srcdir)/test_bad.result result; \
+ 	diff $(srcdir)/test_bad.err err; \
+ 	grep "MORY ALLO" .memdump  | grep -v "MEMORY ALLOCATED : 0" || true;\
+--- libxslt-1.1.27/tests/general/Makefile.am	Fri Sep  7 00:49:41 2012
++++ libxslt-1.1.27/tests/general/Makefile.am	Mon Oct 15 02:41:07 2012
[email protected]@ -207,10 +207,11 @@
+ 	  if [ ! -f $$j ] ; then continue ; fi ; \
+ 	  if [ -d $$j ] ; then continue ; fi ; \
+ 	  name=`basename $$j .xsl`; \
++	  real_docs_path=`cd $(srcdir)/../docs && pwd`; \
+ 	  out=$(srcdir)/"$$name".out; \
+ 	  err=$(srcdir)/"$$name".err; \
+ 	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i \
+-	  	> result.$$name 2>err.$$name; \
++	  	2>&1 > result.$$name | sed 's|$(srcdir)|.|' >err.$$name; \
+ 	  if [ ! -f $$out ] ; then \
+ 	  	cp result.$$name $$out ; \
+ 		if [ -s err.$$name ] ; then \
[email protected]@ -217,6 +218,9 @@
+ 			cp err.$$name $$err ; \
+ 		fi ; \
+ 	  else \
++		grep '../docs/' $$out >/dev/null && \
++		  sed "s|$$real_docs_path|../docs|" result.$$name > \
++		  result.$$name.tmp && mv result.$$name.tmp result.$$name; \
+ 	  	diff $$out result.$$name; \
+ 		if [ -s $$err ] ; then \
+ 	  		diff $$err err.$$name; \
[email protected]@ -239,10 +243,11 @@
+ 	  if [ ! -f $$j ] ; then continue ; fi ; \
+ 	  if [ -d $$j ] ; then continue ; fi ; \
+ 	  name=`basename $$j .xsl`; \
++	  real_docs_path=`cd $(srcdir)/../docs && pwd`; \
+ 	  out=$(srcdir)/"$$name".out; \
+ 	  err=$(srcdir)/"$$name".err; \
+ 	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict $$j $$i \
+-	  	> result.$$name 2>err.$$name; \
++	  	2>&1 > result.$$name | sed 's|$(srcdir)|.|' >err.$$name; \
+ 	  if [ ! -f $$out ] ; then \
+ 	  	cp result.$$name $$out ; \
+ 		if [ -s err.$$name ] ; then \
[email protected]@ -249,6 +254,9 @@
+ 			cp err.$$name $$err ; \
+ 		fi ; \
+ 	  else \
++		grep '../docs/' $$out >/dev/null && \
++		  sed "s|$$real_docs_path|../docs|" result.$$name > \
++		  result.$$name.tmp && mv result.$$name.tmp result.$$name; \
+ 	  	diff $$out result.$$name; \
+ 		if [ -s $$err ] ; then \
+ 	  		diff $$err err.$$name; \
+--- libxslt-1.1.27/tests/REC/Makefile.am	Fri Sep  7 00:49:41 2012
++++ libxslt-1.1.27/tests/REC/Makefile.am	Thu Oct 11 08:04:48 2012
[email protected]@ -96,7 +96,7 @@
+ 	  fi ; \
+ 	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+ 	  	$(srcdir)/$$name.xsl $(srcdir)/$$name.xml \
+-	  	> $$name.res 2>$$name.bad ; \
++	  	2>&1 > $$name.res | sed 's|$(srcdir)|.|' >$$name.bad ; \
+ 	  if [ ! -f $(srcdir)/$$name.out ] ; then \
+ 	  	cp $$name.res $(srcdir)/$$name.out ; \
+ 		if [ -s $$name.bad ] ; then \
[email protected]@ -158,7 +158,7 @@
+ 	  fi ; \
+ 	  log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict \
+ 	  	$(srcdir)/$$name.xsl $(srcdir)/$$name.xml \
+-	  	> $$name.res 2>$$name.bad ; \
++	  	2>&1 > $$name.res | sed 's|$(srcdir)|.|' >$$name.bad ; \
+ 	  if [ ! -f $(srcdir)/$$name.out ] ; then \
+ 	  	cp $$name.res $(srcdir)/$$name.out ; \
+ 		if [ -s $$name.bad ] ; then \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/patches/test.patch	Tue Oct 23 02:14:33 2012 -0700
@@ -0,0 +1,11 @@
+Missing file from distribution.
+
+http://git.gnome.org/browse/libxslt/commit/?id=3d7ba8075408e5b87fde820746bcacfd86b553c6
+
+--- /dev/null	2012-09-19 02:07:22.000000000 -0700
++++ libxslt-1.1.27/tests/general/bug-165.err	2012-09-19 02:06:53.009219700 -0700
[email protected]@ -0,0 +1,4 @@
++runtime error: file ./bug-165.xsl line 6 element value-of
++Variable 'pStyle' has not been declared.
++runtime error: file ./bug-165.xsl line 6 element value-of
++XPath evaluation returned no result.
--- a/components/libxslt/xsl.license	Mon Oct 22 11:36:48 2012 -0700
+++ b/components/libxslt/xsl.license	Tue Oct 23 02:14:33 2012 -0700
@@ -1,5 +1,5 @@
 ------------------
-- libxslt 1.1.26 -
+- libxslt 1.1.27 -
 ------------------
 
 Oracle Internal Tracking Number 5303
--- a/components/libxslt/xsltproc.1	Mon Oct 22 11:36:48 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-."Generated by db2man.xsl. Don't modify this, modify the source.
-.de Sh \" Subsection
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Ip \" List item
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.TH "xsltproc" 1 "2002 Jun 27"
-.SH NAME
-xsltproc \- command line xslt processor
-.SH "SYNOPSIS"
-\fBxsltproc\fR [\fB-V\fR | \fB-v\fR | \fB-o  \fIfile\fR \fR | \fB--timing\fR | \fB--repeat\fR | \fB--debug\fR | \fB--novalid\fR | \fB--noout\fR | \fB--maxdepth  \fIval\fR \fR | \fB--html\fR | \fB--docbook\fR | \fB--param  \fIname\fR   \fIvalue\fR \fR | \fB--stringparam  \fIname\fR   \fIvalue\fR \fR | \fB--nonet\fR | \fB--warnnet\fR | \fB--catalogs\fR | \fB--xinclude\fR | \fB--profile\fR] [\fB\fIstylesheet\fR\fR] [ \fIfile1\fR ] [ \fIfile2\fR ] [ \fI....\fR ]
-.SH "INTRODUCTION"
-
-.PP
-xsltproc is a command line tool for applying XSLT stylesheets to XML documents. It is part of libxslt, the XSLT C library for GNOME. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop.
-.PP
-xsltproc is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied.
-.PP
-If a stylesheet is included in an XML document with a Stylesheet Processing Instruction, no stylesheet need be named at the command line. xsltproc will automatically detect the included stylesheet and use it.
-.PP
-By default, output is to stdout. You can specify a file for output using the \fB-o\fR option.
-
-.SH "COMMAND LINE OPTIONS"
-
-.TP
-\fB-V\fR or \fB--version\fR
-Show the version of libxml and libxslt used.
-.TP
-\fB-v\fR or \fB--verbose\fR
-Output each step taken by xsltproc in processing the stylesheet and the document.
-.TP
-\fB-o\fR or \fB--output\fR \fIfile\fR
-Direct output to the file named \fIfile\fR. For multiple outputs, also known as "chunking", \fB-o\fR \fBdirectory/\fR directs the output files to a specified directory. The directory must already exist.
-.TP
-\fB--timing\fR
-Display the time used for parsing the stylesheet, parsing the document and applying the stylesheet and saving the result. Displayed in milliseconds.
-.TP
-\fB--repeat\fR
-Run the transformation 20 times. Used for timing tests.
-.TP
-\fB--debug\fR
-Output an XML tree of the transformed document for debugging purposes.
-.TP
-\fB--novalid\fR
-Skip loading the document's DTD.
-.TP
-\fB--noout\fR
-Do not output the result.
-.TP
-\fB--maxdepth\fR \fIvalue\fR
-Adjust the maximum depth of the template stack before libxslt concludes it is in an infinite loop. The default is 500.
-.TP
-\fB--html\fR
-The input document is an HTML file.
-.TP
-\fB--docbook\fR
-The input document is DocBook SGML.
-.TP
-\fB--param\fR \fIname\fR \fIvalue\fR
-Pass a parameter of name \fIname\fR and value \fIvalue\fR to the stylesheet. You may pass multiple name/value pairs up to a maximum of 32. If the value being passed is a string rather than a node identifier, use \fB--stringparam\fR instead.
-.TP
-\fB--stringparam\fR \fIname\fR \fIvalue\fR
-Pass a paramenter of name \fIname\fR and value \fIvalue\fR where \fIvalue\fR is a string rather than a node identifier.
-.TP
-\fB--nonet\fR
-Do not use the Internet to fetch DTD's or entities.
-.TP
-\fB--warnnet\fR
-Output notification when DTD's or entities are fetched over the Internet.
-.TP
-\fB--catalogs\fR
-Use catalogs to resolve the location of external entities. This speeds DTD resolution. By having a catalog file point to a local version of the DTD, xsltproc does not have to use the Internet to fetch the DTD. xsltproc uses the catalog identified by the environmental variable \fBSGML_CATALOG_FILES\fR.
-.TP
-\fB--xinclude\fR
-Process the input document using the Xinclude specification. More details on this can be found in the Xinclude specification: http://www.w3.org/TR/xinclude/.
-.TP
-\fB--profile\fR or \fB--norman\fR
-Output profiling information detailing the amount of time spent in each part of the stylesheet. This is useful in optimizing stylesheet performance.
-
-.SH "RETURN VALUES"
-
-.PP
-xsltproc's return codes provide information that can be used when calling it from scripts.
-
-.PP
-0: normal
-.PP
-1: no argument
-.PP
-2: too many parameters
-.PP
-3: unknown option
-.PP
-4: failed to parse the stylesheet
-.PP
-5: error in the stylesheet
-.PP
-6: error in one of the documents
-.PP
-7: unsupported xsl:output method
-.PP
-8: string parameter contains both quote and double-quotes
-
-.SH "MORE INFORMATION"
-
-.PP
-libxml web page: http://www.xmlsoft.org/
-.PP
-W3C XSLT page: http://www.w3.org/TR/xslt
-
-.SH AUTHOR
-Copyright 2001 by John Fleck  <[email protected]>.
-This is release 0.2 of the xsltproc Manual.
-