Merge branch 'master' into erp5testnode

.gitignore

 *pyc
+.installed.cfg
+bin/
 build
+develop-eggs/
 dist
+downloads/
+eggs/
+parts/
 slapos.cookbook.egg-info

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.

CHANGES.txt

-0.8 (unreleased)
+0.11 (not yet released)
 ================
 
- * No changes yet.
+ * No change yet.
+
+0.10 (2011-07-01)
+================
+
+ * Add PHPMyAdmin software release used in SlapOS tutorials
+ [Cedric de Saint Martin]
+ * Add slaprunner software release [Cedric de Saint Martin]
+
+0.9 (2011-06-24)
+================
+
+ * mysql recipe : Changing slapos.recipe.erp5.execute to
+   slapos.recipe.librecipe.execute [Cedric de Saint Martin]
+
+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)
 ================
@@ -37,10 +57,10 @@
  * Fix apache module configuration [Kazuhiko Shiozaki]
  * Allow to control full environment in erp5 module [Łukasz Nowak]
 
-0.2 (unreleased)
+0.2 (2011-05-30)
 ================
 
-  * No changes yet.
+  * Allow to pass zope_environment in erp5 entry point [Łukasz Nowak]
 
 0.1 (2011-05-27)
 ================

component/apache-php/buildout.cfg

+[buildout]
+parts = apache-php
+
+extends = 
+  ../apache/buildout.cfg
+
+[apache-php]
+# Note: Shall react on each build of apache and reinstall itself
+recipe = hexagonit.recipe.cmmi
+url = http://fr2.php.net/get/php-5.3.6.tar.bz2/from/this/mirror
+md5sum = 2286f5a82a6e8397955a0025c1c2ad98
+configure-options =
+  --with-apxs2=${apache:location}/bin/apxs
+  --with-libxml-dir=${libxml2:location}
+  --with-mysql=${mariadb:location}
+  --with-zlib-dir=${zlib:location}
+  --with-mcrypt=${libmcrypt:location}
+  --enable-mbstring
+  --enable-session
+  --disable-all
+
+environment =
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
+  PATH=${libxml2:location}/bin:%(PATH)s
+  LDFLAGS =-L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/lib
+
+[apache-php-xmlrpc-gd]
+# Note: Shall react on each build of apache and reinstall itself
+recipe = hexagonit.recipe.cmmi
+url = http://fr2.php.net/get/php-5.3.6.tar.bz2/from/this/mirror
+md5sum = 2286f5a82a6e8397955a0025c1c2ad98
+configure-options =
+  --with-apxs2=${apache:location}/bin/apxs
+  --with-libxml-dir=${libxml2:location}
+  --with-gd
+  --with-zlib-dir=${zlib:location}
+  --with-mcrypt=${libmcrypt:location}
+  --with-xmlrpc=${xml-rpc:location}
+  --enable-mbstring
+  --enable-session
+  --disable-all
+
+environment =
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
+  PATH=${libxml2:location}/bin:%(PATH)s
+  LDFLAGS =-L${xml-rpc:location}/lib -Wl,-rpath -Wl,${xml-rpc:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/lib
+
+
+[libmcrypt]
+recipe = hexagonit.recipe.cmmi
+url = http://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2/download
+md5sum = c4f491dd411a09e9de3b8702ea6f73eb
+
+[xml-rpc]
+recipe = hexagonit.recipe.cmmi
+url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz
+md5sum = 59a644c636c6d98267d0c99b406ae9e8
\ No newline at end of file

component/apache/buildout.cfg

@@ -13,6 +13,55 @@ extends =
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
 
+[apache-no-ssl]
+# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
+recipe = hexagonit.recipe.cmmi
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.19.tar.bz2
+md5sum = 832f96a6ec4b8fc7cf49b9efd4e89060
+configure-options = --enable-authn-alias
+                    --enable-bucketeer
+                    --enable-cache
+                    --enable-case-filter
+                    --enable-case-filter-in
+                    --enable-cgid
+                    --enable-charset-lite
+                    --enable-disk-cache
+                    --enable-echo
+                    --enable-exception-hook
+                    --enable-mods-shared=all
+                    --enable-optional-fn-export
+                    --enable-optional-fn-import
+                    --enable-optional-hook-export
+                    --enable-optional-hook-import
+                    --enable-proxy
+                    --enable-proxy-ajp
+                    --enable-proxy-balancer
+                    --enable-proxy-connect
+                    --enable-proxy-ftp
+                    --enable-proxy-http
+                    --enable-proxy-scgi
+                    --enable-so
+                    --disable-ssl
+                    --with-included-apr
+                    --with-z=${zlib:location}
+                    --with-expat=${libexpat:location}
+                    --with-pcre=${pcre:location}
+                    --with-sqlite3=${sqlite3:location}
+                    --with-dbm=gdbm
+                    --with-gdm=${gdbm:location}
+                    --without-ssl
+                    --without-lber
+                    --without-ldap
+                    --without-ndbm
+                    --without-berkeley-db
+                    --without-pgsql
+                    --without-mysql
+                    --without-sqlite2
+                    --without-oracle
+                    --without-freedts
+                    --without-odbc
+                    --without-iconv
+
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = hexagonit.recipe.cmmi
@@ -67,7 +116,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

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
-md5sum = ea45c778b36bdc7a720096819e292a73
+url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2
+md5sum = 9dba20116b13fc61a0846b0058fbe004
 environment =
   M4=${m4:location}/bin/m4

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
-md5sum = 36909ae68840d73a800120cf74af794a
+url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.12.tar.gz
+md5sum = fce7999953a67243d00d75cc86dbcaa6
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
 environment =

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

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

component/erp5/buildout.cfg

-[buildout]
-extends =
-  ../mysql-tritonn-5.0/buildout.cfg
-  ../python-2.4/buildout.cfg
-  ../lxml-python/buildout.cfg
-  ../mysql-python/buildout.cfg
-  ../subversion/buildout.cfg
-  ../pysvn-python/buildout.cfg
-  ../python-ldap-python/buildout.cfg
-  ../glib/buildout.cfg
-
-parts =
-  cmf15
-  itools
-  mysql-python
-  products-other
-  products-deps
-  products-erp5
-
-[cmf15]
-recipe = plone.recipe.distros
-urls =
-    http://www.zope.org/Products/CMF/CMF-1.5.4/CMF-1.5.4.tar.gz
-nested-packages =
-  CMF-1.5.4.tar.gz
-version-suffix-packages =
-  CMF-1.5.4.tar.gz
-
-[itools]
-# use a custom build for itools, to add lib64 to the include path
-recipe = zc.recipe.egg:custom
-python = python2.4
-egg = itools
-find-links =
-  http://download.hforge.org/itools/0.20/
-include-dirs =
-  ${glib:location}/include/glib-2.0
-  ${glib:location}/lib/glib-2.0/include
-library-dirs =
-  ${glib:location}/lib
-rpath =
-  ${glib:location}/lib
-
-[products-deps]
-recipe = plone.recipe.distros
-urls =
-    http://www.zope.org/Members/shh/ExtFile/1.4.4/ExtFile-1.4.4.tar.gz
-    http://www.zope.org/Members/NIP/ZMailIn/1.0.1/ZMailIn-1-0-1.tgz
-    http://www.zope.org/Members/NIP/ZMailIn/1.0.0/CMFMailIn-1.0.0
-    http://www.zope.org/Products/PluggableAuthService/PluggableAuthService-1.1b2/PluggableAuthService-1.1b2.tar.gz
-    http://download.hforge.org/localizer/Localizer-1.2.3.tar.gz
-version-suffix-packages =
-    Localizer-1.2.3.tar.gz
-
-[products-ldap]
-recipe = plone.recipe.distros
-
-urls =
-  http://www.dataflake.org/software/ldapmultiplugins/ldapmultiplugins_1.1/LDAPMultiPlugins-1_1.tgz
-  http://www.dataflake.org/software/ldapuserfolder/ldapuserfolder_2.6/LDAPUserFolder-2_6.tgz
-
-[products-other]
-# Recipe infrae.subversion is using svn command under the hood, but there is
-# no way to pass --trust-server-cert --non-interactive --no-auth-cache, so in 2.12 falvour
-# it is better to evaluate usage of provided subversion command
-recipe = plone.recipe.command
-svn_param =--trust-server-cert --non-interactive --no-auth-cache --quiet
-# dircty hack to support PluginRegistry/utils.py:17 assumption that products
-# are in Products folder
-# XXX: Zelenium was eggfied for recent zope versions (2.12) and are available at Bazaar.
-#      some better alternative should be used in future.
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-destination = ${:location}/Products
-stop-on-error = true
-update-command = ${:command}
-command = ${subversion:location}/bin/svn checkout ${:svn_param} http://svn.plone.org/svn/collective/DCWorkflowGraph/tags/release-0_3/ ${:destination}/DCWorkflowGraph &&
-  ${subversion:location}/bin/svn checkout ${:svn_param} svn://svn.zope.org/repos/main/Zelenium/trunk/@110603 ${:destination}/Zelenium &&
-  ${subversion:location}/bin/svn checkout ${:svn_param} svn://svn.zope.org/repos/main/PluginRegistry/tags/1.0 ${:destination}/PluginRegistry &&
-  ${subversion:location}/bin/svn checkout ${:svn_param} http://svn.plone.org/svn/archetypes/MimetypesRegistry/tags/Archetypes-1.4.0-final ${:destination}/MimetypesRegistry
-
-[eggs]
-recipe = zc.recipe.egg
-python = python2.4
-eggs =
-  ${itools:egg}
-  ${mysql-python:egg}
-  ${lxml-python:egg}
-  ${pysvn-python:egg}
-  ${python-ldap-python:egg}
-  PyXML
-  ClientForm
-  SOAPpy
-  cElementTree
-  chardet
-  ctypes
-  elementtree
-  erp5.recipe.mysqldatabase
-  erp5diff
-  ipdb
-  mechanize
-  numpy
-  ordereddict
-  pycrypto
-  paramiko
-  ply
-  python-ldap
-  python-magic
-  python-memcached
-  pytz
-  simplejson
-  threadframe
-  timerserver
-  urlnorm
-  uuid
-  xml_marshaller
-  xupdate_processor
-  feedparser
-
-extra-paths =
-  ${zope-2.8:location}/lib/python
-# shut down script generation. Other parts can generate scripts as needed by
-# reusing ${eggs:eggs}
-
-# parameterizing the version of the generated python interpreter name by the
-# python section version causes dependency between this egg section and the
-# installation of python, which we don't want on an instance
-interpreter = python2.4
-scripts =
-        python=${:interpreter}
-        ipython=i${:interpreter}
-
-[mysql-python]
-python = python2.4
-
-[lxml-python]
-python = python2.4
-
-[python-ldap-python]
-python = python2.4
-
-[pysvn-python]
-python = python2.4
-
-[omelette]
-# XXX don't use this part until this omelette bug is fixed:
-# https://bugs.launchpad.net/collective.buildout/+bug/553005
-recipe = collective.recipe.omelette
-eggs = ${eggs:eggs}
-packages =
-      ${itools:lib} .
-
-[precache-eggs]
-python = python2.4
-eggs +=
-  plone.recipe.zope2zeoserver

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

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

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

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
 

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

component/freetype/buildout.cfg

@@ -10,10 +10,10 @@ parts =
 
 [freetype]
 recipe = hexagonit.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.4.tar.gz
-md5sum = 9273efacffb683483e58a9e113efae9f
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.5.tar.bz2
+md5sum = 90428a6d8ec4876cd1eb94858c2a59b0
 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

component/gcc/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [gmp]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gmplib.org/pub/gmp-4.3.2/gmp-4.3.2.tar.bz2
-md5sum = dd60683d7057917e34630b4a787932e8
+url = ftp://ftp.gmplib.org/pub/gmp-5.0.2/gmp-5.0.2.tar.bz2
+md5sum = 0bbaedc82fb30315b06b1588b9077cd3
 # GMP does not correctly detect achitecture so it have to be given
 # as hexagonit.recipe.cmmi is using shell expansion in subproceses
 # backticks are working
@@ -22,13 +22,13 @@ environment =
 
 [mpfr]
 recipe = hexagonit.recipe.cmmi
-url = http://www.mpfr.org/mpfr-3.0.0/mpfr-3.0.0.tar.bz2
-md5sum = f45bac3584922c8004a10060ab1a8f9f
+url = http://www.mpfr.org/mpfr-3.0.1/mpfr-3.0.1.tar.bz2
+md5sum = bfbecb2eacb6d48432ead5cfc3f7390a
 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
@@ -50,15 +50,15 @@ filename = ecj.jar
 
 [gcc-download]
 recipe = hexagonit.recipe.download
-url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.2/gcc-4.5.2.tar.bz2
-md5sum = d6559145853fbaaa0fd7556ed93bce9a
+url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
+md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
 strip-top-level-dir = True
 destination = ${gcc-java-source:location}
 
 [gcc-java-download]
 recipe = hexagonit.recipe.download
-url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.2/gcc-java-4.5.2.tar.bz2
-md5sum = fe2b647bace18dc7867a4192def46e2c
+url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-java-4.5.3.tar.bz2
+md5sum = 08e045fdbdc22ac9af3aec3b8d16dbab
 strip-top-level-dir = True
 destination = ${gcc-java-source:location}
 ignore-existing = true
@@ -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

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

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]

component/git/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [git]
 recipe = hexagonit.recipe.cmmi
-url = http://kernel.org/pub/software/scm/git/git-1.7.3.4.tar.bz2
-md5sum = 3a2602016f98c529cda7b9fad1a6e216
+url = http://kernel.org/pub/software/scm/git/git-1.7.4.5.tar.bz2
+md5sum = 2fa6c4c847ed87523cf55de54af457eb
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}
@@ -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

component/glib/buildout.cfg

