Merge branch 'erp5-component' into erp5-component-z2.13

Conflicts:
	stack/erp5/buildout.cfg

CHANGES.txt

 Changes
 =======
 
-0.59 (Unreleased)
+0.66 (2012-09-10)
 -----------------
 
+  * Add check_page_content promise generator. [Cedric Le Ninivin]
+
+0.65 (2012-09-07)
+-----------------
+
+  * Add egg_test, recipe allowing to do "python setup.py test" on a list of
+    eggs. [Rafael Monnerat, Cedric de Saint Martin]
+
+0.64.2 (2012-08.28)
+-------------------
+
+  * Specify description on gitinit recipe. [Antoine Catton]
+
+0.64.1 (2012-08-28)
+-------------------
+
+  * Fix: minor fix on downloader recipe in order to allow cross-device renaming.
+    [Antoine Catton]
+
+0.64 (2012-08-27)
+----------------
+
+  * Fix: remove "template" recipe which was collinding with slapos.recipe.template.
+    [Antoine Catton]
+
+0.63 (2012-08-22)
+----------------
+
+  * Add the ability to run command line in shellinabox. [Antoine Catton]
+  * Add the ability to run shellinabox as root. (for LXC purpose) [Antoine Catton]
+  * Add "uuid" recipe. [Antoine Catton]
+  * Add "downloader" recipe. [Antoine Catton]
+
+0.62 (2012-08-21)
+-----------------
+
+  * Add "wrapper" recipe. [Antoine Catton]
+  * Add "gitinit" recipe. [Antoine Catton]
+  * librecipe.execute code clean up and factorization. [Antoine Catton]
+  * Add "template" recipe. [Antoine Catton]
+
+0.61 (2012-08-17)
+-----------------
+
+  * Add "debug" option for slaprunner. [Alain Takoudjou]
+
+0.60 (2012-08-13)
+-----------------
+
+  * New recipe: requestoptional, like "request", but won't fail if instance is
+    not ready. [Cedric de Saint Martin]
+  * Update zabbix to return strings as parameters. [Cedric de Saint Martin]
+  * Add check in check_url_promise in case of empty URL. [Cedric de Saint
+    Martin]
+  * Upgrade slaprunner recipe to be compatible with newest version. [Alain
+    Takoudjou]
+
+0.59 (2012-07-12)
+-----------------
+
+  * Zabbix: add temperature monitoring using custom commands.
 
 0.58 (2012-07-06)
 -----------------
@@ -86,7 +147,7 @@ Changes
     [Cedric de Saint Martin]
   * Apache Frontend: listens to plain http port as well to redirect to https.
     [Cedric de Saint Martin]
-  
+
 0.49 (2012-05-10)
 -----------------
 
@@ -152,7 +213,7 @@ Changes
 -----------------
 
  * apache_frontend initial release. [Cedric de Saint Martin]
- 
+
 0.39 (2012-02-20)
 -----------------
 
@@ -205,7 +266,7 @@ Changes
 0.32 (2011-10-28)
 -----------------
 
-  * LAMP : Recipe can now call lampconfigure from slapos.toolbox which will 
+  * LAMP : Recipe can now call lampconfigure from slapos.toolbox which will
    configure PHP application instance when needed. [Alain Takoudjou Kamdem]
 
 0.31 (2011-10-16)

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

component/attr/buildout.cfg

+[buildout]
+
+parts = attr
+
+[attr]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.igh.cnrs.fr/pub/nongnu/attr/attr-2.4.46.src.tar.gz
+md5sum = db557c17fdfa4f785333ecda08654010
+configure-options =
+    --enable-shared=yes
+    --enable-gettext=no
+make-targets = install install-lib install-dev

component/autoconf/buildout.cfg

@@ -7,8 +7,8 @@ parts =
 
 [autoconf]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.gz
-md5sum = c3b5247592ce694f7097873aa07d66fe
+url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
+md5sum = 82d05e03b93e45f5a39b828dc9c6c29b
 environment =
   M4=${m4:location}/bin/m4
   PATH=${perl:location}/bin:%(PATH)s

component/busybox/buildout.cfg

 [buildout]
-extends =
-  ../patch/buildout.cfg
 
-# https://bugs.busybox.net/show_bug.cgi?id=4838
-[busybox-1.19.3.packed_hack.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = faa5ce46be086763202d7ca24601fbde
-filename = busybox-1.19.3.packed_hack.patch
-download-only = true
+parts = busybox
 
 [busybox]
 recipe = slapos.recipe.build
-url = http://busybox.net/downloads/busybox-1.19.4.tar.bz2
-md5sum = 9c0cae5a0379228e7b55e5b29528df8e
-patch-binary = ${patch:location}/bin/patch
-patch-options = -p1
-patches =
-  ${busybox-1.19.3.packed_hack.patch:location}/${busybox-1.19.3.packed_hack.patch:filename}
+url = http://git.busybox.net/busybox/snapshot/busybox-1_20_1.tar.gz
+md5sum = 15758fc37ae8051d6def1b8afb691821
 script =
     extract_dir = self.extract(self.download(%(url)r, %(md5sum)r))
     workdir = guessworkdir(extract_dir)
-    self.applyPatchList(self.options.get('patches'), self.options.get('patch-options'), self.options.get('patch-binary'), workdir)
-    call(['patch', 'defconfig'], cwd=workdir, env=env)
     self.logger.info("Creating default configuration")
     call(['make', 'defconfig'], cwd=workdir, env=env)
     self.logger.info("Building")

component/busybox/busybox-1.19.3.packed_hack.patch

-diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
-index 2a426db..35f44ac 100644
---- a/miscutils/ubi_tools.c
-+++ b/miscutils/ubi_tools.c
-@@ -60,6 +60,16 @@
- //kbuild:lib-$(CONFIG_UBIUPDATEVOL) += ubi_tools.o
- 
- #include "libbb.h"
-+#if 1
-+// __packed hack for broken kernel headers ubi-user.h
-+// See: https://lkml.org/lkml/2011/6/22/25
-+//   Once ubi-user.h is correctly installed without "__packed", or kernel
-+//   guys correct this another way (with a compiler header??), this can
-+//   go away.
-+# ifndef __packed
-+#  define __packed __attribute__((packed))
-+# endif // ndef __packed
-+#endif // 1
- #include <mtd/ubi-user.h>
- 
- #define OPTION_M  (1 << 0)

component/ca-certificates/buildout.cfg

 # CA certificates
 
 [buildout]
+
+extends =
+  ../patch/buildout.cfg
+
 parts =
   ca-certificates
 
@@ -16,6 +20,7 @@ download-only = true
 recipe = hexagonit.recipe.cmmi
 version = 20120623
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
+patch-binary = ${patch:location}/bin/patch
 md5sum = 5105d4cc086f0d4ecf7bf2e4c4667289
 patches =
   ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}

component/cloud9/buildout.cfg

@@ -16,26 +16,41 @@ parts =
 
 [node-sm]
 recipe = slapos.recipe.build:npm
-packages = sm
+packages = sm@0.2.7
 node = nodejs
 environment =
   PATH=${nodejs:location}/bin:%(PATH)s
 
-[cloud9-git]
+[cloud9-stable]
 # Online IDE written in javascript/node.js
 # URL : c9.io
 # You can use it using the following command :
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
 recipe = plone.recipe.command
 stop-on-error = true
-commit = ab689c5d3cc29d02d788506c0f1b2ab0742a0f05
+commit = 97db1467c517d265438684bd2a70b0b76ee282f6
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 git-binary = ${git:location}/bin/git
-npm-binary = ${nodejs:location}/bin/node ${nodejs:location}/bin/npm
-environment = export GIT_SSL_NO_VERIFY=true; export PATH=${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin/:$PATH; export LDFLAGS=-L${libxml2:location}/lib; export HOME=${:location};
-command = ${:environment} (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install) || (rm -fr ${:location}; exit 1)
+npm-binary = ${nodejs-0.4:location}/bin/node ${npm:location}/bin/npm
+command = export GIT_SSL_NO_VERIFY=true; export HOME=${:location}; (${:git-binary} clone --quiet ${:repository} ${:location} && cd ${:location} && ${:git-binary} reset --hard ${:commit} && ${:git-binary} submodule update --init && cd support/jsdav && PATH=${nodejs-0.4:location}/bin:$PATH LDFLAGS=-L${libxml2:location}/lib ${:npm-binary} install) || (rm -fr ${:location}; exit 1)
+update-command =
+executable = ${:location}/bin/cloud9.js
+
+[cloud9-git]
+# Online IDE written in javascript/node.js
+# URL : c9.io
+# You can use it using the following command :
+# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
+recipe = plone.recipe.command
+stop-on-error = true
+commit = c66284221143c175fc889418d499da6f37492a7c
+repository = https://github.com/ajaxorg/cloud9.git
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};
+command = ${:environment} (git clone --quiet ${:repository} ${:location} && cd ${:location} && git reset --hard ${:commit} && ${node-sm:location}/node_modules/.bin/sm install) || (rm -fr ${:location}; exit 1)
 update-command =
+executable = ${:location}/server.js
 
 [cloud9-npm]
 # Online IDE written in javascript/node.js
@@ -50,4 +65,4 @@ packages =
   cloud9==0.7
 # Specify environment jsDAV (dependency of cloud9) needs libxml2
 environment = 
-  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib
\ No newline at end of file
+  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib

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.9.tar.gz
+md5sum = 801f4c87f8b604f727df5bf1f05a59e7

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

component/fonts/buildout.cfg

@@ -3,6 +3,7 @@ parts =
   liberation-fonts
   ipaex-fonts
   ipa-fonts
+  ocrb-fonts
 
 [fonts]
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -13,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
@@ -22,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]
@@ -32,3 +33,10 @@ strip-top-level-dir = true
 url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAfont00303.zip
 md5sum = 39a828acf27790adbe4944dfb4d94bb1
 destination = ${fonts:location}/${:_buildout_section_name_}
+
+[ocrb-fonts]
+recipe = hexagonit.recipe.download
+strip-top-level-dir = true
+url = http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Ftsukurimashou%2F56948%2Focr-0.2.zip
+md5sum = 9f2acd83291a31dbe053912f4115db75
+destination = ${fonts:location}/${:_buildout_section_name_}

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.10.tar.bz2
+md5sum = 13286702e9390a91661f980608adaff1
 configure-options =
   --disable-static
 environment =

component/git/buildout.cfg

@@ -21,9 +21,13 @@ configure-options =
   --with-expat=${libexpat:location}
   --without-python
   --without-tcltk
