diff options
author | 2009-05-08 19:54:25 +0000 | |
---|---|---|
committer | 2009-05-08 19:54:25 +0000 | |
commit | 1e16c405e034feadfe5a84ee0c69121c9bfbd7fe (patch) | |
tree | 2e7c7ac9a3d846f43df483809930a597648a3776 /dev-libs | |
parent | Add elibtoolize to make cracklib cross-compile (has old libtool version). (diff) | |
download | embedded-cross-1e16c405e034feadfe5a84ee0c69121c9bfbd7fe.tar.gz embedded-cross-1e16c405e034feadfe5a84ee0c69121c9bfbd7fe.tar.bz2 embedded-cross-1e16c405e034feadfe5a84ee0c69121c9bfbd7fe.zip |
Bumping version and fixing ticket #157. Deleting old versions...
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/libxml2/Manifest | 9 | ||||
-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.3-cross-python-configure.patch | 67 | ||||
-rw-r--r-- | dev-libs/libxml2/files/libxml2-2.7.3-cross-python.patch | 12 | ||||
-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.ebuild | 127 | ||||
-rw-r--r-- | dev-libs/libxml2/libxml2-2.7.3-r1.ebuild (renamed from dev-libs/libxml2/libxml2-2.7.2-r1.ebuild) | 43 |
7 files changed, 520 insertions, 247 deletions
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index bd83a8d..02983c0 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,6 +1,7 @@ -AUX libxml2-2.7.2-CVE-2008-422x.patch 2983 RMD160 7453758b6b37d9f892d495fe9671551cdcc0cc3e SHA1 d8e6e917b8012f770d5f5a9e28a0651c45ad025f SHA256 5f836f30669410d496dc8ceee60307724b2a536a99ed710e94a3c5562634f8b6 -DIST libxml2-2.7.2.tar.gz 4790639 RMD160 2b14531007a705679c7814618dc15baed62bc574 SHA1 750b2bcd4ee3bf8595baf97e1881f1a57b1ef363 SHA256 c01bd621f771cdee349877f55cc841a1bdfb206b2cf5c9aa62aa6a9680e61980 +AUX libxml2-2.7.3-cross-python-configure.patch 2666 RMD160 b73cd082fc2778781a4d775cb43e4dcb2d0a6272 SHA1 8c913cd66e80cdc15624c8d85007aaf72715862b SHA256 40a8f4e18b3607ca866b8cc15c7f5ea3073cc5a390c39bd9c59aa936c05e7cbe +AUX libxml2-2.7.3-cross-python.patch 296 RMD160 432d71ed54950b2159f878ab4a858fd777a3370f SHA1 1ae84bfc6622fb20754d4c8f0f59e7b8740d9a8f SHA256 9d9f9966807e6cc92474afcc24f3a4a9eabdb5fb844047749042368c4e7e69c8 +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 3710 RMD160 c83dcd37cbb284cf05c4a40a7d8992aa7689a805 SHA1 188f41a1c3276403bba8e805e77540264ce1e46f SHA256 cbace02d704c4f3f1a91cc0044b5d75a274f6f9122330fd26851066178551014 -EBUILD libxml2-2.7.2.ebuild 3628 RMD160 5e97d8e50c2887fb0e8c0632c05df9a7e70560e7 SHA1 22e8f4e2fcd1edd44d6b6d908133092da19e447c SHA256 07de8e4a5da5ad578c5662d17914e8f8401c064711ce1f3115d12886856fc539 +EBUILD libxml2-2.7.3-r1.ebuild 4121 RMD160 6be47217f23f236481e108b6208149168039a915 SHA1 bf52caff556cd9806643a0967b861477cbeb0763 SHA256 f0b0f1cfd98da62b86cd174bf1d4dd62a22d497df59e9dae0555c8eb75f92dae 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 cbfbc9e..0000000 --- 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.3-cross-python-configure.patch b/dev-libs/libxml2/files/libxml2-2.7.3-cross-python-configure.patch new file mode 100644 index 0000000..aa3ac83 --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.7.3-cross-python-configure.patch @@ -0,0 +1,67 @@ +--- configure.in 2009-01-18 21:31:09.000000000 +0000 ++++ configure.in.new 2009-05-08 07:46:19.000000000 +0000 +@@ -692,42 +692,43 @@ + fi + if test "$PYTHON" != "" + then +- PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` ++ PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_version()"` + echo Found Python version $PYTHON_VERSION + fi + if test "$PYTHON_VERSION" != "" + then +- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ +- -d $with_python/lib/python$PYTHON_VERSION/site-packages ++ PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"` ++ PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` ++ if test ! -r $PYTHON_INCLUDES/Python.h + then +- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages +- else +- if test -r $prefix/include/python$PYTHON_VERSION/Python.h ++ if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a + then +- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages ++ PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION + else +- if test -r /usr/include/python$PYTHON_VERSION/Python.h ++ if test -r $prefix/include/python$PYTHON_VERSION/Python.h + then +- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages ++ PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION + else +- echo could not find python$PYTHON_VERSION/Python.h ++ if test -r /usr/include/python$PYTHON_VERSION/Python.h ++ then ++ PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION ++ else ++ echo could not find python$PYTHON_VERSION/Python.h ++ fi + fi + fi +- if test ! -d "$PYTHON_SITE_PACKAGES" ++ fi ++ if test ! -d $PYTHON_SITE_PACKAGES ++ then ++ if test -d $with_python/lib/python$PYTHON_VERSION/site-packages + then +- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` ++ PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages ++ else ++ PYTHON_SITE_PACKAGES='$(libdir)/python$PYTHON_VERSION/site-packages' + fi + fi + fi +- if test "$with_python" != "" +- then +- pythondir='$(PYTHON_SITE_PACKAGES)' +- else +- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' +- fi ++ pythondir='$(PYTHON_SITE_PACKAGES)' + else + PYTHON= + fi diff --git a/dev-libs/libxml2/files/libxml2-2.7.3-cross-python.patch b/dev-libs/libxml2/files/libxml2-2.7.3-cross-python.patch new file mode 100644 index 0000000..b5fe04e --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.7.3-cross-python.patch @@ -0,0 +1,12 @@ +--- python/setup.py.in 2007-01-03 13:07:43.000000000 +0000 ++++ python/setup.py.in.new 2009-05-08 06:53:16.000000000 +0000 +@@ -56,9 +56,6 @@ + # - iconv.h + # - libxslt/xsltconfig.h + includes_dir = [ +-"/usr/include", +-"/usr/local/include", +-"/opt/include", + os.path.join(ROOT,'include'), + HOME + ]; 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 0000000..2211a70 --- /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.ebuild b/dev-libs/libxml2/libxml2-2.7.2.ebuild deleted file mode 100644 index 6ec9aa8..0000000 --- a/dev-libs/libxml2/libxml2-2.7.2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2008 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.ebuild,v 1.7 2008/10/05 17:35:59 jer Exp $ - -inherit libtool flag-o-matic eutils - -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="bootstrap build 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}" - - 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 readline) \ - $(use_with readline history) \ - $(use_enable ipv6) \ - $(use_enable python)" - - if use python; then - myconf="$myconf \ - --with-python=${SYSROOT}/usr" - fi - - - # 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() { - # 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 -} diff --git a/dev-libs/libxml2/libxml2-2.7.2-r1.ebuild b/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild index 7d396b5..86e954f 100644 --- a/dev-libs/libxml2/libxml2-2.7.2-r1.ebuild +++ b/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2008 Gentoo Foundation +# 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.7 2008/11/24 17:02:41 ranger 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 +inherit libtool flag-o-matic eutils python autotools 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="bootstrap build debug doc examples ipv6 python readline test" +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" @@ -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,13 @@ src_unpack() { || die "Failed to install test tarballs" fi + # Fix macro conflict with wxGTK, bug #266653 + epatch "${FILESDIR}/${P}-printf-rename.patch" + # Enable cross-compilation with +python + epatch "${FILESDIR}/${P}-cross-python.patch" + epatch "${FILESDIR}/${P}-cross-python-configure.patch" + + eautoreconf epunt_cxx } @@ -59,15 +65,11 @@ src_compile() { local myconf="--with-zlib \ $(use_with debug run-debug) \ + $(use_with python) \ $(use_with readline) \ $(use_with readline history) \ $(use_enable ipv6)" - if use python; then - myconf="$myconf \ - --with-python=${SYSROOT}/usr" - fi - # Please do not remove, as else we get references to PORTAGE_TMPDIR # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. elibtoolize @@ -75,7 +77,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. @@ -93,7 +95,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 @@ -107,9 +109,14 @@ src_install() { } pkg_postinst() { + if use python; then + python_need_rebuild + 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 @@ -126,3 +133,7 @@ pkg_postinst() { fi fi } + +pkg_postrm() { + python_mod_cleanup /usr/$(get_libdir)/python*/site-packages +} |