@@ -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

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

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

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

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

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

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
-md5sum = 8fdcb7c0e78d54ff0362a800cbe3bc31
+url = http://download.sourceforge.net/libpng/libpng-1.5.2.tar.bz2
+md5sum = a003b37ed9afb0d9164eb7228421057c

component/libreoffice-bin/buildout.cfg

@@ -10,7 +10,7 @@ versions = versions
 
 [versions]
 # special version of z3c.recipe.openoffice with architecture autodetection
-z3c.recipe.openoffice = 0.3.1dev7
+z3c.recipe.openoffice = 0.3.1dev8
 
 [libreoffice-bin]
 recipe = z3c.recipe.openoffice

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

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

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

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

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

component/lxml-python/buildout.cfg

@@ -13,6 +13,18 @@ PATH = ${libxslt:location}/bin:%(PATH)s
 [lxml-python]
 recipe = zc.recipe.egg:custom
 egg = lxml
+
+# Note: Workaround lxml.de issues blocking buildout runs
+# Empty index makes setuptools NOT trying to find any meta information about
+# lxml...
+index =
+# ...so it is wise to tell where lxml can be found
+find-links =
+  http://pypi.python.org/pypi/lxml/2.2.8
+  http://pypi.python.org/pypi/lxml/2.3
+# Note: Whenever someone is going to remove it, one shall check, that buildout
+# can run in newest mode, without any locally downloaded cache
+
 rpath =
   ${libxml2:location}/lib/
   ${libxslt:location}/lib/

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
-md5sum = 5649a2e593b6c639deae9e72ede777dd
+url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
+md5sum = 8a7cef47fecab6272eb86a6be6363b2f

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

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
 

component/mysql-5.1/buildout.cfg

@@ -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

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

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

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

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"
-  SHARED_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=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"

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

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"

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

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 =

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

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
+  --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

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}

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

component/python-2.6/buildout.cfg

@@ -43,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

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
-md5sum = 35f56b092ecf39a6bd59d64f142aae0f
+package_version = 2.7.1
+md5sum = aa27bc25725137ba155910bd8e5ddc4f
 package_version_suffix =
 
-[python2.7.1]
+[python2.7.2]
 <= python2.7common
-package_version = 2.7.1
-md5sum = 15ed56733655e3fab785e49a7278d2fb
+package_version = 2.7.2
+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

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

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

component/slapos/buildout.cfg

@@ -18,24 +18,29 @@ python = python2.7
 recipe = z3c.recipe.scripts
 python = python2.7
 eggs =
+  slapos.libnetworkcache
+  zc.buildout
   ${lxml-python:egg}
   slapos.core
 
 [versions]
-zc.buildout = 1.5.3-dev-SlapOS-001
+zc.buildout = 1.5.3-dev-SlapOS-004
 Jinja2 = 2.5.5
 Werkzeug = 0.6.2
+buildout-versions = 1.6
 hexagonit.recipe.cmmi = 1.5.0
 lxml = 2.3
 meld3 = 0.6.7
-setuptools = 0.6c12dev-r88795
-slapos.core = 0.2
+netaddr = 0.7.5
+setuptools = 0.6c12dev-r88846
+slapos.core = 0.8
+slapos.libnetworkcache = 0.1
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.2
+# slapos.core==0.8
 Flask = 0.6.1
 
 # Required by:
@@ -43,18 +48,13 @@ Flask = 0.6.1
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.core==0.2
-netaddr = 0.7.5
-
-# Required by:
-# slapos.core==0.2
+# slapos.core==0.8
 netifaces = 0.5
 
 # Required by:
-# slapos.core==0.2
+# slapos.core==0.8
 supervisor = 3.0a10
 
 # Required by:
-# slapos.core==0.2
+# slapos.core==0.8
 zope.interface = 3.6.3
-

component/sphinx/buildout.cfg

+# Sphinx - Open Source Search Server
+# http://sphinxsearch.com/
+
 [buildout]
 parts = sphinx
 extends =
@@ -5,13 +8,6 @@ extends =
   ../mariadb/buildout.cfg
   ../zlib/buildout.cfg
 
