diff options
| -rw-r--r-- | patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch (renamed from patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-libxml-debug.diff) | 29 | ||||
| -rw-r--r-- | patches/xmlstarlet-1.0.1/0002-xmlstarlet-fix-semicolon-in-wrong-place.patch (renamed from patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-missing-semicolon.diff) | 18 | ||||
| -rw-r--r-- | patches/xmlstarlet-1.0.1/0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch (renamed from patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-validation.diff) | 20 | ||||
| -rw-r--r-- | patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch (renamed from patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-fix-linking.diff) | 11 | ||||
| -rw-r--r-- | patches/xmlstarlet-1.0.1/series | 11 |
5 files changed, 44 insertions, 45 deletions
diff --git a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-libxml-debug.diff b/patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch index d073f4f04..81c108f17 100644 --- a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-libxml-debug.diff +++ b/patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch @@ -1,5 +1,7 @@ -Subject: xmlstarlet: use debug functions only if libxml2 has debug support From: Robert Schwebel <r.schwebel@pengutronix.de> +Date: Sun, 29 Nov 2009 00:00:00 +0100 +Subject: [PATCH] xmlstarlet: use debug functions only if libxml2 has debug + support We use xmlXPathDebugDumpCompExpr without testing if libxml2 has support for it enabled. This can result in the following linker error: @@ -9,19 +11,16 @@ xmlstarlet-1.0.1/src/xml_edit.c:327: undefined reference to `xmlXPathDebugDumpCompExpr' Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - +Applied-Upstream: 1.0.2, commit:1cb3f329c92ee9aa9e1dc15c1f1e46a9fc31d4b8 --- -#20091129: rsc: submitted to upstream: -# https://sourceforge.net/tracker/?func=detail&aid=2905668&group_id=66612&atid=515108 - - src/xml_edit.c | 18 ++++++++++++------ + src/xml_edit.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -Index: xmlstarlet-1.0.1/src/xml_edit.c -=================================================================== ---- xmlstarlet-1.0.1.orig/src/xml_edit.c -+++ xmlstarlet-1.0.1/src/xml_edit.c -@@ -323,9 +323,10 @@ edUpdate(xmlDocPtr doc, const char *loc, +diff --git a/src/xml_edit.c b/src/xml_edit.c +index 8e195304302a..42391a9bd569 100644 +--- a/src/xml_edit.c ++++ b/src/xml_edit.c +@@ -323,9 +323,10 @@ edUpdate(xmlDocPtr doc, const char *loc, const char *val, XmlNodeType type) comp = xmlXPathCompile(BAD_CAST loc); if (comp != NULL) { @@ -33,7 +32,7 @@ Index: xmlstarlet-1.0.1/src/xml_edit.c res = xmlXPathCompiledEval(comp, ctxt); xmlXPathFreeCompExpr(comp); } -@@ -406,9 +407,10 @@ edInsert(xmlDocPtr doc, const char *loc, +@@ -406,9 +407,10 @@ edInsert(xmlDocPtr doc, const char *loc, const char *val, const char *name, comp = xmlXPathCompile(BAD_CAST loc); if (comp != NULL) { @@ -45,7 +44,7 @@ Index: xmlstarlet-1.0.1/src/xml_edit.c res = xmlXPathCompiledEval(comp, ctxt); xmlXPathFreeCompExpr(comp); } -@@ -508,9 +510,10 @@ edRename(xmlDocPtr doc, char *loc, char +@@ -508,9 +510,10 @@ edRename(xmlDocPtr doc, char *loc, char *val, XmlNodeType type) comp = xmlXPathCompile(BAD_CAST loc); if (comp != NULL) { @@ -69,7 +68,7 @@ Index: xmlstarlet-1.0.1/src/xml_edit.c res = xmlXPathCompiledEval(comp, ctxt); xmlXPathFreeCompExpr(comp); } -@@ -691,9 +695,10 @@ edMove(xmlDocPtr doc, char *from, char * +@@ -691,9 +695,10 @@ edMove(xmlDocPtr doc, char *from, char *to) comp = xmlXPathCompile(BAD_CAST from); if (comp != NULL) { @@ -81,7 +80,7 @@ Index: xmlstarlet-1.0.1/src/xml_edit.c res = xmlXPathCompiledEval(comp, ctxt); xmlXPathFreeCompExpr(comp); } -@@ -738,9 +743,10 @@ edMove(xmlDocPtr doc, char *from, char * +@@ -738,9 +743,10 @@ edMove(xmlDocPtr doc, char *from, char *to) comp = xmlXPathCompile(BAD_CAST to); if (comp != NULL) { diff --git a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-missing-semicolon.diff b/patches/xmlstarlet-1.0.1/0002-xmlstarlet-fix-semicolon-in-wrong-place.patch index 74702863e..ef72a286a 100644 --- a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-missing-semicolon.diff +++ b/patches/xmlstarlet-1.0.1/0002-xmlstarlet-fix-semicolon-in-wrong-place.patch @@ -1,5 +1,6 @@ -Subject: xmlstarlet: fix semicolon in wrong place From: Robert Schwebel <r.schwebel@pengutronix.de> +Date: Sun, 29 Nov 2009 00:00:00 +0100 +Subject: [PATCH] xmlstarlet: fix semicolon in wrong place We define a semicolon in the wrong place: @@ -9,18 +10,15 @@ This does not fail only by accident, if the right defines have been set in libxml2. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - +Applied-Upstream: 1.0.2, commit:5cfe8480b3029311a3bcaf0471c023d5175fa58d --- -#20091129: rsc: submitted to upstream: -# https://sourceforge.net/tracker/?func=detail&aid=2905712&group_id=66612&atid=515108 - - src/xml_trans.c | 3 ++- + src/xml_trans.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: xmlstarlet-1.0.1/src/xml_trans.c -=================================================================== ---- xmlstarlet-1.0.1.orig/src/xml_trans.c -+++ xmlstarlet-1.0.1/src/xml_trans.c +diff --git a/src/xml_trans.c b/src/xml_trans.c +index 38ddcf84b5cd..c967f0b19762 100644 +--- a/src/xml_trans.c ++++ b/src/xml_trans.c @@ -75,8 +75,9 @@ static const char trans_usage_str_3[] = #ifdef LIBXML_CATALOG_ENABLED " --catalogs - use SGML catalogs from $SGML_CATALOG_FILES\n" diff --git a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-validation.diff b/patches/xmlstarlet-1.0.1/0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch index 1e5813f22..d61682c5e 100644 --- a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-validation.diff +++ b/patches/xmlstarlet-1.0.1/0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch @@ -1,5 +1,6 @@ -Subject: xmlstarlet: bail out if no dtd parsing support in libxml2 From: Robert Schwebel <r.schwebel@pengutronix.de> +Date: Sun, 29 Nov 2009 00:00:00 +0100 +Subject: [PATCH] xmlstarlet: bail out if no dtd parsing support in libxml2 We use xmlParseDTD without testing if libxml2 has support for it enabled. This can result in the following linker error: @@ -9,19 +10,16 @@ xmlstarlet-1.0.1/src/xml_validate.c:229: undefined reference to `xmlParseDTD' Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> - +Applied-Upstream: 1.0.2, commit:5f2a71f57c1500b98ee2d1f9f6757854349e0072 --- -#20091129: rsc: submitted to upstream: -# https://sourceforge.net/tracker/?func=detail&aid=2905714&group_id=66612&atid=515108 - - src/xml_validate.c | 5 +++++ + src/xml_validate.c | 5 +++++ 1 file changed, 5 insertions(+) -Index: xmlstarlet-1.0.1/src/xml_validate.c -=================================================================== ---- xmlstarlet-1.0.1.orig/src/xml_validate.c -+++ xmlstarlet-1.0.1/src/xml_validate.c -@@ -226,6 +226,11 @@ valAgainstDtd(valOptionsPtr ops, char* d +diff --git a/src/xml_validate.c b/src/xml_validate.c +index 911bb16d1d5f..a7f55b8da864 100644 +--- a/src/xml_validate.c ++++ b/src/xml_validate.c +@@ -226,6 +226,11 @@ valAgainstDtd(valOptionsPtr ops, char* dtdvalid, xmlDocPtr doc, char* filename) { xmlDtdPtr dtd; diff --git a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-fix-linking.diff b/patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch index b8e89a0fc..90aa47567 100644 --- a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-fix-linking.diff +++ b/patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch @@ -1,5 +1,6 @@ -Subject: xmlstarlet: fix linking From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Mon, 11 Jan 2010 16:03:22 +0100 +Subject: [PATCH] xmlstarlet: fix linking xmlstarlet links libexslt statically. The configure script does not check for the dependencies. This fails if libexslt links agains libgcrypt. @@ -11,13 +12,13 @@ For ptxdist this is ok. We install the libs already. Not for upstream. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> - +Forwarded: not-needed --- - configure.in | 16 ++++++++-------- + configure.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -Index: b/configure.in -=================================================================== +diff --git a/configure.in b/configure.in +index 856a451cac7f..713d2b34dd32 100644 --- a/configure.in +++ b/configure.in @@ -31,7 +31,7 @@ AC_ARG_WITH(libxml-prefix, diff --git a/patches/xmlstarlet-1.0.1/series b/patches/xmlstarlet-1.0.1/series index 7e4590629..c6360809b 100644 --- a/patches/xmlstarlet-1.0.1/series +++ b/patches/xmlstarlet-1.0.1/series @@ -1,4 +1,7 @@ -xmlstarlet-1.0.1-test-libxml-debug.diff -xmlstarlet-1.0.1-missing-semicolon.diff -xmlstarlet-1.0.1-test-validation.diff -xmlstarlet-1.0.1-fix-linking.diff +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch +0002-xmlstarlet-fix-semicolon-in-wrong-place.patch +0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch +0004-xmlstarlet-fix-linking.patch +# 5ce4c70ec2f7f73bf4105b9adcc9682e - git-ptx-patches magic |