[Erp5-report] r29339 - in /experimental/erp5.buildout-zope-2.12/trunk: ./ patches/

[nobody at svn.erp5.org]

Author: leonardo
Date: Thu Oct  1 00:03:00 2009
New Revision: 29339

URL: http://svn.erp5.org?rev=29339&view=rev
Log:
bring itools into submission, making this buildout repeatable without manual package installation


Added:
    experimental/erp5.buildout-zope-2.12/trunk/patches/
    experimental/erp5.buildout-zope-2.12/trunk/patches/PyErr_Format-to-PyErr_SetString.patch
Removed:
    experimental/erp5.buildout-zope-2.12/trunk/itools-PyErr_Format_security_vulnerability.patch
Modified:
    experimental/erp5.buildout-zope-2.12/trunk/   (props changed)
    experimental/erp5.buildout-zope-2.12/trunk/base.cfg

Propchange: experimental/erp5.buildout-zope-2.12/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Oct  1 00:03:00 2009
@@ -12,3 +12,4 @@
 .Python
 lib
 local.cfg
+*~

Modified: experimental/erp5.buildout-zope-2.12/trunk/base.cfg
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/base.cfg?rev=29339&r1=29338&r2=29339&view=diff
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/base.cfg [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/base.cfg [utf8] Thu Oct  1 00:03:00 2009
@@ -66,8 +66,13 @@
     mechanize
     ClientForm
     timerserver
+    numpy
+    ipython
+# manually built for the time being:
 #    itools
-    numpy
+
+# and here is the manual build of itools
+extra-paths = ${itools-build:lib}
 
 interpreter = zopepy
 
@@ -76,6 +81,8 @@
 urls =
     http://www.zope.org/Members/NIP/ZMailIn/1.0.1/ZMailIn-1-0-1.tgz
     http://www.zope.org/Members/NIP/ZMailIn/1.0.0/CMFMailIn-1.0.0
+# Localizer is currently on src/Products/Localizer until hforge incorporates
+# the changes we requested
 #    http://download.ikaaro.org/localizer/Localizer-1.2.3.tar.gz
 #version-suffix-packages =
 #    Localizer-1.2.3.tar.gz
@@ -115,6 +122,7 @@
 [instance]
 recipe = plone.recipe.zope2instance
 eggs = ${zope2:eggs}
+extra-paths = ${zope2:extra-paths}
 user = zope:zope
 debug-mode = on
 verbose-security = on
@@ -130,24 +138,33 @@
     interval 5
   </timer-server>
 
-[instancepy]
-recipe = zc.recipe.egg
-eggs = ${instance:eggs}
-interpreter = instancepy
-scripts = instancepy
-
-# itools installation by setuptools is not working for some strange reason
-# Install manually with "python setup.py install" for now, after applying
-# the patch at itools-PyErr_Format_security_vulnerability.patch if it has not
-# been included already
-#[itools]
-## use a custom build for itools, to add lib64 to the include path
-#recipe = zc.recipe.egg:custom
-#egg = itools
-#include-dirs = /usr/include/glib-2.0:/usr/lib/glib-2.0/include/:/usr/lib64/glib-2.0/include/
-
 [omelette]
 recipe = collective.recipe.omelette
 eggs = ${instance:eggs}
+packages =
+    ${itools-build:lib} . 
 products = ${instance:products}
 ignore-develop = True
+
+# ugly itools building section until itools and setuptools learn to get
+# along
+[itools]
+recipe = hexagonit.recipe.download
+url = http://download.hforge.org/itools/0.50/itools-0.50.7.tar.gz
+
+[itools-build]
+recipe = collective.recipe.cmd
+lib = ${itools:location}/lib
+on_install = True
+on_update = false
+
+cmds =
+    cd ${itools:location}/itools-0.50.7
+    patch -N -p1 < ${buildout:directory}/patches/PyErr_Format-to-PyErr_SetString.patch
+    env CFLAGS="$(pkg-config glib-2.0 --cflags-only-I)" ${buildout:executable} setup.py install --install-lib=${:lib} --install-scripts=${itools:location}/bin
+
+uninstall_cmds =
+    cd ${itools:location}/itools-0.50.7
+    ${buildout:executable} setup.py clean
+    patch -R -p1 < ${buildout:directory}/patches/PyErr_Format-to-PyErr_SetString.patch
+    rm -rf ${itools:location}/{lib,bin}

Removed: experimental/erp5.buildout-zope-2.12/trunk/itools-PyErr_Format_security_vulnerability.patch
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/itools-PyErr_Format_security_vulnerability.patch?rev=29338&view=auto
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/itools-PyErr_Format_security_vulnerability.patch [utf8] (original)
+++ experimental/erp5.buildout-zope-2.12/trunk/itools-PyErr_Format_security_vulnerability.patch (removed)
@@ -1,11 +1,0 @@
---- ../itools-0.60.4.orig/xml/pyparser.c	2009-09-08 14:52:29.000000000 +0200
-+++ xml/pyparser.c	2009-09-25 19:46:57.000000000 +0200
-@@ -97,7 +97,7 @@
-   doctype = doctype_new (PubidLiteral, SystemLiteral, intSubset, &error_msg);
-   if (!doctype)
-     {
--      PyErr_Format (XMLError, error_msg);
-+      PyErr_Format (XMLError, "%.400s", error_msg);
-       return -1;
-     }
-   self->doctype = doctype;

Added: experimental/erp5.buildout-zope-2.12/trunk/patches/PyErr_Format-to-PyErr_SetString.patch
URL: http://svn.erp5.org/experimental/erp5.buildout-zope-2.12/trunk/patches/PyErr_Format-to-PyErr_SetString.patch?rev=29339&view=auto
==============================================================================
--- experimental/erp5.buildout-zope-2.12/trunk/patches/PyErr_Format-to-PyErr_SetString.patch (added)
+++ experimental/erp5.buildout-zope-2.12/trunk/patches/PyErr_Format-to-PyErr_SetString.patch [utf8] Thu Oct  1 00:03:00 2009
@@ -1,0 +1,13 @@
+diff --git a/xml/pyparser.c b/xml/pyparser.c
+index 897c34d..6a066ea 100644
+--- a/xml/pyparser.c
++++ b/xml/pyparser.c
+@@ -97,7 +97,7 @@ PyDocType_init (PyDocType * self, PyObject * args, PyObject * kwds)
+   doctype = doctype_new (PubidLiteral, SystemLiteral, intSubset, &error_msg);
+   if (!doctype)
+     {
+-      PyErr_Format (XMLError, error_msg);
++      PyErr_SetString (XMLError, error_msg);
+       return -1;
+     }
+   self->doctype = doctype;