Merge branch 'upstream_master'

Conflicts: software/erp5/software.cfg Resolved by accepting upstream version.

Merge branch 'upstream_master'
Conflicts: software/erp5/software.cfg Resolved by accepting upstream version.
99f192e8 · Romain Courteaud · 9847c6e6 · 38c40971 · 99f192e8 · 99f192e8
Commit 99f192e8 authored Jun 17, 2011 by Romain Courteaud
125 changed files
--- a/00.Repository.Rules.txt
+++ b/00.Repository.Rules.txt
+SlapOS repository rules
+=======================
+Short version for impatient
+---------------------------
+'master' branch is always stable. One shall never work in this branch. One
+shall expect reversion or removal of his commits in 'master' branch, if they
+are not because of merging another branch.
+Everyone has to create branch, basing on 'master' or any other branch. All
+work shall be done in such branch. It is advised to review it before merging
+into 'master'. It is very good habit to tag such merges.
+A bit more background
+---------------------
+SlapOS repository 'master' branch is supposed to be stable. No new work is
+accepted on this branch. Each time someone uses (clones, extends) 'master'
+branch it is supposed to work (as far as it was tested).
+Tags on 'master' branch are supposed to be repeatable software definitions
+forever. All versions and external links shall be setup in a way, that they
+wouldn't change in day, month, year, etc.
+Everyone can make his own branch to introduce new software to SlapOS. There
+are no rules about those branches, as each software is specific.
+It is good idea to ask for review before merging changes into 'master' branch.
+Peer review can detect issues not detected by testing, development or self
+analysis.
+After some software is stabilised and no more work is planned it is acceptable
+to remove such abandoned branch in order to minimise amount of branches.
--- a/CHANGES.txt
+++ b/CHANGES.txt
-0.3 (unreleased)
+0.9 (unreleased)
 ================
-  * No changes yet.
+ * No changes yet.
+0.8 (2011-06-15)
+================
+ * Add MySQL and MariaDB standalone software release and recipe [Cedric de Saint Martin]
+ * Fixed slapos.recipe.erp5testnode instantiation [Sebastien Robin]
+0.7 (2011-06-14)
+================
+ * Fix slapos.recipe.erp5 package by providing site.zcml in it. [Łukasz Nowak]
+ * Improve slapos.recipe.erp5testnode partition instantiation error reporting
+   [Sebastien Robin]
+0.6 (2011-06-13)
+================
+ * Fixed slapos.recipe.erp5 instantiation. [Łukasz Nowak]
+0.5 (2011-06-13)
+================
+ * Implement zabbix agent instantiation. [Łukasz Nowak]
+ * Drop dependency on Zope2. [Łukasz Nowak]
+ * Share more in slapos.recipe.librecipe module. [Łukasz Nowak]
+0.4 (2011-06-09)
+================
+ * Remove reference to slapos.tool.networkcache as it was removed from pypi. [Łukasz Nowak]
+ * Add Kumofs standalone software release and recipe [Cedric de Saint Martin]
+ * Add Memcached standalone software release and recipe [Cedric de Saint Martin]
+0.3 (2011-06-09)
+================
+ * Moved out template and build to separate distributions [Łukasz Nowak]
+ * Depend on slapos.core instead of depracated slapos.slap [Romain Courteaud]
+ * Fix apache module configuration [Kazuhiko Shiozaki]
+ * Allow to control full environment in erp5 module [Łukasz Nowak]
 0.2 (2011-05-30)
 ================

--- a/MANIFEST.in
+++ b/MANIFEST.in
 include CHANGES.txt
+include slapos/recipe/erp5/template/site.zcml
 recursive-include slapos/recipe *.in
 recursive-include slapos/recipe README.*.txt
--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
@@ -67,7 +67,7 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
  CPPFLAGS =-I${libuuid:location}/include
