xsltSetGenericDebugFunc xsltSetGenericErrorFunc xsltSetTransformErrorFunc Do not send code, I won't debug it (but patches are
+ really appreciated!).Check the following too before
+-posting :
use the search engine to get informations
++posting:use the search engine to get information
+ related to your problem.make sure you are using a recent
+ version , and that the problem still shows up in those
+@@ -37,7 +37,7 @@ posting:use the search engine to get
+ logs just preceding the possible problemPlease send the command showing the error as well as the input and
+ stylesheet (as an attachment)
+-Then send the bug with associated informations to reproduce it to the xslt@gnome.org list; if it's really libxslt
++
Then send the bug with associated information to reproduce it to the xslt@gnome.org list; if it's really libxslt
+ related I will approve it. Please do not send mail to me directly, it makes
+ things really hard to track and in some cases I am not the best person to
+ answer a given question, ask on the list.
To be really clear about support :
Then send the bug with associated informations to reproduce it to the Then send the bug with associated information to reproduce it to the xslt@gnome.org list; if it's really libxslt
+ related I will approve it. Please do not send mail to me directly, it makes
+ things really hard to track and in some cases I am not the best person to
+@@ -125,8 +125,8 @@ answer a given question, ask on the list.
+ libxslt.
+ There is no garantee for support ,
+ if your question remains unanswered after a week, repost it, making sure
+- you gave all the detail needed and the informations requested.
+- Failing to provide informations as requested or double checking first
++ you gave all the detail needed and the information requested.
++ Failing to provide information as requested or double checking first
+ for prior feedback also carries the implicit message "the time of the
+ library maintainers is less valuable than my time" and might not be
+ welcome.
+diff --git a/doc/apibuild.py b/doc/apibuild.py
+index df1d66b..31598bb 100755
+--- a/doc/apibuild.py
++++ b/doc/apibuild.py
+@@ -674,7 +674,7 @@ class CParser:
+ return((args, desc))
+
+ #
+- # Parse a comment block and merge the informations found in the
++ # Parse a comment block and merge the information found in the
+ # parameters descriptions, finally returns a block as complete
+ # as possible
+ #
+diff --git a/doc/html/libxslt-extra.html b/doc/html/libxslt-extra.html
+index 9e03622..9d16496 100644
+--- a/doc/html/libxslt-extra.html
++++ b/doc/html/libxslt-extra.html
+@@ -19,7 +19,7 @@ A:link, A:visited, A:active { text-decoration: underline }
+ #define XSLT_XT_NAMESPACE This is James Clark's XT processor namespace for extensions.
+ void xsltDebug (xsltTransformContextPtr ctxt, xsltStylePreCompPtr comp) Process an debug node
+-ctxt an XSLT processing context node The current node inst the instruction in the stylesheet comp precomputed informations
void xsltFunctionNodeSet (xmlXPathParserContextPtr ctxt, ctxt an XSLT processing context node The current node inst the instruction in the stylesheet comp precomputed information
void xsltFunctionNodeSet (xmlXPathParserContextPtr ctxt, Implement the node-set() XSLT function node-set node-set(result-tree) This function is available in libxslt, saxon or xt namespace.
+ ctxt the XPath Parser context nargs the number of arguments
Function: xsltRegisterAllExtras void xsltRegisterAllExtras (void) Registers the built-in extensions
+diff --git a/doc/html/libxslt-imports.html b/doc/html/libxslt-imports.html
+index 8b7de45..7dbbf9f 100644
+--- a/doc/html/libxslt-imports.html
++++ b/doc/html/libxslt-imports.html
+@@ -17,7 +17,7 @@ A:link, A:visited, A:active { text-decoration: underline }
+ #define XSLT_GET_IMPORT_INT A macro to import intergers from the stylesheet cascading order.
+ #define XSLT_GET_IMPORT_PTR A macro to import pointers from the stylesheet cascading order.
+ int xsltFindElemSpaceHandling (xsltTransformContextPtr ctxt, Find strip-space or preserve-space informations for an element respect the import precedence or the wildcards
++ Find strip-space or preserve-space information for an element respect the import precedence or the wildcards
+ ctxt an XSLT transformation context node an XML node Returns 1 if space should be stripped, 0 if not, and 2 if everything should be CDTATA wrapped.
xsltTemplatePtr xsltFindTemplate (xsltTransformContextPtr ctxt, Finds the named template, apply import precedence rule. REVISIT TODO: We'll change the nameURI fields of templates to be in the string dict, so if the specified @nameURI is in the same dict, then use pointer comparison. Check if this can be done in a sane way. Maybe this function is not needed internally at transformation-time if we hard-wire the called templates to the caller.
+ ctxt an XSLT transformation context name the template name nameURI the template name URI Returns the xsltTemplatePtr or NULL if not found
int xsltNeedElemSpaceHandling (xsltTransformContextPtr ctxt)xsltRuntimeExtraPtr extras : extra per runtime informations
++ xsltRuntimeExtraPtr extras : extra per runtime information
+ xsltDocumentPtr styleList : the stylesheet docs list
+ void * sec : the security preferences if any
+ xmlGenericErrorFunc error : a specific error handler
+@@ -684,7 +684,7 @@ void xsltElemPreCompDeallocator ( ctxt an XSLT transformation context obj an XPath object to be inspected for result tree fragments Returns 0 in case of success and -1 in case of error.
xmlXPathError xsltFormatNumberConversion (xsltDecimalFormatPtr self, format-number() uses the JDK 1.1 DecimalFormat class: http://java.sun.com/products/jdk/1.1/docs/api/java.text.DecimalFormat.html Structure: pattern := subpattern{;subpattern} subpattern := {prefix}integer{.fraction}{suffix} prefix := '\\u0000'..'\\uFFFD' - specialCharacters suffix := '\\u0000'..'\\uFFFD' - specialCharacters integer := '#'* '0'* '0' fraction := '0'* '#'* Notation: X* 0 or more instances of X (X | Y) either X or Y. X..Y any character from X up to Y, inclusive. S - T characters in S, except those in T Special Characters: Symbol Meaning 0 a digit # a digit, zero shows as absent . placeholder for decimal separator , placeholder for grouping separator. ; separates formats. - default negative prefix. % multiply by 100 and show as percentage ? multiply by 1000 and show as per mille X any other characters can be used in the prefix or suffix ' used to quote special characters in a prefix or suffix.
+-self the decimal format format the format requested number the value to format result the place to ouput the result Returns a possible XPath error
void xsltFreeAVTList (void * avt)self the decimal format format the format requested number the value to format result the place to output the result Returns a possible XPath error
void xsltFreeAVTList (void * avt) Free up the memory associated to the attribute value templates
+ avt pointer to an list of AVT structures
void xsltFreeRVTs (xsltTransformContextPtr ctxt) Frees all registered result value trees (Result Tree Fragments) of the transformation. Internal function; should not be called by user-code.
+@@ -704,7 +704,7 @@ void xsltElemPreCompDeallocator ( void xsltNumberFormat (xsltTransformContextPtr ctxt, xsltNumberDataPtr data, Convert one number.
+-ctxt the XSLT transformation context data the formatting informations node the data to format
int xsltParseAnyXSLTElem (xsltCompilerCtxtPtr cctxt, ctxt the XSLT transformation context data the formatting information node the data to format
int xsltParseAnyXSLTElem (xsltCompilerCtxtPtr cctxt, Parses, validates the content models and compiles XSLT instructions.
+ cctxt the compilation context elem the element node of the XSLT instruction Returns 0 if everything's fine; -1 on API or internal errors.
void xsltParseSequenceConstructor (xsltCompilerCtxtPtr cctxt, Parses a "template" content (or "sequence constructor" in XSLT 2.0 terms). This will additionally remove xsl:text elements from the tree.
+diff --git a/doc/html/libxslt-xsltutils.html b/doc/html/libxslt-xsltutils.html
+index d6551cc..45eb311 100644
+--- a/doc/html/libxslt-xsltutils.html
++++ b/doc/html/libxslt-xsltutils.html
+@@ -126,7 +126,7 @@ void xsltDropCallCallback (void)
+ Returns the value of xslDebugStatus.
xmlChar * xsltGetNsProp (xmlNodePtr node, Similar to xmlGetNsProp() but with a slightly different semantic Search and get the value of an attribute associated to a node This attribute has to be anchored in the namespace specified, or has no namespace and the element is in that namespace. This does the entity substitution. This function looks in DTD attribute declaration for #FIXED or default declaration values unless DTD use has been turned off.
+ node the node name the attribute name nameSpace the URI of the namespace Returns the attribute value or NULL if not found. It's up to the caller to free the memory.
xmlDocPtr xsltGetProfileInformation (xsltTransformContextPtr ctxt) This function should be called after the transformation completed to extract template processing profiling informations if availble. The informations are returned as an XML document tree like <?xml version="1.0"?> <profile> <template rank="1" match="*" name="" mode="" calls="6" time="48" average="8"/> <template rank="2" match="item2|item3" name="" mode="" calls="10" time="30" average="3"/> <template rank="3" match="item1" name="" mode="" calls="5" time="17" average="3"/> </profile> The caller will need to free up the returned tree with xmlFreeDoc()
++ This function should be called after the transformation completed to extract template processing profiling information if availble. The information are returned as an XML document tree like <?xml version="1.0"?> <profile> <template rank="1" match="*" name="" mode="" calls="6" time="48" average="8"/> <template rank="2" match="item2|item3" name="" mode="" calls="10" time="30" average="3"/> <template rank="3" match="item1" name="" mode="" calls="5" time="17" average="3"/> </profile> The caller will need to free up the returned tree with xmlFreeDoc()
+ ctxt a transformation context Returns the xmlDocPtr corresponding to the result or NULL if not available.
const xmlChar * xsltGetQNameURI (xmlNodePtr node, This function analyzes @name, if the name contains a prefix, the function seaches the associated namespace in scope for it. It will also replace @name value with the NCName, the old value being freed. Errors in the prefix lookup are signalled by setting @name to NULL. NOTE: the namespace returned is a pointer to the place where it is defined and hence has the same lifespan as the document holding it.
+ node the node holding the QName name pointer to the initial QName value Returns the namespace URI if there is a prefix, or NULL if @name is not prefixed.
const xmlChar * xsltGetQNameURI2 (xsltStylesheetPtr style, ctxt an XSLT processing context node The current node inst The node containing the message instruction
void xsltPrintErrorContext (xsltTransformContextPtr ctxt, xsltStylesheetPtr style, Display the context of an error.
+ ctxt the transformation context style the stylesheet node the current node being processed
void xsltSaveProfiling (xsltTransformContextPtr ctxt, Save the profiling informations on @output
+-ctxt an XSLT context output a FILE * for saving the informations
int xsltSaveResultTo (xmlOutputBufferPtr buf, xsltStylesheetPtr style) Save the profiling information on @output
++ctxt an XSLT context output a FILE * for saving the information
int xsltSaveResultTo (xmlOutputBufferPtr buf, xsltStylesheetPtr style) Save the result @result obtained by applying the @style stylesheet to an I/O output channel @buf
+ buf an output buffer result the result xmlDocPtr style the stylesheet Returns the number of byte written or -1 in case of failure.
int xsltSaveResultToFd (int fd, xsltStylesheetPtr style) Save the result @result obtained by applying the @style stylesheet to an open file descriptor This does not close the descriptor.
+diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
+index d0ed1a2..e467f9f 100644
+--- a/doc/libxslt-api.xml
++++ b/doc/libxslt-api.xml
+@@ -1357,7 +1357,7 @@ preserve space elements'/>
+ *'/>
+
+ Dumps a list of the registered XSLT extension functions and elements
+@@ -2071,7 +2071,7 @@ exits'/>
+
+
+- Find strip-space or preserve-space informations for an element respect the import precedence or the wildcards
++ Find strip-space or preserve-space information for an element respect the import precedence or the wildcards
+
+
+ Implement the format-number() XSLT function string format-number(number, string, string?)
+@@ -2278,7 +2278,7 @@ exits'/>
+
+
+- This function should be called after the transformation completed to extract template processing profiling informations if availble. The informations are returned as an XML document tree like <?xml version="1.0"?> <profile> <template rank="1" match="*" name="" mode="" calls="6" time="48" average="8"/> <template rank="2" match="item2|item3" name="" mode="" calls="10" time="30" average="3"/> <template rank="3" match="item1" name="" mode="" calls="5" time="17" average="3"/> </profile> The caller will need to free up the returned tree with xmlFreeDoc()
++ This function should be called after the transformation completed to extract template processing profiling information if availble. The information are returned as an XML document tree like <?xml version="1.0"?> <profile> <template rank="1" match="*" name="" mode="" calls="6" time="48" average="8"/> <template rank="2" match="item2|item3" name="" mode="" calls="10" time="30" average="3"/> <template rank="3" match="item1" name="" mode="" calls="5" time="17" average="3"/> </profile> The caller will need to free up the returned tree with xmlFreeDoc()
+
+@@ -2521,7 +2521,7 @@ exits'/>
+ Convert one number.
+
+@@ -2838,10 +2838,10 @@ exits'/>
+
+
+- Save the profiling informations on @output
++ Save the profiling information on @output
+
+
+ Save the result @result obtained by applying the @style stylesheet to an I/O output channel @buf
+diff --git a/doc/libxslt-refs.xml b/doc/libxslt-refs.xml
+index c21e6d2..6e137b6 100644
+--- a/doc/libxslt-refs.xml
++++ b/doc/libxslt-refs.xml
+@@ -5556,7 +5556,7 @@
+
++
+
+-
++
+
+
+diff --git a/libexslt/exsltconfig.h.in b/libexslt/exsltconfig.h.in
+index b46ffc0..03b4b3b 100644
+--- a/libexslt/exsltconfig.h.in
++++ b/libexslt/exsltconfig.h.in
+@@ -1,5 +1,5 @@
+ /*
+- * exsltconfig.h: compile-time version informations for the EXSLT library
++ * exsltconfig.h: compile-time version information for the EXSLT library
+ *
+ * See Copyright for the status of this software.
+ *
+diff --git a/libxslt/extensions.c b/libxslt/extensions.c
+index 6187b7a..14cb90c 100644
+--- a/libxslt/extensions.c
++++ b/libxslt/extensions.c
+@@ -2061,7 +2061,7 @@ xsltExtElementPreCompTest(xsltStylesheetPtr style, xmlNodePtr inst,
+ * @ctxt: an XSLT processing context
+ * @node: The current node
+ * @inst: the instruction in the stylesheet
+- * @comp: precomputed informations
++ * @comp: precomputed information
+ *
+ * Process a libxslt:test node
+ */
+diff --git a/libxslt/extra.c b/libxslt/extra.c
+index 3a0f547..c0a204f 100644
+--- a/libxslt/extra.c
++++ b/libxslt/extra.c
+@@ -50,7 +50,7 @@
+ * @ctxt: an XSLT processing context
+ * @node: The current node
+ * @inst: the instruction in the stylesheet
+- * @comp: precomputed informations
++ * @comp: precomputed information
+ *
+ * Process an debug node
+ */
+diff --git a/libxslt/imports.c b/libxslt/imports.c
+index 23538ab..f70dd19 100644
+--- a/libxslt/imports.c
++++ b/libxslt/imports.c
+@@ -329,7 +329,7 @@ xsltNeedElemSpaceHandling(xsltTransformContextPtr ctxt) {
+ * @ctxt: an XSLT transformation context
+ * @node: an XML node
+ *
+- * Find strip-space or preserve-space informations for an element
++ * Find strip-space or preserve-space information for an element
+ * respect the import precedence or the wildcards
+ *
+ * Returns 1 if space should be stripped, 0 if not, and 2 if everything
+diff --git a/libxslt/numbers.c b/libxslt/numbers.c
+index 8683ca8..6bc2a0a 100644
+--- a/libxslt/numbers.c
++++ b/libxslt/numbers.c
+@@ -726,7 +726,7 @@ xsltNumberFormatGetValue(xmlXPathContextPtr context,
+ /**
+ * xsltNumberFormat:
+ * @ctxt: the XSLT transformation context
+- * @data: the formatting informations
++ * @data: the formatting information
+ * @node: the data to format
+ *
+ * Convert one number.
+@@ -902,7 +902,7 @@ xsltFormatNumberPreSuffix(xsltDecimalFormatPtr self, xmlChar **format, xsltForma
+ * @self: the decimal format
+ * @format: the format requested
+ * @number: the value to format
+- * @result: the place to ouput the result
++ * @result: the place to output the result
+ *
+ * format-number() uses the JDK 1.1 DecimalFormat class:
+ *
+diff --git a/libxslt/pattern.c b/libxslt/pattern.c
+index 8ce74e3..4ce3e12 100644
+--- a/libxslt/pattern.c
++++ b/libxslt/pattern.c
+@@ -1864,6 +1864,8 @@ xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc,
+ while ((pattern[end] != 0) && (pattern[end] != '"'))
+ end++;
+ }
++ if (pattern[end] == 0)
++ break;
+ end++;
+ }
+ if (current == end) {
+diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h
+index e991a93..2648f32 100644
+--- a/libxslt/xsltInternals.h
++++ b/libxslt/xsltInternals.h
+@@ -290,7 +290,7 @@ struct _xsltTemplate {
+ int inheritedNsNr; /* number of inherited namespaces */
+ xmlNsPtr *inheritedNs;/* inherited non-excluded namespaces */
+
+- /* Profiling informations */
++ /* Profiling information */
+ int nbCalls; /* the number of time the template was called */
+ unsigned long time; /* the time spent in this template */
+ void *params; /* xsl:param instructions */
+@@ -1507,7 +1507,7 @@ struct _xsltStylesheet {
+ */
+ xsltTemplatePtr templates; /* the ordered list of templates */
+ void *templatesHash; /* hash table or wherever compiled templates
+- informations are stored */
++ information are stored */
+ void *rootMatch; /* template based on / */
+ void *keyMatch; /* template based on key() */
+ void *elemMatch; /* template based on * */
+@@ -1721,7 +1721,7 @@ struct _xsltTransformContext {
+
+ int extrasNr; /* the number of extras used */
+ int extrasMax; /* the number of extras allocated */
+- xsltRuntimeExtraPtr extras; /* extra per runtime informations */
++ xsltRuntimeExtraPtr extras; /* extra per runtime information */
+
+ xsltDocumentPtr styleList; /* the stylesheet docs list */
+ void * sec; /* the security preferences if any */
+diff --git a/libxslt/xsltconfig.h b/libxslt/xsltconfig.h
+index db20ebd..2b00900 100644
+--- a/libxslt/xsltconfig.h
++++ b/libxslt/xsltconfig.h
+@@ -1,6 +1,6 @@
+ /*
+- * Summary: compile-time version informations for the XSLT engine
+- * Description: compile-time version informations for the XSLT engine
++ * Summary: compile-time version information for the XSLT engine
++ * Description: compile-time version information for the XSLT engine
+ * this module is autogenerated.
+ *
+ * Copy: See Copyright for the status of this software.
+diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in
+index b4cac6d..739515d 100644
+--- a/libxslt/xsltconfig.h.in
++++ b/libxslt/xsltconfig.h.in
+@@ -1,6 +1,6 @@
+ /*
+- * Summary: compile-time version informations for the XSLT engine
+- * Description: compile-time version informations for the XSLT engine
++ * Summary: compile-time version information for the XSLT engine
++ * Description: compile-time version information for the XSLT engine
+ * this module is autogenerated.
+ *
+ * Copy: See Copyright for the status of this software.
+diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
+index 9565e15..d6b1e98 100644
+--- a/libxslt/xsltutils.c
++++ b/libxslt/xsltutils.c
+@@ -1454,7 +1454,7 @@ xsltSaveResultTo(xmlOutputBufferPtr buf, xmlDocPtr result,
+ ((style->method == NULL) ||
+ (!xmlStrEqual(style->method, (const xmlChar *) "xhtml")))) {
+ xsltGenericError(xsltGenericErrorContext,
+- "xsltSaveResultTo : unknown ouput method\n");
++ "xsltSaveResultTo : unknown output method\n");
+ return(-1);
+ }
+
+@@ -1767,7 +1767,7 @@ xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len,
+
+ /************************************************************************
+ * *
+- * Generating profiling informations *
++ * Generating profiling information *
+ * *
+ ************************************************************************/
+
+@@ -1875,9 +1875,9 @@ xsltTimestamp(void)
+ /**
+ * xsltSaveProfiling:
+ * @ctxt: an XSLT context
+- * @output: a FILE * for saving the informations
++ * @output: a FILE * for saving the information
+ *
+- * Save the profiling informations on @output
++ * Save the profiling information on @output
+ */
+ void
+ xsltSaveProfiling(xsltTransformContextPtr ctxt, FILE *output) {
+@@ -1970,7 +1970,7 @@ xsltSaveProfiling(xsltTransformContextPtr ctxt, FILE *output) {
+
+ /************************************************************************
+ * *
+- * Fetching profiling informations *
++ * Fetching profiling information *
+ * *
+ ************************************************************************/
+
+@@ -1979,8 +1979,8 @@ xsltSaveProfiling(xsltTransformContextPtr ctxt, FILE *output) {
+ * @ctxt: a transformation context
+ *
+ * This function should be called after the transformation completed
+- * to extract template processing profiling informations if availble.
+- * The informations are returned as an XML document tree like
++ * to extract template processing profiling information if availble.
++ * The information are returned as an XML document tree like
+ *
+ *
+ *
+
+- If you want to create PostScript ouput, you will need to create an
++ If you want to create PostScript output, you will need to create an
+ EPS version of your image file to be displayed in the
+ PostScript file. There is a simple script available which
+ allows you to change a PNG image into an EPS file
+diff --git a/tests/docbook/result/html/gdp-handbook.html b/tests/docbook/result/html/gdp-handbook.html
+index 211e620..026beb6 100644
+--- a/tests/docbook/result/html/gdp-handbook.html
++++ b/tests/docbook/result/html/gdp-handbook.html
+@@ -328,7 +328,7 @@ V1.1//EN"[]>
+ automatically look for myfile.png in
+ the directory.
+
+- If you want to create PostScript ouput, you will need to create an
++ If you want to create PostScript output, you will need to create an
+ EPS version of your image file to be displayed in the
+ PostScript file. There is a simple script available which
+ allows you to change a PNG image into an EPS file
+diff --git a/tests/docbook/result/xhtml/gdp-handbook.xhtml b/tests/docbook/result/xhtml/gdp-handbook.xhtml
+index dff9a72..ca7199e 100644
+--- a/tests/docbook/result/xhtml/gdp-handbook.xhtml
++++ b/tests/docbook/result/xhtml/gdp-handbook.xhtml
+@@ -329,7 +329,7 @@ V1.1//EN"[]>
+ automatically look for myfile.png in
+ the directory.
+
+- If you want to create PostScript ouput, you will need to create an
++ If you want to create PostScript output, you will need to create an
+ EPS version of your image file to be displayed in the
+ PostScript file. There is a simple script available which
+ allows you to change a PNG image into an EPS file
+diff --git a/tests/docbook/test/gdp-handbook.xml b/tests/docbook/test/gdp-handbook.xml
+index 6fe6253..f7cda69 100644
+--- a/tests/docbook/test/gdp-handbook.xml
++++ b/tests/docbook/test/gdp-handbook.xml
+@@ -625,7 +625,7 @@ V1.1//EN"[]>]]>
+ the directory.
+
+
+- If you want to create PostScript ouput, you will need to create an
++ If you want to create PostScript output, you will need to create an
+ EPS version of your image file to be displayed in the
+ PostScript file. There is a simple script available which
+ allows you to change a PNG image into an EPS file
+diff --git a/tests/plugins/testplugin.c b/tests/plugins/testplugin.c
+index 95bb450..315d78b 100644
+--- a/tests/plugins/testplugin.c
++++ b/tests/plugins/testplugin.c
+@@ -155,7 +155,7 @@ xsltExtElementPreCompTest(xsltStylesheetPtr style, xmlNodePtr inst,
+ * @ctxt: an XSLT processing context
+ * @node: The current node
+ * @inst: the instruction in the stylesheet
+- * @comp: precomputed informations
++ * @comp: precomputed information
+ *
+ * Process a libxslt:test node
+ */
+diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
+index e978a63..8260a0e 100644
+--- a/xsltproc/xsltproc.c
++++ b/xsltproc/xsltproc.c
+@@ -527,7 +527,7 @@ static void usage(const char *name) {
+ printf("\t--xincludestyle : do XInclude processing on stylesheets\n");
+ #endif
+ printf("\t--load-trace : print trace of all external entites loaded\n");
+- printf("\t--profile or --norman : dump profiling informations \n");
++ printf("\t--profile or --norman : dump profiling information \n");
+ printf("\nProject libxslt home page: http://xmlsoft.org/XSLT/\n");
+ printf("To report bugs and get help: http://xmlsoft.org/XSLT/bugs.html\n");
+ }
+--
diff -Nru libxslt-1.1.26/debian/patches/0005-cve-2012-2825.patch libxslt-1.1.26/debian/patches/0005-cve-2012-2825.patch
--- libxslt-1.1.26/debian/patches/0005-cve-2012-2825.patch 1970-01-01 00:00:00.000000000 +0000
+++ libxslt-1.1.26/debian/patches/0005-cve-2012-2825.patch 2012-10-02 15:43:51.000000000 +0000
@@ -0,0 +1,25 @@
+From: Chris Evans
+Date: Thu, 5 Jul 2012 11:08:31 +0800
+Subject: Fix crash with unexpected DTD nodes in XSLT.
+
+A fix for XSLT node checking.
+---
+ libxslt/xsltutils.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libxslt/xsltutils.h b/libxslt/xsltutils.h
+index 3886be3..c986a9c 100644
+--- a/libxslt/xsltutils.h
++++ b/libxslt/xsltutils.h
+@@ -52,8 +52,8 @@ extern "C" {
+ * Checks that the element pertains to XSLT namespace.
+ */
+ #define IS_XSLT_ELEM(n) \
+- (((n) != NULL) && ((n)->ns != NULL) && \
+- (xmlStrEqual((n)->ns->href, XSLT_NAMESPACE)))
++ (((n) != NULL) && ((n)->type == XML_ELEMENT_NODE) && \
++ ((n)->ns != NULL) && (xmlStrEqual((n)->ns->href, XSLT_NAMESPACE)))
+
+ /**
+ * IS_XSLT_NAME:
+--
diff -Nru libxslt-1.1.26/debian/patches/0006-cve-2012-2870.patch libxslt-1.1.26/debian/patches/0006-cve-2012-2870.patch
--- libxslt-1.1.26/debian/patches/0006-cve-2012-2870.patch 1970-01-01 00:00:00.000000000 +0000
+++ libxslt-1.1.26/debian/patches/0006-cve-2012-2870.patch 2012-10-02 15:43:51.000000000 +0000
@@ -0,0 +1,859 @@
+From: Aron Xu
+Date: Thu, 9 Aug 2012 15:31:07 +0800
+Subject: cve 2012 2870
+
+ * Daniel Veillard:
+ Cleanup of the pattern compilation code
+ Avoid potential crashes and memory leaks
+ * Chris Evans:
+ Avoid a heap use after free error
+ For https://code.google.com/p/chromium/issues/detail?id=140368
+ * Daniel Veillard:
+ Hardening of code checking node types in EXSLT
+ Hardening of code checking node types in various entry point
+---
+ libexslt/functions.c | 6 ++++--
+ libxslt/attributes.c | 5 +++--
+ libxslt/functions.c | 6 ++++--
+ libxslt/pattern.c | 53 ++++++++++++++++++++++++++++++++++++++++++++------
+ libxslt/preproc.c | 45 +++++++++++++++++++++---------------------
+ libxslt/templates.c | 15 +++++++++-----
+ libxslt/transform.c | 2 +-
+ libxslt/variables.c | 10 +++++-----
+ libxslt/xslt.c | 43 +++++++++++++++++++++++-----------------
+ libxslt/xsltutils.c | 27 +++++++++++++++++--------
+ 10 files changed, 141 insertions(+), 71 deletions(-)
+
+diff --git a/libexslt/functions.c b/libexslt/functions.c
+index 13fd06e..4c68cea 100644
+--- a/libexslt/functions.c
++++ b/libexslt/functions.c
+@@ -459,10 +459,9 @@ exsltFuncFunctionComp (xsltStylesheetPtr style, xmlNodePtr inst) {
+ xmlHashTablePtr data;
+ exsltFuncFunctionData *func;
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+-
+ {
+ xmlChar *qname;
+
+@@ -546,6 +545,9 @@ exsltFuncResultComp (xsltStylesheetPtr style, xmlNodePtr inst,
+ xmlChar *sel;
+ exsltFuncResultPreComp *ret;
+
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
++ return (NULL);
++
+ /*
+ * "Validity" checking
+ */
+diff --git a/libxslt/attributes.c b/libxslt/attributes.c
+index ce47df7..11d558b 100644
+--- a/libxslt/attributes.c
++++ b/libxslt/attributes.c
+@@ -293,7 +293,7 @@ xsltParseStylesheetAttributeSet(xsltStylesheetPtr style, xmlNodePtr cur) {
+ xmlNodePtr child;
+ xsltAttrElemPtr attrItems;
+
+- if ((cur == NULL) || (style == NULL))
++ if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return;
+
+ value = xmlGetNsProp(cur, (const xmlChar *)"name", NULL);
+@@ -656,7 +656,8 @@ xsltAttributeInternal(xsltTransformContextPtr ctxt,
+ xmlNsPtr ns = NULL;
+ xmlAttrPtr attr;
+
+- if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL))
++ if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL) ||
++ (inst->type != XML_ELEMENT_NODE) )
+ return;
+
+ /*
+diff --git a/libxslt/functions.c b/libxslt/functions.c
+index de962f4..845633b 100644
+--- a/libxslt/functions.c
++++ b/libxslt/functions.c
+@@ -654,6 +654,7 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
+ void
+ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+ xmlNodePtr cur = NULL;
++ xmlXPathObjectPtr obj = NULL;
+ long val;
+ xmlChar str[30];
+ xmlDocPtr doc;
+@@ -661,7 +662,6 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+ if (nargs == 0) {
+ cur = ctxt->context->node;
+ } else if (nargs == 1) {
+- xmlXPathObjectPtr obj;
+ xmlNodeSetPtr nodelist;
+ int i, ret;
+
+@@ -684,7 +684,6 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+ if (ret == -1)
+ cur = nodelist->nodeTab[i];
+ }
+- xmlXPathFreeObject(obj);
+ } else {
+ xsltTransformError(xsltXPathGetTransformContext(ctxt), NULL, NULL,
+ "generate-id() : invalid number of args %d\n", nargs);
+@@ -707,6 +706,9 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+
+ }
+
++ if (obj)
++ xmlXPathFreeObject(obj);
++
+ val = (long)((char *)cur - (char *)doc);
+ if (val >= 0) {
+ sprintf((char *)str, "idp%ld", val);
+diff --git a/libxslt/pattern.c b/libxslt/pattern.c
+index 4ce3e12..a13153a 100644
+--- a/libxslt/pattern.c
++++ b/libxslt/pattern.c
+@@ -303,6 +303,10 @@ xsltCompMatchAdd(xsltParserContextPtr ctxt, xsltCompMatchPtr comp,
+ "xsltCompMatchAdd: memory re-allocation failure.\n");
+ if (ctxt->style != NULL)
+ ctxt->style->errors++;
++ if (value)
++ xmlFree(value);
++ if (value2)
++ xmlFree(value2);
+ return (-1);
+ }
+ comp->maxStep *= 2;
+@@ -1381,17 +1385,22 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
+ NEXT;
+ SKIP_BLANKS;
+ lit = xsltScanLiteral(ctxt);
+- if (ctxt->error)
++ if (ctxt->error) {
++ xsltTransformError(NULL, NULL, NULL,
++ "xsltCompileIdKeyPattern : Literal expected\n");
+ return;
++ }
+ SKIP_BLANKS;
+ if (CUR != ')') {
+ xsltTransformError(NULL, NULL, NULL,
+ "xsltCompileIdKeyPattern : ) expected\n");
++ xmlFree(lit);
+ ctxt->error = 1;
+ return;
+ }
+ NEXT;
+ PUSH(XSLT_OP_ID, lit, NULL, novar);
++ lit = NULL;
+ } else if ((aid) && (xmlStrEqual(name, (const xmlChar *)"key"))) {
+ if (axis != 0) {
+ xsltTransformError(NULL, NULL, NULL,
+@@ -1402,8 +1411,11 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
+ NEXT;
+ SKIP_BLANKS;
+ lit = xsltScanLiteral(ctxt);
+- if (ctxt->error)
++ if (ctxt->error) {
++ xsltTransformError(NULL, NULL, NULL,
++ "xsltCompileIdKeyPattern : Literal expected\n");
+ return;
++ }
+ SKIP_BLANKS;
+ if (CUR != ',') {
+ xsltTransformError(NULL, NULL, NULL,
+@@ -1414,25 +1426,36 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
+ NEXT;
+ SKIP_BLANKS;
+ lit2 = xsltScanLiteral(ctxt);
+- if (ctxt->error)
++ if (ctxt->error) {
++ xsltTransformError(NULL, NULL, NULL,
++ "xsltCompileIdKeyPattern : Literal expected\n");
++ xmlFree(lit);
+ return;
++ }
+ SKIP_BLANKS;
+ if (CUR != ')') {
+ xsltTransformError(NULL, NULL, NULL,
+ "xsltCompileIdKeyPattern : ) expected\n");
++ xmlFree(lit);
++ xmlFree(lit2);
+ ctxt->error = 1;
+ return;
+ }
+ NEXT;
+ /* URGENT TODO: support namespace in keys */
+ PUSH(XSLT_OP_KEY, lit, lit2, novar);
++ lit = NULL;
++ lit2 = NULL;
+ } else if (xmlStrEqual(name, (const xmlChar *)"processing-instruction")) {
+ NEXT;
+ SKIP_BLANKS;
+ if (CUR != ')') {
+ lit = xsltScanLiteral(ctxt);
+- if (ctxt->error)
++ if (ctxt->error) {
++ xsltTransformError(NULL, NULL, NULL,
++ "xsltCompileIdKeyPattern : Literal expected\n");
+ return;
++ }
+ SKIP_BLANKS;
+ if (CUR != ')') {
+ xsltTransformError(NULL, NULL, NULL,
+@@ -1443,6 +1466,7 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
+ }
+ NEXT;
+ PUSH(XSLT_OP_PI, lit, NULL, novar);
++ lit = NULL;
+ } else if (xmlStrEqual(name, (const xmlChar *)"text")) {
+ NEXT;
+ SKIP_BLANKS;
+@@ -1493,8 +1517,7 @@ xsltCompileIdKeyPattern(xsltParserContextPtr ctxt, xmlChar *name,
+ return;
+ }
+ error:
+- if (name != NULL)
+- xmlFree(name);
++ return;
+ }
+
+ /**
+@@ -1557,6 +1580,8 @@ parse_node_test:
+ SKIP_BLANKS;
+ if (CUR == '(') {
+ xsltCompileIdKeyPattern(ctxt, token, 0, novar, axis);
++ xmlFree(token);
++ token = NULL;
+ if (ctxt->error)
+ goto error;
+ } else if (CUR == ':') {
+@@ -1575,20 +1600,24 @@ parse_node_test:
+ "xsltCompileStepPattern : no namespace bound to prefix %s\n",
+ prefix);
+ xmlFree(prefix);
++ prefix=NULL;
+ ctxt->error = 1;
+ goto error;
+ } else {
+ URL = xmlStrdup(ns->href);
+ }
+ xmlFree(prefix);
++ prefix=NULL;
+ if (token == NULL) {
+ if (CUR == '*') {
+ NEXT;
+ if (axis == AXIS_ATTRIBUTE) {
+ PUSH(XSLT_OP_ATTR, NULL, URL, novar);
++ URL = NULL;
+ }
+ else {
+ PUSH(XSLT_OP_NS, URL, NULL, novar);
++ URL = NULL;
+ }
+ } else {
+ xsltTransformError(NULL, NULL, NULL,
+@@ -1599,9 +1628,13 @@ parse_node_test:
+ } else {
+ if (axis == AXIS_ATTRIBUTE) {
+ PUSH(XSLT_OP_ATTR, token, URL, novar);
++ token = NULL;
++ URL = NULL;
+ }
+ else {
+ PUSH(XSLT_OP_ELEM, token, URL, novar);
++ token = NULL;
++ URL = NULL;
+ }
+ }
+ } else {
+@@ -1623,6 +1656,7 @@ parse_node_test:
+ goto error;
+ }
+ xmlFree(token);
++ token = NULL;
+ SKIP_BLANKS;
+ token = xsltScanNCName(ctxt);
+ goto parse_node_test;
+@@ -1637,9 +1671,13 @@ parse_node_test:
+ URL = xmlStrdup(URI);
+ if (axis == AXIS_ATTRIBUTE) {
+ PUSH(XSLT_OP_ATTR, token, URL, novar);
++ token = NULL;
++ URL = NULL;
+ }
+ else {
+ PUSH(XSLT_OP_ELEM, token, URL, novar);
++ token = NULL;
++ URL = NULL;
+ }
+ }
+ parse_predicate:
+@@ -1679,6 +1717,7 @@ parse_predicate:
+ }
+ ret = xmlStrndup(q, CUR_PTR - q);
+ PUSH(XSLT_OP_PREDICATE, ret, NULL, novar);
++ ret = NULL;
+ /* push the predicate lower than local test */
+ SWAP();
+ NEXT;
+@@ -1787,6 +1826,8 @@ xsltCompileLocationPathPattern(xsltParserContextPtr ctxt, int novar) {
+ SKIP_BLANKS;
+ if ((CUR == '(') && !xmlXPathIsNodeType(name)) {
+ xsltCompileIdKeyPattern(ctxt, name, 1, novar, 0);
++ xmlFree(name);
++ name = NULL;
+ if ((CUR == '/') && (NXT(1) == '/')) {
+ PUSH(XSLT_OP_ANCESTOR, NULL, NULL, novar);
+ NEXT;
+diff --git a/libxslt/preproc.c b/libxslt/preproc.c
+index b47d809..0d79976 100644
+--- a/libxslt/preproc.c
++++ b/libxslt/preproc.c
+@@ -669,7 +669,7 @@ xsltSortComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ #else
+ xsltStylePreCompPtr comp;
+ #endif
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -777,7 +777,7 @@ xsltCopyComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+ #ifdef XSLT_REFACTORED
+ comp = (xsltStyleItemCopyPtr) xsltNewStylePreComp(style, XSLT_FUNC_COPY);
+@@ -821,7 +821,7 @@ xsltTextComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ #endif
+ const xmlChar *prop;
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -874,7 +874,7 @@ xsltElementComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ *
+ *
+ */
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -991,7 +991,7 @@ xsltAttributeComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ *
+ *
+ */
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1111,7 +1111,7 @@ xsltCommentComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1141,7 +1141,7 @@ xsltProcessingInstructionComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1175,7 +1175,7 @@ xsltCopyOfComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1222,7 +1222,7 @@ xsltValueOfComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ #endif
+ const xmlChar *prop;
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1347,7 +1347,7 @@ xsltWithParamComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1406,7 +1406,7 @@ xsltNumberComp(xsltStylesheetPtr style, xmlNodePtr cur) {
+ #endif
+ const xmlChar *prop;
+
+- if ((style == NULL) || (cur == NULL))
++ if ((style == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1520,7 +1520,7 @@ xsltApplyImportsComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1550,7 +1550,7 @@ xsltCallTemplateComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1589,7 +1589,7 @@ xsltApplyTemplatesComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1641,7 +1641,7 @@ xsltChooseComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1672,7 +1672,7 @@ xsltIfComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1718,7 +1718,7 @@ xsltWhenComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1764,7 +1764,7 @@ xsltForEachComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1812,7 +1812,7 @@ xsltVariableComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1875,7 +1875,7 @@ xsltParamComp(xsltStylesheetPtr style, xmlNodePtr inst) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((style == NULL) || (inst == NULL))
++ if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -1967,7 +1967,7 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr node) {
+ * the parsing mechanism for all elements in the XSLT namespace.
+ */
+ if (style == NULL) {
+- if (node != NULL)
++ if ((node != NULL) && (node->type == XML_ELEMENT_NODE))
+ node->psvi = NULL;
+ return;
+ }
+@@ -2182,7 +2182,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) {
+ * namespace- and local-name of the node, but can evaluate this
+ * using cctxt->style->inode->category;
+ */
+- if (inst->psvi != NULL)
++ if ((inst == NULL) || (inst->type != XML_ELEMENT_NODE) ||
++ (inst->psvi != NULL))
+ return;
+
+ if (IS_XSLT_ELEM(inst)) {
+diff --git a/libxslt/templates.c b/libxslt/templates.c
+index c6250dc..81de93c 100644
+--- a/libxslt/templates.c
++++ b/libxslt/templates.c
+@@ -198,7 +198,8 @@ xsltEvalTemplateString(xsltTransformContextPtr ctxt,
+ xmlNodePtr oldInsert, insert = NULL;
+ xmlChar *ret;
+
+- if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL))
++ if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL) ||
++ (inst->type != XML_ELEMENT_NODE))
+ return(NULL);
+
+ if (inst->children == NULL)
+@@ -380,7 +381,8 @@ xsltEvalAttrValueTemplate(xsltTransformContextPtr ctxt, xmlNodePtr inst,
+ xmlChar *ret;
+ xmlChar *expr;
+
+- if ((ctxt == NULL) || (inst == NULL) || (name == NULL))
++ if ((ctxt == NULL) || (inst == NULL) || (name == NULL) ||
++ (inst->type != XML_ELEMENT_NODE))
+ return(NULL);
+
+ expr = xsltGetNsProp(inst, name, ns);
+@@ -424,7 +426,8 @@ xsltEvalStaticAttrValueTemplate(xsltStylesheetPtr style, xmlNodePtr inst,
+ const xmlChar *ret;
+ xmlChar *expr;
+
+- if ((style == NULL) || (inst == NULL) || (name == NULL))
++ if ((style == NULL) || (inst == NULL) || (name == NULL) ||
++ (inst->type != XML_ELEMENT_NODE))
+ return(NULL);
+
+ expr = xsltGetNsProp(inst, name, ns);
+@@ -465,7 +468,8 @@ xsltAttrTemplateProcess(xsltTransformContextPtr ctxt, xmlNodePtr target,
+ const xmlChar *value;
+ xmlAttrPtr ret;
+
+- if ((ctxt == NULL) || (attr == NULL) || (target == NULL))
++ if ((ctxt == NULL) || (attr == NULL) || (target == NULL) ||
++ (target->type != XML_ELEMENT_NODE))
+ return(NULL);
+
+ if (attr->type != XML_ATTRIBUTE_NODE)
+@@ -622,7 +626,8 @@ xsltAttrListTemplateProcess(xsltTransformContextPtr ctxt,
+ const xmlChar *value;
+ xmlChar *valueAVT;
+
+- if ((ctxt == NULL) || (target == NULL) || (attrs == NULL))
++ if ((ctxt == NULL) || (target == NULL) || (attrs == NULL) ||
++ (target->type != XML_ELEMENT_NODE))
+ return(NULL);
+
+ oldInsert = ctxt->insert;
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index a4ca41d..5461daa 100644
+--- a/libxslt/transform.c
++++ b/libxslt/transform.c
+@@ -726,7 +726,7 @@ xsltCopyTextString(xsltTransformContextPtr ctxt, xmlNodePtr target,
+ #endif
+
+ /*
+- * Play save and reset the merging mechanism for every new
++ * Play safe and reset the merging mechanism for every new
+ * target node.
+ */
+ if ((target == NULL) || (target->children == NULL)) {
+diff --git a/libxslt/variables.c b/libxslt/variables.c
+index 43a6156..df207c7 100644
+--- a/libxslt/variables.c
++++ b/libxslt/variables.c
+@@ -1926,7 +1926,7 @@ xsltParseStylesheetCallerParam(xsltTransformContextPtr ctxt, xmlNodePtr inst)
+ the instruction itself. */
+ xsltStackElemPtr param = NULL;
+
+- if ((ctxt == NULL) || (inst == NULL))
++ if ((ctxt == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return(NULL);
+
+ #ifdef XSLT_REFACTORED
+@@ -1985,7 +1985,7 @@ xsltParseGlobalVariable(xsltStylesheetPtr style, xmlNodePtr cur)
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((cur == NULL) || (style == NULL))
++ if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -2047,7 +2047,7 @@ xsltParseGlobalParam(xsltStylesheetPtr style, xmlNodePtr cur) {
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((cur == NULL) || (style == NULL))
++ if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return;
+
+ #ifdef XSLT_REFACTORED
+@@ -2110,7 +2110,7 @@ xsltParseStylesheetVariable(xsltTransformContextPtr ctxt, xmlNodePtr inst)
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((inst == NULL) || (ctxt == NULL))
++ if ((inst == NULL) || (ctxt == NULL) || (inst->type != XML_ELEMENT_NODE))
+ return;
+
+ comp = inst->psvi;
+@@ -2152,7 +2152,7 @@ xsltParseStylesheetParam(xsltTransformContextPtr ctxt, xmlNodePtr cur)
+ xsltStylePreCompPtr comp;
+ #endif
+
+- if ((cur == NULL) || (ctxt == NULL))
++ if ((cur == NULL) || (ctxt == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return;
+
+ comp = cur->psvi;
+diff --git a/libxslt/xslt.c b/libxslt/xslt.c
+index 55f505b..fa5a3f9 100644
+--- a/libxslt/xslt.c
++++ b/libxslt/xslt.c
+@@ -1153,9 +1153,9 @@ xsltParseStylesheetOutput(xsltStylesheetPtr style, xmlNodePtr cur)
+ xmlChar *element,
+ *end;
+
+- if ((cur == NULL) || (style == NULL))
++ if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return;
+-
++
+ prop = xmlGetNsProp(cur, (const xmlChar *) "version", NULL);
+ if (prop != NULL) {
+ if (style->version != NULL)
+@@ -1368,12 +1368,12 @@ xsltParseStylesheetDecimalFormat(xsltStylesheetPtr style, xmlNodePtr cur)
+ xmlChar *prop;
+ xsltDecimalFormatPtr format;
+ xsltDecimalFormatPtr iter;
+-
+- if ((cur == NULL) || (style == NULL))
++
++ if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return;
+
+ format = style->decimalFormat;
+-
++
+ prop = xmlGetNsProp(cur, BAD_CAST("name"), NULL);
+ if (prop != NULL) {
+ format = xsltDecimalFormatGetByName(style, prop);
+@@ -1475,7 +1475,7 @@ xsltParseStylesheetPreserveSpace(xsltStylesheetPtr style, xmlNodePtr cur) {
+ xmlChar *elements;
+ xmlChar *element, *end;
+
+- if ((cur == NULL) || (style == NULL))
++ if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return;
+
+ elements = xmlGetNsProp(cur, (const xmlChar *)"elements", NULL);
+@@ -1549,7 +1549,7 @@ xsltParseStylesheetExtPrefix(xsltStylesheetPtr style, xmlNodePtr cur,
+ xmlChar *prefixes;
+ xmlChar *prefix, *end;
+
+- if ((cur == NULL) || (style == NULL))
++ if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return;
+
+ if (isXsltElem) {
+@@ -1614,7 +1614,7 @@ xsltParseStylesheetStripSpace(xsltStylesheetPtr style, xmlNodePtr cur) {
+ xmlChar *elements;
+ xmlChar *element, *end;
+
+- if ((cur == NULL) || (style == NULL))
++ if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return;
+
+ elements = xmlGetNsProp(cur, (const xmlChar *)"elements", NULL);
+@@ -1687,7 +1687,7 @@ xsltParseStylesheetExcludePrefix(xsltStylesheetPtr style, xmlNodePtr cur,
+ xmlChar *prefixes;
+ xmlChar *prefix, *end;
+
+- if ((cur == NULL) || (style == NULL))
++ if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ return(0);
+
+ if (isXsltElem)
+@@ -4278,7 +4278,7 @@ static int
+ xsltParseUnknownXSLTElem(xsltCompilerCtxtPtr cctxt,
+ xmlNodePtr node)
+ {
+- if ((cctxt == NULL) || (node == NULL))
++ if ((cctxt == NULL) || (node == NULL) || (node->type != XML_ELEMENT_NODE))
+ return(-1);
+
+ /*
+@@ -4375,7 +4375,7 @@ xsltParseSequenceConstructor(xsltCompilerCtxtPtr cctxt, xmlNodePtr cur)
+ if (cctxt->inode->category == XSLT_ELEMENT_CATEGORY_EXTENSION) {
+ cctxt->inode->extContentHandled = 1;
+ }
+- if (cur == NULL)
++ if ((cur == NULL) || (cur->type == XML_NAMESPACE_DECL))
+ return;
+ /*
+ * This is the content reffered to as a "template".
+@@ -4780,7 +4780,8 @@ xsltParseSequenceConstructor(xsltCompilerCtxtPtr cctxt, xmlNodePtr cur)
+ */
+ void
+ xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
+- if ((style == NULL) || (templ == NULL))
++ if ((style == NULL) || (templ == NULL) ||
++ (templ->type == XML_NAMESPACE_DECL))
+ return;
+
+ /*
+@@ -4829,6 +4830,10 @@ xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
+ void
+ xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
+ xmlNodePtr cur, delete;
++
++ if ((style == NULL) || (templ == NULL) ||
++ (templ->type == XML_NAMESPACE_DECL)) return;
++
+ /*
+ * This content comes from the stylesheet
+ * For stylesheets, the set of whitespace-preserving
+@@ -5048,7 +5053,7 @@ xsltParseStylesheetKey(xsltStylesheetPtr style, xmlNodePtr key) {
+ xmlChar *name = NULL;
+ xmlChar *nameURI = NULL;
+
+- if ((style == NULL) || (key == NULL))
++ if ((style == NULL) || (key == NULL) || (key->type != XML_ELEMENT_NODE))
+ return;
+
+ /*
+@@ -5138,7 +5143,8 @@ xsltParseXSLTTemplate(xsltCompilerCtxtPtr cctxt, xmlNodePtr templNode) {
+ xmlChar *prop;
+ double priority;
+
+- if ((cctxt == NULL) || (templNode == NULL))
++ if ((cctxt == NULL) || (templNode == NULL) ||
++ (templNode->type != XML_ELEMENT_NODE))
+ return;
+
+ /*
+@@ -5299,7 +5305,8 @@ xsltParseStylesheetTemplate(xsltStylesheetPtr style, xmlNodePtr template) {
+ xmlChar *modeURI = NULL;
+ double priority;
+
+- if (template == NULL)
++ if ((style == NULL) || (template == NULL) ||
++ (template->type != XML_ELEMENT_NODE))
+ return;
+
+ /*
+@@ -5431,7 +5438,7 @@ static xsltStyleItemIncludePtr
+ xsltCompileXSLTIncludeElem(xsltCompilerCtxtPtr cctxt, xmlNodePtr node) {
+ xsltStyleItemIncludePtr item;
+
+- if ((cctxt == NULL) || (node == NULL))
++ if ((cctxt == NULL) || (node == NULL) || (node->type != XML_ELEMENT_NODE))
+ return(NULL);
+
+ node->psvi = NULL;
+@@ -5951,7 +5958,7 @@ xsltParseXSLTStylesheetElem(xsltCompilerCtxtPtr cctxt, xmlNodePtr node)
+ {
+ xmlNodePtr cur, start;
+
+- if ((cctxt == NULL) || (node == NULL))
++ if ((cctxt == NULL) || (node == NULL) || (node->type != XML_ELEMENT_NODE))
+ return(-1);
+
+ if (node->children == NULL)
+@@ -6039,7 +6046,7 @@ xsltParseStylesheetTop(xsltStylesheetPtr style, xmlNodePtr top) {
+ int templates = 0;
+ #endif
+
+- if (top == NULL)
++ if ((top == NULL) || (top->type != XML_ELEMENT_NODE))
+ return;
+
+ prop = xmlGetNsProp(top, (const xmlChar *)"version", NULL);
+diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
+index d6b1e98..531d595 100644
+--- a/libxslt/xsltutils.c
++++ b/libxslt/xsltutils.c
+@@ -90,10 +90,15 @@ xsltGetCNsProp(xsltStylesheetPtr style, xmlNodePtr node,
+ if ((node == NULL) || (style == NULL) || (style->dict == NULL))
+ return(NULL);
+
+- prop = node->properties;
+- if (nameSpace == NULL) {
++ if (nameSpace == NULL)
+ return xmlGetProp(node, name);
+- }
++
++ if (node->type == XML_NAMESPACE_DECL)
++ return(NULL);
++ if (node->type == XML_ELEMENT_NODE)
++ prop = node->properties;
++ else
++ prop = NULL;
+ while (prop != NULL) {
+ /*
+ * One need to have
+@@ -130,7 +135,7 @@ xsltGetCNsProp(xsltStylesheetPtr style, xmlNodePtr node,
+ attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
+ if ((attrDecl == NULL) && (doc->extSubset != NULL))
+ attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
+-
++
+ if ((attrDecl != NULL) && (attrDecl->prefix != NULL)) {
+ /*
+ * The DTD declaration only allows a prefix search
+@@ -172,7 +177,15 @@ xsltGetNsProp(xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace) {
+ if (node == NULL)
+ return(NULL);
+
+- prop = node->properties;
++ if (nameSpace == NULL)
++ return xmlGetProp(node, name);
++
++ if (node->type == XML_NAMESPACE_DECL)
++ return(NULL);
++ if (node->type == XML_ELEMENT_NODE)
++ prop = node->properties;
++ else
++ prop = NULL;
+ /*
+ * TODO: Substitute xmlGetProp() for xmlGetNsProp(), since the former
+ * is not namespace-aware and will return an attribute with equal
+@@ -182,8 +195,6 @@ xsltGetNsProp(xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace) {
+ * So this would return "myName" even if an attribute @name
+ * in the XSLT was requested.
+ */
+- if (nameSpace == NULL)
+- return(xmlGetProp(node, name));
+ while (prop != NULL) {
+ /*
+ * One need to have
+@@ -216,7 +227,7 @@ xsltGetNsProp(xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace) {
+ attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
+ if ((attrDecl == NULL) && (doc->extSubset != NULL))
+ attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
+-
++
+ if ((attrDecl != NULL) && (attrDecl->prefix != NULL)) {
+ /*
+ * The DTD declaration only allows a prefix search
+--
diff -Nru libxslt-1.1.26/debian/patches/0007-Fix-default-template-processing-on-namespace-nodes.patch libxslt-1.1.26/debian/patches/0007-Fix-default-template-processing-on-namespace-nodes.patch
--- libxslt-1.1.26/debian/patches/0007-Fix-default-template-processing-on-namespace-nodes.patch 1970-01-01 00:00:00.000000000 +0000
+++ libxslt-1.1.26/debian/patches/0007-Fix-default-template-processing-on-namespace-nodes.patch 2012-10-02 15:43:51.000000000 +0000
@@ -0,0 +1,34 @@
+From: Daniel Veillard
+Date: Wed, 8 Aug 2012 15:31:05 +0800
+Subject: Fix default template processing on namespace nodes
+
+---
+ libxslt/transform.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index 5461daa..38fbad6 100644
+--- a/libxslt/transform.c
++++ b/libxslt/transform.c
+@@ -4832,7 +4832,10 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node,
+ list = xmlXPathNodeSetCreate(NULL);
+ if (list == NULL)
+ goto error;
+- cur = node->children;
++ if (node->type != XML_NAMESPACE_DECL)
++ cur = node->children;
++ else
++ cur = NULL;
+ while (cur != NULL) {
+ switch (cur->type) {
+ case XML_TEXT_NODE:
+@@ -4881,6 +4884,8 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node,
+ if (cur->prev != NULL)
+ cur->prev->next = cur->next;
+ break;
++ case XML_NAMESPACE_DECL:
++ break;
+ default:
+ #ifdef WITH_XSLT_DEBUG_PROCESS
+ XSLT_TRACE(ctxt,XSLT_TRACE_APPLY_TEMPLATES,xsltGenericDebug(xsltGenericDebugContext,
+--
diff -Nru libxslt-1.1.26/debian/patches/0008-Fix-a-dictionary-string-usage.patch libxslt-1.1.26/debian/patches/0008-Fix-a-dictionary-string-usage.patch
--- libxslt-1.1.26/debian/patches/0008-Fix-a-dictionary-string-usage.patch 1970-01-01 00:00:00.000000000 +0000
+++ libxslt-1.1.26/debian/patches/0008-Fix-a-dictionary-string-usage.patch 2012-10-02 15:43:51.000000000 +0000
@@ -0,0 +1,104 @@
+From: Chris Evans
+Date: Mon, 3 Sep 2012 15:50:22 +0800
+Subject: Fix a dictionary string usage
+
+Raised in chromium, but also affecting xsltproc
+Also updated AUTHORS to list Chris and other contributors
+---
+ AUTHORS | 45 ++++++++++++++++++++++++++++++++++++++++++++-
+ libxslt/templates.c | 7 +++++--
+ 2 files changed, 49 insertions(+), 3 deletions(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index 094ebbc..3a70a17 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -5,7 +5,7 @@ Daniel Veillard:
+ Used to work at W3C, now Red Hat
+ co-chair of W3C XML Linking WG
+ invited expert on the W3C XML Core WG
+- Author of libxml upon which this library is based.
++ Author of libxml2 upon which this library is based.
+
+ Bjorn Reese:
+ breese@users.sourceforge.net
+@@ -18,3 +18,46 @@ William Brack
+ Thomas Broyer
+
+ Igor Zlatkovic for the Windows port
++
++Patches gently provided by a multitude of people :
++
++Abhishek Arya
++Ben Walton
++Bjorn Reese
++C. M. Sperberg-McQueen
++Colin Walters
++Daniel Mustieles
++Daniel Richard G
++Darin Adler
++ÉRDI Gergo
++Fatih Demir
++Federico Mena Quintero
++Frederic Crozat
++Hao Hu
++Havoc Pennington
++IlyaS
++jacob berkman
++Jason Viers
++Jérôme Carretero
++Joachim Breitner
++Johan Dahlin
++John Fleck
++Jose Maria Celorio
++Julio M. Merino Vidal
++Kasimier T. Buchcik
++Kjartan Maraas
++Laurence Rowe
++Malcolm Purvis
++Martin
++MDT 2002 John Fleck
++Michael Bonfils
++money_seshu Dronamraju
++Nick Wellnhofer
++Nix
++Pedro F. Giffuni
++Peter Williams
++Rob Richards
++Roumen Petrov
++Stefan Kost
++Tomasz Kłoczko
++Chris Evans
+diff --git a/libxslt/templates.c b/libxslt/templates.c
+index 81de93c..e1289fc 100644
+--- a/libxslt/templates.c
++++ b/libxslt/templates.c
+@@ -18,6 +18,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include "xslt.h"
+@@ -576,7 +577,8 @@ xsltAttrTemplateProcess(xsltTransformContextPtr ctxt, xmlNodePtr target,
+ }
+ } else if ((ctxt->internalized) && (target != NULL) &&
+ (target->doc != NULL) &&
+- (target->doc->dict == ctxt->dict)) {
++ (target->doc->dict == ctxt->dict) &&
++ xmlDictOwns(ctxt->dict, value)) {
+ text->content = (xmlChar *) value;
+ } else {
+ text->content = xmlStrdup(value);
+@@ -762,7 +764,8 @@ xsltAttrListTemplateProcess(xsltTransformContextPtr ctxt,
+ }
+ } else if ((ctxt->internalized) &&
+ (target->doc != NULL) &&
+- (target->doc->dict == ctxt->dict))
++ (target->doc->dict == ctxt->dict) &&
++ xmlDictOwns(ctxt->dict, value))
+ {
+ text->content = (xmlChar *) value;
+ } else {
+--
diff -Nru libxslt-1.1.26/debian/patches/CVE-2012-6139.patch libxslt-1.1.26/debian/patches/CVE-2012-6139.patch
--- libxslt-1.1.26/debian/patches/CVE-2012-6139.patch 1970-01-01 00:00:00.000000000 +0000
+++ libxslt-1.1.26/debian/patches/CVE-2012-6139.patch 2013-03-28 17:02:17.000000000 +0000
@@ -0,0 +1,161 @@
+Description: fix denial of service via malformed stylesheet
+Origin: backport, http://git.gnome.org/browse/libxslt/commit/?id=dc11b6b379a882418093ecc8adf11f6166682e8d
+Origin: backport, http://git.gnome.org/browse/libxslt/commit/?id=6c99c519d97e5fcbec7a9537d190efb442e4e833
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=685328
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=685330
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=703933
+
+Index: libxslt-1.1.26/libxslt/functions.c
+===================================================================
+--- libxslt-1.1.26.orig/libxslt/functions.c 2013-03-28 13:01:33.052454020 -0400
++++ libxslt-1.1.26/libxslt/functions.c 2013-03-28 13:01:33.048454019 -0400
+@@ -260,7 +260,7 @@
+ obj = valuePop(ctxt);
+ ret = xmlXPathNewNodeSet(NULL);
+
+- if (obj->nodesetval) {
++ if ((obj != NULL) && obj->nodesetval) {
+ for (i = 0; i < obj->nodesetval->nodeNr; i++) {
+ valuePush(ctxt,
+ xmlXPathNewNodeSet(obj->nodesetval->nodeTab[i]));
+@@ -280,7 +280,8 @@
+ }
+ }
+
+- xmlXPathFreeObject(obj);
++ if (obj != NULL)
++ xmlXPathFreeObject(obj);
+ if (obj2 != NULL)
+ xmlXPathFreeObject(obj2);
+ valuePush(ctxt, ret);
+Index: libxslt-1.1.26/libxslt/keys.c
+===================================================================
+--- libxslt-1.1.26.orig/libxslt/keys.c 2013-03-28 13:01:33.052454020 -0400
++++ libxslt-1.1.26/libxslt/keys.c 2013-03-28 13:01:33.048454019 -0400
+@@ -311,8 +311,8 @@
+ end = skipPredicate(match, end);
+ if (end <= 0) {
+ xsltTransformError(NULL, style, inst,
+- "key pattern is malformed: %s",
+- key->match);
++ "xsl:key : 'match' pattern is malformed: %s",
++ key->match);
+ if (style != NULL) style->errors++;
+ goto error;
+ }
+@@ -321,7 +321,7 @@
+ }
+ if (current == end) {
+ xsltTransformError(NULL, style, inst,
+- "key pattern is empty\n");
++ "xsl:key : 'match' pattern is empty\n");
+ if (style != NULL) style->errors++;
+ goto error;
+ }
+@@ -344,6 +344,12 @@
+ }
+ current = end;
+ }
++ if (pattern == NULL) {
++ xsltTransformError(NULL, style, inst,
++ "xsl:key : 'match' pattern is empty\n");
++ if (style != NULL) style->errors++;
++ goto error;
++ }
+ #ifdef WITH_XSLT_DEBUG_KEYS
+ xsltGenericDebug(xsltGenericDebugContext,
+ " resulting pattern %s\n", pattern);
+@@ -359,14 +365,14 @@
+ key->comp = xsltXPathCompile(style, pattern);
+ if (key->comp == NULL) {
+ xsltTransformError(NULL, style, inst,
+- "xsl:key : XPath pattern compilation failed '%s'\n",
++ "xsl:key : 'match' pattern compilation failed '%s'\n",
+ pattern);
+ if (style != NULL) style->errors++;
+ }
+ key->usecomp = xsltXPathCompile(style, use);
+ if (key->usecomp == NULL) {
+ xsltTransformError(NULL, style, inst,
+- "xsl:key : XPath pattern compilation failed '%s'\n",
++ "xsl:key : 'use' expression compilation failed '%s'\n",
+ use);
+ if (style != NULL) style->errors++;
+ }
+Index: libxslt-1.1.26/tests/docs/Makefile.am
+===================================================================
+--- libxslt-1.1.26.orig/tests/docs/Makefile.am 2013-03-28 13:01:33.052454020 -0400
++++ libxslt-1.1.26/tests/docs/Makefile.am 2013-03-28 13:01:33.048454019 -0400
+@@ -168,6 +168,7 @@
+ bug-167.xml \
+ bug-168.xml \
+ bug-169.xml \
++ bug-180.xml \
+ character.xml \
+ array.xml \
+ items.xml
+Index: libxslt-1.1.26/tests/docs/Makefile.in
+===================================================================
+--- libxslt-1.1.26.orig/tests/docs/Makefile.in 2013-03-28 13:01:33.052454020 -0400
++++ libxslt-1.1.26/tests/docs/Makefile.in 2013-03-28 13:01:33.048454019 -0400
+@@ -387,6 +387,7 @@
+ bug-167.xml \
+ bug-168.xml \
+ bug-169.xml \
++ bug-180.xml \
+ character.xml \
+ array.xml \
+ items.xml
+Index: libxslt-1.1.26/tests/docs/bug-180.xml
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libxslt-1.1.26/tests/docs/bug-180.xml 2013-03-28 13:01:33.048454019 -0400
+@@ -0,0 +1,2 @@
++
++
++
++
++
++
++
diff -Nru libxslt-1.1.26/debian/patches/series libxslt-1.1.26/debian/patches/series
--- libxslt-1.1.26/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ libxslt-1.1.26/debian/patches/series 2013-03-28 17:01:21.000000000 +0000
@@ -0,0 +1,9 @@
+0001-patch-xslt-config-to-add-private-libraries.patch
+0002-fix-autoconf-automake.patch
+0003-code-fix-and-docs-modification.patch
+0004-fix-typo.patch
+0005-cve-2012-2825.patch
+0006-cve-2012-2870.patch
+0007-Fix-default-template-processing-on-namespace-nodes.patch
+0008-Fix-a-dictionary-string-usage.patch
+CVE-2012-6139.patch
diff -Nru libxslt-1.1.26/debian/python-libxslt1-dbg.lintian-overrides libxslt-1.1.26/debian/python-libxslt1-dbg.lintian-overrides
--- libxslt-1.1.26/debian/python-libxslt1-dbg.lintian-overrides 1970-01-01 00:00:00.000000000 +0000
+++ libxslt-1.1.26/debian/python-libxslt1-dbg.lintian-overrides 2012-10-01 13:33:47.000000000 +0000
@@ -0,0 +1,2 @@
+python-libxslt1-dbg: hardening-no-relro
+python-libxslt1-dbg: hardening-no-fortify-functions
diff -Nru libxslt-1.1.26/debian/rules libxslt-1.1.26/debian/rules
--- libxslt-1.1.26/debian/rules 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/debian/rules 2012-10-01 13:33:47.000000000 +0000
@@ -5,43 +5,49 @@
# The current default version of python
PYVER=$(shell pyversions -d)
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-CONFIGURE_FLAGS := CC="gcc -Wl,--as-needed" --cache-file="$(CURDIR)/build/config.cache"
+CFLAGS = `dpkg-buildflags --get CFLAGS` -Wall
+LDFLAGS = `dpkg-buildflags --get LDFLAGS` -Wl,--as-needed
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
+CONFIGURE_FLAGS := --with-history CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --cache-file="$(CURDIR)/builddir/config.cache"
TARGETS := main $(PYVERS) $(PYVERS:%=%-dbg)
override_dh_auto_configure: $(TARGETS:%=configure-%)
configure-%:
- dh_auto_configure --builddirectory=build/$* -- $(CONFIGURE_FLAGS)
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
+ dh_auto_configure --builddirectory=builddir/$* -- $(CONFIGURE_FLAGS)
-configure-main: CONFIGURE_FLAGS += --without-python --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+configure-main: CONFIGURE_FLAGS += --without-python
configure-python%: CONFIGURE_FLAGS += --with-python=/usr/bin/$*
-override_dh_auto_build: $(TARGETS:%=build-%)
+override_dh_auto_build: $(TARGETS:%=dobuild-%)
-build-%: BUILD_DIR=build/$*
-build-%:
- $(if $(filter $(BUILD_DIR),build/$*),,[ -d $(BUILD_DIR) ] || mv build/$*/python $(BUILD_DIR))
+dobuild-%: BUILD_DIR=builddir/$*
+dobuild-%:
+ $(if $(filter $(BUILD_DIR),builddir/$*),,[ -d $(BUILD_DIR) ] || mv builddir/$*/python $(BUILD_DIR))
dh_auto_build --builddirectory=$(BUILD_DIR) -- $(BUILD_FLAGS)
-build-python%: BUILD_DIR=build/main/$*
-build-python%-dbg: BUILD_FLAGS = PYTHON_INCLUDES=/usr/include/$(*:-dbg=_d) \
- LDFLAGS="-L$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" CFLAGS="-Wall -g -O0"
+dobuild-python%: BUILD_DIR=builddir/main/$*
+dobuild-python%-dbg: BUILD_FLAGS = PYTHON_INCLUDES=/usr/include/$(*:-dbg=_d) \
+ LDFLAGS="-L$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" CFLAGS="-Wall -g -O0"
override_dh_auto_clean:
- rm -rf build debian/tmp-dbg
-
- -test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
+ rm -rf builddir debian/tmp-dbg config.sub config.guess autogen.sh
+ dh_auto_clean
-override_dh_auto_install: $(TARGETS:%=install-%)
+override_dh_auto_install: $(TARGETS:%=doinstall-%)
+ find debian/ -name *.la -delete
-install-main:
- dh_auto_install --builddirectory=build/main
+doinstall-main:
+ dh_auto_install --builddirectory=builddir/main
# Properly install documentation in /usr/share/doc/libxslt1-dev
install -d debian/tmp/usr/share/doc/libxslt1-dev/EXSLT
@@ -60,12 +66,12 @@
doc/EXSLT/html debian/tmp/usr/share/doc/libxslt1-dev/EXSLT
sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
-install-python%-dbg:
- $(MAKE) -C build/main/python$*-dbg DESTDIR=$(CURDIR)/debian/tmp-dbg install-pythonLTLIBRARIES
+doinstall-python%-dbg:
+ $(MAKE) -C builddir/main/python$*-dbg DESTDIR=$(CURDIR)/debian/tmp-dbg install-pythonLTLIBRARIES
prename 's/(?= 1.1.26)' -- -c4
%:
- dh --with python2 $@
+ dh $@ --with autoreconf,python2
diff -Nru libxslt-1.1.26/debian/source/format libxslt-1.1.26/debian/source/format
--- libxslt-1.1.26/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ libxslt-1.1.26/debian/source/format 2013-12-29 18:34:16.340402160 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru libxslt-1.1.26/debian/xslt-config.1 libxslt-1.1.26/debian/xslt-config.1
--- libxslt-1.1.26/debian/xslt-config.1 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/debian/xslt-config.1 2012-10-01 13:33:47.000000000 +0000
@@ -9,7 +9,6 @@
linker flags that should be used to compile and link programs that use
\fIlibxslt\fP.
.SH OPTIONS
-.l
\fIxslt-config\fP accepts the following options:
.TP 8
.B \-\-version
diff -Nru libxslt-1.1.26/doc/Makefile.am libxslt-1.1.26/doc/Makefile.am
--- libxslt-1.1.26/doc/Makefile.am 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/doc/Makefile.am 2009-09-16 13:53:45.000000000 +0000
@@ -45,7 +45,7 @@
man_MANS = xsltproc.1
-all: $(man_MANS)
+all: web ../NEWS libxslt.xsa $(man_MANS)
api: libxslt-api.xml libxslt-refs.xml $(APIPAGES) search.php \
html/index.html $(WIN32_DIR)/libxslt.def.src
diff -Nru libxslt-1.1.26/doc/Makefile.in libxslt-1.1.26/doc/Makefile.in
--- libxslt-1.1.26/doc/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/doc/Makefile.in 2009-09-24 14:43:14.000000000 +0000
@@ -138,7 +138,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -154,7 +153,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -293,7 +291,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -302,9 +300,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign doc/Makefile
+ $(AUTOMAKE) --gnu doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -318,9 +316,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
@@ -537,7 +535,7 @@
uninstall uninstall-am uninstall-man uninstall-man1
-all: $(man_MANS)
+all: web ../NEWS libxslt.xsa $(man_MANS)
api: libxslt-api.xml libxslt-refs.xml $(APIPAGES) search.php \
html/index.html $(WIN32_DIR)/libxslt.def.src
diff -Nru libxslt-1.1.26/doc/xsltproc.1 libxslt-1.1.26/doc/xsltproc.1
--- libxslt-1.1.26/doc/xsltproc.1 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/doc/xsltproc.1 2009-05-12 06:29:34.000000000 +0000
@@ -161,14 +161,6 @@
will maybe not work, but
\fB\-o directory/\fR
will\.
-.sp
-Also note that if there is no output to xsltproc,
-\fIFILE\fR
-will not be created at all\&. An empty file will
-\fBnot\fR
-be created\.
-.sp .5v
-.RE
.RE
.PP
\fB\-\-encoding \fR\fB\fIENCODING\fR\fR
diff -Nru libxslt-1.1.26/doc/xsltproc.xml libxslt-1.1.26/doc/xsltproc.xml
--- libxslt-1.1.26/doc/xsltproc.xml 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/doc/xsltproc.xml 2009-05-12 06:29:34.000000000 +0000
@@ -282,11 +282,6 @@
e.g. -o directory will maybe not work,
but -o directory/ will.
-
- Also note that if there is no output to xsltproc,
- FILE will not be created at all.
- An empty file will not be created.
-
diff -Nru libxslt-1.1.26/libexslt/Makefile.in libxslt-1.1.26/libexslt/Makefile.in
--- libxslt-1.1.26/libexslt/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libexslt/Makefile.in 2009-09-24 14:43:14.000000000 +0000
@@ -168,7 +168,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -184,7 +183,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -309,7 +307,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -318,9 +316,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libexslt/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libexslt/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign libexslt/Makefile
+ $(AUTOMAKE) --gnu libexslt/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -334,9 +332,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
exsltconfig.h: $(top_builddir)/config.status $(srcdir)/exsltconfig.h.in
diff -Nru libxslt-1.1.26/libexslt/functions.c libxslt-1.1.26/libexslt/functions.c
--- libxslt-1.1.26/libexslt/functions.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libexslt/functions.c 2009-09-17 09:44:47.000000000 +0000
@@ -459,9 +459,10 @@
xmlHashTablePtr data;
exsltFuncFunctionData *func;
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
+
{
xmlChar *qname;
@@ -545,9 +546,6 @@
xmlChar *sel;
exsltFuncResultPreComp *ret;
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
- return (NULL);
-
/*
* "Validity" checking
*/
diff -Nru libxslt-1.1.26/libexslt.pc.in libxslt-1.1.26/libexslt.pc.in
--- libxslt-1.1.26/libexslt.pc.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libexslt.pc.in 2009-05-12 06:29:34.000000000 +0000
@@ -9,5 +9,4 @@
Description: EXSLT Extension library
Requires: libxml-2.0
Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@
-Libs.private: @M_LIBS@ @LIBGCRYPT_LIBS@
Cflags: @EXSLT_INCLUDEDIR@
diff -Nru libxslt-1.1.26/libxslt/Makefile.in libxslt-1.1.26/libxslt/Makefile.in
--- libxslt-1.1.26/libxslt/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/Makefile.in 2009-09-24 14:43:14.000000000 +0000
@@ -170,7 +170,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -186,7 +185,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -343,7 +341,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -352,9 +350,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libxslt/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libxslt/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign libxslt/Makefile
+ $(AUTOMAKE) --gnu libxslt/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -368,9 +366,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
xsltconfig.h: $(top_builddir)/config.status $(srcdir)/xsltconfig.h.in
diff -Nru libxslt-1.1.26/libxslt/attributes.c libxslt-1.1.26/libxslt/attributes.c
--- libxslt-1.1.26/libxslt/attributes.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/attributes.c 2009-06-24 09:57:11.000000000 +0000
@@ -293,7 +293,7 @@
xmlNodePtr child;
xsltAttrElemPtr attrItems;
- if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ if ((cur == NULL) || (style == NULL))
return;
value = xmlGetNsProp(cur, (const xmlChar *)"name", NULL);
@@ -656,8 +656,7 @@
xmlNsPtr ns = NULL;
xmlAttrPtr attr;
- if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL) ||
- (inst->type != XML_ELEMENT_NODE) )
+ if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL))
return;
/*
diff -Nru libxslt-1.1.26/libxslt/functions.c libxslt-1.1.26/libxslt/functions.c
--- libxslt-1.1.26/libxslt/functions.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/functions.c 2009-05-12 06:29:34.000000000 +0000
@@ -260,7 +260,7 @@
obj = valuePop(ctxt);
ret = xmlXPathNewNodeSet(NULL);
- if ((obj != NULL) && obj->nodesetval) {
+ if (obj->nodesetval) {
for (i = 0; i < obj->nodesetval->nodeNr; i++) {
valuePush(ctxt,
xmlXPathNewNodeSet(obj->nodesetval->nodeTab[i]));
@@ -280,8 +280,7 @@
}
}
- if (obj != NULL)
- xmlXPathFreeObject(obj);
+ xmlXPathFreeObject(obj);
if (obj2 != NULL)
xmlXPathFreeObject(obj2);
valuePush(ctxt, ret);
@@ -655,14 +654,13 @@
void
xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
xmlNodePtr cur = NULL;
- xmlXPathObjectPtr obj = NULL;
- long val;
- xmlChar str[30];
- xmlDocPtr doc;
+ unsigned long val;
+ xmlChar str[20];
if (nargs == 0) {
cur = ctxt->context->node;
} else if (nargs == 1) {
+ xmlXPathObjectPtr obj;
xmlNodeSetPtr nodelist;
int i, ret;
@@ -685,6 +683,7 @@
if (ret == -1)
cur = nodelist->nodeTab[i];
}
+ xmlXPathFreeObject(obj);
} else {
xsltTransformError(xsltXPathGetTransformContext(ctxt), NULL, NULL,
"generate-id() : invalid number of args %d\n", nargs);
@@ -695,27 +694,9 @@
* Okay this is ugly but should work, use the NodePtr address
* to forge the ID
*/
- if (cur->type != XML_NAMESPACE_DECL)
- doc = cur->doc;
- else {
- xmlNsPtr ns = (xmlNsPtr) cur;
-
- if (ns->context != NULL)
- doc = ns->context;
- else
- doc = ctxt->context->doc;
-
- }
-
- if (obj)
- xmlXPathFreeObject(obj);
-
- val = (long)((char *)cur - (char *)doc);
- if (val >= 0) {
- sprintf((char *)str, "idp%ld", val);
- } else {
- sprintf((char *)str, "idm%ld", -val);
- }
+ val = (unsigned long)((char *)cur - (char *)0);
+ val /= sizeof(xmlNode);
+ sprintf((char *)str, "id%ld", val);
valuePush(ctxt, xmlXPathNewString(str));
}
diff -Nru libxslt-1.1.26/libxslt/keys.c libxslt-1.1.26/libxslt/keys.c
--- libxslt-1.1.26/libxslt/keys.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/keys.c 2009-09-16 13:33:48.000000000 +0000
@@ -311,8 +311,8 @@
end = skipPredicate(match, end);
if (end <= 0) {
xsltTransformError(NULL, style, inst,
- "xsl:key : 'match' pattern is malformed: %s",
- key->match);
+ "key pattern is malformed: %s",
+ key->match);
if (style != NULL) style->errors++;
goto error;
}
@@ -321,7 +321,7 @@
}
if (current == end) {
xsltTransformError(NULL, style, inst,
- "xsl:key : 'match' pattern is empty\n");
+ "key pattern is empty\n");
if (style != NULL) style->errors++;
goto error;
}
@@ -344,12 +344,6 @@
}
current = end;
}
- if (pattern == NULL) {
- xsltTransformError(NULL, style, inst,
- "xsl:key : 'match' pattern is empty\n");
- if (style != NULL) style->errors++;
- goto error;
- }
#ifdef WITH_XSLT_DEBUG_KEYS
xsltGenericDebug(xsltGenericDebugContext,
" resulting pattern %s\n", pattern);
@@ -365,14 +359,14 @@
key->comp = xsltXPathCompile(style, pattern);
if (key->comp == NULL) {
xsltTransformError(NULL, style, inst,
- "xsl:key : 'match' pattern compilation failed '%s'\n",
+ "xsl:key : XPath pattern compilation failed '%s'\n",
pattern);
if (style != NULL) style->errors++;
}
key->usecomp = xsltXPathCompile(style, use);
if (key->usecomp == NULL) {
xsltTransformError(NULL, style, inst,
- "xsl:key : 'use' expression compilation failed '%s'\n",
+ "xsl:key : XPath pattern compilation failed '%s'\n",
use);
if (style != NULL) style->errors++;
}
diff -Nru libxslt-1.1.26/libxslt/pattern.c libxslt-1.1.26/libxslt/pattern.c
--- libxslt-1.1.26/libxslt/pattern.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/pattern.c 2009-09-17 12:58:46.000000000 +0000
@@ -303,10 +303,6 @@
"xsltCompMatchAdd: memory re-allocation failure.\n");
if (ctxt->style != NULL)
ctxt->style->errors++;
- if (value)
- xmlFree(value);
- if (value2)
- xmlFree(value2);
return (-1);
}
comp->maxStep *= 2;
@@ -1385,22 +1381,17 @@
NEXT;
SKIP_BLANKS;
lit = xsltScanLiteral(ctxt);
- if (ctxt->error) {
- xsltTransformError(NULL, NULL, NULL,
- "xsltCompileIdKeyPattern : Literal expected\n");
+ if (ctxt->error)
return;
- }
SKIP_BLANKS;
if (CUR != ')') {
xsltTransformError(NULL, NULL, NULL,
"xsltCompileIdKeyPattern : ) expected\n");
- xmlFree(lit);
ctxt->error = 1;
return;
}
NEXT;
PUSH(XSLT_OP_ID, lit, NULL, novar);
- lit = NULL;
} else if ((aid) && (xmlStrEqual(name, (const xmlChar *)"key"))) {
if (axis != 0) {
xsltTransformError(NULL, NULL, NULL,
@@ -1411,11 +1402,8 @@
NEXT;
SKIP_BLANKS;
lit = xsltScanLiteral(ctxt);
- if (ctxt->error) {
- xsltTransformError(NULL, NULL, NULL,
- "xsltCompileIdKeyPattern : Literal expected\n");
+ if (ctxt->error)
return;
- }
SKIP_BLANKS;
if (CUR != ',') {
xsltTransformError(NULL, NULL, NULL,
@@ -1426,36 +1414,25 @@
NEXT;
SKIP_BLANKS;
lit2 = xsltScanLiteral(ctxt);
- if (ctxt->error) {
- xsltTransformError(NULL, NULL, NULL,
- "xsltCompileIdKeyPattern : Literal expected\n");
- xmlFree(lit);
+ if (ctxt->error)
return;
- }
SKIP_BLANKS;
if (CUR != ')') {
xsltTransformError(NULL, NULL, NULL,
"xsltCompileIdKeyPattern : ) expected\n");
- xmlFree(lit);
- xmlFree(lit2);
ctxt->error = 1;
return;
}
NEXT;
/* URGENT TODO: support namespace in keys */
PUSH(XSLT_OP_KEY, lit, lit2, novar);
- lit = NULL;
- lit2 = NULL;
} else if (xmlStrEqual(name, (const xmlChar *)"processing-instruction")) {
NEXT;
SKIP_BLANKS;
if (CUR != ')') {
lit = xsltScanLiteral(ctxt);
- if (ctxt->error) {
- xsltTransformError(NULL, NULL, NULL,
- "xsltCompileIdKeyPattern : Literal expected\n");
+ if (ctxt->error)
return;
- }
SKIP_BLANKS;
if (CUR != ')') {
xsltTransformError(NULL, NULL, NULL,
@@ -1466,7 +1443,6 @@
}
NEXT;
PUSH(XSLT_OP_PI, lit, NULL, novar);
- lit = NULL;
} else if (xmlStrEqual(name, (const xmlChar *)"text")) {
NEXT;
SKIP_BLANKS;
@@ -1517,7 +1493,8 @@
return;
}
error:
- return;
+ if (name != NULL)
+ xmlFree(name);
}
/**
@@ -1580,8 +1557,6 @@
SKIP_BLANKS;
if (CUR == '(') {
xsltCompileIdKeyPattern(ctxt, token, 0, novar, axis);
- xmlFree(token);
- token = NULL;
if (ctxt->error)
goto error;
} else if (CUR == ':') {
@@ -1600,24 +1575,20 @@
"xsltCompileStepPattern : no namespace bound to prefix %s\n",
prefix);
xmlFree(prefix);
- prefix=NULL;
ctxt->error = 1;
goto error;
} else {
URL = xmlStrdup(ns->href);
}
xmlFree(prefix);
- prefix=NULL;
if (token == NULL) {
if (CUR == '*') {
NEXT;
if (axis == AXIS_ATTRIBUTE) {
PUSH(XSLT_OP_ATTR, NULL, URL, novar);
- URL = NULL;
}
else {
PUSH(XSLT_OP_NS, URL, NULL, novar);
- URL = NULL;
}
} else {
xsltTransformError(NULL, NULL, NULL,
@@ -1628,13 +1599,9 @@
} else {
if (axis == AXIS_ATTRIBUTE) {
PUSH(XSLT_OP_ATTR, token, URL, novar);
- token = NULL;
- URL = NULL;
}
else {
PUSH(XSLT_OP_ELEM, token, URL, novar);
- token = NULL;
- URL = NULL;
}
}
} else {
@@ -1656,7 +1623,6 @@
goto error;
}
xmlFree(token);
- token = NULL;
SKIP_BLANKS;
token = xsltScanNCName(ctxt);
goto parse_node_test;
@@ -1671,13 +1637,9 @@
URL = xmlStrdup(URI);
if (axis == AXIS_ATTRIBUTE) {
PUSH(XSLT_OP_ATTR, token, URL, novar);
- token = NULL;
- URL = NULL;
}
else {
PUSH(XSLT_OP_ELEM, token, URL, novar);
- token = NULL;
- URL = NULL;
}
}
parse_predicate:
@@ -1717,7 +1679,6 @@
}
ret = xmlStrndup(q, CUR_PTR - q);
PUSH(XSLT_OP_PREDICATE, ret, NULL, novar);
- ret = NULL;
/* push the predicate lower than local test */
SWAP();
NEXT;
@@ -1826,8 +1787,6 @@
SKIP_BLANKS;
if ((CUR == '(') && !xmlXPathIsNodeType(name)) {
xsltCompileIdKeyPattern(ctxt, name, 1, novar, 0);
- xmlFree(name);
- name = NULL;
if ((CUR == '/') && (NXT(1) == '/')) {
PUSH(XSLT_OP_ANCESTOR, NULL, NULL, novar);
NEXT;
@@ -1905,8 +1864,6 @@
while ((pattern[end] != 0) && (pattern[end] != '"'))
end++;
}
- if (pattern[end] == 0)
- break;
end++;
}
if (current == end) {
diff -Nru libxslt-1.1.26/libxslt/preproc.c libxslt-1.1.26/libxslt/preproc.c
--- libxslt-1.1.26/libxslt/preproc.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/preproc.c 2009-09-18 09:42:29.000000000 +0000
@@ -669,7 +669,7 @@
#else
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -777,7 +777,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
comp = (xsltStyleItemCopyPtr) xsltNewStylePreComp(style, XSLT_FUNC_COPY);
@@ -821,7 +821,7 @@
#endif
const xmlChar *prop;
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -874,7 +874,7 @@
*
*
*/
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -991,7 +991,7 @@
*
*
*/
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1111,7 +1111,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1141,7 +1141,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1175,7 +1175,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1222,7 +1222,7 @@
#endif
const xmlChar *prop;
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1347,7 +1347,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1406,7 +1406,7 @@
#endif
const xmlChar *prop;
- if ((style == NULL) || (cur == NULL) || (cur->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (cur == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1520,7 +1520,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1550,7 +1550,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1589,7 +1589,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1641,7 +1641,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1672,7 +1672,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1718,7 +1718,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1764,7 +1764,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1812,7 +1812,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1875,7 +1875,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((style == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -1967,7 +1967,7 @@
* the parsing mechanism for all elements in the XSLT namespace.
*/
if (style == NULL) {
- if ((node != NULL) && (node->type == XML_ELEMENT_NODE))
+ if (node != NULL)
node->psvi = NULL;
return;
}
@@ -2182,8 +2182,7 @@
* namespace- and local-name of the node, but can evaluate this
* using cctxt->style->inode->category;
*/
- if ((inst == NULL) || (inst->type != XML_ELEMENT_NODE) ||
- (inst->psvi != NULL))
+ if (inst->psvi != NULL)
return;
if (IS_XSLT_ELEM(inst)) {
diff -Nru libxslt-1.1.26/libxslt/templates.c libxslt-1.1.26/libxslt/templates.c
--- libxslt-1.1.26/libxslt/templates.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/templates.c 2009-09-24 12:01:50.000000000 +0000
@@ -18,7 +18,6 @@
#include
#include
#include
-#include
#include
#include
#include "xslt.h"
@@ -199,8 +198,7 @@
xmlNodePtr oldInsert, insert = NULL;
xmlChar *ret;
- if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL) ||
- (inst->type != XML_ELEMENT_NODE))
+ if ((ctxt == NULL) || (contextNode == NULL) || (inst == NULL))
return(NULL);
if (inst->children == NULL)
@@ -382,8 +380,7 @@
xmlChar *ret;
xmlChar *expr;
- if ((ctxt == NULL) || (inst == NULL) || (name == NULL) ||
- (inst->type != XML_ELEMENT_NODE))
+ if ((ctxt == NULL) || (inst == NULL) || (name == NULL))
return(NULL);
expr = xsltGetNsProp(inst, name, ns);
@@ -427,8 +424,7 @@
const xmlChar *ret;
xmlChar *expr;
- if ((style == NULL) || (inst == NULL) || (name == NULL) ||
- (inst->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (inst == NULL) || (name == NULL))
return(NULL);
expr = xsltGetNsProp(inst, name, ns);
@@ -469,8 +465,7 @@
const xmlChar *value;
xmlAttrPtr ret;
- if ((ctxt == NULL) || (attr == NULL) || (target == NULL) ||
- (target->type != XML_ELEMENT_NODE))
+ if ((ctxt == NULL) || (attr == NULL) || (target == NULL))
return(NULL);
if (attr->type != XML_ATTRIBUTE_NODE)
@@ -577,8 +572,7 @@
}
} else if ((ctxt->internalized) && (target != NULL) &&
(target->doc != NULL) &&
- (target->doc->dict == ctxt->dict) &&
- xmlDictOwns(ctxt->dict, value)) {
+ (target->doc->dict == ctxt->dict)) {
text->content = (xmlChar *) value;
} else {
text->content = xmlStrdup(value);
@@ -628,8 +622,7 @@
const xmlChar *value;
xmlChar *valueAVT;
- if ((ctxt == NULL) || (target == NULL) || (attrs == NULL) ||
- (target->type != XML_ELEMENT_NODE))
+ if ((ctxt == NULL) || (target == NULL) || (attrs == NULL))
return(NULL);
oldInsert = ctxt->insert;
@@ -764,8 +757,7 @@
}
} else if ((ctxt->internalized) &&
(target->doc != NULL) &&
- (target->doc->dict == ctxt->dict) &&
- xmlDictOwns(ctxt->dict, value))
+ (target->doc->dict == ctxt->dict))
{
text->content = (xmlChar *) value;
} else {
diff -Nru libxslt-1.1.26/libxslt/transform.c libxslt-1.1.26/libxslt/transform.c
--- libxslt-1.1.26/libxslt/transform.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/transform.c 2009-09-24 13:58:03.000000000 +0000
@@ -726,7 +726,7 @@
#endif
/*
- * Play safe and reset the merging mechanism for every new
+ * Play save and reset the merging mechanism for every new
* target node.
*/
if ((target == NULL) || (target->children == NULL)) {
@@ -4832,10 +4832,7 @@
list = xmlXPathNodeSetCreate(NULL);
if (list == NULL)
goto error;
- if (node->type != XML_NAMESPACE_DECL)
- cur = node->children;
- else
- cur = NULL;
+ cur = node->children;
while (cur != NULL) {
switch (cur->type) {
case XML_TEXT_NODE:
@@ -4884,8 +4881,6 @@
if (cur->prev != NULL)
cur->prev->next = cur->next;
break;
- case XML_NAMESPACE_DECL:
- break;
default:
#ifdef WITH_XSLT_DEBUG_PROCESS
XSLT_TRACE(ctxt,XSLT_TRACE_APPLY_TEMPLATES,xsltGenericDebug(xsltGenericDebugContext,
diff -Nru libxslt-1.1.26/libxslt/variables.c libxslt-1.1.26/libxslt/variables.c
--- libxslt-1.1.26/libxslt/variables.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/variables.c 2009-09-16 13:29:55.000000000 +0000
@@ -1926,7 +1926,7 @@
the instruction itself. */
xsltStackElemPtr param = NULL;
- if ((ctxt == NULL) || (inst == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((ctxt == NULL) || (inst == NULL))
return(NULL);
#ifdef XSLT_REFACTORED
@@ -1985,7 +1985,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ if ((cur == NULL) || (style == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -2047,7 +2047,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ if ((cur == NULL) || (style == NULL))
return;
#ifdef XSLT_REFACTORED
@@ -2110,7 +2110,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((inst == NULL) || (ctxt == NULL) || (inst->type != XML_ELEMENT_NODE))
+ if ((inst == NULL) || (ctxt == NULL))
return;
comp = inst->psvi;
@@ -2152,7 +2152,7 @@
xsltStylePreCompPtr comp;
#endif
- if ((cur == NULL) || (ctxt == NULL) || (cur->type != XML_ELEMENT_NODE))
+ if ((cur == NULL) || (ctxt == NULL))
return;
comp = cur->psvi;
diff -Nru libxslt-1.1.26/libxslt/xslt.c libxslt-1.1.26/libxslt/xslt.c
--- libxslt-1.1.26/libxslt/xslt.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/xslt.c 2009-09-17 08:04:37.000000000 +0000
@@ -1153,9 +1153,9 @@
xmlChar *element,
*end;
- if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ if ((cur == NULL) || (style == NULL))
return;
-
+
prop = xmlGetNsProp(cur, (const xmlChar *) "version", NULL);
if (prop != NULL) {
if (style->version != NULL)
@@ -1368,12 +1368,12 @@
xmlChar *prop;
xsltDecimalFormatPtr format;
xsltDecimalFormatPtr iter;
-
- if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+
+ if ((cur == NULL) || (style == NULL))
return;
format = style->decimalFormat;
-
+
prop = xmlGetNsProp(cur, BAD_CAST("name"), NULL);
if (prop != NULL) {
format = xsltDecimalFormatGetByName(style, prop);
@@ -1475,7 +1475,7 @@
xmlChar *elements;
xmlChar *element, *end;
- if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ if ((cur == NULL) || (style == NULL))
return;
elements = xmlGetNsProp(cur, (const xmlChar *)"elements", NULL);
@@ -1549,7 +1549,7 @@
xmlChar *prefixes;
xmlChar *prefix, *end;
- if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ if ((cur == NULL) || (style == NULL))
return;
if (isXsltElem) {
@@ -1614,7 +1614,7 @@
xmlChar *elements;
xmlChar *element, *end;
- if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ if ((cur == NULL) || (style == NULL))
return;
elements = xmlGetNsProp(cur, (const xmlChar *)"elements", NULL);
@@ -1687,7 +1687,7 @@
xmlChar *prefixes;
xmlChar *prefix, *end;
- if ((cur == NULL) || (style == NULL) || (cur->type != XML_ELEMENT_NODE))
+ if ((cur == NULL) || (style == NULL))
return(0);
if (isXsltElem)
@@ -4278,7 +4278,7 @@
xsltParseUnknownXSLTElem(xsltCompilerCtxtPtr cctxt,
xmlNodePtr node)
{
- if ((cctxt == NULL) || (node == NULL) || (node->type != XML_ELEMENT_NODE))
+ if ((cctxt == NULL) || (node == NULL))
return(-1);
/*
@@ -4375,7 +4375,7 @@
if (cctxt->inode->category == XSLT_ELEMENT_CATEGORY_EXTENSION) {
cctxt->inode->extContentHandled = 1;
}
- if ((cur == NULL) || (cur->type == XML_NAMESPACE_DECL))
+ if (cur == NULL)
return;
/*
* This is the content reffered to as a "template".
@@ -4780,8 +4780,7 @@
*/
void
xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
- if ((style == NULL) || (templ == NULL) ||
- (templ->type == XML_NAMESPACE_DECL))
+ if ((style == NULL) || (templ == NULL))
return;
/*
@@ -4830,10 +4829,6 @@
void
xsltParseTemplateContent(xsltStylesheetPtr style, xmlNodePtr templ) {
xmlNodePtr cur, delete;
-
- if ((style == NULL) || (templ == NULL) ||
- (templ->type == XML_NAMESPACE_DECL)) return;
-
/*
* This content comes from the stylesheet
* For stylesheets, the set of whitespace-preserving
@@ -5053,7 +5048,7 @@
xmlChar *name = NULL;
xmlChar *nameURI = NULL;
- if ((style == NULL) || (key == NULL) || (key->type != XML_ELEMENT_NODE))
+ if ((style == NULL) || (key == NULL))
return;
/*
@@ -5143,8 +5138,7 @@
xmlChar *prop;
double priority;
- if ((cctxt == NULL) || (templNode == NULL) ||
- (templNode->type != XML_ELEMENT_NODE))
+ if ((cctxt == NULL) || (templNode == NULL))
return;
/*
@@ -5305,8 +5299,7 @@
xmlChar *modeURI = NULL;
double priority;
- if ((style == NULL) || (template == NULL) ||
- (template->type != XML_ELEMENT_NODE))
+ if (template == NULL)
return;
/*
@@ -5438,7 +5431,7 @@
xsltCompileXSLTIncludeElem(xsltCompilerCtxtPtr cctxt, xmlNodePtr node) {
xsltStyleItemIncludePtr item;
- if ((cctxt == NULL) || (node == NULL) || (node->type != XML_ELEMENT_NODE))
+ if ((cctxt == NULL) || (node == NULL))
return(NULL);
node->psvi = NULL;
@@ -5958,7 +5951,7 @@
{
xmlNodePtr cur, start;
- if ((cctxt == NULL) || (node == NULL) || (node->type != XML_ELEMENT_NODE))
+ if ((cctxt == NULL) || (node == NULL))
return(-1);
if (node->children == NULL)
@@ -6046,7 +6039,7 @@
int templates = 0;
#endif
- if ((top == NULL) || (top->type != XML_ELEMENT_NODE))
+ if (top == NULL)
return;
prop = xmlGetNsProp(top, (const xmlChar *)"version", NULL);
diff -Nru libxslt-1.1.26/libxslt/xsltutils.c libxslt-1.1.26/libxslt/xsltutils.c
--- libxslt-1.1.26/libxslt/xsltutils.c 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/xsltutils.c 2009-05-12 06:29:34.000000000 +0000
@@ -90,15 +90,10 @@
if ((node == NULL) || (style == NULL) || (style->dict == NULL))
return(NULL);
- if (nameSpace == NULL)
+ prop = node->properties;
+ if (nameSpace == NULL) {
return xmlGetProp(node, name);
-
- if (node->type == XML_NAMESPACE_DECL)
- return(NULL);
- if (node->type == XML_ELEMENT_NODE)
- prop = node->properties;
- else
- prop = NULL;
+ }
while (prop != NULL) {
/*
* One need to have
@@ -135,7 +130,7 @@
attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
if ((attrDecl == NULL) && (doc->extSubset != NULL))
attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
-
+
if ((attrDecl != NULL) && (attrDecl->prefix != NULL)) {
/*
* The DTD declaration only allows a prefix search
@@ -177,15 +172,7 @@
if (node == NULL)
return(NULL);
- if (nameSpace == NULL)
- return xmlGetProp(node, name);
-
- if (node->type == XML_NAMESPACE_DECL)
- return(NULL);
- if (node->type == XML_ELEMENT_NODE)
- prop = node->properties;
- else
- prop = NULL;
+ prop = node->properties;
/*
* TODO: Substitute xmlGetProp() for xmlGetNsProp(), since the former
* is not namespace-aware and will return an attribute with equal
@@ -195,6 +182,8 @@
* So this would return "myName" even if an attribute @name
* in the XSLT was requested.
*/
+ if (nameSpace == NULL)
+ return(xmlGetProp(node, name));
while (prop != NULL) {
/*
* One need to have
@@ -227,7 +216,7 @@
attrDecl = xmlGetDtdAttrDesc(doc->intSubset, node->name, name);
if ((attrDecl == NULL) && (doc->extSubset != NULL))
attrDecl = xmlGetDtdAttrDesc(doc->extSubset, node->name, name);
-
+
if ((attrDecl != NULL) && (attrDecl->prefix != NULL)) {
/*
* The DTD declaration only allows a prefix search
diff -Nru libxslt-1.1.26/libxslt/xsltutils.h libxslt-1.1.26/libxslt/xsltutils.h
--- libxslt-1.1.26/libxslt/xsltutils.h 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt/xsltutils.h 2009-05-12 06:29:34.000000000 +0000
@@ -52,8 +52,8 @@
* Checks that the element pertains to XSLT namespace.
*/
#define IS_XSLT_ELEM(n) \
- (((n) != NULL) && ((n)->type == XML_ELEMENT_NODE) && \
- ((n)->ns != NULL) && (xmlStrEqual((n)->ns->href, XSLT_NAMESPACE)))
+ (((n) != NULL) && ((n)->ns != NULL) && \
+ (xmlStrEqual((n)->ns->href, XSLT_NAMESPACE)))
/**
* IS_XSLT_NAME:
diff -Nru libxslt-1.1.26/libxslt.pc.in libxslt-1.1.26/libxslt.pc.in
--- libxslt-1.1.26/libxslt.pc.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/libxslt.pc.in 2009-05-12 06:29:34.000000000 +0000
@@ -9,5 +9,4 @@
Description: XSLT library version 2.
Requires: libxml-2.0
Libs: @XSLT_LIBDIR@ @XSLT_LIBS@
-Libs.private: @M_LIBS@
Cflags: @XSLT_INCLUDEDIR@
diff -Nru libxslt-1.1.26/ltmain.sh libxslt-1.1.26/ltmain.sh
--- libxslt-1.1.26/ltmain.sh 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/ltmain.sh 2009-09-24 14:43:11.000000000 +0000
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
+# $progname: (GNU libtool) 2.2.6
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-4"
+VERSION=2.2.6
TIMESTAMP=""
package_revision=1.3012
@@ -5033,10 +5033,7 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -5347,19 +5344,19 @@
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_duplicate_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
continue
fi # $pass = conv
@@ -5896,7 +5893,6 @@
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
- path=
case $deplib in
-L*) path="$deplib" ;;
*.la)
@@ -6210,9 +6206,6 @@
revision="$number_minor"
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
- ;;
esac
;;
no)
diff -Nru libxslt-1.1.26/python/Makefile.am libxslt-1.1.26/python/Makefile.am
--- libxslt-1.1.26/python/Makefile.am 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/python/Makefile.am 2009-05-12 06:29:34.000000000 +0000
@@ -35,12 +35,11 @@
python_LTLIBRARIES = libxsltmod.la
-libxsltmod_la_SOURCES = $(srcdir)/libxslt.c $(srcdir)/types.c
-nodist_libxsltmod_la_SOURCES = libxslt-py.c
+libxsltmod_la_SOURCES = libxslt.c types.c libxslt-py.c
libxsltmod_la_LIBADD = $(mylibs)
-libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
- cat $(srcdir)/libxsl.py libxsltclass.py > libxslt.py
+libxslt.py: $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py
+ cat $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py > libxslt.py
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pythondir)
@@ -51,16 +50,16 @@
GENERATE = generator.py
API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml
-GENERATED= libxsltclass.py \
- libxslt-export.c \
- libxslt-py.c \
- libxslt-py.h \
- libxsltclass.txt
+GENERATED= $(srcdir)/libxsltclass.py \
+ $(srcdir)/libxslt-export.c \
+ $(srcdir)/libxslt-py.c \
+ $(srcdir)/libxslt-py.h \
+ $(srcdir)/libxsltclass.txt
$(GENERATED): gen_prog
gen_prog: $(srcdir)/$(GENERATE) $(API_DESC)
- $(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
+ cd $(srcdir) && $(PYTHON) $(GENERATE)
touch gen_prog
$(libxsltmod_la_OBJECTS): $(GENERATED)
diff -Nru libxslt-1.1.26/python/Makefile.in libxslt-1.1.26/python/Makefile.in
--- libxslt-1.1.26/python/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/python/Makefile.in 2009-09-24 14:43:14.000000000 +0000
@@ -68,11 +68,10 @@
am__installdirs = "$(DESTDIR)$(pythondir)"
LTLIBRARIES = $(python_LTLIBRARIES)
@WITH_PYTHON_TRUE@libxsltmod_la_DEPENDENCIES = $(mylibs)
-am__libxsltmod_la_SOURCES_DIST = $(srcdir)/libxslt.c $(srcdir)/types.c
-@WITH_PYTHON_TRUE@am_libxsltmod_la_OBJECTS = libxslt.lo types.lo
-@WITH_PYTHON_TRUE@nodist_libxsltmod_la_OBJECTS = libxslt-py.lo
-libxsltmod_la_OBJECTS = $(am_libxsltmod_la_OBJECTS) \
- $(nodist_libxsltmod_la_OBJECTS)
+am__libxsltmod_la_SOURCES_DIST = libxslt.c types.c libxslt-py.c
+@WITH_PYTHON_TRUE@am_libxsltmod_la_OBJECTS = libxslt.lo types.lo \
+@WITH_PYTHON_TRUE@ libxslt-py.lo
+libxsltmod_la_OBJECTS = $(am_libxsltmod_la_OBJECTS)
libxsltmod_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(libxsltmod_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -90,7 +89,7 @@
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-SOURCES = $(libxsltmod_la_SOURCES) $(nodist_libxsltmod_la_SOURCES)
+SOURCES = $(libxsltmod_la_SOURCES)
DIST_SOURCES = $(am__libxsltmod_la_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
@@ -200,7 +199,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -216,7 +214,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -338,23 +335,22 @@
@WITH_PYTHON_TRUE@ $(top_builddir)/libexslt/libexslt.la
@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxsltmod.la
-@WITH_PYTHON_TRUE@libxsltmod_la_SOURCES = $(srcdir)/libxslt.c $(srcdir)/types.c
-@WITH_PYTHON_TRUE@nodist_libxsltmod_la_SOURCES = libxslt-py.c
+@WITH_PYTHON_TRUE@libxsltmod_la_SOURCES = libxslt.c types.c libxslt-py.c
@WITH_PYTHON_TRUE@libxsltmod_la_LIBADD = $(mylibs)
@WITH_PYTHON_TRUE@GENERATE = generator.py
@WITH_PYTHON_TRUE@API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml
-@WITH_PYTHON_TRUE@GENERATED = libxsltclass.py \
-@WITH_PYTHON_TRUE@ libxslt-export.c \
-@WITH_PYTHON_TRUE@ libxslt-py.c \
-@WITH_PYTHON_TRUE@ libxslt-py.h \
-@WITH_PYTHON_TRUE@ libxsltclass.txt
+@WITH_PYTHON_TRUE@GENERATED = $(srcdir)/libxsltclass.py \
+@WITH_PYTHON_TRUE@ $(srcdir)/libxslt-export.c \
+@WITH_PYTHON_TRUE@ $(srcdir)/libxslt-py.c \
+@WITH_PYTHON_TRUE@ $(srcdir)/libxslt-py.h \
+@WITH_PYTHON_TRUE@ $(srcdir)/libxsltclass.txt
CLEANFILES = $(GENERATED) *.o libxslt.so *.pyc libxslt.py gen_prog
all: all-recursive
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -379,9 +375,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-pythonLTLIBRARIES: $(python_LTLIBRARIES)
@@ -449,20 +445,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-libxslt.lo: $(srcdir)/libxslt.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxslt.lo -MD -MP -MF $(DEPDIR)/libxslt.Tpo -c -o libxslt.lo `test -f '$(srcdir)/libxslt.c' || echo '$(srcdir)/'`$(srcdir)/libxslt.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxslt.Tpo $(DEPDIR)/libxslt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/libxslt.c' object='libxslt.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxslt.lo `test -f '$(srcdir)/libxslt.c' || echo '$(srcdir)/'`$(srcdir)/libxslt.c
-
-types.lo: $(srcdir)/types.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT types.lo -MD -MP -MF $(DEPDIR)/types.Tpo -c -o types.lo `test -f '$(srcdir)/types.c' || echo '$(srcdir)/'`$(srcdir)/types.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/types.Tpo $(DEPDIR)/types.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/types.c' object='types.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o types.lo `test -f '$(srcdir)/types.c' || echo '$(srcdir)/'`$(srcdir)/types.c
-
mostlyclean-libtool:
-rm -f *.lo
@@ -792,8 +774,8 @@
@WITH_PYTHON_TRUE@all-local: libxslt.py
-@WITH_PYTHON_TRUE@libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
-@WITH_PYTHON_TRUE@ cat $(srcdir)/libxsl.py libxsltclass.py > libxslt.py
+@WITH_PYTHON_TRUE@libxslt.py: $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py
+@WITH_PYTHON_TRUE@ cat $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py > libxslt.py
@WITH_PYTHON_TRUE@install-data-local:
@WITH_PYTHON_TRUE@ $(mkinstalldirs) $(DESTDIR)$(pythondir)
@@ -805,7 +787,7 @@
@WITH_PYTHON_TRUE@$(GENERATED): gen_prog
@WITH_PYTHON_TRUE@gen_prog: $(srcdir)/$(GENERATE) $(API_DESC)
-@WITH_PYTHON_TRUE@ $(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
+@WITH_PYTHON_TRUE@ cd $(srcdir) && $(PYTHON) $(GENERATE)
@WITH_PYTHON_TRUE@ touch gen_prog
@WITH_PYTHON_TRUE@$(libxsltmod_la_OBJECTS): $(GENERATED)
diff -Nru libxslt-1.1.26/python/generator.py libxslt-1.1.26/python/generator.py
--- libxslt-1.1.26/python/generator.py 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/python/generator.py 2009-05-12 06:29:34.000000000 +0000
@@ -6,23 +6,15 @@
functions = {}
enums = {} # { enumType: { enumConstant: enumValue } }
-import os
-import sys
import string
-if __name__ == "__main__":
- # launched as a script
- srcPref = os.path.dirname(sys.argv[0])
-else:
- # imported
- srcPref = os.path.dirname(__file__)
-
#######################################################################
#
# That part if purely the API acquisition phase from the
# XML API description
#
#######################################################################
+import os
import xmllib
try:
import sgmlop
@@ -450,20 +442,20 @@
global unknown_types
try:
- f = open(os.path.join(srcPref,"libxslt-api.xml"))
+ f = open("libxslt-api.xml")
data = f.read()
(parser, target) = getparser()
parser.feed(data)
parser.close()
except IOError, msg:
try:
- f = open(os.path.join(srcPref,"..","doc","libxslt-api.xml"))
+ f = open("../doc/libxslt-api.xml")
data = f.read()
(parser, target) = getparser()
parser.feed(data)
parser.close()
except IOError, msg:
- print os.path.join(srcPref,"..","doc","libxslt-api.xml"), ":", msg
+ print "../doc/libxslt-api.xml", ":", msg
n = len(functions.keys())
print "Found %d functions in libxslt-api.xml" % (n)
@@ -471,7 +463,7 @@
py_types['pythonObject'] = ('O', "pythonObject", "pythonObject",
"pythonObject", "libxml_")
try:
- f = open(os.path.join(srcPref,"libxslt-python-api.xml"))
+ f = open("libxslt-python-api.xml")
data = f.read()
(parser, target) = getparser()
parser.feed(data)
diff -Nru libxslt-1.1.26/python/tests/Makefile.in libxslt-1.1.26/python/tests/Makefile.in
--- libxslt-1.1.26/python/tests/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/python/tests/Makefile.in 2009-09-24 14:43:14.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -239,7 +237,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -248,9 +246,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign python/tests/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/tests/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign python/tests/Makefile
+ $(AUTOMAKE) --gnu python/tests/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -264,9 +262,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/Makefile.in libxslt-1.1.26/tests/Makefile.in
--- libxslt-1.1.26/tests/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/Makefile.in 2009-09-24 14:43:14.000000000 +0000
@@ -153,7 +153,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -169,7 +168,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -268,7 +266,7 @@
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -277,9 +275,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/Makefile
+ $(AUTOMAKE) --gnu tests/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -293,9 +291,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/REC/Makefile.in libxslt-1.1.26/tests/REC/Makefile.in
--- libxslt-1.1.26/tests/REC/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/REC/Makefile.in 2009-09-24 14:43:14.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -299,7 +297,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -308,9 +306,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/REC/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/REC/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/REC/Makefile
+ $(AUTOMAKE) --gnu tests/REC/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -324,9 +322,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/REC1/Makefile.in libxslt-1.1.26/tests/REC1/Makefile.in
--- libxslt-1.1.26/tests/REC1/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/REC1/Makefile.in 2009-09-24 14:43:14.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -225,7 +223,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -234,9 +232,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/REC1/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/REC1/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/REC1/Makefile
+ $(AUTOMAKE) --gnu tests/REC1/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -250,9 +248,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/REC2/Makefile.in libxslt-1.1.26/tests/REC2/Makefile.in
--- libxslt-1.1.26/tests/REC2/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/REC2/Makefile.in 2009-09-24 14:43:14.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -225,7 +223,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -234,9 +232,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/REC2/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/REC2/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/REC2/Makefile
+ $(AUTOMAKE) --gnu tests/REC2/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -250,9 +248,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/XSLTMark/Makefile.in libxslt-1.1.26/tests/XSLTMark/Makefile.in
--- libxslt-1.1.26/tests/XSLTMark/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/XSLTMark/Makefile.in 2009-09-24 14:43:14.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -276,7 +274,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -285,9 +283,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/XSLTMark/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/XSLTMark/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/XSLTMark/Makefile
+ $(AUTOMAKE) --gnu tests/XSLTMark/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -301,9 +299,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/docbook/Makefile.in libxslt-1.1.26/tests/docbook/Makefile.in
--- libxslt-1.1.26/tests/docbook/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/docbook/Makefile.in 2009-09-24 14:43:15.000000000 +0000
@@ -114,7 +114,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -130,7 +129,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -226,7 +224,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -235,9 +233,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/docbook/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/docbook/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/docbook/Makefile
+ $(AUTOMAKE) --gnu tests/docbook/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -251,9 +249,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/docs/Makefile.am libxslt-1.1.26/tests/docs/Makefile.am
--- libxslt-1.1.26/tests/docs/Makefile.am 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/docs/Makefile.am 2009-09-17 08:51:07.000000000 +0000
@@ -168,7 +168,6 @@
bug-167.xml \
bug-168.xml \
bug-169.xml \
- bug-180.xml \
character.xml \
array.xml \
items.xml
diff -Nru libxslt-1.1.26/tests/docs/Makefile.in libxslt-1.1.26/tests/docs/Makefile.in
--- libxslt-1.1.26/tests/docs/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/docs/Makefile.in 2009-09-24 14:43:15.000000000 +0000
@@ -117,7 +117,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -133,7 +132,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -389,7 +387,6 @@
bug-167.xml \
bug-168.xml \
bug-169.xml \
- bug-180.xml \
character.xml \
array.xml \
items.xml
@@ -397,7 +394,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -406,9 +403,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/docs/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/docs/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/docs/Makefile
+ $(AUTOMAKE) --gnu tests/docs/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -422,9 +419,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/docs/bug-180.xml libxslt-1.1.26/tests/docs/bug-180.xml
--- libxslt-1.1.26/tests/docs/bug-180.xml 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/docs/bug-180.xml 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-
-
-
-
-
-
-
diff -Nru libxslt-1.1.26/tests/keys/Makefile.in libxslt-1.1.26/tests/keys/Makefile.in
--- libxslt-1.1.26/tests/keys/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/keys/Makefile.in 2009-09-24 14:43:15.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -225,7 +223,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -234,9 +232,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/keys/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/keys/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/keys/Makefile
+ $(AUTOMAKE) --gnu tests/keys/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -250,9 +248,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/multiple/Makefile.in libxslt-1.1.26/tests/multiple/Makefile.in
--- libxslt-1.1.26/tests/multiple/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/multiple/Makefile.in 2009-09-24 14:43:15.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -248,7 +246,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -257,9 +255,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/multiple/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/multiple/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/multiple/Makefile
+ $(AUTOMAKE) --gnu tests/multiple/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -273,9 +271,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/namespaces/Makefile.in libxslt-1.1.26/tests/namespaces/Makefile.in
--- libxslt-1.1.26/tests/namespaces/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/namespaces/Makefile.in 2009-09-24 14:43:15.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -237,7 +235,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -246,9 +244,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/namespaces/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/namespaces/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/namespaces/Makefile
+ $(AUTOMAKE) --gnu tests/namespaces/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -262,9 +260,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/numbers/Makefile.in libxslt-1.1.26/tests/numbers/Makefile.in
--- libxslt-1.1.26/tests/numbers/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/numbers/Makefile.in 2009-09-24 14:43:16.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -225,7 +223,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -234,9 +232,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/numbers/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/numbers/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/numbers/Makefile
+ $(AUTOMAKE) --gnu tests/numbers/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -250,9 +248,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/plugins/Makefile.in libxslt-1.1.26/tests/plugins/Makefile.in
--- libxslt-1.1.26/tests/plugins/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/plugins/Makefile.in 2009-09-24 14:43:16.000000000 +0000
@@ -139,7 +139,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -155,7 +154,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -262,7 +260,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -271,9 +269,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/plugins/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/plugins/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/plugins/Makefile
+ $(AUTOMAKE) --gnu tests/plugins/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -287,9 +285,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
xmlsoft_org_xslt_testplugin.la: $(xmlsoft_org_xslt_testplugin_la_OBJECTS) $(xmlsoft_org_xslt_testplugin_la_DEPENDENCIES)
diff -Nru libxslt-1.1.26/tests/reports/Makefile.in libxslt-1.1.26/tests/reports/Makefile.in
--- libxslt-1.1.26/tests/reports/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/reports/Makefile.in 2009-09-24 14:43:16.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -232,7 +230,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -241,9 +239,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/reports/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/reports/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/reports/Makefile
+ $(AUTOMAKE) --gnu tests/reports/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -257,9 +255,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/xinclude/Makefile.in libxslt-1.1.26/tests/xinclude/Makefile.in
--- libxslt-1.1.26/tests/xinclude/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/xinclude/Makefile.in 2009-09-24 14:43:16.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -232,7 +230,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -241,9 +239,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/xinclude/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/xinclude/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/xinclude/Makefile
+ $(AUTOMAKE) --gnu tests/xinclude/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -257,9 +255,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/tests/xmlspec/Makefile.in libxslt-1.1.26/tests/xmlspec/Makefile.in
--- libxslt-1.1.26/tests/xmlspec/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/tests/xmlspec/Makefile.in 2009-09-24 14:43:16.000000000 +0000
@@ -113,7 +113,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -129,7 +128,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -228,7 +226,7 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -237,9 +235,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/xmlspec/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/xmlspec/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/xmlspec/Makefile
+ $(AUTOMAKE) --gnu tests/xmlspec/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -253,9 +251,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
diff -Nru libxslt-1.1.26/xslt-config.in libxslt-1.1.26/xslt-config.in
--- libxslt-1.1.26/xslt-config.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/xslt-config.in 2009-05-12 06:29:46.000000000 +0000
@@ -4,6 +4,7 @@
exec_prefix=@exec_prefix@
exec_prefix_set=no
includedir=@includedir@
+libdir=@libdir@
usage()
{
@@ -15,7 +16,6 @@
--prefix=DIR change XSLT prefix [default $prefix]
--exec-prefix=DIR change XSLT executable prefix [default $exec_prefix]
--libs print library linking information
- add --static to print static library linking information
--cflags print pre-processor and compiler flags
--plugins print plugin directory
--help display this help and exit
@@ -31,7 +31,6 @@
cflags=false
libs=false
-static=false
while test $# -gt 0; do
case "$1" in
@@ -80,11 +79,6 @@
--libs)
libs=true
- if [ "$2" = "--static" ]
- then
- shift
- static=true
- fi
;;
*)
@@ -95,7 +89,7 @@
shift
done
-the_libs="@XSLT_LIBS@"
+the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
if test "$includedir" != "/usr/include"; then
the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
else
@@ -106,10 +100,6 @@
all_flags="$the_flags"
fi
-if $static; then
- the_libs="$the_libs @M_LIBS@ `@XML_CONFIG@ --libs --static`"
-fi
-
if $libs; then
all_flags="$all_flags $services $the_libs"
fi
diff -Nru libxslt-1.1.26/xsltproc/Makefile.in libxslt-1.1.26/xsltproc/Makefile.in
--- libxslt-1.1.26/xsltproc/Makefile.in 2013-12-29 18:34:15.000000000 +0000
+++ libxslt-1.1.26/xsltproc/Makefile.in 2009-09-24 14:43:16.000000000 +0000
@@ -147,7 +147,6 @@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MV = @MV@
@@ -163,7 +162,6 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
@@ -280,7 +278,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -289,9 +287,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xsltproc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xsltproc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign xsltproc/Makefile
+ $(AUTOMAKE) --gnu xsltproc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -305,9 +303,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)