Merge branch 'erp5-component' into erp5

Conflicts:
	component/rpm2cpio/buildout.cfg

CHANGES.txt

 Changes
 =======
 
-0.59 (Unreleased)
+0.71.1 (2013-01-04)
+-------------------
+
+ * Frontend: Sort instances by reference to avoid attacks. [Cedric de Saint
+   Martin]
+ * Frontend: Add public_ipv4 parameter support to ease deployment of slave
+   frontend. [Cedric de Saint Martin]
+ * Frontend: Move apache_frontend wrappers to watched directory (etc/service).
+   [Cedric de Saint Martin]
+ * Frontend: Add native path to varnish environment. [Cedric de Saint Martin]
+
+0.71 (2012-12-20)
+-----------------
+
+ * frontend: Add "path" parameter for Zope instances. [Cedric de Saint Martin]
+
+0.70 (2012-11-05)
+-----------------
+
+ * KVM: Add support for disk-type, second nbd and cpu-count. [Cedric de Saint
+   Martin]
+
+0.69 (2012-10-30)
+-----------------
+
+ * handle multiple notification_url values in notifier recipe [Marco Mariani]
+ * createWrapper() sh alternative to execute.execute() for simple cases
+   [Marco Mariani]
+ * fixed secret key generation in apachephp config [Marco Mariani]
+
+0.68.1 (2012-10-03)
+-------------------
+
+  * slaprunner: fix "logfile" parameter to "log_file"
+
+0.68 (2012-10-02)
+-----------------
+
+  * request.py: Remove useless calls to master, fix "update" method. [Cedric
+    de Saint Martin]
+  * Add webrunner test recipe. [Alain Takoudjou]
+  * Add logfile for slaprunner. [Cedric de Saint Martin]
+  * Fix check_url_available promise (syntax + checks + IPv6 support). [Cedric
+    de Saint Martin]
+
+0.67 (2012-09-26)
+-----------------
+
+  * Add check_page_content promise generator. [Cedric Le Ninivin]
+  * Fix check_url_available recipe. [Cedric de Saint Martin]
+  * Set up timezone database in mariab's mysql table so that we can use
+    timezone conversion function. [Kazuhiko Shiozaki]
+  * Add many resiliency-based recipes [Timothée Lacroix]
+  * Fix and unify request and requestoptional recipes [Cedric de Saint Martin]
+  * Fix Dropbear. [Antoine Catton]
+
+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 +203,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 +269,7 @@ Changes
 -----------------
 
  * apache_frontend initial release. [Cedric de Saint Martin]
- 
+
 0.39 (2012-02-20)
 -----------------
 
@@ -205,7 +322,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/apache-perl/buildout.cfg

+[buildout]
+parts = apache-perl
+
+extends =
+  ../apache/buildout.cfg
+  ../perl/buildout.cfg
+  ../libuuid/buildout.cfg
+
+[apache-perl]
+# Note: Shall react on each build of apache and reinstall itself
+recipe = hexagonit.recipe.cmmi
+url = http://perl.apache.org/dist/mod_perl-2.0.5.tar.gz
+md5sum = 03d01d135a122bd8cebd0cd5b185d674
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL
+configure-options =
+  MP_AP_PREFIX=${apache-2.2:location}
+
+environment =
+  # CPPFLAGS=-I${libuuid:location}/include
+  MP_CCOPTS=-L${libuuid:location}/lib

component/apache-php/buildout.cfg

@@ -55,10 +55,50 @@ configure-options =
   --enable-bz2
   --enable-ftp
 
+
+# Changing TMPDIR is required for PEAR installation.
+# It will create a pear/temp directory under the SR instead of a shared /tmp/pear/temp.
+# XXX we could mkdir tmp there
+
 environment =
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
   LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
+  TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
+
+
+
+
+[apache-php-postgres]
+<=apache-php
+configure-options =
+  --with-apxs2=${apache:location}/bin/apxs
+  --with-libxml-dir=${libxml2:location}
+  --with-zlib-dir=${zlib:location}
+  --with-bz2-dir=${bzip2:location}
+  --with-mcrypt=${libmcrypt:location}
+  --with-gd
+  --with-jpeg-dir=${libjpeg:location}
+  --with-png-dir=${libpng:location}
+  --enable-gd-native-ttf
+  --with-ttf
+  --with-freetype-dir=${freetype:location}
+  --with-curl=${curl:location}
+  --with-zip-dir=${zip:location}
+  --with-imap=${cclient:location}
+  --with-iconv-dir=${libiconv:location}
+  --with-gettext=${gettext:location}
+  --with-ldap=${openldap:location}
+  --with-imap-ssl
+  --with-openssl=${openssl:location}
+  --enable-libxml
+  --enable-mbstring
+  --enable-session
+  --enable-exif
+  --enable-zip
+  --enable-bz2
+  --enable-ftp
+  --with-pgsql=${postgresql:location}
 
 
 [libmcrypt]

component/apache/buildout.cfg

@@ -31,7 +31,7 @@ recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
 version = 2.4.3
-revision = 1
+revision = 2
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
@@ -87,7 +87,7 @@ configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_na
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  CPPFLAGS =-I${libuuid:location}/include
+  CPPFLAGS =-I${libuuid:location}/include -I${openssl:location}/include
   LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
 
 [mod_antiloris-apache-2.4.patch]

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/automake/buildout.cfg

@@ -2,12 +2,13 @@
 extends =
   ../autoconf/buildout.cfg
   ../perl/buildout.cfg
+  ../xz-utils/buildout.cfg
 parts =
   automake
 
 [automake]
 recipe = hexagonit.recipe.cmmi
-md5sum = e620cb9e0259159341c0e0d6b712b67a
-url = http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz
+md5sum = 140e084223bf463a24c1a28427c6aec7
+url = http://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.xz
 environment =
-  PATH =${autoconf:location}/bin:${perl:location}/bin:%(PATH)s
+  PATH =${autoconf:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s

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 = 2dcfee8add6b9c52d6a91e97ba705b66
 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/cclient/buildout.cfg

@@ -10,10 +10,10 @@ parts =
   cclient
 
 [cclient-patch]
-recipe = slapos.recipe.download
+recipe = hexagonit.recipe.download
+download-only = true
 url = ${:_profile_base_location_}/imap-2007f.patch
 md5sum = 42c77fdd5d7a976fc302b93aadb3da98
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = imap-2007f.patch
 
 [cclient]

component/cloud9/buildout.cfg

@@ -16,32 +16,54 @@ parts =
 
 [node-sm]
 recipe = slapos.recipe.build:npm
-packages = sm
+packages = sm@0.2.11
 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} 
+# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
 recipe = plone.recipe.command
 stop-on-error = true
-commit = ab689c5d3cc29d02d788506c0f1b2ab0742a0f05
+commit = 5d18344936baf1d86b0fa5fc2c690051b4c77cb2
 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-session-directory.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+filename = cloud9-session-directory.patch
+download-only = true
+md5sum = 5dc8cc28447ed3747b8a53c768d872aa
+
+[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 = 6b0112363dd0f9523430808394a162d3cc699550
+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 && patch -p1 < ${cloud9-session-directory.patch:location}/${cloud9-session-directory.patch:filename}) || (rm -fr ${:location}; exit 1)
+update-command =
+executable = ${:location}/server.js
 
 [cloud9-npm]
 # Online IDE written in javascript/node.js
-# URL : c9.io 
+# URL : c9.io
 # You can use it using the following command :
-# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location} 
+# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
 recipe = slapos.recipe.npm
 # Node part has to be specified, otherwise system node is used.
 node = nodejs
@@ -50,4 +72,4 @@ packages =
   cloud9==0.7
 # Specify environment jsDAV (dependency of cloud9) needs libxml2
 environment = 
-  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib
+  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib
\ No newline at end of file

component/cloud9/cloud9-session-directory.patch