-[sphinx-1.10-fix_nosigpipe.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = b606b2a267ebfbd009bb1e72e7a29462
-download-only = true
-filename = sphinx-1.10-fix_nosigpipe.patch
-
 [sphinx-1.10-beta-snowball.patch]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
@@ -22,8 +18,8 @@ filename = sphinx-1.10-beta-snowball.patch
 
 [sphinx]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sphinxsearch.com/files/sphinx-1.10-beta.tar.gz
-md5sum = 5b52ce9e93a73c66d37bc3a2402f14fa
+url = http://sphinxsearch.com/files/sphinx-2.0.1-beta.tar.gz
+md5sum = 95c217d81d0b7a4ff73d5297318c3481
 configure-options =
   --with-mysql
   --with-mysql-includes=${mariadb:location}/include/mysql
@@ -34,8 +30,7 @@ configure-options =
   --without-unixodbc
 patch-options = -p1
 patches =
-  ${sphinx-1.10-fix_nosigpipe.patch:location}/${sphinx-1.10-fix_nosigpipe.patch:filename}
   ${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

component/sqlite3/buildout.cfg

@@ -5,11 +5,11 @@ parts =
 
 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz
-md5sum = f16c08617968b4087b3d591fd575f59f
+url = http://www.sqlite.org/sqlite-autoconf-3070603.tar.gz
+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

component/stunnel/buildout.cfg

@@ -17,8 +17,8 @@ filename = stunnel-4-hooks.py
 
 [stunnel-4]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.stunnel.org/stunnel/stunnel-4.36.tar.gz
-md5sum = 600a09b03798424842b24548ca1e4235
+url = ftp://ftp.stunnel.org/stunnel/stunnel-4.38.tar.gz
+md5sum = de5c0478303da746f946d9c112fa7f4b
 pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
 configure-options =
   --enable-ipv6
@@ -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

component/subversion/buildout.cfg

@@ -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

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

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

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

component/w3m/buildout.cfg

@@ -9,6 +9,18 @@ extends =
 parts =
   w3m
 
+versions = versions
+
+find-links =
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+[w3m-w3m.gcc.forward.compat.patch]
+recipe = hexagonit.recipe.download
+url =${:_profile_base_location_}/${:filename}
+filename = w3m.gcc.forward.compat.patch
+download-only = true
+md5sum = 75422a6f7f671b3a6d9add6724cc0945
+
 [w3m]
 recipe = hexagonit.recipe.cmmi
 md5sum = 1b845a983a50b8dec0169ac48479eacc
@@ -27,8 +39,18 @@ configure-options =
   --disable-external-uri-loader
   --disable-w3mmailer
 
+patch-options =
+  -p1
+
+patches =
+  ${w3m-w3m.gcc.forward.compat.patch:location}/${w3m-w3m.gcc.forward.compat.patch:filename}
+
 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
+
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-004

component/w3m/w3m.gcc.forward.compat.patch

+diff --git a/istream.c b/istream.c
+index 8967280..d4c788a 100644
+--- a/istream.c
++++ b/istream.c
+@@ -22,8 +22,8 @@
+ static void basic_close(int *handle);
+ static int basic_read(int *handle, char *buf, int len);
+ 
+-static void file_close(struct file_handle *handle);
+-static int file_read(struct file_handle *handle, char *buf, int len);
++static void file_close(struct w3m_file_handle *handle);
++static int file_read(struct w3m_file_handle *handle, char *buf, int len);
+ 
+ static int str_read(Str handle, char *buf, int len);
+ 
+@@ -114,7 +114,7 @@ newFileStream(FILE * f, void (*closep) ())
+     stream = New(union input_stream);
+     init_base_stream(&stream->base, STREAM_BUF_SIZE);
+     stream->file.type = IST_FILE;
+-    stream->file.handle = New(struct file_handle);
++    stream->file.handle = New(struct w3m_file_handle);
+     stream->file.handle->f = f;
+     if (closep)
+ 	stream->file.handle->close = closep;
+@@ -658,13 +658,13 @@ basic_read(int *handle, char *buf, int len)
+ }
+ 
+ static void
+-file_close(struct file_handle *handle)
++file_close(struct w3m_file_handle *handle)
+ {
+     handle->close(handle->f);
+ }
+ 
+ static int
+-file_read(struct file_handle *handle, char *buf, int len)
++file_read(struct w3m_file_handle *handle, char *buf, int len)
+ {
+     return fread(buf, 1, len, handle->f);
+ }
+diff --git a/istream.h b/istream.h
+index a220d8b..6d9736d 100644
+--- a/istream.h
++++ b/istream.h
+@@ -20,7 +20,7 @@ struct stream_buffer {
+ 
+ typedef struct stream_buffer *StreamBuffer;
+ 
+-struct file_handle {
++struct w3m_file_handle {
+     FILE *f;
+     void (*close) ();
+ };
+@@ -53,7 +53,7 @@ struct base_stream {
+ 
+ struct file_stream {
+     struct stream_buffer stream;
+-    struct file_handle *handle;
++    struct w3m_file_handle *handle;
+     char type;
+     char iseos;
+     int (*read) ();

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;

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

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.8-dev'
+version = '0.11dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -49,8 +49,13 @@ setup(name=name,
           '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',
+          'osoeslaptraining = slapos.recipe.osoeslaptraining:Request',
+          'osoeslaptraining.request = slapos.recipe.osoeslaptraining:Request',
+          'osoeslaptraining.static = slapos.recipe.osoeslaptraining:Static',
+          'osoeslaptraining.simple = slapos.recipe.osoeslaptraining:Simple',
           'proactive = slapos.recipe.proactive:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
           'siptester = slapos.recipe.siptester:SipTesterRecipe',

slapos/recipe/README.mysql.txt

+mysql
+=========
+
+Instantiates MySQL instance.

slapos/recipe/erp5/__init__.py

@@ -34,6 +34,9 @@ import sys
 import zc.buildout
 import zc.recipe.egg
 import ConfigParser
+import re
+
+_isurl = re.compile('([a-zA-Z0-9+.-]+)://').match
 
 # based on Zope2.utilities.mkzopeinstance.write_inituser
 def Zope2InitUser(path, username, password):
@@ -68,20 +71,27 @@ class Recipe(BaseSlapRecipe):
         self.getLocalIPv4Address(), 23000, 23060)
     mysql_conf = self.installMysqlServer(self.getLocalIPv4Address(), 45678)
     user, password = self.installERP5()
-    zodb_dir = os.path.join(self.data_root_directory, 'zodb')
-    self._createDirectory(zodb_dir)
-    zodb_root_path = os.path.join(zodb_dir, 'root.fs')
-    zope_access = self.installZope(ip=self.getLocalIPv4Address(),
-          port=12000 + 1, name='zope_%s' % 1,
-          zodb_configuration_string=self.substituteTemplate(
-            self.getTemplateFilename('zope-zodb-snippet.conf.in'),
-            dict(zodb_root_path=zodb_root_path)), with_timerservice=True)
+
+    if self.parameter_dict.get("slap_software_type", "").lower() == "cluster":
+      # Site access is done by HAProxy
+      zope_access, site_access = self.installZopeCluster()
+    else:
+      zope_access = self.installZopeStandalone()
+      site_access = zope_access
+
     key, certificate = self.requestCertificate('Login Based Access')
     apache_conf = dict(
         apache_login=self.installBackendApache(ip=self.getGlobalIPv6Address(),
-          port=13000, backend=zope_access, key=key, certificate=certificate))
-    self.installERP5Site(user, password, zope_access, mysql_conf, 
-             conversion_server_conf, memcached_conf, kumo_conf, self.site_id)
+          port=13000, backend=site_access, key=key, certificate=certificate))
+
+    default_bt5_list = []
+    if self.parameter_dict.get("flavour", "default") == 'configurator':
+      default_bt5_list = self.options.get("configurator_bt5_list", '').split()
+
+    self.installERP5Site(user, password, zope_access, mysql_conf,
+             conversion_server_conf, memcached_conf, kumo_conf,
+             self.site_id, default_bt5_list)
+
     self.installTestRunner(ca_conf, mysql_conf, conversion_server_conf,
                            memcached_conf, kumo_conf)
     self.installTestSuiteRunner(ca_conf, mysql_conf, conversion_server_conf,
@@ -96,6 +106,87 @@ class Recipe(BaseSlapRecipe):
     ))
     return self.path_list
 
+  def installZopeStandalone(self):
+    """ Install a single Zope instance without ZEO Server.
+    """
+    zodb_dir = os.path.join(self.data_root_directory, 'zodb')
+    self._createDirectory(zodb_dir)
+    zodb_root_path = os.path.join(zodb_dir, 'root.fs')
+
+    thread_amount_per_zope = int(self.options.get(
+                                 'single_zope_thread_amount', 4))
+
+    return self.installZope(ip=self.getLocalIPv4Address(),
+          port=12000 + 1, name='zope_%s' % 1,
+          zodb_configuration_string=self.substituteTemplate(
+            self.getTemplateFilename('zope-zodb-snippet.conf.in'),
+            dict(zodb_root_path=zodb_root_path)), with_timerservice=True,
+            thread_amount=thread_amount_per_zope)
+
+  def installZopeCluster(self):
+    """ Install ERP5 using ZEO Cluster
+    """
+    site_check_path = '/%s/getId' % self.site_id
+    thread_amount_per_zope = int(self.options.get(
+                                'cluster_zope_thread_amount', 1))
+
+    activity_node_amount = 2
+    user_node_amount = 2
+    ip = self.getLocalIPv4Address()
+    storage_dict = self._requestZeoFileStorage('Zeo Server 1', 'main')
+
+    zeo_conf = self.installZeo(ip)
+    tidstorage_config = dict(host=ip, port='6001')
+
+    mount_point = '/'
+    check_path = '/erp5/account_module'
+
+    known_tid_storage_identifier_dict = {}
+    known_tid_storage_identifier_dict[
+      (((storage_dict['ip'],storage_dict['port']),), storage_dict['storage_name'])
+        ] = (zeo_conf[storage_dict['storage_name']]['path'], check_path or mount_point)
+
+    zodb_configuration_string = self.substituteTemplate(
+        self.getTemplateFilename('zope-zeo-snippet.conf.in'), dict(
+        storage_name=storage_dict['storage_name'],
+        address='%s:%s' % (storage_dict['ip'], storage_dict['port']),
+        mount_point=mount_point
+        ))
+
+    zope_port = 12000
+    # One Distribution Node (Single Thread Always)
+    zope_port += 1
+    self.installZope(ip, zope_port, 'zope_distribution', with_timerservice=True,
+        zodb_configuration_string=zodb_configuration_string,
+        tidstorage_config=tidstorage_config)
+
+    # Activity Nodes (Single Thread Always)
+    for i in range(activity_node_amount):
+      zope_port += 1
+      self.installZope(ip, zope_port, 'zope_activity_%s' % i,
+          with_timerservice=True,
+          zodb_configuration_string=zodb_configuration_string,
+          tidstorage_config=tidstorage_config)
+
+    # Four Web Page Nodes (Human access)
+    login_url_list = []
+    for i in range(user_node_amount):
+      zope_port += 1
+      login_url_list.append(self.installZope(ip, zope_port,
+        'zope_login_%s' % i, with_timerservice=False,
+        zodb_configuration_string=zodb_configuration_string,
+        tidstorage_config=tidstorage_config,
+        thread_amount=thread_amount_per_zope))
+
+    login_haproxy = self.installHaproxy(ip, 15001, 'login',
+                               site_check_path, login_url_list)
+
+    self.installTidStorage(tidstorage_config['host'],
+                           tidstorage_config['port'],
+            known_tid_storage_identifier_dict, 'http://' + login_haproxy)
+
+    return login_url_list[-1], login_haproxy
+
   def _requestZeoFileStorage(self, server_name, storage_name):
     """Local, slap.request compatible, call to ask for filestorage on Zeo
 
@@ -478,10 +569,50 @@ class Recipe(BaseSlapRecipe):
       self._createDirectory(os.path.join(self.erp5_directory, directory))
     self._createDirectory(os.path.join(self.erp5_directory, 'etc',
       'package-includes'))
+
+    # Symlink to BT5 repositories defined in instance config.
+    # Those paths will eventually end up in the ZODB, and having symlinks
+    # inside the XXX makes it possible to reuse such ZODB with another software
+    # release[ version].
+    # Note: this path cannot be used for development, it's really just a
+    # read-only repository.
+    repository_path = os.path.join(self.var_directory, "bt5_repository")
+    if not os.path.isdir(repository_path):
+      os.mkdir(repository_path)
+    self.path_list.append(repository_path)
+    self.bt5_repository_list = []
+    append = self.bt5_repository_list.append
+    for repository in self.options.get('bt5_repository_list', '').split():
+      repository = repository.strip()
+      if not repository:
+        continue
+
+      if _isurl(repository) and not repository.startswith("file://"):
+        # XXX: assume it's a valid URL
+        append(repository)
+        continue
+
+      if repository.startswith('file://'):
+        repository = repository.replace('file://', '', '')
+
+      if os.path.isabs(repository):
+        repo_id = hashlib.sha1(repository).hexdigest()
+        link = os.path.join(repository_path, repo_id)
+        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(repository, link)
+        self.logger.debug('Created link %r -> %r' % (link, repository_path))
+        # Always provide a URL-Type
+        append("file://" + link)
+
     return user, password
 
   def installERP5Site(self, user, password, zope_access, mysql_conf,
-          conversion_server_conf=None, memcached_conf=None, kumo_conf=None, erp5_site_id='erp5'):
+          conversion_server_conf=None, memcached_conf=None, kumo_conf=None, 
+          erp5_site_id='erp5', default_bt5_list=[]):
     """ Create a script controlled by supervisor, which creates a erp5
     site on current available zope and mysql environment"""
     conversion_server = None
@@ -494,19 +625,18 @@ class Recipe(BaseSlapRecipe):
       kumo_conf = {}
     # XXX Conversion server and memcache server coordinates are not relevant
     # for pure site creation.
-    https_connection_url = "http://%s:%s@%s/" % (user, password, zope_access)
     mysql_connection_string = "%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s" % mysql_conf
 
-    # XXX URL list vs. repository + list of bt5 names?
-    bt5_list = self.parameter_dict.get("bt5_list", "").split()
-    bt5_repository_list = self.parameter_dict.get("bt5_repository_list", "").split()
+    bt5_list = self.parameter_dict.get("bt5_list", "").split() or default_bt5_list
+    bt5_repository_list = self.parameter_dict.get("bt5_repository_list", "").split() \
+      or getattr(self, 'bt5_repository_list', [])
 
     self.path_list.extend(zc.buildout.easy_install.scripts([('erp5_update',
             __name__ + '.erp5', 'updateERP5')], self.ws,
                   sys.executable, self.wrapper_directory,
                   arguments=[erp5_site_id,
                              mysql_connection_string,
-                             https_connection_url,
+                             [user, password, zope_access],
                              memcached_conf.get('memcached_url'),
                              conversion_server,
                              kumo_conf.get("kumo_address"),
@@ -794,6 +924,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):
@@ -904,7 +1036,8 @@ 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','slapos.recipe.librecipe.execute', 'executee')],

slapos/recipe/erp5/erp5.py

@@ -24,84 +24,356 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-import time
-import urllib
-import xmlrpclib
+
+import httplib
+import json
+import base64
 import socket
+import time
 
-def updateERP5(args):
-  # FIXME Use a dict
-  site_id = args[0]
-  mysql_string = args[1]
-  base_url = args[2]
-  memcached_provider = args[3]
-  conversion_server = args[4]
-  kumo_provider = args[5]
-  bt5_list = args[6]
-  bt5_repository_list = []
-  if len(args) > 7:
-    bt5_repository_list = args[7]
 
-  if len(bt5_list) > 0 and len(bt5_repository_list) == 0:
-    bt5_repository_list = ["http://www.erp5.org/dists/snapshot/bt5"]
+class ERP5Updater(object):
+
   erp5_catalog_storage = "erp5_mysql_innodb_catalog"
-  business_template_setup_finished = 0
-  external_service_assertion = 1
-  update_script_id = "ERP5Site_assertExternalServiceList"
-  sleep = 120
-  while True:
+  header_dict = {}
+
+  sleeping_time = 120
+
+  def __init__(self, user, password, host,
+      site_id, mysql_url, memcached_address,
+      conversion_server_address, persistent_cache_address,
+      bt5_list, bt5_repository_list):
+
+    authentication_string = '%s:%s' % (user, password)
+    base64string = base64.encodestring(authentication_string).strip()
+
+    self.header_dict['Authorization'] = 'Basic %s' % base64string
+
+    self.host = host
+    self.site_id = site_id
+    self.business_template_repository_list = bt5_repository_list
+    self.business_template_list = bt5_list
+    self.memcached_address = memcached_address
+    self.persintent_cached_address = persistent_cache_address
+    self.mysql_url = mysql_url
+
+    host, port = conversion_server_address.split(":")
+    self.conversion_server_address = host
+    self.conversion_server_port = int(port)
+
+  def log(self, level, message):
+    date = time.strftime("%a, %d %b %Y %H:%M:%S +0000")
+    print "%s - %s : %s" % (date, level, message)
+
+  def getConnectionToZope(self):
+    return httplib.HTTPConnection(self.host)
+
+  def GET(self, path):
+    zope_connection = self.getConnectionToZope()
+    self.log("INFO", "GET ZOPE: %s, PATH: %s" % (self.host, path))
     try:
-      proxy = xmlrpclib.ServerProxy(base_url)
-      print "Adding site at %r" % base_url
-      if proxy.isERP5SitePresent() == False:
-        url = '%s/manage_addProduct/ERP5/manage_addERP5Site' % base_url
-        result = urllib.urlopen(url, urllib.urlencode({
-          "id": site_id,
-          "erp5_catalog_storage": erp5_catalog_storage,
-          "erp5_sql_connection_string": mysql_string,
-          "cmf_activity_sql_connection_string": mysql_string, }))
-        print "ERP5 Site creation output: %s" % result.read()
-
-      if not business_template_setup_finished:
-        if proxy.isERP5SitePresent() == True:
-          print "Start to set initial business template setup."
-          # Update URL to ERP5 Site
-          erp5 = xmlrpclib.ServerProxy("%s/%s" % (base_url, site_id),
-                                       allow_none=1)
-
-          repository_list = erp5.portal_templates.getRepositoryList()
-          if len(bt5_repository_list) > 0 and \
-             set(bt5_repository_list) != set(repository_list):
-            erp5.portal_templates.\
-                updateRepositoryBusinessTemplateList(bt5_repository_list, None)
-
-          installed_bt5_list =\
-            erp5.portal_templates.getInstalledBusinessTemplateTitleList()
-          for bt5 in bt5_list:
-            if bt5 not in installed_bt5_list:
-              erp5.portal_templates.\
-                installBusinessTemplatesFromRepositories([bt5])
-
-          repository_set = set(erp5.portal_templates.getRepositoryList())
-          installed_bt5_list = erp5.portal_templates.\
-               getInstalledBusinessTemplateTitleList()
-          if (set(repository_set) == set(bt5_repository_list)) and \
-              len([i for i in bt5_list if i not in installed_bt5_list]) == 0:
-            print "Repositories updated and business templates installed."
-            business_template_setup_finished = 1
-
-      if external_service_assertion:
-        url = "%s/%s/%s" % (base_url, site_id, update_script_id)
-        result = urllib.urlopen(url, urllib.urlencode({
-          "memcached" : memcached_provider,
-          "kumo" : kumo_provider,
-          "conversion_server" : conversion_server,})).read()
-        external_service_assertion = not (result == "True")
-
-    except IOError:
-      print "Unable to create the ERP5 Site!"
+      zope_connection.request('GET', path, headers=self.header_dict)
+      result = zope_connection.getresponse()
+      data = result.read()
+      status = result.status
     except socket.error, e:
-      print "Unable to connect to ZOPE! %s" % e
-    except xmlrpclib.Fault, e:
-      print "XMLRPC Fault: %s" % e
-    time.sleep(sleep)
+      data = "Unable to connect to %s (socket.error: %s)" % (self.host, e)
+      self.log("ERROR", data)
+      status = 0
+    finally:
+      zope_connection.close()
+
+    return status, data
+
+  def POST(self, path, post_dict):
+    zope_connection = self.getConnectionToZope()
+    param_list = []
+    for item in post_dict:
+      value = post_dict[item]
+      if isinstance(value, type([])):
+        for v in value:
+          param_list.append("%s:list=%s" % (item, v))
+      else:
+        param_list.append("%s=%s" % (item, value))
+
+    params = "&".join(param_list)
+    self.log("INFO", "GET ZOPE: %s, PATH: %s, PARAMS: %s" % \
+                     (self.host, path, params))
+    try:
+      zope_connection.request('POST', path, params, headers=self.header_dict)
+      result = zope_connection.getresponse()
+      data = result.read()
+      status = result.status
+    except socket.error, e:
+      data = "Unable to connect to %s (socket.error: %s)" % (self.host, e)
+      self.log("ERROR", data)
+      status = 0
+    finally:
+      zope_connection.close()
+
+    return status, data
+
+  def isERP5Present(self):
+    status, data = self.GET("/isERP5SitePresent")
+    self.log("DEBUG", "isERP5Present : %s, %s" % (status, data))
+    return status == 200 and not (data == "False")
+
+  def loadSystemSignatureDict(self):
+    base_path = \
+        "/%s/portal_introspections/getSystemSignatureAsJSON" % self.site_id
+    status, data = self.GET(base_path)
+    if status == 200:
+      data_dict = json.loads(data)
+      self.system_signature_dict = data_dict
+    elif status == 404:
+      # Unable to find portal_introspection, this means erp5_base is not
+      # installed yet.
+      self.system_signature_dict = None
+      self.log("DEBUG", "Unable to find portal_introspection, this means " + \
+                        "erp5_base is not installed yet.")
+    else:
+      self.log("ERROR", "Unable to get SystemSignature to %s (status: %s, data: %s)" % \
+          (self.host, status, data))
+
+  def getSystemSignatureDict(self, item=None, default=None):
+    system_signature_dict = getattr(self, 'system_signature_dict', None)
+    if system_signature_dict is not None and item is not None:
+        return system_signature_dict.get(item, default)
+    return system_signature_dict
+
+  def getMissingBusinessTemplateRepositoryList(self):
+    found_list = self.getSystemSignatureDict(
+                "business_template_repository_list", [])
+    return [i for i in self.business_template_repository_list
+                    if i not in found_list]
+
+  def getMissingBusinessTemplateList(self):
+    bt5_dict = self.getSystemSignatureDict("business_template_dict", [])
+    found_bt5_list = bt5_dict.keys()
+    return [bt for bt in self.business_template_list\
+                          if bt not in found_bt5_list]
+
+  def isBusinessTemplateUpdated(self):
+    return len(self.getMissingBusinessTemplateList()) == 0
+
+  def isBusinessTemplateRepositoryUpdated(self):
+    return len(self.getMissingBusinessTemplateRepositoryList()) == 0
+
+  def updateBusinessTemplateList(self):
+    """ Update Business Template Configuration, including the repositories
+    """
+    if not self.isBusinessTemplateUpdated():
+      # Before update the business templates, it is required to make
+      # sure the repositories are updated.
+      if not self.isBusinessTemplateRepositoryUpdated():
+        # Require to update Business template Repository
+        repository_list = self.getSystemSignatureDict(
+           "business_template_repository_list", [])
+        repository_list.extend(self.getMissingBusinessTemplateRepositoryList())
+        self._setRepositoryList(repository_list)
+
+      # Require to update Business template
+      for bt in self.getMissingBusinessTemplateList():
+        self._installBusinessTemplateList([bt])
+      return True
+
+    return False
+
+  def _setRepositoryList(self, repository_list):
+    """ Set repository list on portal_templates """
+    set_path = "/%s/portal_templates/updateRepositoryBusinessTemplateList" % self.site_id
+    self.POST(set_path, {"repository_list": repository_list})
+
+  def _installBusinessTemplateList(self, name_list, update_catalog=False):
+    """ Install a Business Template on Remote ERP5 setup """
+    set_path = "/%s/portal_templates/installBusinessTemplatesFromRepositories" % self.site_id
+    self.POST(set_path, {"template_list": name_list,
+                         "only_newer": 1,
+                         "update_catalog": int(update_catalog)})
+
+  def _createActiveSystemPreference(self):
+    """ Assert that at least one enabled System Preference is present on
+        the erp5 instance.
+    """
+    self.log("INFO", "Try to create New System Preference into ERP5!")
+    path = "/%s/portal_preferences/createActiveSystemPreference" % self.site_id
+    status, data = self.POST(path, {})
+    if status != 200:
+      self.log("ERROR", "Unable to create System Preference, an error ocurred %s." % data)
+
+  def updateConversionServer(self):
+    """ Update Conversion server Configuration """
+    external_connection_dict = self.getSystemSignatureDict("external_connection_dict")
+    host_key = None
+    port_key = None
+    for external_connection in external_connection_dict:
+      # Search for Configurated value for Conversion Server
+      if external_connection.endswith("getPreferredOoodocServerAddress"):
+         host_key = external_connection
+      elif external_connection.endswith("getPreferredOoodocServerPortNumber"):
+         port_key = external_connection
+      if None not in [host_key, port_key]:
+        break
+
+    if None in [host_key, port_key]:
+      self.log("ERROR", "Unable to find the Active System Preference to Update!")
+      self._createActiveSystemPreference()
+      return True
+
+    is_updated = self._assertAndUpdateDocument(host_key, self.conversion_server_address,
+         "setPreferredOoodocServerAddress")
+
+    is_updated = is_updated or self._assertAndUpdateDocument(port_key,
+         self.conversion_server_port,
+         "setPreferredOoodocServerPortNumber")
+
+    return is_updated
+
+  def updateMemcached(self):
+    # Assert Memcached configuration
+    self._assertAndUpdateDocument(
+       "portal_memcached/default_memcached_plugin/getUrlString",
+       self.memcached_address,
+       "setUrlString")
+
+    # Assert Persistent cache configuration (Kumofs)
+    self._assertAndUpdateDocument(
+      "portal_memcached/persistent_memcached_plugin/getUrlString",
+      self.persintent_cached_address,
+      "setUrlString")
+
+  def _assertAndUpdateDocument(self, key, expected_value, update_method):
+    external_connection_dict = self.getSystemSignatureDict("external_connection_dict")
+
+    # Assert Memcached configuration
+    found_address = external_connection_dict.get(key)
+    if found_address != expected_value:
+      document_path = "/".join(key.split("/")[:-1])
+      self.log("INFO",
+               "Document require update at %s (Found: %s, Expected: %s)" % \
+                            (document_path, found_address, expected_value))
+
+      set_path = "/%s/%s/%s" % (self.site_id, document_path, update_method)
+      self.POST(set_path, {"value": expected_value})
+      return True
+    return False
+
+  def updateMysql(self):
+    """ This API is not implemented yet, because it is not needed to
+    update Mysql Connection on ERP5 Sites.
+    """
+    pass
+
+  def updatePortalActivities(self):
+    """ This API is not implemented yet, because it is not needed for
+        a single instance configuration. This method should define which
+        instances will handle activities, which one will distribute
+        activities
+    """
+    pass
+
+  def updateERP5Site(self):
+    if not self.isERP5Present():
+      url = '/manage_addProduct/ERP5/manage_addERP5Site'
+      self.POST(url, {
+          "id": self.site_id,
+          "erp5_catalog_storage": self.erp5_catalog_storage,
+          "erp5_sql_connection_string": self.mysql_url,
+          "cmf_activity_sql_connection_string": self.mysql_url})
+      return True
+    return False
+
+  def _hasActivityPresent(self):
+    activity_dict = self.getSystemSignatureDict("activity_dict")
+    if activity_dict["total"] > 0:
+      return True
+
+  def _hasFailureActivity(self):
+    activity_dict = self.getSystemSignatureDict("activity_dict")
+    if activity_dict["failure"] > 0:
+       return True
+
+  def _updatePreRequiredBusinessTemplateList(self):
+    """ Update only the first part of bt5."""
+
+    # This list contains the minimal set of bt5 required to install
+    # portal_introspections. Move portal_introspection to erp5_core
+    # can remove this set.
+    pre_required_business_template_list = [i for i in self.business_template_list\
+                if i.startswith("erp5_full_text") or i == "erp5_base"]
+
+    if len(self.business_template_repository_list) > 0 and \
+         len(pre_required_business_template_list):
+      pre_required_business_template_list.insert(0, "erp5_core_proxy_field_legacy")
+      self._setRepositoryList(self.business_template_repository_list)
+      time.sleep(30)
+      for bt in pre_required_business_template_list:
+        update_catalog = bt.endswith("_catalog")
+        self._installBusinessTemplateList([bt], update_catalog)
+    else:
+      self.log("ERROR", "Unable to install erp5_base, it is not on your " +\
+               "requested business templates list. Once it is installed " +\
+               "setup will continue")
+
+  def run(self):
+    """ Keep running until kill"""
+    while 1:
+      time.sleep(30)
+      if not self.updateERP5Site():
+        self.loadSystemSignatureDict()
+        if self.getSystemSignatureDict() is None:
+          self.log("INFO", "The erp5_base is not installed yet, trying to " +\
+                           "install it before continue.")
+          self._updatePreRequiredBusinessTemplateList()
+          time.sleep(60)
+          continue
+
+        if self._hasActivityPresent():
+          self.log("DEBUG", "Waiting for activities on ERP5...")
+          if self._hasFailureActivity():
+            self.log("ERROR", "Update progress found " +\
+                     "Failure activities and it will not progress until " +\
+                     " activites issue be solved")
+          continue
+
+        if self.updateBusinessTemplateList():
+          continue
+
+        self.updateMemcached()
+        if self.updateConversionServer():
+          # If update Conversion Server adds a bit more delay to continue
+          # To wait for activiies.
+          time.sleep(60)
+          continue
+
+        time.sleep(self.sleeping_time)
+
+def updateERP5(argument_list):
+  site_id = argument_list[0]
+  mysql_url = argument_list[1]
+  user, password, host = argument_list[2]
+  memcached_address = argument_list[3]
+  conversion_server_address = argument_list[4]
+  persistent_cache_provider = argument_list[5]
+  bt5_list = argument_list[6]
+  bt5_repository_list = []
+
+  if len(argument_list) > 7:
+    bt5_repository_list = argument_list[7]
+
+  if len(bt5_list) > 0 and len(bt5_repository_list) == 0:
+    bt5_repository_list = ["http://www.erp5.org/dists/snapshot/bt5"]
+
+  erp5_upgrader = ERP5Updater(
+    user=user,
+    password=password,
+    host=host,
+    site_id=site_id,
+    mysql_url=mysql_url,
+    memcached_address=memcached_address,
+    conversion_server_address=conversion_server_address,
+    persistent_cache_address=persistent_cache_provider,
+    bt5_list=bt5_list,
+    bt5_repository_list=bt5_repository_list)
+
+  erp5_upgrader.run()

slapos/recipe/erp5/template/my.cnf.in

@@ -28,6 +28,9 @@ plugin-load = ha_innodb_plugin.so
 #innodb_log_file_size = 256M
 #innodb_log_buffer_size = 8M
 
+# very important to allow parallel indexing
+innodb_locks_unsafe_for_binlog = 1
+
 # 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

slapos/recipe/mysql/__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.recipe.librecipe import BaseSlapRecipe
+import hashlib
+import os
+import pkg_resources
+import sys
+import zc.buildout
+import ConfigParser
+
+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()
+    # self.cron_d is a directory, where cron jobs can be registered
+    self.cron_d = self.installCrond()
+    self.logrotate_d, self.logrotate_backup = self.installLogrotate()
+    
+    mysql_conf = self.installMysqlServer(self.getLocalIPv4Address(), 45678)
+      
+    ca_conf = self.installCertificateAuthority()
+    key, certificate = self.requestCertificate('MySQL')
+    
+    stunnel_conf = self.installStunnel(self.getGlobalIPv6Address(),
+        self.getLocalIPv4Address(), 12345, mysql_conf['tcp_port'],
+        certificate, key, ca_conf['ca_crl'],
+        ca_conf['certificate_authority_path'])
+    
+    self.linkBinary()
+    self.setConnectionDict(dict(
+      stunnel_ip = stunnel_conf['public_ip'],
+      stunnel_port = stunnel_conf['public_port'],
+      mysql_database = mysql_conf['mysql_database'],
+      mysql_user = mysql_conf['mysql_user'],
+      mysql_password = mysql_conf['mysql_password'],
+    ))
+    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 installCrond(self):
+    timestamps = self.createDataDirectory('cronstamps')
+    cron_output = os.path.join(self.log_directory, 'cron-output')
+    self._createDirectory(cron_output)
+    catcher = zc.buildout.easy_install.scripts([('catchcron',
+      __name__ + '.catdatefile', 'catdatefile')], self.ws, sys.executable,
+      self.bin_directory, arguments=[cron_output])[0]
+    self.path_list.append(catcher)
+    cron_d = os.path.join(self.etc_directory, 'cron.d')
+    crontabs = os.path.join(self.etc_directory, 'crontabs')
+    self._createDirectory(cron_d)
+    self._createDirectory(crontabs)
+    wrapper = zc.buildout.easy_install.scripts([('crond',
+      '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]
+      )[0]
+    self.path_list.append(wrapper)
+    return cron_d
+  
+  def installLogrotate(self):
+    """Installs logortate main configuration file and registers its to cron"""
+    logrotate_d = os.path.abspath(os.path.join(self.etc_directory,
+      'logrotate.d'))
+    self._createDirectory(logrotate_d)
+    logrotate_backup = self.createBackupDirectory('logrotate')
+    logrotate_conf = self.createConfigurationFile("logrotate.conf",
+        "include %s" % logrotate_d)
+    logrotate_cron = os.path.join(self.cron_d, 'logrotate')
+    state_file = os.path.join(self.data_root_directory, 'logrotate.status')
+    open(logrotate_cron, 'w').write('0 0 * * * %s -s %s %s' %
+        (self.options['logrotate_binary'], state_file, logrotate_conf))
+    self.path_list.extend([logrotate_d, logrotate_conf, logrotate_cron])
+    return logrotate_d, logrotate_backup
+
+  def registerLogRotation(self, name, log_file_list, postrotate_script):
+    """Register new log rotation requirement"""
+    open(os.path.join(self.logrotate_d, name), 'w').write(
+        self.substituteTemplate(self.getTemplateFilename(
+          'logrotate_entry.in'),
+          dict(file_list=' '.join(['"'+q+'"' for q in log_file_list]),
+            postrotate=postrotate_script, olddir=self.logrotate_backup)))
+
+  def installCertificateAuthority(self, ca_country_code='XX',
+      ca_email='xx@example.com', ca_state='State', ca_city='City',
+      ca_company='Company'):
+    backup_path = self.createBackupDirectory('ca')
+    self.ca_dir = os.path.join(self.data_root_directory, 'ca')
+    self._createDirectory(self.ca_dir)
+    self.ca_request_dir = os.path.join(self.ca_dir, 'requests')
+    self._createDirectory(self.ca_request_dir)
+    config = dict(ca_dir=self.ca_dir, request_dir=self.ca_request_dir)
+    self.ca_private = os.path.join(self.ca_dir, 'private')
+    self.ca_certs = os.path.join(self.ca_dir, 'certs')
+    self.ca_crl = os.path.join(self.ca_dir, 'crl')
+    self.ca_newcerts = os.path.join(self.ca_dir, 'newcerts')
+    self.ca_key_ext = '.key'
+    self.ca_crt_ext = '.crt'
+    for d in [self.ca_private, self.ca_crl, self.ca_newcerts, self.ca_certs]:
+      self._createDirectory(d)
+    for f in ['crlnumber', 'serial']:
+      if not os.path.exists(os.path.join(self.ca_dir, f)):
+        open(os.path.join(self.ca_dir, f), 'w').write('01')
+    if not os.path.exists(os.path.join(self.ca_dir, 'index.txt')):
+      open(os.path.join(self.ca_dir, 'index.txt'), 'w').write('')
+    openssl_configuration = os.path.join(self.ca_dir, 'openssl.cnf')
+    config.update(
+        working_directory=self.ca_dir,
+        country_code=ca_country_code,
+        state=ca_state,
+        city=ca_city,
+        company=ca_company,
+        email_address=ca_email,
+    )
+    self._writeFile(openssl_configuration, pkg_resources.resource_string(
+      __name__, 'template/openssl.cnf.ca.in') % config)
+    self.path_list.extend(zc.buildout.easy_install.scripts([
+      ('certificate_authority',
+        __name__ + '.certificate_authority', 'runCertificateAuthority')],
+        self.ws, sys.executable, self.wrapper_directory, arguments=[dict(
+          openssl_configuration=openssl_configuration,
+          openssl_binary=self.options['openssl_binary'],
+          certificate=os.path.join(self.ca_dir, 'cacert.pem'),
+          key=os.path.join(self.ca_private, 'cakey.pem'),
+          crl=os.path.join(self.ca_crl),
+          request_dir=self.ca_request_dir
+          )]))
+    # configure backup
+    backup_cron = os.path.join(self.cron_d, 'ca_rdiff_backup')
+    open(backup_cron, 'w').write(
+        '''0 0 * * * %(rdiff_backup)s %(source)s %(destination)s'''%dict(
+          rdiff_backup=self.options['rdiff_backup_binary'],
+          source=self.ca_dir,
+          destination=backup_path))
+    self.path_list.append(backup_cron)
+
+    return dict(
+      ca_certificate=os.path.join(config['ca_dir'], 'cacert.pem'),
+      ca_crl=os.path.join(config['ca_dir'], 'crl'),
+      certificate_authority_path=config['ca_dir']
+    )
+
+  def requestCertificate(self, name):
+    hash = hashlib.sha512(name).hexdigest()
+    key = os.path.join(self.ca_private, hash + self.ca_key_ext)
+    certificate = os.path.join(self.ca_certs, hash + self.ca_crt_ext)
+    parser = ConfigParser.RawConfigParser()
+    parser.add_section('certificate')
+    parser.set('certificate', 'name', name)
+    parser.set('certificate', 'key_file', key)
+    parser.set('certificate', 'certificate_file', certificate)
+    parser.write(open(os.path.join(self.ca_request_dir, hash), 'w'))
+    return key, certificate
+
+  def installStunnel(self, public_ip, private_ip, public_port, private_port,
+      ca_certificate, key, ca_crl, ca_path):
+    """Installs stunnel"""
+    template_filename = self.getTemplateFilename('stunnel.conf.in')
+    log = os.path.join(self.log_directory, 'stunnel.log')
+    pid_file = os.path.join(self.run_directory, 'stunnel.pid')
+    stunnel_conf = dict(
+        public_ip=public_ip,
+        private_ip=private_ip,
+        public_port=public_port,
+        pid_file=pid_file,
+        log=log,
+        cert = ca_certificate,
+        key = key,
+        ca_crl = ca_crl,
+        ca_path = ca_path,
+        private_port = private_port,
+    )
+    stunnel_conf_path = self.createConfigurationFile("stunnel.conf",
+        self.substituteTemplate(template_filename,
+          stunnel_conf))
+    wrapper = zc.buildout.easy_install.scripts([('stunnel',
+      'slapos.recipe.librecipe.execute', 'execute')], self.ws, sys.executable,
+      self.wrapper_directory, arguments=[
+        self.options['stunnel_binary'].strip(), stunnel_conf_path]
+      )[0]
+    self.path_list.append(wrapper)
+    return stunnel_conf
+
+    
+  def installMysqlServer(self, ip, port, database='db', user='user',
+      template_filename=None, mysql_conf=None):
+    if mysql_conf is None:
+      mysql_conf = {}
+    backup_directory = self.createBackupDirectory('mysql')
+    if template_filename is None:
+      template_filename = self.getTemplateFilename('my.cnf.in')
+    error_log = os.path.join(self.log_directory, 'mysqld.log')
+    slow_query_log = os.path.join(self.log_directory, 'mysql-slow.log')
+    mysql_conf.update(
+        ip=ip,
+        data_directory=os.path.join(self.data_root_directory,
+          'mysql'),
+        tcp_port=port,
+        pid_file=os.path.join(self.run_directory, 'mysqld.pid'),
+        socket=os.path.join(self.run_directory, 'mysqld.sock'),
+        error_log=error_log,
+        slow_query_log=slow_query_log,
+        mysql_database=database,
+        mysql_user=user,
+        mysql_password=self.generatePassword(),
+    )
+    self.registerLogRotation('mysql', [error_log, slow_query_log],
+        '%(mysql_binary)s --no-defaults -B --user=root '
+        '--socket=%(mysql_socket)s -e "FLUSH LOGS"' % dict(
+          mysql_binary=self.options['mysql_binary'],
+          mysql_socket=mysql_conf['socket']))
+    self._createDirectory(mysql_conf['data_directory'])
+
+    mysql_conf_path = self.createConfigurationFile("my.cnf",
+        self.substituteTemplate(template_filename,
+          mysql_conf))
+
+    mysql_script_list = []
+    for x_database, x_user, x_password in \
+          [(mysql_conf['mysql_database'],
+            mysql_conf['mysql_user'],
+            mysql_conf['mysql_password']),
+          ]:
+      mysql_script_list.append(pkg_resources.resource_string(__name__,
+                     'template/initmysql.sql.in') % {
+                        'mysql_database': x_database,
+                        'mysql_user': x_user,
+                        'mysql_password': x_password})
+    mysql_script_list.append('EXIT')
+    mysql_script = '\n'.join(mysql_script_list)
+    self.path_list.extend(zc.buildout.easy_install.scripts([('mysql_update',
+      __name__ + '.mysql', 'updateMysql')], self.ws,
+      sys.executable, self.wrapper_directory, arguments=[dict(
+        mysql_script=mysql_script,
+        mysql_binary=self.options['mysql_binary'].strip(),
+        mysql_upgrade_binary=self.options['mysql_upgrade_binary'].strip(),
+        socket=mysql_conf['socket'],
+        )]))
+    self.path_list.extend(zc.buildout.easy_install.scripts([('mysqld',
+      __name__ + '.mysql', 'runMysql')], self.ws,
+        sys.executable, self.wrapper_directory, arguments=[dict(
+        mysql_install_binary=self.options['mysql_install_binary'].strip(),
+        mysqld_binary=self.options['mysqld_binary'].strip(),
+        data_directory=mysql_conf['data_directory'].strip(),
+        mysql_binary=self.options['mysql_binary'].strip(),
+        socket=mysql_conf['socket'].strip(),
+        configuration_file=mysql_conf_path,
+       )]))
+    self.path_list.extend([mysql_conf_path])
+
+    # backup configuration
+    backup_directory = self.createBackupDirectory('mysql')
+    full_backup = os.path.join(backup_directory, 'full')
+    incremental_backup = os.path.join(backup_directory, 'incremental')
+    self._createDirectory(full_backup)
+    self._createDirectory(incremental_backup)
+    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']
+    environment = dict(PATH='%s' % self.bin_directory)
+    innobackupex_incremental = zc.buildout.easy_install.scripts([(
+      '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',
+      'slapos.recipe.librecipe.execute', 'executee')], self.ws,
+      sys.executable, self.bin_directory, arguments=[
+        innobackupex_argument_list,
+        environment])[0]
+    self.path_list.append(innobackupex_full)
+    backup_controller = zc.buildout.easy_install.scripts([
+      ('innobackupex_controller', __name__ + '.innobackupex', 'controller')],
+      self.ws, sys.executable, self.bin_directory,
+      arguments=[innobackupex_incremental, innobackupex_full, full_backup,
+        incremental_backup])[0]
+    self.path_list.append(backup_controller)
+    mysql_backup_cron = os.path.join(self.cron_d, 'mysql_backup')
+    open(mysql_backup_cron, 'w').write('0 0 * * * ' + backup_controller)
+    self.path_list.append(mysql_backup_cron)
+    # The return could be more explicit database, user ...
+    return mysql_conf

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)

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)

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';

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
+}

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

slapos/recipe/mysql/template/openssl.cnf.ca.in

+#
+# OpenSSL example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+
+# This definition stops the following lines choking if HOME isn't
+# defined.
+HOME			= .
+RANDFILE		= $ENV::HOME/.rnd
+
+# Extra OBJECT IDENTIFIER info:
+#oid_file		= $ENV::HOME/.oid
+oid_section		= new_oids
+
+# To use this configuration file with the "-extfile" option of the
+# "openssl x509" utility, name here the section containing the
+# X.509v3 extensions to use:
+# extensions		= 
+# (Alternatively, use a configuration file that has only
+# X.509v3 extensions in its main [= default] section.)
+
+[ new_oids ]
+
+# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
+# Add a simple OID like this:
+# testoid1=1.2.3.4
+# Or use config file substitution like this:
+# testoid2=${testoid1}.5.6
+
+# Policies used by the TSA examples.
+tsa_policy1 = 1.2.3.4.1
+tsa_policy2 = 1.2.3.4.5.6
+tsa_policy3 = 1.2.3.4.5.7
+
+####################################################################
+[ ca ]
+default_ca	= CA_default		# The default ca section
+
+####################################################################
+[ CA_default ]
+
+dir		= %(working_directory)s		# Where everything is kept
+certs		= $dir/certs		# Where the issued certs are kept
+crl_dir		= $dir/crl		# Where the issued crl are kept
+database	= $dir/index.txt	# database index file.
+#unique_subject	= no			# Set to 'no' to allow creation of
+					# several ctificates with same subject.
+new_certs_dir	= $dir/newcerts		# default place for new certs.
+
+certificate	= $dir/cacert.pem 	# The CA certificate
+serial		= $dir/serial 		# The current serial number
+crlnumber	= $dir/crlnumber	# the current crl number
+					# must be commented out to leave a V1 CRL
+crl		= $dir/crl.pem 		# The current CRL
+private_key	= $dir/private/cakey.pem # The private key
+RANDFILE	= $dir/private/.rand	# private random number file
+
+x509_extensions	= usr_cert		# The extentions to add to the cert
+
+# Comment out the following two lines for the "traditional"
+# (and highly broken) format.
+name_opt 	= ca_default		# Subject Name options
+cert_opt 	= ca_default		# Certificate field options
+
+# Extension copying option: use with caution.
+# copy_extensions = copy
+
+# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
+# so this is commented out by default to leave a V1 CRL.
+# crlnumber must also be commented out to leave a V1 CRL.
+# crl_extensions	= crl_ext
+
+default_days	= 3650			# how long to certify for
+default_crl_days= 30			# how long before next CRL
+default_md	= default		# use public key default MD
+preserve	= no			# keep passed DN ordering
+
+# A few difference way of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy		= policy_match
+
+# For the CA policy
+[ policy_match ]
+countryName		= match
+stateOrProvinceName	= match
+organizationName	= match
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+# For the 'anything' policy
+# At this point in time, you must list all acceptable 'object'
+# types.
+[ policy_anything ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+####################################################################
+[ req ]
+default_bits		= 2048
+default_md		= sha1
+default_keyfile 	= privkey.pem
+distinguished_name	= req_distinguished_name
+#attributes		= req_attributes
+x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+
+# Passwords for private keys if not present they will be prompted for
+# input_password = secret
+# output_password = secret
+
+# This sets a mask for permitted string types. There are several options. 
+# default: PrintableString, T61String, BMPString.
+# pkix	 : PrintableString, BMPString (PKIX recommendation before 2004)
+# utf8only: only UTF8Strings (PKIX recommendation after 2004).
+# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
+# MASK:XXXX a literal mask value.
+# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings.
+string_mask = utf8only
+
+# req_extensions = v3_req # The extensions to add to a certificate request
+
+[ req_distinguished_name ]
+countryName			= Country Name (2 letter code)
+countryName_value		= %(country_code)s
+countryName_min			= 2
+countryName_max			= 2
+
+stateOrProvinceName		= State or Province Name (full name)
+stateOrProvinceName_value	= %(state)s
+
+localityName			= Locality Name (eg, city)
+localityName_value		= %(city)s
+
+0.organizationName		= Organization Name (eg, company)
+0.organizationName_value	= %(company)s
+
+# we can do this but it is not needed normally :-)
+#1.organizationName		= Second Organization Name (eg, company)
+#1.organizationName_default	= World Wide Web Pty Ltd
+
+commonName			= Common Name (eg, your name or your server\'s hostname)
+commonName_max			= 64
+
+emailAddress			= Email Address
+emailAddress_value = %(email_address)s
+emailAddress_max		= 64
+
+# SET-ex3			= SET extension number 3
+
+#[ req_attributes ]
+#challengePassword		= A challenge password
+#challengePassword_min		= 4
+#challengePassword_max		= 20
+#
+#unstructuredName		= An optional company name
+
+[ usr_cert ]
+
+# These extensions are added when 'ca' signs a request.
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType			= server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment			= "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This is required for TSA certificates.
+# extendedKeyUsage = critical,timeStamping
+
+[ v3_req ]
+
+# Extensions to add to a certificate request
+
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+[ v3_ca ]
+
+
+# Extensions for a typical CA
+
+
+# PKIX recommendation.
+
+subjectKeyIdentifier=hash
+
+authorityKeyIdentifier=keyid:always,issuer
+
+# This is what PKIX recommends but some broken software chokes on critical
+# extensions.
+#basicConstraints = critical,CA:true
+# So we do this instead.
+basicConstraints = CA:true
+
+# Key usage: this is typical for a CA certificate. However since it will
+# prevent it being used as an test self-signed certificate it is best
+# left out by default.
+# keyUsage = cRLSign, keyCertSign
+
+# Some might want this also
+# nsCertType = sslCA, emailCA
+
+# Include email address in subject alt name: another PKIX recommendation
+# subjectAltName=email:copy
+# Copy issuer details
+# issuerAltName=issuer:copy
+
+# DER hex encoding of an extension: beware experts only!
+# obj=DER:02:03
+# Where 'obj' is a standard or added object
+# You can even override a supported extension:
+# basicConstraints= critical, DER:30:03:01:01:FF
+
+[ crl_ext ]
+
+# CRL extensions.
+# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
+
+# issuerAltName=issuer:copy
+authorityKeyIdentifier=keyid:always
+
+[ proxy_cert_ext ]
+# These extensions should be added when creating a proxy certificate
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType			= server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment			= "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This really needs to be in place for it to be a proxy certificate.
+proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
+
+####################################################################
+[ tsa ]
+
+default_tsa = tsa_config1	# the default TSA section
+
+[ tsa_config1 ]
+
+# These are used by the TSA reply generation only.
+dir		= /etc/pki/tls		# TSA root directory
+serial		= $dir/tsaserial	# The current serial number (mandatory)
+crypto_device	= builtin		# OpenSSL engine to use for signing
+signer_cert	= $dir/tsacert.pem 	# The TSA signing certificate
+					# (optional)
+certs		= $dir/cacert.pem	# Certificate chain to include in reply
+					# (optional)
+signer_key	= $dir/private/tsakey.pem # The TSA private key (optional)
+
+default_policy	= tsa_policy1		# Policy if request did not specify it
+					# (optional)
+other_policies	= tsa_policy2, tsa_policy3	# acceptable policies (optional)
+digests		= md5, sha1		# Acceptable message digests (mandatory)
+accuracy	= secs:1, millisecs:500, microsecs:100	# (optional)
+clock_precision_digits  = 0	# number of digits after dot. (optional)
+ordering		= yes	# Is ordering defined for timestamps?
+				# (optional, default: no)
+tsa_name		= yes	# Must the TSA name be included in the reply?
+				# (optional, default: no)
+ess_cert_id_chain	= no	# Must the ESS cert id chain be included?
+				# (optional, default: no)

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

slapos/recipe/osoeslaptraining/__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.recipe.librecipe import BaseSlapRecipe
+import os
+import shutil
+import pkg_resources
+import zc.buildout
+import sys
+import zc.recipe.egg
+
+class BaseRecipe(BaseSlapRecipe):
+  def installMysqlServer(self, ip=None, port=None):
+    if ip is None:
+      ip = self.getLocalIPv4Address()
+    if port is None:
+      port = '3306'
+    mysql_conf = dict(
+        ip=ip,
+        data_directory=os.path.join(self.data_root_directory,
+          'mysql'),
+        tcp_port=port,
+        pid_file=os.path.join(self.run_directory, 'mysqld.pid'),
+        socket=os.path.join(self.run_directory, 'mysqld.sock'),
+        error_log=os.path.join(self.log_directory, 'mysqld.log'),
+        slow_query_log=os.path.join(self.log_directory,
+        'mysql-slow.log'),
+        database='appdb',
+        user='appuser',
+        password=self.generatePassword(),
+    )
+    self._createDirectory(mysql_conf['data_directory'])
+
+    mysql_conf_path = self.createConfigurationFile("my.cnf",
+        self.substituteTemplate(pkg_resources.resource_filename(__name__, 'template/my.cnf.in'),
+          mysql_conf))
+
+    mysql_script = pkg_resources.resource_string(__name__,
+        'template/mysqlinit.sql.in') % mysql_conf
+    self.path_list.extend(zc.buildout.easy_install.scripts([('mysql_update',
+      __name__ + '.mysql', 'updateMysql')], self.ws,
+      sys.executable, self.wrapper_directory, arguments=[dict(
+        mysql_script=mysql_script,
+        mysql_binary=self.options['mysql_binary'].strip(),
+        mysql_upgrade_binary=self.options['mysql_upgrade_binary'].strip(),
+        socket=mysql_conf['socket'],
+        )]))
+    self.path_list.extend(zc.buildout.easy_install.scripts([('mysqld',
+      __name__ + '.mysql', 'runMysql')], self.ws,
+        sys.executable, self.wrapper_directory, arguments=[dict(
+        mysql_install_binary=self.options['mysql_install_binary'].strip(),
+        mysqld_binary=self.options['mysqld_binary'].strip(),
+        data_directory=mysql_conf['data_directory'].strip(),
+        mysql_binary=self.options['mysql_binary'].strip(),
+        socket=mysql_conf['socket'].strip(),
+        configuration_file=mysql_conf_path,
+       )]))
+    self.path_list.extend([mysql_conf_path])
+    return dict(
+      mysql_host=mysql_conf['ip'],
+      mysql_port=mysql_conf['tcp_port'],
+      mysql_user=mysql_conf['user'],
+      mysql_password=mysql_conf['password'],
+      mysql_database=mysql_conf['database'],
+    )
+
+  def createHtdocs(self, source, document_root):
+    source = self.options['source'].strip()
+    document_root = self.createDataDirectory('htdocs')
+    for p in os.listdir(document_root):
+      path = os.path.join(document_root, p)
+      if os.path.isdir(path):
+        shutil.rmtree(path)
+      else:
+        os.unlink(path)
+    for p in os.listdir(source):
+      path = os.path.join(source, p)
+      if os.path.isdir(path):
+        shutil.copytree(path, os.path.join(document_root, p))
+      else:
+        shutil.copy2(path, os.path.join(document_root, p))
+
+  def installApache(self, document_root, ip=None, port=None):
+    if ip is None:
+      ip=self.getGlobalIPv6Address()
+    if port is None:
+      port = '9080'
+    apache_config = dict(
+        pid_file=os.path.join(self.run_directory, 'httpd.pid'),
+        lock_file=os.path.join(self.run_directory, 'httpd.lock'),
+        ip=ip,
+        port=port,
+        error_log=os.path.join(self.log_directory, 'httpd-error.log'),
+        access_log=os.path.join(self.log_directory, 'httpd-access.log'),
+        document_root=document_root,
+        php_ini_dir=self.etc_directory
+    )
+    config_file = self.createConfigurationFile('httpd.conf',
+        self.substituteTemplate(pkg_resources.resource_filename(__name__,
+          'template/apache.in'), apache_config))
+    self.path_list.append(config_file)
+    self.path_list.append(self.createConfigurationFile('php.ini',
+        self.substituteTemplate(pkg_resources.resource_filename(__name__,
+          'template/php.ini.in'), {})))
+    self.path_list.extend(zc.buildout.easy_install.scripts([(
+      'httpd',
+        __name__ + '.apache', 'runApache')], self.ws,
+          sys.executable, self.wrapper_directory, arguments=[
+            dict(
+              required_path_list=[],
+              binary=self.options['httpd_binary'],
+              config=config_file
+            )
+          ]))
+    return 'http://[%s]:%s' % (ip, port)
+
+  def createConfiguration(self, template, document_root, destination, d):
+    directory = os.path.dirname(destination)
+    file = os.path.basename(destination)
+    path = document_root
+    if directory:
+      path = os.path.join(document_root, directory)
+      if not os.path.exists(path):
+        os.makedirs(path)
+    destination = os.path.join(path, file)
+    open(destination, 'w').write(open(template, 'r').read() % d)
+
+class Static(BaseRecipe):
+  def _install(self):
+    self.path_list = []
+    self.requirements, self.ws = self.egg.working_set()
+    document_root = self.createDataDirectory('htdocs')
+    self.createHtdocs(self.options['source'].strip(), document_root)
+    url = self.installApache(document_root)
+    self.setConnectionDict(dict(url = url))
+    return self.path_list
+
+class Simple(BaseRecipe):
+  def _install(self):
+    self.path_list = []
+    self.requirements, self.ws = self.egg.working_set()
+    document_root = self.createDataDirectory('htdocs')
+    self.createHtdocs(self.options['source'].strip(), document_root)
+    mysql_conf = self.installMysqlServer()
+    url = self.installApache(document_root)
+    self.setConnectionDict(dict(
+      url=url,
+      **mysql_conf
+    ))
+    self.createConfiguration(self.options['template'], document_root,
+        self.options['configuration'], mysql_conf)
+    return self.path_list
+
+class Request(BaseRecipe):
+  def _install(self):
+    self.path_list = []
+    self.requirements, self.ws = self.egg.working_set()
+    software_type = self.parameter_dict['slap_software_type']
+    if software_type == 'RootSoftwareInstance':
+      document_root = self.createDataDirectory('htdocs')
+      self.createHtdocs(self.options['source'].strip(), document_root)
+      mysql = self.request(self.software_release_url, 'MySQL Server', 'mysql')
+      mysql_conf = dict(
+        mysql_host=mysql.getConnectionParameter('mysql_host'),
+        mysql_port=mysql.getConnectionParameter('mysql_port'),
+        mysql_user=mysql.getConnectionParameter('mysql_user'),
+        mysql_password=mysql.getConnectionParameter('mysql_password'),
+        mysql_database=mysql.getConnectionParameter('mysql_database'),
+      )
+      url = self.installApache(document_root)
+      self.setConnectionDict(dict(
+        url=url,
+      ))
+      self.createConfiguration(self.options['template'], document_root,
+          self.options['configuration'], mysql_conf)
+    elif software_type == 'MySQL Server':
+      mysql_conf = self.installMysqlServer()
+      self.setConnectionDict(dict(
+        **mysql_conf
+      ))
+    else:
+      raise zc.buildout.UserError('Uknown software type %r' % software_type)
+    return self.path_list

slapos/recipe/osoeslaptraining/apache.py

+import os
+import sys
+import time
+
+
+def runApache(args):
+  sleep = 60
+  conf = args[0]
+  while True:
+    ready = True
+    for f in conf.get('required_path_list', []):
+      if not os.path.exists(f):
+        print 'File %r does not exists, sleeping for %s' % (f, sleep)
+        ready = False
+    if ready:
+      break
+    time.sleep(sleep)
+  apache_wrapper_list = [conf['binary'], '-f', conf['config'], '-DFOREGROUND']
+  apache_wrapper_list.extend(sys.argv[1:])
+  sys.stdout.flush()
+  sys.stderr.flush()
+  os.execl(apache_wrapper_list[0], *apache_wrapper_list)

slapos/recipe/osoeslaptraining/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
+      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_script = conf.get('mysql_script')
+        if mysql_script:
+          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)

slapos/recipe/osoeslaptraining/template/apache.in

+# Apache static configuration
+# Automatically generated
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+LockFile "%(lock_file)s"
+Listen %(ip)s:%(port)s
+PHPINIDir %(php_ini_dir)s
+ServerAdmin someone@email
+DefaultType text/plain
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+AddType application/x-httpd-php .php .phtml .php5 .php4
+AddType application/x-httpd-php-source .phps
+
+# 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
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+<Directory %(document_root)s>
+  Options FollowSymLinks
+  AllowOverride All
+  Order allow,deny
+  Allow from all
+</Directory>
+DocumentRoot %(document_root)s
+DirectoryIndex index.html index.php
+
+# 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 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 dir_module modules/mod_dir.so
+LoadModule php5_module modules/libphp5.so

slapos/recipe/osoeslaptraining/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

slapos/recipe/osoeslaptraining/template/mysqlinit.sql.in

+CREATE DATABASE IF NOT EXISTS %(database)s;
+GRANT ALL PRIVILEGES ON %(database)s.* TO %(user)s@localhost IDENTIFIED BY %(password)r;
+GRANT ALL PRIVILEGES ON %(database)s.* TO %(user)s@'%%' IDENTIFIED BY %(password)r;
+GRANT SHOW DATABASES ON *.* TO %(user)s@localhost IDENTIFIED BY %(password)r;
+GRANT SHOW DATABASES ON *.* TO %(user)s@'%%' IDENTIFIED BY %(password)r;
+FLUSH PRIVILEGES;
+EXIT

slapos/recipe/osoeslaptraining/template/php.ini.in

+[PHP]
+engine = On
+safe_mode = Off
+expose_php = On
+error_reporting = E_ALL | E_STRICT
+display_errors = On
+display_startup_errors = On
+log_errors = On
+log_errors_max_len = 1024
+ignore_repeated_errors = Off
+ignore_repeated_source = Off

slapos/recipe/vifib.py

@@ -122,7 +122,7 @@ SSLCARevocationPath %(ca_crl)s"""
     zodb_configuration_string = '\n'.join(zodb_configuration_list)
     zope_port = 12000
     # One Distribution Node
-    zope_port +=1
+    zope_port += 1
     self.installZope(ip, zope_port, 'zope_distribution', with_timerservice=True,
         zodb_configuration_string=zodb_configuration_string,
         tidstorage_config=tidstorage_config)
@@ -147,6 +147,9 @@ SSLCARevocationPath %(ca_crl)s"""
         login_url_list)
     apache_login = self.installBackendApache(self.getGlobalIPv6Address(), 15000,
         login_haproxy, backend_key, backend_certificate)
+    apache_frontend_login = self.installFrontendZopeApache(
+        self.getGlobalIPv6Address(), 4443, 'vifib', '/',
+        apache_login, '/', backend_key, backend_certificate)
     # Four Web Service Nodes (Machine access)
     service_url_list = []
     for i in (1, 2, 3, 4):
@@ -170,6 +173,7 @@ SSLCARevocationPath %(ca_crl)s"""
         known_tid_storage_identifier_dict, 'http://'+login_haproxy)
     self.linkBinary()
     self.setConnectionDict(dict(
+      front_end_url=apache_frontend_login,
       site_url=apache_login,
       site_user=user,
       site_password=password,

software/erp5/configuration.json

+{
+  "name":"Parameter",
+  "title": "Default parameter schema for ERP5 Software Release.",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "flavour" : {
+        "type" : "string",
+        "title" : "Sofware Release Flavour",
+        "optional": true,
+        "default" : "default",
+        "enum" : ["default", "configurator"]
+      },
+
+    "bt5_list": {
+       "type":"array",
+       "title" : "Business Template List",
+       "items" : {"type": "string"},
+       "optional" : true
+      },
+
+    "bt5_repository_list": {
+       "type" : "array",
+       "title" : "Business Template Repository List",
+       "items" : {"type": "string"},
+       "optional" : true
+     }
+  }
+}

software/erp5/instance.cfg

@@ -30,6 +30,7 @@ runzeo_binary = ${buildout:bin-directory}/runzeo
 runzope_binary = ${buildout:bin-directory}/runzope
 tidstorage_repozo_binary = ${buildout:bin-directory}/tidstorage_repozo
 tidstoraged_binary = ${buildout:bin-directory}/tidstoraged
+xtrabackup_binary = ${xtrabackup:location}/bin/xtrabackup_51
 zabbix_agent_binary = ${zabbix-agent:location}/sbin/zabbix_agent
 
 # cloudooo specific configuration
@@ -48,15 +49,16 @@ link_binary_list =
   ${graphviz:location}/bin/dot
   ${grep:location}/bin/grep
   ${imagemagick:location}/bin/convert
+  ${imagemagick:location}/bin/identify
   ${mariadb:location}/bin/mysql
   ${mariadb:location}/bin/mysqldump
   ${pdftk:location}/bin/pdftk
   ${sed:location}/bin/sed
   ${tesseract:location}/bin/tesseract
   ${w3m:location}/bin/w3m
-  ${xpdf:location}/bin/pdfinfo
-  ${xpdf:location}/bin/pdftotext
-  ${xtrabackup:location}/bin/xtrabackup_51
+  ${poppler:location}/bin/pdfinfo
+  ${poppler:location}/bin/pdftotext
+  ${poppler:location}/bin/pdftohtml
 
 # XXX: products won't be needed as soon as all ERP5 (and products-deps)
 # products will be eggified so then it will be possible to use them thanks to
@@ -64,3 +66,7 @@ link_binary_list =
 products = ${products:list}
 environment =
   LD_LIBRARY_PATH = ${file:location}/lib:${zlib:location}/lib:${freetype:location}/lib:${libXext:location}/lib:${libXau:location}/lib:${libX11:location}/lib:${libXdmcp:location}/lib:${libxcb:location}/lib
+
+bt5_repository_list = ${bt5-repository:list}
+
+configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catalog erp5_base erp5_workflow erp5_configurator erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_ung

software/erp5/software.cfg

 [buildout]
-extensions =
-  slapos.rebootstrap
-  slapos.zcbworkarounds
-  mr.developer
-
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-    http://dist.repoze.org
-    http://www.nexedi.org/static/packages/source/
-
 extends =
   ../../stack/erp5.cfg
 
@@ -17,6 +7,7 @@ versions = versions
 parts +=
 # Create instance template
   template
+  validator
 
 # XXX: Workaround of SlapOS limitation
 # Unzippig of eggs is required, as SlapOS do not yet provide nicely working
@@ -31,39 +22,19 @@ module = erp5
 
 [template]
 # Default template for erp5 instance.
-recipe = slapos.cookbook:template
+recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 1b29b27aedcc7fa5f30f1053e8eab13f
+md5sum = 65d9b269e204ba49ac5ff11e891a4b84
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
-# Release stabilisation
-[products-deps]
-# Recipe minitage.recipe.fetch is disabled, as it uses PATH variable, but it
-# is not possible to change its environment to use localy delivered subversion
-# nor git. plone.recipe.command can do same job, but it is controllable which
-# binary will be used
-recipe = plone.recipe.command
-svn_param =--trust-server-cert --non-interactive --quiet
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-command =
-  ${subversion:location}/bin/svn checkout ${:svn_param} -r 98997 https://svn.plone.org/svn/collective/ExtFile/trunk ${:location}/ExtFile &&
-  ${git:location}/bin/git clone --quiet git://git.hforge.org/Localizer.git ${:location}/Localizer && cd ${:location}/Localizer && ${git:location}/bin/git reset --quiet --hard dacb6ba0ae559cd9bdb8822812d24a12a21e9e37
-update-command =
-
-[erp5]
-# Recipe zerokspot.recipe.git is disabled, as is not possible to change its
-# environment to use localy delivered git.
-# plone.recipe.command can do same job, but it is controllable which binary
-# will be used
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-repository = http://git.erp5.org/repos/erp5.git
-branch = master
-command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && cd ${:location} && ${git:location}/bin/git reset --quiet --hard 0eba9830dae07dbf5319f218989b79ddd5eb11b1
-update-command =
+[validator]
+# Default json schema for instance parameters.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/configuration.json
+md5sum = cbe1d75339c6cb20e1aef818797face1 
+output = ${buildout:directory}/validator.json
+mode = 0644
 
 [versions]
 MySQL-python = 1.2.3
@@ -79,11 +50,13 @@ Products.DCWorkflowGraph = 0.4nxd001
 Products.ExternalEditor = 1.1.0
 Products.GenericSetup = 1.6.3
 Products.MimetypesRegistry = 2.0.2
-Products.PluggableAuthService = 1.7.4
+Products.PluggableAuthService = 1.7.5
 Products.PluginRegistry = 1.3b1
 Products.TIDStorage = 5.4.7.dev-r45842
 Products.Zelenium = 1.0.3
 StructuredText = 2.11.1
+Werkzeug = 0.6.2
+buildout-versions = 1.6
 cElementTree = 1.0.5-20051216
 chardet = 1.0.1
 cloudooo = 1.2.3
@@ -94,33 +67,40 @@ cloudooo.handler.pdf = 0.1
 csp-eventlet = 0.6.0
 elementtree = 1.2.7-20070827-preview
 erp5.conflictresolver = 0.3
-erp5.recipe.cmmiforcei686 = 0.1.1
+erp5.recipe.cmmiforcei686 = 0.1.3
 erp5diff = 0.8.1.3
-eventlet = 0.9.15
+eventlet = 0.9.16
 feedparser = 5.0.1
 five.localsitemanager = 2.0.5
 greenlet = 0.3.1
 hexagonit.recipe.cmmi = 1.5.0
 hexagonit.recipe.download = 1.5.0
-ipdb = 0.3
-mr.developer = 1.17
+http-parser = 0.6.2
+ipdb = 0.4
+meld3 = 0.6.7
 ordereddict = 1.1
 paramiko = 1.7.7.1
 plone.recipe.command = 1.1
 ply = 3.4
 psutil = 0.2.1
 pycrypto = 2.3
-python-ldap = 2.3.13
-python-memcached = 1.47
-restkit = 3.2.3
+python-ldap = 2.4.0
+python-memcached = 1.45
+restkit = 3.3.0
 rtjp-eventlet = 0.3.2
-slapos.cookbook = 0.1
+slapos.cookbook = 0.9
+slapos.recipe.template = 1.1
 threadframe = 0.2
 timerserver = 2.0.2
 urlnorm = 1.1.2
 uuid = 1.30
+validictory = 0.7.1
 xupdate-processor = 0.4
 
+# Required by:
+# slapos.core==0.8
+Flask = 0.7.1
+
 # Required by:
 # PasteScript==1.7.3
 # cloudooo==1.2.3
@@ -132,10 +112,11 @@ WSGIUtils = 0.7
 
 # Required by:
 # cloudooo==1.2.3
-argparse = 1.2.1
+# slapos.core==0.8
+argparse = 1.1
 
 # Required by:
-# slapos.cookbook==0.1
+# slapos.recipe.template==1.1
 collective.recipe.template = 1.8
 
 # Required by:
@@ -143,46 +124,33 @@ collective.recipe.template = 1.8
 fpconst = 0.7.2
 
 # Required by:
-# ipdb==0.3
+# ipdb==0.4
 ipython = 0.10.2
 
 # Required by:
-# slapos.cookbook==0.1
+# slapos.cookbook==0.9
 netaddr = 0.7.5
 
+# Required by:
+# slapos.core==0.8
+netifaces = 0.4
+
 # Required by:
 # cloudooo==1.2.3
 python-magic = 0.4.0.1
 
 # Required by:
-# Products.CMFActionIcons==2.1.3
-# Products.CMFCalendar==2.2.2
-# Products.CMFCore==2.2.4
-# Products.CMFDefault==2.2.2
-# Products.CMFTopic==2.2.1
-# Products.CMFUid==2.2.1
-# Products.DCWorkflow==2.2.3nxd002
-# Products.DCWorkflowGraph==0.4nxd001
-# Products.ExternalEditor==1.1.0
-# Products.GenericSetup==1.6.3
-# Products.MimetypesRegistry==2.0.2
-# Products.PluggableAuthService==1.7.4
-# Products.PluginRegistry==1.3b1
-# Products.TIDStorage==5.4.7.dev-r45842
-# Products.Zelenium==1.0.3
-# Zope2==2.12.18
-# five.localsitemanager==2.0.5
-# mr.developer==1.17
-# python-ldap==2.3.13
-# zc.buildout==1.5.3-dev-SlapOS-001
-# zope.deprecation==3.4.0
-# zope.structuredtext==3.4.0
-setuptools = 0.6c12dev-r88795
+# zc.buildout==1.5.3-dev-SlapOS-004
+setuptools = 0.6c12dev-r88846
+
+# Required by:
+# slapos.cookbook==0.9
+slapos.core = 0.8
 
 # Required by:
-# slapos.cookbook==0.1
-slapos.slap = 1.2.dev-r4679
+# slapos.core==0.8
+supervisor = 3.0a10
 
 # Required by:
-# slapos.cookbook==0.1
+# slapos.cookbook==0.9
 xml-marshaller = 0.9.7

software/erp5testnode/software.cfg

@@ -55,6 +55,10 @@ arguments = sys.argv[1:] + ["bootstrap"]
 section = python2.6
 version = 1
 
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-002
+
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -67,7 +71,3 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-
-[versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-002

software/kumofs/software.cfg

@@ -16,6 +16,18 @@ extends =
   ../../component/rdiff-backup/buildout.cfg
   ../../component/lxml-python/buildout.cfg
 
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
 versions = versions
 
 parts +=
@@ -60,13 +72,13 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.4
+slapos.cookbook = 0.7
 
 erp5.recipe.cmmiforcei686 = 0.1.1
 hexagonit.recipe.cmmi = 1.5.0
 hexagonit.recipe.download = 1.5.0
 
-# Required by slapos.cookbook==0.4
+# Required by slapos.cookbook==0.7
 slapos.core = 0.2
 collective.recipe.template = 1.8
 netaddr = 0.7.5

software/mariadb/instance.cfg

+[buildout]
+parts =
+  instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+dcrond_binary = ${dcron:location}/sbin/crond
+innobackupex_binary = ${xtrabackup:location}/bin/innobackupex
+logrotate_binary = ${logrotate:location}/usr/sbin/logrotate
+mysql_binary = ${mariadb:location}/bin/mysql
+mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
+mysqld_binary = ${mariadb:location}/libexec/mysqld
+openssl_binary = ${openssl:location}/bin/openssl
+perl_binary = ${perl:location}/bin/perl
+rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
+stunnel_binary = ${stunnel:location}/bin/stunnel

software/mariadb/software.cfg

+[buildout]
+
+extensions =
+  slapos.zcbworkarounds
+  slapos.rebootstrap
+
+find-links +=
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+extends =
+  ../../component/mariadb/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
+versions = versions
+
+parts +=
+# Create instance template
+#TODO : list here all parts.
+  template
+  libxslt
+  eggs
+  instance-recipe-egg
+
+# XXX: Workaround of SlapOS limitation
+# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
+# development / fast switching environment for whole software
+unzip = true
+
+[rebootstrap]
+# Default first version of rebootstrapped python
+version = 2
+section = python2.7
+
+[instance-recipe]
+egg = slapos.cookbook
+module = mysql
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+
+[eggs]
+recipe = zc.recipe.egg
+python = python2.7
+eggs =
+  ${lxml-python:egg}
+
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 69c32a67c5640d36ee042d2cfc35843d
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+slapos.cookbook = 0.9
+
+# Required by slapos.cookbook==0.9
+slapos.core = 0.4
+collective.recipe.template = 1.8
+netaddr = 0.7.5
+xml-marshaller = 0.9.7
+setuptools = 0.6c12dev-r88795
+
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+plone.recipe.command = 1.1
+
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001

software/memcached/software.cfg

@@ -14,7 +14,19 @@ extends =
   ../../component/stunnel/buildout.cfg
   ../../component/rdiff-backup/buildout.cfg
   ../../component/lxml-python/buildout.cfg
-  
+
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
 versions = versions
 
 parts =
@@ -59,9 +71,9 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-slapos.cookbook = 0.4
+slapos.cookbook = 0.7
 
-# Required by slapos.cookbook==0.4
+# Required by slapos.cookbook==0.7
 slapos.core = 0.2
 collective.recipe.template = 1.8
 netaddr = 0.7.5

software/mysql-5.1/instance.cfg

+[buildout]
+parts =
+  instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+dcrond_binary = ${dcron:location}/sbin/crond
+innobackupex_binary = ${xtrabackup:location}/bin/innobackupex
+logrotate_binary = ${logrotate:location}/usr/sbin/logrotate
+mysql_binary = ${mysql-5.1:location}/bin/mysql
+mysql_install_binary = ${mysql-5.1:location}/bin/mysql_install_db
+mysql_upgrade_binary = ${mysql-5.1:location}/bin/mysql_upgrade
+mysqld_binary = ${mysql-5.1:location}/libexec/mysqld
+openssl_binary = ${openssl:location}/bin/openssl
+perl_binary = ${perl:location}/bin/perl
+rdiff_backup_binary = ${buildout:bin-directory}/rdiff-backup
+stunnel_binary = ${stunnel:location}/bin/stunnel

software/mysql-5.1/software.cfg

+[buildout]
+
+extensions =
+  slapos.zcbworkarounds
+  slapos.rebootstrap
+
+find-links +=
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+extends =
+  ../../component/mysql-5.1/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/stunnel/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
+versions = versions
+
+parts +=
+#TODO : list here all parts.
+# Create instance template
+  template
+  libxslt
+  eggs
+  instance-recipe-egg
+  rdiff-backup
+
+# XXX: Workaround of SlapOS limitation
+# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
+# development / fast switching environment for whole software
+unzip = true
+
+[rebootstrap]
+# Default first version of rebootstrapped python
+version = 2
+section = python2.7
+
+[instance-recipe]
+egg = slapos.cookbook
+module = mysql
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+
+[eggs]
+recipe = zc.recipe.egg
+python = python2.7
+eggs =
+  ${lxml-python:egg}
+
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 2764597a6e4fe243cdf6e37b6535e767
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[versions]
+slapos.cookbook = 0.9
+
+# Required by slapos.cookbook==0.9
+slapos.core = 0.4
+collective.recipe.template = 1.8
+netaddr = 0.7.5
+xml-marshaller = 0.9.7
+setuptools = 0.6c12dev-r88795
+
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+plone.recipe.command = 1.1
+
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001

software/phpmyadmin/instance.cfg

+[buildout]
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+parts = instance
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+source = ${application:location}
+template = ${application-template:location}/${application-template:filename}
+configuration = ${application-configuration:location}
+
+httpd_binary = ${apache:location}/bin/httpd
+mysql_binary = ${mariadb:location}/bin/mysql
+mysql_install_binary = ${mariadb:location}/bin/mysql_install_db
+mysql_upgrade_binary = ${mariadb:location}/bin/mysql_upgrade
+mysqld_binary = ${mariadb:location}/libexec/mysqld

software/phpmyadmin/phpmyadmin-configuration-template.php.ini

+<?php
+$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$i = 0;
+$i++;
+/* Server parameters */
+$cfg['Servers'][$i]['host'] = '%(mysql_host)s';
+$cfg['Servers'][$i]['port'] = '%(mysql_port)s';
+/* Authentication type */
+$cfg['Servers'][$i]['auth_type'] = 'cookie';
+$cfg['Servers'][$i]['user'] = '';
+$cfg['Servers'][$i]['connect_type'] = 'tcp';
+$cfg['Servers'][$i]['compress'] = false;
+/* Select mysqli if your server has it */
+$cfg['Servers'][$i]['extension'] = 'mysql';
+$cfg['Servers'][$i]['AllowNoPassword'] = false;
+
+/* rajk - for blobstreaming */
+$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
+$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
+$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
+$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
+$cfg['UploadDir'] = '';
+$cfg['SaveDir'] = '';
+
+?>
\ No newline at end of file

software/phpmyadmin/software.cfg

+[buildout]
+find-links +=
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
+versions = versions
+
+parts =
+  template
+  downloadcache-workaround
+  apache-php
+  mariadb
+  eggs
+  instance-recipe-egg
+  
+extends =
+  ../../component/mariadb/buildout.cfg
+  ../../component/apache/buildout.cfg
+  ../../component/apache-php/buildout.cfg
+  ../../component/dcron/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/glib/buildout.cfg
+  ../../component/logrotate/buildout.cfg
+  ../../component/python-2.7/buildout.cfg
+  ../../component/perl/buildout.cfg
+  ../../component/sqlite3/buildout.cfg
+  ../../component/xtrabackup/buildout.cfg
+  ../../component/rdiff-backup/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/zlib/buildout.cfg
+  
+[template]
+# Default template for the instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = efdb8509f40c86b1b73924fc1ce92f13
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[application]
+recipe = hexagonit.recipe.download
+url = http://downloads.sourceforge.net/project/phpmyadmin/phpMyAdmin/3.3.10/phpMyAdmin-3.3.10-all-languages.tar.bz2?r=http%3A%2F%2Fwww.phpmyadmin.net%2Fhome_page%2Fdownloads.php&ts=1300959842&use_mirror=sunet
+#md5sum = Student may put here md5sum of this file, this is good idea
+#If provided tarball does not containt top directory this option shall be changed o false
+strip-top-level-dir = true
+
+[application-template]
+recipe = slapos.recipe.download
+#url = https://docs.google.com/a/lnowak.com/uc?id=0B_lVQSQ57Cz7Yzg3MjFiYTgtNmJlYy00YjhhLWE4ZGEtYThlOWM2NzA3YWQ0&export=download&hl=en
+url = ${:_profile_base_location_}/phpmyadmin-configuration-template.php.ini
+#md5sum = Student may put here md5sum of this file, this is good idea
+download-only = True
+filename = template.in
+mode = 0644
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+[application-configuration]
+location = config.inc.php
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  
+[instance-recipe]
+egg = slapos.cookbook
+module = osoeslaptraining.simple
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+
+[downloadcache-workaround]
+# workaround irritating problem of hexagonit.recipe.cmmi which automatically
+# creates download cache, which in turn switches builout to "semi-offline" mode
+recipe = plone.recipe.command
+# in hexagonit.recipe.cmmi if there is no ${buildout:download-cache} set it resolves
+# to ${buildout:directory}/downloads but this variable is available late, that's
+# why it is hardcoded only for required case
+download-cache = ${buildout:directory}/downloads
+command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
+update-command = ${:command}
+stop-on-error = True
+
+[versions]
+slapos.cookbook = 0.10
+
+# Required by slapos.cookbook==0.10
+slapos.core = 0.8
+collective.recipe.template = 1.8
+netaddr = 0.7.5
+xml-marshaller = 0.9.7
+setuptools = 0.6c12dev-r88795
+
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+plone.recipe.command = 1.1
+
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-004
\ No newline at end of file

software/slaprunner/instance.cfg

+[buildout]
+parts =
+  instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+slaprunner = ${buildout:directory}/bin/slaprunner
+slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
+slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
+slapproxy = ${buildout:directory}/bin/slapproxy
+supervisor = ${buildout:directory}/bin/slapgrid-supervisor

software/slaprunner/software.cfg

+[buildout]
+extends =
+  ../../stack/flask.cfg
+
+parts =
+  template
+  eggs
+  instance-recipe-egg
+
+find-links +=
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+versions = versions
+
+[instance-recipe]
+egg = slapos.cookbook
+module = slaprunner
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.7
+eggs = ${instance-recipe:egg}
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/template.cfg
+mode = 0644
+md5sum = 04b17b8665eb4e11ce3a4661ad98e5e3
+
+[eggs]
+eggs +=
+  slapos.toolbox
+  slapos.core
+
+[versions]
+slapos.cookbook = 0.10
+
+# Required by slapos.cookbook==0.10
+slapos.core = 0.8
+collective.recipe.template = 1.8
+netaddr = 0.7.5
+xml-marshaller = 0.9.7
+setuptools = 0.6c12dev-r88795
+
+hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.download = 1.5.0
+plone.recipe.command = 1.1
+
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-004
\ No newline at end of file

software/vifib/software.cfg

+[buildout]
+extends =
+  ../erp5/software.cfg
+
+parts +=
+  vifib
+
+[eggs]
+eggs += slapos.core
+
+[instance-recipe]
+module = vifib
+
+[vifib]
+# Recipe zerokspot.recipe.git is disabled, as is not possible to change its
+# environment to use localy delivered git.
+# plone.recipe.command can do same job, but it is controllable which binary
+# will be used
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+repository = http://git.erp5.org/repos/slapos.core.git
+branch = master
+revision = f95ca3ccda07292895939ef9b48678acb5f524ce
+command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+
+[local-bt5-repository]
+# XXX: workaround for zc.buildout bug, as list += ends up with adding new entry
+#      after newline
+list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${vifib:location}/master/bt5
+
+[products]
+# XXX: Lack of eggification workaround
+# list of products, possible to extend, it is passed in reversed way
+# to allow overriding during extending profile
+list = ${products-deps:location} ${erp5:location}/product ${vifib:location}/master/product

stack/erp5.cfg

@@ -9,9 +9,26 @@ find-links =
     http://dist.repoze.org
     http://www.nexedi.org/static/packages/source/
 
+# Separate from site eggs
+allowed-eggs-from-site-packages =
+include-site-packages = false
+exec-sitecustomize = false
+
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
 extends =
 # Exact version of Zope
-  http://svn.zope.org/repos/main/Zope/tags/2.12.18/versions.cfg
+  http://svn.zope.org/repos/main/Zope/tags/2.12.19/versions.cfg
   ../component/logrotate/buildout.cfg
   ../component/dcron/buildout.cfg
   ../component/file/buildout.cfg
@@ -35,6 +52,7 @@ extends =
   ../component/python-2.7/buildout.cfg
   ../component/python-ldap-python/buildout.cfg
   ../component/rdiff-backup/buildout.cfg
+  ../component/sphinx/buildout.cfg
   ../component/stunnel/buildout.cfg
   ../component/subversion/buildout.cfg
   ../component/tesseract/buildout.cfg
@@ -42,7 +60,7 @@ extends =
   ../component/w3-validator/buildout.cfg
   ../component/w3m/buildout.cfg
   ../component/xorg/buildout.cfg
-  ../component/xpdf/buildout.cfg
+  ../component/poppler/buildout.cfg
   ../component/xtrabackup/buildout.cfg
   ../component/zabbix/buildout.cfg
   ../component/sed/buildout.cfg
@@ -63,10 +81,11 @@ parts =
   varnish-2.1
   stunnel
   w3m
-  xpdf
+  poppler
   libpng12
   ghostscript
   mariadb
+  sphinx
   imagemagick
   kumo
   libreoffice-bin
@@ -103,27 +122,36 @@ parts =
 
 # get git repositories
   erp5
-
-[products]
-# XXX: ERP5 related products are not defined as python distributions, so it is
-#      required to configure them in declarative manner
-list = ${products-deps:location} ${erp5:location}/product
+  genbt5list
+
+[bt5-repository]
+# Format:
+#   <url or path> [...]
+#
+# Use absolute paths for local repositories, and URLs for non-local otherwise.
+#
+list = ${local-bt5-repository:list}
+
+[local-bt5-repository]
+# Same as bt5-repository, but only local repository.
+# Used to generate bt5lists.
+list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap
+
+[genbt5list]
+recipe = plone.recipe.command
+stop-on-error = true
+genbt5list = ${erp5:location}/product/ERP5/bin/genbt5list
+command =
+  ${buildout:executable} ${:genbt5list} ${local-bt5-repository:list}
+update-command = ${:command}
 
 [bootstrap2.6]
 python = python2.6
 
 [rebootstrap]
-# Default first version of rebootstrapped python
-version = 2
+version = 3
 section = python2.7
-
-[template]
-# Default template for erp5 instance.
-recipe = slapos.cookbook:template
-url = ${:_profile_base_location_}/instance.cfg
-md5sum = 16d09f1964101bbe128a81c7ffcf996e
-output = ${buildout:directory}/template.cfg
-mode = 0644
+eggs = slapos.libnetworkcache
 
 [itools]
 pkgname = itools-0.50.8
@@ -187,8 +215,9 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 stop-on-error = true
 repository = http://git.erp5.org/repos/erp5.git
 branch = master
-command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location}
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+revision = 0c37bafcc688c022d710f04ffafa226e3543a2cd
+command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
 
 [products]
 # XXX: ERP5 related products are not defined as python distributions, so it is
@@ -214,14 +243,16 @@ initialization =
   import Zope2
   os.environ['SOFTWARE_HOME'] = os.path.abspath(os.path.dirname(os.path.dirname(Zope2.__file__)))
   os.environ['ZOPE_SCRIPTS'] = ''
-  temp_bt5_path_list = ['/'.join(['''${buildout:parts-directory}''', x, 'bt5']) for x in '''${erp5_repository_list:repository_id_list}'''.split(' ')]
+  parts_directory = '''${buildout:parts-directory}'''
+  repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
+  temp_bt5_path_list = ['/'.join([parts_directory, x, 'bt5']) for x in repository_id_list]
   bt5_path_list = []
   [bt5_path_list.extend([bt5_path, '%s/*' % bt5_path]) for bt5_path in temp_bt5_path_list]
   os.environ['erp5_tests_bt5_path'] = ','.join(bt5_path_list)
-  sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x, 'tests']) for x in '''${erp5_repository_list:repository_id_list}'''.split(' ')]
+  sys.path[0:0] = ['/'.join([parts_directory, x, 'tests']) for x in repository_id_list]
   import glob
   product_test_path_list = []