-
 environment =
   NO_PERL=y
   PATH=${curl:location}/bin:${gettext:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[gitweb]
+<= git
+make-targets = install-gitweb
+make-options = bindir="${git:location}/bin/"

component/groonga/buildout.cfg

@@ -5,10 +5,13 @@
 parts =
   groonga
 
+extends =
+  ../zlib/buildout.cfg
+
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.6.tar.gz
-md5sum = 64467d1ab8d5e0df8348a636972a95a7
+url = http://packages.groonga.org/source/groonga/groonga-2.0.8.tar.gz
+md5sum = 2ad20b64d57d28b90f78be7d97e20b3a
 configure-options =
   --disable-static
   --disable-glibtest
@@ -16,3 +19,7 @@ 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
+

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

component/imagemagick/buildout.cfg

@@ -16,6 +16,7 @@ extends =
   ../jasper/buildout.cfg
   ../jbigkit/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../webp/buildout.cfg
   ../zlib/buildout.cfg
 
 [imagemagick-6.6.6-1-no-gsx-gsc-probe.patch]
@@ -28,7 +29,7 @@ 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.7.8-8.tar.bz2
+url = http://ftp.vim.org/ImageMagick/ImageMagick-6.7.8-8.tar.bz2
 md5sum = 4e5c8f102f3e7401587c924f5b4bca15
 depends =
   ${libtiff:version}
@@ -66,5 +67,5 @@ patches =
 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
+  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

component/kumo/buildout.cfg

@@ -34,5 +34,5 @@ configure-options =
   --with-msgpack=${messagepack:location}
 
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -DKUMO_IPV6
+  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib

component/libcap/buildout.cfg

+[buildout]
+
+extends =
+  ../attr/buildout.cfg
+
+parts = libcap
+
+[libcap2]
+recipe = slapos.recipe.build
+format = no
+url = http://pkgs.fedoraproject.org/lookaside/pkgs/libcap/libcap-2.22.tar.bz2/ce64058bdb3f086ddbfca8ce6c919845/libcap-2.22.tar.bz2
+md5sum = ce64058bdb3f086ddbfca8ce6c919845
+attr-include = ${attr:location}/include/
+attr-lib = ${attr:location}/lib/
+slapos_promise =
+  directory:sbin
+  directory:usr/include
+  statlib:lib/libcap.a
+  file:lib/libcap.so
+  file:sbin/getcap
+  file:sbin/setcap
+script =
+  import os
+  url = self.download(self.options['url'], self.options['md5sum'])
+  extract_dir = self.extract(url)
+  workdir = guessworkdir(extract_dir)
+  cflags = '-I%(attr)s' % {'attr': self.options['attr-include']}
+  ldflags = '-L%(attr)s -Wl,-rpath=%(attr)s' % {'attr': self.options['attr-lib']}
+  call(['make', 'CFLAGS=%s' % cflags, 'LDFLAGS=%s' % ldflags, 'DESTDIR=%s' % self.options['location'], 'RAISE_SETFCAP=no', 'install'],
+       cwd=workdir, env=env)
+  lib64 = os.path.join(self.options['location'], 'lib64')
+  lib = os.path.join(self.options['location'], 'lib')
+  # XXX: Dirty if case
+  #      if lib64 exists, then create a symlink from lib to lib64
+  os.path.exists(lib64) and os.symlink(lib64, lib)
+
+[libcap]
+<= libcap2

component/libdmtx/buildout.cfg

@@ -3,8 +3,10 @@
 
 [buildout]
 extends =
+  ../bzip2/buildout.cfg
   ../imagemagick/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
   libdmtx
   dmtx-utils
@@ -26,4 +28,4 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${imagemagick:location}/lib/pkgconfig:${libdmtx:location}/lib/pkgconfig
   CPPFLAGS=-I${libdmtx:location}/include
-  LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib
+  LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libpng/buildout.cfg

@@ -21,5 +21,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.13.tar.bz2
+md5sum = 186b3098d1ef844f76681bc69968efe2

component/librsvg/buildout.cfg

@@ -14,7 +14,8 @@ url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.3.tar.bz2
 md5sum = e1e93eeff4367c896f3959af34ba20eb
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  LDFLAGS=-Wl,-rpath=${zlib:location}/lib
 
 [librsvg]
 recipe = hexagonit.recipe.cmmi
@@ -36,4 +37,4 @@ configure-options =
 environment = 
   PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libtiff/buildout.cfg

@@ -9,11 +9,9 @@ parts =
 
 [libtiff]
 recipe = hexagonit.recipe.cmmi
-version = 4.0.2
-#url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
-# server is down - circumvent
-url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
-md5sum = 04a08fa1e07e696e820a0c3f32465a13
+version = 4.0.3
+url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
+md5sum = 051c1068e6a0627f461948c365290410
 configure-options =
   --disable-static
   --without-x

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

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

component/libyaml/buildout.cfg

+[buildout]
+
+parts =
+  libyaml
+
+[libyaml]
+recipe = hexagonit.recipe.cmmi
+url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
+md5sum = 36c852831d02cf90508c29852361d01b

component/lxc/buildout.cfg

+[buildout]
+
+extends =
+  ../patch/buildout.cfg
+  ../attr/buildout.cfg
+  ../libcap/buildout.cfg
+
+parts = lxc
+
+[lxc]
+<= lxc-0.8
+
+[lxc-0.8.0-rc2-libexecdir-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = libexecdir-fix.patch
+download-only = true
+md5sum = d674463ccb3a7c205c2326fb4ab5436b
+
+[lxc-0.8.0-rc2-lxc-ls-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = lxc-ls-fix.patch
+download-only = true
+md5sum = 28c155a554d4f4856351085494585c73
+
+[lxc-0.8.0-rc2-cap_get_flag-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = cap_get_flag-fix.patch
+download-only = true
+md5sum = 8d3706a9bd60b6ebfea33998644b1a99
+
+[lxc-0.8]
+recipe = hexagonit.recipe.cmmi
+url = http://lxc.sourceforge.net/download/lxc/lxc-0.8.0-rc2.tar.gz
+md5sum = 9bd6988542fd7dd198d056ef3a2db9f6
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+patches =
+  ${lxc-0.8.0-rc2-cap_get_flag-patch:location}/${lxc-0.8.0-rc2-cap_get_flag-patch:filename}
+  ${lxc-0.8.0-rc2-libexecdir-patch:location}/${lxc-0.8.0-rc2-libexecdir-patch:filename}
+  ${lxc-0.8.0-rc2-lxc-ls-patch:location}/${lxc-0.8.0-rc2-lxc-ls-patch:filename}
+environment =
+  PATH=%(PATH)s:${attr:location}/bin/:${libcap:location}/sbin/
+  CFLAGS=-I${libcap:location}/usr/include
+  LDFLAGS=-L${libcap:location}/lib/ -Wl,-rpath=${libcap:location}/lib/

component/lxc/cap_get_flag-fix.patch

+commit 94767c5249b5802a894f6d84f6245ef86f50bff3
+Author: Serge Hallyn <serge.hallyn@ubuntu.com>
+Date:   Fri Jun 29 10:37:07 2012 -0500
+
+    Fix lxc's handling of CAP_LAST_CAP
+    
+    CAP_LAST_CAP in linux/capability.h doesn't always match what the kernel
+    actually supports.  If the kernel supports fewer capabilities, then a
+    cap_get_flag for an unsupported capability returns -EINVAL.
+    
+    Recognize that, and don't fail when initializing capabilities when this
+    happens, rather accept that we've reached the last capability.
+    
+    Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+
+diff --git a/src/lxc/caps.c b/src/lxc/caps.c
+index 10a0b4a..c32e7e4 100644
+--- a/src/lxc/caps.c
++++ b/src/lxc/caps.c
+@@ -28,6 +28,7 @@
+ #include <limits.h>
+ #include <sys/prctl.h>
+ #include <sys/capability.h>
++#include <errno.h>
+ 
+ #include "log.h"
+ 
+@@ -90,6 +91,7 @@ int lxc_caps_up(void)
+ 	cap_t caps;
+ 	cap_value_t cap;
+ 	int ret;
++	int lastcap = 0;
+ 
+ 	/* when we are run as root, we don't want to play
+ 	 * with the capabilities */
+@@ -108,9 +110,15 @@ int lxc_caps_up(void)
+ 
+ 		ret = cap_get_flag(caps, cap, CAP_PERMITTED, &flag);
+ 		if (ret) {
+-			ERROR("failed to cap_get_flag: %m");
+-			goto out;
++			if (errno == EINVAL) {
++				INFO("Last supported cap was %d\n", cap-1);
++				break;
++			} else {
++				ERROR("failed to cap_get_flag: %m");
++				goto out;
++			}
+ 		}
++		lastcap = cap;
+ 
+ 		ret = cap_set_flag(caps, CAP_EFFECTIVE, 1, &cap, flag);
+ 		if (ret) {

component/lxc/libexecdir-fix.patch

+commit 00ad19d4dba5c05401125d4217dc8f4e7fd9403a
+Author: David Ward <david.ward@ll.mit.edu>
+Date:   Fri May 4 00:50:15 2012 +0200
+
+    lxc-setcap/lxc-setuid: add autoconf expansion for $libexecdir
+    
+    Support new default location for LXCINITDIR.
+    
+    Signed-off-by: David Ward <david.ward@ll.mit.edu>
+    Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
+
+diff --git a/configure.ac b/configure.ac
+index c2bf4b0..0c8aa69 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,7 @@ AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
+ AS_AC_EXPAND(PREFIX, $prefix)
+ AS_AC_EXPAND(LIBDIR, $libdir)
+ AS_AC_EXPAND(BINDIR, $bindir)
++AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
+ AS_AC_EXPAND(INCLUDEDIR, $includedir)
+ AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+ AS_AC_EXPAND(DATADIR, $datadir)
+diff --git a/src/lxc/lxc-setcap.in b/src/lxc/lxc-setcap.in
+index 52d4b48..71e3710 100644
+--- a/src/lxc/lxc-setcap.in
++++ b/src/lxc/lxc-setcap.in
+@@ -84,6 +84,7 @@ lxc_dropcaps()
+ shortoptions='hd'
+ longoptions='help'
+ libdir=@LIBDIR@
++libexecdir=@LIBEXECDIR@
+ localstatedir=@LOCALSTATEDIR@
+ 
+ getopt=$(getopt -o $shortoptions --longoptions  $longoptions -- "$@")
+diff --git a/src/lxc/lxc-setuid.in b/src/lxc/lxc-setuid.in
+index 0919eac..020dfae 100644
+--- a/src/lxc/lxc-setuid.in
++++ b/src/lxc/lxc-setuid.in
+@@ -81,6 +81,7 @@ lxc_dropuid()
+ shortoptions='hd'
+ longoptions='help'
+ libdir=@LIBDIR@
++libexecdir=@LIBEXECDIR@
+ localstatedir=@LOCALSTATEDIR@
+ 
+ getopt=$(getopt -o $shortoptions --longoptions  $longoptions -- "$@")

component/lxc/lxc-ls-fix.patch

+commit 7ef0141356454503ab81460290b5dffa32c1f441
+Author: David Ward <david.ward@ll.mit.edu>
+Date:   Fri May 4 00:50:15 2012 +0200
+
+    refresh lxc-ls
+    
+    Add an '--active' option that lists active containers by searching
+    cgroups. (Otherwise, the directories in /var/lib/lxc are listed.)
+    Modify the cgroup search to only use hierarchies that contain one
+    or more subsystems. When searching, if a hierarchy contains the
+    'ns' subsystem, do not append '/lxc' to the parent cgroup.
+    
+    Add a '--help' option that prints the command syntax.
+    
+    Print error messages and help information to stderr.
+    
+    Update the documentation.
+    
+    Signed-off-by: David Ward <david.ward@ll.mit.edu>
+    Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
+
+diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in
+index 3ffd4f8..d33e9b3 100644
+--- a/doc/lxc-ls.sgml.in
++++ b/doc/lxc-ls.sgml.in
+@@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+   <refsynopsisdiv>
+     <cmdsynopsis>
+-      <command>lxc-ls <optional>ls option</optional>
++      <command>lxc-ls <optional>--active</optional> <optional>ls option</optional>
+       </command>
+     </cmdsynopsis>
+   </refsynopsisdiv>
+@@ -67,6 +67,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 
+       <varlistentry>
+ 	<term>
++	  <option><optional>--active</optional></option>
++	</term>
++	<listitem>
++	  <para>
++	    List active containers.
++	  </para>
++	</listitem>
++      </varlistentry>
++
++      <varlistentry>
++	<term>
+ 	  <option><optional>ls options</optional></option>
+ 	</term>
+ 	<listitem>
+@@ -94,10 +105,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+       </varlistentry>
+ 
+       <varlistentry>
+-	<term>lxc-ls -1</term>
++	<term>lxc-ls --active -1</term>
+ 	<listitem>
+ 	<para>
+-	  list all the containers and display the list in one column.
++	  list active containers and display the list in one column.
+ 	</para>
+ 	</listitem>
+       </varlistentry>
+diff --git a/src/lxc/lxc-ls.in b/src/lxc/lxc-ls.in
+index a1ad642..11a3b45 100644
+--- a/src/lxc/lxc-ls.in
++++ b/src/lxc/lxc-ls.in
+@@ -1,43 +1,100 @@
+ #!/bin/bash
+ 
+-localstatedir=@LOCALSTATEDIR@
+-lxcpath=@LXCPATH@
++#
++# lxc: linux Container library
+ 
+-if [ ! -r $lxcpath ]; then
+-    exit 0
+-fi
++# This library is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License as published by the Free Software Foundation; either
++# version 2.1 of the License, or (at your option) any later version.
++
++# This library 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
++# Lesser General Public License for more details.
++
++# You should have received a copy of the GNU Lesser General Public
++# License along with this library; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++localstatedir=@LOCALSTATEDIR@
++lxc_path=@LXCPATH@
+ 
+-function get_cgroup()
++usage()
+ {
+-	local mount_string
+-	mount_string=$(mount -t cgroup |grep -E -e '^lxc ')
+-	if test -n "$mount_string"; then
+-		mount_point=$(echo $mount_string |cut -d' ' -f3)
+-		return
+-	fi
+-	mount_string=`grep -m1 -E '^[^ \t]+[ \t]+[^ \t]+[ \t]+cgroup' /proc/self/mounts`;
+-	if test -z "$mount_string"; then
+-		echo "failed to find mounted cgroup"
+-		exit 1
+-	fi
+-	mount_point=`echo "$mount_string" |cut -d' ' -f2`;
++	echo "usage: $(basename $0) [--active] [--] [LS_OPTIONS...]" >&2
+ }
+ 
+-ls "$@" $lxcpath
++help() {
++	usage
++	echo >&2
++	echo "List containers existing on the system." >&2
++	echo >&2
++	echo "  --active     list active containers" >&2
++	echo "  LS_OPTIONS   ls command options (see \`ls --help')" >&2
++}
++
++get_parent_cgroup()
++{
++	local hierarchies hierarchy fields subsystems init_cgroup mountpoint
++
++	parent_cgroup=""
++
++	# Obtain a list of hierarchies that contain one or more subsystems
++	hierarchies=$(tail -n +2 /proc/cgroups | cut -f 2)
+ 
+-active=$(netstat -xl 2>/dev/null | grep $lxcpath | \
+-	sed -e 's#.*'"$lxcpath/"'\(.*\)/command#\1#');
++	# Iterate through the list until a suitable hierarchy is found
++	for hierarchy in $hierarchies; do
++		# Obtain information about the init process in the hierarchy
++		fields=$(grep -E "^$hierarchy:" /proc/1/cgroup | head -n 1)
++		if [ -z "$fields" ]; then continue; fi
++		fields=${fields#*:}
+ 
+-if test -n "$active"; then
+-	get_cgroup
+-	if test -n "$mount_point"; then
+-		# get cgroup for init
+-		init_cgroup=`cat /proc/1/cgroup | awk -F: '{ print $3 }' | head -1`
+-		if [ ! -d $mount_point/$init_cgroup/lxc  ]; then
+-			cd $mount_point/$init_cgroup
++		# Get a comma-separated list of the hierarchy's subsystems
++		subsystems=${fields%:*}
++
++		# Get the cgroup of the init process in the hierarchy
++		init_cgroup=${fields#*:}
++
++		# Get the filesystem mountpoint of the hierarchy
++		mountpoint=$(grep -E "^cgroup [^ ]+ [^ ]+ ([^ ]+,)?$subsystems(,[^ ]+)? " /proc/self/mounts | cut -d ' ' -f 2)
++		if [ -z "$mountpoint" ]; then continue; fi
++
++		# Return the absolute path to the containers' parent cgroup
++		# (do not append '/lxc' if the hierarchy contains the 'ns' subsystem)
++		if [[ ",$subsystems," == *,ns,* ]]; then
++			parent_cgroup="${mountpoint}${init_cgroup%/}"
+ 		else
+-			cd $mount_point/$init_cgroup/lxc
++			parent_cgroup="${mountpoint}${init_cgroup%/}/lxc"
+ 		fi
+-		ls "$@" -d $active
+-	fi
++		break
++	done
++}
++
++directory="$lxc_path"
++
++for i in "$@"; do
++	case $i in
++		--help)
++			help; exit 1;;
++		--active)
++			get_parent_cgroup; directory="$parent_cgroup"; shift;;
++		--)
++			shift; break;;
++		*)
++			break;;
++        esac
++done
++
++containers=""
++if [ ! -z "$directory" ]; then
++	containers=$(find $directory -mindepth 1 -maxdepth 1 -type d -printf "%f\n" 2>/dev/null)
+ fi
++
++if [ -z "$containers" ]; then
++	echo "$(basename $0): no containers found" >&2
++	exit 1
++fi
++
++cd "$directory"
++ls -d $@ $containers

component/mariadb/buildout.cfg

@@ -25,10 +25,10 @@ download-only = true
 
 [mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.5.27
+version = 5.5.28a
 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 = ad6f3239a1d5af0a667e30f7c0b05037
+md5sum = a2d20a040ef1e49944a4ffe65ed7fefa
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -62,8 +62,8 @@ 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 = https://github.com/downloads/mroonga/mroonga/mroonga-2.08.tar.gz
+md5sum = bb04d973569a1b17f811fc344c0feb95
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

component/mydumper/buildout.cfg

@@ -3,6 +3,7 @@
 extends =
     ../cmake/buildout.cfg
     ../glib/buildout.cfg
+    ../openssl/buildout.cfg
     ../pcre/buildout.cfg
     ../mariadb/buildout.cfg
 
@@ -15,17 +16,17 @@ parts = mydumper
 recipe = slapos.recipe.build
 depends =
   ${mariadb:version}
-url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
-md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
+url = https://launchpad.net/mydumper/0.5/0.5.1/+download/mydumper-0.5.1.tar.gz
+md5sum = b4df42dfe23f308ab13eb6ecb73a0d21
 buildout-bin-dir = ${buildout:bin-directory}
 cmake-command = ${cmake:location}/bin/cmake
 mysql-config = ${mariadb:location}/bin/mysql_config
-doc-dependency = ${mydumper-doc:eggs}
 mysqllib = ${mariadb:location}/lib
-pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
-libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/
-includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql
-cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql
+pkg-config-path = ${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/:${openssl:location}/lib/pkgconfig/
+libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/:${openssl:location}/lib/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include:${openssl:location}/include/
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include -I${openssl:location}/include/
+mysql-include-dir = ${mariadb:location}/include
 mydumper-patches =
    ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
 slapos_promise =
@@ -49,17 +50,13 @@ script =
                     '-DMYSQL_CONFIG=%%s' %% self.options['mysql-config'],
                     '-DCMAKE_C_FLAGS=%%s' %% self.options['cflags'],
                     '-DCMAKE_INSTALL_RPATH=%%s' %% self.options['libraries'],
+                    '-DMYSQL_INCLUDE_DIR=%%s' %% self.options['mysql-include-dir'],
+                    '-DBUILD_DOCS=OFF',
                     '.']
     call(command_line, cwd=workdir, env=env)
     call(['make'], cwd=workdir, env=env)
     call(['make', 'install'], cwd=workdir, env=env)
 
-[mydumper-doc]
-recipe = zc.recipe.egg
-eggs =
-    Sphinx
-dependent-scripts = true
-
 # XXX-Antoine: here's what I did using hexagonit.recipe.cmmi.
 # and it wasn't working !
 #[mydumper]
@@ -78,4 +75,3 @@ dependent-scripts = true
 #environment=
 #    PATH=$PATH:${buildout:bin-directory}
 #    PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
-

component/nginx/buildout.cfg

+[buildout]
+extends =
+  ../pcre/buildout.cfg
+  ../zlib/buildout.cfg
+  ../openssl/buildout.cfg
+
+parts = nginx
+
+[nginx]
+recipe = hexagonit.recipe.cmmi
+url = http://nginx.org/download/nginx-1.0.14.tar.gz
+configure-options=
+  --with-ipv6
+  --with-http_ssl_module
+  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
+  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
+

component/noVNC/buildout.cfg

@@ -4,5 +4,6 @@ parts =
 
 [noVNC]
 recipe = slapos.recipe.build:download-unpacked
-url = https://github.com/kanaka/noVNC/tarball/v0.2
+url = http://cloud.github.com/downloads/kanaka/noVNC/novnc-0.3.tar.gz
+md5sum = 95d3c58921fa188c179491e8ef2acc12
 strip-top-level-dir = true

component/nodejs/buildout.cfg

@@ -3,23 +3,40 @@ extends =
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../openssl/buildout.cfg
-  ../python-2.7/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
   nodejs
 
 [nodejs]
+<= nodejs-0.8
+
+[nodejs-0.8]
+# Server-side Javascript.
+recipe = hexagonit.recipe.cmmi
+url = http://nodejs.org/dist/v0.8.8/node-v0.8.8.tar.gz
+md5sum = f4dae84e96a94b768404c14633bccd49
+configure-options =
+  --openssl-includes=${openssl:location}/include
+  --openssl-libpath=${openssl:location}/lib
+environment =
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[nodejs-0.6]
 # Server-side Javascript.
 recipe = hexagonit.recipe.cmmi
-url = http://nodejs.org/dist/v0.6.19/node-v0.6.19.tar.gz
-md5sum = f5669a9717422b811c6bad1cc961b1e5
+url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz
+md5sum = 0da985a0bf820400af92363b9f453fe4
 configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib
 environment =
   HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -32,7 +49,7 @@ configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib
 environment =
-  PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/openssl/buildout.cfg

@@ -7,6 +7,7 @@
 extends =
   ../ca-certificates/buildout.cfg
   ../zlib/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   openssl
@@ -30,6 +31,7 @@ download-only = true
 recipe = hexagonit.recipe.cmmi
 url = https://www.openssl.org/source/openssl-1.0.1c.tar.gz
 md5sum = ae412727c8c15b67880aef7bd2999b2e
+patch-binary = ${patch:location}/bin/patch
 patches =
   ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}
   ${openssl-exlibs.patch:location}/${openssl-exlibs.patch:filename}

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.31.tar.bz2
+md5sum = 1c9a276af932b5599157f96e945391f0
 configure-options =
   --disable-static
-  --enable-utf8
   --enable-unicode-properties

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.7
+url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
+md5sum = 12b096cf027395f0bf085f7314f95886
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/perl/buildout.cfg

@@ -16,9 +16,9 @@ filename = ${:_buildout_section_name_}
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 5.16.0
+version = 5.16.2
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 15a2f95fb27231e10998240f13acf961
+md5sum = 2818ab01672f005a4e552a713aa27b08
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =

component/pkgconfig/buildout.cfg

@@ -11,8 +11,8 @@ extends =
 
 [pkgconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://pkgconfig.freedesktop.org/releases/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.

component/python-setuptools/buildout.cfg

+[buildout]
+parts = python-setuptools
+
+[setuptools-download]
+recipe = slapos.recipe.download
+filename = setuptools-0.6c11-py2.7.egg
+url = http://pypi.python.org/packages/2.7/s/setuptools/${:filename}
+md5sum = fe1f997bc722265116870bc7919059ea
+
+[python-setuptools]
+# Hack to manually install setuptools outside of the Buildout environment.
+# It is useful in case of using things like "python setup.py test" in eggs
+# downloaded from source (so not using bildout magic).
+# To be able to use it, you should in your instance do an:
+# export PYTHONPATH=${:location} (defined in ${:environment})
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+environment = export PATH=${python2.7:location}/bin:$PATH; export PYTHONPATH=${:location};
+stop-on-error = true
+recipe = plone.recipe.command
+update = true
+command = ${:environment} (mkdir ${:location}; sh ${setuptools-download:location}/${setuptools-download:filename} --install-dir ${:location}) || (rm -fr ${:location}; exit 1)

component/rpm2cpio/buildout.cfg

@@ -4,5 +4,5 @@ parts =
 
 [rpm2cpio]
 recipe = slapos.recipe.build:download
-url = http://ruda.googlecode.com/hg-history/2989f0531de63872cc7327590798d1898ac91246/rpm/rpm2cpio.py
+url = https://raw.github.com/ruda/rpm2cpio/e196173f1f6b746463b7398e381b94a42edfa345/rpm2cpio.py
 md5sum = c5bb6227d99e1ff5df880f997cbed2e3

component/ruby/buildout.cfg

+[buildout]
+
+extends =
+  ../libyaml/buildout.cfg
+
+parts = ruby
+
+[ruby-1.9.3]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.3-p194.tar.gz
+md5sum = bc0c715c69da4d1d8bd57069c19f6c0e
+configure-options =
+  --enable-shared --enable-rpath
+environment =
+  CFLAGS=-I${libyaml:location}/include
+  LDFLAGS=-L${libyaml:location}/lib -Wl,-rpath=${libyaml:location}/lib
+
+[ruby-1.9]
+<= ruby-1.9.3
+
+[ruby]
+<= ruby-1.9

component/slapos/buildout.cfg

+# This file is used to install SlapOS Node itself.
+
 [buildout]
 extends =
   ../../stack/shacache-client.cfg
@@ -19,6 +21,7 @@ extends =
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
   ../zlib/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   slapos
@@ -47,7 +50,7 @@ allowed-eggs-from-site-packages =
 [environment]
 # Note: For now original PATH is appeneded to the end, as not all tools are
 #       provided by SlapOS
-PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:$PATH
+PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:${patch:location}/bin:$PATH
 CFLAGS=-I${bzip2:location}/include -I${gdbm:location}/include -I${gettext:location}/include -I${glib:location}/include -I${libxml2:location}/include -I${libxslt:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${popt:location}/include -I${readline:location}/include -I${sqlite3:location}/include -I${zlib:location}/include
 CPPFLAGS=${:CFLAGS}
 LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
@@ -110,53 +113,50 @@ scripts =
   slapgrid-supervisorctl = slapos.grid.svcbackend:supervisorctl
   slapgrid-supervisord = slapos.grid.svcbackend:supervisord
   slapproxy = slapos.proxy:main
+  slapos = slapos.entry:main
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-006
-hexagonit.recipe.download = 1.5.1-dev-slapos-002
+zc.buildout = 1.6.0-dev-SlapOS-008
+
 
-# Generated by buildout-versions
 Jinja2 = 2.6
-Pygments = 1.5
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
-docutils = 0.9.1
 hexagonit.recipe.cmmi = 1.6
-ipython = 0.13
-lxml = 2.3.4
-meld3 = 0.6.8
-netaddr = 0.7.7
-slapos.core = 0.26.1
-slapos.libnetworkcache = 0.12
+lxml = 2.3.5
+meld3 = 0.6.9
+netaddr = 0.7.10
+slapos.core = 0.29
+slapos.libnetworkcache = 0.13.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.29
 Flask = 0.9
 
 # Required by:
-# netaddr==0.7.7
-Sphinx = 1.1.3
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.29
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.26.1
-# slapos.libnetworkcache==0.12
-# supervisor==3.0a12
+# slapos.core==0.29
+# slapos.libnetworkcache==0.13.2
+# supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-006
 # zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.26.1
-supervisor = 3.0a12
+# slapos.core==0.29
+supervisor = 3.0b1
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.29
 zope.interface = 4.0.1

component/sphinx/README

+This component is not used anymore - but might be revived within 4 months.
+If not used within 6 months, feel free to delete this.

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-3071401.tar.gz
+md5sum = 4cf3fd434bbb6e50777019ff3507bfa5
 configure-options =
   --disable-static
   --enable-readline

component/stunnel/buildout.cfg

@@ -17,8 +17,8 @@ filename = stunnel-4-hooks.py
 
 [stunnel-4]
 recipe = hexagonit.recipe.cmmi
-url = http://mirror.bit.nl/stunnel/stunnel-4.53.tar.gz
-md5sum = ab3bfc915357d67da18c73f73610d593
+url = ftp://ftp.stunnel.org/stunnel/archive/4.x/stunnel-4.54.tar.gz
+md5sum = c2b1db99e3ed547214568959a8ed18ac
 pre-configure-hook = ${stunnel-4-hook-download:location}/${stunnel-4-hook-download:filename}:pre_configure_hook
 configure-options =
   --enable-ipv6

component/tar/buildout.cfg

+[buildout]
+
+parts = tar
+
+[tar-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 9352820566aa3534a04bd269c9f89f48
+download-only = true
+filename = drop.gets.patch
+
+[tar]
+virtual-depends = ${tar-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${tar-drop.gets.patch:location}/${tar-drop.gets.patch:filename}
+
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz
+md5sum = 00d1e769c6af702c542cca54b728920d
+environment =
+  FORCE_UNSAFE_CONFIGURE=1

component/tar/drop.gets.patch

+diff -ur tar-1.26.orig/gnu/stdio.in.h tar-1.26/gnu/stdio.in.h
+--- tar-1.26.orig/gnu/stdio.in.h	2011-03-12 10:14:33.000000000 +0100
++++ tar-1.26/gnu/stdio.in.h	2012-08-24 15:35:22.299190847 +0200
+@@ -164,7 +164,10 @@
+    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@

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

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]

component/xz-utils/buildout.cfg

+[buidout]
+parts =
+  xz-utils
+
+[xz-utils]
+recipe = hexagonit.recipe.cmmi
+url = http://tukaani.org/xz/xz-5.0.4.tar.gz
+md5sum = df3df690aef18384e1e031be7ec3a964

component/zabbix/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [zabbix-agent]
 recipe = hexagonit.recipe.cmmi
-url = http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.10.tar.gz?download
-md5sum = 7e89f80c1822787c0831f7c0dbefcd7b
+url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.1.tar.gz?download
+md5sum = 3b301aa4f2b7cb5ede46884b9c7873e1
 configure-options =
   --enable-agent
   --enable-ipv6

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.59-dev'
+version = '0.67-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -46,97 +46,113 @@ setup(name=name,
           'apachephp = slapos.recipe.apachephp:Recipe',
           'apacheproxy = slapos.recipe.apacheproxy:Recipe',
           'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
-          'certificate_authority = slapos.recipe.certificate_authority:Recipe',
           'certificate_authority.request = slapos.recipe.certificate_authority:Request',
+          'certificate_authority = slapos.recipe.certificate_authority:Recipe',
           'check_port_listening = slapos.recipe.check_port_listening:Recipe',
           'check_url_available = slapos.recipe.check_url_available:Recipe',
+          'check_page_content = slapos.recipe.check_page_content:Recipe',
           'cloud9 = slapos.recipe.cloud9:Recipe',
-          'cron = slapos.recipe.dcron:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
+          'cron = slapos.recipe.dcron:Recipe',
           'davstorage = slapos.recipe.davstorage:Recipe',
-          'dropbear = slapos.recipe.dropbear:Recipe',
+          'downloader = slapos.recipe.downloader:Recipe',
           'dropbear.add_authorized_key = slapos.recipe.dropbear:AddAuthorizedKey',
           'dropbear.client = slapos.recipe.dropbear:Client',
+          'dropbear = slapos.recipe.dropbear:Recipe',
           'duplicity = slapos.recipe.duplicity:Recipe',
-          'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
+          'egg_test = slapos.recipe.erp5_test:EggTestRecipe',
           'equeue = slapos.recipe.equeue:Recipe',
+          'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
+          'erp5.promise = slapos.recipe.erp5_promise:Recipe',
+          'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
+          'erp5.test = slapos.recipe.erp5_test:Recipe',
+          'erp5.update = slapos.recipe.erp5_update:Recipe',
+          'firefox = slapos.recipe.firefox:Recipe',
+          'fontconfig = slapos.recipe.fontconfig:Recipe',
           'generate.mac = slapos.recipe.generatemac:Recipe',
           'generate.password = slapos.recipe.generatepassword:Recipe',
-          'nbdserver = slapos.recipe.nbdserver:Recipe',
-          'onetimeupload = slapos.recipe.onetimeupload:Recipe',
-          'helloworld = slapos.recipe.helloworld:Recipe',
           'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
           'cloudooo.test = slapos.recipe.cloudooo_test:Recipe',
-          'firefox = slapos.recipe.firefox:Recipe',
-          'fontconfig = slapos.recipe.fontconfig:Recipe',
+          'ipv6toipv4 = slapos.recipe.6tunnel:SixToFour',
+          'ipv4toipv6 = slapos.recipe.6tunnel:FourToSix',
+          'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
+          'generic.memcached = slapos.recipe.generic_memcached:Recipe',
+          'generic.mysql = slapos.recipe.generic_mysql:Recipe',
+          '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',
+          'gitinit = slapos.recipe.gitinit:Recipe',
+          'haproxy = slapos.recipe.haproxy:Recipe',
+          'helloworld = slapos.recipe.helloworld:Recipe',
           'java = slapos.recipe.java:Recipe',
           'kumofs = slapos.recipe.kumofs:Recipe',
-          'kvm = slapos.recipe.kvm:Recipe',
           'kvm.frontend = slapos.recipe.kvm_frontend:Recipe',
-          'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
-          'haproxy = slapos.recipe.haproxy:Recipe',
-          'libcloud = slapos.recipe.libcloud:Recipe',
+          'kvm = slapos.recipe.kvm:Recipe',
+          'lamp.request = slapos.recipe.lamp:Request',
+          'lamp.simple = slapos.recipe.lamp:Simple',
+          'lamp = slapos.recipe.lamp:Request',
+          'lamp.static = slapos.recipe.lamp:Static',
           'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
+          'libcloud = slapos.recipe.libcloud:Recipe',
           'lockfile = slapos.recipe.lockfile:Recipe',
+          'logrotate.d = slapos.recipe.logrotate:Part',
+          'logrotate = slapos.recipe.logrotate:Recipe',
           'memcached = slapos.recipe.memcached:Recipe',
-          'generic.memcached = slapos.recipe.generic_memcached:Recipe',
-          'mysql = slapos.recipe.mysql:Recipe',
-          'mydumper = slapos.recipe.mydumper:Recipe',
-          'generic.mysql = slapos.recipe.generic_mysql:Recipe',
           'mkdirectory = slapos.recipe.mkdirectory:Recipe',
+          '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',
           'notifier.notify = slapos.recipe.notifier:Notify',
+          'notifier = slapos.recipe.notifier:Recipe',
           'novnc = slapos.recipe.novnc:Recipe',
-          'lamp = slapos.recipe.lamp:Request',
-          'lamp.request = slapos.recipe.lamp:Request',
-          'lamp.static = slapos.recipe.lamp:Static',
-          'lamp.simple = slapos.recipe.lamp:Simple',
-          'logrotate = slapos.recipe.logrotate:Recipe',
-          'logrotate.d = slapos.recipe.logrotate:Part',
+          'onetimeupload = slapos.recipe.onetimeupload:Recipe',
           'pbs = slapos.recipe.pbs:Recipe',
+          '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',
-          'proactive = slapos.recipe.proactive:Recipe',
+          'requestoptional = slapos.recipe.requestoptional:Recipe',
           'request = slapos.recipe.request:Recipe',
+          'request.serialised = slapos.recipe.request:Serialised',
           'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
-          'shell = slapos.recipe.shell:Recipe',
           'shellinabox = slapos.recipe.shellinabox:Recipe',
-          'slapconfiguration = slapos.recipe.slapconfiguration:Recipe',
-          'symbolic.link = slapos.recipe.symbolic_link:Recipe',
-          'softwaretype = slapos.recipe.softwaretype:Recipe',
-          'siptester = slapos.recipe.siptester:SipTesterRecipe',
+          'shell = slapos.recipe.shell:Recipe',
+          'signalwrapper= slapos.recipe.signal_wrapper:Recipe',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
-          'slaprunner = slapos.recipe.slaprunner: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:Recipe',
           'slapreport = slapos.recipe.slapreport:Recipe',
-          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
-          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
+          'slaprunner = slapos.recipe.slaprunner:Recipe',
+          'softwaretype = slapos.recipe.softwaretype:Recipe',
           'sphinx= slapos.recipe.sphinx:Recipe',
+          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
+          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
           'stunnel = slapos.recipe.stunnel:Recipe',
+          'symbolic.link = slapos.recipe.symbolic_link:Recipe',
           'testnode = slapos.recipe.testnode:Recipe',
+          'tidstorage = slapos.recipe.tidstorage:Recipe',
           'urlparse = slapos.recipe._urlparse:Recipe',
+          'uuid = slapos.recipe._uuid:Recipe',
           'vifib = slapos.recipe.vifib:Recipe',
           'waitfor = slapos.recipe.waitfor:Recipe',
+          'webchecker = slapos.recipe.web_checker:Recipe',
+          'wrapper = slapos.recipe.wrapper:Recipe',
           'xvfb = slapos.recipe.xvfb:Recipe',
           'xwiki = slapos.recipe.xwiki:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
-          'generic.zope = slapos.recipe.generic_zope:Recipe',
-          'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',
           'zeo = slapos.recipe.zeo:Recipe',
-          'tidstorage = slapos.recipe.tidstorage:Recipe',
-          'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
-          'erp5.promise = slapos.recipe.erp5_promise:Recipe',
-          'erp5.update = slapos.recipe.erp5_update:Recipe',
-          'erp5.test = slapos.recipe.erp5_test:Recipe',
-          'generic.varnish = slapos.recipe.generic_varnish:Recipe',
-          'webchecker = slapos.recipe.web_checker:Recipe',
-          'signalwrapper= slapos.recipe.signal_wrapper:Recipe',
         ],
         'slapos.recipe.nosqltestbed.plugin': [
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

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'

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

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

slapos/recipe/cloudooo_test/__init__.py → slapos/recipe/_uuid.py

@@ -24,28 +24,32 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+
+import uuid
+
+import os
+
 from slapos.recipe.librecipe import GenericBaseRecipe
-import urlparse
 
 class Recipe(GenericBaseRecipe):
-  def install(self):
-    path_list = []
-    common_dict = dict(
-        prepend_path=self.options['prepend-path'],
-    )
-    common_list = [
-           "--paster_path", self.options['ooo-paster'],
-           self.options['configuration-file']
-          ]
-    run_unit_test_path = self.createPythonScript(self.options['run-unit-test'],
-        __name__ + '.test.runUnitTest', [dict(
-        call_list=[self.options['run-unit-test-binary'],
-          ] + common_list, **common_dict)])
-
-    path_list.append(run_unit_test_path)
-    path_list.append(self.createPythonScript(self.options['run-test-suite'],
-        __name__ + '.test.runTestSuite', [dict(
-        call_list=[self.options['run-test-suite-binary'],
-          ], **common_dict)]))
-
-    return path_list
+
+    def _options(self, options):
+        write = True
+        if os.path.exists(options['cache-file']):
+            with open(options['cache-file'], 'r') as cache_file:
+                try:
+                    generated_uuid = uuid.UUID(hex=cache_file.read())
+                    write = False
+                except ValueError:
+                    generated_uuid = uuid.uuid4()
+        else:
+            generated_uuid = uuid.uuid4()
+
+        if write:
+            with open(options['cache-file'], 'w') as cache_file:
+                cache_file.write(generated_uuid.hex)
+
+        options['uuid'] = generated_uuid.hex
+
+    def install(self):
+        return []

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,
+          },
+        ],
+      ),
+    ]

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

slapos/recipe/apache_zope_backend/template/snippet.ssl.in

-
-# SSL Configuration
-SSLEngine on
 SSLCertificateFile %(certificate)s
 SSLCertificateKeyFile %(key)s
 SSLRandomSeed startup builtin

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>

slapos/recipe/check_page_content/__init__.py

+##############################################################################
+#
+# Copyright (c) 2011 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
+import sys
+
+class Recipe(GenericBaseRecipe):
+  """
+  Create script that will check if content at "url" is available 
+  (e.g page has a link to itself).
+  """
+
+  def install(self):
+    config = {
+      'url': self.options['url'],
+      'shell_path': self.options['dash_path'],
+      'curl_path': self.options['curl_path'],
+    }
+
+    # XXX-Cedric in this script, curl won't check certificate
+    promise = self.createExecutable(
+      self.options['path'],
+      self.substituteTemplate(self.getTemplateFilename('check_page_content.in'), config)
+    )
+
+    return [promise]

slapos/recipe/check_page_content/template/check_page_content.in

+#!%(shell_path)s
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+URL="%(url)s"
+
+if [ -z $URL ]; then
+  echo "No URL specified." >&2
+  exit 3
+fi
+
+%(curl_path)s -k -sL $URL | grep "$URL" > /dev/null
+
+if [ $? != 0 ]; then
+  echo "Content at $URL seems to be corrupted" >&2
+  exit 1
+fi

slapos/recipe/check_url_available/template/check_url.in

@@ -3,14 +3,25 @@
 # BEWARE: It will be overwritten automatically
 
 URL="%(url)s"
+
+if [ -z $URL ]; then
+  echo "No URL specified." >&2
+  exit 3
+fi
+
 CODE=$(%(curl_path)s -k -sL $URL -w %%{http_code} -o /dev/null)
 
+if [ ! $CODE ]; then
+  echo "$URL is not available (server not reachable)." >&2
+  exit 1
+fi
+
 if [ $CODE -eq 000 ]; then
-  echo "$URL is not available (server not reachable)" >&2
+  echo "$URL is not available (server not reachable)." >&2
   exit 1
 fi
 
 if ! [ $CODE -eq 200 ]; then
-  echo "$URL is not available (returned $CODE)" >&2
+  echo "$URL is not available (returned $CODE)." >&2
   exit 2
 fi

slapos/recipe/container.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import ConfigParser
+import uuid
+import os
+import subprocess
+
+# XXX : This is in order to get the computer_partition object
+#       which exposes the state of the current partition.
+#
+# XXX : We could have modify slapgrid in order to put the
+#       state of the current partition offline. But this is
+#       written to have the most minimal impact.
+from slapos.recipe.librecipe import GenericSlapRecipe
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericSlapRecipe):
+
+    def _options(self, options):
+        config_filename = self.options['config']
+
+        container_uuid = None
+
+        if os.path.exists(config_filename):
+            config = ConfigParser.ConfigParser()
+            config.read(config_filename)
+            if config.has_option('requested', 'name'):
+                container_uuid = uuid.UUID(hex=config.get('requested', 'name'))
+
+        if container_uuid is None:
+            # uuid wasn't generated at first in order to avoid
+            # wasting entropy
+            container_uuid = uuid.uuid4()
+
+        options['slapcontainer-name'] = container_uuid.hex
+
+        return options
+
+
+
+    def _install(self):
+        path_list = []
+
+        self.logger.info("Putting slapcontainer configuration file...")
+
+        config = ConfigParser.ConfigParser()
+        config.add_section('requested')
+        config.set('requested', 'status',
+                   self.computer_partition.getState())
+        config.set('requested', 'name', self.options['slapcontainer-name'])
+        config.add_section('rootfs')
+        config.set('rootfs', 'image', self.options['image'])
+        config.set('rootfs', 'complete', self.options['image-complete'])
+        config.add_section('network')
+        config.set('network', 'interface', self.options['interface'])
+        config.add_section('config')
+        config.set('config', 'file', self.options['lxc-config'])
+
+        # Just a touch
+        open(self.options['lxc-config'], 'a').close()
+
+        config_filename = self.options['config']
+        with open(config_filename, 'w') as config_file:
+            config.write(config_file)
+        path_list.append(config_filename)
+
+        return path_list

slapos/recipe/downloader.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+import urllib
+import hashlib
+import tempfile
+import shutil
+import subprocess
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+BUFFER_SIZE = 1024
+
+def service(args):
+    environ = os.environ.copy()
+    environ.update(PATH=args['path'])
+    if not os.path.exists(args['confirm']):
+        tmpdir = tempfile.mkdtemp()
+        try:
+            # XXX: Hardcoded path
+            tmpoutput = os.path.join(tmpdir, 'downloaded')
+            urllib.urlretrieve(args['url'], tmpoutput)
+
+            if args['md5'] is not None:
+                # XXX: we need to find a better way to do a md5sum
+                md5sum = hashlib.md5()
+                with open(args['output'], 'r') as output:
+                    file_buffer = output.read(BUFFER_SIZE)
+                    while len(file_buffer) > 0:
+                        md5sum.update(file_buffer)
+                        file_buffer = output.read(BUFFER_SIZE)
+
+                if args['md5'] != md5sum.hexdigest():
+                    return 127 # Not-null return code
+
+            if not args['archive']:
+                shutil.move(tmpoutput, args['output'])
+            else:
+                # XXX: hardcoding path
+                extract_dir = os.path.join(tmpdir, 'extract')
+                os.mkdir(extract_dir)
+                subprocess.check_call(
+                    ['tar', '-x', '-f', tmpoutput,
+                            '-C', extract_dir,
+                    ],
+                    env=environ,
+                )
+                archive_content = os.listdir(extract_dir)
+                if len(archive_content) == 1 and \
+                   os.path.isfile(os.path.join(extract_dir,
+                                               archive_content[0])):
+                    shutil.move(os.path.join(extract_dir,
+                                             archive_content[0]),
+                              args['output'])
+                else:
+                    return 127 # Not-null return code
+
+        finally:
+            shutil.rmtree(tmpdir)
+
+        # Just a touch on args['confirm'] file
+        open(args['confirm'], 'w').close()
+
+    return 0
+
+
+
+class Recipe(GenericBaseRecipe):
+
+    def install(self):
+        path_list = []
+
+        md5sum = self.options.get('md5sum', '')
+        if len(md5sum) == 0:
+            md5sum = None
+
+        keywords = {
+            'url': self.options['url'],
+            'md5': md5sum,
+            'output': self.options['downloaded-file'],
+            'confirm': self.options['downloaded-file-complete'],
+            'archive': self.optionIsTrue('archive', False),
+        }
+        if keywords['archive']:
+            keywords['path'] = self.options['path']
+        path_list.append(
+            self.createPythonScript(
+                self.options['binary'],
+                'slapos.recipe.downloader.service',
+                keywords,
+            )
+        )
+
+        return path_list

slapos/recipe/erp5_test/__init__.py

@@ -27,6 +27,9 @@
 from slapos.recipe.librecipe import GenericBaseRecipe
 import urlparse
 
+# The follow recipes should be unified somehow in order to improve
+# code mantainence.
+
 class Recipe(GenericBaseRecipe):
   def install(self):
     testinstance = self.options['test-instance-path']
@@ -72,3 +75,62 @@ class Recipe(GenericBaseRecipe):
           ] + common_list, **common_dict)]))
 
     return path_list
