Merge branch 'erp5'

0f8e52e7 · Kazuhiko Shiozaki · 0408949b · 591782d6 · 0f8e52e7 · 0f8e52e7
Commit 0f8e52e7 authored Mar 04, 2013 by Kazuhiko Shiozaki
88 changed files
--- a/component/6tunnel/buildout.cfg
+++ b/component/6tunnel/buildout.cfg
+# 6tunnel - Tunnelling for application that don't speak IPv6
+# http://toxygen.net/6tunnel/
+
+[buildout]
+parts = 6tunnel
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+
+[6tunnel]
+recipe = hexagonit.recipe.cmmi
+url = http://toxygen.net/6tunnel/6tunnel-0.11rc2.tar.gz
+md5sum = 74e02d4f0704b3083a01feda66033449
+configure-command =
+  aclocal
+  autoheader
+  automake --foreign
+  autoconf
+  ./configure
+configure-options =
+  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s
--- a/component/apache/buildout.cfg
+++ b/component/apache/buildout.cfg
@@ -21,19 +21,19 @@ md5sum = ffee70a111fd07372982b0550bbb14b7

 [apr-util]
 recipe = hexagonit.recipe.download
-version = 1.4.1
+version = 1.5.1
 url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-${:version}.tar.bz2
-md5sum = 52b31b33fb1aa16e65ddaefc76e41151
+md5sum = 9c1db8606e520f201c451ec9a0b095f6

 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = hexagonit.recipe.cmmi
 depends =
  ${gdbm:version}
-version = 2.4.3
-revision = 2
+version = 2.4.4
+revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
+md5sum = 0e712ee2119cd798c8ae39d5f11a9206
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
 configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
                    --disable-static
@@ -120,8 +120,8 @@ make-targets =
 [apache-2.2]
 # 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.22.tar.gz
-md5sum = d77fa5af23df96a8af68ea8114fa6ce1
+url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.24.tar.gz
+md5sum = 64a3392018ad60583209a16d728180d3
 patch-options = -p1
 configure-options = --disable-static
                    --enable-authn-alias

--- a/component/automake/buildout.cfg
+++ b/component/automake/buildout.cfg
@@ -2,12 +2,13 @@
 extends =
  ../autoconf/buildout.cfg
  ../perl/buildout.cfg
+  ../xz-utils/buildout.cfg
 parts =
  automake

 [automake]
 recipe = hexagonit.recipe.cmmi
-md5sum = e620cb9e0259159341c0e0d6b712b67a
-url = http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz
+md5sum = 140e084223bf463a24c1a28427c6aec7
+url = http://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.xz
 environment =
