diff options
| -rw-r--r-- | dev-libs/libxml2/ChangeLog | 13 | ||||
| -rw-r--r-- | dev-libs/libxml2/Manifest | 21 | ||||
| -rw-r--r-- | dev-libs/libxml2/files/libxml2-2.7.2-CVE-2008-422x.patch | 100 | ||||
| -rw-r--r-- | dev-libs/libxml2/files/libxml2-2.7.2-old-sax-parser-behaviour-option.patch | 109 | ||||
| -rw-r--r-- | dev-libs/libxml2/files/libxml2-2.7.2-xmlAddChildList-pointer.patch | 50 | ||||
| -rw-r--r-- | dev-libs/libxml2/files/libxml2-2.7.2-xmlTextWriterFullEndElement-indent.patch | 26 | ||||
| -rw-r--r-- | dev-libs/libxml2/files/libxml2-2.7.3-printf-rename.patch | 409 | ||||
| -rw-r--r-- | dev-libs/libxml2/libxml2-2.7.2-r2.ebuild | 141 | ||||
| -rw-r--r-- | dev-libs/libxml2/libxml2-2.7.3-r1.ebuild (renamed from dev-libs/libxml2/libxml2-2.7.2-r1.ebuild) | 21 |
9 files changed, 445 insertions, 445 deletions
diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog index 8c367eafc286..7263bd3e9dd0 100644 --- a/dev-libs/libxml2/ChangeLog +++ b/dev-libs/libxml2/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for dev-libs/libxml2 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.263 2009/04/12 20:35:46 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.264 2009/04/27 21:28:46 eva Exp $ + +*libxml2-2.7.3-r1 (27 Apr 2009) + + 27 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org> + -files/libxml2-2.7.2-CVE-2008-422x.patch, + -files/libxml2-2.7.2-old-sax-parser-behaviour-option.patch, + -files/libxml2-2.7.2-xmlAddChildList-pointer.patch, + -files/libxml2-2.7.2-xmlTextWriterFullEndElement-indent.patch, + +files/libxml2-2.7.3-printf-rename.patch, -libxml2-2.7.2-r1.ebuild, + -libxml2-2.7.2-r2.ebuild, +libxml2-2.7.3-r1.ebuild: + Fix macro conflict with wxGTK, bug #266653 12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> ChangeLog: Stable on sparc, bug #260063 diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index 205e0d861aca..ec7b6fd4eda9 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,13 +1,18 @@ -AUX libxml2-2.7.2-CVE-2008-422x.patch 2983 RMD160 7453758b6b37d9f892d495fe9671551cdcc0cc3e SHA1 d8e6e917b8012f770d5f5a9e28a0651c45ad025f SHA256 5f836f30669410d496dc8ceee60307724b2a536a99ed710e94a3c5562634f8b6 -AUX libxml2-2.7.2-old-sax-parser-behaviour-option.patch 4109 RMD160 0ea5e04ea498561f9cd20d6fb319632a9c609695 SHA1 c0e164de5ef3d01fac1e06193a9566df777af59f SHA256 e4be8adbb81fe71b684c43751b4da2034a8850b4fbad2513db7a1f8732810690 -AUX libxml2-2.7.2-xmlAddChildList-pointer.patch 1523 RMD160 868436455c98d74666e6baf068b7c9d1b01cc16c SHA1 cc365e2e056fe0e07c9f61d8189d5fdcd0cef3df SHA256 131c9f3d5e5f970e14168d0086f31237d5aa166ef3021084457248094e3fc635 -AUX libxml2-2.7.2-xmlTextWriterFullEndElement-indent.patch 925 RMD160 b58a61553e6752ce7e94d40626ab584bdff934df SHA1 eaa3e9bad2d74169a46548e24c4d194d2d334f22 SHA256 d2d37dfb9448817fff4508a82a8cb2ebfb826ea2174982f3cf07725057cb9411 -DIST libxml2-2.7.2.tar.gz 4790639 RMD160 2b14531007a705679c7814618dc15baed62bc574 SHA1 750b2bcd4ee3bf8595baf97e1881f1a57b1ef363 SHA256 c01bd621f771cdee349877f55cc841a1bdfb206b2cf5c9aa62aa6a9680e61980 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX libxml2-2.7.3-printf-rename.patch 17280 RMD160 920065d543127026c526f00856e9a2a8fb41e42d SHA1 9a9515a1ea7c7313aa8e6bb607f987560504aaed SHA256 a7206cbd8a675e2d944f330255d648502d143472a2d96daa4753e422614b8520 DIST libxml2-2.7.3.tar.gz 4789450 RMD160 14018347531fd135366cee9fd9d760a1988546e2 SHA1 fd4e427fb55c977876bc74c0e552ef7d3d794a07 SHA256 432464d8c9bd8060d9c1fdef1cfa75803c1a363ceac20b21f8c7e34e056e5a98 DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1db08 SHA1 ca6344e6c47f8c28231f5b213d0c8deb0311a409 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 DIST xsts-2004-01-14.tar.gz 2761085 RMD160 faff2d7826e47ae9968564bc83dab1b54c5e4bf6 SHA1 5896c2aa2cda464246306c5cf0577ed506eefaab SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17 -EBUILD libxml2-2.7.2-r1.ebuild 3864 RMD160 28dcb3169f2af74898490d57924a2fdd0f5ccdf8 SHA1 77f23c81475395f687dbf8728fbec217f32afd15 SHA256 d68f402f6c1359a2d73d0a97fcbc2761c00992657b34f912cbabb3063512ae57 -EBUILD libxml2-2.7.2-r2.ebuild 4188 RMD160 2145917f7228c04252967c938ee74dbb64a24b96 SHA1 45648517d40e5da39bca6923b2834ce25a883dfa SHA256 ed9be8ca9e192abc8dd52a3375c11b42054fb7bda7619f3aedfb6b0636d65874 +EBUILD libxml2-2.7.3-r1.ebuild 3955 RMD160 b83ea471fd0cfbec34cafc188652fea8cd491803 SHA1 9d901c65c6301d2f6d665e41c50952ef2ff19248 SHA256 01799d800f1a7cc7f86d5bbe6ee5787c164233279fddb934ba2a08915963e429 EBUILD libxml2-2.7.3.ebuild 3899 RMD160 1ee7fc807c673de46c107aca9df437439e9783ad SHA1 07b708b6f3222f7e849195d199a5d6001ea0cbed SHA256 9f53004724783f7e19a37c34fec4513e276b09e002afbbba4c08b09c3f08547d -MISC ChangeLog 34777 RMD160 80f684321e1db0f5da33cd052cf9fd1a8c1a9381 SHA1 01aedb7ccb0db832d1d75ed8c0a52bce88f4015a SHA256 4f6b3c930afe415d1c6b5b77ade4ef153e8e8775076e0b6a5cb072ba12224e9d +MISC ChangeLog 35254 RMD160 5aca14beb5af335780aa62882e94501303c21316 SHA1 ac6acbe23dfb43f1013ec2d7d51c35edd1da47df SHA256 fdf47fbfbd885d92e3dbd03d8983230462ef6d2aab9263b031967191463338d5 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkn2P7cACgkQ1fmVwcYIWAYrnACfRFZK17xTkOXAs9LULE8xH2TL +RaAAoIlJ+nm5y3SC/gdNVXroxYxDWGQk +=t10s +-----END PGP SIGNATURE----- diff --git a/dev-libs/libxml2/files/libxml2-2.7.2-CVE-2008-422x.patch b/dev-libs/libxml2/files/libxml2-2.7.2-CVE-2008-422x.patch deleted file mode 100644 index cbfbc9ea87e3..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.7.2-CVE-2008-422x.patch +++ /dev/null @@ -1,100 +0,0 @@ -Mon Nov 17 16:56:18 CET 2008 Daniel Veillard <daniel@...> (upstream revision 3803) - - * SAX2.c parser.c: fix for CVE-2008-4226, a memory overflow - when building gigantic text nodes, and a bit of cleanup - to better handled out of memory problem in that code. - * tree.c: fix for CVE-2008-4225, lack of testing leads to - a busy loop test assuming one have enough core memory. - -Index: SAX2.c -=================================================================== ---- SAX2.c (revision 3802) -+++ SAX2.c (revision 3803) -@@ -11,6 +11,7 @@ - #include "libxml.h" - #include <stdlib.h> - #include <string.h> -+#include <limits.h> - #include <libxml/xmlmemory.h> - #include <libxml/tree.h> - #include <libxml/parser.h> -@@ -26,6 +27,11 @@ - #include <libxml/HTMLtree.h> - #include <libxml/globals.h> - -+/* Define SIZE_T_MAX unless defined through <limits.h>. */ -+#ifndef SIZE_T_MAX -+# define SIZE_T_MAX ((size_t)-1) -+#endif /* !SIZE_T_MAX */ -+ - /* #define DEBUG_SAX2 */ - /* #define DEBUG_SAX2_TREE */ - -@@ -2455,9 +2461,14 @@ - (xmlDictOwns(ctxt->dict, lastChild->content))) { - lastChild->content = xmlStrdup(lastChild->content); - } -+ if ((size_t)ctxt->nodelen > SIZE_T_MAX - (size_t)len || -+ (size_t)ctxt->nodemem + (size_t)len > SIZE_T_MAX / 2) { -+ xmlSAX2ErrMemory(ctxt, "xmlSAX2Characters overflow prevented"); -+ return; -+ } - if (ctxt->nodelen + len >= ctxt->nodemem) { - xmlChar *newbuf; -- int size; -+ size_t size; - - size = ctxt->nodemem + len; - size *= 2; -Index: tree.c -=================================================================== ---- tree.c (revision 3802) -+++ tree.c (revision 3803) -@@ -14,7 +14,7 @@ - #include "libxml.h" - - #include <string.h> /* for memset() only ! */ -- -+#include <limits.h> - #ifdef HAVE_CTYPE_H - #include <ctype.h> - #endif -@@ -6996,7 +6996,13 @@ - case XML_BUFFER_ALLOC_DOUBLEIT: - /*take care of empty case*/ - newSize = (buf->size ? buf->size*2 : size + 10); -- while (size > newSize) newSize *= 2; -+ while (size > newSize) { -+ if (newSize > UINT_MAX / 2) { -+ xmlTreeErrMemory("growing buffer"); -+ return 0; -+ } -+ newSize *= 2; -+ } - break; - case XML_BUFFER_ALLOC_EXACT: - newSize = size+10; -Index: parser.c -=================================================================== ---- parser.c (revision 3802) -+++ parser.c (revision 3803) -@@ -4142,6 +4142,9 @@ - line = ctxt->input->line; - col = ctxt->input->col; - } -+ /* something really bad happened in the SAX callback */ -+ if (ctxt->instate != XML_PARSER_CONTENT) -+ return; - } - ctxt->input->cur = in; - if (*in == 0xD) { -@@ -4222,6 +4225,9 @@ - } - } - nbchar = 0; -+ /* something really bad happened in the SAX callback */ -+ if (ctxt->instate != XML_PARSER_CONTENT) -+ return; - } - count++; - if (count > 50) { diff --git a/dev-libs/libxml2/files/libxml2-2.7.2-old-sax-parser-behaviour-option.patch b/dev-libs/libxml2/files/libxml2-2.7.2-old-sax-parser-behaviour-option.patch deleted file mode 100644 index e7f601e3e991..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.7.2-old-sax-parser-behaviour-option.patch +++ /dev/null @@ -1,109 +0,0 @@ -Upstream SVN trunk revision 3807 - -This solves huge PHP problems in combination with a PHP patch using this -new xmlParserOption per gentoo bug #249703: - - -Mon Jan 05 18:28:41 CET 2009 Rob Richards - -* include/libxml/parser.h parser.c: add XML_PARSE_OLDSAX parser - option to enable pre 2.7 SAX behavior. - -diff --git a/include/libxml/parser.h b/include/libxml/parser.h -index 24d5cf9..01de128 100644 ---- a/include/libxml/parser.h -+++ b/include/libxml/parser.h -@@ -1096,7 +1096,8 @@ typedef enum { - crash if you try to modify the tree) */ - XML_PARSE_OLD10 = 1<<17,/* parse using XML-1.0 before update 5 */ - XML_PARSE_NOBASEFIX = 1<<18,/* do not fixup XINCLUDE xml:base uris */ -- XML_PARSE_HUGE = 1<<19 /* relax any hardcoded limit from the parser */ -+ XML_PARSE_HUGE = 1<<19, /* relax any hardcoded limit from the parser */ -+ XML_PARSE_OLDSAX = 1<<20 /* parse using SAX2 interface from before 2.7.0 */ - } xmlParserOption; - - XMLPUBFUN void XMLCALL -diff --git a/parser.c b/parser.c -index c52d360..9db664f 100644 ---- a/parser.c -+++ b/parser.c -@@ -7047,9 +7047,11 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) { - /* - * Predefined entites override any extra definition - */ -- ent = xmlGetPredefinedEntity(name); -- if (ent != NULL) -- return(ent); -+ if ((ctxt->options & XML_PARSE_OLDSAX) == 0) { -+ ent = xmlGetPredefinedEntity(name); -+ if (ent != NULL) -+ return(ent); -+ } - - /* - * Increate the number of entity references parsed -@@ -7063,6 +7065,9 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) { - if (ctxt->sax != NULL) { - if (ctxt->sax->getEntity != NULL) - ent = ctxt->sax->getEntity(ctxt->userData, name); -+ if ((ctxt->wellFormed == 1 ) && (ent == NULL) && -+ (ctxt->options & XML_PARSE_OLDSAX)) -+ ent = xmlGetPredefinedEntity(name); - if ((ctxt->wellFormed == 1 ) && (ent == NULL) && - (ctxt->userData==ctxt)) { - ent = xmlSAX2GetEntity(ctxt, name); -@@ -7135,6 +7140,7 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) { - */ - else if ((ctxt->instate == XML_PARSER_ATTRIBUTE_VALUE) && - (ent != NULL) && (ent->content != NULL) && -+ (ent->etype != XML_INTERNAL_PREDEFINED_ENTITY) && - (xmlStrchr(ent->content, '<'))) { - xmlFatalErrMsgStr(ctxt, XML_ERR_LT_IN_ATTRIBUTE, - "'<' in entity '%s' is not allowed in attributes values\n", name); -@@ -7231,11 +7237,13 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) { - /* - * Predefined entites override any extra definition - */ -- ent = xmlGetPredefinedEntity(name); -- if (ent != NULL) { -- xmlFree(name); -- *str = ptr; -- return(ent); -+ if ((ctxt->options & XML_PARSE_OLDSAX) == 0) { -+ ent = xmlGetPredefinedEntity(name); -+ if (ent != NULL) { -+ xmlFree(name); -+ *str = ptr; -+ return(ent); -+ } - } - - /* -@@ -7250,6 +7258,8 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) { - if (ctxt->sax != NULL) { - if (ctxt->sax->getEntity != NULL) - ent = ctxt->sax->getEntity(ctxt->userData, name); -+ if ((ent == NULL) && (ctxt->options & XML_PARSE_OLDSAX)) -+ ent = xmlGetPredefinedEntity(name); - if ((ent == NULL) && (ctxt->userData==ctxt)) { - ent = xmlSAX2GetEntity(ctxt, name); - } -@@ -7318,6 +7328,7 @@ xmlParseStringEntityRef(xmlParserCtxtPtr ctxt, const xmlChar ** str) { - */ - else if ((ctxt->instate == XML_PARSER_ATTRIBUTE_VALUE) && - (ent != NULL) && (ent->content != NULL) && -+ (ent->etype != XML_INTERNAL_PREDEFINED_ENTITY) && - (xmlStrchr(ent->content, '<'))) { - xmlFatalErrMsgStr(ctxt, XML_ERR_LT_IN_ATTRIBUTE, - "'<' in entity '%s' is not allowed in attributes values\n", -@@ -14211,6 +14222,10 @@ xmlCtxtUseOptionsInternal(xmlParserCtxtPtr ctxt, int options, const char *encodi - ctxt->options |= XML_PARSE_HUGE; - options -= XML_PARSE_HUGE; - } -+ if (options & XML_PARSE_OLDSAX) { -+ ctxt->options |= XML_PARSE_OLDSAX; -+ options -= XML_PARSE_OLDSAX; -+ } - ctxt->linenumbers = 1; - return (options); - } diff --git a/dev-libs/libxml2/files/libxml2-2.7.2-xmlAddChildList-pointer.patch b/dev-libs/libxml2/files/libxml2-2.7.2-xmlAddChildList-pointer.patch deleted file mode 100644 index a7f40d857b97..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.7.2-xmlAddChildList-pointer.patch +++ /dev/null @@ -1,50 +0,0 @@ -Upstream SVN trunk revision 3806 - -Wed Dec 31 23:11:37 CET 2008 Rob Richards - -* tree.c: set doc on last child tree in xmlAddChildList for - bug #546772. Fix problem adding an attribute via with xmlAddChild - reported by Kris Breuker. - -diff --git a/tree.c b/tree.c -index fe89dc4..8e393da 100644 ---- a/tree.c -+++ b/tree.c -@@ -3216,7 +3216,10 @@ xmlAddChildList(xmlNodePtr parent, xmlNodePtr cur) { - cur = cur->next; - } - cur->parent = parent; -- cur->doc = parent->doc; /* the parent may not be linked to a doc ! */ -+ /* the parent may not be linked to a doc ! */ -+ if (cur->doc != parent->doc) { -+ xmlSetTreeDoc(cur, parent->doc); -+ } - parent->last = cur; - - return(cur); -@@ -3309,9 +3312,7 @@ xmlAddChild(xmlNodePtr parent, xmlNodePtr cur) { - if (cur->type == XML_ATTRIBUTE_NODE) { - if (parent->type != XML_ELEMENT_NODE) - return(NULL); -- if (parent->properties == NULL) { -- parent->properties = (xmlAttrPtr) cur; -- } else { -+ if (parent->properties != NULL) { - /* check if an attribute with the same name exists */ - xmlAttrPtr lastattr; - -@@ -3326,8 +3327,13 @@ xmlAddChild(xmlNodePtr parent, xmlNodePtr cur) { - } - if (lastattr == (xmlAttrPtr) cur) - return(cur); -+ -+ } -+ if (parent->properties == NULL) { -+ parent->properties = (xmlAttrPtr) cur; -+ } else { - /* find the end */ -- lastattr = parent->properties; -+ xmlAttrPtr lastattr = parent->properties; - while (lastattr->next != NULL) { - lastattr = lastattr->next; - } diff --git a/dev-libs/libxml2/files/libxml2-2.7.2-xmlTextWriterFullEndElement-indent.patch b/dev-libs/libxml2/files/libxml2-2.7.2-xmlTextWriterFullEndElement-indent.patch deleted file mode 100644 index 0525c86ea7f9..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.7.2-xmlTextWriterFullEndElement-indent.patch +++ /dev/null @@ -1,26 +0,0 @@ -Upstream SVN trunk revision 3805 -Sun Dec 27 14:16:13 CET 2008 Rob Richards - -xmlwriter.c: fix indenting in xmlTextWriterFullEndElement for bug #554353. - -diff --git a/xmlwriter.c b/xmlwriter.c -index 69d4b85..b88de3a 100644 ---- a/xmlwriter.c -+++ b/xmlwriter.c -@@ -1240,8 +1240,16 @@ xmlTextWriterFullEndElement(xmlTextWriterPtr writer) - if (count < 0) - return -1; - sum += count; -+ if (writer->indent) -+ writer->doindent = 0; - /* fallthrough */ - case XML_TEXTWRITER_TEXT: -+ if ((writer->indent) && (writer->doindent)) { -+ count = xmlTextWriterWriteIndent(writer); -+ sum += count; -+ writer->doindent = 1; -+ } else -+ writer->doindent = 1; - count = xmlOutputBufferWriteString(writer->out, "</"); - if (count < 0) - return -1; diff --git a/dev-libs/libxml2/files/libxml2-2.7.3-printf-rename.patch b/dev-libs/libxml2/files/libxml2-2.7.3-printf-rename.patch new file mode 100644 index 000000000000..2211a702d325 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.7.3-printf-rename.patch @@ -0,0 +1,409 @@ +Author: Jose Luis Rivero <yoswink@gentoo.org> +Source: patch extrated from libxml2 svn. Diff between 3826 .. 3827 + +Description: the patch fix the problems between libxml2 and wxGTK +described in http://mail.gnome.org/archives/xml/2009-April/msg00021.html. +It is basically a renaming of the macro function to avoid collisions +with other libraries. + +This patch should only be applied to version 2.7.3 + +Index: include/libxml/parser.h +=================================================================== +--- include/libxml/parser.h (rev: 3826) ++++ include/libxml/parser.h (working copy) +@@ -594,7 +594,7 @@ + * Display and format a warning messages, callback. + */ + typedef void (XMLCDECL *warningSAXFunc) (void *ctx, +- const char *msg, ...) ATTRIBUTE_PRINTF(2,3); ++ const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); + /** + * errorSAXFunc: + * @ctx: an XML parser context +@@ -604,7 +604,7 @@ + * Display and format an error messages, callback. + */ + typedef void (XMLCDECL *errorSAXFunc) (void *ctx, +- const char *msg, ...) ATTRIBUTE_PRINTF(2,3); ++ const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); + /** + * fatalErrorSAXFunc: + * @ctx: an XML parser context +@@ -616,7 +616,7 @@ + * get all the callbacks for errors. + */ + typedef void (XMLCDECL *fatalErrorSAXFunc) (void *ctx, +- const char *msg, ...) ATTRIBUTE_PRINTF(2,3); ++ const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); + /** + * isStandaloneSAXFunc: + * @ctx: the user data (XML parser context) +Index: include/libxml/xmlwriter.h +=================================================================== +--- include/libxml/xmlwriter.h (rev: 3826) ++++ include/libxml/xmlwriter.h (working copy) +@@ -70,12 +70,12 @@ + XMLPUBFUN int XMLCALL + xmlTextWriterWriteFormatComment(xmlTextWriterPtr writer, + const char *format, ...) +- ATTRIBUTE_PRINTF(2,3); ++ LIBXML_ATTR_FORMAT(2,3); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatComment(xmlTextWriterPtr writer, + const char *format, + va_list argptr) +- ATTRIBUTE_PRINTF(2,0); ++ LIBXML_ATTR_FORMAT(2,0); + XMLPUBFUN int XMLCALL xmlTextWriterWriteComment(xmlTextWriterPtr + writer, + const xmlChar * +@@ -105,13 +105,13 @@ + xmlTextWriterWriteFormatElement(xmlTextWriterPtr writer, + const xmlChar * namme, + const char *format, ...) +- ATTRIBUTE_PRINTF(3,4); ++ LIBXML_ATTR_FORMAT(3,4); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatElement(xmlTextWriterPtr writer, + const xmlChar * name, + const char *format, + va_list argptr) +- ATTRIBUTE_PRINTF(3,0); ++ LIBXML_ATTR_FORMAT(3,0); + XMLPUBFUN int XMLCALL xmlTextWriterWriteElement(xmlTextWriterPtr + writer, + const xmlChar * name, +@@ -123,7 +123,7 @@ + const xmlChar * name, + const xmlChar * namespaceURI, + const char *format, ...) +- ATTRIBUTE_PRINTF(5,6); ++ LIBXML_ATTR_FORMAT(5,6); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatElementNS(xmlTextWriterPtr writer, + const xmlChar * prefix, +@@ -131,7 +131,7 @@ + const xmlChar * namespaceURI, + const char *format, + va_list argptr) +- ATTRIBUTE_PRINTF(5,0); ++ LIBXML_ATTR_FORMAT(5,0); + XMLPUBFUN int XMLCALL xmlTextWriterWriteElementNS(xmlTextWriterPtr + writer, + const xmlChar * +@@ -148,11 +148,11 @@ + XMLPUBFUN int XMLCALL + xmlTextWriterWriteFormatRaw(xmlTextWriterPtr writer, + const char *format, ...) +- ATTRIBUTE_PRINTF(2,3); ++ LIBXML_ATTR_FORMAT(2,3); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer, + const char *format, va_list argptr) +- ATTRIBUTE_PRINTF(2,0); ++ LIBXML_ATTR_FORMAT(2,0); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteRawLen(xmlTextWriterPtr writer, + const xmlChar * content, int len); +@@ -163,13 +163,13 @@ + writer, + const char + *format, ...) +- ATTRIBUTE_PRINTF(2,3); ++ LIBXML_ATTR_FORMAT(2,3); + XMLPUBFUN int XMLCALL xmlTextWriterWriteVFormatString(xmlTextWriterPtr + writer, + const char + *format, + va_list argptr) +- ATTRIBUTE_PRINTF(2,0); ++ LIBXML_ATTR_FORMAT(2,0); + XMLPUBFUN int XMLCALL xmlTextWriterWriteString(xmlTextWriterPtr writer, + const xmlChar * + content); +@@ -204,13 +204,13 @@ + xmlTextWriterWriteFormatAttribute(xmlTextWriterPtr writer, + const xmlChar * name, + const char *format, ...) +- ATTRIBUTE_PRINTF(3,4); ++ LIBXML_ATTR_FORMAT(3,4); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatAttribute(xmlTextWriterPtr writer, + const xmlChar * name, + const char *format, + va_list argptr) +- ATTRIBUTE_PRINTF(3,0); ++ LIBXML_ATTR_FORMAT(3,0); + XMLPUBFUN int XMLCALL xmlTextWriterWriteAttribute(xmlTextWriterPtr + writer, + const xmlChar * name, +@@ -222,7 +222,7 @@ + const xmlChar * name, + const xmlChar * namespaceURI, + const char *format, ...) +- ATTRIBUTE_PRINTF(5,6); ++ LIBXML_ATTR_FORMAT(5,6); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatAttributeNS(xmlTextWriterPtr writer, + const xmlChar * prefix, +@@ -230,7 +230,7 @@ + const xmlChar * namespaceURI, + const char *format, + va_list argptr) +- ATTRIBUTE_PRINTF(5,0); ++ LIBXML_ATTR_FORMAT(5,0); + XMLPUBFUN int XMLCALL xmlTextWriterWriteAttributeNS(xmlTextWriterPtr + writer, + const xmlChar * +@@ -257,12 +257,12 @@ + xmlTextWriterWriteFormatPI(xmlTextWriterPtr writer, + const xmlChar * target, + const char *format, ...) +- ATTRIBUTE_PRINTF(3,4); ++ LIBXML_ATTR_FORMAT(3,4); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatPI(xmlTextWriterPtr writer, + const xmlChar * target, + const char *format, va_list argptr) +- ATTRIBUTE_PRINTF(3,0); ++ LIBXML_ATTR_FORMAT(3,0); + XMLPUBFUN int XMLCALL + xmlTextWriterWritePI(xmlTextWriterPtr writer, + const xmlChar * target, +@@ -287,11 +287,11 @@ + XMLPUBFUN int XMLCALL + xmlTextWriterWriteFormatCDATA(xmlTextWriterPtr writer, + const char *format, ...) +- ATTRIBUTE_PRINTF(2,3); ++ LIBXML_ATTR_FORMAT(2,3); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer, + const char *format, va_list argptr) +- ATTRIBUTE_PRINTF(2,0); ++ LIBXML_ATTR_FORMAT(2,0); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteCDATA(xmlTextWriterPtr writer, + const xmlChar * content); +@@ -315,14 +315,14 @@ + const xmlChar * pubid, + const xmlChar * sysid, + const char *format, ...) +- ATTRIBUTE_PRINTF(5,6); ++ LIBXML_ATTR_FORMAT(5,6); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatDTD(xmlTextWriterPtr writer, + const xmlChar * name, + const xmlChar * pubid, + const xmlChar * sysid, + const char *format, va_list argptr) +- ATTRIBUTE_PRINTF(5,0); ++ LIBXML_ATTR_FORMAT(5,0); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteDTD(xmlTextWriterPtr writer, + const xmlChar * name, +@@ -353,13 +353,13 @@ + xmlTextWriterWriteFormatDTDElement(xmlTextWriterPtr writer, + const xmlChar * name, + const char *format, ...) +- ATTRIBUTE_PRINTF(3,4); ++ LIBXML_ATTR_FORMAT(3,4); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatDTDElement(xmlTextWriterPtr writer, + const xmlChar * name, + const char *format, + va_list argptr) +- ATTRIBUTE_PRINTF(3,0); ++ LIBXML_ATTR_FORMAT(3,0); + XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDElement(xmlTextWriterPtr + writer, + const xmlChar * +@@ -383,13 +383,13 @@ + xmlTextWriterWriteFormatDTDAttlist(xmlTextWriterPtr writer, + const xmlChar * name, + const char *format, ...) +- ATTRIBUTE_PRINTF(3,4); ++ LIBXML_ATTR_FORMAT(3,4); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriterPtr writer, + const xmlChar * name, + const char *format, + va_list argptr) +- ATTRIBUTE_PRINTF(3,0); ++ LIBXML_ATTR_FORMAT(3,0); + XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDAttlist(xmlTextWriterPtr + writer, + const xmlChar * +@@ -414,14 +414,14 @@ + int pe, + const xmlChar * name, + const char *format, ...) +- ATTRIBUTE_PRINTF(4,5); ++ LIBXML_ATTR_FORMAT(4,5); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriterPtr writer, + int pe, + const xmlChar * name, + const char *format, + va_list argptr) +- ATTRIBUTE_PRINTF(4,0); ++ LIBXML_ATTR_FORMAT(4,0); + XMLPUBFUN int XMLCALL + xmlTextWriterWriteDTDInternalEntity(xmlTextWriterPtr writer, + int pe, +Index: include/libxml/relaxng.h +=================================================================== +--- include/libxml/relaxng.h (rev: 3826) ++++ include/libxml/relaxng.h (working copy) +@@ -32,7 +32,7 @@ + * + * Signature of an error callback from a Relax-NG validation + */ +-typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3); ++typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); + + /** + * xmlRelaxNGValidityWarningFunc: +@@ -42,7 +42,7 @@ + * + * Signature of a warning callback from a Relax-NG validation + */ +-typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3); ++typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); + + /** + * A schemas validation context +Index: include/libxml/xmlversion.h.in +=================================================================== +--- include/libxml/xmlversion.h.in (rev: 3826) ++++ include/libxml/xmlversion.h.in (working copy) +@@ -414,19 +414,19 @@ + #endif + + /** +- * ATTRIBUTE_PRINTF: ++ * LIBXML_ATTR_FORMAT: + * + * Macro used to indicate to GCC the parameter are printf like + */ + +-#ifndef ATTRIBUTE_PRINTF ++#ifndef LIBXML_ATTR_FORMAT + # if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) +-# define ATTRIBUTE_PRINTF(fmt,args) __attribute__((__format__(__printf__,fmt,args))) ++# define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args))) + # else +-# define ATTRIBUTE_PRINTF(fmt,args) ++# define LIBXML_ATTR_FORMAT(fmt,args) + # endif + #else +-# define ATTRIBUTE_PRINTF(fmt,args) ++# define LIBXML_ATTR_FORMAT(fmt,args) + #endif + + #else /* ! __GNUC__ */ +@@ -443,11 +443,11 @@ + */ + #define ATTRIBUTE_ALLOC_SIZE(x) + /** +- * ATTRIBUTE_PRINTF: ++ * LIBXML_ATTR_FORMAT: + * + * Macro used to indicate to GCC the parameter are printf like + */ +-#define ATTRIBUTE_PRINTF(fmt,args) ++#define LIBXML_ATTR_FORMAT(fmt,args) + #endif /* __GNUC__ */ + + #ifdef __cplusplus + +Index: include/libxml/valid.h +=================================================================== +--- include/libxml/valid.h (rev: 3826) ++++ include/libxml/valid.h (working copy) +@@ -41,7 +41,7 @@ + */ + typedef void (XMLCDECL *xmlValidityErrorFunc) (void *ctx, + const char *msg, +- ...) ATTRIBUTE_PRINTF(2,3); ++ ...) LIBXML_ATTR_FORMAT(2,3); + + /** + * xmlValidityWarningFunc: +@@ -56,7 +56,7 @@ + */ + typedef void (XMLCDECL *xmlValidityWarningFunc) (void *ctx, + const char *msg, +- ...) ATTRIBUTE_PRINTF(2,3); ++ ...) LIBXML_ATTR_FORMAT(2,3); + + #ifdef IN_LIBXML + /** +Index: include/libxml/xmlschemas.h +=================================================================== +--- include/libxml/xmlschemas.h (rev: 3826) ++++ include/libxml/xmlschemas.h (working copy) +@@ -92,7 +92,7 @@ + * + * Signature of an error callback from an XSD validation + */ +-typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3); ++typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); + + /** + * xmlSchemaValidityWarningFunc: +@@ -102,7 +102,7 @@ + * + * Signature of a warning callback from an XSD validation + */ +-typedef void (XMLCDECL *xmlSchemaValidityWarningFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3); ++typedef void (XMLCDECL *xmlSchemaValidityWarningFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); + + /** + * A schemas validation context +Index: include/libxml/xmlerror.h +=================================================================== +--- include/libxml/xmlerror.h (rev: 3826) ++++ include/libxml/xmlerror.h (working copy) +@@ -843,7 +843,7 @@ + */ + typedef void (XMLCDECL *xmlGenericErrorFunc) (void *ctx, + const char *msg, +- ...) ATTRIBUTE_PRINTF(2,3); ++ ...) LIBXML_ATTR_FORMAT(2,3); + /** + * xmlStructuredErrorFunc: + * @userData: user provided data for the error callback +@@ -874,19 +874,19 @@ + XMLPUBFUN void XMLCDECL + xmlParserError (void *ctx, + const char *msg, +- ...) ATTRIBUTE_PRINTF(2,3); ++ ...) LIBXML_ATTR_FORMAT(2,3); + XMLPUBFUN void XMLCDECL + xmlParserWarning (void *ctx, + const char *msg, +- ...) ATTRIBUTE_PRINTF(2,3); ++ ...) LIBXML_ATTR_FORMAT(2,3); + XMLPUBFUN void XMLCDECL + xmlParserValidityError (void *ctx, + const char *msg, +- ...) ATTRIBUTE_PRINTF(2,3); ++ ...) LIBXML_ATTR_FORMAT(2,3); + XMLPUBFUN void XMLCDECL + xmlParserValidityWarning (void *ctx, + const char *msg, +- ...) ATTRIBUTE_PRINTF(2,3); ++ ...) LIBXML_ATTR_FORMAT(2,3); + XMLPUBFUN void XMLCALL + xmlParserPrintFileInfo (xmlParserInputPtr input); + XMLPUBFUN void XMLCALL +@@ -930,7 +930,7 @@ + int int1, + int col, + const char *msg, +- ...) ATTRIBUTE_PRINTF(16,17); ++ ...) LIBXML_ATTR_FORMAT(16,17); + XMLPUBFUN void XMLCALL + __xmlSimpleError (int domain, + int code, diff --git a/dev-libs/libxml2/libxml2-2.7.2-r2.ebuild b/dev-libs/libxml2/libxml2-2.7.2-r2.ebuild deleted file mode 100644 index a1a9d49f3d5d..000000000000 --- a/dev-libs/libxml2/libxml2-2.7.2-r2.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.2-r2.ebuild,v 1.11 2009/03/17 16:14:17 armin76 Exp $ - -inherit libtool flag-o-matic eutils python - -DESCRIPTION="Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="debug doc examples ipv6 python readline test" - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" - -SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )" - -RDEPEND="sys-libs/zlib - python? ( dev-lang/python ) - readline? ( sys-libs/readline )" - -DEPEND="${RDEPEND} - hppa? ( >=sys-devel/binutils-2.15.92.0.2 )" - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" - - # Fix for CVE-2008-4225 and CVE-2008-4226, bug 245960 - epatch "${FILESDIR}/${P}-CVE-2008-422x.patch" - - # Few small patches from SVN (revisions 3805 and 3806) - epatch "${FILESDIR}/${P}-xmlTextWriterFullEndElement-indent.patch" - epatch "${FILESDIR}/${P}-xmlAddChildList-pointer.patch" - - # Fix possibility for PHP's xml_parse_into_struct function, bug 249703 - epatch "${FILESDIR}/${P}-old-sax-parser-behaviour-option.patch" - - if use test; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - fi - - epunt_cxx -} - -src_compile() { - # USE zlib support breaks gnome2 - # (libgnomeprint for instance fails to compile with - # fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002). - - # The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - - # --with-mem-debug causes unusual segmentation faults (bug #105120). - - local myconf="--with-zlib \ - $(use_with debug run-debug) \ - $(use_with python) \ - $(use_with readline) \ - $(use_with readline history) \ - $(use_enable ipv6)" - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - elibtoolize - - # filter seemingly problematic CFLAGS (#26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - econf $myconf || die "Configuration failed" - - # Patching the Makefiles to respect get_libdir - # Fixes BUG #86766, please keep this. - # Danny van Dyk <kugelfang@gentoo.org> 2005/03/26 - for x in $(find "${S}" -name "Makefile") ; do - sed \ - -e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \ - -i ${x} \ - || die "sed failed" - done - - emake || die "Compilation failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation failed" - - dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* - - if ! use doc; then - rm -rf "${D}"/usr/share/gtk-doc - rm -rf "${D}"/usr/share/doc/${P}/html - fi - - if ! use examples; then - rm -rf "${D}/usr/share/doc/${P}/examples" - rm -rf "${D}/usr/share/doc/${PN}-python-${PV}/examples" - fi -} - -pkg_postinst() { - if use python; then - python_version - python_need_rebuild - python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages - fi - - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ "${ROOT}" != "/" ]] - then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # need an XML catalog, so no-one writes to a non-existent one - CATALOG="${ROOT}etc/xml/catalog" - - # we dont want to clobber an existing catalog though, - # only ensure that one is there - # <obz@gentoo.org> - if [ ! -e ${CATALOG} ]; then - [ -d "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml" - /usr/bin/xmlcatalog --create > ${CATALOG} - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/python*/site-packages -} diff --git a/dev-libs/libxml2/libxml2-2.7.2-r1.ebuild b/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild index adaba4851c31..f8411cb38878 100644 --- a/dev-libs/libxml2/libxml2-2.7.2-r1.ebuild +++ b/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.2-r1.ebuild,v 1.11 2009/01/29 21:58:29 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild,v 1.1 2009/04/27 21:28:46 eva Exp $ inherit libtool flag-o-matic eutils python @@ -9,7 +9,7 @@ HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="debug doc examples ipv6 python readline test" XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" @@ -31,12 +31,11 @@ DEPEND="${RDEPEND} hppa? ( >=sys-devel/binutils-2.15.92.0.2 )" src_unpack() { + # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, + # as they are needed as tarballs in ${S}/xstc instead and not unpacked unpack ${P}.tar.gz cd "${S}" - # Fix for CVE-2008-4225 and CVE-2008-4226, bug 245960 - epatch "${FILESDIR}/${P}-CVE-2008-422x.patch" - if use test; then cp "${DISTDIR}/${XSTS_TARBALL_1}" \ "${DISTDIR}/${XSTS_TARBALL_2}" \ @@ -44,6 +43,9 @@ src_unpack() { || die "Failed to install test tarballs" fi + # Fix macro conflict with wxGTK, bug #266653 + epatch "${FILESDIR}/${P}-printf-rename.patch" + epunt_cxx } @@ -71,7 +73,7 @@ src_compile() { # filter seemingly problematic CFLAGS (#26320) filter-flags -fprefetch-loop-arrays -funroll-loops - econf $myconf || die "Configuration failed" + econf $myconf # Patching the Makefiles to respect get_libdir # Fixes BUG #86766, please keep this. @@ -89,7 +91,7 @@ src_compile() { src_install() { emake DESTDIR="${D}" install || die "Installation failed" - dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* + dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed" if ! use doc; then rm -rf "${D}"/usr/share/gtk-doc @@ -104,14 +106,13 @@ src_install() { pkg_postinst() { if use python; then - python_version python_need_rebuild - python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages + python_mod_optimize $(python_get_sitedir) fi # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ "${ROOT}" != "/" ]] + if [ "${ROOT}" != "/" ] then elog "Skipping XML catalog creation for stage building (bug #208887)." else |