+
+class CloudoooRecipe(GenericBaseRecipe):
+  def install(self):
+    path_list = []
+    common_dict = dict(
+        prepend_path=self.options['prepend-path'],
+    )
+    common_list = [
+           "--paster_path", self.options['ooo-paster'],
+           self.options['configuration-file']
+          ]
+    run_unit_test_path = self.createPythonScript(self.options['run-unit-test'],
+        __name__ + '.test.runUnitTest', [dict(
+        call_list=[self.options['run-unit-test-binary'],
+          ] + common_list, **common_dict)])
+
+    path_list.append(run_unit_test_path)
+    path_list.append(self.createPythonScript(self.options['run-test-suite'],
+        __name__ + '.test.runTestSuite', [dict(
+        call_list=[self.options['run-test-suite-binary'],
+          ], **common_dict)]))
+
+    return path_list
+
+class EggTestRecipe(GenericBaseRecipe):
+  """
+  Recipe used to create wrapper used to run test suite (python setup.py test)
+  off a list of Python eggs.
+  """
+  def install(self):
+    path_list = []
+    test_list = self.options['test-list'].strip().replace('\n', ',')
+    common_dict = {}
+
+    environment_dict = {}
+    if self.options.get('environment'):
+      environment_part = self.buildout.get(self.options['environment'])
+      if environment_part:
+        for key, value in environment_part.iteritems():
+          environment_dict[key] = value
+
+    common_list = [ "--source_code_path_list", test_list]
+
+    argument_dict = dict(
+        call_list=[self.options['run-test-suite-binary'],] + common_list,
+        environment=environment_dict,
+        **common_dict
+    )
+    if 'prepend-path' in self.options:
+      argument_dict['prepend_path'] = self.options['prepend-path']
+
+    run_test_suite_script = self.createPythonScript(
+        self.options['run-test-suite'], __name__ + '.test.runTestSuite',
+        [argument_dict]
+    )
+
+    path_list.append(run_test_suite_script)
+
+    return path_list