+diff --git a/configs/default.js b/configs/default.js
+index 6d1c85f..be35b37 100644
+--- a/configs/default.js
++++ b/configs/default.js
+@@ -22,6 +22,8 @@ var vfsUrl = "/vfs";
+ var port = argv.p || process.env.PORT || 3131;
+ var host = argv.l || process.env.IP || "localhost";
+ 
++var home = process.env['HOME']
++
+ var config = [
+     {
+         packagePath: "connect-architect/connect",
+@@ -167,7 +169,7 @@ var config = [
+     },
+     {
+         packagePath: "connect-architect/connect.session.file",
+-        sessionsPath: __dirname + "/../.sessions"
++        sessionsPath: home + "/.sessions"
+     },
+     "./cloud9.permissions",
+     {
\ No newline at end of file

component/cmake/buildout.cfg

@@ -4,5 +4,5 @@ parts =
 
 [cmake]
 recipe = hexagonit.recipe.cmmi
-url = http://www.cmake.org/files/v2.8/cmake-2.8.8.tar.gz
-md5sum = ba74b22c788a0c8547976b880cd02b17
+url = http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz
+md5sum = 097278785da7182ec0aea8769d06860c

component/coreutils/buildout.cfg

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
   coreutils
 
-[coreutils-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 63c2299d92d23e4748abb9668b7e62ea
-download-only = true
-filename = drop.gets.patch
-
 [coreutils]
-virtual-depends = ${coreutils-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.12.tar.gz
-md5sum = fce7999953a67243d00d75cc86dbcaa6
-
-patch-options = -p1
-patches =
-  ${coreutils-drop.gets.patch:location}/${coreutils-drop.gets.patch:filename}
-
+url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.20.tar.xz
+md5sum = 3d69af8f561fce512538a9fe85f147ff
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
 environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
   LDFLAGS =-Wl,--as-needed

component/curl/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [curl]
 recipe = hexagonit.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.24.0.tar.bz2
-#md5sum = 5f6d50c4d4ee38c57fe37e3cff75adbd
+url = http://curl.haxx.se/download/curl-7.28.1.tar.bz2
+md5sum = 26eb081c999b0e203770869427e9a93d
 configure-options =
   --disable-static
   --disable-ldap

component/cyrus-sasl/buildout.cfg

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

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

@@ -14,8 +14,8 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 [liberation-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-1.07.0.tar.gz
-md5sum = 8150db1c6e27cacdfd524b563b85b69e
+url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz
+md5sum = 5c781723a0d9ed6188960defba8e91cf
 destination = ${fonts:location}/${:_buildout_section_name_}
 
 # IPAex and IPA Font - Japanese fonts provided by IPA
@@ -23,8 +23,8 @@ destination = ${fonts:location}/${:_buildout_section_name_}
 [ipaex-fonts]
 recipe = hexagonit.recipe.download
 strip-top-level-dir = true
-url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAexfont00103.zip
-md5sum = ac67b2fc3aab7f683d89f0070df284e7
+url = http://ossipedia.ipa.go.jp/ipafont/ipaexfont/IPAexfont00201.php
+md5sum = 7bf84182a04a9632268dbcb03f100d05
 destination = ${fonts:location}/${:_buildout_section_name_}
 
 [ipa-fonts]

component/gettext/buildout.cfg

@@ -6,22 +6,10 @@ extends =
   ../libxml2/buildout.cfg
   ../zlib/buildout.cfg
 
-[gettext-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 1a17a2e6c1539927304379dfa0f149c5
-download-only = true
-filename = drop.gets.patch
-
 [gettext]
-virtual-depends = ${gettext-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz
-md5sum = 3dd55b952826d2b32f51308f2f91aa89
-
-patch-options = -p1
-patches =
-  ${gettext-drop.gets.patch:location}/${gettext-drop.gets.patch:filename}
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.2.tar.gz
+md5sum = 0c86e5af70c195ab8bd651d17d783928
 
 configure-options =
   --disable-static

component/gettext/drop.gets.patch

-diff -ur gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h
---- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h	2010-05-17 21:56:12.000000000 +0200
-+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h	2012-07-20 17:42:29.940524198 +0200
-@@ -141,7 +141,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-diff -ur gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h
---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h	2010-05-24 11:42:46.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h	2012-07-20 17:45:20.550461064 +0200
-@@ -141,7 +141,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
-diff -ur gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h
---- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h	2010-05-17 21:58:03.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h	2012-07-20 17:45:15.937129402 +0200
-@@ -141,7 +141,9 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

component/git/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 
 [git]
 recipe = hexagonit.recipe.cmmi
-url = http://git-core.googlecode.com/files/git-1.7.10.4.tar.gz
-md5sum = 68319d593d051ef76c26e945bbd2d7ac
+url = http://git-core.googlecode.com/files/git-1.7.12.tar.gz
+md5sum = ceb1a6b17a3e33bbc70eadf8fce5876c
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}
@@ -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/grep/buildout.cfg

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

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/gzip/buildout.cfg

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
   gzip
 
-[gzip-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = d9b1156f912c8cf006f140482918ebc9
-download-only = true
-filename = drop.gets.patch
-
 [gzip]
-virtual-depends = ${gzip-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
-
-patch-options = -p1
-patches =
-  ${gzip-drop.gets.patch:location}/${gzip-drop.gets.patch:filename}
-
-url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.4.tar.gz
-md5sum = e381b8506210c794278f5527cba0e765
+url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.5.tar.xz
+md5sum = 2a431e169b6f62f7332ef6d47cc53bae
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

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

@@ -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,8 @@
 extends =
     ../cmake/buildout.cfg
     ../glib/buildout.cfg
+    ../pkgconfig/buildout.cfg
+    ../openssl/buildout.cfg
     ../pcre/buildout.cfg
     ../mariadb/buildout.cfg
 
@@ -15,17 +17,18 @@ 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
+path = ${pkgconfig:location}/bin
+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 =
@@ -38,7 +41,7 @@ script =
     extract_dir = self.extract(url)
     workdir = guessworkdir(extract_dir)
     self.applyPatchList(self.options['mydumper-patches'], cwd=workdir)
-    env['PATH'] = self.options['buildout-bin-dir'] + ':' + env.get('PATH', '')
+    env['PATH'] = self.options['path'] + ':' + self.options['buildout-bin-dir'] + ':' + env.get('PATH', '')
     env['PKG_CONFIG_PATH'] = self.options['pkg-config-path'] + ':' + \
                              env.get('PKG_CONFIG_PATH', '')
     env['CMAKE_INCLUDE_PATH'] = self.options['includes']
@@ -49,17 +52,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 +77,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

@@ -3,6 +3,7 @@ parts =
   noVNC
 
 [noVNC]
-recipe = slapos.recipe.build:download-unpacked
-url = https://github.com/kanaka/noVNC/tarball/v0.2
+recipe = hexagonit.recipe.download
+url = http://cloud.github.com/downloads/kanaka/noVNC/novnc-0.4.tar.gz
+md5sum = 5703d5d46022d8723796dcbbf821ee7f
 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.14/node-v0.8.14.tar.gz
+md5sum = 284fd2c7578064c339d9cf6a3a475ac7
+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/openldap/buildout.cfg

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

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/patch/buildout.cfg

 [buildout]
+extends =
+  ../xz-utils/buildout.cfg
 parts =
   patch
 
 [patch]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.gnu.org/gnu/patch/patch-2.6.1.tar.gz
-md5sum = d758eb96d3f75047efc004a720d33daf
+url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.1.tar.xz
+md5sum = e9ae5393426d3ad783a300a338c09b72
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/pcre/buildout.cfg

@@ -4,9 +4,8 @@ parts =
 
 [pcre]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2
-md5sum = 0a7b592bea64b7aa7f4011fc7171a730
+url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.32.tar.bz2
+md5sum = 62f02a76bb57a40bc66681760ed511d5
 configure-options =
   --disable-static
-  --enable-utf8
   --enable-unicode-properties

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

@@ -9,10 +9,13 @@ extends =
   ../glib/buildout.cfg
   ../popt/buildout.cfg
 
+[pkg-config]
+<= pkgconfig
+
 [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/postgresql/buildout.cfg

+[buildout]
+extends = 
+  ../openssl/buildout.cfg
+  ../readline/buildout.cfg
+  ../zlib/buildout.cfg
+  ../ncurses/buildout.cfg
+parts = postgresql
+
+
+[postgresql]
+<= postgresql92
+
+
+[postgresql91]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.postgresql.org/pub/source/v9.1.7/postgresql-9.1.7.tar.bz2
+md5sum = eaf7b67493d59d1a60767ffdfbd65ce9
+configure-options = --with-openssl
+environment =
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib 
+
+
+[postgresql92]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.postgresql.org/pub/source/v9.2.2/postgresql-9.2.2.tar.bz2
+md5sum = 1cc388988e69bf75c6b55d59070100f6
+configure-options = --with-openssl
+environment =
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib 
+

component/python-setuptools/buildout.cfg

+[buildout]
+parts = python-setuptools
+
+[setuptools-download]
+recipe = hexagonit.recipe.download
+download-only = true
+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 = https://raw.github.com/ruda/rpm2cpio/master/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,11 +21,13 @@ extends =
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
   ../zlib/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   slapos
   cfg-environment
   sh-environment
+  py
 
 find-links =
   http://www.nexedi.org/static/packages/source/slapos.buildout/
@@ -45,13 +49,13 @@ exec-sitecustomize = false
 allowed-eggs-from-site-packages =
 
 [environment]
-# Note: For now original PATH is appeneded to the end, as not all tools are
+# Note: For now original PATH is appended 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
-PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${python2.7:location}/lib/pkconfig:${sqlite3:location}/lib/pkconfig
+PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${python2.7:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig
 LD_LIBRARY_PATH=${bzip2:location}/lib:${gdbm:location}/lib:${gettext:location}/lib:${glib:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${popt:location}/lib:${readline:location}/lib:${sqlite3:location}/lib:${zlib:location}/lib
 
 [cfg-environment]
@@ -110,53 +114,60 @@ scripts =
   slapgrid-supervisorctl = slapos.grid.svcbackend:supervisorctl
   slapgrid-supervisord = slapos.grid.svcbackend:supervisord
   slapproxy = slapos.proxy:main
+  slapos = slapos.entry:main
+  slapos-watchdog = slapos.grid.watchdog:main
+
+[py]
+recipe = zc.recipe.egg
+eggs = 
+    ${slapos:eggs}
+python = python2.7
+interpreter = py
+scripts = py
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-006
-hexagonit.recipe.download = 1.5.1-dev-slapos-002
+# Use our own buildout version
+zc.buildout = 1.6.0-dev-SlapOS-010
 
 # 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 = 3.0.1
+meld3 = 0.6.9
+netaddr = 0.7.10
+slapos.core = 0.33.1
+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.33.1
 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.33.1
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.26.1
-# slapos.libnetworkcache==0.12
-# supervisor==3.0a12
-# zc.buildout==1.6.0-dev-SlapOS-006
+# slapos.core==0.33.1
+# slapos.libnetworkcache==0.13.2
+# supervisor==3.0b1
+# zc.buildout==1.6.0-dev-SlapOS-010
 # zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.26.1
-supervisor = 3.0a12
+# slapos.core==0.33.1
+supervisor = 3.0b1
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.33.1
 zope.interface = 4.0.1

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/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/coreutils/drop.gets.patch → component/tar/drop.gets.patch

-diff -ur coreutils-8.12.old/lib/stdio.in.h coreutils-8.12/lib/stdio.in.h
---- coreutils-8.12.old/lib/stdio.in.h	2011-04-25 11:01:29.000000000 +0200
-+++ coreutils-8.12/lib/stdio.in.h	2012-07-23 16:02:17.591610452 +0200
-@@ -181,7 +181,9 @@
+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/w3m/buildout.cfg

@@ -45,6 +45,6 @@ patches =
 
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkconfig
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig
   CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/ -I${garbage-collector:location}/include
   LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

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/wget/buildout.cfg

 [buildout]
 extends =
   ../openssl/buildout.cfg
+  ../pcre/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 parts =
   wget
 
-[wget-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 866907ebc89fc2e76b44c519cb84930f
-download-only = true
-filename = drop.gets.patch
-
 [wget]
-virtual-depends = ${wget-drop.gets.patch:md5sum}
-patch-options = -p1
-patches =
-  ${wget-drop.gets.patch:location}/${wget-drop.gets.patch:filename}
-
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnu.org/gnu/wget/wget-1.13.4.tar.bz2
-md5sum = 12115c3750a4d92f9c6ac62bac372e85
+url = http://ftp.gnu.org/gnu/wget/wget-1.14.tar.xz
+md5sum = 316f6f59292c9098ad81fd54f658c579
 configure-options =
   --enable-ipv6
   --enable-opie
@@ -31,7 +21,7 @@ configure-options =
   --with-zlib-lib=${zlib:location}
 
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -I${pcre:location}/include

component/wget/drop.gets.patch

-diff -ur wget-1.13.4.orig/lib/stdio.in.h wget-1.13.4/lib/stdio.in.h
---- wget-1.13.4.orig/lib/stdio.in.h	2011-09-13 10:15:14.000000000 +0200
-+++ wget-1.13.4/lib/stdio.in.h	2012-07-23 14:47:39.793579086 +0200
-@@ -697,8 +697,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@

component/wkhtmltopdf/buildout.cfg

+[buildout]
+
+extends = 
+  ../fontconfig/buildout.cfg
+  ../xorg/buildout.cfg
+
+parts =
+  wkhtmltopdf
+
+[wkhtmltopdf]
+recipe = slapos.recipe.build
+
+# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
+url_x86-64 = http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1-static-amd64.tar.bz2
+url_x86 = http://wkhtmltopdf.googlecode.com/files/wkhtmltopdf-0.11.0_rc1-static-i386.tar.bz2
+
+# supported architectures md5sums
+md5sum_x86 = d796cfb66e45673d8f6728b61f34d5e0
+md5sum_x86-64 = 02a2c6963728b69b8e329dcbf1f4c7e1
+
+# script to install.
+script =
+  location = %(location)r
+  self.failIfPathExists(location)
+  import sys
+  ARCH_DIR_MAP = { 'x86': 'x86', 'x86-64': 'x86_64' }
+  WK_SUFIX_MAP = { 'x86': 'i386', 'x86-64': 'amd64' }
+  platform = guessPlatform()
+  url = self.options['url_' + platform]
+  md5sum = self.options['md5sum_' + platform]
+  extract_dir = self.extract(self.download(url, md5sum))
+  shutil.move(extract_dir, location)
+  wrapper_location = os.path.join("%(location)s", "wkhtmltopdf")
+  wrapper = open(wrapper_location, 'w')
+  wrapper.write("""#!${dash:location}/bin/dash
+  cd %(location)s
+  export LD_LIBRARY_PATH=%(location)s:${libXrender:location}/lib/:${fontconfig:location}/lib/:${libX11:location}/lib/:${libXext:location}/lib/
+  export PATH=${fontconfig:location}/bin:$PATH
+  exec %(location)s/wkhtmltopdf-""" + WK_SUFIX_MAP[platform]+ """ $*""")
+  wrapper.close()
+  os.chmod(wrapper_location, 0777)

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

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/slapmonitor/template/slapmonitor_run.in → slapos/recipe/6tunnel/template/4to6.in

 #!%(shell_path)s
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-#
-exec %(slapmonitor_path)s %(pid_file_path)s %(database_path)s
-
+exec %(6tunnel_path)s -d -l %(ipv4)s %(ipv4_port)s %(ipv6)s %(ipv6_port)s

slapos/recipe/slapreport/template/slapreport_run.in → slapos/recipe/6tunnel/template/6to4.in

 #!%(shell_path)s
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-#
-exec %(slapreport_path)s %(pid_file_path)s %(consumption_log_path)s %(database_path)s %(logbox_ip)s %(logbox_port)s %(logbox_user)s %(logbox_passwd)s
+exec %(6tunnel_path)s -6 -4 -d -l %(ipv6)s %(ipv6_port)s %(ipv4)s %(ipv4_port)s

slapos/recipe/README.testnode.txt

-testnode
-========
-
-Generic testnode.

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/addresiliency/__init__.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.recipe.librecipe import GenericSlapRecipe
+
+import os
+
+
+class Recipe(GenericSlapRecipe):
+    """ This class provides the installation of the resilience
+        scripts on the partition.
+
+        bin/takeover will perform a rename (must be run manually).
+        bin/bully will monitor, run elections and perform renames when needed.
+    """
+
+    def _install(self):
+        path_list = []
+
+        confpath = os.path.join(self.options['etc'], 'bully.conf')
+
+        ip_list = self.parameter_dict['ip-list']
+        print 'Creating bully configuration with ips : %s\n' % ip_list
+
+        conf = self.createFile(confpath,
+                               self.substituteTemplate(
+                               self.getTemplateFilename('bully.conf.in'),
+                               {
+                                   'self_id': int(self.parameter_dict['number']),
+                                   'ip_list': ip_list
+                                   }
+                               ))
+        path_list.append(conf)
+
+        slap_connection = self.buildout['slap-connection']
+
+        if self.optionIsTrue('enable-bully-service', default=False):
+            bully_dir = self.options['services']
+        else:
+            bully_dir = self.options['bin']
+
+        bully_wrapper = self.createPythonScript(
+            name=os.path.join(bully_dir, self.options['wrapper-bully']),
+            absolute_function='slapos.recipe.addresiliency.bully.run',
+            arguments={
+                'confpath': confpath,
+                'server_url': slap_connection['server-url'],
+                'key_file': slap_connection.get('key-file'),
+                'cert_file': slap_connection.get('cert-file'),
+                'computer_id': slap_connection['computer-id'],
+                'partition_id': slap_connection['partition-id'],
+                'software': slap_connection['software-release-url'],
+                'namebase': self.parameter_dict['namebase'],
+            })
+
+        path_list.append(bully_wrapper)
+
+        takeover_wrapper = self.createPythonScript(
+            name=os.path.join(self.options['bin'], self.options['wrapper-takeover']),
+            absolute_function='slapos.recipe.addresiliency.takeover.run',
+            arguments={
+                'server_url': slap_connection['server-url'],
+                'key_file': slap_connection.get('key-file'),
+                'cert_file': slap_connection.get('cert-file'),
+                'computer_id': slap_connection['computer-id'],
+                'partition_id': slap_connection['partition-id'],
+                'software': slap_connection['software-release-url'],
+                'namebase': self.parameter_dict['namebase'],
+            })
+
+        path_list.append(takeover_wrapper)
+
+        return path_list
+
+

slapos/recipe/addresiliency/bully.py

+# -*- coding: utf-8 -*-
+
+import logging
+import Queue
+import socket
+import thread
+import time
+
+import slapos.recipe.addresiliency.renamer
+import slapos
+
+log = logging.getLogger(__name__)
+logging.basicConfig(level=logging.DEBUG)
+
+
+BASE_PORT = 50000
+SLEEPING_MINS = 2           # XXX was 30, increase after testing
+
+MSG_PING = 'ping'
+MSG_HALT = 'halt'
+MSG_VICTORY = 'victory'
+
+MSG_OK = 'ok'
+
+STATE_NORMAL = 'normal'
+STATE_WAITINGCONFIRM = 'waitingConfirm'
+STATE_ELECTION = 'election'
+STATE_REORGANIZATION = 'reorganization'
+
+
+
+## Leader is always number 0
+
+class ResilientInstance(object):
+
+    def __init__(self, comm, renamer, confpath):
+        self.comm = comm
+        self.participant_id = 0
+        self.state = STATE_NORMAL
+        self.halter_id = 0
+        self.inElection = False
+        self.alive = True
+
+        self.mainCanal = self.comm.create_canal([MSG_PING, MSG_HALT, MSG_VICTORY])
+
+        self.renamer = renamer
+        self.okCanal = self.comm.create_canal([MSG_OK])
+        self.confpath = confpath
+        self.loadConnectionInfo()
+
+    def loadConnectionInfo(self):
+        params = open(self.confpath, 'r').readlines()
+        self.total_participants = len(params[0].split())
+        new_id = int(params[1])
+        if self.participant_id != new_id:
+            self.halter_id = new_id
+            self.participant_id = new_id 
+        log.debug('I am {} of {}'.format(self.participant_id, self.total_participants))
+
+    ## Needs to be changed to use the master
+    def aliveManagement(self):
+        while self.alive:
+            log.info('XXX sleeping for %d minutes' % SLEEPING_MINS)
+            time.sleep(SLEEPING_MINS*60)
+            if self.participant_id == 0:
+                continue
+            self.comm.send(MSG_PING, 0)
+            message, sender = self.okCanal.get()
+            if message:
+                continue
+            self.election()
+
+    def listen(self):
+        while self.alive:
+            self.comm.recv()
+
+    def main(self):
+        while self.alive:
+            message, sender = self.mainCanal.get()
+            if message == MSG_PING:
+                self.comm.send(MSG_OK, sender)
+
+            elif message == MSG_HALT:
+                self.state = STATE_WAITINGCONFIRM
+                self.halter_id = int(sender)
+                self.comm.send(MSG_OK, sender)
+
+            elif message == MSG_VICTORY:
+                if int(sender) == self.halter_id and self.state == STATE_WAITINGCONFIRM:
+                    log.info('{} thinks {} is the leader'.format(self.participant_id, sender))
+                    self.comm.send(MSG_OK, sender)
+                self.state = STATE_NORMAL
+
+    def election(self):
+        self.inElection = True
+        self.loadConnectionInfo()
+        # Check if I'm the highest instance alive
+        for higher in range(self.participant_id + 1, self.total_participants):
+            self.comm.send(MSG_PING, higher)
+            message, sender = self.okCanal.get()
+            if message:
+                log.info('{} is alive ({})'.format(higher, self.participant_id))
+                self.inElection = False
+                return False
+            continue
+
+        if not self.alive:
+            return False
+
+        # I should be the new coordinator, halt those below me
+        log.info('Should be ME : {}'.format(self.participant_id))
+        self.state = STATE_ELECTION
+        self.halter_id = self.participant_id
+        ups = []
+        for lower in range(self.participant_id):
+            self.comm.send(MSG_HALT, lower)
+            message, sender = self.okCanal.get()
+            if message:
+                ups.append(lower)
+
+        #Broadcast Victory
+        self.state = STATE_REORGANIZATION
+        for up in ups:
+            self.comm.send(MSG_VICTORY, up)
+            message, sender = self.okCanal.get()
+            if message:
+                continue
+            log.info('Something is wrong... let\'s start over')
+            return self.election()
+        self.state = STATE_NORMAL
+        self.active = True
+        log.info('{} Is THE LEADER'.format(self.participant_id))
+
+        self.renamer.failover()
+
+        self.inElection = False
+
+        return True
+
+
+
+class FilteredCanal(object):
+
+    def __init__(self, accept, timeout):
+        self.accept = accept
+        self.queue = Queue.Queue()
+        self.timeout = timeout
+
+    def append(self, message, sender):
+        if message in self.accept:
+            self.queue.put([message, sender])
+
+    def get(self):
+        try:
+            return self.queue.get(timeout=self.timeout)
+        except Queue.Empty:
+            return [None, None]
+
+
+
+class Wrapper(object):
+
+    def __init__(self, confpath, timeout=20):
+        self.canals = []
+        self.ips = []
+        self.participant_id = 0
+        self.timeout = timeout
+        self.confpath = confpath
+        self.getConnectionInfo()
+        self.socket = None
+
+    def getConnectionInfo(self):
+        params = open(self.confpath, 'r').readlines()
+        self.ips = params[0].split()
+        self.participant_id = int(params[1])
+        log.debug('I am {} of {}'.format(self.participant_id, self.ips))
+
+    def start(self):
+        self.getConnectionInfo()
+        self.socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+        self.socket.bind((self.ips[self.participant_id], BASE_PORT + self.participant_id))
+        self.socket.listen(5)
+
+    def send(self, message, number):
+        self.getConnectionInfo()
+        try:
+            s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+            s.connect((self.ips[number], BASE_PORT + number))
+            s.send(message + (' {}\n'.format(self.participant_id)))
+        except (socket.error, socket.herror, socket.gaierror, socket.timeout):
+            pass
+        finally:
+            s.close()
+
+    def create_canal(self, accept):
+        created = FilteredCanal(accept, self.timeout)
+        self.canals.append(created)
+        return created
+
+    def recv(self):
+        client, _ = self.socket.accept()
+        client_message = client.recv(1024)
+        if client_message:
+            message, sender = client_message.split()
+            for canal in self.canals:
+                canal.append(message, int(sender))
+
+
+
+
+def run(args):
+    confpath = args.pop('confpath')
+
+    renamer = slapos.recipe.addresiliency.renamer.Renamer(server_url = args.pop('server_url'),
+                                                          key_file = args.pop('key_file'),
+                                                          cert_file = args.pop('cert_file'),
+                                                          computer_guid = args.pop('computer_id'),
+                                                          partition_id = args.pop('partition_id'),
+                                                          software_release = args.pop('software'),
+                                                          namebase = args.pop('namebase'))
+
+    if args:
+        raise ValueError('Unknown arguments: %s' % ', '.join(args))
+
+    wrapper = Wrapper(confpath=confpath, timeout=20)
+
+    computer = ResilientInstance(wrapper, renamer=renamer, confpath=confpath)
+
+    # idle waiting for connection infos
+    while computer.total_participants < 2:
+        computer.loadConnectionInfo()
+        time.sleep(30)
+
+    log.info('Starting')
+
+    computer.comm.start()
+    thread.start_new_thread(computer.listen, ())
+    thread.start_new_thread(computer.aliveManagement, ())
+
+    computer.main()
+

slapos/recipe/addresiliency/renamer.py

+# -*- coding: utf-8 -*-
+
+import logging
+import time
+
+import slapos
+
+log = logging.getLogger(__name__)
+logging.basicConfig(level=logging.DEBUG)
+
+
+
+class Renamer(object):
+    def __init__(self, server_url, key_file, cert_file, computer_guid,
+                 partition_id, software_release, namebase):
+        self.server_url = server_url
+        self.key_file = key_file
+        self.cert_file = cert_file
+        self.computer_guid = computer_guid
+        self.partition_id = partition_id
+        self.software_release = software_release
+        self.namebase = namebase
+
+
+    def _failover(self):
+        """\
+        This method does
+
+        - retrieve the broken computer partition
+        - change its reference to 'broken-...' and its software type to 'frozen'
+        - retrieve the winner computer partition (attached to this process)
+        - change its reference to replace the broken one.
+          later, slapgrid will change its software_type as well.
+
+        Then, after running slapgrid-cp a few times, the winner takes over and
+        a new cp is created to replace it as an importer.
+        """
+
+        slap = slapos.slap.slap()
+        slap.initializeConnection(self.server_url, self.key_file, self.cert_file)
+
+        # partition that will take over.
+        cp_winner = slap.registerComputerPartition(computer_guid=self.computer_guid,
+                                                   partition_id=self.partition_id)
+        # XXX although we can already rename cp_winner, to change its software type we need to
+        # get hold of the root cp as well
+
+        cp_exporter_ref = self.namebase + '0'       # this is ok. the boss is always number zero.
+
+        # partition to be deactivated
+        cp_broken = cp_winner.request(software_release=self.software_release,
+                                      software_type='frozen',
+                                      state='stopped',
+                                      partition_reference=cp_exporter_ref)
+
+        broken_new_ref = 'broken-{}'.format(time.strftime("%d-%b_%H:%M:%S", time.gmtime()))
+
+        log.debug("Renaming {}: {}".format(cp_broken.getId(), broken_new_ref))
+
+        cp_broken.rename(new_name=broken_new_ref)
+
+        cp_broken.stopped()
+
+        log.debug("Renaming {}: {}".format(cp_winner.getId(), cp_exporter_ref))
+
+        # update name (and later, software type) for the partition that will take over
+
+        cp_winner.rename(new_name=cp_exporter_ref)
+        cp_winner.bang(message='partitions have been renamed!')
+
+
+
+    def failover(self):
+        try:
+            self._failover()
+            log.info('Renaming done')
+        except slapos.slap.ServerError:
+            log.info('Internal server error')
+

slapos/recipe/addresiliency/takeover.py

+# -*- coding: utf-8 -*-
+
+import slapos.recipe.addresiliency.renamer
+
+def run(args):
+    renamer = slapos.recipe.addresiliency.renamer.Renamer(server_url = args.pop('server_url'),
+                                                          key_file = args.pop('key_file'),
+                                                          cert_file = args.pop('cert_file'),
+                                                          computer_guid = args.pop('computer_id'),
+                                                          partition_id = args.pop('partition_id'),
+                                                          software_release = args.pop('software'),
+                                                          namebase = args.pop('namebase'))
+
+    renamer.failover()
+
+

slapos/recipe/addresiliency/template/bully.conf.in

+%(ip_list)s
+%(self_id)s

slapos/recipe/addresiliency/template/bully.py.in

+#!%(executable)s
+
+import select
+import socket
+import threading
+import time
+import sys
+
+sys.path[:] = %(syspath)s
+
+import slapos
+from slapos import slap as slapmodule
+
+port = 50000
+size = 1024
+wait = True
+
+
+def loadConnectionInfos():
+  connectionInfos = {}
+  file = open('%(confpath)s', 'r')
+  params = file.read().split('\n')
+  file.close()
+  ip_list = [x.strip("' ") for x in params[0].strip('[],').split(',')]
+  connectionInfos['self_id'] = int(params[1])
+
+  connectionInfos['server_list'] = \
+      [(i, ip_list[i]) for i in range(len(ip_list))]
+
+  connectionInfos['self_ip'] = ip_list[connectionInfos['self_id']]
+
+  return connectionInfos
+
+
+def rename_broken_and_stop():
+  try:
+    slap = slapmodule.slap()
+    slap.initializeConnection('%(server_url)s',
+                              '%(key_file)s',
+                              '%(cert_file)s')
+    computer_partition = slap.registerComputerPartition(computer_guid='%(computer_id)s',
+                                                        partition_id='%(partition_id)s')
+    broken = computer_partition.request(software_release='%(software)s',
+                                        software_type='frozen',
+                                        partition_reference='%(namebase)s0')
+
+    broken.rename('broken-%%s' %% (time.strftime("%%d-%%b_%%H:%%M:%%S", time.gmtime())))
+    broken.stopped()
+    computer_partition.rename('%(namebase)s0')
+    print 'renaming done\n'
+  except slapos.slap.slap.ServerError:
+    print 'Internal server error\n'
+
+def election():
+  global wait
+  connection = loadConnectionInfos()
+  message = "%%s, %%s" %% (connection['self_id'], "Election")
+  victory = True
+
+  for (remote_id, addr) in connection['server_list']:
+    if remote_id > connection['self_id']:
+      try:
+        s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+        s.connect((addr, port + remote_id))
+        s.send(message)
+        reply = s.recv(size)
+        if reply == "%%s, %%s" %% (remote_id, "Alive"):
+          victory = False
+      except (socket.error, socket.herror, socket.gaierror, socket.timeout):
+        pass
+      finally:
+        s.close()
+
+  if victory:
+    wait = True
+    for (remote_id, addr) in connection['server_list']:
+      if remote_id < connection['self_id']:
+        try:
+          s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+          s.connect((addr, port + remote_id))
+          s.send("%%s, %%s" %% (connection['self_id'], "Victory"))
+        except (socket.error, socket.herror, socket.gaierror, socket.timeout):
+          pass
+        finally:
+          s.close()
+    rename_broken_and_stop()
+
+
+def failure_detect():
+  global wait
+  connection = loadConnectionInfos()
+  while True:
+    time.sleep(30)
+    if wait:
+      print 'waiting 30 minutes\n'
+      time.sleep(30 * 60)
+      wait = False
+    if not connection['server_list'][0]:
+      continue
+    (remote_id, addr) = connection['server_list'][0]
+    try:
+      s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+      s.connect((addr, port + remote_id))
+      s.close()
+    except (socket.error, socket.herror, socket.gaierror, socket.timeout):
+      s.close()
+      election()
+
+failure_detect_thread = threading.Thread(target=failure_detect)
+failure_detect_thread.start()
+
+connection = loadConnectionInfos()
+s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+s.bind((connection['self_ip'], port + connection['self_id']))
+s.listen(5)
+#election()
+while True:
+  force_election = False
+  client, _ = s.accept()
+  client_message = client.recv(1024)
+  if client_message:
+    client_id, message = client_message.split(', ')
+    client_id = eval(client_id)
+    if message == "Victory":
+      wait = True
+      print "%%s wins" %% client_id
+    elif message == "Election":
+      print "%%s starts an election" %% client_id
+      if client_id < connection['self_id']:
+        client.send("%%s, %%s" %% (connection['self_id'], "Alive"))
+        force_election = True
+  client.close()
+  if force_election:
+    election()

slapos/recipe/addresiliency/template/bully_new.py.in

+#!%(executable)s
+
+import logging
+import os
+import socket
+import sys
+import thread
+import time
+
+sys.path[:] = %(syspath)s
+
+from slapos import slap as slapmodule
+import slapos
+
+BASE_PORT = 50000
+SLEEPING_MINS = 2
+
+log = logging.getLogger(__name__)
+logging.basicConfig(level=logging.DEBUG)
+
+
+
+class Renamer(object):
+    def __init__(self, server_url, key_file, cert_file, computer_guid,
+                 partition_id, software_release, namebase):
+        self.server_url = server_url
+        self.key_file = key_file
+        self.cert_file = cert_file
+        self.computer_guid = computer_guid
+        self.partition_id = partition_id
+        self.software_release = software_release
+        self.namebase = namebase
+
+    def _failover(self):
+        slap = slapmodule.slap()
+        slap.initializeConnection(self.server_url,
+                                  self.key_file,
+                                  self.cert_file)
+        computer_partition = slap.registerComputerPartition(computer_guid=self.computer_guid,
+                                                            partition_id=self.partition_id)
+        broken = computer_partition.request(software_release=self.software_release,
+                                            software_type='frozen',
+                                            partition_reference=self.namebase+'0')
+
+        broken.rename('broken-{}'.format(time.strftime("%%d-%%b_%%H:%%M:%%S", time.gmtime())))
+        broken.stopped()
+        computer_partition.rename(self.namebase+'0')
+
+    def failover(self):
+        try:
+            log.info('renaming done')
+        except slapos.slap.slap.ServerError:
+            log.info('Internal server error')
+
+
+
+## Leader is always number 0
+
+class ResilientInstance(object):
+
+    def __init__(self, comm, renamer, confpath):
+        self.comm = comm
+        self.id = 0
+        self.state = 'normal'
+        self.halter = 0
+        self.inElection = False
+        self.alive = True
+        self.lastPing = time.clock()
+
+        self.mainCanal = self.comm.canal(['ping', 'halt', 'victory'])
+
+        self.renamer = renamer
+        self.okCanal = self.comm.canal(['ok'])
+        self.confpath = confpath
+        self.loadConnectionInfos()
+
+    def loadConnectionInfos(self):
+        file = open(self.confpath, 'r')
+        params = file.read().split('\n')
+        file.close()
+        self.nbComp = len([x.strip("' ") for x in params[0].strip('[],').split(',')])
+        new_id = int(params[1])
+        if self.id != new_id:
+            self.halter = new_id
+            self.id = new_id 
+
+    ## Needs to be changed to use the master
+    def aliveManagement(self):
+        while self.alive:
+            log.info('XXX sleeping for %%d minutes' %% SLEEPING_MINS)
+            time.sleep(SLEEPING_MINS*60)
+            if self.id == 0:
+                continue
+            self.comm.send('ping', 0)
+            message, sender = self.okCanal.get()
+            if message:
+                continue
+            self.election()
+
+    def listen(self):
+        while self.alive:
+            self.comm.recv()
+
+    def main(self):
+        while self.alive:
+            message, sender = self.mainCanal.get()
+            if message == 'ping':
+                self.comm.send('ok', sender)
+
+            elif message == 'halt':
+                self.state = 'waitingConfirm'
+                self.halter = sender
+                self.comm.send('ok', sender)
+
+            elif message == 'victory':
+                if int(sender) == int(self.halter) and self.state == 'waitingConfirm':
+                    log.info('{} thinks {} is the leader'.format(self.id, sender))
+                    self.comm.send('ok', sender)
+                self.state = 'normal'
+
+    def election(self):
+        self.inElection = True
+        self.loadConnectionInfos()
+        #Check if I'm the highest instance alive
+        for higher in range(self.id + 1, self.nbComp):
+            self.comm.send('ping', higher)
+            message, sender = self.okCanal.get()
+            if message:
+                log.info('{} is alive ({})'.format(higher, self.id))
+                self.inElection = False
+                return False
+            continue
+
+        if not self.alive:
+            return False
+
+        #I should be the new coordinator, halt those below me
+        log.info('Should be ME : {}'.format(self.id))
+        self.state = 'election'
+        self.halter = self.id
+        ups = []
+        for lower in range(self.id):
+            self.comm.send('halt', lower)
+            message, sender = self.okCanal.get()
+            if message:
+                ups.append(lower)
+
+        #Broadcast Victory
+        self.state = 'reorganization'
+        for up in ups:
+            self.comm.send('victory', up)
+            message, sender = self.okCanal.get()
+            if message:
+                continue
+            log.info('Something is wrong... let\'s start over')
+            return self.election()
+        self.state = 'normal'
+        self.active = True
+        log.info('{} Is THE LEADER'.format(self.id))
+
+        self.renamer.failover()
+
+        self.inElection = False
+
+        return True
+
+
+class FilteredCanal(object):
+
+    def __init__(self, accept, timeout):
+        self.accept = accept
+        self.list = []
+        self.lock = thread.allocate_lock()
+        self.timeout = timeout
+
+    def append(self, message, sender):
+        if message in self.accept:
+            self.lock.acquire()
+            self.list.append([message, sender])
+            self.lock.release()
+
+    def get(self):
+        start = time.clock()
+        while (time.clock() - start < self.timeout):
+            self.lock.acquire()
+            if self.list:
+                self.lock.release()
+                return self.list.pop(0)
+            self.lock.release()
+        return [None, None]
+
+
+class Wrapper(object):
+
+    def __init__(self, confpath, timeout=20):
+        self.canals = []
+        self.ips = []
+        self.id = 0
+        self.timeout = timeout
+        self.confpath = confpath
+        self.getConnectionInfos()
+        self.socket = None
+
+    def getConnectionInfos(self):
+        file = open(self.confpath, 'r')
+        params = file.read().split('\n')
+        file.close()
+        self.ips = [x.strip("' ") for x in params[0].strip('[],').split(',')]
+        self.id = int(params[1])
+
+    def start(self):
+        self.getConnectionInfos()
+        self.socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+        self.socket.bind((self.ips[self.id], BASE_PORT + self.id))
+        self.socket.listen(5)
+
+    def send(self, message, number):
+        self.getConnectionInfos()
+        try:
+            s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+            s.connect((self.ips[number], BASE_PORT + number))
+            s.send(message + (' {}\n'.format(self.id)))
+        except (socket.error, socket.herror, socket.gaierror, socket.timeout):
+            pass
+        finally:
+            s.close()
+
+    def canal(self, accept):
+        created = FilteredCanal(accept, self.timeout)
+        self.canals.append(created)
+        return created
+
+    def recv(self):
+        client, _ = self.socket.accept()
+        client_message = client.recv(1024)
+        if client_message:
+            message, sender = client_message.split()
+            for canal in self.canals:
+                canal.append(message, int(sender))
+
+
+
+def main():
+
+    renamer = Renamer(server_url = '%(server_url)s',
+                      key_file = '%(key_file)s',
+                      cert_file = '%(cert_file)s',
+                      computer_guid = '%(computer_id)s',
+                      partition_id = '%(partition_id)s',
+                      software_release = '%(software)s',
+                      namebase = '%(namebase)s')
+
+    confpath = '%(confpath)s'
+
+    wrapper = Wrapper(confpath=confpath, timeout=20)
+
+    computer = ResilientInstance(wrapper, renamer=renamer, confpath=confpath)
+
+    #idle waiting for connection infos
+    while computer.nbComp < 2 :
+        computer.loadConnectionInfos()
+        time.sleep(30)
+
+    log.info('Starting')
+
+    computer.comm.start()
+    thread.start_new_thread(computer.listen, ())
+    thread.start_new_thread(computer.main, ())
+    thread.start_new_thread(computer.aliveManagement, ())
+
+    while True:
+        # XXX tight loop
+        continue
+
+
+if __name__ == '__main__':
+    main()
+

slapos/recipe/agent/__init__.py

@@ -25,65 +25,42 @@
 #
 #############################################################################
 
-import os
-import sys
 import zc.buildout
-import slapos.slap
-from slapos.recipe.librecipe import BaseSlapRecipe
-from slapos.recipe.librecipe import GenericSlapRecipe
-import json
-import ConfigParser
+from slapos.recipe.librecipe import GenericBaseRecipe
+import sys
 
-# XXX: BaseSlapRecipe and GenericSlapRecipe are deprecated, use
-# GenericBaseRecipe and move partition parameter fetching to software release.
-class Recipe(BaseSlapRecipe, GenericSlapRecipe):
+class Recipe(GenericBaseRecipe):
   def install(self):
-    self.path_list = []
-    crond = self.installCrond()
+    path_list = []
+
+    configuration_path = self.options["config"]
+    header = """[DEFAULT]
+master_url = %s
+key = %s
 
-    slap = slapos.slap.slap()
-    slap.initializeConnection(self.server_url, self.key_file, self.cert_file)
-    parameter_dict = slap.registerComputerPartition(
-      self.computer_id,
-      self.computer_partition_id,
-    ).getInstanceParameterDict()
+cert = %s
+
+max_install_duration = %s
+max_uninstall_duration = %s
+max_request_duration = %s
+max_destroy_duration = %s
+""" % (self.options["master-url"],
+      "\n  ".join(self.options["key"].split("\n")),
+       "\n  ".join(self.options["cert"].split("\n")),
+       self.options["default_max_install_duration"],
+       self.options["default_max_uninstall_duration"],
+       self.options["default_max_request_duration"],
+       self.options["default_max_destroy_duration"])
 
-    # XXX: should probably expect one more (SR-originating) parameter instead
-    # of using self.work_directory .
-    configuration_path = os.path.join(self.work_directory, "agent.cfg")
     with open(configuration_path, "w") as configuration:
-      configuration.write(parameter_dict["configuration"])
-    agent_crond_path = os.path.join(crond, "agent")
-    with open(agent_crond_path, "w") as agent_crond:
-      agent_crond.write("*/5 * * * * %s -S %s --pidfile=%s --log=%s "
-        "%s 2>&1 > /dev/null\n" % (
-          self.options["python_binary"],
-          self.options["agent_binary"],
-          self.options["pidfile"],
-          self.options["log"],
-          configuration_path,
-      ))
+      configuration.write(header + self.options["configuration"])
+
+    path_list.append(self.createPythonScript(
+                       self.options['wrapper'],
+                       'slapos.recipe.librecipe.execute.execute',
+                         [self.options["agent_binary"], '--pidfile=%s' % self.options["pidfile"],
+                          "--log=%s" % self.options["log"], configuration_path]))
 
-    return self.path_list + [configuration_path, agent_crond_path]
+    path_list.append(configuration_path)
 
-  def installCrond(self):
-    _, ws = self.egg.working_set()
-    timestamps = self.createDataDirectory('cronstamps')
-    cron_output = os.path.join(self.log_directory, 'cron-output')
-    self._createDirectory(cron_output)
-    catcher = zc.buildout.easy_install.scripts([('catchcron',
-      __name__ + '.catdatefile', 'catdatefile')], ws, sys.executable,
-      self.bin_directory, arguments=[cron_output])[0]
-    self.path_list.append(catcher)
-    cron_d = os.path.join(self.etc_directory, 'cron.d')
-    crontabs = os.path.join(self.etc_directory, 'crontabs')
-    self._createDirectory(cron_d)
-    self._createDirectory(crontabs)
-    wrapper = zc.buildout.easy_install.scripts([('crond',
-      'slapos.recipe.librecipe.execute', 'execute')], ws, sys.executable,
-      self.wrapper_directory, arguments=[
-        self.options['dcrond_binary'].strip(), '-s', cron_d, '-c', crontabs,
-        '-t', timestamps, '-f', '-l', '5', '-M', catcher]
-      )[0]
-    self.path_list.append(wrapper)
-    return cron_d
+    return path_list

slapos/recipe/apache_frontend/template/apache.conf.in

@@ -5,12 +5,13 @@
 PidFile "%(pid_file)s"
 ServerName %(server_name)s
 DocumentRoot %(document_root)s
+ServerRoot %(instance_home)s
 
 %(listen)s
 
 ServerAdmin %(server_admin)s
 DefaultType text/plain
-TypesConfig conf/mime.types
+TypesConfig %(httpd_home)s/conf/mime.types
 AddType application/x-compress .Z
 AddType application/x-gzip .gz .tgz
 
@@ -22,8 +23,8 @@ ServerTokens Prod
 # Log configuration
 ErrorLog "%(error_log)s"
 LogLevel warn
-LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
-LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
+LogFormat "%%h %%{REMOTE_USER}i %%{Host}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
+LogFormat "%%h %%{REMOTE_USER}i %%{Host}i %%l %%u %%t \"%%r\" %%>s %%b" common
 CustomLog "%(access_log)s" common
 
 %(path_enable)s
@@ -32,23 +33,23 @@ CustomLog "%(access_log)s" common
 #LoadModule unixd_module modules/mod_unixd.so
 #LoadModule access_compat_module modules/mod_access_compat.so
 #LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule deflate_module modules/mod_deflate.so
-LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule version_module modules/mod_version.so
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
-LoadModule ssl_module modules/mod_ssl.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule dav_module modules/mod_dav.so
-LoadModule dav_fs_module modules/mod_dav_fs.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule headers_module modules/mod_headers.so
-LoadModule cache_module modules/mod_cache.so
-LoadModule mem_cache_module modules/mod_mem_cache.so
-LoadModule antiloris_module modules/mod_antiloris.so
+LoadModule authz_host_module  %(httpd_home)s/modules/mod_authz_host.so
+LoadModule log_config_module  %(httpd_home)s/modules/mod_log_config.so
+LoadModule deflate_module     %(httpd_home)s/modules/mod_deflate.so
+LoadModule setenvif_module    %(httpd_home)s/modules/mod_setenvif.so
+LoadModule version_module     %(httpd_home)s/modules/mod_version.so
+LoadModule proxy_module       %(httpd_home)s/modules/mod_proxy.so
+LoadModule proxy_http_module  %(httpd_home)s/modules/mod_proxy_http.so
+LoadModule ssl_module         %(httpd_home)s/modules/mod_ssl.so
+LoadModule mime_module        %(httpd_home)s/modules/mod_mime.so
+LoadModule dav_module         %(httpd_home)s/modules/mod_dav.so
+LoadModule dav_fs_module      %(httpd_home)s/modules/mod_dav_fs.so
+LoadModule negotiation_module %(httpd_home)s/modules/mod_negotiation.so
+LoadModule rewrite_module     %(httpd_home)s/modules/mod_rewrite.so
+LoadModule headers_module     %(httpd_home)s/modules/mod_headers.so
+LoadModule cache_module       %(httpd_home)s/modules/mod_cache.so
+LoadModule mem_cache_module   %(httpd_home)s/modules/mod_mem_cache.so
+LoadModule antiloris_module   %(httpd_home)s/modules/mod_antiloris.so
 
 # The following directives modify normal HTTP response behavior to
 # handle known problems with browser implementations.
@@ -99,17 +100,28 @@ Header append Vary User-Agent
   ProxyTimeout 600
   RewriteEngine On
 
-  # Define the two rewritemaps : one for zope, one generic
+  # Include configuration file not operated by slapos. This file won't be erased
+  # or changed when slapgrid is ran. It can be freely customized by node admin.
+  Include %(custom_apache_virtualhost_conf)s
+
+  # Define the two RewriteMaps (key -> value store): one for Zope, one generic
+  # containing: rewritten URL -> original URL (a.k.a VirtualHostBase in Zope)
   RewriteMap apachemapzope txt:%(apachemapzope_path)s
   RewriteMap apachemapgeneric txt:%(apachemap_path)s
 
+  # Define another RewriteMap for Zope, containing:
+  # rewritten URL -> VirtualHostRoot
+  RewriteMap apachemapzopepath txt:%(apachemapzopepath_path)s
+
   # First, we check if we have a zope backend server
   # If so, let's use Virtual Host Daemon rewrite
   RewriteCond ${apachemapzope:%%{SERVER_NAME}} >""
-  RewriteRule ^/(.*)$ ${apachemapzope:%%{SERVER_NAME}}/VirtualHostBase/https/%%{SERVER_NAME}:%%{SERVER_PORT}/VirtualHostRoot/$1 [L,P]
+  # We suppose that Apache listens to 443 (even indirectly thanks to things like iptables)
+  RewriteRule ^/(.*)$ ${apachemapzope:%%{SERVER_NAME}}/VirtualHostBase/https/%%{SERVER_NAME}:443/${apachemapzopepath:%%{SERVER_NAME}}/VirtualHostRoot/$1 [L,P]
 
   # If we have generic backend server, let's rewrite without virtual host daemon
   RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
+  # We suppose that Apache listens to 443 (even indirectly thanks to things like iptables)
   RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
 
   # If nothing exist : put a nice error
@@ -120,6 +132,10 @@ Header append Vary User-Agent
   RewriteEngine On
   ProxyPreserveHost On
 
+  # Include configuration file not operated by slapos. This file won't be erased
+  # or changed when slapgrid is ran. It can be freely customized by node admin.
+  Include %(custom_apache_virtualhost_conf)s
+
   # We accept generic (i.e not lamp) backends on http
   RewriteMap apachemapgeneric txt:%(apachemap_path)s
   RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""

slapos/recipe/apache_frontend/template/apache.conf.path-protected.in

-# Path protected
-<Location %(path)s>
+<Directory %(path)s>
   Order Deny,Allow
   Allow from %(access_control_string)s
-</Location>
+</Directory>
+
+<Directory %(document_root)s>
+  Order Allow,Deny
+  Allow from All
+</Directory>

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/apachephp/__init__.py

@@ -24,13 +24,17 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
+
 import shutil
 import os
 import signal
+import subprocess
+
 from binascii import b2a_uu as uuencode
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
+
 class Recipe(GenericBaseRecipe):
 
   def install(self):
@@ -66,11 +70,13 @@ class Recipe(GenericBaseRecipe):
     )
     path_list.append(httpd_conf)
 
-    wrapper = self.createPythonScript(self.options['wrapper'],
-        'slapos.recipe.librecipe.execute.execute',
-        [self.options['httpd-binary'], '-f', self.options['httpd-conf'],
-         '-DFOREGROUND']
-    )
+    wrapper = self.createWrapper(name=self.options['wrapper'],
+                                 command=self.options['httpd-binary'],
+                                 parameters=[
+                                     '-f',
+                                     self.options['httpd-conf'],
+                                     '-DFOREGROUND'
+                                     ])
     path_list.append(wrapper)
 
     secret_key_filename = os.path.join(self.buildout['buildout']['directory'],
@@ -78,7 +84,7 @@ class Recipe(GenericBaseRecipe):
     if not os.path.exists(secret_key_filename):
       secret_key = uuencode(os.urandom(45)).strip()
       # Remove unsafe characters
-      secret_key = secret_key.translate(None, '"\'')
+      secret_key = secret_key.translate(None, '"\'\\')
       with open(secret_key_filename, 'w') as secret_key_file:
         secret_key_file.write(secret_key)
     else:
@@ -110,12 +116,16 @@ class Recipe(GenericBaseRecipe):
         self.substituteTemplate(self.options['template'], application_conf))
       path_list.append(config)
 
-    if os.path.exists(self.options['pid-file']):
-      # Reload apache configuration
-      with open(self.options['pid-file']) as pid_file:
-        pid = int(pid_file.read().strip(), 10)
-      try:
-        os.kill(pid, signal.SIGUSR1) # Graceful restart
-      except OSError:
-        pass
+    # Reload apache configuration.
+    # notez-bien: a graceful restart or a SIGUSR1 can somehow hang the apache threads.
+
+    subprocess.call([
+                        self.options['httpd-binary'],
+                        '-f',
+                        self.options['httpd-conf'],
+                        '-k',
+                        'graceful'
+                    ])
+
     return path_list
+

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

@@ -15,4 +15,4 @@ date.timezone = Europe/Paris
 file_uploads = On
 upload_max_filesize = 8M
 post_max_size = 8M
-magic_quotes_gpc=0ff
+magic_quotes_gpc=Off

slapos/recipe/apacheproxy/__init__.py

@@ -24,8 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-import os
-import signal
+import subprocess
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
@@ -50,17 +49,23 @@ class Recipe(GenericBaseRecipe):
     )
     path_list.append(httpd_conf)
 
-    wrapper = self.createPythonScript(self.options['wrapper'],
-        'slapos.recipe.librecipe.execute.execute',
-        [self.options['httpd-binary'], '-f', self.options['httpd-conf'],
-         '-DFOREGROUND']
-    )
+    wrapper = self.createWrapper(name=self.options['wrapper'],
+                                 command=self.options['httpd-binary'],
+                                 parameters=[
+                                     '-f',
+                                     self.options['httpd-conf'],
+                                     '-DFOREGROUND',
+                                     ])
+
     path_list.append(wrapper)
 
-    if os.path.exists(self.options['pid-file']):
-      # Reload apache configuration
-      with open(self.options['pid-file']) as pid_file:
-        pid = int(pid_file.read().strip(), 10)
-      os.kill(pid, signal.SIGUSR1) # Graceful restart
+    subprocess.call([
+                        self.options['httpd-binary'],
+                        '-f',
+                        self.options['httpd-conf'],
+                        '-k',
+                        'graceful',
+                    ])
 
     return path_list
+

slapos/recipe/apacheproxy/template/apache.in

@@ -3,7 +3,6 @@
 
 # Basic server configuration
 PidFile "%(pid_file)s"
-LockFile "%(lock_file)s"
 Listen %(ip)s:%(port)s
 ServerAdmin someone@email
 DefaultType text/plain
@@ -22,13 +21,15 @@ CustomLog "%(access_log)s" common
 <Directory />
     Options FollowSymLinks
     AllowOverride None
-    Order deny,allow
-    Deny from all
+    Require all denied
 </Directory>
 
 ProxyPass / %(backend_url)s
 
 # List of modules
+LoadModule unixd_module modules/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule authz_core_module modules/mod_authz_core.so
 LoadModule authz_host_module modules/mod_authz_host.so
 LoadModule log_config_module modules/mod_log_config.so
 LoadModule setenvif_module modules/mod_setenvif.so

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_port_listening/__init__.py

+# vim: set et sts=2:
 ##############################################################################
 #
 # Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.

slapos/recipe/check_port_listening/template/socket_connection_attempt.py.in

@@ -7,15 +7,10 @@ import sys
 hostname = "%(hostname)s"
 port = %(port)s
 
-connection_okay = False
-
 try:
   s = socket.create_connection((hostname, port))
-  connection_okay = True
   s.close()
 except (socket.error, socket.timeout):
-  connection_okay = False
-
-if not connection_okay:
-  print >> sys.stderr, "%(port)s on %(hostname)s isn't listening"
+  sys.stderr.write("%(port)s on %(hostname)s isn't listening\n")
   sys.exit(127)
+

slapos/recipe/check_url_available/template/check_url.in

@@ -3,14 +3,35 @@
 # BEWARE: It will be overwritten automatically
 
 URL="%(url)s"
-CODE=$(%(curl_path)s -k -sL $URL -w %%{http_code} -o /dev/null)
+
+if [ -z $URL ]; then
+  echo "No URL specified." >&2
+  exit 3
+fi
+
+CODE=$(%(curl_path)s -g -k -sL $URL -w %%{http_code} -o /dev/null)
+
+if [ $? -eq 3 ]; then
+  echo "URL malformed: $URL." >&2
+  exit 1
+fi
+
+if [ $? -eq 7 ]; then
+  echo "Failed to connect to host: $URL." >&2
+  exit 1
+fi
+
+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/dcron.py

@@ -33,26 +33,22 @@ class Recipe(GenericBaseRecipe):
   def install(self):
     self.logger.info("Installing dcron...")
 
-    path_list = []
+    options = self.options
+    script = self.createWrapper(name=options['binary'],
+                                command=options['dcrond-binary'].strip(),
+                                parameters=[
+                                    '-s', options['cron-entries'],
+                                    '-c', options['crontabs'],
+                                    '-t', options['cronstamps'],
+                                    '-f', '-l', '5',
+                                    '-M', options['catcher']
+                                    ])
 
-    cronstamps = self.options['cronstamps']
-    cron_d = self.options['cron-entries']
-    crontabs = self.options['crontabs']
-    catcher = self.options['catcher']
-
-    binary = self.options['binary']
-
-    script = self.createPythonScript(binary,
-      'slapos.recipe.librecipe.execute.execute',
-      [self.options['dcrond-binary'].strip(), '-s', cron_d, '-c', crontabs,
-       '-t', cronstamps, '-f', '-l', '5', '-M', catcher]
-      )
-    path_list.append(script)
     self.logger.debug('Main cron executable created at : %r', script)
 
     self.logger.info("dcron successfully installed.")
 
-    return path_list
+    return [script]
 
 
 

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/dropbear.py

@@ -158,6 +158,24 @@ class Client(GenericBaseRecipe):
 
     return [wrapper]
 
+
+def keysplit(s):
+  """
+  Split a string like "ssh-rsa AKLFKJSL..... ssh-rsa AAAASAF...."
+  and return the individual key_type + key strings.
+  """
+  si = iter(s.split(' '))
+  while True:
+    key_type = next(si)
+    try:
+      key_value = next(si)
+    except StopIteration:
+      # odd number of elements, should not happen, yield the last one by itself
+      yield key_type
+      break
+    yield '%s %s' % (key_type, key_value)
+
+
 class AddAuthorizedKey(GenericBaseRecipe):
 
   def install(self):
@@ -167,6 +185,9 @@ class AddAuthorizedKey(GenericBaseRecipe):
     path_list.append(ssh)
 
     authorized_keys = AuthorizedKeysFile(os.path.join(ssh, 'authorized_keys'))
-    authorized_keys.append(self.options['key'])
+    for key in keysplit(self.options['key']):
+      # XXX key might actually be the string 'None' or 'null'
+      authorized_keys.append(key)
 
     return path_list
+

slapos/recipe/equeue.py

@@ -30,17 +30,19 @@ class Recipe(GenericBaseRecipe):
 
   def install(self):
 
-    commandline = [self.options['equeue-binary']]
-    commandline.extend(['--database', self.options['database']])
-    commandline.extend(['-l', self.options['log']])
+    parameters = [
+      '--database', self.options['database'],
+      '-l', self.options['log'],
+    ]
 
     if 'loglevel' in self.options:
-      commandline.extend(['--loglevel', self.options['loglevel']])
+      parameters.extend(['--loglevel', self.options['loglevel']])
 
-    commandline.append(self.options['socket'])
+    parameters.append(self.options['socket'])
+
+    wrapper = self.createWrapper(name=self.options['wrapper'],
+                                 command=self.options['equeue-binary'],
+                                 parameters=parameters)
+
+    return [wrapper]
 
-    return [self.createPythonScript(
-      self.options['wrapper'],
-      'slapos.recipe.librecipe.execute.execute',
-      commandline,
-    )]