-  [product_test_path_list.extend(glob.glob('/'.join(['''${buildout:parts-directory}''', x, 'product/*/tests']))) for x in '''${erp5_repository_list:repository_id_list}'''.split(' ')]
+  [product_test_path_list.extend(glob.glob('/'.join([parts_directory, x, 'product/*/tests']))) for x in repository_id_list]
   sys.path[0:0] = product_test_path_list
 
 [test_suite_runner]
@@ -243,7 +274,8 @@ initialization =
   import Zope2
   os.environ['SOFTWARE_HOME'] = os.path.abspath(os.path.dirname(os.path.dirname(Zope2.__file__)))
   os.environ['ZOPE_SCRIPTS'] = ''
-  sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in '''${erp5_repository_list:repository_id_list}'''.split(' ')]
+  repository_id_list = list(reversed('''${erp5_repository_list:repository_id_list}'''.split()))
+  sys.path[0:0] = ['/'.join(['''${buildout:parts-directory}''', x]) for x in repository_id_list]
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg
@@ -285,6 +317,7 @@ eggs =
   xupdate_processor
   feedparser
   argparse
+  validictory
 
 # Zope 2.12 with patched acquisition
   ZODB3
@@ -360,7 +393,7 @@ scripts =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-001
+zc.buildout = 1.5.3-dev-SlapOS-004
 
 # pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
 Acquisition = 2.13.7nxd001

stack/flask.cfg

@@ -4,6 +4,18 @@ extends =
   ../component/python-2.7/buildout.cfg
   ../component/lxml-python/buildout.cfg
 
+# Use only quite well working sites.
+allow-hosts =
+  *.nexedi.org
+  *.python.org
+  *.sourceforge.net
+  dist.repoze.org
+  effbot.org
+  github.com
+  peak.telecommunity.com
+  psutil.googlecode.com
+  www.dabeaz.com
+
 parts =
   eggs
 
@@ -11,7 +23,12 @@ parts =
 unzip = true
 
 [eggs]
+python = python2.7
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   Flask
+  slapos.cookbook
+
+[lxml-python]
+python = python2.7