slapos/recipe/erp5_test/test.py

@@ -29,11 +29,20 @@ import sys
 def runTestSuite(args):
   env = os.environ.copy()
   d = args[0]
-  env['OPENSSL_BINARY'] = d['openssl_binary']
-  env['TEST_CA_PATH'] = d['test_ca_path']
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
-  env['INSTANCE_HOME'] = d['instance_home']
-  env['REAL_INSTANCE_HOME'] = d['instance_home']
+  if 'openssl_binary' in d:
+    env['OPENSSL_BINARY'] = d['openssl_binary']
+  if 'test_ca_path' in d:
+    env['TEST_CA_PATH'] = d['test_ca_path']
+  if 'prepend_path' in d:
+    env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
+  if 'instance_home' in d:
+    env['INSTANCE_HOME'] = d['instance_home']
+    env['REAL_INSTANCE_HOME'] = d['instance_home']
+
+  # If defined, will add (and replace if existing) envvars to environment.
+  if 'environment' in d:
+    env.update(d['environment'])
+
   # Deal with Shebang size limitation
   executable_filepath = d['call_list'][0]
   file_object = open(executable_filepath, 'r')
@@ -51,11 +60,15 @@ def runTestSuite(args):
 def runUnitTest(args):
   env = os.environ.copy()
   d = args[0]