-  PATH =${autoconf:location}/bin:${perl:location}/bin:%(PATH)s
+  PATH =${autoconf:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
--- a/component/cloudooo/buildout.cfg
+++ b/component/cloudooo/buildout.cfg
@@ -15,14 +15,10 @@ update-command = ${:command}
 command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link

 [cloudooo-repository]
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/cloudooo.git
 branch = master
-revision =
-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
+git-executable = ${git:location}/bin/git

 [cloudooo]
 recipe = zc.recipe.egg
@@ -44,4 +40,4 @@ scripts =
  paster=cloudooo_paster
  runCloudoooUnitTest
  runCloudoooTestSuite
-ugly-depend-on = ${cloudooo-repository:command} ${cloudooo-repository:update-command} ${cloudooo-check-recipe:command}
+ugly-depend-on = ${cloudooo-repository:recipe} ${cloudooo-repository:repository} ${cloudooo-check-recipe:command}
--- a/component/cmake/buildout.cfg
+++ b/component/cmake/buildout.cfg
@@ -4,5 +4,5 @@ parts =

 [cmake]
 recipe = hexagonit.recipe.cmmi
-url = http://www.cmake.org/files/v2.8/cmake-2.8.8.tar.gz
-md5sum = ba74b22c788a0c8547976b880cd02b17
+url = http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz
+md5sum = 097278785da7182ec0aea8769d06860c
--- a/component/coreutils/buildout.cfg
+++ b/component/coreutils/buildout.cfg
 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
  coreutils

-[coreutils-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 63c2299d92d23e4748abb9668b7e62ea
-download-only = true
-filename = drop.gets.patch
-
 [coreutils]
-virtual-depends = ${coreutils-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.12.tar.gz
-md5sum = fce7999953a67243d00d75cc86dbcaa6
-
-patch-options = -p1
-patches =
-  ${coreutils-drop.gets.patch:location}/${coreutils-drop.gets.patch:filename}
-
+url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.20.tar.xz
+md5sum = 3d69af8f561fce512538a9fe85f147ff
 configure-options =
  --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
  LDFLAGS =-Wl,--as-needed
--- a/component/coreutils/drop.gets.patch
+++ b/component/coreutils/drop.gets.patch
-diff -ur coreutils-8.12.old/lib/stdio.in.h coreutils-8.12/lib/stdio.in.h
--- coreutils-8.12.old/lib/stdio.in.h	2011-04-25 11:01:29.000000000 +0200
-+++ coreutils-8.12/lib/stdio.in.h	2012-07-23 16:02:17.591610452 +0200
-@@ -181,7 +181,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
--- a/component/curl/buildout.cfg
+++ b/component/curl/buildout.cfg
@@ -11,8 +11,8 @@ parts =

 [curl]
 recipe = hexagonit.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.24.0.tar.bz2
-#md5sum = 5f6d50c4d4ee38c57fe37e3cff75adbd
+url = http://curl.haxx.se/download/curl-7.29.0.tar.bz2
+md5sum = fa5f37f38a8042020e292ce7ec5341ce
 configure-options =
  --disable-static
  --disable-ldap

--- a/component/cyrus-sasl/buildout.cfg
+++ b/component/cyrus-sasl/buildout.cfg
@@ -4,24 +4,10 @@ parts =
 extends =
  ../zlib/buildout.cfg

-[cyrus-sasl-gcc4.4-patch]
-# patch available thanks to Gentoo packagers
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-gcc44.patch?revision=1.2
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 5deb4d67b53ecba20c7887fc8fdebee1
-filename = cyrus-sasl-2.1.22-gcc44.patch
-download-only = true
-
 [cyrus-sasl]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.23.tar.gz
-md5sum = 2eb0e48106f0e9cd8001e654f267ecbc
-
-patches =
-  ${cyrus-sasl-gcc4.4-patch:location}/${cyrus-sasl-gcc4.4-patch:filename}
-patch-options =
-  -p1
+url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
+md5sum = a7f4e5e559a0e37b3ffc438c9456e425

 configure-options =
  --disable-digest

--- a/component/firefox/buildout.cfg
+++ b/component/firefox/buildout.cfg
@@ -22,8 +22,8 @@ depends =
  ${liberation-fonts:location}
  ${ipaex-fonts:location}

-x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/linux-i686/fr/firefox-11.0.tar.bz2 a7e9c614ddac993476ef771afaedf568
-x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/linux-x86_64/fr/firefox-11.0.tar.bz2 b358865c08145211314a62660e871614
+x86 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/18.0.2/linux-i686/en-US/firefox-18.0.2.tar.bz2 9eb4dcf2e9578203a16da3c70817ccb2
+x86-64 = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/18.0.2/linux-x86_64/en-US/firefox-18.0.2.tar.bz2 29903172f6fd788f04dbeb27b9193fe6

 script =
  if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
@@ -34,9 +34,9 @@ script =
  wrapper = open(wrapper_location, 'w')
  wrapper.write("""#!${dash:location}/bin/dash
  cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:${freetype:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${bzip2:location}/lib/:${libXext:location}/lib/:${libXt:location}/lib/:${zlib:location}/lib/:${libXcursor:location}/lib/:${gtk-2:location}/lib/:${cairo:location}/lib/:${pango:location}/lib/:${glib:location}/lib/:${atk:location}/lib/:${gdk-pixbuf:location}/lib/:${alsa:location}/lib/:${libpng:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
+  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:{dbus:location}/lib/:${dbus-glib:location}/lib/:${freetype:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${bzip2:location}/lib/:${libXext:location}/lib/:${libXt:location}/lib/:${zlib:location}/lib/:${libXcursor:location}/lib/:${gtk-2:location}/lib/:${cairo:location}/lib/:${pango:location}/lib/:${glib:location}/lib/:${atk:location}/lib/:${gdk-pixbuf:location}/lib/:${alsa:location}/lib/:${libpng:location}/lib/:${libSM:location}/lib/:${libICE:location}/lib:${libxml2:location}/lib:${openssl:location}/lib
  export PATH=${fontconfig:location}/bin:$PATH
  exec %(location)s/firefox $*""")
  wrapper.close()
-  os.chmod(wrapper_location, 0777)
+  os.chmod(wrapper_location, 0755)

--- a/component/fontconfig/buildout.cfg
+++ b/component/fontconfig/buildout.cfg
@@ -13,17 +13,16 @@ parts =

 [fontconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://fontconfig.org/release/fontconfig-2.9.0.tar.gz
-md5sum = 26c83855ed256b5c032baae032fadc4f
+url = http://fontconfig.org/release/fontconfig-2.10.2.tar.bz2
+md5sum = 2f239690057d1438aa282e051f721d08
 # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
  --disable-static
  --disable-docs
  --enable-libxml2
  --with-default-fonts=${fonts:location}
-  --with-freetype-config=${freetype:location}/bin/freetype-config
 environment =
  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${freetype:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
  CPPFLAGS=-I${zlib:location}/include -I${bzip2:location}/include
  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib
--- a/component/fonts/buildout.cfg
+++ b/component/fonts/buildout.cfg
@@ -14,8 +14,8 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [liberation-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-1.07.0.tar.gz
-md5sum = 8150db1c6e27cacdfd524b563b85b69e
+url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz
+md5sum = 5c781723a0d9ed6188960defba8e91cf
 destination = ${fonts:location}/${:_buildout_section_name_}

 # IPAex and IPA Font - Japanese fonts provided by IPA
@@ -23,8 +23,8 @@ destination = ${fonts:location}/${:_buildout_section_name_}
 [ipaex-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAexfont00103.zip
-md5sum = ac67b2fc3aab7f683d89f0070df284e7
+url = http://ossipedia.ipa.go.jp/ipafont/ipaexfont/IPAexfont00201.php
+md5sum = 7bf84182a04a9632268dbcb03f100d05
 destination = ${fonts:location}/${:_buildout_section_name_}

 [ipa-fonts]

--- a/component/freetype/buildout.cfg
+++ b/component/freetype/buildout.cfg
@@ -11,8 +11,8 @@ parts =

 [freetype]
 recipe = hexagonit.recipe.cmmi
-url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2
-md5sum = 77a893dae81fd5b896632715ca041179
+url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.11.tar.bz2
+md5sum = b93435488942486c8d0ca22e8f768034
 configure-options =
  --disable-static
 environment =

--- a/component/gcc/buildout.cfg
+++ b/component/gcc/buildout.cfg
@@ -55,13 +55,6 @@ environment =
  PATH=${m4:location}/bin:%(PATH)s
  LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${ppl:location}/lib

-[ecj]
-recipe = hexagonit.recipe.download
-download-only = true
-url = ftp://sourceware.org/pub/java/ecj-4.5.jar
-md5sum = d7cd6a27c8801e66cbaa964a039ecfdb
-filename = ecj.jar
-
 [gcc-download]
 hack-revision = ${gcc-interconnection-workaround:hack-revision}
 recipe = hexagonit.recipe.download
@@ -70,15 +63,6 @@ md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
 strip-top-level-dir = True
 destination = ${gcc-source:location}

-[gcc-java-download]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-recipe = hexagonit.recipe.download
-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-source:location}
-ignore-existing = true
-
 [gcc-source]
 hack-revision = ${gcc-interconnection-workaround:hack-revision}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -90,53 +74,10 @@ url = ${:_profile_base_location_}/${:filename}
 filename = ${:_buildout_section_name_}
 download-only = true

-[gcc-java-pre-4.4.patch]
-recipe = hexagonit.recipe.download
-md5sum = 9a563576126d9fcf234ef29c2fc7df76
-url = ${:_profile_base_location_}/${:filename}
-filename = ${:_buildout_section_name_}
-download-only = true
-
-[gcc-java-minimal]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-depends =
-  ${gcc-download:location}
-  ${gcc-java-download:location}
-recipe = hexagonit.recipe.cmmi
-path = ${gcc-source:location}
-md5sum = bb3265edf0fa7543e50cedb93e04e427
-patches =
-  ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
-  ${gcc-java-pre-4.4.patch:location}/${gcc-java-pre-4.4.patch:filename}
-patch-options = -p2
-configure-command = make clean \\; make distclean \\; ./configure
-# 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
-configure-options =
-  --disable-bootstrap
-  --enable-languages=java
-  --disable-multilib
-  --with-gmp=${gmp:location}
-  --with-mpfr=${mpfr:location}
-  --with-mpc=${mpc:location}
-  --with-ecj-jar=${ecj:location}/${ecj:filename}
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --without-ppl
-  --without-cloog
-
-environment =
-  CPPFLAGS =-I${mpfr:location}/include -I${gmp:location}/include -I${mpc:location}/include
-  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
-
 [gcc]
 hack-revision = ${gcc-interconnection-workaround:hack-revision}
 depends =
  ${gcc-download:location}
-  ${gcc-java-download:location}
 recipe = hexagonit.recipe.cmmi
 path = ${gcc-source:location}
 md5sum = bb3265edf0fa7543e50cedb93e04e427
@@ -149,7 +90,7 @@ configure-command = make clean \\; make distclean \\; ./configure
 # backticks are working
 configure-options =
  --disable-bootstrap
-  --enable-languages="c,c++,java"
+  --enable-languages="c,c++"
  --disable-multilib
  --with-gmp=${gmp:location}
  --with-mpfr=${mpfr:location}

--- a/component/gettext/buildout.cfg
+++ b/component/gettext/buildout.cfg
@@ -6,22 +6,10 @@ extends =
  ../libxml2/buildout.cfg
  ../zlib/buildout.cfg

-[gettext-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 1a17a2e6c1539927304379dfa0f149c5
-download-only = true
-filename = drop.gets.patch
-
 [gettext]
-virtual-depends = ${gettext-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz
-md5sum = 3dd55b952826d2b32f51308f2f91aa89
-
-patch-options = -p1
-patches =
-  ${gettext-drop.gets.patch:location}/${gettext-drop.gets.patch:filename}
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.tar.gz
+md5sum = 0c86e5af70c195ab8bd651d17d783928

 configure-options =
  --disable-static

--- a/component/gettext/drop.gets.patch
+++ b/component/gettext/drop.gets.patch
-diff -ur gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h
--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h	2010-05-17 21:56:12.000000000 +0200
-+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h	2012-07-20 17:42:29.940524198 +0200
-@@ -141,7 +141,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-diff -ur gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h
--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h	2010-05-24 11:42:46.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h	2012-07-20 17:45:20.550461064 +0200
-@@ -141,7 +141,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-diff -ur gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h
--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h	2010-05-17 21:58:03.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h	2012-07-20 17:45:15.937129402 +0200
-@@ -141,7 +141,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
--- a/component/ghostscript/buildout.cfg
+++ b/component/ghostscript/buildout.cfg
@@ -16,6 +16,7 @@ configure-options =
  --with-system-libtiff
  --without-x
  --with-drivers=FILES
+  --with-fontpath=${ghostscript-fonts:location}
 # it seems that parallel build sometimes fails for ghostscript.
 make-options = -j1
 environment =
@@ -31,3 +32,9 @@ environment =
 <= ghostscript-common
 url = http://downloads.ghostscript.com/public/ghostscript-9.06.tar.bz2
 md5sum = 46f9ebe40dc52755287b30704270db11
+
+[ghostscript-fonts]
+recipe = hexagonit.recipe.download
+url = http://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-8.11.tar.gz
+md5sum = 6865682b095f8c4500c54b285ff05ef6
+strip-top-level-dir = true
--- a/component/grep/buildout.cfg
+++ b/component/grep/buildout.cfg
 [buildout]
 extends =
  ../pcre/buildout.cfg
+  ../xz-utils/buildout.cfg
 parts =
  grep

 [grep]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/grep/grep-2.9.tar.gz
-md5sum = 03e3451a38b0d615cb113cbeaf252dc0
+url = http://ftp.gnu.org/gnu/grep/grep-2.14.tar.xz
+md5sum = d4a3f03849d1e17ce56ab76aa5a24cab
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
  CPPFLAGS=-I${pcre:location}/include
  LDFLAGS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib
--- a/component/groonga/buildout.cfg
+++ b/component/groonga/buildout.cfg
@@ -5,10 +5,15 @@
 parts =
  groonga

+extends =
+  ../pkgconfig/buildout.cfg
+  ../zlib/buildout.cfg
+
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.6.tar.gz
-md5sum = 64467d1ab8d5e0df8348a636972a95a7
+version = 3.0.1
+url = http://packages.groonga.org/source/groonga/groonga-${:version}.tar.gz
+md5sum = fd03bb14a04e7c696151b5673e408701
 configure-options =
  --disable-static
  --disable-glibtest
@@ -16,3 +21,20 @@ configure-options =
  --disable-document
  --disable-groonga-httpd
  --without-mecab
+environment =
+  CPPFLAGS =-I${zlib:location}/include
+  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
+
+[groonga-normalizer-mysql]
+recipe = hexagonit.recipe.cmmi
+version = 1.0.1
+url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
+md5sum = 93239c856f2e4768562506d440cb4c7d
+location = ${groonga:location}
+depends =
+  ${groonga:version}
+configure-options =
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
--- a/component/gtk-2/buildout.cfg
+++ b/component/gtk-2/buildout.cfg
@@ -20,6 +20,7 @@ url = http://cairographics.org/releases/cairo-1.10.2.tar.gz
 md5sum = f101a9e88b783337b20b2e26dfd26d5f
 configure-options = 
  --enable-tee=yes
+  --enable-xlib=no
 environment = 
  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig
@@ -36,7 +37,7 @@ configure-options =
 # XXX-Cedric : Why, god, why do I have to supply the -lXrender option to linker?
 environment = 
  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig::${libXrender:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
  CPPFLAGS=-I${cairo:location}/include/cairo -I${libX11:location}/include/X11 -I${libxcb:location}/include/xcb -I${libXau:location}/include/X11 -I${bzip2:location}/include -L${libXrender:location}/include -I${zlib:location}/include
  LDFLAGS=-L${cairo:location}/lib -Wl,-rpath=${cairo:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -lXrender -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib:${libXrender:location}/lib

--- a/component/gzip/buildout.cfg
+++ b/component/gzip/buildout.cfg
 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
  gzip

-[gzip-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = d9b1156f912c8cf006f140482918ebc9
-download-only = true
-filename = drop.gets.patch
-
 [gzip]
-virtual-depends = ${gzip-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
-
-patch-options = -p1
-patches =
-  ${gzip-drop.gets.patch:location}/${gzip-drop.gets.patch:filename}
-
-url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.4.tar.gz
-md5sum = e381b8506210c794278f5527cba0e765
+url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.5.tar.xz
+md5sum = 2a431e169b6f62f7332ef6d47cc53bae
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
--- a/component/imagemagick/buildout.cfg
+++ b/component/imagemagick/buildout.cfg
@@ -13,9 +13,12 @@ extends =
  ../libpng/buildout.cfg
  ../libtiff/buildout.cfg
  ../libtool/buildout.cfg
+  ../libxml2/buildout.cfg
  ../jasper/buildout.cfg
  ../jbigkit/buildout.cfg
  ../pkgconfig/buildout.cfg
+  ../webp/buildout.cfg
+  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg

 [imagemagick-6.6.6-1-no-gsx-gsc-probe.patch]
@@ -28,11 +31,10 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch

 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.8.1-10.tar.bz2
-md5sum = cde56988f9d2208d9d61815cc23665b4
+url = http://ftp.vim.org/ImageMagick/ImageMagick-6.8.2-6.tar.xz
+md5sum = ee01558201041a9978dd14b1db946ce8
 depends =
  ${libtiff:version}
-  ${librsvg:version}
 configure-options =
  --disable-static
  --without-x
@@ -49,22 +51,21 @@ configure-options =
  --without-lcms
  --without-lcms2
  --without-lqr
-  --without-lzma
  --without-openexr
  --without-pango
+  --without-rsvg
  --without-wmf
-  --without-xml
  --with-bzlib=${bzip2:location}
  --with-zlib=${zlib:location}
  --with-ltdl-include=${libtool:location}/include
  --with-ltdl-lib=${libtool:location}/lib
-  --with-rsvg=${librsvg:location}
+  --with-gs-font-dir=${ghostscript-fonts:location}
  --with-frozenpaths
 patch-options = -p1
 patches =
  ${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:location}/${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:filename}
 environment =
-  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${librsvg: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=${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
+  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${librsvg:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${xz-utils: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 -I${webp:location}/include
+  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 -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib
--- a/component/java/buildout.cfg
+++ b/component/java/buildout.cfg
@@ -41,7 +41,7 @@ script =
  (download_dir, filename) = os.path.split(download_file)
  auto_extract_bin = os.path.join(extract_dir, filename)
  shutil.move(download_file, auto_extract_bin)
-  os.chmod(auto_extract_bin, 0777)
+  os.chmod(auto_extract_bin, 0755)
  subprocess.call([auto_extract_bin])
  self.cleanup_dir_list.append(extract_dir)
  workdir = guessworkdir(extract_dir)

--- a/component/libpng/buildout.cfg
+++ b/component/libpng/buildout.cfg
 [buildout]
 extends =
+  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg

 parts =
@@ -11,6 +12,7 @@ recipe = hexagonit.recipe.cmmi
 configure-options =
  --disable-static
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
  CPPFLAGS =-I${zlib:location}/include
  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

@@ -21,5 +23,5 @@ md5sum = 717caa58e9c71a80820eb38c4f4d6ec3

 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.12.tar.bz2
-md5sum = d87f9c34ccab8242c00e41925839f6c9
+url = http://download.sourceforge.net/libpng/libpng-1.5.14.tar.xz
+md5sum = 94284b01d62ca43c5eb3f6702db08ed8
--- a/component/libreoffice-bin/buildout.cfg
+++ b/component/libreoffice-bin/buildout.cfg
@@ -12,15 +12,14 @@ find-links =
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-version = 3.5.6
-#url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
-url = http://ftp.psu.ac.th/pub/libreoffice/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
+version = 3.6.5
+url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
 # supported architectures md5sums
-md5sum_x86 = 079609188b86ede3b3eebe2b75862b31
-md5sum_x86-64 = 6a559fa9c62c810464254d129bd2dc17
+md5sum_x86 = 9575c9a567d48a9feeaed2f915bfdf7f
+md5sum_x86-64 = 302e326f2b2a524a78994705ea782770

 # where office code can be found?
-officedir = libreoffice3.5
+officedir = libreoffice3.6

 # script to install
 script =

--- a/component/libxml2/buildout.cfg
+++ b/component/libxml2/buildout.cfg
@@ -8,8 +8,8 @@ parts =

 [libxml2]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz
-md5sum = c62106f02ee00b6437f0fb9d370c1093
+url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.9.0.tar.gz
+md5sum = 5b9bebf4f5d2200ae2c4efe8fa6103f7
 configure-options =
  --disable-static
  --without-python

--- a/component/libxslt/buildout.cfg
+++ b/component/libxslt/buildout.cfg
@@ -8,8 +8,8 @@ parts =
  libxslt

 [libxslt]
-url = ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz
-md5sum = e61d0364a30146aaa3001296f853b2b9
+url = ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
+md5sum = 9667bf6f9310b957254fdcf6596600b7
 recipe = hexagonit.recipe.cmmi
 configure-options =
  --disable-static

--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -25,10 +25,10 @@ download-only = true

 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.5.28a
+version = 5.5.29
 revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = a2d20a040ef1e49944a4ffe65ed7fefa
+md5sum = 643cca7f07f7b00ca3ae1515e6f245d6
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -62,18 +62,17 @@ environment =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.06.tar.gz
-md5sum = 89ce640a57ed8f2161b8358ff4c29c66
+url = http://packages.groonga.org/source/mroonga/mroonga-3.01.tar.gz
+md5sum = 45c302ca45ae0eb4bbc6f3ec5f7f1072
 configure-options =
  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
  --with-mysql-config=${mariadb:location}/bin/mysql_config
 depends =
  ${mariadb:version}
  ${mariadb:revision}
+  ${groonga-normalizer-mysql:version}
 environment =
  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
  CPPFLAGS=-I${groonga:location}/include/groonga
  LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
-  CXXFLAGS=-Wno-deprecated
-# CXXFLAGS workaround: avoid depracation warning in order to compile on gcc 4.7+
+  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig
--- a/component/openldap/buildout.cfg
+++ b/component/openldap/buildout.cfg
@@ -8,8 +8,8 @@ extends =

 [openldap]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.32.tgz
-md5sum = 6a3e85cf61860ca5e8a1eba6753dd9d0
+url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.33.tgz
+md5sum = 5adae44897647c15ce5abbff313bc85a
 configure-options =
  --disable-static
  --disable-slapd

--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -29,8 +29,8 @@ download-only = true

 [openssl]
 recipe = hexagonit.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1c.tar.gz
-md5sum = ae412727c8c15b67880aef7bd2999b2e
+url = https://www.openssl.org/source/openssl-1.0.1e.tar.gz
+md5sum = 66bf6f10f060d561929de96f9dfe5b8c
 patch-binary = ${patch:location}/bin/patch
 patches =
  ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}

--- a/component/patch/buildout.cfg
+++ b/component/patch/buildout.cfg
 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
  patch

 [patch]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/patch/patch-2.6.1.tar.gz
-md5sum = d758eb96d3f75047efc004a720d33daf
+url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.1.tar.xz
+md5sum = e9ae5393426d3ad783a300a338c09b72
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
--- a/component/pcre/buildout.cfg
+++ b/component/pcre/buildout.cfg
@@ -4,9 +4,8 @@ parts =

 [pcre]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2
-md5sum = 0a7b592bea64b7aa7f4011fc7171a730
+url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.32.tar.bz2
+md5sum = 62f02a76bb57a40bc66681760ed511d5
 configure-options =
  --disable-static
-  --enable-utf8
  --enable-unicode-properties
--- a/component/percona-toolkit/buildout.cfg
+++ b/component/percona-toolkit/buildout.cfg
@@ -10,7 +10,8 @@ parts =
 recipe = hexagonit.recipe.cmmi
 depends =
  ${perl:version}
-url = http://www.percona.com/redir/downloads/percona-toolkit/2.1.3/percona-toolkit-2.1.3.tar.gz
-md5sum = 6f8c4a0a0e43e467766cbdabaec9ef93
+version = 2.1.9
+url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
+md5sum = 94545d0fe6a4893dcad8a3411531107d
 configure-command =
  ${perl:location}/bin/perl Makefile.PL
--- a/component/perl/buildout.cfg
+++ b/component/perl/buildout.cfg
@@ -23,18 +23,15 @@ filename = create-libs-symlink.py
 recipe = hexagonit.recipe.cmmi
 depends =
  ${gdbm:version}
-version = 5.14.2
+version = 5.16.2
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
+md5sum = 2818ab01672f005a4e552a713aa27b08
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =
  ${perl-keep-linker-flags-in-ldflags.patch:location}/${perl-keep-linker-flags-in-ldflags.patch:filename}
-# Viktor has adapted the following commands for AMD64 compilation
-# TODO: find out how we can write a generic code that suits all architectures
 configure-command =
  sh Configure -des \
-    -A ccflags=-fPIC \
    -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
    -Dsiteprefix=${:siteprefix} \
    -Dcflags=-I${gdbm:location}/include \
@@ -44,5 +41,4 @@ configure-command =
    -Dusethreads
 environment =
  PATH=${patch:location}/bin:%(PATH)s
-  CFLAGS='-m64 -mtune=nocona'
-post-make-hook = ${perl-postmakehook-download:location}/${perl-postmakehook-download:filename}:post_make_hook
\ No newline at end of file
+post-make-hook = ${perl-postmakehook-download:location}/${perl-postmakehook-download:filename}:post_make_hook
--- a/component/pkgconfig/buildout.cfg
+++ b/component/pkgconfig/buildout.cfg
@@ -14,8 +14,8 @@ extends =

 [pkgconfig]
 recipe = hexagonit.recipe.cmmi
-url = ftp://mirror.ovh.net/gentoo-distfiles/distfiles/pkg-config-0.26.tar.gz
-md5sum = 47525c26a9ba7ba14bf85e01509a7234
+url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz
+md5sum = 5392b4e3372879c5bf856173b418d6a2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # build pkg-config twice so that second configure can use pkg-config
 # to compute GLIB_CFLAGS and GLIB_LIBS.

--- a/component/poppler/buildout.cfg
+++ b/component/poppler/buildout.cfg
@@ -13,8 +13,8 @@ extends =

 [poppler]
 recipe = hexagonit.recipe.cmmi
-md5sum = 28c40266f374e1960a7bcead17d39f96
-url = http://poppler.freedesktop.org/poppler-0.20.3.tar.gz
+md5sum = c7038be37a7d446544e83a7df3c26196
+url = http://poppler.freedesktop.org/poppler-0.22.0.tar.gz
 depends =
  ${libtiff:version}
 configure-options =

--- a/component/qt/buildout.cfg
+++ b/component/qt/buildout.cfg
@@ -25,7 +25,7 @@ script =
  (download_dir, filename) = os.path.split(download_file)
  auto_extract_bin = os.path.join(extract_dir, filename)
  shutil.move(download_file, auto_extract_bin)
-  os.chmod(auto_extract_bin, 0777)
+  os.chmod(auto_extract_bin, 0755)
  subprocess.call([auto_extract_bin])
  self.cleanup_dir_list.append(extract_dir)
  workdir = guessworkdir(extract_dir)

--- a/component/sqlite3/buildout.cfg
+++ b/component/sqlite3/buildout.cfg
@@ -5,8 +5,8 @@ parts =

 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz
-md5sum = c97df403e8a3d5b67bb408fcd6aabd8e
+url = http://www.sqlite.org/sqlite-autoconf-3071502.tar.gz
+md5sum = bcb0ab0b5b30116b2531cfeef3c861b4
 configure-options =
  --disable-static
  --enable-readline

--- a/component/webp/buildout.cfg
+++ b/component/webp/buildout.cfg
+# WebP - A new image format for the Web
+# https://developers.google.com/speed/webp/
+
 [buildout]
 parts =
  webp
+extends =
+  ../libjpeg/buildout.cfg
+  ../libpng/buildout.cfg

 [webp]
 recipe = hexagonit.recipe.cmmi
@@ -8,3 +14,7 @@ url = https://webp.googlecode.com/files/libwebp-0.1.3.tar.gz
 md5sum = 254d4670e14e9ed881f0536b006ab336
 configure-options =
  --disable-static
+  --with-jpegincludedir=${libjpeg:location}/include
+  --with-jpeglibdir=${libjpeg:location}/lib
+environment =
+  PATH=${libpng:location}/bin:%(PATH)s
--- a/component/wget/buildout.cfg
+++ b/component/wget/buildout.cfg
 [buildout]
 extends =
  ../openssl/buildout.cfg
+  ../pcre/buildout.cfg
  ../pkgconfig/buildout.cfg
+  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg
 parts =
  wget

-[wget-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 866907ebc89fc2e76b44c519cb84930f
-download-only = true
-filename = drop.gets.patch
-
 [wget]
-virtual-depends = ${wget-drop.gets.patch:md5sum}
-patch-options = -p1
-patches =
-  ${wget-drop.gets.patch:location}/${wget-drop.gets.patch:filename}
-
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/wget/wget-1.13.4.tar.bz2
-md5sum = 12115c3750a4d92f9c6ac62bac372e85
+url = http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz
+md5sum = 316f6f59292c9098ad81fd54f658c579
 configure-options =
  --enable-ipv6
  --enable-opie
@@ -31,7 +21,7 @@ configure-options =
  --with-zlib-lib=${zlib:location}

 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -I${pcre:location}/include
--- a/component/wget/drop.gets.patch
+++ b/component/wget/drop.gets.patch
-diff -ur wget-1.13.4.orig/lib/stdio.in.h wget-1.13.4/lib/stdio.in.h
--- wget-1.13.4.orig/lib/stdio.in.h	2011-09-13 10:15:14.000000000 +0200
-+++ wget-1.13.4/lib/stdio.in.h	2012-07-23 14:47:39.793579086 +0200
-@@ -697,8 +697,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
--- a/component/wkhtmltopdf/buildout.cfg
+++ b/component/wkhtmltopdf/buildout.cfg
+[buildout]
+
+extends = 
+  ../fontconfig/buildout.cfg
+  ../xorg/buildout.cfg
+
+parts =
+  wkhtmltopdf
+
+[wkhtmltopdf]
+recipe = slapos.recipe.build
+
+# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
+url_x86-64 = http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1-static-amd64.tar.bz2
+url_x86 = http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1-static-i386.tar.bz2
+
+# supported architectures md5sums
+md5sum_x86 = d796cfb66e45673d8f6728b61f34d5e0
+md5sum_x86-64 = 02a2c6963728b69b8e329dcbf1f4c7e1
+
+# script to install.
+script =
+  location = %(location)r
+  self.failIfPathExists(location)
+  import sys
+  ARCH_DIR_MAP = { 'x86': 'x86', 'x86-64': 'x86_64' }
+  WK_SUFIX_MAP = { 'x86': 'i386', 'x86-64': 'amd64' }
+  platform = guessPlatform()
+  url = self.options['url_' + platform]
+  md5sum = self.options['md5sum_' + platform]
+  extract_dir = self.extract(self.download(url, md5sum))
+  shutil.move(extract_dir, location)
+  wrapper_location = os.path.join("%(location)s", "wkhtmltopdf")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!${dash:location}/bin/dash
+  cd %(location)s
+  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${libXext:location}/lib/
+  export PATH=${fontconfig:location}/bin:$PATH
+  exec %(location)s/wkhtmltopdf-""" + WK_SUFIX_MAP[platform]+ """ $*""")
+  wrapper.close()
+  os.chmod(wrapper_location, 0755)
--- a/component/xorg/buildout.cfg
+++ b/component/xorg/buildout.cfg
@@ -120,7 +120,7 @@ configure-options =
  --disable-static
  --disable-build-docs
 environment =
-  PKG_CONFIG_PATH=${xcbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${libXau:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
  PATH=${pkgconfig:location}/bin:${libxslt:location}/bin:%(PATH)s
  PYTHON=${buildout:executable}
 # Python note: libxcb requires python with ElementTree. In case of appliance
@@ -133,10 +133,8 @@ recipe = hexagonit.recipe.cmmi
 url = http://www.x.org/releases/X11R7.6/src/lib/libXext-1.2.0.tar.bz2
 md5sum = 9bb236ff0193e9fc1c1fb504dd840331
 environment =
-  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig:${xcbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig
-  CPPFLAGS=-I${xcbproto:location}/include -I${libXau:location}/include -I${xproto:location}/include -I${xorg-libpthread-stubs:location}/include -I${xextproto:location}/include -I${libX11:location}/include -I${libxcb:location}/include
-  LD_LIBRARY_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${xextproto:location}/lib:${libX11:location}/lib:${libxcb:location}/lib
-  LD_RUN_PATH=${xcbproto:location}/lib:${libXau:location}/lib:${xorg-libpthread-stubs:location}/lib:${xextproto:location}/lib:${libX11:location}/lib:${libxcb:location}/lib
+  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  LD_LIBRARY_PATH=${libX11:location}/lib
  PATH=${pkgconfig:location}/bin:%(PATH)s
 # Warning: do *not* enable -fPIC CFLAGS for this library. Even if it fails and ld asks you to enable it. This will not solve your problem, and create an unexpected (by build chain) setup (all .o will be position-independant code).
 # CFLAGS=-fPIC
@@ -183,9 +181,7 @@ configure-options =
  --without-xmlto
  --without-fop
 environment =
-  PKG_CONFIG_PATH=${xproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig
-  LD_LIBRARY_PATH=${xproto:location}/lib:${xextproto:location}/lib:${libxcb:location}/lib
-  LD_RUN_PATH=${xproto:location}/lib:${xextproto:location}/lib:${libxcb:location}/lib
+  PKG_CONFIG_PATH=${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig
  PATH=${pkgconfig:location}/bin:%(PATH)s


@@ -342,11 +338,7 @@ md5sum = ce7cda009aa0b10a73637941d44ae789
 configure-options =
  --disable-static
 environment =
-  PKG_CONFIG_PATH=${renderproto:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${render:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig
-  CPPFLAGS=-I${renderproto:location}/include/ -I${libX11:location}/include/ -I${libxcb:location}/include -I${libXau:location}/include -I${libXdmcp:location}/include -I${xproto:location}/include -I${kbproto:location}/include
-  LD_LIBRARY_PATH=${render:location}/lib:${libX11:location}/lib
-  LD_RUN_PATH=${render:location}/lib
-  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libxcb:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libXau:location}/lib -Wl,-rpath=${libXau:location}/lib -L${libXdmcp:location}/lib -Wl,-rpath=${libXdmcp:location}/lib 
+  PKG_CONFIG_PATH=${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${render:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
  PATH=${pkgconfig:location}/bin:%(PATH)s

 [libXinerama]

--- a/component/xz-utils/buildout.cfg
+++ b/component/xz-utils/buildout.cfg
-[buidout]
+[buildout]
 parts =
  xz-utils


--- a/setup.py
+++ b/setup.py
@@ -105,6 +105,8 @@ setup(name=name,
          'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
          'generic.memcached = slapos.recipe.generic_memcached:Recipe',
          'generic.mysql = slapos.recipe.generic_mysql:Recipe',
+          'generic.mysql.wrap_update_mysql = slapos.recipe.generic_mysql:WrapUpdateMySQL',
+          'generic.mysql.wrap_mysqld = slapos.recipe.generic_mysql:WrapMySQLd',
          'generic.varnish = slapos.recipe.generic_varnish:Recipe',
          'generic.zope = slapos.recipe.generic_zope:Recipe',
          'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',
@@ -112,6 +114,8 @@ setup(name=name,
          'haproxy = slapos.recipe.haproxy:Recipe',
          'helloworld = slapos.recipe.helloworld:Recipe',
          'importmdb = slapos.recipe.importmdb:Recipe',
+          'ipv4toipv6 = slapos.recipe.6tunnel:FourToSix',
+          'ipv6toipv4 = slapos.recipe.6tunnel:SixToFour',
          'java = slapos.recipe.java:Recipe',
          'kumofs = slapos.recipe.kumofs:Recipe',
          'kvm = slapos.recipe.kvm:Recipe',
@@ -131,6 +135,9 @@ setup(name=name,
          'mydumper = slapos.recipe.mydumper:Recipe',
          'mysql = slapos.recipe.mysql:Recipe',
          'nbdserver = slapos.recipe.nbdserver:Recipe',
+          'neoppod.admin = slapos.recipe.neoppod:Admin',
+          'neoppod.master = slapos.recipe.neoppod:Master',
+          'neoppod.storage = slapos.recipe.neoppod:Storage',
          'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
          'notifier = slapos.recipe.notifier:Recipe',
          'notifier.callback = slapos.recipe.notifier:Callback',
@@ -143,10 +150,12 @@ setup(name=name,
          'postgres.import = slapos.recipe.postgres.backup:ImportRecipe',
          'proactive = slapos.recipe.proactive:Recipe',
          'publish = slapos.recipe.publish:Recipe',
+          'publish.serialised = slapos.recipe.publish:Serialised',
          'publishurl = slapos.recipe.publishurl:Recipe',
          'pwgen = slapos.recipe.pwgen:Recipe',
          'pwgen.stable = slapos.recipe.pwgen:StablePasswordGeneratorRecipe',
          'request = slapos.recipe.request:Recipe',
+          'request.serialised = slapos.recipe.request:Serialised',
          'requestoptional = slapos.recipe.request:RequestOptional',
          'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
          'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
@@ -156,6 +165,7 @@ setup(name=name,
          'simplelogger = slapos.recipe.simplelogger:Recipe',
          'siptester = slapos.recipe.siptester:SipTesterRecipe',
          'slapconfiguration = slapos.recipe.slapconfiguration:Recipe',
+          'slapconfiguration.serialised = slapos.recipe.slapconfiguration:Serialised',
          'slapcontainer = slapos.recipe.container:Recipe',
          'slapmonitor = slapos.recipe.slapmonitor:MonitorRecipe',
          'slapmonitor-xml = slapos.recipe.slapmonitor:MonitorXMLRecipe',
@@ -179,6 +189,7 @@ setup(name=name,
          'xwiki = slapos.recipe.xwiki:Recipe',
          'zabbixagent = slapos.recipe.zabbixagent:Recipe',
          'zeo = slapos.recipe.zeo:Recipe',
+
        ],
        'slapos.recipe.nosqltestbed.plugin': [
          'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

--- a/slapos/recipe/6tunnel/__init__.py
+++ b/slapos/recipe/6tunnel/__init__.py
+##############################################################################
+#
+# Copyright (c) 2012 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 GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+  """
+  ipv4toipv6 tunnel configuration.
+  """
+  # Override in subclasses
+  template_name = None
+
+  def install(self):
+    return [
+      self.createExecutable(
+        self.options['runner-path'],
+        self.substituteTemplate(
+          self.getTemplateFilename(self.template_name),
+          {
+            'ipv6': self.options['ipv6'],
+            'ipv6_port': self.options['ipv6-port'],
+            'ipv4': self.options['ipv4'],
+            'ipv4_port': self.options['ipv4-port'],
+            'shell_path': self.options['shell-path'],
+            '6tunnel_path': self.options['6tunnel-path'],
+          },
+        ),
+      )
+    ]
+
+class SixToFour(Recipe):
+    template_name = '6to4.in'
+
+class FourToSix(Recipe):
+    template_name = '4to6.in'
--- a/slapos/recipe/6tunnel/template/4to6.in
+++ b/slapos/recipe/6tunnel/template/4to6.in
+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+exec %(6tunnel_path)s -d -l %(ipv4)s %(ipv4_port)s %(ipv6)s %(ipv6_port)s
--- a/slapos/recipe/6tunnel/template/6to4.in
+++ b/slapos/recipe/6tunnel/template/6to4.in
+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+exec %(6tunnel_path)s -6 -4 -d -l %(ipv6)s %(ipv6_port)s %(ipv4)s %(ipv4_port)s
--- a/slapos/recipe/apache_zope_backend/__init__.py
+++ b/slapos/recipe/apache_zope_backend/__init__.py
@@ -29,61 +29,71 @@ import pkg_resources

 class Recipe(GenericBaseRecipe):
  def install(self):
-    path_list = []
-    ip = self.options['ip']
-    port = self.options['port']
-    backend = self.options['backend']
-
-    apache_conf = dict()
+    try:
+      backend_list = self.options['backend-list']
+    except KeyError:
+      backend_list = [(self.options['port'], self.options['backend'])]

    scheme = self.options['scheme']
    if scheme == 'http':
      required_path_list = []
-      apache_conf['ssl_snippet'] = ''
+      ssl_enable = ssl_snippet = ''
    elif scheme == 'https':
      key = self.options['key-file']
      certificate = self.options['cert-file']
      required_path_list = [key, certificate]
-      apache_conf['key'] = key
-      apache_conf['certificate'] = certificate
-      apache_conf['ssl_session_cache'] = self.options['ssl-session-cache']
-      apache_conf['ssl_snippet'] = pkg_resources.resource_string(__name__,
-          'template/snippet.ssl.in') % apache_conf
+      ssl_snippet = self.substituteTemplate(self.getTemplateFilename('snippet.ssl.in'), {
+        'key': key,
+        'certificate': certificate,
+        'ssl_session_cache': self.options['ssl-session-cache'],
+      })
      if 'ssl-authentication' in self.options and self.optionIsTrue(
          'ssl-authentication'):
-        apache_conf['ssl_snippet'] += pkg_resources.resource_string(__name__,
-          'template/snippet.ssl.ca.in') % dict(
-            ca_certificate=self.options['ssl-authentication-certificate'],
-            ca_crl=self.options['ssl-authentication-crl']
-          )
+        ssl_snippet += self.substituteTemplate(self.getTemplateFilename('snippet.ssl.ca.in'), {
+          'ca_certificate': self.options['ssl-authentication-certificate'],
+          'ca_crl': self.options['ssl-authentication-crl'],
+        })
+      ssl_enable = 'SSLEngine on'
    else:
-      raise ValueError, "Unsupported scheme %s" % scheme
+      raise ValueError('Unsupported scheme %s' % scheme)

-    access_control_string = self.options['access-control-string']
-    apache_conf['pid_file'] = self.options['pid-file']
-    apache_conf['lock_file'] = self.options['lock-file']
-    apache_conf['ip'] = ip
-    apache_conf['port'] = port
-    apache_conf['server_admin'] = 'admin@'
-    apache_conf['error_log'] = self.options['error-log']
-    apache_conf['access_log'] = self.options['access-log']
-    apache_conf['server_name'] = '%s' % apache_conf['ip']
-    apache_conf['path'] = '/'
-    apache_conf['access_control_string'] = access_control_string
-    apache_conf['rewrite_rule'] = "RewriteRule (.*) %s%s$1 [L,P]" % (backend,
-      self.options.get('backend-path', '/'))
-    apache_conf_string = pkg_resources.resource_string(__name__,
-          'template/apache.zope.conf.in') % apache_conf
-    apache_config_file = self.createFile(self.options['configuration-file'],
-      apache_conf_string)
-    path_list.append(apache_config_file)
-    wrapper = self.createPythonScript(self.options['wrapper'], __name__ +
-      '.apache.runApache', [
-            dict(
-              required_path_list=required_path_list,
-              binary=self.options['apache-binary'],
-              config=apache_config_file
-            )
-          ])
-    path_list.append(wrapper)
-    return path_list
+    ip = self.options['ip']
+    backend_path = self.options.get('backend-path', '/')
+    vhost_template_name = self.getTemplateFilename('vhost.in')
+    apache_config_file = self.createFile(
+      self.options['configuration-file'],
+      self.substituteTemplate(
+        self.getTemplateFilename('apache.zope.conf.in'),
+        {
+          'path': '/',
+          'server_admin': 'admin@',
+          'pid_file': self.options['pid-file'],
+          'lock_file': self.options['lock-file'],
+          'error_log': self.options['error-log'],
+          'access_log': self.options['access-log'],
+          'access_control_string': self.options['access-control-string'],
+          'ssl_snippet': ssl_snippet,
+          'vhosts': ''.join(self.substituteTemplate(vhost_template_name, {
+            'ip': ip,
+            'port': port,
+            'backend': backend,
+            'backend-path': backend_path,
+            'ssl_enable': ssl_enable,
+          }) for (port, backend) in backend_list),
+        },
+      )
+    )
+    return [
+      apache_config_file,
+      self.createPythonScript(
+        self.options['wrapper'],
+        __name__ + '.apache.runApache',
+        [
+          {
+            'required_path_list': required_path_list,
+            'binary': self.options['apache-binary'],
+            'config': apache_config_file,
+          },
+        ],
+      ),
+    ]
--- a/slapos/recipe/apache_zope_backend/template/apache.zope.conf.in
+++ b/slapos/recipe/apache_zope_backend/template/apache.zope.conf.in
@@ -22,7 +22,6 @@ LoadModule headers_module modules/mod_headers.so

 # Basic server configuration
 PidFile "%(pid_file)s"
-Listen %(ip)s:%(port)s
 ServerAdmin %(server_admin)s
 TypesConfig conf/mime.types
 AddType application/x-compress .Z
@@ -63,4 +62,4 @@ CustomLog "%(access_log)s" combined

 # Magic of Zope related rewrite
 RewriteEngine On
-%(rewrite_rule)s
+%(vhosts)s
--- a/slapos/recipe/apache_zope_backend/template/snippet.ssl.in
+++ b/slapos/recipe/apache_zope_backend/template/snippet.ssl.in
-
-# SSL Configuration
-SSLEngine on
 SSLCertificateFile %(certificate)s
 SSLCertificateKeyFile %(key)s
 SSLRandomSeed startup builtin

--- a/slapos/recipe/apache_zope_backend/template/vhost.in
+++ b/slapos/recipe/apache_zope_backend/template/vhost.in
+Listen %(ip)s:%(port)s
+<VirtualHost *:%(port)s>
+  %(ssl_enable)s
+  RewriteRule (.*) %(backend)s%(backend-path)s$1 [L,P]
+</VirtualHost>
--- a/slapos/recipe/generic_mysql/__init__.py
+++ b/slapos/recipe/generic_mysql/__init__.py
@@ -69,9 +69,16 @@ class Recipe(GenericBaseRecipe):
    mysql_script_list = []

    # user defined functions
+    mroonga = self.options.get('mroonga', 'ha_mroonga.so')
+    if mroonga:
+      last_insert_grn_id = "CREATE FUNCTION last_insert_grn_id RETURNS " \
+        "INTEGER SONAME '" + mroonga + "';"
+    else:
+      last_insert_grn_id = ""
    mysql_script_list.append(self.substituteTemplate(
      self.getTemplateFilename('mysql-init-function.sql.in'),
      {
+        'last_insert_grn_id': last_insert_grn_id,
      }
    ))
    # real database
@@ -119,14 +126,13 @@ class Recipe(GenericBaseRecipe):
    )
    path_list.append(mysql_update)

-    mysqld_binary = self.options['mysqld-binary']
    mysqld = self.createPythonScript(
      self.options['wrapper'],
      '%s.mysql.runMysql' % __name__,
      [dict(
        mysql_base_directory=self.options['mysql-base-directory'],
        mysql_install_binary=self.options['mysql-install-binary'],
-        mysqld_binary=mysqld_binary,
+        mysqld_binary=self.options['mysqld-binary'],
        data_directory=self.options['data-directory'],
        mysql_binary=mysql_binary,
        socket=socket,
@@ -134,6 +140,7 @@ class Recipe(GenericBaseRecipe):
       )]
    )
    path_list.append(mysqld)
+    environment = dict(PATH='%s' % self.options['bin-directory'])
    # TODO: move to a separate recipe (ack'ed by Cedric)
    if 'backup-script' in self.options:
      # backup configuration
@@ -144,7 +151,6 @@ class Recipe(GenericBaseRecipe):
          '--defaults-file=%s' % mysql_conf_file,
          '--socket=%s' % socket.strip(), '--user=root',
          '--ibbackup=%s'% self.options['xtrabackup-binary']]
-      environment = dict(PATH='%s' % self.options['bin-directory'])
      innobackupex_incremental = self.createPythonScript(self.options['innobackupex-incremental'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list + ['--incremental'], environment])
      path_list.append(innobackupex_incremental)
      innobackupex_full = self.createPythonScript(self.options['innobackupex-full'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list, environment])
@@ -204,3 +210,33 @@ class Recipe(GenericBaseRecipe):
      path_list.append(pt_exe)

    return path_list
+
+class WrapUpdateMySQL(GenericBaseRecipe):
+  def install(self):
+    return [
+      self.createPythonScript(
+        self.options['output'],
+        __name__ + '.mysql.updateMysql',
+        [{
+          'mysql_upgrade_binary': self.options['binary'],
+          'mysql_binary': self.options['mysql'],
+          'mysql_script_file': self.options['init-script'],
+        }]
+      ),
+    ]
+
+class WrapMySQLd(GenericBaseRecipe):
+  def install(self):
+    return [
+      self.createPythonScript(
+        self.options['output'],
+        __name__ + '.mysql.runMysql',
+        [{
+          'mysqld_binary': self.options['binary'],
+          'configuration_file': self.options['configuration-file'],
+          'data_directory': self.options['data-directory'],
+          'mysql_install_binary': self.options['mysql-install-binary'],
+          'mysql_base_directory': self.options['mysql-base-directory'],
+        }]
+      ),
+    ]
--- a/slapos/recipe/generic_mysql/mysql.py
+++ b/slapos/recipe/generic_mysql/mysql.py
@@ -41,8 +41,18 @@ def updateMysql(args):
  conf = args[0]
  sleep = 30
  is_succeed = False
+  try:
+    script_filename = conf.pop('mysql_script_file')
+  except KeyError:
+    pass
+  else:
+    assert 'mysql_script' not in conf
+    with open(script_filename) as script_file:
+      conf['mysql_script'] = script_file.read()
  while True:
-    mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--no-defaults', '--user=root', '--socket=%s' % conf['socket']]
+    mysql_upgrade_list = [conf['mysql_upgrade_binary'], '--no-defaults', '--user=root']
+    if 'socket' in conf:
+      mysql_upgrade_list.append('--socket=' + 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:
@@ -54,7 +64,9 @@ def updateMysql(args):
        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_list = [conf['mysql_binary'].strip(), '--no-defaults', '-B', '--user=root']
+      if 'socket' in conf:
+        mysql_list.append('--socket=' + conf['socket'])
      mysql = subprocess.Popen(mysql_list, stdin=subprocess.PIPE,
          stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
      result = mysql.communicate(conf['mysql_script'])[0]

--- a/slapos/recipe/generic_mysql/template/my.cnf.in
+++ b/slapos/recipe/generic_mysql/template/my.cnf.in
@@ -22,7 +22,7 @@ slow_query_log
 slow_query_log_file = %(slow_query_log)s
 long_query_time = 1
 max_allowed_packet = 128M
-query_cache_size = 32M
+query_cache_size = 0

 plugin-load = ha_mroonga.so;handlersocket.so


--- a/slapos/recipe/generic_mysql/template/mysql-init-function.sql.in
+++ b/slapos/recipe/generic_mysql/template/mysql-init-function.sql.in
 USE mysql;
 DROP FUNCTION IF EXISTS last_insert_grn_id;
-CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME 'ha_mroonga.so';
+%(last_insert_grn_id)s
 DROP FUNCTION IF EXISTS sphinx_snippets;
 #CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'ha_sphinx.so';
--- a/slapos/recipe/haproxy/__init__.py
+++ b/slapos/recipe/haproxy/__init__.py
@@ -66,40 +66,53 @@ class Recipe(GenericBaseRecipe):
    #      stick in other nodes and are not coming back. Please note this option
    #      is not an issue if you have more than (maxqueue * node_quantity) requests
    #      because haproxy will handle a top-level queue
+    try:
+      backend_dict = self.options['backend-dict']
+    except KeyError:
+      backend_list = self.options['backend-list']
+      if isinstance(backend_list, str):
+        # BBB
+        backend_list = backend_list.split()
+      backend_dict = {
+        self.options['name']: (self.options['port'], backend_list),
+      }

-    snippet_filename = self.getTemplateFilename(
-                                    'haproxy-server-snippet.cfg.in')
-    # Prepare all filestorages
+    server_snippet_filename = self.getTemplateFilename(
+      'haproxy-server-snippet.cfg.in')
+    listen_snippet_filename = self.getTemplateFilename(
+      'haproxy-listen-snippet.cfg.in')
    server_snippet = ""
+    ip = self.options['ip']
+    server_check_path = self.options['server-check-path']
+    # FIXME: maxconn must be provided per-backend, not globally
+    maxconn = self.options['maxconn']
    i = 0
-    name = self.options['name']
-    backend_list = self.options['backend-list']
-    if isinstance(backend_list, str):
-      # BBB
-      backend_list = backend_list.split()
-    for address in backend_list:
-      i += 1
+    for name, (port, backend_list) in backend_dict.iteritems():
      server_snippet += self.substituteTemplate(
-          snippet_filename, dict(
-             name='%s_%s' % (name, i),
-             address=address,
-             cluster_zope_thread_amount=self.options['maxconn']))
+        listen_snippet_filename, {
+          'name': name,
+          'ip': ip,
+          'port': port,
+          'server_check_path': server_check_path,
+        })
+      for address in backend_list:
+        i += 1
+        server_snippet += self.substituteTemplate(
+          server_snippet_filename, {
+            'name': '%s_%s' % (name, i),
+            'address': address,
+            'cluster_zope_thread_amount': maxconn,
+          })

-    config = dict(
-        name=name,
-        ip=self.options['ip'],
-        port=self.options['port'],
-        server_text=server_snippet,
-        server_check_path=self.options['server-check-path'],)
-    template_filename = self.getTemplateFilename('haproxy.cfg.in')
    configuration_path = self.createFile(
-        self.options['conf-path'],
-        self.substituteTemplate(template_filename, config))
-
-    # Create running wrapper
+      self.options['conf-path'],
+      self.substituteTemplate(
+        self.getTemplateFilename('haproxy.cfg.in'),
+        {'server_text': server_snippet},
+      )
+    )
    wrapper_path = self.createPythonScript(
      self.options['wrapper-path'],
      'slapos.recipe.librecipe.execute.execute',
      arguments=[self.options['binary-path'].strip(), '-f', configuration_path],)
-
    return [configuration_path, wrapper_path]
--- a/slapos/recipe/haproxy/template/haproxy-listen-snippet.cfg.in
+++ b/slapos/recipe/haproxy/template/haproxy-listen-snippet.cfg.in
+listen %(name)s %(ip)s:%(port)s
+  cookie  SERVERID insert
+  balance roundrobin
+  option httpchk GET %(server_check_path)s
+  stats uri /haproxy
+  stats realm Global\ statistics
--- a/slapos/recipe/haproxy/template/haproxy-server-snippet.cfg.in
+++ b/slapos/recipe/haproxy/template/haproxy-server-snippet.cfg.in
  server %(name)s %(address)s cookie %(name)s check inter 3s rise 1 fall 2 maxqueue 5 maxconn %(cluster_zope_thread_amount)s
-
--- a/slapos/recipe/haproxy/template/haproxy.cfg.in
+++ b/slapos/recipe/haproxy/template/haproxy.cfg.in
@@ -29,13 +29,4 @@ defaults
  # to render a page
  option forceclose

-listen %(name)s %(ip)s:%(port)s
-  cookie  SERVERID insert
-  balance roundrobin
-
 %(server_text)s
-
-  option httpchk GET %(server_check_path)s
-
-  stats uri /haproxy
-  stats realm Global\ statistics
--- a/slapos/recipe/librecipe/__init__.py
+++ b/slapos/recipe/librecipe/__init__.py
@@ -35,12 +35,28 @@ import netaddr
 import time
 import re
 import urlparse
+import json

 # Use to do from slapos.recipe.librecipe import GenericBaseRecipe
 from generic import GenericBaseRecipe
 from genericslap import GenericSlapRecipe
 from filehash import filehash

+# Utility functions to (de)serialise live python objects in order to send them
+# to master.
+JSON_SERIALISED_MAGIC_KEY = '_'
+def wrap(value):
+  return {JSON_SERIALISED_MAGIC_KEY: json.dumps(value)}
+
+def unwrap(value):
+  try:
+    value = value[JSON_SERIALISED_MAGIC_KEY]
+  except (KeyError, TypeError):
+    pass
+  else:
+    value = json.loads(value)
+  return value
+
 class BaseSlapRecipe:
  """Base class for all slap.recipe.*"""


--- a/slapos/recipe/neoppod.py
+++ b/slapos/recipe/neoppod.py
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class NeoBaseRecipe(GenericBaseRecipe):
+
+  _binding_port_mandatory = True
+
+  def install(self):
+    options = self.options
+    if not options['masters']:
+      # All parameters are always provided.
+      # This parameter needs special care, because it is initially generated
+      # empty, until all requested master nodes get their partitions
+      # allocated.
+      # Only then can this recipe start succeeding and actually doing anything
+      # useful, as per NEO deploying constraints.
+      raise Exception('"masters" parameter is mandatory')
+    option_list = [
+      options['binary'],
+      '-l', options['logfile'],
+      '-m', options['masters'],
+      '-b', self._getBindingAddress(),
+      # TODO: reuse partition reference for better log readability.
+      #'-n', options['name'],
+      '-c', options['cluster'],
+    ]
+    if options['verbose']:
+      option_list.append('-v')
+    option_list.extend(self._getOptionList())
+    return [self.createPythonScript(
+      options['wrapper'],
+      'slapos.recipe.librecipe.execute.execute',
+      option_list
+    )]
+
+  def _getBindingAddress(self):
+    options = self.options
+    bind = options['ip']
+    if 'port' in options:
+      # Some node types support port auto-allocation when no binding port is
+      # requested.
+      bind = bind + ':' + options['port']
+    elif self._binding_port_mandatory:
+      raise ValueError('"port" option is mandatory.')
+    return bind
+
+  def _getOptionList(self):
+    raise NotImplementedError
+
+class Storage(NeoBaseRecipe):
+
+  _binding_port_mandatory = False
+
+  def _getOptionList(self):
+    return [
+      '-d', self.options['database-parameters'],
+      '-a', self.options['database-adapter'],
+      '-w', self.options['wait-database'],
+    ]
+
+class Admin(NeoBaseRecipe):
+  def _getOptionList(self):
+    return []
+
+class Master(NeoBaseRecipe):
+  def _getOptionList(self):
+    options = self.options
+    return [
+      '-p', options['partitions'],
+      '-r', options['replicas'],
+    ]
--- a/slapos/recipe/publish.py
+++ b/slapos/recipe/publish.py
@@ -25,7 +25,7 @@
 #
 ##############################################################################
 import zc.buildout
-
+from slapos.recipe.librecipe import wrap
 from slapos.recipe.librecipe import GenericSlapRecipe

 class Recipe(GenericSlapRecipe):
@@ -36,5 +36,14 @@ class Recipe(GenericSlapRecipe):

    for k, v in options.iteritems():
      publish_dict[k] = v
-    self.setConnectionDict(publish_dict)
+    self._setConnectionDict(publish_dict)
    return []
+
+  def _setConnectionDict(self, publish_dict):
+    return self.setConnectionDict(publish_dict)
+
+SERIALISED_MAGIC_KEY = '_'
+
+class Serialised(Recipe):
+  def _setConnectionDict(self, publish_dict):
+    return super(Serialised, self)._setConnectionDict(wrap(publish_dict))
--- a/slapos/recipe/request.py
+++ b/slapos/recipe/request.py
@@ -25,6 +25,8 @@
 #
 ##############################################################################
 import logging
+from slapos.recipe.librecipe import wrap, JSON_SERIALISED_MAGIC_KEY
+import json
 from slapos import slap as slapmodule
 import slapos.recipe.librecipe.generic as librecipe
 import traceback
@@ -87,57 +89,45 @@ class Recipe(object):

  def __init__(self, buildout, name, options):
    self.logger = logging.getLogger(name)
-
-    slap = slapmodule.slap()
-
    software_url = options['software-url']
    name = options['name']
-
-    slap.initializeConnection(options['server-url'],
-                              options.get('key-file'),
-                              options.get('cert-file'),
-                             )
-    request = slap.registerComputerPartition(
-      options['computer-id'], options['partition-id']).request
-
-    return_parameters = []
-    if 'return' in options:
-      return_parameters = [str(parameter).strip()
-                          for parameter in options['return'].split()]
-    else:
+    return_parameters = options.get('return', '').split()
+    if not return_parameters:
      self.logger.debug("No parameter to return to main instance."
        "Be careful about that...")
-
    software_type = options.get('software-type', DEFAULT_SOFTWARE_TYPE)
-
-    filter_kw = {}
-    if 'sla' in options:
-      for sla_parameter in options['sla'].split():
-        sla_key = options['sla-%s' % sla_parameter]
-        if sla_key:
-          # Only append to the list if the key actually exists and is not
-          # empty string
-          filter_kw[sla_parameter] = sla_key
-
-    partition_parameter_kw = {}
-    if 'config' in options:
-      for config_parameter in options['config'].split():
-        partition_parameter_kw[config_parameter] = \
-            options['config-%s' % config_parameter]
-
-    isSlave = options.get('slave', '').lower() in \
-        librecipe.GenericBaseRecipe.TRUE_VALUES
-
+    filter_kw = dict(
+      (x, options['sla-' + x]) for x in options.get('sla', '').split()
+      if options['sla-' + x]
+    )
+    partition_parameter_kw = self._filterForStorage(dict(
+      (x, options['config-' + x])
+      for x in options.get('config', '').split()
+    ))
+    slave = options.get('slave', 'false').lower() in \
+      librecipe.GenericBaseRecipe.TRUE_VALUES
+    slap = slapmodule.slap()
+    slap.initializeConnection(
+      options['server-url'],
+      options.get('key-file'),
+      options.get('cert-file'),
+    )
+    request = slap.registerComputerPartition(
+      options['computer-id'],
+      options['partition-id'],
+    ).request
    self._raise_request_exception = None
    self._raise_request_exception_formatted = None
    self.instance = None
    try:
      self.instance = request(software_url, software_type,
          name, partition_parameter_kw=partition_parameter_kw,
-          filter_kw=filter_kw, shared=isSlave)
-      if not isSlave:
+          filter_kw=filter_kw, shared=slave)
+      return_parameter_dict = self._getReturnParameterDict(self.instance,
+          return_parameters)
+      if not slave:
        # XXX: convention: should be instance-guid
-        options['instance_guid'] = self.instance.getInstanceGuid()
+        options['instance_guid'] = self.instance.getId()
    except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
      self._raise_request_exception = exc
      self._raise_request_exception_formatted = traceback.format_exc()
@@ -147,11 +137,25 @@ class Recipe(object):
      if not self.instance:
        continue
      try:
-        options['connection-%s' % param] = str(
-          self.instance.getConnectionParameter(param))
+        value = return_parameter_dict[param]
+      except KeyError:
+        value = ''
      except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady):
        if self.failed is None:
          self.failed = param
+      options['connection-%s' % param] = value
+
+  def _filterForStorage(self, partition_parameter_kw):
+    return partition_parameter_kw
+
+  def _getReturnParameterDict(self, instance, return_parameter_list):
+    result = {}
+    for param in return_parameter_list:
+      try:
+        result[param] = str(instance.getConnectionParameter(param))
+      except slapmodule.NotFoundError:
+        pass
+    return result

  def install(self):
    if self._raise_request_exception:
@@ -177,6 +181,7 @@ class Recipe(object):

  update = install

+
 class RequestOptional(Recipe):
  """
  Request a SlapOS instance. Won't fail if request failed or is not ready.
@@ -206,3 +211,14 @@ class RequestOptional(Recipe):
    return []

  update = install
+
+
+class Serialised(Recipe):
+  def _filterForStorage(self, partition_parameter_kw):
+    return wrap(partition_parameter_kw)
+
+  def _getReturnParameterDict(self, instance, return_parameter_list):
+    try:
+      return json.loads(instance.getConnectionParameter(JSON_SERIALISED_MAGIC_KEY))
+    except slapmodule.NotFoundError:
+      return {}
--- a/slapos/recipe/slapconfiguration.py
+++ b/slapos/recipe/slapconfiguration.py
@@ -25,6 +25,7 @@
 #
 ##############################################################################
 import slapos.slap
+from slapos.recipe.librecipe import unwrap
 from ConfigParser import RawConfigParser
 from netaddr import valid_ipv4, valid_ipv6

@@ -95,9 +96,21 @@ class Recipe(object):
          options['partition'],
      ).getInstanceParameterDict()
      # XXX: those are not partition parameters, strictly speaking.
-      # Discard them, and make them available as separate section keys.
-      options['slap-software-type'] = parameter_dict.pop(
-          'slap_software_type')
+      # Make them available as individual section keys.
+      for his_key in (
+                  'slap_software_type',
+                  'slap_computer_partition_id',
+                  'slap_computer_id',
+                  'slap_software_release_url',
+                  'slave_instance_list',
+                  'timestamp',
+              ):
+          try:
+              value = parameter_dict.pop(his_key)
+          except KeyError:
+              pass
+          else:
+              options[his_key.replace('_', '-')] = value
      ipv4_set = set()
      v4_add = ipv4_set.add
      ipv6_set = set()
@@ -121,11 +134,23 @@ class Recipe(object):
          options['ipv6-random'] = list(ipv6_set)[0]

      options['tap'] = tap_set
-      options['configuration'] = parameter_dict
+      parameter_dict = self._expandParameterDict(options, parameter_dict)
      match = self.OPTCRE_match
      for key, value in parameter_dict.iteritems():
          if match(key) is not None:
              continue
          options['configuration.' + key] = value

+  def _expandParameterDict(self, options, parameter_dict):
+      options['configuration'] = parameter_dict
+      return parameter_dict
+
  install = update = lambda self: []
+
+class Serialised(Recipe):
+  def _expandParameterDict(self, options, parameter_dict):
+      options['configuration'] = parameter_dict = unwrap(parameter_dict)
+      if isinstance(parameter_dict, dict):
+          return parameter_dict
+      else:
+          return {}
--- a/slapos/recipe/symbolic_link.py
+++ b/slapos/recipe/symbolic_link.py
@@ -43,6 +43,7 @@ class Recipe:
    """
    path_list = []
    target_directory = self.options['target-directory']
+    # XXX: breaks if any path contains spaces.
    for linkline in self.options['link-binary'].split():
      path, linkname = os.path.split(linkline)


--- a/slapos/recipe/wrapper.py
+++ b/slapos/recipe/wrapper.py
@@ -42,10 +42,10 @@ class Recipe(GenericBaseRecipe):

        environment = self.options.get('environment')
        if environment is not None:
-            environment = {k.strip(): v.strip() for k, v in [
+            environment = dict((k.strip(), v.strip()) for k, v in [
                             line.split('=')
                             for line in environment.split('\n')
-                           ]}
+                           ])

        return [self.createPythonScript(
            self.options['output'],

--- a/slapos/recipe/zeo/__init__.py
+++ b/slapos/recipe/zeo/__init__.py
@@ -56,17 +56,23 @@ class Recipe(GenericBaseRecipe):
                                    'zeo-filestorage-snippet.conf.in')
    # Prepare all filestorages
    filestorage_snippet = ""
-    for storage_definition in self.options['storage'].splitlines():
-      storage_definition = storage_definition.strip()
-      if not storage_definition:
-        continue
-      for q in storage_definition.split():
-        if 'storage-name' in q:
-          storage_name = q.split('=')[1].strip()
-        if 'zodb-path' in q:
-          zodb_path = q.split('=')[1].strip()
-      filestorage_snippet += self.substituteTemplate(
-          snippet_filename, dict(storage_name=storage_name, path=zodb_path))
+    storage = self.options['storage']
+    if isinstance(storage, basestring):
+      for storage_definition in storage.splitlines():
+        storage_definition = storage_definition.strip()
+        if not storage_definition:
+          continue
+        for q in storage_definition.split():
+          if 'storage-name' in q:
+            storage_name = q.split('=')[1].strip()
+          if 'zodb-path' in q:
+            zodb_path = q.split('=')[1].strip()
+        filestorage_snippet += self.substituteTemplate(
+            snippet_filename, dict(storage_name=storage_name, path=zodb_path))
+    else:
+      for storage_name, path in storage:
+        filestorage_snippet += self.substituteTemplate(snippet_filename,
+          {'storage_name': storage_name, 'path': path})

    config = dict(
      zeo_ip=self.options['ip'],

--- a/software/cloudooo/instance-cloudoo.cfg.in
+++ b/software/cloudooo/instance-cloudoo.cfg.in
@@ -76,7 +76,6 @@ link-binary =
  {{ parameter_dict['poppler'] }}/bin/pdfinfo
  {{ parameter_dict['poppler'] }}/bin/pdftotext
  {{ parameter_dict['poppler'] }}/bin/pdftohtml
-  {{ parameter_dict['pdftk'] }}/bin/pdftk

 # rest of parts are candidates for some generic stuff
 [basedirectory]

--- a/software/cloudooo/instance.cfg.in
+++ b/software/cloudooo/instance.cfg.in
@@ -34,7 +34,6 @@ fonts = {{ fonts_location }}
 coreutils = {{ coreutils_location }}
 imagemagick = {{ imagemagick_location }}
 poppler = {{ poppler_location }}
-pdftk = {{ pdftk_location }}
 buildout-bin-directory = {{ buildout_bin_directory }}

 [dynamic-template-cloudooo]

--- a/software/cloudooo/software.cfg
+++ b/software/cloudooo/software.cfg
 [buildout]
 extends =
-  ../../stack/shacache-client.cfg
+  ../../stack/slapos.cfg
  ../../stack/cloudooo.cfg

 versions = versions
@@ -69,7 +69,7 @@ context =
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = ea305baf481766227752e08d287c0bf8
+md5sum = 694205787e78c5d615d72d7b4b26d174
 extra-context =
    key buildout_bin_directory buildout:bin-directory
    key dcron_location dcron:location
@@ -90,7 +90,6 @@ extra-context =
    key libreoffice_bin_location libreoffice-bin:location
    key libxcb_location libxcb:location
    key openssl_location openssl:location
-    key pdftk_location pdftk:location
    key poppler_location poppler:location
    key template_cloudooo template-cloudooo:target
    key zlib_location zlib:location
@@ -99,7 +98,7 @@ extra-context =
 [template-cloudooo]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
-md5sum = fd5964a038613ea3e0b54f87564fe248
+md5sum = 4c8608f9525be0f01a09d60b240315a9
 mode = 640



--- a/software/mioga/software.cfg
+++ b/software/mioga/software.cfg
@@ -50,6 +50,35 @@ eggs =
  slapos.cookbook
  cns.recipe.symlink

+# override perl here to keep using 5.14.x.
+[perl]
+recipe = hexagonit.recipe.cmmi
+depends =
+  ${gdbm:version}
+version = 5.14.2
+url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
+md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
+siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
+patch-options = -p1
+patches =
+  ${perl-keep-linker-flags-in-ldflags.patch:location}/${perl-keep-linker-flags-in-ldflags.patch:filename}
+# Viktor has adapted the following commands for AMD64 compilation
+# TODO: find out how we can write a generic code that suits all architectures
+configure-command =
+  sh Configure -des \
+    -A ccflags=-fPIC \
+    -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \
+    -Dsiteprefix=${:siteprefix} \
+    -Dcflags=-I${gdbm:location}/include \
+    -Dldflags="-L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib" \
+    -Ui_db \
+    -Dnoextensions=ODBM_File \
+    -Dusethreads
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
+  CFLAGS='-m64 -mtune=nocona'
+post-make-hook = ${perl-postmakehook-download:location}/${perl-postmakehook-download:filename}:post_make_hook
+
 [cpan-simple-modules]
 recipe = slapos.recipe.build:cpan
 modules =

--- a/software/neoppod/README.txt
+++ b/software/neoppod/README.txt
+Software types
+==============
+Which software type is an entry point and can be used for root software
+instance.
+
+Parameters are expected to be passed as of *.serialised recipes expect them.
+Minimal parameters::
+
+```
+<?xml version='1.0' encoding='utf-8'?>
+<instance>
+  <parameter id="_">{
+    "cluster": "dummy",
+  }</parameter>
+</instance>
+```
+
+For each available key in the outmost dict are described below.
+
+default (default)
+-----------------
+Deploy a NEO cluster.
+
+'cluster' (str, mandatory)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Cluster unique identifier. Your last line of defense against mixing up neo
+clusters and corrupting your data. Choose a unique value for each of your
+cluster.
+
+'partitions' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Number of partitions. You cannot change this value once you created a cluster.
+Defautls to 12.
+
+'replicas' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+Number of replicates.
+Defaults to 0 (no resilience).
+
+'verbose' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~
+Non-zero to increase verbosity.
+Defaults to 0.
+
+'mysql-storage-count' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Number of MySQL-based storage nodes to deploy. One master node is deployed
+along with each storage.
+Defaults to 1.
+
+'admin-count' (int, optional)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Number of admin nodes to deploy.
+Defaults to 1.
--- a/software/neoppod/cluster.cfg.in
+++ b/software/neoppod/cluster.cfg.in
+{% if slap_software_type not in (
+    mysql_storage_software_type,
+    admin_software_type,
+) -%}
+{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
+{% set part_list = [] -%}
+{% set master_list = [] -%}
+{% set admin_list = [] -%}
+[request-common]
+recipe = slapos.cookbook:request
+software-url = ${slap-connection:software-release-url}
+sla = computer_guid
+sla-computer_guid = ${slap-connection:computer-id}
+server-url = ${slap-connection:server-url}
+key-file = ${slap-connection:key-file}
+cert-file = ${slap-connection:cert-file}
+computer-id = ${slap-connection:computer-id}
+partition-id = ${slap-connection:partition-id}
+config-cluster = {{ slapparameter_dict['cluster'] }}
+config-partitions = {{ slapparameter_dict.get('partitions', 12) }}
+config-replicas = {{ slapparameter_dict.get('replicas', 0) }}
+config-verbose = {{ dumps(slapparameter_dict.get('verbose', 0)) }}
+
+[request-config]
+base = cluster verbose
+master = partitions replicas
+node = masters
+
+[node-base]
+< = request-common
+config = ${request-config:base} ${request-config:node}
+config-masters = ${all-masters:addresses}
+
+[mysql-storage-base]
+< = request-common
+config = ${request-config:base} ${request-config:master}
+software-type = {{ mysql_storage_software_type }}
+
+[mysql-storage-request-base]
+< = mysql-storage-base
+return = master
+
+[admin-base]
+< = node-base
+return = admin
+software-type = {{ admin_software_type }}
+
+[publish]
+recipe = slapos.cookbook:publish
+masters = ${all-masters:addresses}
+admins = ${all-admins:addresses}
+
+{% for node_number in range(slapparameter_dict.get('mysql-storage-count', 1)) -%}
+{%   set section_id = 'storage-%i' % (node_number, ) -%}
+{%   set final_section_id = 'final-' ~ section_id -%}
+{%   do master_list.append(section_id) -%}
+[{{ section_id }}]
+< = mysql-storage-request-base
+name = {{ section_id }}
+
+[{{ section(final_section_id) }}]
+< = mysql-storage-base
+	node-base
+name = {{ section_id }}
+config = ${request-config:base} ${request-config:master} ${request-config:node}
+
+{% endfor -%}
+{% for node_number in range(slapparameter_dict.get('admin-count', 1)) -%}
+{%   set section_id = 'admin-%i' % (node_number, ) -%}
+{%   do admin_list.append(section_id)%}
+[{{ section(section_id) }}]
+< = admin-base
+name = {{ section_id }}
+
+{% endfor -%}
+[buildout]
+parts = 
+	{{ part_list | join('\n\t') }}
+	publish
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[all-masters]
+addresses = {% for master in master_list -%}
+{{   '${' + master + ':connection-master}' -}}
+{%   if not loop.last %} {% endif -%}
+{% endfor %}
+
+[all-admins]
+addresses = {% for admin in admin_list -%}
+{{  '${' + admin + ':connection-admin}' -}}
+{%  if not loop.last %} {% endif -%}
+{% endfor %}
+{% endif -%}
--- a/software/neoppod/instance-neo-admin.cfg.in
+++ b/software/neoppod/instance-neo-admin.cfg.in
+[buildout]
+parts =
+  neo-admin-run-wrapper
+  neo-admin-promise
+
+eggs-directory = {{eggs_directory}}
+develop-eggs-directory = {{develop_eggs_directory}}
+offline = true
+
+[neo-admin]
+recipe = slapos.cookbook:neoppod.admin
+binary = {{bin_directory}}/neoadmin
+wrapper = ${directory:bin}/neoadmin
+logfile = ${directory:log}/neoadmin.log
+ip = ${publish:ip}
+port = ${publish:port}
+cluster = ${slap-parameter:cluster}
+masters = ${slap-parameter:masters}
+verbose = ${slap-parameter:verbose}
+
+[publish]
+recipe = slapos.cookbook:publish
+# TODO: make port a partition parameter
+# TODO: stop using slap-network-information
+ip = [${slap-network-information:global-ipv6}]
+port = 10002
+admin = ${:ip}:${:port}
+
+[neo-admin-run-wrapper]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${directory:run}
+link-binary = ${neo-admin:wrapper}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+run = ${buildout:directory}/etc/run
+log = ${buildout:directory}/var/log
+bin = ${buildout:directory}/bin
+
+[neo-admin-promise]
+recipe = slapos.cookbook:check_port_listening
+hostname = ${neo-admin:ip}
+port = ${neo-admin:port}
+path = ${directory:promises}/neo-admin-promise
--- a/software/neoppod/instance-neo-master.cfg.in
+++ b/software/neoppod/instance-neo-master.cfg.in
+[buildout]
+parts =
+  neo-master-run-wrapper
+  neo-master-promise
+eggs-directory = {{eggs_directory}}
+develop-eggs-directory = {{develop_eggs_directory}}
+offline = true
+
+[neo-master]
+recipe = slapos.cookbook:neoppod.master
+binary = {{bin_directory}}/neomaster
+wrapper = ${directory:bin}/neomaster
+logfile = ${directory:log}/neomaster.log
+ip = ${publish:ip}
+port = ${publish:port}
+cluster = ${slap-parameter:cluster}
+partitions = ${slap-parameter:partitions}
+replicas = ${slap-parameter:replicas}
+masters = ${slap-parameter:masters}
+verbose = ${slap-parameter:verbose}
+
+[publish]
+recipe = slapos.cookbook:publish
+# TODO: make port a partition parameter
+# TODO: stop using slap-network-information
+ip = [${slap-network-information:global-ipv6}]
+port = 10000
+master = ${:ip}:${:port}
+
+[neo-master-run-wrapper]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${directory:run}
+link-binary = ${neo-master:wrapper}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+run = ${buildout:directory}/etc/run
+log = ${buildout:directory}/var/log
+bin = ${buildout:directory}/bin
+
+[neo-master-promise]
+recipe = slapos.cookbook:check_port_listening
+hostname = ${neo-master:ip}
+port = ${neo-master:port}
+path = ${directory:promises}/neo-master-promise
+
+[slap-parameter]
+# "masters" parameter is not provided when just requesting a partition.
+# No actuall installation takes place at that time
+# (slapos.cookbook:neoppod.master raises), but cfg expansion must succeed. So
+# this default value is required.
+masters =
--- a/software/neoppod/instance-neo-storage-mysql.cfg.in
+++ b/software/neoppod/instance-neo-storage-mysql.cfg.in
+[buildout]
+extends = {{ master_cfg }}
+parts += neo-storage-run-wrapper
+
+[mariadb-instance]
+recipe = slapos.cookbook:generic.mysql
+user = user
+database = neo
+
+conf-file = ${directory:etc}/mariadb.cnf
+# No networking (ip & port options)
+data-directory = ${directory:srv_mariadb}
+pid-file = ${directory:var_run}/mariadb.pid
+socket = ${directory:var_run}/mariadb.sock
+error-log = ${directory:log}/mariadb_error.log
+slow-query-log = ${directory:log}/mariadb_slowquery.log
+
+wrapper = ${directory:etc_run}/mariadb
+update-wrapper = ${directory:etc_run}/mariadb_update
+mysql-base-directory = {{ mariadb_location }}
+mysql-binary = {{ mariadb_location }}/bin/mysql
+mysql-install-binary = {{ mariadb_location }}/scripts/mysql_install_db
+mysql-upgrade-binary = {{ mariadb_location }}/bin/mysql_upgrade
+mysqld-binary = {{ mariadb_location }}/bin/mysqld
+
+mroonga =
+
+[neo-storage]
+recipe = slapos.cookbook:neoppod.storage
+binary = {{ bin_directory }}/neostorage
+wrapper = ${directory:bin}/neostorage
+logfile = ${directory:log}/neostorage.log
+ip = [${slap-network-information:global-ipv6}]
+cluster = ${slap-parameter:cluster}
+masters = ${slap-parameter:masters}
+verbose = ${slap-parameter:verbose}
+database-adapter = MySQL
+database-parameters = ${mariadb-instance:user}:${mariadb-instance:password}@${mariadb-instance:database}${mariadb-instance:socket}
+wait-database = 60
+
+[neo-storage-run-wrapper]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${directory:etc_run}
+link-binary = ${neo-storage:wrapper}
+
+[directory]
+etc = ${buildout:directory}/etc
+var = ${buildout:directory}/var
+etc_run =  ${:etc}/run
+var_run =  ${:var}/run
+srv_mariadb = ${buildout:directory}/srv/mariadb
--- a/software/neoppod/instance.cfg.in
+++ b/software/neoppod/instance.cfg.in
+{% set admin_software_type = 'neo-admin' -%}
+{% set mysql_storage_software_type = 'neo-storage-mysql' -%}
+[buildout]
+parts = switch-softwaretype
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[slap-connection]
+computer-id = ${slap_connection:computer_id}
+partition-id = ${slap_connection:partition_id}
+server-url = ${slap_connection:server_url}
+software-release-url = ${slap_connection:software_release_url}
+key-file = ${slap_connection:key_file}
+cert-file = ${slap_connection:cert_file}
+
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration.serialised
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+
+[neo-cluster]
+recipe = slapos.recipe.template:jinja2
+template = {{ cluster }}
+rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/cluster.cfg
+extensions = jinja2.ext.do
+context =
+    key eggs_directory buildout:eggs-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key slap_software_type slap-configuration:slap-software-type
+    key slapparameter_dict slap-configuration:configuration
+    raw admin_software_type {{ admin_software_type }}
+    raw mysql_storage_software_type {{ mysql_storage_software_type }}
+
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = ${neo-cluster:rendered}
+{{ admin_software_type }} = {{ neo_admin }}
+{{ mysql_storage_software_type }} = {{ neo_storage_mysql }}
--- a/software/neoppod/software.cfg
+++ b/software/neoppod/software.cfg
+# Note on COOKBOOK/END COOKBOOK: the areas delimited by those tags should be
+# dropped when a cookbook version containing neoppod recipe is released as an
+# egg on pypi.
+# Note on LXML/END LXML: they delimit areas where lxml magic is needed. lxml is
+# a slapos.cookbook dependency, so it should be fetched automatically. But when
+# automatically fetched, it gets built against system headers/libs, which is
+# forbidden in slapos. So we need to fetch lxml explicitly so it is properly
+# built.
+
+[buildout]
+extends =
+    ../../stack/slapos.cfg
+#COOKBOOK
+    ../../component/git/buildout.cfg
+#END COOKBOOK
+#LXML
+    ../../component/lxml-python/buildout.cfg
+#END LXML
+    ../../component/python-2.7/buildout.cfg
+    ../../component/mariadb/buildout.cfg
+    ../../component/mysql-python/buildout.cfg
+
+develop =
+#COOKBOOK
+# Note: as we develop a path we fetch, first buildout execution will fail as
+# develop couldn't find the clone. Second (and later) runs will succeed.
+    ${:parts-directory}/slapos.cookbook-repository
+#END COOKBOOK
+
+parts =
+#COOKBOOK
+    slapos.cookbook-repository
+    check-recipe
+#END COOKBOOK
+    slapos-deps-eggs
+# NEO & dependencies
+    python2.7
+    mariadb
+    mysql-python
+    neoppod
+# NEO instanciation
+    template-instance
+
+[slapos-deps-eggs]
+recipe = zc.recipe.egg
+eggs =
+#LXML
+    ${lxml-python:egg}
+#END LXML
+#COOKBOOK
+    slapos.cookbook
+#END COOKBOOK
+
+#LXML
+[lxml-python]
+python = python2.7
+#END LXML
+
+#COOKBOOK
+[slapos.cookbook-repository]
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
+branch = neoppod
+git-executable = ${git:location}/bin/git
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = test -e ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+#END COOKBOOK
+
+[base-template]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/${:filename}.in
+rendered = ${buildout:directory}/${:filename}
+extensions = jinja2.ext.do
+extra-context =
+context =
+    key eggs_directory buildout:eggs-directory
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key bin_directory buildout:bin-directory
+    ${:extra-context}
+
+[template-neo-master]
+< = base-template
+filename = instance-neo-master.cfg
+md5sum = b48e9446fb8fdce24d954d7d4f4c7460
+
+[template-neo-storage-mysql]
+< = base-template
+filename = instance-neo-storage-mysql.cfg
+md5sum = e767c66e7de58232de30bdf26188efe1
+extra-context =
+    key mariadb_location mariadb:location
+    key master_cfg template-neo-master:rendered
+
+[template-neo-admin]
+< = base-template
+filename = instance-neo-admin.cfg
+md5sum = fcf1a5c937a609a934c8ccd7c1326726
+
+[template-cluster]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/cluster.cfg.in
+md5sum = fe37b2ff36fee65b44945393f63e51c3
+
+[template-instance]
+< = base-template
+template = ${:_profile_base_location_}/instance.cfg.in
+# XXX: "template.cfg" is hardcoded in instanciation recipe
+filename = template.cfg
+md5sum = 17e761b371487b55b39da1c39ebb1bb6
+extra-context =
+    key neo_master template-neo-master:rendered
+    key neo_storage_mysql template-neo-storage-mysql:rendered
+    key neo_admin template-neo-admin:rendered
+    key cluster template-cluster:target
+
+[neoppod]
+recipe = zc.recipe.egg
+eggs = neoppod[admin, master, storage-mysqldb]
--- a/software/slaprunner/README.txt
+++ b/software/slaprunner/README.txt
-kvm
-===
+slaprunner
+==========

 Introduction
 ------------

--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
@@ -43,7 +43,6 @@ extends =
  ../component/git/buildout.cfg
  ../component/poppler/buildout.cfg
  ../component/imagemagick/buildout.cfg
-  ../component/pdftk/buildout.cfg
  ../component/ffmpeg/buildout.cfg
  ../component/file/buildout.cfg
  ../component/stunnel/buildout.cfg
@@ -76,7 +75,6 @@ parts =
  imagemagick
  file
  poppler
-  pdftk
  ffmpeg

  bootstrap2.6
@@ -93,7 +91,3 @@ python = python2.6
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-006
-
-# Use patched hexagonit.recipe.download from
-# https://github.com/SlapOS/hexagonit.recipe.download
-hexagonit.recipe.download = 1.5.1-dev-slapos-001
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -15,9 +15,11 @@ find-links =
    http://www.nexedi.org/static/packages/source/
    http://www.owlfish.com/software/wsgiutils/download.html

+allow-hosts += pybrary.net
+
 extends =
 # Exact version of Zope
-  http://svn.zope.org/repos/main/Zope/tags/2.12.25/versions.cfg
+  http://svn.zope.org/repos/main/Zope/tags/2.12.26/versions.cfg
  ../../stack/slapos.cfg
  ../../component/logrotate/buildout.cfg
  ../../component/dcron/buildout.cfg
@@ -40,7 +42,6 @@ extends =
  ../../component/mariadb/buildout.cfg
  ../../component/memcached/buildout.cfg
  ../../component/mysql-python/buildout.cfg
-  ../../component/pdftk/buildout.cfg
  ../../component/pil-python/buildout.cfg
  ../../component/pycrypto-python/buildout.cfg
  ../../component/pysvn-python/buildout.cfg
@@ -48,7 +49,6 @@ extends =
  ../../component/python-2.7/buildout.cfg
  ../../component/python-ldap-python/buildout.cfg
  ../../component/rdiff-backup/buildout.cfg
-  ../../component/stunnel/buildout.cfg
  ../../component/subversion/buildout.cfg
  ../../component/tesseract/buildout.cfg
  ../../component/varnish/buildout.cfg
@@ -77,7 +77,6 @@ parts =
  memcached
  haproxy
  varnish-3.0
-  stunnel
  w3m
  poppler
  libpng
@@ -97,7 +96,6 @@ parts =
  perl-DBI
  percona-toolkit
  zabbix-agent
-  pdftk
  dcron
  dash
  wget
@@ -142,13 +140,10 @@ parts =

 # Local development
 [slapos.cookbook-repository]
-recipe = plone.recipe.command
-stop-on-error = true
+recipe = slapos.recipe.build:gitclone
+repository = http://git.erp5.org/repos/slapos.git
 branch = erp5
-revision =
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
-update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --quiet --hard @{upstream} ; fi
+git-executable = ${git:location}/bin/git

 [check-recipe]
 recipe = plone.recipe.command
@@ -161,7 +156,7 @@ recipe = zc.recipe.egg
 eggs = slapos.cookbook
 scripts =
 python = python2.6
-ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
+ugly-depend-on = ${slapos.cookbook-repository:repository} ${slapos.cookbook-repository:branch}

 [slapos.recipe.template-python2.6]
 recipe = zc.recipe.egg
@@ -185,7 +180,7 @@ context =
 [template-mariadb]
 < = template-jinja2-base
 filename = instance-mariadb.cfg
-md5sum = 867bd8e3c4f56db2aab2fcad59f2efd8
+md5sum = 49ae6f1bf97d3755978fe08b8e29fb5a
 extra-context =
    key coreutils_location coreutils:location
    key dcron_location dcron:location
@@ -202,7 +197,7 @@ extra-context =
 [template-zope]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-zope.cfg.in
-md5sum = de2918c8ca604f452a69108f6e31e78d
+md5sum = 918b972679d5c06082363d41483324a7
 mode = 640

 [template-kumofs]
@@ -219,7 +214,7 @@ extra-context =
 [template-tidstorage]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
-md5sum = 1f3e7cfc719d3c2eee4860678f6a67df
+md5sum = bd5872108f812c6823a8915670e51c4c
 mode = 640

 [template-cloudooo]
@@ -239,7 +234,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 700b8729a4d9a8423ab2a99de486cc31
+md5sum = 2576de300d1a74fd1a99388af9723d42
 extra-context =
    key apache_location apache:location
    key aspell_location aspell:location
@@ -275,12 +270,11 @@ extra-context =
    key logrotate_location logrotate:location
    key mariadb_location mariadb:location
    key openssl_location openssl:location
-    key pdftk_location pdftk:location
    key poppler_location poppler:location
    key sed_location sed:location
    key template_cloudooo template-cloudooo:target
    key template_erp5_single template-erp5-single:target
-    key template_erp5_cluster template-erp5-cluster:rendered
+    key template_erp5_cluster template-erp5-cluster:target
    key template_kumofs template-kumofs:rendered
    key template_mariadb template-mariadb:rendered
    key template_memcached template-memcached:rendered
@@ -309,11 +303,10 @@ md5sum = 2a4312202a3160f874c4fa3ee9155a1d
 mode = 640

 [template-erp5-cluster]
-< = template-jinja2-base
-filename = instance-erp5-cluster.cfg
-md5sum = b4a9688ca7983fac5dd573e66c6e4263
-extra-context =
-    key local_bt5_repository local-bt5-repository:list
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/instance-erp5-cluster.cfg.in
+md5sum = eecde68b9a266d8883042540ac077839
+mode = 640

 [template-varnish]
 recipe = slapos.recipe.build:download
@@ -349,24 +342,17 @@ python = python2.6
 repository_id_list = erp5

 [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
+recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/erp5.git
 branch = master
-revision =
-command = "${git:location}/bin/git" clone --quiet --branch "${: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" fetch && if [ -n "${:revision}" ]; then "${git:location}/bin/git" reset --hard "${:revision}"; else "${git:location}/bin/git" reset --hard @{upstream} ; fi
+git-executable = ${git:location}/bin/git

 [fix-products-paths]
 recipe = plone.recipe.command
 stop-on-error = true
+dir = ${erp5:location}
 command =
-  for DIR in "${erp5:location}"; do cd "$DIR"; rm -f Products ; ln -s product Products; touch product/__init__.py; done
+  rm -f "${:dir}/Products" && ln -s product "${:dir}/Products" && touch "${:dir}/product/__init__.py"
 update-command = ${:command}

 [testrunner]
@@ -447,6 +433,7 @@ eggs =
  ordereddict
  paramiko
  ply
+  pyPdf # should be replaced by PyPDF2, but it is not installable
  python-magic
  python-memcached
  pytz
@@ -463,6 +450,7 @@ eggs =
  erp5.util
  huBarcode
  qrcode
+  spyne

 # Zope
  ZODB3
@@ -517,7 +505,7 @@ extra-paths =

 [cloudooo-repository]
 branch = master
-revision = 4cdfffb3f81a0fdbb7b372d92de664e716f12d4b
+revision = 6629837c96ae58e96cac019044ce95d19cb7a659

 [mysql-python]
 python = python2.6
@@ -575,9 +563,12 @@ Products.CMFUid = 2.2.1
 slapos.cookbook =

 # Pinned versions
+Flask = 0.9
+GitPython = 0.3.2.RC1
 MySQL-python = 1.2.4
 PIL = 1.1.7
 Paste = 1.7.5.1
+PasteDeploy = 1.5.0
 PasteScript = 1.7.5
 Products.CMFActionIcons = 2.1.3
 Products.DCWorkflowGraph = 0.4.1
@@ -588,15 +579,19 @@ Products.MimetypesRegistry = 2.0.4
 Products.PluggableAuthService = 1.9.0
 Products.PluginRegistry = 1.3
 Products.TIDStorage = 5.4.8
+Products.Zelenium = 1.0.3
 StructuredText = 2.11.1
 WSGIUtils = 0.7
 WebOb = 1.2.3
 Werkzeug = 0.8.3
 apache-libcloud = 0.11.4
+argparse = 1.2.1
 async = 0.6.1
+atomize = 0.1.1
 buildout-versions = 1.7
 cElementTree = 1.0.5-20051216
 chardet = 2.1.1
+cloudooo = 1.2.5-dev
 coverage = 3.6
 csp-eventlet = 0.7.0
 elementtree = 1.2.7-20070827-preview
@@ -604,19 +599,30 @@ erp5.recipe.cmmiforcei686 = 0.1.3
 erp5.util = 0.4.22
 erp5diff = 0.8.1.5
 eventlet = 0.12.1
+feedparser = 5.1.3
 five.localsitemanager = 2.0.5
+fpconst = 0.7.2
 gitdb = 0.5.4
 greenlet = 0.4.0
 hexagonit.recipe.cmmi = 1.6
 http-parser = 0.7.12
 huBarcode = 0.63
+inotifyx = 0.2.0
 ipdb = 0.7
 ipython = 0.13.1
+lxml = 2.3.6
 meld3 = 0.6.10
+mr.developer = 1.21
+netaddr = 0.7.10
+netifaces = 0.8
+nose = 1.2.1
 ordereddict = 1.1
+paramiko = 1.9.0
 plone.recipe.command = 1.1
 ply = 3.4
 polib = 1.0.2
+psutil = 0.6.1
+pyflakes = 0.6.1
 python-ldap = 2.4.10
 python-magic = 0.4.3
 python-memcached = 1.47-ipv6-1
@@ -624,33 +630,20 @@ qrcode = 2.4.2
 requests = 1.1.0
 restkit = 4.2.0
 rtjp-eventlet = 0.3.2
-slapos.recipe.build = 0.11.5
+setuptools = 0.6c12dev-r88846
+slapos.core = 0.34
+slapos.libnetworkcache = 0.13.2
+slapos.recipe.build = 0.11.6
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.33
 smmap = 0.8.2
 socketpool = 0.5.2
+spyne = 2.9.3
+supervisor = 3.0b1
 threadframe = 0.2
 timerserver = 2.0.2
 urlnorm = 1.1.2
 uuid = 1.30
 validictory = 0.9.0
-xupdate-processor = 0.4
-Flask = 0.9
-GitPython = 0.3.2.RC1
-PasteDeploy = 1.5.0
-argparse = 1.2.1
-atomize = 0.1.1
-feedparser = 5.1.3
-fpconst = 0.7.2
-hexagonit.recipe.download = 1.6
-inotifyx = 0.2.0
-netaddr = 0.7.10
-netifaces = 0.8
-nose = 1.2.1
-paramiko = 1.9.0
-psutil = 0.6.1
-pyflakes = 0.6.1
-slapos.core = 0.34
-supervisor = 3.0b1
 xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88846
+xupdate-processor = 0.4
--- a/stack/erp5/instance-erp5-cluster.cfg.in
+++ b/stack/erp5/instance-erp5-cluster.cfg.in
+{% if slap_software_type == software_type -%}
 #############################
 #
 # Request erp5 production environnment
@@ -104,3 +105,4 @@ smtp-url = smtp://localhost:25/
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc/run
+{% endif %}
--- a/stack/erp5/instance-mariadb.cfg.in
+++ b/stack/erp5/instance-mariadb.cfg.in
@@ -62,26 +62,38 @@ mysql-binary = {{ mariadb_location }}/bin/mysql
 mysql-install-binary = {{ mariadb_location }}/scripts/mysql_install_db
 mysql-upgrade-binary = {{ mariadb_location }}/bin/mysql_upgrade
 mysqld-binary = {{ mariadb_location }}/bin/mysqld
+pt-align-binary = {{ perl_siteprefix }}/bin/pt-align
 pt-archiver-binary = {{ perl_siteprefix }}/bin/pt-archiver
+pt-collect-binary = {{ perl_siteprefix }}/bin/pt-collect
 pt-config-diff-binary = {{ perl_siteprefix }}/bin/pt-config-diff
 pt-deadlock-logger-binary = {{ perl_siteprefix }}/bin/pt-deadlock-logger
+pt-diskstats-binary = {{ perl_siteprefix }}/bin/pt-diskstats
 pt-duplicate-key-checker-binary = {{ perl_siteprefix }}/bin/pt-duplicate-key-checker
 pt-fifo-split-binary = {{ perl_siteprefix }}/bin/pt-fifo-split
 pt-find-binary = {{ perl_siteprefix }}/bin/pt-find
+pt-fingerprint-binary = {{ perl_siteprefix }}/bin/pt-fingerprint
 pt-fk-error-logger-binary = {{ perl_siteprefix }}/bin/pt-fk-error-logger
 pt-heartbeat-binary = {{ perl_siteprefix }}/bin/pt-heartbeat
 pt-index-usage-binary = {{ perl_siteprefix }}/bin/pt-index-usage
+pt-ioprofile-binary = {{ perl_siteprefix }}/bin/pt-ioprofile
 pt-kill-binary = {{ perl_siteprefix }}/bin/pt-kill
 pt-log-player-binary = {{ perl_siteprefix }}/bin/pt-log-player
+pt-mext-binary = {{ perl_siteprefix }}/bin/pt-mext
+pt-mysql-summary-binary = {{ perl_siteprefix }}/bin/pt-mysql-summary
 pt-online-schema-change-binary = {{ perl_siteprefix }}/bin/pt-online-schema-change
+pt-pmp-binary = {{ perl_siteprefix }}/bin/pt-pmp
 pt-query-advisor-binary = {{ perl_siteprefix }}/bin/pt-query-advisor
 pt-query-digest-binary = {{ perl_siteprefix }}/bin/pt-query-digest
 pt-show-grants-binary = {{ perl_siteprefix }}/bin/pt-show-grants
+pt-sift-binary = {{ perl_siteprefix }}/bin/pt-sift
 pt-slave-delay-binary = {{ perl_siteprefix }}/bin/pt-slave-delay
 pt-slave-find-binary = {{ perl_siteprefix }}/bin/pt-slave-find
 pt-slave-restart-binary = {{ perl_siteprefix }}/bin/pt-slave-restart
+pt-stalk-binary = {{ perl_siteprefix }}/bin/pt-stalk
+pt-summary-binary = {{ perl_siteprefix }}/bin/pt-summary
 pt-table-checksum-binary = {{ perl_siteprefix }}/bin/pt-table-checksum
 pt-table-sync-binary = {{ perl_siteprefix }}/bin/pt-table-sync
+pt-table-usage-binary = {{ perl_siteprefix }}/bin/pt-table-usage
 pt-tcp-model-binary = {{ perl_siteprefix }}/bin/pt-tcp-model
 pt-trend-binary = {{ perl_siteprefix }}/bin/pt-trend
 pt-upgrade-binary = {{ perl_siteprefix }}/bin/pt-upgrade

--- a/stack/erp5/instance-tidstorage.cfg.in
+++ b/stack/erp5/instance-tidstorage.cfg.in
@@ -134,10 +134,10 @@ link-binary =
  {{ parameter_dict['imagemagick'] }}/bin/identify
  {{ parameter_dict['mariadb'] }}/bin/mysql
  {{ parameter_dict['mariadb'] }}/bin/mysqldump
-  {{ parameter_dict['pdftk'] }}/bin/pdftk
  {{ parameter_dict['sed'] }}/bin/sed
  {{ parameter_dict['tesseract'] }}/bin/tesseract
  {{ parameter_dict['w3m'] }}/bin/w3m
+  {{ parameter_dict['openssl'] }}/bin/openssl
  {{ parameter_dict['poppler'] }}/bin/pdfinfo
  {{ parameter_dict['poppler'] }}/bin/pdfseparate
  {{ parameter_dict['poppler'] }}/bin/pdftotext

--- a/stack/erp5/instance-zope.cfg.in
+++ b/stack/erp5/instance-zope.cfg.in
@@ -196,10 +196,10 @@ link-binary =
  {{ librsvg_location }}/bin/rsvg-convert
  {{ mariadb_location }}/bin/mysql
  {{ mariadb_location }}/bin/mysqldump
-  {{ pdftk_location }}/bin/pdftk
  {{ sed_location }}/bin/sed
  {{ tesseract_location }}/bin/tesseract
  {{ w3m_location }}/bin/w3m
+  {{ openssl_location }}/bin/openssl
  {{ poppler_location }}/bin/pdfinfo
  {{ poppler_location }}/bin/pdfseparate
  {{ poppler_location }}/bin/pdftotext

--- a/stack/erp5/instance.cfg.in
+++ b/stack/erp5/instance.cfg.in
@@ -39,7 +39,6 @@ grep = {{ grep_location }}
 imagemagick = {{ imagemagick_location }}
 librsvg = {{ librsvg_location }}
 mariadb = {{ mariadb_location }}
-pdftk = {{ pdftk_location }}
 sed = {{ sed_location }}
 tesseract = {{ tesseract_location }}
 w3m = {{ w3m_location }}
@@ -129,7 +128,6 @@ librsvg = {{ librsvg_location }}
 logrotate = {{ logrotate_location }}
 mariadb = {{ mariadb_location }}
 openssl = {{ openssl_location }}
-pdftk = {{ pdftk_location }}
 poppler = {{ poppler_location }}
 sed = {{ sed_location }}
 tesseract = {{ tesseract_location }}
@@ -159,7 +157,6 @@ extra-context =
    key logrotate_location dynamic-template-zope-parameters:logrotate
    key mariadb_location dynamic-template-zope-parameters:mariadb
    key openssl_location dynamic-template-zope-parameters:openssl
-    key pdftk_location dynamic-template-zope-parameters:pdftk
    key poppler_location dynamic-template-zope-parameters:poppler
    key sed_location dynamic-template-zope-parameters:sed
    key tesseract_location dynamic-template-zope-parameters:tesseract
@@ -187,11 +184,30 @@ extra-context =
    key template_zope dynamic-template-zope:rendered
    key local_bt5_repository template-erp5-single-parameters:local_bt5_repository

+[dynamic-template-cluster-parameters]
+local-bt5-repository = {{ local_bt5_repository }}
+
+[dynamic-template-cluster]
+< = jinja2-template-base
+template = {{ template_erp5_cluster }}
+filename = instance-erp5-cluster.cfg
+extra-context =
+    key local_bt5_repository dynamic-template-cluster-parameters:local-bt5-repository
+# Must match the key id in [switch-softwaretype] which uses this section.
+# XXX: it is dangerous to use buildout-style expansion in jinja context declaration
+    raw software_type ${:software-type}
+software-type = cluster
+
+# BBB: use "cluster" software type instead
+[dynamic-template-production]
+< = dynamic-template-cluster
+software-type = production
+
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = ${template-erp5-single:rendered}
-production = {{ template_erp5_cluster }}
-cluster = {{ template_erp5_cluster }}
+production = ${dynamic-template-production:rendered}
+cluster = ${dynamic-template-cluster:rendered}
 kumofs = {{ template_kumofs }}
 memcached = {{ template_memcached }}
 cloudooo = ${dynamic-template-cloudooo:rendered}

--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -22,6 +22,7 @@ exec-sitecustomize = false
 find-links +=
  http://www.nexedi.org/static/packages/source/slapos.buildout/
  http://www.nexedi.org/static/packages/source/
+  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/

 # Use only quite well working sites.
 allow-hosts +=
@@ -68,7 +69,8 @@ eggs =
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-010
-
+# Use xz-friendly hexagonit.recipe.download
+hexagonit.recipe.download = 1.6nxd002
 # zc.recipe.egg 2.0.0a is buggy
 zc.recipe.egg = 1.3.2