-  LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -Wl,-rpath -Wl,${libexpat:location}/lib -Wl,-rpath -Wl,${pcre:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
 [apache-antiloris]
 # Note: Shall react on each build of apache and reinstall itself

--- a/component/bison/buildout.cfg
+++ b/component/bison/buildout.cfg
@@ -6,7 +6,7 @@ parts =
 [bison]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz
+url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2
-md5sum = ea45c778b36bdc7a720096819e292a73
+md5sum = 9dba20116b13fc61a0846b0058fbe004
 environment =
  M4=${m4:location}/bin/m4
--- a/component/cloudooo-development/buildout.cfg
+++ b/component/cloudooo-development/buildout.cfg
-[buildout]
-extends =
-  ../cloudooo/buildout.cfg
-extensions = mr.developer
-sources = sources
-auto-checkout = ${buildout:cloudooo-packages}
-[sources]
-cloudooo = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo
-cloudooo.handler.pdf = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo.handler.pdf/
-cloudooo.handler.ffmpeg = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo.handler.ffmpeg/
-cloudooo.handler.imagemagick = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo.handler.imagemagick/
-cloudooo.handler.ooo = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo.handler.ooo/
--- a/component/coreutils/buildout.cfg
+++ b/component/coreutils/buildout.cfg
@@ -4,8 +4,8 @@ parts =
 [coreutils]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.9.tar.gz
+url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.12.tar.gz
-md5sum = 36909ae68840d73a800120cf74af794a
+md5sum = fce7999953a67243d00d75cc86dbcaa6
 configure-options =
  --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
 environment =

--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
@@ -37,4 +37,4 @@ configure-options =
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  LDFLAGS=-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib
+  LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
--- a/component/cyrus-sasl/buildout.cfg
+++ b/component/cyrus-sasl/buildout.cfg
@@ -38,4 +38,4 @@ make-options =
 environment =
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/fastjar/buildout.cfg
+++ b/component/fastjar/buildout.cfg
@@ -9,4 +9,4 @@ url = http://sourceforge.net/projects/fastjar/files/fastjar/0.94/fastjar-0.94.ta
 md5sum = 14d4bdfac236e347d806c6743dba48c6
 environment =
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/ffmpeg/buildout.cfg
+++ b/component/ffmpeg/buildout.cfg
@@ -95,8 +95,8 @@ configure-options =
 --enable-shared
 --enable-zlib
 --disable-static
- --extra-ldflags="-Wl,-rpath -Wl,${buildout:parts-directory}/${:_buildout_section_name_}/lib"
+ --extra-ldflags="-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"
 environment = 
  CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libvorbis:location}/include -I${libtheora:location}/include -I${libvpx:location}/include -I${libx264:location}/include -I${lame:location}/include -I${opencore-amr:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libogg:location}/lib -Wl,-rpath -Wl,${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath -Wl,${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath -Wl,${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath -Wl,${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath -Wl,${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath -Wl,${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath -Wl,${opencore-amr:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libogg:location}/lib -Wl,-rpath=${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
  PATH=${yasm:location}/bin:%(PATH)s
--- a/component/file/buildout.cfg
+++ b/component/file/buildout.cfg
@@ -12,4 +12,4 @@ configure-options =
  --disable-static
 environment =
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/flare/buildout.cfg
+++ b/component/flare/buildout.cfg
@@ -14,5 +14,5 @@ configure-options =
  --with-tokyocabinet=${tokyocabinet:location}
  --with-boost=${boost-lib:location}
 environment =
-  LDFLAGS =-Wl,-rpath -Wl,${tokyocabinet:location}/lib -Wl,-rpath -Wl,${boost-lib:location}/lib
+  LDFLAGS =-Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${boost-lib:location}/lib
--- a/component/fontconfig/buildout.cfg
+++ b/component/fontconfig/buildout.cfg
@@ -23,4 +23,4 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/freetype/buildout.cfg
+++ b/component/freetype/buildout.cfg
@@ -16,4 +16,4 @@ configure-options =
  --disable-static
 environment =
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/gcc/buildout.cfg
+++ b/component/gcc/buildout.cfg
@@ -28,7 +28,7 @@ configure-options =
  --with-gmp=${gmp:location}
 environment =
  CPPFLAGS =-I${gmp:location}/include
-  LDFLAGS =-L${gmp:location}/lib -Wl,-rpath -Wl,${gmp:location}/lib
+  LDFLAGS =-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib
 [mpc]
 recipe = hexagonit.recipe.cmmi
@@ -39,7 +39,7 @@ configure-options =
  --with-mpfr=${mpfr:location}
 environment =
  CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include
-  LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath -Wl,${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath -Wl,${gmp:location}/lib
+  LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath=${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib
 [ecj]
 recipe = hexagonit.recipe.download
@@ -90,7 +90,7 @@ configure-options =
 environment =
  CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include -I${mpc:location}/include
-  LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath -Wl,${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath -Wl,${gmp:location}/lib -Wl,-rpath -Wl,${mpc:location}/lib
+  LDFLAGS =-L${mpfr:location}/lib -Wl,-rpath=${mpfr:location}/lib -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib
  PATH=${zip:location}/bin:%(PATH)s
 # make install does not work when several core are used
 make-targets = install -j1
--- a/component/gettext/buildout.cfg
+++ b/component/gettext/buildout.cfg
@@ -23,4 +23,4 @@ configure-options =
 environment =
  CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include
-  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath -Wl,${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib
+  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
--- a/component/ghostscript/buildout.cfg
+++ b/component/ghostscript/buildout.cfg
@@ -28,7 +28,7 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig
  CPPFLAGS=-I${libtiff:location}/include
-  LDFLAGS=-Wl,-rpath -Wl,${fontconfig:location}/lib -L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib
+  LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib
  LD_LIBRARY_PATH=${fontconfig:location}/lib
 [ghostscript]

--- a/component/git/buildout.cfg
+++ b/component/git/buildout.cfg
@@ -27,4 +27,4 @@ configure-options =
 environment =
  PATH=${curl:location}/bin:%(PATH)s
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/glib/buildout.cfg
+++ b/component/glib/buildout.cfg
@@ -5,8 +5,8 @@ extends =
 [glib]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.6.tar.bz2
+url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.7.tar.bz2
-md5sum = 7d8fc15ae70d5111c0cf2a79d50ef717
+md5sum = feda1650c8646ad39c7b01d95b03766b
 configure-options =
  --disable-static
  --disable-selinux
@@ -15,5 +15,5 @@ configure-options =
 environment =
  CPPFLAGS=-I${zlib:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
  PATH=${gettext:location}/bin:%(PATH)s
--- a/component/graphviz/buildout.cfg
+++ b/component/graphviz/buildout.cfg
@@ -53,4 +53,4 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/grep/buildout.cfg
+++ b/component/grep/buildout.cfg
@@ -10,4 +10,4 @@ url = http://ftp.gnu.org/gnu/grep/grep-2.8.tar.gz
 md5sum = cb2dfc502c5afc7a4a6e5f6cefd6850e
 environment =
  PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
-  LDFLAGS =-Wl,--as-needed -Wl,-rpath -Wl,${pcre:location}/lib
+  LDFLAGS =-Wl,--as-needed -Wl,-rpath=${pcre:location}/lib
--- a/component/imagemagick/buildout.cfg
+++ b/component/imagemagick/buildout.cfg
@@ -71,4 +71,4 @@ environment =
  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig
  CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include
-  LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -L${zlib:location}/lib -Wl,${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath -Wl,${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath -Wl,${freetype:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib
--- a/component/jasper/buildout.cfg
+++ b/component/jasper/buildout.cfg
@@ -13,4 +13,4 @@ configure-command =
  /bin/sh ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --enable-shared --disable-opengl
 environment =
  CPPFLAGS=-I${libjpeg:location}/include
-  LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib
+  LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib
--- a/component/kumo/buildout.cfg
+++ b/component/kumo/buildout.cfg
@@ -35,4 +35,4 @@ configure-options =
 environment =
  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath -Wl,${tokyocabinet:location}/lib -Wl,-rpath -Wl,${messagepack:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
--- a/component/libpng/buildout.cfg
+++ b/component/libpng/buildout.cfg
@@ -12,7 +12,7 @@ configure-options =
  --disable-static
 environment =
  CPPFLAGS =-I${zlib:location}/include
-  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 [libpng12]
 <= libpng-common
@@ -21,5 +21,5 @@ md5sum = e3ac7879d62ad166a6f0c7441390d12b
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.1.tar.bz2
+url = http://download.sourceforge.net/libpng/libpng-1.5.2.tar.bz2
-md5sum = 8fdcb7c0e78d54ff0362a800cbe3bc31
+md5sum = a003b37ed9afb0d9164eb7228421057c
--- a/component/librsync/buildout.cfg
+++ b/component/librsync/buildout.cfg
@@ -15,4 +15,4 @@ configure-options =
  --enable-shared
 environment =
  CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include -I${popt:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${popt:location}/lib -Wl,-rpath -Wl,${popt:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
--- a/component/libtiff/buildout.cfg
+++ b/component/libtiff/buildout.cfg
@@ -16,4 +16,4 @@ configure-options =
  --without-x
 environment =
  CPPFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/libxml2/buildout.cfg
+++ b/component/libxml2/buildout.cfg
@@ -15,4 +15,4 @@ configure-options =
  --without-python
  --with-zlib=${zlib:location}
 environment =
-    LDFLAGS = -Wl,-rpath -Wl,${zlib:location}/lib
+    LDFLAGS = -Wl,-rpath=${zlib:location}/lib
--- a/component/libxslt/buildout.cfg
+++ b/component/libxslt/buildout.cfg
@@ -19,5 +19,5 @@ configure-options =
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${zlib:location}/lib
  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
--- a/component/logrotate/buildout.cfg
+++ b/component/logrotate/buildout.cfg
@@ -10,4 +10,4 @@ md5sum = eeba9dbca62a9210236f4b83195e4ea5
 configure-command = true
 make-options = PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} 
 environment =
-  POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath -Wl,${popt:location}/lib
+  POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
--- a/component/m4/buildout.cfg
+++ b/component/m4/buildout.cfg
@@ -4,5 +4,5 @@ parts =
 [m4]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/m4/m4-1.4.15.tar.gz
+url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
-md5sum = 5649a2e593b6c639deae9e72ede777dd
+md5sum = 8a7cef47fecab6272eb86a6be6363b2f
--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -35,4 +35,4 @@ configure-options =
 environment =
  CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include
-  LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${readline:location}/lib
+  LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
--- a/component/memcached/buildout.cfg
+++ b/component/memcached/buildout.cfg
@@ -49,5 +49,5 @@ patches =
  ${memcached-gcc4.6.patch:location}/${memcached-gcc4.6.patch:filename}
 patch-options = -p1
 environment =
-    LDFLAGS =-Wl,-rpath ${libevent:location}/lib
+    LDFLAGS =-Wl,-rpath=${libevent:location}/lib
--- a/component/mysql-5.1/buildout.cfg
+++ b/component/mysql-5.1/buildout.cfg
@@ -21,9 +21,9 @@ download-only = true
 [mysql-5.1]
 recipe = hexagonit.recipe.cmmi
-version = 5.1.54
+version = 5.1.57
 url = http://mysql.he.net/Downloads/MySQL-5.1/mysql-${:version}.tar.gz
-md5sum = 2a0f45a2f8b5a043b95ce7575796a30b
+md5sum = 8d6998ef0f2e2d1dac2a761348c71c21
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 # configure: how to avoid searching for my.cnf?
@@ -60,4 +60,4 @@ patches =
 environment =
  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
  CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include
-  LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${readline:location}/lib
+  LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
--- a/component/mysql-tritonn-5.0/buildout.cfg
+++ b/component/mysql-tritonn-5.0/buildout.cfg
@@ -90,4 +90,4 @@ patches =
 environment =
    PATH=${senna:location}/bin:${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
    CPPFLAGS=-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline:location}/include
-    LDFLAGS=-L${senna:location}/lib -L${readline:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${readline:location}/lib
+    LDFLAGS=-L${senna:location}/lib -L${readline:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
--- a/component/neon/buildout.cfg
+++ b/component/neon/buildout.cfg
@@ -25,4 +25,4 @@ environment =
  PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
  CPPFLAGS=-I${openssl:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${libxml2:location}/lib
+  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libxml2:location}/lib
--- a/component/openldap/buildout.cfg
+++ b/component/openldap/buildout.cfg
@@ -23,4 +23,4 @@ configure-options =
 environment =
  CPPFLAGS=-I${openssl:location}/include -I${cyrus-sasl:location}/include
-  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${cyrus-sasl:location}/lib -Wl,-rpath -Wl,${cyrus-sasl:location}/lib
+  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${cyrus-sasl:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib
--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -27,5 +27,5 @@ configure-options =
 # it seems that parallel build sometimes fails for openssl.
 make-options =
  -j1
-  LDFLAGS="-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${buildout:parts-directory}/${:_buildout_section_name_}/lib"
+  LDFLAGS="-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"
-  SHARED_LDFLAGS="-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${buildout:parts-directory}/${:_buildout_section_name_}/lib"
+  SHARED_LDFLAGS="-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"
--- a/component/pdftk/buildout.cfg
+++ b/component/pdftk/buildout.cfg
@@ -40,5 +40,5 @@ make-options =
 pre-make-hook = ${pdftk-hooks-download:location}/${pdftk-hooks-download:filename}:pre_make_hook
 environment =
  PATH=${gcc-java:location}/bin:${fastjar:location}/bin:%(PATH)s
-  LDFLAGS=-L${gcc-java:location}/lib -Wl,-rpath -Wl,${gcc-java:location}/lib -L${gcc-java:location}/lib64 -Wl,-rpath -Wl,${gcc-java:location}/lib64
+  LDFLAGS=-L${gcc-java:location}/lib -Wl,-rpath=${gcc-java:location}/lib -L${gcc-java:location}/lib64 -Wl,-rpath=${gcc-java:location}/lib64
  LD_LIBRARY_PATH=${gcc-java:location}/lib:${gcc-java:location}/lib64
--- a/component/perl-SGML-Parser-OpenSP/buildout.cfg
+++ b/component/perl-SGML-Parser-OpenSP/buildout.cfg
@@ -17,4 +17,4 @@ configure-command =
  ${perl:location}/bin/perl Makefile.PL
 make-options =
  INC=-I${opensp:location}/include
-  OTHERLDFLAGS="-L${opensp:location}/lib -Wl,-rpath -Wl,${opensp:location}/lib"
+  OTHERLDFLAGS="-L${opensp:location}/lib -Wl,-rpath=${opensp:location}/lib"
--- a/component/perl-XML-LibXML/buildout.cfg
+++ b/component/perl-XML-LibXML/buildout.cfg
@@ -23,7 +23,7 @@ configure-command =
 # Parallel make does not work for this package on fast machines
 # with many cores
 make-options =
-  OTHERLDFLAGS=" -Wl,-rpath -Wl,${libxml2:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib" -j1
+  OTHERLDFLAGS=" -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${zlib:location}/lib" -j1
 environment =
  LD_LIBRARY_PATH=${libxml2:location}/lib:${zlib:location}/lib
  PERLLIB=blib/lib
--- a/component/perl/buildout.cfg
+++ b/component/perl/buildout.cfg
@@ -25,7 +25,7 @@ configure-command =
    -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
    -Dsiteprefix=${buildout:parts-directory}/site_${:_buildout_section_name_} \
    -Dcflags=-I${gdbm:location}/include \
-    -Dldflags="-L${gdbm:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib" \
+    -Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \
    -Ui_db \
    -Dnoextensions=ODBM_File
 environment =

--- a/component/pkgconfig/buildout.cfg
+++ b/component/pkgconfig/buildout.cfg
@@ -26,4 +26,4 @@ environment =
  PATH=${:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
  CPPFLAGS=-I${glib:location}/include -I${popt:location}/include
-  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${glib:location}/lib -L${popt:location}/lib -Wl,-rpath -Wl,${popt:location}/lib
+  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib
--- a/component/poppler/buildout.cfg
+++ b/component/poppler/buildout.cfg
+[buildout]
+parts = poppler
+extends =
+  ../fontconfig/buildout.cfg
+  ../freetype/buildout.cfg
+  ../jbigkit/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
+[poppler]
+<= poppler-0.17.1
+[poppler-0.17.1]
+recipe = hexagonit.recipe.cmmi
+md5sum = 8d7276d1943078c76aabe9f2ec52d50b
+url = http://poppler.freedesktop.org/poppler-0.17.1.tar.gz
+configure-options =
+  --disable-cairo-output
+  --disable-cms
+  --disable-curl
+  --disable-gtk-doc-html
+  --disable-gtk-test
+  --disable-poppler-cpp
+  --disable-poppler-glib
+  --disable-poppler-qt4
+  --disable-splash-output
+  --enable-zlib
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
+  CPPFLAGS=-I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/postfix/buildout.cfg
+++ b/component/postfix/buildout.cfg
@@ -15,5 +15,5 @@ url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.8.3.tar
 md5sum = b3922ededd3fd6051f759e58a4ada3ae
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = make
-configure-options = makefiles CCARGS='-DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl:location}/include' AUXLIBS='-L${openssl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -lssl -lpcre -ldb -lcrypto -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${pcre:location}/lib -Wl,-rpath -Wl,${libdb:location}/lib'
+configure-options = makefiles CCARGS='-DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl:location}/include' AUXLIBS='-L${openssl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -lssl -lpcre -ldb -lcrypto -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib'
 make-targets = non-interactive-package install_root=${:location}
--- a/component/python-2.4/buildout.cfg
+++ b/component/python-2.4/buildout.cfg
@@ -59,7 +59,7 @@ configure-options =
 environment =
  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
 [pythonbin2.4]
 # XXX/Note: This is hackish way to have fully featured python interpreter

--- a/component/python-2.6/buildout.cfg
+++ b/component/python-2.6/buildout.cfg
 [buildout]
 # XXX: Extends shall not jump out of software
 extends =
@@ -27,12 +28,12 @@ recipe = hexagonit.recipe.cmmi
 # other settings in this part if we don't set it explicitly here.
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
 version = 2.6
-package_version = ${:version}.6
+package_version = ${:version}.7
 executable = ${:prefix}/bin/python${:version}
 url =
-  http://python.org/ftp/python/${:package_version}/Python-${:package_version}.tgz
+  http://python.org/ftp/python/${:package_version}/Python-${:package_version}.tar.bz2
-md5sum = b2f209df270a33315e62c1ffac1937f0
+md5sum = d40ef58ed88438a870bbeb0ac5d4217b
 patch-options = -p1
 patches =
  ${python-2.6.6-no_system_inc_dirs.patch:location}/${python-2.6.6-no_system_inc_dirs.patch:filename}
@@ -42,7 +43,7 @@ configure-options =
 environment =
  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
 [bootstrap2.6]
 recipe = zc.recipe.egg

--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
@@ -13,18 +13,18 @@ parts =
    python2.7
 [python2.7]
-<= python2.7.1
+<= python2.7.2
-[python2.7.0]
+[python2.7.1]
 <= python2.7common
-package_version = 2.7
+package_version = 2.7.1
-md5sum = 35f56b092ecf39a6bd59d64f142aae0f
+md5sum = aa27bc25725137ba155910bd8e5ddc4f
 package_version_suffix =
-[python2.7.1]
+[python2.7.2]
 <= python2.7common
-package_version = 2.7.1
+package_version = 2.7.2
-md5sum = 15ed56733655e3fab785e49a7278d2fb
+md5sum = ba7b2f11ffdbf195ee0d111b9455a5bd
 package_version_suffix =
 [bootstrap2.7]
@@ -45,11 +45,11 @@ version = 2.7
 executable = ${:prefix}/bin/python${:version}
 url =
-  http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tgz
+  http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.bz2
 configure-options =
  --enable-unicode=ucs4
  --with-threads
 environment =
  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${gdbm:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
--- a/component/readline/buildout.cfg
+++ b/component/readline/buildout.cfg
@@ -12,4 +12,4 @@ configure-options =
  --disable-static
  --with-ncurses=${ncurses:location}
 environment =
-    LDFLAGS =-Wl,-rpath ${ncurses:location}/lib
+    LDFLAGS =-Wl,-rpath=${ncurses:location}/lib
--- a/component/serf/buildout.cfg
+++ b/component/serf/buildout.cfg
@@ -17,4 +17,4 @@ configure-options =
  --with-openssl=${openssl:location}
 environment =
  CFLAGS=-I${zlib:location}/include -I${libuuid:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
--- a/component/slapos/buildout.cfg
+++ b/component/slapos/buildout.cfg
 [buildout]
 extends =
  ../lxml-python/buildout.cfg
+  ../python-2.7/buildout.cfg
 parts =
  slapos
@@ -10,8 +11,12 @@ find-links =
 versions = versions
+[lxml-python]
+python = python2.7
 [slapos]
 recipe = z3c.recipe.scripts
+python = python2.7
 eggs =
  ${lxml-python:egg}
  slapos.core
@@ -24,13 +29,13 @@ hexagonit.recipe.cmmi = 1.5.0
 lxml = 2.3
 meld3 = 0.6.7
 setuptools = 0.6c12dev-r88795
-slapos.core = 0.1
+slapos.core = 0.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 # Required by:
-# slapos.core==0.1
+# slapos.core==0.2
 Flask = 0.6.1
 # Required by:
@@ -38,17 +43,18 @@ Flask = 0.6.1
 hexagonit.recipe.download = 1.5.0
 # Required by:
-# slapos.core==0.1
+# slapos.core==0.2
 netaddr = 0.7.5
 # Required by:
-# slapos.core==0.1
+# slapos.core==0.2
 netifaces = 0.5
 # Required by:
-# slapos.core==0.1
+# slapos.core==0.2
 supervisor = 3.0a10
 # Required by:
-# slapos.core==0.1
+# slapos.core==0.2
 zope.interface = 3.6.3
--- a/component/sphinx/buildout.cfg
+++ b/component/sphinx/buildout.cfg
@@ -38,4 +38,4 @@ patches =
  ${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename}
 environment =
  CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath ${mariadb:location}/lib/mysql -L${libexpat:location}/lib -Wl,-rpath ${libexpat:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib
--- a/component/sqlite3/buildout.cfg
+++ b/component/sqlite3/buildout.cfg
@@ -5,11 +5,11 @@ parts =
 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz
+url = http://www.sqlite.org/sqlite-autoconf-3070603.tar.gz
-md5sum = f16c08617968b4087b3d591fd575f59f
+md5sum = 7eb41eea5ffa5cbe359a48629084c425
 configure-options =
  --disable-static
  --enable-readline
 environment =
  CPPFLAGS=-I${readline:location}/include -I${ncurses:location}/include
-  LDFLAGS=-L${buildout:parts-directory}/${:_buildout_section_name_} -Wl,-rpath -Wl,${readline:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib
+  LDFLAGS=-L${buildout:parts-directory}/${:_buildout_section_name_} -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib
--- a/component/stunnel/buildout.cfg
+++ b/component/stunnel/buildout.cfg
@@ -26,4 +26,4 @@ configure-options =
  --with-ssl=${openssl:location}
 environment =
  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath -Wl,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/subversion/buildout.cfg
+++ b/component/subversion/buildout.cfg
@@ -24,8 +24,8 @@ md5sum = 8d911ec2422dc4c08a00693ac915a07a
 [subversion]
 recipe = hexagonit.recipe.cmmi
-url = http://subversion.tigris.org/downloads/subversion-1.6.16.tar.bz2
+url = http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2
-md5sum = 32f25a6724559fe8691d1f57a63f636e
+md5sum = 81e5dc5beee4b3fc025ac70c0b6caa14
 patches =
  ${subversion-1.6.0-disable_linking_against_unneeded_libraries:location}/${subversion-1.6.0-disable_linking_against_unneeded_libraries:filename}
 configure-options =
@@ -58,4 +58,4 @@ environment =
  PATH=${pkgconfig:location}/bin:${neon:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${neon:location}/lib/pkgconfig
  CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
-  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${neon:location}/lib -Wl,-rpath -Wl,${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib
+  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${neon:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
--- a/component/tesseract/buildout.cfg
+++ b/component/tesseract/buildout.cfg
@@ -28,7 +28,7 @@ configure-options =
  --datarootdir=${tesseract-share:location}
 environment =
  CPPFLAGS=-I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include
-  LDFLAGS =-Wl,-rpath -L${zlib:location}/lib -Wl,${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath -Wl,${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath -Wl,${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath -Wl,${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib
+  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib
 [tesseract-eng-traineddata]
 recipe = hexagonit.recipe.download

--- a/component/tokyocabinet/buildout.cfg
+++ b/component/tokyocabinet/buildout.cfg
@@ -14,4 +14,4 @@ configure-options =
  --with-bzip=${bzip2:location}
 environment =
-  LDFLAGS =-Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
--- a/component/varnish/buildout.cfg
+++ b/component/varnish/buildout.cfg
@@ -22,7 +22,7 @@ configure-options =
  --disable-static
 environment =
  CPPFLAGS=-I${ncurses:location}/include
-  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
 [varnish-2.1]
 recipe = hexagonit.recipe.cmmi
@@ -34,4 +34,4 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
  CPPFLAGS=-I${ncurses:location}/include
-  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
--- a/component/w3m/buildout.cfg
+++ b/component/w3m/buildout.cfg
@@ -31,4 +31,4 @@ environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
  CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/
-  LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath -Wl,${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/xtrabackup/allow_force_ibbackup.patch
+++ b/component/xtrabackup/allow_force_ibbackup.patch
+commit c052380cf84e33b32268af97a7c1539c8a6771e5
+Author: Łukasz Nowak <luke@nexedi.com>
+Date:   Mon Jun 6 13:29:32 2011 +0200
+    Really use option_ibbackup_binary.
+diff --git a/innobackupex b/innobackupex
+index 67d0d44..ed06294 100755
+--- a/innobackupex
+++ b/innobackupex
+@@ -214,6 +214,7 @@ check_args();
+ print_version();
+ # initialize global variables and perform some checks
+if ( $option_ibbackup_binary eq "autodetect" ){
+ if ($option_copy_back) {
+     $option_ibbackup_binary = 'xtrabackup_51';
+ } elsif ($option_apply_log) {
+@@ -250,6 +251,7 @@ if ($option_copy_back) {
+ } else {
+     $option_ibbackup_binary = set_xtrabackup_version();
+ }
+}
+ init();
+ my $ibbackup_exit_code = 0;
--- a/component/xtrabackup/buildout.cfg
+++ b/component/xtrabackup/buildout.cfg
 # xtrabackup: hot backup utility for MySQL
 # http://www.percona.com/
+# Depends on SlapOS patched buildout for _profile_base_location_ functionality
 [buildout]
 extends =
  ../autoconf/buildout.cfg
@@ -15,6 +15,11 @@ extends =
 parts =
  xtrabackup
+find-links =
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+versions = versions
 [xtrabackup-build-patch-download]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
@@ -22,18 +27,31 @@ md5sum = e018df8bb3ed672891388556b8e91e35
 download-only = true
 filename = xtrabackup_build.patch
+[allow_force_ibbackup.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = d642ea7b30d1322a516fbece4ee100e0
+download-only = true
+filename = ${:_buildout_section_name_}
 [xtrabackup]
 recipe = hexagonit.recipe.cmmi
 url = http://www.percona.com/redir/downloads/XtraBackup/XtraBackup-1.6/source/xtrabackup-1.6.tar.gz
 md5sum = 7c263723312cba36539df4cd7a119744
 make-binary = true
-patches = ${xtrabackup-build-patch-download:location}/${xtrabackup-build-patch-download:filename}
+patches =
+  ${xtrabackup-build-patch-download:location}/${xtrabackup-build-patch-download:filename}
+  ${allow_force_ibbackup.patch:location}/${allow_force_ibbackup.patch:filename}
 patch-options = -p1
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = utils/build.sh innodb51_builtin ${:location} ${libtool:location}
 environment =
  CPPFLAGS =-I${zlib:location}/include -I${ncurses:location}/include -I${readline:location}/include
-  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath -Wl,${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath -Wl,${readline:location}/lib
+  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib
  PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${flex:location}/bin:%(PATH)s:${bison:location}/bin
 make-options =
  -j1
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001
--- a/component/zabbix/buildout.cfg
+++ b/component/zabbix/buildout.cfg
@@ -4,8 +4,8 @@ parts =
 [zabbix-agent]
 recipe = hexagonit.recipe.cmmi
-url = http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.4.tar.gz?download
+url = http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.5.tar.gz?download
-md5sum = 969ce09317c98b205bc96157e16f5c8c
+md5sum = 58b9253fb0eace1e20b2fe5c1fce32a3
 configure-options =
  --enable-agent
  --enable-ipv6
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
-version = '0.3-dev'
+version = '0.9-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"
@@ -27,7 +27,6 @@ setup(name=name,
      include_package_data=True,
      install_requires=[
        'PyXML', # for full blown python interpreter
-        'Zope2', # some recipes like to play with zope
        'lxml', # for full blown python interpreter
        'netaddr', # to manipulate on IP addresses
        'setuptools', # namespaces
@@ -46,9 +45,12 @@ setup(name=name,
          'erp5testnode = slapos.recipe.erp5testnode:Recipe',
          'helloworld = slapos.recipe.helloworld:Recipe',
          'java = slapos.recipe.java:Recipe',
+          'kumofs = slapos.recipe.kumofs:Recipe',
          'kvm = slapos.recipe.kvm:Recipe',
          'libcloud = slapos.recipe.libcloud:Recipe',
          'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
+          'memcached = slapos.recipe.memcached:Recipe',
+          'mysql = slapos.recipe.mysql:Recipe',
          'nbdserver = slapos.recipe.nbdserver:Recipe',
          'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
          'proactive = slapos.recipe.proactive:Recipe',
@@ -58,5 +60,6 @@ setup(name=name,
          'testnode = slapos.recipe.testnode:Recipe',
          'vifib = slapos.recipe.vifib:Recipe',
          'xwiki = slapos.recipe.xwiki:Recipe',
+          'zabbixagent = slapos.recipe.zabbixagent:Recipe',
      ]},
    )
--- a/slapos/recipe/README.cloudooo.txt
+++ b/slapos/recipe/README.cloudooo.txt
+cloudooo
+=========
+Instantiates CloudOOo instance.
--- a/slapos/recipe/README.kumofs.txt
+++ b/slapos/recipe/README.kumofs.txt
+kumofs
+=========
+Instantiates KumoFS instance.
--- a/slapos/recipe/README.memcached.txt
+++ b/slapos/recipe/README.memcached.txt
+memcached
+=========
+Instantiates Memcached instance.
--- a/slapos/recipe/README.mysql.txt
+++ b/slapos/recipe/README.mysql.txt
+mysql
+=========
+Instantiates MySQL instance.
--- a/slapos/recipe/README.zabbixagent.txt
+++ b/slapos/recipe/README.zabbixagent.txt
+zabbixagent
+===========
--- a/slapos/recipe/cloudooo/__init__.py
+++ b/slapos/recipe/cloudooo/__init__.py
+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+import os
+import pkg_resources
+import sys
+import zc.buildout
+import zc.recipe.egg
+class Recipe(BaseSlapRecipe):
+  def getTemplateFilename(self, template_name):
+    return pkg_resources.resource_filename(__name__,
+        'template/%s' % template_name)
+  def _install(self):
+    self.path_list = []
+    self.requirements, self.ws = self.egg.working_set([__name__])
+    # Use killpidfromfile from ERP5.
+    self.killpidfromfile = zc.buildout.easy_install.scripts(
+        [('killpidfromfile', __name__ + 'slapos.recipe.erp5.killpidfromfile',
+          'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0]
+    self.path_list.append(self.killpidfromfile)
+    conversion_server_conf = self.installConversionServer(
+        self.getLocalIPv4Address(), 23000, 23060)
+    self.linkBinary()
+    self.setConnectionDict(dict(
+      site_url="http://%s:%s/" % (self.getLocalIPv4Address(), 23000),
+    ))
+    return self.path_list
+  def linkBinary(self):
+    """Links binaries to instance's bin directory for easier exposal"""
+    for linkline in self.options.get('link_binary_list', '').splitlines():
+      if not linkline:
+        continue
+      target = linkline.split()
+      if len(target) == 1:
+        target = target[0]
+        path, linkname = os.path.split(target)
+      else:
+        linkname = target[1]
+        target = target[0]
+      link = os.path.join(self.bin_directory, linkname)
+      if os.path.lexists(link):
+        if not os.path.islink(link):
+          raise zc.buildout.UserError(
+              'Target link already %r exists but it is not link' % link)
+        os.unlink(link)
+      os.symlink(target, link)
+      self.logger.debug('Created link %r -> %r' % (link, target))
+      self.path_list.append(link)
+  def installConversionServer(self, ip, port, openoffice_port):
+    name = 'conversion_server'
+    working_directory = self.createDataDirectory(name)
+    conversion_server_dict = dict(
+      working_path=working_directory,
+      uno_path=self.options['ooo_uno_path'],
+      office_binary_path=self.options['ooo_binary_path'],
+      ip=ip,
+      port=port,
+      openoffice_port=openoffice_port,
+    )
+    for env_line in self.options['environment'].splitlines():
+      env_line = env_line.strip()
+      if not env_line:
+        continue
+      if '=' in env_line:
+        env_key, env_value = env_line.split('=')
+        conversion_server_dict[env_key.strip()] = env_value.strip()
+      else:
+        raise zc.buildout.UserError('Line %r in environment parameter is '
+            'incorrect' % env_line)
+    config_file = self.createConfigurationFile(name + '.cfg',
+        self.substituteTemplate(self.getTemplateFilename('cloudooo.cfg.in'),
+          conversion_server_dict))
+    self.path_list.append(config_file)
+    # Use execute from erp5.
+    self.path_list.extend(zc.buildout.easy_install.scripts([(name,
+      __name__ + 'slapos.recipe.librecipe.execute',
+      'execute_with_signal_translation')], self.ws,
+      sys.executable, self.wrapper_directory,
+      arguments=[self.options['ooo_paster'].strip(), 'serve', config_file]))
+    return {
+      name + '_port': conversion_server_dict['port'],
+      name + '_ip': conversion_server_dict['ip']
+      }
--- a/slapos/recipe/cloudooo/template/cloudooo.cfg.in
+++ b/slapos/recipe/cloudooo/template/cloudooo.cfg.in
+[app:main]
+use = egg:cloudooo
+#
+## System config
+#
+debug_mode = True
+# Folder where pid files, lock files and virtual frame buffer mappings
+# are stored. In this folder is necessary create a folder tmp, because this
+# folder is used to create all temporary documents.
+working_path = %(working_path)s
+# Folder where UNO library is installed
+uno_path = %(uno_path)s
+# Folder where soffice.bin is installed
+office_binary_path = %(office_binary_path)s
+#
+## Monitor Settings
+#
+# Limit to use the Openoffice Instance. if pass of the limit, the instance is
+# stopped and another is started.
+limit_number_request = 100
+# Interval to check the factory
+monitor_interval = 10
+timeout_response = 180
+enable_memory_monitor = True
+# Set the limit in MB
+# e.g 1000 = 1 GB, 100 = 100 MB
+limit_memory_used = 3000
+#
+## OOFactory Settings
+#
+# The pool consist of several OpenOffice.org instances
+application_hostname = %(ip)s
+# OpenOffice Port
+openoffice_port = %(openoffice_port)s
+# LD_LIBRARY_PATH passed to OpenOffice
+env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s
+#
+# Mimetype Registry
+# It is used to select the handler that will be used in conversion.
+# Priority matters, first match take precedence on next lines.
+mimetype_registry =
+  application/pdf * ooo
+  video/* * ffmpeg
+  audio/* * ffmpeg
+  application/x-shockwave-flash * ffmpeg
+  application/ogg * ffmpeg
+  application/ogv * ffmpeg
+  image/* * ooo
+  text/* * ooo
+  application/zip * ooo
+  application/msword * ooo
+  application/vnd* * ooo
+  application/x-vnd* * ooo
+  application/postscript * ooo
+  application/wmf * ooo
+  application/csv * ooo
+  application/x-openoffice-gdimetafile * ooo
+  application/x-emf * ooo
+  application/emf * ooo
+  application/octet* * ooo
+  * application/vnd.oasis.opendocument* ooo
+[server:main]
+use = egg:PasteScript#wsgiutils
+host = %(ip)s
+port = %(port)s
--- a/slapos/recipe/erp5/__init__.py
+++ b/slapos/recipe/erp5/__init__.py
@@ -34,8 +34,13 @@ import sys
 import zc.buildout
 import zc.recipe.egg
 import ConfigParser
-from Zope2.utilities.mkzopeinstance import write_inituser
+# based on Zope2.utilities.mkzopeinstance.write_inituser
+def Zope2InitUser(path, username, password):
+  open(path, 'w').write('')
+  os.chmod(path, 0600)
+  open(path, "w").write('%s:{SHA}%s\n' % (
+    username,binascii.b2a_base64(hashlib.sha1(password).digest())[:-1]))
 class Recipe(BaseSlapRecipe):
  def getTemplateFilename(self, template_name):
@@ -307,7 +312,7 @@ class Recipe(BaseSlapRecipe):
    self._createDirectory(cron_d)
    self._createDirectory(crontabs)
    wrapper = zc.buildout.easy_install.scripts([('crond',
-      __name__ + '.execute', 'execute')], self.ws, sys.executable,
+     'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
      self.wrapper_directory, arguments=[
        self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs,
        '-t', timestamps, '-f', '-l', '5', '-M', catcher]
@@ -412,7 +417,7 @@ class Recipe(BaseSlapRecipe):
          conversion_server_dict))
    self.path_list.append(config_file)
    self.path_list.extend(zc.buildout.easy_install.scripts([(name,
-      __name__ + '.execute', 'execute_with_signal_translation')], self.ws,
+     'slapos.recipe.librecipe.execute', 'execute_with_signal_translation')], self.ws,
      sys.executable, self.wrapper_directory,
      arguments=[self.options['ooo_paster'].strip(), 'serve', config_file]))
    return {
@@ -436,7 +441,7 @@ class Recipe(BaseSlapRecipe):
        config))
    self.path_list.append(haproxy_conf_path)
    wrapper = zc.buildout.easy_install.scripts([('haproxy_%s' % name,
-      __name__ + '.execute', 'execute')], self.ws, sys.executable,
+     'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
      self.wrapper_directory, arguments=[
        self.options['haproxy_binary'].strip(), '-f', haproxy_conf_path]
      )[0]
@@ -455,7 +460,7 @@ class Recipe(BaseSlapRecipe):
    password = self.generatePassword()
    # XXX Unhardcoded me please
    user = 'zope'
-    write_inituser(
+    Zope2InitUser(
        os.path.join(self.erp5_directory, "inituser"), user, password)
    self._createDirectory(self.erp5_directory)
@@ -542,7 +547,7 @@ class Recipe(BaseSlapRecipe):
        self.substituteTemplate(self.getTemplateFilename('zeo.conf.in'), config))
      self.path_list.append(zeo_conf_path)
      wrapper = zc.buildout.easy_install.scripts([('zeo_%s' % zeo_number,
-        __name__ + '.execute', 'execute')], self.ws, sys.executable,
+       'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
        self.wrapper_directory, arguments=[
          self.options['runzeo_binary'].strip(), '-C', zeo_conf_path]
        )[0]
@@ -588,7 +593,7 @@ class Recipe(BaseSlapRecipe):
      )))
    # TID server
    tidstorage_server = zc.buildout.easy_install.scripts([('tidstoraged',
-      __name__ + '.execute', 'execute')], self.ws, sys.executable,
+     'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
      self.wrapper_directory, arguments=[
        self.options['tidstoraged_binary'], '--nofork', '--config',
        tidstorage_config])[0]
@@ -599,7 +604,7 @@ class Recipe(BaseSlapRecipe):
    # repozo wrapper
    tidstorage_repozo = zc.buildout.easy_install.scripts([('tidstorage_repozo',
-      __name__ + '.execute', 'execute')], self.ws, sys.executable,
+     'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
      self.bin_directory, arguments=[
        self.options['tidstorage_repozo_binary'], '--config', tidstorage_config,
      '--repozo', self.options['repozo_binary'], '-z'])[0]
@@ -637,7 +642,7 @@ class Recipe(BaseSlapRecipe):
    )
    # configure default Zope2 zcml
    open(os.path.join(self.erp5_directory, 'etc', 'site.zcml'), 'w').write(
-        pkg_resources.resource_string('Zope2', 'utilities/skel/etc/site.zcml'))
+        pkg_resources.resource_string(__name__, 'template/site.zcml'))
    zope_config['zodb_configuration_string'] = zodb_configuration_string
    zope_config['instance'] = self.erp5_directory
    zope_config['event_log'] = os.path.join(self.log_directory,
@@ -687,7 +692,7 @@ class Recipe(BaseSlapRecipe):
    self.path_list.append(zope_conf_path)
    # Create init script
    wrapper = zc.buildout.easy_install.scripts([(name,
-      __name__ + '.execute', 'execute')], self.ws, sys.executable,
+     'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
      self.wrapper_directory, arguments=[
        self.options['runzope_binary'].strip(), '-C', zope_conf_path]
      )[0]
@@ -789,6 +794,8 @@ class Recipe(BaseSlapRecipe):
              config=apache_config_file
            )
          ]))
+    # Note: IPv6 is assumed always
+    return 'https://[%(ip)s]:%(port)s' % apache_conf
  def installBackendApache(self, ip, port, backend, key, certificate,
      suffix='', access_control_string=None):
@@ -899,16 +906,17 @@ class Recipe(BaseSlapRecipe):
    innobackupex_argument_list = [self.options['perl_binary'],
        self.options['innobackupex_binary'],
        '--defaults-file=%s' % mysql_conf_path,
-        '--socket=%s' %mysql_conf['socket'].strip(), '--user=root']
+        '--socket=%s' %mysql_conf['socket'].strip(), '--user=root',
+        '--ibbackup=%s'% self.options['xtrabackup_binary']]
    environment = dict(PATH='%s' % self.bin_directory)
    innobackupex_incremental = zc.buildout.easy_install.scripts([(
-      'innobackupex_incremental', __name__ + '.execute', 'executee')],
+      'innobackupex_incremental','slapos.recipe.librecipe.execute', 'executee')],
      self.ws, sys.executable, self.bin_directory, arguments=[
        innobackupex_argument_list + ['--incremental'],
        environment])[0]
    self.path_list.append(innobackupex_incremental)
    innobackupex_full = zc.buildout.easy_install.scripts([('innobackupex_full',
-      __name__ + '.execute', 'executee')], self.ws,
+     'slapos.recipe.librecipe.execute', 'executee')], self.ws,
      sys.executable, self.bin_directory, arguments=[
        innobackupex_argument_list,
        environment])[0]

--- a/slapos/recipe/erp5/template/apache.zope.conf.in
+++ b/slapos/recipe/erp5/template/apache.zope.conf.in
 # Apache configuration file for Zope
 # Automatically generated
+# List of modules
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule antiloris_module modules/mod_antiloris.so
 # Basic server configuration
 PidFile "%(pid_file)s"
 LockFile "%(lock_file)s"
 Listen %(ip)s:%(port)s
 ServerAdmin %(server_admin)s
-DefaultType text/plain
 TypesConfig conf/mime.types
 AddType application/x-compress .Z
 AddType application/x-gzip .gz .tgz
@@ -19,7 +34,6 @@ RequestHeader unset REMOTE_USER
 # Log configuration
 ErrorLog "%(error_log)s"
-LogLevel warn
 LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
 LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
 CustomLog "%(access_log)s" common
@@ -37,19 +51,3 @@ CustomLog "%(access_log)s" common
 # Magic of Zope related rewrite
 RewriteEngine On
 %(rewrite_rule)s
-# List of modules
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule version_module modules/mod_version.so
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
-LoadModule ssl_module modules/mod_ssl.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule dav_module modules/mod_dav.so
-LoadModule dav_fs_module modules/mod_dav_fs.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule headers_module modules/mod_headers.so
-LoadModule antiloris_module modules/mod_antiloris.so
--- a/slapos/recipe/erp5/template/site.zcml
+++ b/slapos/recipe/erp5/template/site.zcml
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:meta="http://namespaces.zope.org/meta"
+    xmlns:five="http://namespaces.zope.org/five">
+  <include package="Products.Five" />
+  <meta:redefinePermission from="zope2.Public" to="zope.Public" />
+  <!-- Load the meta -->
+  <include files="package-includes/*-meta.zcml" />
+  <five:loadProducts file="meta.zcml"/>
+  <!-- Load the configuration -->
+  <include files="package-includes/*-configure.zcml" />
+  <five:loadProducts />
+  <!-- Load the configuration overrides-->
+  <includeOverrides files="package-includes/*-overrides.zcml" />
+  <five:loadProductsOverrides />
+  <securityPolicy
+      component="Products.Five.security.FiveSecurityPolicy" />
+</configure>
--- a/slapos/recipe/erp5testnode/SlapOSControler.py
+++ b/slapos/recipe/erp5testnode/SlapOSControler.py
@@ -46,45 +46,49 @@ class SlapOSControler(object):
 'reference': config['computer_id'],
 'software_root': config['software_root']}))
-  def runSoftwareRelease(self, config, environment, process_group_pid_set=None):
+  def runSoftwareRelease(self, config, environment, process_group_pid_set=None,
+                         stdout=None, stderr=None):
    print "SlapOSControler.runSoftwareRelease"
-    while True:
+    cpu_count = os.sysconf("SC_NPROCESSORS_ONLN")
-      cpu_count = os.sysconf("SC_NPROCESSORS_ONLN")
+    os.putenv('MAKEFLAGS', '-j%s' % cpu_count)
-      os.putenv('MAKEFLAGS', '-j%s' % cpu_count)
+    os.environ['PATH'] = environment['PATH']
-      os.environ['PATH'] = environment['PATH']
+    slapgrid = subprocess.Popen([config['slapgrid_software_binary'], '-v', '-c',
-      stdout = open(os.path.join(
+      #'--buildout-parameter',"'-U -N' -o",
-                    config['instance_root'],'.runSoftwareRelease_out'),
+      config['slapos_config']],
-                    'w+')
+      stdout=stdout, stderr=stderr,
-      stderr = open(os.path.join(
+      close_fds=True, preexec_fn=os.setsid)
-                    config['instance_root'],'.runSoftwareRelease_err'),
+    process_group_pid_set.add(slapgrid.pid)
-                    'w+')
+    slapgrid.wait()
-      slapgrid = subprocess.Popen([config['slapgrid_software_binary'], '-v', '-c',
+    stdout.seek(0)
-        #'--buildout-parameter',"'-U -N' -o",
+    stderr.seek(0)
-        config['slapos_config']],
+    process_group_pid_set.remove(slapgrid.pid)
-        stdout=stdout, stderr=stderr,
+    status_dict = {'status_code':slapgrid.returncode,
-        close_fds=True, preexec_fn=os.setsid)
+                    'stdout':stdout.read(),
-      process_group_pid_set.add(slapgrid.pid)
+                    'stderr':stderr.read()}
-      slapgrid.wait()
+    stdout.close()
-      stdout.seek(0)
+    stderr.close()
-      stderr.seek(0)
+    return status_dict
-      process_group_pid_set.remove(slapgrid.pid)
-      status_dict = {'status_code':slapgrid.returncode,
-                     'stdout':stdout.read(),
-                     'stderr':stderr.read()}
-      stdout.close()
-      stderr.close()
-      return status_dict
-  def runComputerPartition(self, config, process_group_pid_set=None):
+  def runComputerPartition(self, config, environment,
+                           process_group_pid_set=None,
+                           stdout=None, stderr=None):
    print "SlapOSControler.runSoftwareRelease"
    slap = slapos.slap.slap()
    slap.registerOpenOrder().request(self.software_profile,
        partition_reference='testing partition',
        partition_parameter_kw=config['instance_dict'])
    slapgrid = subprocess.Popen([config['slapgrid_partition_binary'],
-      config['slapos_config'], '-c', '-v'], close_fds=True, preexec_fn=os.setsid)
+      config['slapos_config'], '-c', '-v'],
+      stdout=stdout, stderr=stderr,
+      close_fds=True, preexec_fn=os.setsid)
    process_group_pid_set.add(slapgrid.pid)
    slapgrid.wait()
+    stdout.seek(0)
+    stderr.seek(0)
    process_group_pid_set.remove(slapgrid.pid)
-    if slapgrid.returncode != 0:
+    status_dict = {'status_code':slapgrid.returncode,
-      raise ValueError('Slapgrid instance failed')
+                    'stdout':stdout.read(),
+                    'stderr':stderr.read()}
+    stdout.close()
+    stderr.close()
+    return status_dict
--- a/slapos/recipe/erp5testnode/Updater.py
+++ b/slapos/recipe/erp5testnode/Updater.py
@@ -147,7 +147,7 @@ class Updater(object):
      # edit .git/info/sparse-checkout if you want sparse checkout
      if revision:
        if type(revision) is str:
-          h = self._git_find_rev('r' + revision)
+          h = revision
        else:
          h = revision[1]
        if h != self._git('rev-parse', 'HEAD'):

--- a/slapos/recipe/erp5testnode/__init__.py
+++ b/slapos/recipe/erp5testnode/__init__.py
@@ -83,36 +83,25 @@ class Recipe(BaseSlapRecipe):
              git_binary=self.options['git_binary'],
              software_root=CONFIG['software_root'],
              working_directory=CONFIG['working_directory'],
-              vcs_repository=self.parameter_dict.get('vcs_repository'),
+              vcs_repository_list=eval(self.parameter_dict.get('vcs_repository_list'),),
              node_quantity=self.parameter_dict.get('node_quantity', '1'),
-              branch=self.parameter_dict.get('branch', None),
              test_suite_master_url=self.parameter_dict.get(
                                'test_suite_master_url', None),
-              test_suite_name=self.parameter_dict.get('test_suite_name'),
+              test_suite=self.parameter_dict.get('test_suite'),
              test_suite_title=self.parameter_dict.get('test_suite_title'),
+              test_node_title=self.parameter_dict.get('test_node_title'),
+              project_title=self.parameter_dict.get('project_title'),
              bin_directory=self.bin_directory,
-              foo='bar',
              # botenvironemnt is splittable string of key=value to substitute
              # environment of running bot
              bot_environment=self.parameter_dict.get('bot_environment', ''),
              partition_reference=CONFIG['partition_reference'],
              environment=dict(PATH=os.environ['PATH']),
+              vcs_authentication_list=eval(self.parameter_dict.get(
+                     'vcs_authentication_list', 'None')),
            )
          ]))
-  def installLocalSvn(self):
-    svn_dict = dict(svn_binary = self.options['svn_binary'])
-    svn_dict.update(self.parameter_dict)
-    self._writeExecutable(os.path.join(self.bin_directory, 'svn'), """\
-#!/bin/sh
-%(svn_binary)s --username %(svn_username)s --password %(svn_password)s \
--non-interactive --trust-server-cert --no-auth-cache "$@" """% svn_dict)
-    svnversion = os.path.join(self.bin_directory, 'svnversion')
-    if os.path.lexists(svnversion):
-      os.unlink(svnversion)
-    os.symlink(self.options['svnversion_binary'], svnversion)
  def installLocalGit(self):
    git_dict = dict(git_binary = self.options['git_binary'])
    git_dict.update(self.parameter_dict)
@@ -122,19 +111,19 @@ class Recipe(BaseSlapRecipe):
    home_directory = os.path.join(*os.path.split(self.bin_directory)[0:-1])
    print "home_directory : %r" % home_directory
    git_dict.setdefault("git_server_name", "git.erp5.org")
-    if git_dict.get('vcs_username', None) is not None:
+    if git_dict.get('vcs_authentication_list', None) is not None:
+      vcs_authentication_list = eval(git_dict['vcs_authentication_list'])
      netrc_file = open(os.path.join(home_directory, '.netrc'), 'w')
-      netrc_file.write("""
+      for vcs_authentication_dict in vcs_authentication_list:
-  machine %(git_server_name)s
+        netrc_file.write("""
-  login %(vcs_username)s
+machine %(host)s
-  password %(vcs_password)s""" % git_dict)
+login %(user_name)s
+password %(password)s
+""" % vcs_authentication_dict)
      netrc_file.close()
  def installLocalRepository(self):
-    if self.parameter_dict.get('vcs_repository').endswith('git'):
+    self.installLocalGit()
-      self.installLocalGit()
-    else:
-      self.installLocalSvn()
  def installLocalZip(self):
    zip = os.path.join(self.bin_directory, 'zip')

--- a/slapos/recipe/erp5testnode/testnode.py
+++ b/slapos/recipe/erp5testnode/testnode.py
--- a/slapos/recipe/kumofs/__init__.py
+++ b/slapos/recipe/kumofs/__init__.py
--- a/slapos/recipe/kumofs/certificate_authority.py
+++ b/slapos/recipe/kumofs/certificate_authority.py
+import os
+import subprocess
+import time
+import ConfigParser
+def popenCommunicate(command_list, input=None):
+  subprocess_kw = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  if input is not None:
+    subprocess_kw.update(stdin=subprocess.PIPE)
+  popen = subprocess.Popen(command_list, **subprocess_kw)
+  result = popen.communicate(input)[0]
+  if popen.returncode is None:
+    popen.kill()
+  if popen.returncode != 0:
+    raise ValueError('Issue during calling %r, result was:\n%s' % (
+      command_list, result))
+  return result
+class CertificateAuthority:
+  def __init__(self, key, certificate, openssl_binary,
+      openssl_configuration, request_dir):
+    self.key = key
+    self.certificate = certificate
+    self.openssl_binary = openssl_binary
+    self.openssl_configuration = openssl_configuration
+    self.request_dir = request_dir
+  def checkAuthority(self):
+    file_list = [ self.key, self.certificate ]
+    ca_ready = True
+    for f in file_list:
+      if not os.path.exists(f):
+        ca_ready = False
+        break
+    if ca_ready:
+      return
+    for f in file_list:
+      if os.path.exists(f):
+        os.unlink(f)
+    try:
+      # no CA, let us create new one
+      popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
+          self.openssl_configuration, '-new', '-x509', '-extensions',
+          'v3_ca', '-keyout', self.key, '-out', self.certificate,
+          '-days', '10950'], 'Automatic Certificate Authority\n')
+    except:
+      try:
+        for f in file_list:
+          if os.path.exists(f):
+            os.unlink(f)
+      except:
+        # do not raise during cleanup
+        pass
+      raise
+  def _checkCertificate(self, common_name, key, certificate):
+    file_list = [key, certificate]
+    ready = True
+    for f in file_list:
+      if not os.path.exists(f):
+        ready = False
+        break
+    if ready:
+      return False
+    for f in file_list:
+      if os.path.exists(f):
+        os.unlink(f)
+    csr = certificate + '.csr'
+    try:
+      popenCommunicate([self.openssl_binary, 'req', '-config',
+        self.openssl_configuration, '-nodes', '-new', '-keyout',
+        key, '-out', csr, '-days', '3650'],
+        common_name + '\n')
+      try:
+        popenCommunicate([self.openssl_binary, 'ca', '-batch', '-config',
+          self.openssl_configuration, '-out', certificate,
+          '-infiles', csr])
+      finally:
+        if os.path.exists(csr):
+          os.unlink(csr)
+    except:
+      try:
+        for f in file_list:
+          if os.path.exists(f):
+            os.unlink(f)
+      except:
+        # do not raise during cleanup
+        pass
+      raise
+    else:
+      return True
+  def checkRequestDir(self):
+    for request_file in os.listdir(self.request_dir):
+      parser = ConfigParser.RawConfigParser()
+      parser.readfp(open(os.path.join(self.request_dir, request_file), 'r'))
+      if self._checkCertificate(parser.get('certificate', 'name'),
+          parser.get('certificate', 'key_file'), parser.get('certificate',
+            'certificate_file')):
+        print 'Created certificate %r' % parser.get('certificate', 'name')
+def runCertificateAuthority(args):
+  ca_conf = args[0]
+  ca = CertificateAuthority(ca_conf['key'], ca_conf['certificate'],
+      ca_conf['openssl_binary'], ca_conf['openssl_configuration'],
+      ca_conf['request_dir'])
+  while True:
+    ca.checkAuthority()
+    ca.checkRequestDir()
+    time.sleep(60)
--- a/slapos/recipe/kumofs/template/kumo_gateway.in
+++ b/slapos/recipe/kumofs/template/kumo_gateway.in
+#!/bin/sh
+exec %(kumo_gateway_binary)s -F -E -m %(kumo_manager_ip)s:%(kumo_manager_port)s -t %(kumo_gateway_ip)s:%(kumo_gateway_port)s -o %(kumo_gateway_log)s
--- a/slapos/recipe/kumofs/template/kumo_manager.in
+++ b/slapos/recipe/kumofs/template/kumo_manager.in
+#!/bin/sh
+exec %(kumo_manager_binary)s -a -l %(kumo_manager_ip)s:%(kumo_manager_port)s -o %(kumo_manager_log)s
--- a/slapos/recipe/kumofs/template/kumo_server.in
+++ b/slapos/recipe/kumofs/template/kumo_server.in
+#!/bin/sh
+exec %(kumo_server_binary)s -l %(kumo_server_ip)s:%(kumo_server_port)s -L %(kumo_server_listen_port)s -m %(kumo_manager_ip)s:%(kumo_manager_port)s -s %(kumo_server_storage)s -o %(kumo_server_log)s
--- a/slapos/recipe/kumofs/template/openssl.cnf.ca.in
+++ b/slapos/recipe/kumofs/template/openssl.cnf.ca.in
--- a/slapos/recipe/kumofs/template/stunnel.conf.in
+++ b/slapos/recipe/kumofs/template/stunnel.conf.in
+foreground = yes
+output = %(log)s
+pid = %(pid_file)s
+syslog = no
+CApath = %(ca_path)s
+key = %(key)s
+CRLpath = %(ca_crl)s
+cert = %(cert)s
+[service]
+accept = %(public_ip)s:%(public_port)s
+connect = %(private_ip)s:%(private_port)s
--- a/slapos/recipe/librecipe.py
+++ b/slapos/recipe/librecipe.py
--- a/slapos/recipe/erp5/execute.py
+++ b/slapos/recipe/erp5/execute.py
--- a/slapos/recipe/memcached/__init__.py
+++ b/slapos/recipe/memcached/__init__.py
--- a/slapos/recipe/memcached/certificate_authority.py
+++ b/slapos/recipe/memcached/certificate_authority.py
+import os
+import subprocess
+import time
+import ConfigParser
+def popenCommunicate(command_list, input=None):
+  subprocess_kw = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  if input is not None:
+    subprocess_kw.update(stdin=subprocess.PIPE)
+  popen = subprocess.Popen(command_list, **subprocess_kw)
+  result = popen.communicate(input)[0]
+  if popen.returncode is None:
+    popen.kill()
+  if popen.returncode != 0:
+    raise ValueError('Issue during calling %r, result was:\n%s' % (
+      command_list, result))
+  return result
+class CertificateAuthority:
+  def __init__(self, key, certificate, openssl_binary,
+      openssl_configuration, request_dir):
+    self.key = key
+    self.certificate = certificate
+    self.openssl_binary = openssl_binary
+    self.openssl_configuration = openssl_configuration
+    self.request_dir = request_dir
+  def checkAuthority(self):
+    file_list = [ self.key, self.certificate ]
+    ca_ready = True
+    for f in file_list:
+      if not os.path.exists(f):
+        ca_ready = False
+        break
+    if ca_ready:
+      return
+    for f in file_list:
+      if os.path.exists(f):
+        os.unlink(f)
+    try:
+      # no CA, let us create new one
+      popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
+          self.openssl_configuration, '-new', '-x509', '-extensions',
+          'v3_ca', '-keyout', self.key, '-out', self.certificate,
+          '-days', '10950'], 'Automatic Certificate Authority\n')
+    except:
+      try:
+        for f in file_list:
+          if os.path.exists(f):
+            os.unlink(f)
+      except:
+        # do not raise during cleanup
+        pass
+      raise
+  def _checkCertificate(self, common_name, key, certificate):
+    file_list = [key, certificate]
+    ready = True
+    for f in file_list:
+      if not os.path.exists(f):
+        ready = False
+        break
+    if ready:
+      return False
+    for f in file_list:
+      if os.path.exists(f):
+        os.unlink(f)
+    csr = certificate + '.csr'
+    try:
+      popenCommunicate([self.openssl_binary, 'req', '-config',
+        self.openssl_configuration, '-nodes', '-new', '-keyout',
+        key, '-out', csr, '-days', '3650'],
+        common_name + '\n')
+      try:
+        popenCommunicate([self.openssl_binary, 'ca', '-batch', '-config',
+          self.openssl_configuration, '-out', certificate,
+          '-infiles', csr])
+      finally:
+        if os.path.exists(csr):
+          os.unlink(csr)
+    except:
+      try:
+        for f in file_list:
+          if os.path.exists(f):
+            os.unlink(f)
+      except:
+        # do not raise during cleanup
+        pass
+      raise
+    else:
+      return True
+  def checkRequestDir(self):
+    for request_file in os.listdir(self.request_dir):
+      parser = ConfigParser.RawConfigParser()
+      parser.readfp(open(os.path.join(self.request_dir, request_file), 'r'))
+      if self._checkCertificate(parser.get('certificate', 'name'),
+          parser.get('certificate', 'key_file'), parser.get('certificate',
+            'certificate_file')):
+        print 'Created certificate %r' % parser.get('certificate', 'name')
+def runCertificateAuthority(args):
+  ca_conf = args[0]
+  ca = CertificateAuthority(ca_conf['key'], ca_conf['certificate'],
+      ca_conf['openssl_binary'], ca_conf['openssl_configuration'],
+      ca_conf['request_dir'])
+  while True:
+    ca.checkAuthority()
+    ca.checkRequestDir()
+    time.sleep(60)
--- a/slapos/recipe/memcached/template/memcached.in
+++ b/slapos/recipe/memcached/template/memcached.in
+#!/bin/sh
+exec %(memcached_binary)s -p %(memcached_port)s -U %(memcached_port)s -l %(memcached_ip)s
--- a/slapos/recipe/memcached/template/openssl.cnf.ca.in
+++ b/slapos/recipe/memcached/template/openssl.cnf.ca.in
--- a/slapos/recipe/memcached/template/stunnel.conf.in
+++ b/slapos/recipe/memcached/template/stunnel.conf.in
+foreground = yes
+output = %(log)s
+pid = %(pid_file)s
+syslog = no
+CApath = %(ca_path)s
+key = %(key)s
+CRLpath = %(ca_crl)s
+cert = %(cert)s
+[service]
+accept = %(public_ip)s:%(public_port)s
+connect = %(private_ip)s:%(private_port)s
--- a/slapos/recipe/mysql/__init__.py
+++ b/slapos/recipe/mysql/__init__.py
--- a/slapos/recipe/mysql/certificate_authority.py
+++ b/slapos/recipe/mysql/certificate_authority.py
+import os
+import subprocess
+import time
+import ConfigParser
+def popenCommunicate(command_list, input=None):
+  subprocess_kw = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  if input is not None:
+    subprocess_kw.update(stdin=subprocess.PIPE)
+  popen = subprocess.Popen(command_list, **subprocess_kw)
+  result = popen.communicate(input)[0]
+  if popen.returncode is None:
+    popen.kill()
+  if popen.returncode != 0:
+    raise ValueError('Issue during calling %r, result was:\n%s' % (
+      command_list, result))
+  return result
+class CertificateAuthority:
+  def __init__(self, key, certificate, openssl_binary,
+      openssl_configuration, request_dir):
+    self.key = key
+    self.certificate = certificate
+    self.openssl_binary = openssl_binary
+    self.openssl_configuration = openssl_configuration
+    self.request_dir = request_dir
+  def checkAuthority(self):
+    file_list = [ self.key, self.certificate ]
+    ca_ready = True
+    for f in file_list:
+      if not os.path.exists(f):
+        ca_ready = False
+        break
+    if ca_ready:
+      return
+    for f in file_list:
+      if os.path.exists(f):
+        os.unlink(f)
+    try:
+      # no CA, let us create new one
+      popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
+          self.openssl_configuration, '-new', '-x509', '-extensions',
+          'v3_ca', '-keyout', self.key, '-out', self.certificate,
+          '-days', '10950'], 'Automatic Certificate Authority\n')
+    except:
+      try:
+        for f in file_list:
+          if os.path.exists(f):
+            os.unlink(f)
+      except:
+        # do not raise during cleanup
+        pass
+      raise
+  def _checkCertificate(self, common_name, key, certificate):
+    file_list = [key, certificate]
+    ready = True
+    for f in file_list:
+      if not os.path.exists(f):
+        ready = False
+        break
+    if ready:
+      return False
+    for f in file_list:
+      if os.path.exists(f):
+        os.unlink(f)
+    csr = certificate + '.csr'
+    try:
+      popenCommunicate([self.openssl_binary, 'req', '-config',
+        self.openssl_configuration, '-nodes', '-new', '-keyout',
+        key, '-out', csr, '-days', '3650'],
+        common_name + '\n')
+      try:
+        popenCommunicate([self.openssl_binary, 'ca', '-batch', '-config',
+          self.openssl_configuration, '-out', certificate,
+          '-infiles', csr])
+      finally:
+        if os.path.exists(csr):
+          os.unlink(csr)
+    except:
+      try:
+        for f in file_list:
+          if os.path.exists(f):
+            os.unlink(f)
+      except:
+        # do not raise during cleanup
+        pass
+      raise
+    else:
+      return True
+  def checkRequestDir(self):
+    for request_file in os.listdir(self.request_dir):
+      parser = ConfigParser.RawConfigParser()
+      parser.readfp(open(os.path.join(self.request_dir, request_file), 'r'))
+      if self._checkCertificate(parser.get('certificate', 'name'),
+          parser.get('certificate', 'key_file'), parser.get('certificate',
+            'certificate_file')):
+        print 'Created certificate %r' % parser.get('certificate', 'name')
+def runCertificateAuthority(args):
+  ca_conf = args[0]
+  ca = CertificateAuthority(ca_conf['key'], ca_conf['certificate'],
+      ca_conf['openssl_binary'], ca_conf['openssl_configuration'],
+      ca_conf['request_dir'])
+  while True:
+    ca.checkAuthority()
+    ca.checkRequestDir()
+    time.sleep(60)
--- a/slapos/recipe/mysql/mysql.py
+++ b/slapos/recipe/mysql/mysql.py
+import os
+import subprocess
+import time
+import sys
+def runMysql(args):
+  sleep = 60
+  conf = args[0]
+  mysqld_wrapper_list = [conf['mysqld_binary'], '--defaults-file=%s' %
+      conf['configuration_file']]
+  # we trust mysql_install that if mysql directory is available mysql was
+  # correctly initalised
+  if not os.path.isdir(os.path.join(conf['data_directory'], 'mysql')):
+    while True:
+      # XXX: Protect with proper root password
+      # XXX: Follow http://dev.mysql.com/doc/refman/5.0/en/default-privileges.html
+      popen = subprocess.Popen([conf['mysql_install_binary'],
+        '--skip-name-resolve', '--no-defaults', '--datadir=%s' %
+        conf['data_directory']],
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+      result = popen.communicate()[0]
+      if popen.returncode is None or popen.returncode != 0:
+        print "Failed to initialise server.\nThe error was: %s" % result
+        print "Waiting for %ss and retrying" % sleep
+        time.sleep(sleep)
+      else:
+        print "Mysql properly initialised"
+        break
+  else:
+    print "MySQL already initialised"
+  print "Starting %r" % mysqld_wrapper_list[0]
+  sys.stdout.flush()
+  sys.stderr.flush()
+  os.execl(mysqld_wrapper_list[0], *mysqld_wrapper_list)
+def updateMysql(args):
+  conf = args[0]
+  sleep = 30
+  is_succeed = False
+  while True:
+    if not is_succeed:
+      mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--no-defaults', '--user=root', '--socket=%s' % conf['socket']]
+      mysql_upgrade = subprocess.Popen(mysql_upgrade_list, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+      result = mysql_upgrade.communicate()[0]
+      if mysql_upgrade.returncode is None:
+        mysql_upgrade.kill()
+      if mysql_upgrade.returncode != 0 and not 'is already upgraded' in result:
+        print "Command %r failed with result:\n%s" % (mysql_upgrade_list, result)
+        print 'Sleeping for %ss and retrying' % sleep
+      else:
+        if mysql_upgrade.returncode == 0:
+          print "MySQL database upgraded with result:\n%s" % result
+        else:
+          print "No need to upgrade MySQL database"
+        mysql_list = [conf['mysql_binary'].strip(), '--no-defaults', '-B', '--user=root', '--socket=%s' % conf['socket']]
+        mysql = subprocess.Popen(mysql_list, stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        result = mysql.communicate(conf['mysql_script'])[0]
+        if mysql.returncode is None:
+          mysql.kill()
+        if mysql.returncode != 0:
+          print 'Command %r failed with:\n%s' % (mysql_list, result)
+          print 'Sleeping for %ss and retrying' % sleep
+        else:
+          is_succeed = True
+          print 'SlapOS initialisation script succesfully applied on database.'
+    sys.stdout.flush()
+    sys.stderr.flush()
+    time.sleep(sleep)
--- a/slapos/recipe/mysql/template/initmysql.sql.in
+++ b/slapos/recipe/mysql/template/initmysql.sql.in
+CREATE DATABASE IF NOT EXISTS %(mysql_database)s;
+GRANT ALL PRIVILEGES ON %(mysql_database)s.* TO %(mysql_user)s@'%%' IDENTIFIED BY '%(mysql_password)s';
+#GRANT ALL PRIVILEGES ON %(mysql_database)s.* TO %(mysql_user)s@* IDENTIFIED BY '%(mysql_password)s';
--- a/slapos/recipe/mysql/template/logrotate_entry.in
+++ b/slapos/recipe/mysql/template/logrotate_entry.in
+%(file_list)s {
+  daily
+  dateext
+  rotate 30
+  compress
+  notifempty
+  sharedscripts
+  create
+  postrotate
+    %(postrotate)s
+  endscript
+  olddir %(olddir)s
+}
--- a/slapos/recipe/mysql/template/my.cnf.in
+++ b/slapos/recipe/mysql/template/my.cnf.in
+# ERP5 buildout my.cnf template based on my-huge.cnf shipped with mysql
+# The MySQL server
+[mysqld]
+# ERP5 by default requires InnoDB storage. MySQL by default fallbacks to using
+# different engine, like MyISAM. Such behaviour generates problems only, when
+# tables requested as InnoDB are silently created with MyISAM engine.
+#
+# Loud fail is really required in such case.
+sql-mode="NO_ENGINE_SUBSTITUTION"
+skip-show-database
+port = %(tcp_port)s
+bind-address = %(ip)s
+socket = %(socket)s
+datadir = %(data_directory)s
+pid-file = %(pid_file)s
+log-error = %(error_log)s
+#log-slow-file = %(slow_query_log)s
+long_query_time = 5
+max_allowed_packet = 128M
+query_cache_size = 32M
+plugin-load = ha_innodb_plugin.so
+# The following are important to configure and depend a lot on to the size of
+# your database and the available resources.
+#innodb_buffer_pool_size = 4G
+#innodb_log_file_size = 256M
+#innodb_log_buffer_size = 8M
+# Some dangerous settings you may want to uncomment if you only want
+# performance or less disk access. Useful for unit tests.
+#innodb_flush_log_at_trx_commit = 0
+#innodb_flush_method = nosync
+#innodb_doublewrite = 0
+#sync_frm = 0
+# Uncomment the following if you need binary logging, which is recommended
+# on production instances (either for replication or incremental backups).
+#log-bin=mysql-bin
+# Force utf8 usage
+collation_server = utf8_unicode_ci
+character_set_server = utf8
+skip-character-set-client-handshake
+[mysql]
+no-auto-rehash
+socket = %(socket)s
+[mysqlhotcopy]
+interactive-timeout
--- a/slapos/recipe/mysql/template/openssl.cnf.ca.in
+++ b/slapos/recipe/mysql/template/openssl.cnf.ca.in
--- a/slapos/recipe/mysql/template/stunnel.conf.in
+++ b/slapos/recipe/mysql/template/stunnel.conf.in
+foreground = yes
+output = %(log)s
+pid = %(pid_file)s
+syslog = no
+CApath = %(ca_path)s
+key = %(key)s
+CRLpath = %(ca_crl)s
+cert = %(cert)s
+[service]
+accept = %(public_ip)s:%(public_port)s
+connect = %(private_ip)s:%(private_port)s
--- a/slapos/recipe/vifib.py
+++ b/slapos/recipe/vifib.py
--- a/slapos/recipe/zabbixagent/__init__.py
+++ b/slapos/recipe/zabbixagent/__init__.py
--- a/slapos/recipe/zabbixagent/catdatefile.py
+++ b/slapos/recipe/zabbixagent/catdatefile.py
--- a/slapos/recipe/zabbixagent/svcdaemon.py
+++ b/slapos/recipe/zabbixagent/svcdaemon.py
--- a/slapos/recipe/zabbixagent/template/logrotate_entry.in
+++ b/slapos/recipe/zabbixagent/template/logrotate_entry.in
--- a/slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in
+++ b/slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in
--- a/software/cloudooo/instance.cfg
+++ b/software/cloudooo/instance.cfg
--- a/software/cloudooo/software.cfg
+++ b/software/cloudooo/software.cfg
--- a/software/erp5/instance.cfg
+++ b/software/erp5/instance.cfg
--- a/software/erp5/software.cfg
+++ b/software/erp5/software.cfg
--- a/software/erp5testnode/instance.cfg
+++ b/software/erp5testnode/instance.cfg
--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
--- a/software/kumofs/instance.cfg
+++ b/software/kumofs/instance.cfg
--- a/software/kumofs/software.cfg
+++ b/software/kumofs/software.cfg
--- a/software/mariadb/instance.cfg
+++ b/software/mariadb/instance.cfg
--- a/software/mariadb/software.cfg
+++ b/software/mariadb/software.cfg
--- a/software/memcached/instance.cfg
+++ b/software/memcached/instance.cfg
--- a/software/memcached/software.cfg
+++ b/software/memcached/software.cfg
--- a/software/mysql-5.1/instance.cfg
+++ b/software/mysql-5.1/instance.cfg
--- a/software/mysql-5.1/software.cfg
+++ b/software/mysql-5.1/software.cfg
--- a/software/vifib/software.cfg
+++ b/software/vifib/software.cfg
--- a/software/zabbix-agent/instance.cfg
+++ b/software/zabbix-agent/instance.cfg
--- a/software/zabbix-agent/software.cfg
+++ b/software/zabbix-agent/software.cfg
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
--- a/stack/erp5.cfg
+++ b/stack/erp5.cfg