-  env['OPENSSL_BINARY'] = d['openssl_binary']
-  env['TEST_CA_PATH'] = d['test_ca_path']
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
-  env['INSTANCE_HOME'] = d['instance_home']
-  env['REAL_INSTANCE_HOME'] = d['instance_home']
+  if 'openssl_binary' in d:
+    env['OPENSSL_BINARY'] = d['openssl_binary']
+  if 'test_ca_path' in d:
+    env['TEST_CA_PATH'] = d['test_ca_path']
+  if 'prepend_path' in d:
+    env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
+  if 'instance_home' in d:
+    env['INSTANCE_HOME'] = d['instance_home']
+    env['REAL_INSTANCE_HOME'] = d['instance_home']
   # Deal with Shebang size limitation
   executable_filepath = d['call_list'][0]
   file_object = open(executable_filepath, 'r')

slapos/recipe/fontconfig/__init__.py

@@ -77,7 +77,7 @@ class Recipe(GenericBaseRecipe):
       onetimedownload_config['url'] = url
       onetimedownload_config['file_path'] = file_path
       onetimedownload_runner_path = self.createExecutable(bin_path,
-          self.substituteTemplate(wrapper_template_location, 
+          self.substituteTemplate(wrapper_template_location,
                                   onetimedownload_config))
 
       created_file_list.append(onetimedownload_runner_path)

slapos/recipe/generic_kumofs/__init__.py

@@ -30,11 +30,6 @@ from slapos.recipe.librecipe import GenericBaseRecipe
 class Recipe(GenericBaseRecipe):
   def install(self):
     ip = self.options['ip']
-    address_family = self.options.get('address-family', 'inet4')
-    if address_family == 'inet6':
-      ip = '[' + ip + ']'
-    elif address_family != 'inet4':
-      raise ValueError('Unsupported address family: %r' % (address_family, ))
     kumo_manager_port = int(self.options['manager-port'])
     kumo_server_port = int(self.options['server-port'])
     kumo_server_listen_port = int(self.options['server-listen-port'])

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

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

@@ -24,7 +24,7 @@ long_query_time = 1
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so;handlersocket.so
+plugin-load = ha_mroonga.so;handlersocket.so
 
 # By default only 100 connections are allowed, when using zeo
 # we may have much more connections

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

slapos/recipe/cloudooo_test/test.py → slapos/recipe/gitinit.py

@@ -24,41 +24,26 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+import json
 import os
-import sys
-def runTestSuite(args):
-  env = os.environ.copy()
-  d = args[0]
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
-  # Deal with Shebang size limitation
-  executable_filepath = d['call_list'][0]
-  file_object = open(executable_filepath, 'r')
-  line = file_object.readline()
-  file_object.close()
-  argument_list = []
-  if line[:2] == '#!':
-    executable_filepath = line[2:].strip()
-    argument_list.append(executable_filepath)
-  argument_list.extend(d['call_list'])
-  argument_list.extend(sys.argv[1:])
-  argument_list.append(env)
-  os.execle(executable_filepath, *argument_list)
 
-def runUnitTest(args):
-  env = os.environ.copy()
-  d = args[0]
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
-  # Deal with Shebang size limitation
-  executable_filepath = d['call_list'][0]
-  file_object = open(executable_filepath, 'r')
-  line = file_object.readline()
-  file_object.close()
-  argument_list = []
-  if line[:2] == '#!':
-    executable_filepath = line[2:].strip()
-    argument_list.append(executable_filepath)
-  argument_list.extend(d['call_list'])
-  argument_list.extend(sys.argv[1:])
-  argument_list.append(env)
-  os.execle(executable_filepath, *argument_list)
+from subprocess import check_call
 
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+    def install(self):
+
+        repolist = json.loads(self.options['repos'])
+        for repo, desc in repolist.iteritems():
+            absolute_path = os.path.join(self.options['base-directory'], '%s.git' % repo)
+            if not os.path.exists(absolute_path):
+                check_call([self.options['git-binary'], 'init',
+                            '--bare', absolute_path])
+                # XXX: Hardcoded path
+                description_filename = os.path.join(absolute_path, 'description')
+                with open(description_filename, 'w') as description_file:
+                    description_file.write(desc)
+
+        return []

slapos/recipe/haproxy/__init__.py

@@ -66,36 +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']
-    for address in self.options['backend-list'].split():
-      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]

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

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
-

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

slapos/recipe/kumofs/__init__.py

@@ -43,15 +43,15 @@ class Recipe(BaseSlapRecipe):
     # XXX-Cedric : add logrotate?
     self.cron_d = self.installCrond()
     kumo_conf = self.installKumo(self.getLocalIPv4Address())
-    
+
     ca_conf = self.installCertificateAuthority()
     key, certificate = self.requestCertificate('Login Based Access')
-    
+
     stunnel_conf = self.installStunnel(self.getGlobalIPv6Address(),
         self.getLocalIPv4Address(), 12345, kumo_conf['kumo_gateway_port'],
         certificate, key, ca_conf['ca_crl'],
         ca_conf['certificate_authority_path'])
-    
+
     self.linkBinary()
     self.setConnectionDict(dict(
       stunnel_ip = stunnel_conf['public_ip'],
@@ -80,7 +80,7 @@ class Recipe(BaseSlapRecipe):
       os.symlink(target, link)
       self.logger.debug('Created link %r -> %r' % (link, target))
       self.path_list.append(link)
-  
+
 
   def installCrond(self):
     timestamps = self.createDataDirectory('cronstamps')
@@ -103,7 +103,7 @@ class Recipe(BaseSlapRecipe):
       )[0]
     self.path_list.append(wrapper)
     return cron_d
-  
+
   def installLogrotate(self):
     """Installs logortate main configuration file and registers its to cron"""
     logrotate_d = os.path.abspath(os.path.join(self.etc_directory,

slapos/recipe/kvm_frontend/__init__.py

@@ -26,6 +26,7 @@
 ##############################################################################
 from slapos.recipe.librecipe import GenericBaseRecipe, GenericSlapRecipe
 import json
+import traceback
 import zc.buildout
 
 class Recipe(GenericSlapRecipe):
@@ -127,11 +128,15 @@ class Recipe(GenericSlapRecipe):
     # Send connection parameters of slave instances
     site_url = "https://%s:%s/" % (self.options['domain'], self.options['port'])
     for slave in rewrite_rule_list:
-      self.setConnectionDict(
-          dict(url="%s%s" % (site_url, slave['resource']),
-               domainname=self.options['domain'],
-               port=self.options['port'],
-               resource=slave['resource']),
-          slave['reference'])
+      try:
+        self.setConnectionDict(
+            dict(url="%s%s" % (site_url, slave['resource']),
+                 domainname=self.options['domain'],
+                 port=str(self.options['port']),
+                 resource=slave['resource']),
+            slave['reference'])
+      except:
+        self.logger.fatal("Error while sending slave %s informations: %s",
+           slave['reference'], traceback.format_exc())
 
     return [map_file, conf_file, runner_path]

slapos/recipe/lamp/__init__.py

@@ -158,7 +158,7 @@ class BaseRecipe(BaseSlapRecipe):
     open(destination, 'w').write(open(template, 'r').read() % d)
 
   def configureInstallation(self, document_root, url, mysql_conf):
-    """Start process which can launch python scripts, move or remove files or 
+    """Start process which can launch python scripts, move or remove files or
     directories when installing software.
     """
     if not self.options.has_key('delete') and not self.options.has_key('rename') and not\
@@ -179,7 +179,7 @@ class BaseRecipe(BaseSlapRecipe):
     else:
       argument = argument + ["-f", self.options['file_token'].strip()]
     argument += ["-t", document_root]
-    
+
     if self.options.has_key('delete'):
       delete = ["delete"]
       for fname in self.options['delete'].split(','):
@@ -231,7 +231,7 @@ class Simple(BaseRecipe):
     url = self.installApache(document_root)
     renamed = self.configureInstallation(document_root, url, mysql_conf)
     connectionDict = dict(
-      url=url,      
+      url=url,
       **mysql_conf
     )
     if not renamed == "":

slapos/recipe/lamp/runner.py

 import sys
 import subprocess
-    
+
 def executeRunner(args):
-  """Start the instance configure. this may run a python script, move or/and rename 
+  """Start the instance configure. this may run a python script, move or/and rename
   file or directory when dondition is filled. the condition may be when file exist or when an entry
   exist into database.
   """

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

@@ -21,7 +21,7 @@ long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so
+plugin-load = ha_mroonga.so
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

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.*"""
 

slapos/recipe/librecipe/execute.py

@@ -47,15 +47,13 @@ def _wait_files_creation(file_list):
 
 def execute(args):
   """Portable execution with process replacement"""
-  # Note: Candidate for slapos.lib.recipe
-  os.execv(args[0], args + sys.argv[1:])
+  # XXX: Kept for backward compatibility
+  generic_exec([args, None, None])
 
 def execute_wait(args):
   """Execution but after all files in args[1] exists"""
-  exec_list = list(args[0])
-  file_list = list(args[1])
-  _wait_files_creation(file_list)
-  os.execv(exec_list[0], exec_list + sys.argv[1:])
+  # XXX: Kept for backward compatibility
+  generic_exec([args[0], args[1], None])
 
 
 child_pg = None
@@ -63,23 +61,27 @@ child_pg = None
 
 def executee(args):
   """Portable execution with process replacement and environment manipulation"""
-  exec_list = list(args[0])
-  environment = args[1]
-  env = os.environ.copy()
-  for k,v in environment.iteritems():
-    env[k] = v
-  os.execve(exec_list[0], exec_list + sys.argv[1:], env)
+  # XXX: Kept for backward compatibility
+  generic_exec([args[0], None, args[1]])
 
 def executee_wait(args):
   """Portable execution with process replacement and environment manipulation"""
+  # XXX: Kept for backward compatibility
+  generic_exec(args)
+
+def generic_exec(args):
   exec_list = list(args[0])
-  file_list = list(args[1])
-  environment = args[2]
-  env = os.environ.copy()
-  for k,v in environment.iteritems():
-    env[k] = v
-  _wait_files_creation(file_list)
-  os.execve(exec_list[0], exec_list + sys.argv[1:], env)
+  file_list = args[1]
+  environment_overriding = args[2]
+
+  exec_env = os.environ.copy()
+  if environment_overriding is not None:
+      exec_env.update(environment_overriding)
+
+  if file_list is not None:
+      _wait_files_creation(file_list)
+
+  os.execve(exec_list[0], exec_list + sys.argv[1:], exec_env)
 
 def sig_handler(signal, frame):
   print 'Received signal %r, killing children and exiting' % signal

slapos/recipe/logrotate.py

@@ -41,7 +41,7 @@ class Recipe(GenericBaseRecipe):
       'include %s' % logrotate_d,
     ]
 
-    logrotate_conf_file = self.createFile(logrotate_conf_file, 
+    logrotate_conf_file = self.createFile(logrotate_conf_file,
         '\n'.join(logrotate_conf))
 
     state_file = self.options['state-file']

slapos/recipe/memcached/__init__.py

@@ -44,7 +44,7 @@ class Recipe(BaseSlapRecipe):
     self.cron_d = self.installCrond()
     memcached_conf = self.installMemcached(ip=self.getLocalIPv4Address(),
         port=11000)
-        
+
     ca_conf = self.installCertificateAuthority()
     key, certificate = self.requestCertificate('Memcached')
 
@@ -52,7 +52,7 @@ class Recipe(BaseSlapRecipe):
         self.getLocalIPv4Address(), 12345, memcached_conf['memcached_port'],
         certificate, key, ca_conf['ca_crl'],
         ca_conf['certificate_authority_path'])
-    
+
     self.linkBinary()
     self.setConnectionDict(dict(
       stunnel_ip = stunnel_conf['public_ip'],
@@ -81,7 +81,7 @@ class Recipe(BaseSlapRecipe):
       os.symlink(target, link)
       self.logger.debug('Created link %r -> %r' % (link, target))
       self.path_list.append(link)
-  
+
   def installCrond(self):
     timestamps = self.createDataDirectory('cronstamps')
     cron_output = os.path.join(self.log_directory, 'cron-output')
@@ -103,7 +103,7 @@ class Recipe(BaseSlapRecipe):
       )[0]
     self.path_list.append(wrapper)
     return cron_d
-  
+
   def installLogrotate(self):
     """Installs logortate main configuration file and registers its to cron"""
     logrotate_d = os.path.abspath(os.path.join(self.etc_directory,

slapos/recipe/mysql/__init__.py

@@ -107,6 +107,7 @@ class Recipe(GenericBaseRecipe):
         mysql_binary=mysql_binary,
         socket=socket,
         configuration_file=mysql_conf_file,
+        cwd=self.options['mysql-base-directory'],
        )
     )
     path_list.append(mysqld)

slapos/recipe/mysql/mysql.py

@@ -17,7 +17,7 @@ def runMysql(conf):
       popen = subprocess.Popen([conf['mysql_install_binary'],
         '--skip-name-resolve', '--skip-host-cache', '--no-defaults',
         '--datadir=%s' % conf['data_directory']],
-        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=conf['cwd'])
       result = popen.communicate()[0]
       if popen.returncode is None or popen.returncode != 0:
         print "Failed to initialise server.\nThe error was: %s" % result

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

@@ -19,7 +19,7 @@ long_query_time = 5
 max_allowed_packet = 128M
 query_cache_size = 32M
 
-plugin-load = ha_mroonga.so;ha_sphinx.so
+plugin-load = ha_mroonga.so
 
 # The following are important to configure and depend a lot on to the size of
 # your database and the available resources.

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'],
+    ]

slapos/recipe/nosqltestbed/kumo/__init__.py

@@ -43,14 +43,14 @@ class KumoTestBed(object):
 
     kumo_cloud_config['address'] = recipe.getGlobalIPv6Address()
     kumo_cloud_config['report_path'] = recipe.log_directory
-    
+
     kumo_cloud_config.setdefault('max_server', 4)
     kumo_cloud_config.setdefault('max_tester', 5)
     kumo_cloud_config.setdefault('nb_thread', 32)
     kumo_cloud_config.setdefault('nb_request', 1024000)
     kumo_cloud_config.setdefault('erp5_publish_url', '')
     kumo_cloud_config.setdefault('erp5_publish_project', '')
-    
+
     computer_guid_list = []
     computer_guid_list.append("COMP-23") # manager
     computer_guid_list.append("COMP-13") # server 1
@@ -62,9 +62,9 @@ class KumoTestBed(object):
     computer_guid_list.append("COMP-14") # tester 3
     computer_guid_list.append("COMP-20") # tester 4
     computer_guid_list.append("COMP-19") # tester 5
-    
+
     kumo_cloud_config.setdefault('computer_guid_list', ":".join(computer_guid_list))
-    
+
     kumo_cloud_config['software_release_url'] = recipe.software_release_url
     kumo_cloud_config['server_url'] = recipe.server_url
     kumo_cloud_config['key_file'] = recipe.key_file

slapos/recipe/proactive/__init__.py

@@ -36,7 +36,7 @@ class Recipe(BaseSlapRecipe):
     #ipv6 = self.getGlobalIPv6Address(parameter_dict)
 
     proactive_home = self.options['proactive_location']
-    
+
     # ProActive parameters
     proactive_rmUrl = parameter_dict.get('rmURL')
     proactive_credential = parameter_dict.get('credentials')
@@ -55,7 +55,7 @@ class Recipe(BaseSlapRecipe):
         )
     self._writeFile(proactive_configuration_file, pkg_resources.resource_string(
       __name__, 'template/ProActiveConfiguration.xml.in') % proactive_dict)
-      
+
     # ProActive wrapper
     #proactive = os.path.join(proactive_home, 'bin', 'unix', 'rm-start-node')
     proactive_pa_bundle = os.path.join(proactive_home, 'PABundle')
@@ -74,4 +74,4 @@ sh %(proactive)s %(rmUrl)s %(nsname)s %(credential)s
     self.computer_partition.setConnectionDict(dict(
       #proactive_ip="[%s]" % (ipv6),
       ))
-    return [proactive_configuration_file, proactive_wrapper]
\ No newline at end of file
+    return [proactive_configuration_file, proactive_wrapper]

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

slapos/recipe/pulse2/__init__.py

@@ -43,17 +43,17 @@ class Recipe(BaseSlapRecipe):
     document_root = self.createDataDirectory('htdocs')
     self.createHtdocs(self.options['source'].strip(), document_root)
     url = self.installApache(document_root)
-    
+
     # MySQL
     mysql_conf = self.installMysqlServer(self.getLocalIPv4Address(), 45678)
-    
+
     # LDAP
     ldap_port = dict()
-    
+
     # Pulse
     mmc_core_conf = self.installPulse2(ip=self.getLocalIPv4Address(),
         port=11000, ldap_host=ldap_conf['host'], ldap_port=ldap_conf['port'])
-        
+
     ca_conf = self.installCertificateAuthority()
     key, certificate = self.requestCertificate('Pulse')
 
@@ -61,7 +61,7 @@ class Recipe(BaseSlapRecipe):
         self.getLocalIPv4Address(), 12345, pulse_conf['inventory_port'],
         certificate, key, ca_conf['ca_crl'],
         ca_conf['certificate_authority_path'])
-    
+
     self.linkBinary()
     self.setConnectionDict(dict(
       stunnel_inventory_ip = stunnel_conf['public_ip'],
@@ -92,7 +92,7 @@ class Recipe(BaseSlapRecipe):
       os.symlink(target, link)
       self.logger.debug('Created link %r -> %r' % (link, target))
       self.path_list.append(link)
-  
+
   def installCrond(self):
     timestamps = self.createDataDirectory('cronstamps')
     cron_output = os.path.join(self.log_directory, 'cron-output')
@@ -114,7 +114,7 @@ class Recipe(BaseSlapRecipe):
       )[0]
     self.path_list.append(wrapper)
     return cron_d
-  
+
   def installLogrotate(self):
     """Installs logortate main configuration file and registers its to cron"""
     logrotate_d = os.path.abspath(os.path.join(self.etc_directory,
@@ -247,26 +247,26 @@ class Recipe(BaseSlapRecipe):
         ldap_logfile_path= os.path.join(self.log_directory, 'ldap.log'),
         mmc_core_binary=self.options['mmc_core_binary']
     )
-    
-    #TODO write function that takes all templates in subdir and creates conf 
+
+    #TODO write function that takes all templates in subdir and creates conf
     # files, keeping same dir structure.
     mmc_conf_path = self.createConfigurationFile(os.path.join("mmc",
         "agent", "config.ini"), self.substituteTemplate(
         self.getTemplateFilename(os.path.join("mmc_conf",
         "agent", "config.ini.in")), config))
     config['mmc_core_config_file'] = mysql_conf_path
-    
+
     self.path_list.append(self.createRunningWrapper('mmc-core',
       self.substituteTemplate(self.getTemplateFilename('mmc-core.in'),
         config)))
 
 
-    
+
     return dict(memcached_url='%s:%s' %
         (config['memcached_ip'], config['memcached_port']),
         memcached_ip=config['memcached_ip'],
         memcached_port=config['memcached_port'])
-  
+
   def createHtdocs(self, source, document_root):
     source = self.options['source'].strip()
     document_root = self.createDataDirectory('htdocs')
@@ -282,7 +282,7 @@ class Recipe(BaseSlapRecipe):
         shutil.copytree(path, os.path.join(document_root, p))
       else:
         shutil.copy2(path, os.path.join(document_root, p))
-  
+
   def installApache(self, document_root, ip=None, port=None):
     if ip is None:
       ip=self.getGlobalIPv6Address()

slapos/recipe/pwgen.py

@@ -41,7 +41,9 @@ class Recipe(GenericBaseRecipe):
         password = password_file.read()
     options['password'] = password
 
-  update = install = lambda self: []
+  def install(self):
+    os.chmod(self.options['file'], 0600)
+    return []
 
 class StablePasswordGeneratorRecipe(GenericBaseRecipe):
   """

slapos/recipe/request.py

@@ -25,7 +25,8 @@
 #
 ##############################################################################
 import logging
-
+from slapos.recipe.librecipe import wrap, JSON_SERIALISED_MAGIC_KEY
+import json
 from slapos import slap as slapmodule
 
 class Recipe(object):
@@ -119,19 +120,33 @@ class Recipe(object):
       for config_parameter in options['config'].split():
         partition_parameter_kw[config_parameter] = \
             options['config-%s' % config_parameter]
+    partition_parameter_kw = self._filterForStorage(partition_parameter_kw)
 
     self.instance = instance = request(software_url, software_type,
       name, partition_parameter_kw=partition_parameter_kw,
       filter_kw=filter_kw, shared=isSlave)
-
+    return_parameter_dict = self._getReturnParameterDict(instance,
+      return_parameters)
     for param in return_parameters:
       try:
-        options['connection-%s' % param] = str(
-          instance.getConnectionParameter(param))
-      except slapmodule.NotFoundError:
-        options['connection-%s' % param] = ''
+        value = return_parameter_dict[param]
+      except KeyError:
+        value = ''
         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.failed is not None:
@@ -150,3 +165,13 @@ class Recipe(object):
     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 {}

slapos/recipe/requestoptional.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+import logging
+
+from slapos import slap as slapmodule
+
+class Recipe(object):
+  """ Request a SlapOS instance. Won't fail if instance is not ready.
+  """
+
+  def __init__(self, buildout, name, options):
+    self.logger = logging.getLogger(name)
+
+    slap = slapmodule.slap()
+
+    self.software_release_url = options['software-url']
+    self.name = options['name']
+
+    slap.initializeConnection(options['server-url'],
+                              options.get('key-file'),
+                              options.get('cert-file'),
+                             )
+    computer_partition = slap.registerComputerPartition(
+      options['computer-id'], options['partition-id'])
+    self.request = computer_partition.request
+
+    self.isSlave = False
+    if 'slave' in options:
+      self.isSlave = options['slave'].lower() in ['y', 'yes', 'true', '1']
+
+    self.return_parameters = []
+    if 'return' in options:
+      self.return_parameters = [str(parameter).strip()
+                               for parameter in options['return'].split()]
+    else:
+      self.logger.debug("No parameter to return to main instance."
+                          "Be careful about that...")
+
+    software_type = 'RootSoftwareInstance'
+    if 'software-type' in options:
+      software_type = options['software-type']
+
+    filter_kw = {}
+    if 'sla' in options:
+      for sla_parameter in options['sla'].split():
+        filter_kw[sla_parameter] = options['sla-%s' % sla_parameter]
+
+    partition_parameter_kw = {}
+    if 'config' in options:
+      for config_parameter in options['config'].split():
+        partition_parameter_kw[config_parameter] = \
+            options['config-%s' % config_parameter]
+
+    self.instance = self.request(options['software-url'], software_type,
+      self.name, partition_parameter_kw=partition_parameter_kw,
+      filter_kw=filter_kw, shared=self.isSlave)
+
+    self.failed = None
+    for param in self.return_parameters:
+      try:
+        options['connection-%s' % param] = str(
+            self.instance.getConnectionParameter(param))
+      except slapmodule.NotFoundError:
+        options['connection-%s' % param] = ''
+        if self.failed is None:
+          self.failed = param
+
+  def install(self):
+    if self.failed is not None:
+      # Check instance status to know if instance has been deployed
+      try:
+        status = self.instance.getState()
+      except slapmodule.NotFoundError:
+        status = 'not ready yet'
+      except AttributeError:
+        status = 'unknown'
+      error_message = 'Connection parameter %s not found. '\
+          'Requested instance is currently %s. If this error persists, '\
+          'check status of this instance.' % (self.failed, status)
+      self.logger.error(error_message)
+    return []
+
+  update = install

slapos/recipe/seleniumrunner/ERP5TypeFunctionalTestCase.py

@@ -27,7 +27,7 @@
 #
 ##############################################################################
 
-# XXX-Cedric : This is an import of 
+# XXX-Cedric : This is an import of
 # http://git.erp5.org/gitweb/erp5.git/blob/HEAD:/product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
 # Modification of the present file should be ported back to this original file.
 import os

slapos/recipe/seleniumrunner/__init__.py

@@ -37,7 +37,7 @@ class Recipe(GenericBaseRecipe):
     runner = self.createPythonScript(
       self.options['runner-path'],
       __name__+'.testrunner.run',
-      arguments=[self.options['suite-url'], 
+      arguments=[self.options['suite-url'],
                  self.options['report-url'],
                  self.options['report-project'],
                  self.options['browser'],