Merge branch 'master' into slapos

MANIFEST.in

 include CHANGES.txt
-include slapos/recipe/erp5/template/site.zcml
+include slapos/recipe/generic_zope/template/site.zcml
 recursive-include slapos/recipe *.in
 recursive-include slapos/recipe *.bin
 recursive-include slapos/recipe README.*.txt

component/boa/buildout.cfg

+[buildout]
+
+parts = boa
+
+[boa-patch-ENOSYS]
+recipe = hexagonit.recipe.download
+url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-servers/boa/files/boa-0.94.14_rc21-ENOSYS.patch?revision=1.1
+filename = boa-0.94.14_rc21-ENOSYS.patch
+md5sum = 7206b342195961501ed1eae38486e5db
+download-only = true
+
+
+[boa]
+recipe = slapos.recipe.build
+url = http://www.boa.org/boa-0.94.14rc21.tar.gz
+md5sum = e24b570bd767a124fcfb40a34d148ba9
+patches =
+    ${boa-patch-ENOSYS:location}/${boa-patch-ENOSYS:filename}
+slapos_promise =
+    directory:bin/
+    file:bin/boa
+    file:bin/boa_indexer
+script = 
+    import shutil
+    import os
+    url = self.download(self.options['url'], self.options['md5sum'])
+    extract_dir = self.extract(url)
+    workdir = guessworkdir(extract_dir)
+    self.applyPatchList(self.options.get('patches'), '-p1', cwd=workdir)
+    call(['./configure'], cwd=workdir)
+    call(['make'], cwd=workdir)
+    # Installation of boa. Manually, no make install
+    os.makedirs('%(location)s/bin/')
+    shutil.copyfile(workdir + '/src/boa', '%(location)s/bin/boa')
+    os.chmod('%(location)s/bin/boa', 0755)
+    shutil.copyfile(workdir + '/src/boa_indexer', '%(location)s/bin/boa_indexer')
+    os.chmod('%(location)s/bin/boa_indexer', 0755)

component/busybox/buildout.cfg

+[buildout]
+
+parts = busybox
+
+[busybox]
+recipe = slapos.recipe.build
+url = http://busybox.net/downloads/busybox-1.19.3.tar.bz2
+md5sum = c3938e1ac59602387009bbf1dd1af7f6
+script =
+    extract_dir = self.extract(self.download(%(url)r, %(md5sum)r))
+    workdir = guessworkdir(extract_dir)
+    self.logger.info("Creating default configuration")
+    call(['make', 'defconfig'], cwd=workdir, env=env)
+    self.logger.info("Building")
+    call(['make'], cwd=workdir, env=env)
+    self.logger.info("Installing")
+    call(['make', 'CONFIG_PREFIX=%(location)s', 'install'], cwd=workdir, env=env)
+    self.logger.info("Installation finished")

component/ca-certificates/buildout.cfg

+# CA certificates
+
+[buildout]
+parts =
+  ca-certificates
+
+
+[ca-certificates-sbin-dir.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 0b4e7d82ce768823c01954ee41ef177b
+filename = ${:_buildout_section_name_}
+download-only = true
+
+[ca-certificates]
+recipe = hexagonit.recipe.cmmi
+version = 20111211
+url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
+patches =
+  ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}
+patch-options = -p0
+configure-command = true
+make-targets = install DESTDIR=${buildout:parts-directory}/${:_buildout_section_name_} CERTSDIR=certs SBINDIR=sbin

component/ca-certificates/ca-certificates-sbin-dir.patch

+--- Makefile.orig	2011-12-11 20:54:02.000000000 +0100
++++ Makefile	2012-01-09 17:36:55.059392824 +0100
+@@ -17,7 +17,7 @@
+ 
+ install:
+ 	for dir in $(SUBDIRS); do \
+-	  mkdir $(DESTDIR)/$(CERTSDIR)/$$dir; \
++	  mkdir -p $(DESTDIR)/$(CERTSDIR)/$$dir; \
+ 	  $(MAKE) -C $$dir install CERTSDIR=$(DESTDIR)/$(CERTSDIR)/$$dir; \
+ 	done
+ 	for dir in sbin; do \
+--- sbin/Makefile.orig	2011-12-11 20:54:02.000000000 +0100
++++ sbin/Makefile	2012-01-09 17:31:45.207387898 +0100
+@@ -3,9 +3,12 @@
+ #
+ #
+ 
++SBINDIR=/usr/sbin
++
+ all:
+ 
+ clean:
+ 
+ install:
+-	install -m755 update-ca-certificates $(DESTDIR)/usr/sbin/
++	mkdir -p $(DESTDIR)/$(SBINDIR)
++	install -m755 update-ca-certificates $(DESTDIR)/$(SBINDIR)

component/curl/buildout.cfg

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

component/cyrus-sasl/cyrus-sasl-prototype-declaration.patch

---- cyrus-sasl-2.1.23/include/sasl.h	2010-11-25 18:15:05.000000000 +0100
-+++ cyrus-sasl-2.1.23/include/sasl.h	2010-11-25 18:15:34.000000000 +0100
-@@ -346,7 +346,7 @@
-      * Mechanisms must ignore callbacks with id's they don't recognize.
-      */
-     unsigned long id;
--    int (*proc)();   /* Callback function.  Types of arguments vary by 'id' */
-+    int (*proc);   /* Callback function.  Types of arguments vary by 'id' */
-     void *context;
- } sasl_callback_t;
- 

component/dash/buildout.cfg

+[buildout]
+
+parts = dash
+
+[dash]
+recipe = hexagonit.recipe.cmmi
+url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz
+md5sum = f6cedb10ae7258adb5ab17a10ae80d51
+configure-options =
+  --disable-static
+  --disable-fnmatch
+  --disable-glob

component/dropbear/buildout.cfg

@@ -13,7 +13,7 @@ parts =
 
 [dropbear-userspace-patch]
 recipe = hexagonit.recipe.download
-md5sum = 89f575b9a9586b04ef9073c9c3af13ae
+md5sum = 3d934c2c90e8c57536a4fa2cf8ad216d
 url = ${:_profile_base_location_}/${:filename}
 filename = userspace.patch
 download-only = true
@@ -25,6 +25,13 @@ url = ${:_profile_base_location_}/${:filename}
 filename = ipv6-support.patch
 download-only = true
 
+[dropbear-no-shell-check-patch]
+recipe = hexagonit.recipe.download
+md5sum = bb2ac410bd4cb2b07c23bfcc712e45f7
+url = ${:_profile_base_location_}/${:filename}
+filename = no-shell-checking.patch
+download-only = true
+
 [dropbear]
 recipe = hexagonit.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
@@ -35,7 +42,7 @@ url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-zlib=${zlib:location}
-  CFLAGS="-DENABLE_SINGLEUSER "
+  CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING"
 
 environment =
   CPPFLAGS =-I${zlib:location}/include
@@ -44,6 +51,7 @@ environment =
 patches=
   ${dropbear-userspace-patch:location}/${dropbear-userspace-patch:filename}
   ${dropbear-ipv6-patch:location}/${dropbear-ipv6-patch:filename}
+  ${dropbear-no-shell-check-patch:location}/${dropbear-no-shell-check-patch:filename}
 
 patch-options=
   -p1

component/dropbear/no-shell-checking.patch

+diff --git a/svr-auth.c b/svr-auth.c
+index 87e3c5e..8b93a22 100644
+--- a/svr-auth.c
++++ b/svr-auth.c
+@@ -267,6 +267,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
+ 		usershell = "/bin/sh";
+ 	}
+ 
++#ifndef __DIRTY_NO_SHELL_CHECKING
+ 	/* check the shell is valid. If /etc/shells doesn't exist, getusershell()
+ 	 * should return some standard shells like "/bin/sh" and "/bin/csh" (this
+ 	 * is platform-specific) */
+@@ -288,6 +289,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
+ 	
+ goodshell:
+ 	endusershell();
++#endif
+ 	TRACE(("matching shell"))
+ 
+ 	TRACE(("uid = %d", ses.authstate.pw_uid))

component/dropbear/userspace.patch

@@ -48,7 +48,7 @@ index 87e3c5e..adb2e8b 100644
 +	if (svr_opts.singleuser) {
 +		m_free(username);
 +		/* Get the current login of the user running dropbear */
-+		username = m_strdup(getlogin());
++		username = m_strdup(getpwuid(getuid())->pw_name);
 +	}
 +#endif /* ifdef ENABLE_SINGLEUSER */
  	servicename = buf_getstring(ses.payload, &servicelen);

component/file/buildout.cfg

+# File - Determines file type using "magic" numbers
+# http://www.darwinsys.com/file/
+
 [buildout]
 parts = file
 extends =
   ../zlib/buildout.cfg
 
-
 [file]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.astron.com/pub/file/file-5.07.tar.gz
-md5sum = b8d1f9a8a644067bd0a703cebf3f4858
+url = ftp://ftp.astron.com/pub/file/file-5.10.tar.gz
+md5sum = 4cea34b087b060772511e066e2038196
 configure-options =
   --disable-static
 environment =

component/gcc/buildout.cfg

@@ -63,6 +63,7 @@ md5sum = d7cd6a27c8801e66cbaa964a039ecfdb
 filename = ecj.jar
 
 [gcc-download]
+hack-revision = ${gcc-interconnection-workaround:hack-revision}
 recipe = hexagonit.recipe.download
 url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
 md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
@@ -70,6 +71,7 @@ strip-top-level-dir = True
 destination = ${gcc-source:location}
 
 [gcc-java-download]
+hack-revision = ${gcc-interconnection-workaround:hack-revision}
 recipe = hexagonit.recipe.download
 url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-java-4.5.3.tar.bz2
 md5sum = 08e045fdbdc22ac9af3aec3b8d16dbab
@@ -78,6 +80,7 @@ destination = ${gcc-source:location}
 ignore-existing = true
 
 [gcc-source]
+hack-revision = ${gcc-interconnection-workaround:hack-revision}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [gcc-multiarch.patch]
@@ -87,7 +90,15 @@ url = ${:_profile_base_location_}/${:filename}
 filename = ${:_buildout_section_name_}
 download-only = true
 
+[gcc-java-pre-4.4.patch]
+recipe = hexagonit.recipe.download
+md5sum = 9a563576126d9fcf234ef29c2fc7df76
+url = ${:_profile_base_location_}/${:filename}
+filename = ${:_buildout_section_name_}
+download-only = true
+
 [gcc-java-minimal]
+hack-revision = ${gcc-interconnection-workaround:hack-revision}
 depends =
   ${gcc-download:location}
   ${gcc-java-download:location}
@@ -96,6 +107,7 @@ path = ${gcc-source:location}
 md5sum = bb3265edf0fa7543e50cedb93e04e427
 patches =
   ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
+  ${gcc-java-pre-4.4.patch:location}/${gcc-java-pre-4.4.patch:filename}
 patch-options = -p2
 configure-command = make clean \\; make distclean \\; ./configure
 # GMP does not correctly detect achitecture so it have to be given
@@ -121,6 +133,7 @@ environment =
 make-targets = install -j1
 
 [gcc]
+hack-revision = ${gcc-interconnection-workaround:hack-revision}
 depends =
   ${gcc-download:location}
   ${gcc-java-download:location}
@@ -151,3 +164,10 @@ environment =
   PATH=${zip:location}/bin:%(PATH)s
 # make install does not work when several core are used
 make-targets = install -j1
+
+[gcc-interconnection-workaround]
+# gcc parts are interconnected, so buildout is not capable to clean them up
+# until gcc will be simplified by using more robust build recipe (like
+# slapos.recipe.build) each time any of parts which reuses this one gets updated
+# the hack-revision have to be increased
+hack-revision = 1

component/gcc/gcc-java-pre-4.4.patch

+Patch for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50888
+
+--- a/src/libjava/libjava/prims.cc.orig	2012-01-20 11:30:18.586157610 +0100
++++ b/src/libjava/libjava/prims.cc	2012-01-20 11:30:58.192770947 +0100
+@@ -38,6 +38,14 @@
+ #endif
+ 
+ #ifndef DISABLE_GETENV_PROPERTIES
++#ifdef __GLIBC__
++/* glibc 2.15+ provides even for C++ inline optimized ::isspace etc.
++   Unfortunately those inlines are throw (), and call a function pointer
++   (which is throw () too, but with -fnon-call-exceptions this results
++   in a __cxa_call_unexpected call.  This macro disables the optimized
++   version.  */
++#define __NO_CTYPE 1
++#endif
+ #include <ctype.h>
+ #include <java-props.h>
+ #define PROCESS_GCJ_PROPERTIES process_gcj_properties()
+--- a/src/libjava/prims.cc.orig	2012-01-20 11:30:23.042818341 +0100
++++ b/src/libjava/prims.cc	2012-01-20 11:31:01.389433254 +0100
+@@ -38,6 +38,14 @@
+ #endif
+ 
+ #ifndef DISABLE_GETENV_PROPERTIES
++#ifdef __GLIBC__
++/* glibc 2.15+ provides even for C++ inline optimized ::isspace etc.
++   Unfortunately those inlines are throw (), and call a function pointer
++   (which is throw () too, but with -fnon-call-exceptions this results
++   in a __cxa_call_unexpected call.  This macro disables the optimized
++   version.  */
++#define __NO_CTYPE 1
++#endif
+ #include <ctype.h>
+ #include <java-props.h>
+ #define PROCESS_GCJ_PROPERTIES process_gcj_properties()

component/gdbm/buildout.cfg

@@ -4,9 +4,9 @@ parts =
 
 [gdbm]
 recipe = hexagonit.recipe.cmmi
-version = 1.9.1
+version = 1.10
 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
-md5sum = 59f6e4c4193cb875964ffbe8aa384b58
+md5sum = 88770493c2559dc80b561293e39d3570
 configure-options =
   --disable-static
 # install as parts/gdbm/include/gdbm/*.h etc. because some softwares

component/gdbm/gdbm-Makefile.in-nochange.patch

---- Makefile.in	2002-10-08 16:09:12.000000000 +0000
-+++ Makefile.in.nochange	2010-11-03 21:17:38.579435530 +0000
-@@ -14,10 +14,6 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- 
--# File ownership and group
--BINOWN = bin
--BINGRP = bin
--
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- 
-@@ -131,11 +127,11 @@
- 		$(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \
- 		$(INSTALL_ROOT)$(infodir)
- 	$(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \
-+	$(INSTALL_DATA) gdbm.h \
- 		$(INSTALL_ROOT)$(includedir)/gdbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \
-+	$(INSTALL_DATA) $(srcdir)/gdbm.3 \
- 		$(INSTALL_ROOT)$(man3dir)/gdbm.3
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \
-+	$(INSTALL_DATA) $(srcdir)/gdbm.info \
- 		$(INSTALL_ROOT)$(infodir)/gdbm.info
- 
- install-compat:
-@@ -143,9 +139,9 @@
- 		$(INSTALL_ROOT)$(includedir)
- 	$(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \
- 		$(INSTALL_ROOT)$(libdir)/libgdbm_compat.la
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \
-+	$(INSTALL_DATA) $(srcdir)/dbm.h \
- 		$(INSTALL_ROOT)$(includedir)/dbm.h
--	$(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \
-+	$(INSTALL_DATA) $(srcdir)/ndbm.h \
- 		$(INSTALL_ROOT)$(includedir)/ndbm.h
- 
- #libgdbm.a: $(OBJS) gdbm.h

component/git/buildout.cfg

@@ -13,10 +13,8 @@ parts =
 
 [git]
 recipe = hexagonit.recipe.cmmi
-# url = http://kernel.org/pub/software/scm/git/git-1.7.4.5.tar.bz2
-# Circumvent kernel.org downtime
-url = http://ftp.free.fr/mirrors/ftp.kernel.org/software/scm/git/git-1.7.4.5.tar.bz2
-md5sum = 2fa6c4c847ed87523cf55de54af457eb
+url = http://git-core.googlecode.com/files/git-1.7.8.3.tar.gz
+md5sum = 7a4bc5160166537d4da5eb48a7670dff
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/graphviz/buildout.cfg

@@ -8,17 +8,15 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../libpng/buildout.cfg
-  ../libtool/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
 [graphviz]
 recipe = hexagonit.recipe.cmmi
-url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz
-md5sum = 6f45946fa622770c45609778c0a982ee
+url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz
+md5sum = 8d26c1171f30ca3b1dc1b429f7937e58
 configure-options =
-  --with-ltdl-include=${libtool:location}/include
-  --with-ltdl-lib=${libtool:location}/lib
+  --with-included-ltdl
   --with-pngincludedir=${libpng:location}/include
   --with-pnglibdir=${libpng:location}/lib
   --with-zincludedir=${zlib:location}/include

component/groonga/buildout.cfg

-# mroonga - a MySQL storage engine using full-text search engine groonga
-# http://mroonga.github.com/
+# groonga - an open-source fulltext search engine and column store
 # http://groonga.org/
 
 [buildout]
@@ -8,9 +7,10 @@ parts =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-1.2.8.tar.gz
-md5sum = a319b1f3a55cbf250ef5255f5c51ff46
+url = http://packages.groonga.org/source/groonga/groonga-1.2.9.tar.gz
+md5sum = 47117baa401a3db08362e00f94fced12
 configure-options =
   --disable-static
   --disable-glibtest
+  --disable-benchmark
   --without-mecab

component/groonga/groonga-storage-engine-0.4.mariadb.patch

-diff -ur groonga-storage-engine-0.4.orig/configure groonga-storage-engine-0.4/configure
---- groonga-storage-engine-0.4.orig/configure	2010-11-24 06:23:50.000000000 +0100
-+++ groonga-storage-engine-0.4/configure	2011-01-01 16:01:07.000000000 +0100
-@@ -13925,8 +13925,8 @@
-     as_fn_error "failed to run \"$ac_mysql_config\": $plugindir" "$LINENO" 5
-   fi
-   MYSQL_INC="$MYSQL_INC $($ac_mysql_config --include)"
--  ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1-3`"
--  if test "$ac_mysql_major_version" = "5.1"; then
-+  ac_mysql_major_version="`$ac_mysql_config --version | cut -b 1,3`"
-+  if test $ac_mysql_major_version -lt 55; then
-     MYSQL51="-DMYSQL51"
- 
-   fi

component/haproxy/buildout.cfg

@@ -3,8 +3,8 @@ parts = haproxy
 
 [haproxy]
 recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.18.tar.gz
-md5sum = 4ac88bb1a76c4b84ed4f6131183bedbe
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.19.tar.gz
+md5sum = 41392d738460dbf99295fd928031c6a4
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/imagemagick/buildout.cfg

@@ -25,18 +25,10 @@ md5sum = 3f28ecd9f6722cf2c3238ce6ec3d7a68
 download-only = true
 filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
-[imagemagick-6.6.7-4-without-lzma.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-path = ${:filename}
-md5sum = 04e1b934a58f4b3a83e4df148795b338
-download-only = true
-filename = imagemagick-6.6.7-4-without-lzma.patch
-
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.3-1.tar.bz2
-md5sum = 89d378733d89bc61c04bc0fdc140a3a7
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.3-10.tar.bz2
+md5sum = 3c1d1a04b1ed2998217e16001b58069f
 configure-options =
   --disable-static
   --without-x
@@ -55,6 +47,7 @@ configure-options =
   --without-lqr
   --without-lzma
   --without-openexr
+  --without-pango
   --without-rsvg
   --without-wmf
   --without-xml
@@ -66,7 +59,6 @@ configure-options =
 patch-options = -p1
 patches =
   ${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:location}/${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:filename}
-  ${imagemagick-6.6.7-4-without-lzma.patch:location}/${imagemagick-6.6.7-4-without-lzma.patch:filename}
 environment =
   PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig

component/imagemagick/imagemagick-6.6.7-4-without-lzma.patch

---- ImageMagick-6.6.7-4/configure~	2011-02-10 11:50:21.704561096 +0100
-+++ ImageMagick-6.6.7-4/configure	2011-02-10 12:23:45.612561097 +0100
-@@ -28251,7 +28251,7 @@
- #
- have_lzma='no'
- LZMA_LIBS=''
--if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then
-+if test "$with_lzma" != 'no'; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
- $as_echo "-------------------------------------------------------------" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZMA" >&5
---- ImageMagick-6.6.7-4/configure.ac~	2011-02-10 11:50:21.693561096 +0100
-+++ ImageMagick-6.6.7-4/configure.ac	2011-02-10 12:23:40.013561098 +0100
-@@ -2290,7 +2290,7 @@
- #
- have_lzma='no'
- LZMA_LIBS=''
--if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then
-+if test "$with_lzma" != 'no'; then
-     AC_MSG_RESULT([-------------------------------------------------------------])
-   AC_MSG_CHECKING(for LZMA)
-   AC_MSG_RESULT()

component/libreoffice-bin/buildout.cfg

@@ -12,11 +12,12 @@ find-links =
 [libreoffice-bin]
 recipe = slapos.recipe.build
 # here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-url = http://download.documentfoundation.org/libreoffice/stable/3.4.4/rpm/%s/LibO_3.4.4_Linux_%s_install-rpm_en-US.tar.gz
+version = 3.4.5
+url = http://download.documentfoundation.org/libreoffice/stable/${:version}/rpm/%s/LibO_${:version}_Linux_%s_install-rpm_en-US.tar.gz
 
 # supported architectures md5sums
-md5sum_x86 = 529c60e161d0c23405723f4a3cd1e046
-md5sum_x86-64 = fc6cb85312d6e11a7ab6ddb1bc4e79cc
+md5sum_x86 = 34786e6aa570782abac551ab092f3fb3
+md5sum_x86-64 = 2159a50daab707c02b669a83f635ff0c
 
 # where office code can be found?
 officedir = libreoffice3.4

component/mariadb/buildout.cfg

@@ -46,6 +46,7 @@ configure-options =
   --with-plugins=max-no-ndb
   --with-aria-tmp-tables
   --without-plugin-innodb_plugin
+  --without-plugin-oqgraph
   --without-readline
   --with-ssl
   --with-libevent=${libevent:location}
@@ -60,8 +61,8 @@ environment =
 
 [mroonga-mariadb]
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-1.10.tar.gz
-md5sum = 6a712b2b20eddc65d918dabd8fba590f
+url = https://github.com/downloads/mroonga/mroonga/mroonga-1.11.tar.gz
+md5sum = 69e56246226e0b9969ee7f99e08aa7da
 configure-options =
   --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
   --with-mysql-config=${mariadb:location}/bin/mysql_config

component/mydumper/buildout.cfg

+[buildout]
+
+extends =
+    ../cmake/buildout.cfg
+    ../glib/buildout.cfg
+    ../pcre/buildout.cfg
+    ../mariadb/buildout.cfg
+
+parts = mydumper
+
+# XXX-Antoine:
+# This is really dirty, but it's the only way to install
+# mydumper that works
+[mydumper]
+recipe = slapos.recipe.build
+url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
+md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
+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/mysql/
+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/
+mydumper-patches =
+   ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
+slapos_promise =
+    directory:bin
+    file:bin/mydumper
+    file:bin/myloader
+script =
+    import os
+    url = self.download(self.options['url'], self.options.get('md5sum'))
+    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['PKG_CONFIG_PATH'] = self.options['pkg-config-path'] + ':' + \
+                             env.get('PKG_CONFIG_PATH', '')
+    env['CMAKE_INCLUDE_PATH'] = self.options['includes']
+    env['CMAKE_LIBRARY_PATH'] = self.options['libraries']
+    env['CFLAGS'] = self.options['cflags']
+    command_line = [self.options['cmake-command'],
+                    '-DCMAKE_INSTALL_PREFIX=%%s' %% self.options['location'],
+                    '-DMYSQL_CONFIG=%%s' %% self.options['mysql-config'],
+                    '-DCMAKE_C_FLAGS=%%s' %% self.options['cflags'],
+                    '-DCMAKE_INSTALL_RPATH=%%s' %% self.options['libraries'],
+                    '.']
+    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]
+#recipe = hexagonit.recipe.cmmi
+#url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
+#md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
+#strip-top-level-dir = true
+#location = ${buildout:parts-directory}/${:_buildout_section_name_}
+#configure-command =
+#    ${cmake:location}/bin/cmake \
+#    -DCMAKE_INSTALL_PREFIX=${:location} \
+#    -DMYSQL_CONFIG=${mariadb:location}/bin/mysql_config \
+#    -DCMAKE_INCLUDE_PATH=${zlib:location}/include \
+#    -DCMAKE_LIBRARY_PATH=${zlib:location}/lib \
+#    .
+#environment=
+#    PATH=$PATH:${buildout:bin-directory}
+#    PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig/:${pcre:location}/lib/pkgconfig/
+

component/mydumper/mydumper-remove-warnings-errors.patch

+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ 
+ add_subdirectory(docs)
+ 
+-set(CMAKE_C_FLAGS "-Wall -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -Werror -O3 -g ${MYSQL_CFLAGS}")
++set(CMAKE_C_FLAGS "-Wall -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -O3 -g ${MYSQL_CFLAGS}")
+ 
+ include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
+ 

component/mysql-tritonn-5.0/buildout.cfg

@@ -76,7 +76,6 @@ configure-options =
   --enable-assembler
   --without-readline
   --with-sphinx-storage-engine
-  --with-named-curses-libs=${ncurses:location}/lib/libncurses.so
   --with-zlib-dir=${zlib:location}
 
 make-options =
@@ -89,5 +88,5 @@ patches =
   ${mysql-5.0-sphinx-patch:location}/${mysql-5.0-sphinx-patch:filename}
 environment =
     PATH=${senna:location}/bin:${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
-    CPPFLAGS=-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline:location}/include
-    LDFLAGS=-L${senna:location}/lib -L${readline:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
+    CPPFLAGS=-I${senna:location}/include/senna -I${ncurses:location}/include -I${readline5:location}/include
+    LDFLAGS=-L${senna:location}/lib -L${readline5:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline5:location}/lib

component/openssl/buildout.cfg

@@ -5,6 +5,7 @@
 
 [buildout]
 extends =
+  ../ca-certificates/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -20,8 +21,8 @@ download-only = true
 
 [openssl]
 recipe = hexagonit.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.0f.tar.gz
-md5sum = e358705fb4a8827b5e9224a73f442025
+url = https://www.openssl.org/source/openssl-1.0.0g.tar.gz
+md5sum = 07ecbe4324f140d157478637d6beccf1
 patches =
   ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}
 patch-options = -p0
@@ -38,5 +39,7 @@ configure-options =
 # it seems that parallel build sometimes fails for openssl.
 make-options =
   -j1
+make-targets =
+  install && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
   LDFLAGS="-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"
   SHARED_LDFLAGS="-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"

component/percona-toolkit/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 recipe = hexagonit.recipe.cmmi
 depends =
   ${perl:version}
-url = http://www.percona.com/redir/downloads/percona-toolkit/percona-toolkit-1.0.1.tar.gz
-md5sum = 1d843b1b3ebd2eacfa3bf95ef2a00557
+url = http://www.percona.com/redir/downloads/percona-toolkit/percona-toolkit-2.0.1.tar.gz
+md5sum = 3a78c78672cb7c634bda35dfb2f817bf
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/pkgconfig/buildout.cfg

@@ -11,8 +11,8 @@ extends =
 
 [pkgconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz
-md5sum = a3270bab3f4b69b7dc6dbdacbcae9745
+url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
+md5sum = 47525c26a9ba7ba14bf85e01509a7234
 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/pwgen/buildout.cfg

+[buildout]
+parts =
+  pwgen
+
+[pwgen]
+recipe = hexagonit.recipe.cmmi
+url = http://downloads.sourceforge.net/project/pwgen/pwgen/2.06/pwgen-2.06.tar.gz
+md5sum = 935aebcbe610fbc9de8125e7b7d71297

component/readline/buildout.cfg

@@ -2,8 +2,15 @@
 parts =
   readline5
   readline
-extends =
-  ../ncurses/buildout.cfg
+
+# readline-5.x is still used for GPL2 only softwares.
+[readline5]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
+md5sum = e39331f32ad14009b9ff49cc10c5e751
+configure-options =
+  --enable-multibyte
+  --disable-static
 
 # readline-5.x is still used for GPL2 only softwares.
 [readline5]
@@ -22,7 +29,5 @@ recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
 md5sum = 67948acb2ca081f23359d0256e9a271c
 configure-options =
+  --enable-multibyte
   --disable-static
-  --with-ncurses=${ncurses:location}
-environment =
-    LDFLAGS =-Wl,-rpath=${ncurses:location}/lib

component/shellinabox/0001-Switch-to-IPv6.patch

+From 50ec7439e80bd6a77346dc6482895e481d8cd43a Mon Sep 17 00:00:00 2001
+From: Antoine Catton <acatton@tiolive.com>
+Date: Tue, 10 Jan 2012 18:30:20 +0100
+Subject: [PATCH] Switch to IPv6
+
+---
+ libhttp/http.h             |    4 ++--
+ libhttp/httpconnection.c   |   11 ++++++++++-
+ libhttp/server.c           |   33 +++++++++++++++++++--------------
+ libhttp/server.h           |    6 +++---
+ shellinabox/shellinaboxd.c |   14 +++++++-------
+ 5 files changed, 41 insertions(+), 27 deletions(-)
+
+diff --git a/libhttp/http.h b/libhttp/http.h
+index e7840fa..5cd61e3 100644
+--- a/libhttp/http.h
++++ b/libhttp/http.h
+@@ -66,8 +66,8 @@ typedef struct ServerConnection ServerConnection;
+ typedef struct Server Server;
+ typedef struct URL URL;
+ 
+-Server *newCGIServer(int localhostOnly, int portMin, int portMax, int timeout);
+-Server *newServer(int localhostOnly, int port);
++Server *newCGIServer(char *ipv6, int portMin, int portMax, int timeout);
++Server *newServer(char *ipv6, int port);
+ void deleteServer(Server *server);
+ int  serverGetListeningPort(Server *server);
+ int  serverGetFd(Server *server);
+diff --git a/libhttp/httpconnection.c b/libhttp/httpconnection.c
+index c8e69f6..cae467f 100644
+--- a/libhttp/httpconnection.c
++++ b/libhttp/httpconnection.c
+@@ -823,8 +823,17 @@ static int httpHandleCommand(struct HttpConnection *http,
+   const char *host                         = getFromHashMap(&http->header,
+                                                             "host");
+   if (host) {
++    int brackets = 0; // For IPv6 hosts
+     for (char ch; (ch = *host) != '\000'; host++) {
+-      if (ch == ':') {
++      if (ch == '[') {
++          brackets = 1;
++          break;
++      }
++      if (ch == ']') {
++          brackets = 0;
++          break;
++      }
++      if (!brackets && ch == ':') {
+         *(char *)host                      = '\000';
+         break;
+       }
+diff --git a/libhttp/server.c b/libhttp/server.c
+index f52a269..2c30bd8 100644
+--- a/libhttp/server.c
++++ b/libhttp/server.c
+@@ -170,19 +170,19 @@ static int serverQuitHandler(struct HttpConnection *http, void *arg) {
+   return HTTP_DONE;
+ }
+ 
+-struct Server *newCGIServer(int localhostOnly, int portMin, int portMax,
++struct Server *newCGIServer(char *ipv6, int portMin, int portMax,
+                             int timeout) {
+   struct Server *server;
+   check(server = malloc(sizeof(struct Server)));
+-  initServer(server, localhostOnly, portMin, portMax, timeout);
++  initServer(server, ipv6, portMin, portMax, timeout);
+   return server;
+ }
+ 
+-struct Server *newServer(int localhostOnly, int port) {
+-  return newCGIServer(localhostOnly, port, port, -1);
++struct Server *newServer(char *ipv6, int port) {
++  return newCGIServer(ipv6, port, port, -1);
+ }
+ 
+-void initServer(struct Server *server, int localhostOnly, int portMin,
++void initServer(struct Server *server, char *ipv6, int portMin,
+                 int portMax, int timeout) {
+   server->looping               = 0;
+   server->exitAll               = 0;
+@@ -192,14 +192,19 @@ void initServer(struct Server *server, int localhostOnly, int portMin,
+   server->numConnections        = 0;
+ 
+   int true                      = 1;
+-  server->serverFd              = socket(PF_INET, SOCK_STREAM, 0);
++  server->serverFd              = socket(PF_INET6, SOCK_STREAM, 0);
+   check(server->serverFd >= 0);
+   check(!setsockopt(server->serverFd, SOL_SOCKET, SO_REUSEADDR,
+                     &true, sizeof(true)));
+-  struct sockaddr_in serverAddr = { 0 };
+-  serverAddr.sin_family         = AF_INET;
+-  serverAddr.sin_addr.s_addr    = htonl(localhostOnly
+-                                        ? INADDR_LOOPBACK : INADDR_ANY);
++  struct sockaddr_in6 serverAddr = { 0 };
++  serverAddr.sin6_family         = AF_INET6;
++  if (ipv6 != NULL) {
++    if (!inet_pton(AF_INET6, ipv6, serverAddr.sin6_addr.s6_addr)) {
++        fatal("Bad ipv6 address");
++    }
++  } else {
++    serverAddr.sin6_addr = in6addr_any;
++  }
+ 
+   // Linux unlike BSD does not have support for picking a local port range.
+   // So, we have to randomly pick a port from our allowed port range, and then
+@@ -214,14 +219,14 @@ void initServer(struct Server *server, int localhostOnly, int portMin,
+     int portStart               = rand() % (portMax - portMin + 1) + portMin;
+     for (int p = 0; p <= portMax-portMin; p++) {
+       int port                  = (p+portStart)%(portMax-portMin+1)+ portMin;
+-      serverAddr.sin_port       = htons(port);
++      serverAddr.sin6_port       = htons(port);
+       if (!bind(server->serverFd, (struct sockaddr *)&serverAddr,
+                 sizeof(serverAddr))) {
+         break;
+       }
+-      serverAddr.sin_port       = 0;
++      serverAddr.sin6_port       = 0;
+     }
+-    if (!serverAddr.sin_port) {
++    if (!serverAddr.sin6_port) {
+       fatal("Failed to find any available port");
+     }
+   }
+@@ -231,7 +236,7 @@ void initServer(struct Server *server, int localhostOnly, int portMin,
+   check(!getsockname(server->serverFd, (struct sockaddr *)&serverAddr,
+                      &socklen));
+   check(socklen == sizeof(serverAddr));
+-  server->port                  = ntohs(serverAddr.sin_port);
++  server->port                  = ntohs(serverAddr.sin6_port);
+   info("Listening on port %d", server->port);
+ 
+   check(server->pollFds         = malloc(sizeof(struct pollfd)));
+diff --git a/libhttp/server.h b/libhttp/server.h
+index bb879fb..5ffb698 100644
+--- a/libhttp/server.h
++++ b/libhttp/server.h
+@@ -78,10 +78,10 @@ struct Server {
+   struct SSLSupport       ssl;
+ };
+ 
+-struct Server *newCGIServer(int localhostOnly, int portMin, int portMax,
++struct Server *newCGIServer(char *ipv6, int portMin, int portMax,
+                             int timeout);
+-struct Server *newServer(int localhostOnly, int port);
+-void initServer(struct Server *server, int localhostOnly, int portMin,
++struct Server *newServer(char *ipv6, int port);
++void initServer(struct Server *server, char *ipv6, int portMin,
+                 int portMax, int timeout);
+ void destroyServer(struct Server *server);
+ void deleteServer(struct Server *server);
+diff --git a/shellinabox/shellinaboxd.c b/shellinabox/shellinaboxd.c
+index dcf05ff..2d1d758 100644
+--- a/shellinabox/shellinaboxd.c
++++ b/shellinabox/shellinaboxd.c
+@@ -80,7 +80,7 @@
+ static int            port;
+ static int            portMin;
+ static int            portMax;
+-static int            localhostOnly = 0;
++static char           *ipv6 = NULL;
+ static int            noBeep        = 0;
+ static int            numericHosts  = 0;
+ static int            enableSSL     = 1;
+@@ -747,7 +747,7 @@ static void usage(void) {
+           "  -g, --group=GID             switch to this group (default: %s)\n"
+           "  -h, --help                  print this message\n"
+           "      --linkify=[none|normal|agressive] default is \"normal\"\n"
+-          "      --localhost-only        only listen on 127.0.0.1\n"
++          "      --ipv6                  listen on a specific ipv6\n"
+           "      --no-beep               suppress all audio output\n"
+           "  -n, --numeric               do not resolve hostnames\n"
+           "  -p, --port=PORT             select a port (default: %d)\n"
+@@ -839,7 +839,7 @@ static void parseArgs(int argc, char * const argv[]) {
+       { "static-file",      1, 0, 'f' },
+       { "group",            1, 0, 'g' },
+       { "linkify",          1, 0,  0  },
+-      { "localhost-only",   0, 0,  0  },
++      { "ipv6",             1, 0,  0  },
+       { "no-beep",          0, 0,  0  },
+       { "numeric",          0, 0, 'n' },
+       { "port",             1, 0, 'p' },
+@@ -1001,8 +1001,8 @@ static void parseArgs(int argc, char * const argv[]) {
+               "\"none\", \"normal\", or \"aggressive\".");
+       }
+     } else if (!idx--) {
+-      // Localhost Only
+-      localhostOnly        = 1;
++      // IPv6
++      ipv6 = optarg;
+     } else if (!idx--) {
+       // No Beep
+       noBeep               = 1;
+@@ -1197,7 +1197,7 @@ int main(int argc, char * const argv[]) {
+   // Create a new web server
+   Server *server;
+   if (port) {
+-    check(server  = newServer(localhostOnly, port));
++    check(server  = newServer(ipv6, port));
+     dropPrivileges();
+     setUpSSL(server);
+   } else {
+@@ -1217,7 +1217,7 @@ int main(int argc, char * const argv[]) {
+       _exit(0);
+     }
+     check(!NOINTR(close(fds[0])));
+-    check(server  = newCGIServer(localhostOnly, portMin, portMax,
++    check(server  = newCGIServer(ipv6, portMin, portMax,
+                                  AJAX_TIMEOUT));
+     cgiServer     = server;
+     setUpSSL(server);
+-- 
+1.7.6.5
+

component/shellinabox/0002-Allow-to-run-entire-command-path.patch

+From eee6f7180dc5dd4523264e7ce0721945ab2b78a1 Mon Sep 17 00:00:00 2001
+From: Antoine Catton <acatton@tiolive.com>
+Date: Wed, 11 Jan 2012 17:32:15 +0100
+Subject: [PATCH 2/2] Allow to run entire command path.
+
+---
+ shellinabox/launcher.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c
+index fb8a133..e116a75 100644
+--- a/shellinabox/launcher.c
++++ b/shellinabox/launcher.c
+@@ -1226,8 +1226,7 @@ static void execService(int width, int height, struct Service *service,
+ 
+   extern char **environ;
+   environ                     = environment;
+-  char *cmd                   = strrchr(argv[0], '/');
+-  execvp(cmd ? cmd + 1: argv[0], argv);
++  execvp(argv[0], argv);
+ }
+ 
+ void setWindowSize(int pty, int width, int height) {
+-- 
+1.7.6.5
+

component/shellinabox/buildout.cfg

+[buildout]
+extends =
+  ../zlib/buildout.cfg
+  ../openssl/buildout.cfg
+  ../patch/buildout.cfg
+
+parts = shellinabox
+
+[shellinabox-full-path-patch]
+recipe = hexagonit.recipe.download
+filename = 0002-Allow-to-run-entire-command-path.patch
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+
+
+[shellinabox-ipv6-patch]
+recipe = hexagonit.recipe.download
+filename = 0001-Switch-to-IPv6.patch
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+
+[shellinabox]
+recipe = hexagonit.recipe.cmmi
+url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz
+md5sum = 0e144910d85d92edc54702ab9c46f032
+environment =
+    CFLAGS = -I${zlib:location}/include -I${openssl:location}/include
+    LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
+    PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig/
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+patches =
+    ${shellinabox-ipv6-patch:location}/${shellinabox-ipv6-patch:filename}
+    ${shellinabox-full-path-patch:location}/${shellinabox-full-path-patch:filename}

component/sphinx/sphinx-1.10-fix_nosigpipe.patch

-# http://www.sphinxsearch.com/bugs/view.php?id=550
-# 0000550: Can not make libsphinxclient
-
---- sphinx-1.10-beta/api/libsphinxclient/sphinxclient.c	2010-07-15 13:05:40.000000000 +0200
-+++ sphinx-1.10-beta/api/libsphinxclient/sphinxclient.c	2010-07-21 20:43:26.760024489 +0200
-@@ -1355,11 +1355,13 @@
- 
- 	optval = 1;
- #ifndef _WIN32
-+  #ifdef SO_NOSIGPIPE
- 	if ( setsockopt ( sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&optval, (socklen_t)sizeof(optval) ) < 0 )
- 	{
- 		set_error ( client, "setsockopt() failed: %s", sock_error() );
- 		return -1;
- 	}
-+  #endif
- #endif
- 
- 	res = connect ( sock, (struct sockaddr*)&sa, sizeof(sa) );

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = hexagonit.recipe.cmmi
-url = http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz
-md5sum = dce303524736fe89a76b8ed29d566352
+url = http://www.sqlite.org/sqlite-autoconf-3071000.tar.gz
+md5sum = 9ed2ca93577b58cfa0d01f64b9312ab9
 configure-options =
   --disable-static
   --enable-readline

component/zabbix/buildout.cfg

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

setup.py

@@ -30,6 +30,7 @@ setup(name=name,
         'lxml', # for full blown python interpreter
         'netaddr', # to manipulate on IP addresses
         'setuptools', # namespaces
+        'inotifyx', # to watch filesystem changes (used in lockfile)
         'slapos.core', # uses internally
 #        'slapos.toolbox', # needed for libcloud, cloudmgr, disabled for now
         'xml_marshaller', # need to communication with slapgrid
@@ -39,45 +40,81 @@ setup(name=name,
       zip_safe=True,
       entry_points={
         'zc.buildout': [
+          'apachephp = slapos.recipe.apachephp:Recipe',
+          'apacheproxy = slapos.recipe.apacheproxy:Recipe',
+          'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
           'certificate_authority = slapos.recipe.certificate_authority:Recipe',
           'certificate_authority.request = slapos.recipe.certificate_authority:Request',
           'cron = slapos.recipe.dcron:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
           'davstorage = slapos.recipe.davstorage:Recipe',
+          'dropbear = slapos.recipe.dropbear:Recipe',
+          'dropbear.add_authorized_key = slapos.recipe.dropbear:AddAuthorizedKey',
+          'dropbear.client = slapos.recipe.dropbear:Client',
           'duplicity = slapos.recipe.duplicity:Recipe',
-          'erp5 = slapos.recipe.erp5:Recipe',
           'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',
+          'equeue = slapos.recipe.equeue:Recipe',
           'erp5testnode = slapos.recipe.erp5testnode:Recipe',
           'helloworld = slapos.recipe.helloworld:Recipe',
+          'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
+          'fontconfig = slapos.recipe.fontconfig:Recipe',
           'java = slapos.recipe.java:Recipe',
           'kumofs = slapos.recipe.kumofs:Recipe',
+          'generic.kumofs = slapos.recipe.generic_kumofs:Recipe',
+          'haproxy = slapos.recipe.haproxy:Recipe',
           'kvm = slapos.recipe.kvm:Recipe',
           'libcloud = slapos.recipe.libcloud:Recipe',
           'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
+          'lockfile = slapos.recipe.lockfile:Recipe',
           'memcached = slapos.recipe.memcached:Recipe',
+          'generic.memcached = slapos.recipe.generic_memcached:Recipe',
           'mysql = slapos.recipe.mysql:Recipe',
+          'mydumper = slapos.recipe.mydumper:Recipe',
+          'generic.mysql = slapos.recipe.generic_mysql:Recipe',
           'mkdirectory = slapos.recipe.mkdirectory:Recipe',
           'nbdserver = slapos.recipe.nbdserver:Recipe',
           'nosqltestbed = slapos.recipe.nosqltestbed:NoSQLTestBed',
+          'notifier = slapos.recipe.notifier:Recipe',
+          'notifier.callback = slapos.recipe.notifier:Callback',
+          'notifier.notify = slapos.recipe.notifier:Notify',
           'lamp = slapos.recipe.lamp:Request',
           'lamp.request = slapos.recipe.lamp:Request',
           'lamp.static = slapos.recipe.lamp:Static',
           'lamp.simple = slapos.recipe.lamp:Simple',
           'logrotate = slapos.recipe.logrotate:Recipe',
           'logrotate.d = slapos.recipe.logrotate:Part',
+          'pbs = slapos.recipe.pbs:Recipe',
+          'publish = slapos.recipe.publish:Recipe',
           'publishurl = slapos.recipe.publishurl:Recipe',
+          'pwgen = slapos.recipe.pwgen:Recipe',
           'proactive = slapos.recipe.proactive:Recipe',
           'request = slapos.recipe.request:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
+          'shell = slapos.recipe.shell:Recipe',
+          'shellinabox = slapos.recipe.shellinabox:Recipe',
+          'symbolic.link = slapos.recipe.symbolic_link:Recipe',
           'softwaretype = slapos.recipe.softwaretype:Recipe',
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
           'slaprunner = slapos.recipe.slaprunner:Recipe',
+          'sshkeys_authority = slapos.recipe.sshkeys_authority:Recipe',
+          'sshkeys_authority.request = slapos.recipe.sshkeys_authority:Request',
+          'sphinx= slapos.recipe.sphinx:Recipe',
           'stunnel = slapos.recipe.stunnel:Recipe',
           'testnode = slapos.recipe.testnode:Recipe',
+          'urlparse = slapos.recipe._urlparse:Recipe',
           'vifib = slapos.recipe.vifib:Recipe',
+          'waitfor = slapos.recipe.waitfor:Recipe',
           'xwiki = slapos.recipe.xwiki:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
+          'generic.zope = slapos.recipe.generic_zope:Recipe',
+          'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',
+          'generate.erp5.tidstorage = slapos.recipe.generate_erp5_tidstorage:Recipe',
+          'generate.cloudooo = slapos.recipe.generate_cloudooo:Recipe',
+          'zeo = slapos.recipe.zeo:Recipe',
+          'tidstorage = slapos.recipe.tidstorage:Recipe',
+          'erp5.update = slapos.recipe.erp5_update:Recipe',
+          'erp5.test = slapos.recipe.erp5_test:Recipe',
         ],
         'slapos.recipe.nosqltestbed.plugin': [
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',

slapos/recipe/_urlparse.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 urlparse import urlparse
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def _options(self, options):
+    url = urlparse(options['url'])
+
+    def to_str(data):
+      if data is None:
+        return ''
+      return str(data)
+
+    options.update(scheme=url.scheme,
+                   username=to_str(url.username),
+                   password=to_str(url.password),
+                   host=to_str(url.hostname),
+                   port=to_str(url.port),
+                   path=url.path.strip('/'),
+                   params=url.params,
+                   query=url.query,
+                   fragment=url.fragment)
+
+  def install(self):
+    return []

slapos/recipe/apache_zope_backend/__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 pkg_resources
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+    path_list = []
+    ip = self.options['ip']
+    port = self.options['port']
+    backend = self.options['backend']
+    key = self.options['key-file']
+    certificate = self.options['cert-file']
+    access_control_string = self.options['access-control-string']
+    apache_conf = dict()
+    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['certificate'] = certificate
+    apache_conf['key'] = key
+    apache_conf['path'] = '/'
+    apache_conf['access_control_string'] = access_control_string
+    apache_conf['rewrite_rule'] = "RewriteRule (.*) %s$1 [L,P]" % backend
+    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=[key, certificate],
+              binary=self.options['apache-binary'],
+              config=apache_config_file
+            )
+          ])
+    path_list.append(wrapper)
+    return path_list

slapos/recipe/apache_zope_backend/apache.py

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

slapos/recipe/apache_zope_backend/template/apache.zope.conf.in

+# Apache configuration file for Zope
+# Automatically generated
+
+# List of modules
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule headers_module modules/mod_headers.so
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+LockFile "%(lock_file)s"
+Listen %(ip)s:%(port)s
+ServerAdmin %(server_admin)s
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+# As backend is trusting REMOTE_USER header unset it always
+RequestHeader unset REMOTE_USER
+
+# SSL Configuration
+SSLEngine on
+SSLCertificateFile %(certificate)s
+SSLCertificateKeyFile %(key)s
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+
+SSLProxyEngine On
+
+# Log configuration
+ErrorLog "%(error_log)s"
+# Default apache log format with request time in microsecond at the end
+LogFormat "%%h %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\" %%D" combined
+CustomLog "%(access_log)s" combined
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+# Path protected
+<Location %(path)s>
+  Order Deny,Allow
+  Deny from all
+  Allow from %(access_control_string)s
+</Location>
+
+# Magic of Zope related rewrite
+RewriteEngine On
+%(rewrite_rule)s

slapos/recipe/apachephp/__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.
+#
+##############################################################################
+import shutil
+import os
+import signal
+from binascii import b2a_uu as uuencode
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    # Copy application
+    shutil.rmtree(self.options['htdocs'])
+    shutil.copytree(self.options['source'],
+                    self.options['htdocs'])
+
+    # Install php.ini
+    php_ini = self.createFile(os.path.join(self.options['php-ini-dir'],
+                                           'php.ini'),
+      self.substituteTemplate(self.getTemplateFilename('php.ini.in'),
+        dict(tmp_directory=self.options['tmp-dir']))
+    )
+    path_list.append(php_ini)
+
+    # Install apache
+    apache_config = dict(
+      pid_file=self.options['pid-file'],
+      lock_file=self.options['lock-file'],
+      ip=self.options['ip'],
+      port=self.options['port'],
+      error_log=self.options['error-log'],
+      access_log=self.options['access-log'],
+      document_root=self.options['htdocs'],
+      php_ini_dir=self.options['php-ini-dir'],
+    )
+    httpd_conf = self.createFile(self.options['httpd-conf'],
+      self.substituteTemplate(self.getTemplateFilename('apache.in'),
+                              apache_config)
+    )
+    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']
+    )
+    path_list.append(wrapper)
+
+    secret_key_filename = os.path.join(self.buildout['buildout']['directory'],
+                                       '.php_secret_key')
+    if not os.path.exists(secret_key_filename):
+      secret_key = uuencode(os.urandom(45)).strip()
+      # Remove unsafe characters
+      secret_key = secret_key.translate(None, '"\'')
+      with open(secret_key_filename, 'w') as secret_key_file:
+        secret_key_file.write(secret_key)
+    else:
+      with open(secret_key_filename, 'r') as secret_key_file:
+        secret_key = secret_key_file.read()
+
+    application_conf = dict(mysql_database=self.options['mysql-database'],
+                            mysql_user=self.options['mysql-username'],
+                            mysql_password=self.options['mysql-password'],
+                            mysql_host='%s:%s' % (self.options['mysql-host'],
+                                                  self.options['mysql-port']),
+                            secret_key=secret_key,
+                           )
+
+    directory, file_ = os.path.split(self.options['configuration'])
+
+    path = self.options['htdocs']
+    if directory:
+      path = os.path.join(path, directory)
+      if not os.path.exists(path):
+        os.makedirs(path)
+      if not os.path.isdir(path):
+        raise OSError("Cannot create %r." % path)
+
+    destination = os.path.join(path, file_)
+    config = self.createFile(destination,
+      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)
+      os.kill(pid, signal.SIGUSR1) # Graceful restart
+
+    return path_list

slapos/recipe/apachephp/template/apache.in

+# Apache static configuration
+# Automatically generated
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+LockFile "%(lock_file)s"
+Listen %(ip)s:%(port)s
+PHPINIDir %(php_ini_dir)s
+ServerAdmin someone@email
+DefaultType text/plain
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+AddType application/x-httpd-php .php .phtml .php5 .php4
+AddType application/x-httpd-php-source .phps
+
+# Log configuration
+ErrorLog "%(error_log)s"
+LogLevel warn
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
+CustomLog "%(access_log)s" common
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+<Directory %(document_root)s>
+  Options FollowSymLinks
+  AllowOverride All
+  Order allow,deny
+  Allow from all
+</Directory>
+DocumentRoot %(document_root)s
+DirectoryIndex index.html index.php
+
+# List of modules
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule dav_module modules/mod_dav.so
+LoadModule dav_fs_module modules/mod_dav_fs.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule php5_module modules/libphp5.so
+LoadModule alias_module modules/mod_alias.so

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

+[PHP]
+engine = On
+safe_mode = Off
+expose_php = Off
+error_reporting = E_ALL & ~(E_DEPRECATED|E_NOTICE|E_WARNING)
+display_errors = On
+display_startup_errors = Off
+log_errors = On
+log_errors_max_len = 1024
+ignore_repeated_errors = Off
+ignore_repeated_source = Off
+session.save_path = "%(tmp_directory)s"
+session.auto_start = 0
+date.timezone = Europe/Paris
+file_uploads = On
+upload_max_filesize = 8M
+post_max_size = 8M
+magic_quotes_gpc=0ff

slapos/recipe/apacheproxy/__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.
+#
+##############################################################################
+import os
+import signal
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    # Install apache
+    apache_config = dict(
+      pid_file=self.options['pid-file'],
+      lock_file=self.options['lock-file'],
+      ip=self.options['ip'],
+      port=self.options['port'],
+      error_log=self.options['error-log'],
+      access_log=self.options['access-log'],
+      backend_url=self.options['url'],
+    )
+    httpd_conf = self.createFile(self.options['httpd-conf'],
+      self.substituteTemplate(self.getTemplateFilename('apache.in'),
+                              apache_config)
+    )
+    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']
+    )
+    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
+
+    return path_list

slapos/recipe/apacheproxy/template/apache.in

+# Apache static configuration
+# Automatically generated
+
+# Basic server configuration
+PidFile "%(pid_file)s"
+LockFile "%(lock_file)s"
+Listen %(ip)s:%(port)s
+ServerAdmin someone@email
+DefaultType text/plain
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+# Log configuration
+ErrorLog "%(error_log)s"
+LogLevel warn
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
+LogFormat "%%h %%{REMOTE_USER}i %%l %%u %%t \"%%r\" %%>s %%b" common
+CustomLog "%(access_log)s" common
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
+
+ProxyPass / %(backend_url)s
+
+# List of modules
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule setenvif_module modules/mod_setenvif.so
+LoadModule version_module modules/mod_version.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule dir_module modules/mod_dir.so
+LoadModule alias_module modules/mod_alias.so

slapos/recipe/certificate_authority/__init__.py

@@ -117,7 +117,7 @@ class Request(Recipe):
       if os.path.islink(link):
         os.unlink(link)
       elif os.path.exists(link):
-        raise OSError("%r file should be a symbolic link.")
+        raise OSError("%r file should be a symbolic link." % link)
 
     os.symlink(key, key_file)
     os.symlink(certificate, cert_file)

slapos/recipe/certificate_authority/certificate_authority.py

@@ -2,6 +2,7 @@ import os
 import subprocess
 import time
 import ConfigParser
+import uuid
 
 
 def popenCommunicate(command_list, input=None):
@@ -44,7 +45,7 @@ class CertificateAuthority:
       popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
           self.openssl_configuration, '-new', '-x509', '-extensions',
           'v3_ca', '-keyout', self.key, '-out', self.certificate,
-          '-days', '10950'], 'Automatic Certificate Authority\n')
+          '-days', '10950'], 'Certificate Authority %s\n' % uuid.uuid1())
     except:
       try:
         for f in file_list:

slapos/recipe/davstorage/__init__.py

@@ -24,102 +24,88 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import BaseSlapRecipe
-import os
 import subprocess
-import pkg_resources
-import zc.buildout
-import zc.recipe.egg
-import sys
-
-class Recipe(BaseSlapRecipe):
-  def getTemplateFilename(self, template_name):
-    return pkg_resources.resource_filename(__name__,
-        'template/%s' % template_name)
-
-  def _install(self):
-    self.path_list = []
-    self.requirements, self.ws = self.egg.working_set()
-    document_root = self.createDataDirectory('www')
-    apache_config = self.installApache(document_root)
-    self.setConnectionUrl(scheme='webdavs',
-                          host=apache_config['ip'],
-                          port=apache_config['port'],
-                          auth=(apache_config['user'],
-                                apache_config['password']))
-    return self.path_list
-
-  def installApache(self, document_root, ip=None, port=None):
-    if ip is None:
-      ip=self.getGlobalIPv6Address()
-    if port is None:
-      port = '9080'
-
-    htpasswd_config = self.createHtpasswd()
-    ssl_config = self.createCertificate(size=2048)
+import httplib
+import base64
+
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def _options(self, options):
+    options['password'] = self.generatePassword()
+
+  def install(self):
+    path_list = []
+
+    htpasswd_file = self.options['htpasswd-file']
+    # Create or empty the file
+    open(htpasswd_file, 'w').close()
+    path_list.append(htpasswd_file)
+
+    user = self.options['user']
+    password = self.options['password']
+    subprocess.check_call([self.options['apache-htpasswd'],
+                           '-bc', htpasswd_file,
+                           user, password
+                          ])
+
 
     apache_config = dict(
-      pid_file=os.path.join(self.run_directory, 'httpd.pid'),
-      lock_file=os.path.join(self.run_directory, 'httpd.lock'),
-      davlock_db=os.path.join(self.run_directory, 'davdb.lock'),
-      ip=ip,
-      port=port,
-      error_log=os.path.join(self.log_directory, 'httpd-error.log'),
-      access_log=os.path.join(self.log_directory, 'httpd-access.log'),
-      document_root=document_root,
-      modules_dir=self.options['apache_modules_dir'],
-      mime_types=self.options['apache_mime_file'],
-      server_root=self.work_directory,
-      email_address='admin@vifib.net',
-      htpasswd_file=htpasswd_config['htpasswd_file'],
-      ssl_certificate=ssl_config['certificate'],
-      ssl_key=ssl_config['key'],
+      pid_file=self.options['pid-file'],
+      lock_file=self.options['lock-file'],
+      davlock_db=self.options['davdb-lock'],
+      ip=self.options['ip'],
+      port=self.options['port'],
+      error_log=self.options['error-log'],
+      access_log=self.options['access-log'],
+      document_root=self.options['htdocs'],
+      modules_dir=self.options['apache-modules-dir'],
+      mime_types=self.options['apache-mime-file'],
+      server_root=self.options['root'],
+      email_address=self.options['email-address'],
+      htpasswd_file=htpasswd_file,
+      ssl_certificate=self.options['cert-file'],
+      ssl_key=self.options['key-file'],
     )
-    httpd_config_file = self.createConfigurationFile('httpd.conf',
+
+    # Create logfiles
+    for log in [self.options['error-log'], self.options['access-log']]:
+      open(log, 'a').close()
+
+    config_file = self.createFile(self.options['conf-file'],
        self.substituteTemplate(self.getTemplateFilename('httpd.conf.in'),
-                              apache_config))
-    self.path_list.append(httpd_config_file)
-    apache_runner = zc.buildout.easy_install.scripts(
-      [('httpd', 'slapos.recipe.librecipe.execute', 'execute')],
-      self.ws, sys.executable, self.wrapper_directory,
-      arguments=[self.options['apache_binary'],
-                 '-f', httpd_config_file,
-                 '-DFOREGROUND',
-                ]
-    )[0]
-    self.path_list.append(apache_runner)
-    return dict(ip=apache_config['ip'],
-                port=apache_config['port'],
-                user=htpasswd_config['user'],
-                password=htpasswd_config['password']
+                               apache_config)
     )
+    path_list.append(config_file)
 
-  def createHtpasswd(self):
-    htpasswd = self.createConfigurationFile('htpasswd', '')
-    self.path_list.append(htpasswd)
-    password = self.generatePassword()
-    user = 'user'
-    subprocess.check_call([self.options['apache_htpasswd'],
-                           '-bc', htpasswd,
-                           user, password
-                          ])
-    return dict(htpasswd_file=htpasswd,
-                user=user,
-                password=password)
-
-  def createCertificate(self, size=1024, subject='/C=FR/L=Marcq-en-Baroeul/O=Nexedi'):
-    key_file = os.path.join(self.etc_directory, 'httpd.key')
-    self.path_list.append(key_file)
-
-    certificate_file = os.path.join(self.etc_directory, 'httpd.crt')
-    self.path_list.append(certificate_file)
-
-    subprocess.check_call([self.options['openssl_binary'],
-                           'req', '-x509', '-nodes',
-                           '-newkey', 'rsa:%s' % size,
-                           '-subj', str(subject),
-                           '-out', certificate_file,
-                           '-keyout', key_file
-                          ])
-    return dict(key=key_file,
-                certificate=certificate_file)
+    wrapper = self.createPythonScript(self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.execute',
+      [self.options['apache-binary'], '-f', config_file, '-DFOREGROUND'])
+    path_list.append(wrapper)
+
+    promise = self.createPythonScript(self.options['promise'],
+      __name__ + '.promise',
+      dict(host=self.options['ip'], port=int(self.options['port']),
+           user=self.options['user'], password=self.options['password'])
+                                     )
+    path_list.append(promise)
+
+    return path_list
+
+def promise(args):
+  host = args['host']
+  port = args['port']
+  user = args['user']
+  password = args['password']
+
+  connection = httplib.HTTPSConnection(host, port)
+  auth = base64.b64encode('%s:%s' % (user, password))
+  connection.request('OPTIONS', '/',
+                     headers=dict(
+                       Authorization='Basic %s' % auth,
+                     )
+                    )
+  connection.getresponse()
+
+  return 0

slapos/recipe/dcron.py

@@ -58,13 +58,10 @@ class Recipe(GenericBaseRecipe):
 
 class Part(GenericBaseRecipe):
 
-  def _options(self, options):
-    if 'name' not in options:
-      options['name'] = self.name
-
   def install(self):
     cron_d = self.options['cron-entries']
-    filename = os.path.join(cron_d, 'name')
+    name = self.options['name']
+    filename = os.path.join(cron_d, name)
 
     with open(filename, 'w') as part:
       part.write('%(frequency)s %(command)s\n' % {

slapos/recipe/dropbear.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 itertools
+from slapos.recipe.librecipe import GenericBaseRecipe
+
+class KnownHostsFile(dict):
+
+  def __init__(self, filename):
+    self._filename = filename
+
+  def _load(self):
+    if os.path.exists(self._filename):
+      with open(self._filename, 'r') as keyfile:
+        for line in keyfile:
+          host, key = [column.strip() for column in line.split(' ', 1)]
+          self[host] = key
+
+  def _dump(self):
+    with open(self._filename, 'w') as keyfile:
+      for key, value in self.items():
+        if key is not None and value is not None:
+          keyfile.write('%(host)s %(key)s\n' % {'host': key,
+                                                'key': value})
+
+  def __enter__(self):
+    self._load()
+
+  def __exit__(self, exc_type, exc_value, traceback):
+    self._dump()
+
+
+
+class AuthorizedKeysFile(object):
+
+  def __init__(self, filename):
+    self.filename = filename
+
+  def append(self, key):
+    """Append the key to the file if the key's not in the file
+    """
+    # Create the file it it does not exist
+    try:
+      file_ = os.open(self.filename, os.O_CREAT | os.O_EXCL)
+      os.close(file_)
+    except:
+      pass
+
+    with open(self.filename, 'r') as keyfile:
+      # itertools.imap avoid loading all the authorized_keys file in
+      # memory which would be counterproductive.
+      present = (key.strip() in itertools.imap(lambda k: k.strip(),
+                                               keyfile))
+      try:
+        keyfile.seek(-1, os.SEEK_END)
+        ended_by_newline = (keyfile.read() == '\n')
+      except IOError:
+        ended_by_newline = True
+
+    if not present:
+      with open(self.filename, 'a') as keyfile:
+        if not ended_by_newline:
+          keyfile.write('\n')
+        keyfile.write(key.strip())
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    dropbear_cmd = [self.options['dropbear-binary']]
+    # Don't fork into background
+    dropbear_cmd.append('-F')
+    # Log on stderr
+    dropbear_cmd.append('-E')
+    # Don't display motd
+    dropbear_cmd.append('-m')
+    # Disable password login
+    dropbear_cmd.extend(['-s', '-g'])
+    # Disable port forwarding
+    dropbear_cmd.extend(['-j', '-k'])
+
+    host = self.options['host']
+    if ':' in host:
+      host = '[%s]' % host
+    port = self.options['port']
+    binding_address = '%s:%s' % (host, port)
+    dropbear_cmd.extend(['-p', binding_address])
+    # Single user mode
+    dropbear_cmd.append('-n')
+
+    if 'dss-keyfile' in self.options:
+      dropbear_cmd.extend(['-d', self.options['dss-keyfile']])
+    else:
+      dropbear_cmd.extend(['-r', self.options['rsa-keyfile']])
+
+    env = {}
+    if 'home' in self.options:
+      env['DROPBEAR_OVERRIDE_HOME'] = self.options['home']
+
+    if 'shell' in self.options:
+      env['DROPBEAR_OVERRIDE_SHELL'] = self.options['shell']
+
+    wrapper = self.createPythonScript(
+      self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.executee',
+      (dropbear_cmd, env, )
+    )
+    path_list.append(wrapper)
+
+    return path_list
+
+class Client(GenericBaseRecipe):
+
+  def install(self):
+    env = dict()
+
+    if 'home' in self.options:
+      env['HOME'] = self.options['home']
+      self.createDirectory(self.options['home'], '.ssh')
+
+    dropbear_cmd = [self.options['dbclient-binary'], '-T']
+    if self.optionIsTrue('force-host-key', default=False):
+      dropbear_cmd.extend(['-y'])
+
+    if 'identity-file' in self.options:
+      dropbear_cmd.extend(['-i', self.options['identity-file']])
+
+    wrapper = self.createPythonScript(
+      self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.executee',
+      (dropbear_cmd, env, )
+    )
+
+    return [wrapper]
+
+class AddAuthorizedKey(GenericBaseRecipe):
+
+  def install(self):
+    path_list = []
+
+    ssh = self.createDirectory(self.options['home'], '.ssh')
+    path_list.append(ssh)
+
+    authorized_keys = AuthorizedKeysFile(os.path.join(ssh, 'authorized_keys'))
+    authorized_keys.append(self.options['key'])
+
+    return path_list

slapos/recipe/duplicity.py

@@ -30,15 +30,23 @@ class Recipe(GenericBaseRecipe):
 
   def install(self):
 
-    remote_url = self.options['remote_backup']
-    backup_directory = self.options['directory']
+    remote_url = self.options['remote-backup']
+    backup_directory = self.options['local-directory']
 
-    wrapper = self.createPythonScript(
-      self.options['wrapper'],
-      'slapos.recipe.librecipe.execute.execute',
-      [self.options['duplicity_binary'], '--no-encryption',
-       backup_directory, remote_url]
-    )
-    return [wrapper]
+    cmd = [self.options['duplicity-binary'],]
+    options = ['--no-encryption', '--archive-dir', self.options['cache']]
+
+    if self.optionIsTrue('recover', False):
+      options.append('--force')
+      # duplicity [options] remote backup
+      cmd.extend(options)
+      cmd.extend([remote_url, backup_directory])
+    else:
+      # duplicity [options] local remote
+      cmd.extend(options)
+      cmd.extend([backup_directory, remote_url])
 
+    wrapper = self.createPythonScript(self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.execute', cmd)
 
+    return [wrapper]

slapos/recipe/equeue.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 GenericBaseRecipe
+
+class Recipe(GenericBaseRecipe):
+
+  def install(self):
+
+    commandline = [self.options['equeue-binary']]
+    commandline.extend(['--database', self.options['database']])
+    commandline.extend(['-l', self.options['log']])
+
+    if 'loglevel' in self.options:
+      commandline.extend(['--loglevel', self.options['loglevel']])
+
+    commandline.append(self.options['socket'])
+
+    return [self.createPythonScript(
+      self.options['wrapper'],
+      'slapos.recipe.librecipe.execute.execute',
+      commandline,
+    )]

slapos/recipe/erp5/catdatefile.py

-import os
-import sys
-import time
-def catdatefile(args):
-  directory = args[0]
-  try:
-    suffix = args[1]
-  except IndexError:
-    suffix = '.log'
-  f = open(os.path.join(directory,
-    time.strftime('%Y-%m-%d.%H:%M.%s') + suffix), 'aw')
-  for line in sys.stdin.read():
-    f.write(line)
-  f.close()

slapos/recipe/erp5/certificate_authority.py

-import os
-import subprocess
-import time
-import ConfigParser
-
-
-def popenCommunicate(command_list, input=None):
-  subprocess_kw = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-  if input is not None:
-    subprocess_kw.update(stdin=subprocess.PIPE)
-  popen = subprocess.Popen(command_list, **subprocess_kw)
-  result = popen.communicate(input)[0]
-  if popen.returncode is None:
-    popen.kill()
-  if popen.returncode != 0:
-    raise ValueError('Issue during calling %r, result was:\n%s' % (
-      command_list, result))
-  return result
-
-
-class CertificateAuthority:
-  def __init__(self, key, certificate, openssl_binary,
-      openssl_configuration, request_dir):
-    self.key = key
-    self.certificate = certificate
-    self.openssl_binary = openssl_binary
-    self.openssl_configuration = openssl_configuration
-    self.request_dir = request_dir
-
-  def checkAuthority(self):
-    file_list = [ self.key, self.certificate ]
-    ca_ready = True
-    for f in file_list:
-      if not os.path.exists(f):
-        ca_ready = False
-        break
-    if ca_ready:
-      return
-    for f in file_list:
-      if os.path.exists(f):
-        os.unlink(f)
-    try:
-      # no CA, let us create new one
-      popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
-          self.openssl_configuration, '-new', '-x509', '-extensions',
-          'v3_ca', '-keyout', self.key, '-out', self.certificate,
-          '-days', '10950'], 'Automatic Certificate Authority\n')
-    except:
-      try:
-        for f in file_list:
-          if os.path.exists(f):
-            os.unlink(f)
-      except:
-        # do not raise during cleanup
-        pass
-      raise
-
-  def _checkCertificate(self, common_name, key, certificate):
-    file_list = [key, certificate]
-    ready = True
-    for f in file_list:
-      if not os.path.exists(f):
-        ready = False
-        break
-    if ready:
-      return False
-    for f in file_list:
-      if os.path.exists(f):
-        os.unlink(f)
-    csr = certificate + '.csr'
-    try:
-      popenCommunicate([self.openssl_binary, 'req', '-config',
-        self.openssl_configuration, '-nodes', '-new', '-keyout',
-        key, '-out', csr, '-days', '3650'],
-        common_name + '\n')
-      try:
-        popenCommunicate([self.openssl_binary, 'ca', '-batch', '-config',
-          self.openssl_configuration, '-out', certificate,
-          '-infiles', csr])
-      finally:
-        if os.path.exists(csr):
-          os.unlink(csr)
-    except:
-      try:
-        for f in file_list:
-          if os.path.exists(f):
-            os.unlink(f)
-      except:
-        # do not raise during cleanup
-        pass
-      raise
-    else:
-      return True
-
-  def checkRequestDir(self):
-    for request_file in os.listdir(self.request_dir):
-      parser = ConfigParser.RawConfigParser()
-      parser.readfp(open(os.path.join(self.request_dir, request_file), 'r'))
-      if self._checkCertificate(parser.get('certificate', 'name'),
-          parser.get('certificate', 'key_file'), parser.get('certificate',
-            'certificate_file')):
-        print 'Created certificate %r' % parser.get('certificate', 'name')
-
-def runCertificateAuthority(args):
-  ca_conf = args[0]
-  ca = CertificateAuthority(ca_conf['key'], ca_conf['certificate'],
-      ca_conf['openssl_binary'], ca_conf['openssl_configuration'],
-      ca_conf['request_dir'])
-  while True:
-    ca.checkAuthority()
-    ca.checkRequestDir()
-    time.sleep(60)

slapos/recipe/erp5/killpidfromfile.py

-import sys
-import os
-import signal
-def killpidfromfile():
-  file = sys.argv[1]
-  sig = getattr(signal, sys.argv[2], None)
-  if sig is None:
-    raise ValueError('Unknwon signal name %s' % sys.argv[2])
-  if os.path.exists(file):
-    pid = int(open(file).read())
-    print 'Killing pid %s with signal %s' % (pid, sys.argv[2])
-    os.kill(pid, sig)

slapos/recipe/erp5/template/apache.ssl-snippet.conf.in

@@ -3,5 +3,7 @@ SSLCertificateFile %(login_certificate)s
 SSLCertificateKeyFile %(login_key)s
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
+SSLProtocol -ALL +SSLv3 +TLSv1
+SSLCipherSuite ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM
 
 SSLProxyEngine On

slapos/recipe/erp5/template/apache.zope.conf.in

@@ -26,6 +26,10 @@ TypesConfig conf/mime.types
 AddType application/x-compress .Z
 AddType application/x-gzip .gz .tgz
 
+ServerTokens Prod
+ServerSignature Off
+TraceEnable Off
+
 # As backend is trusting REMOTE_USER header unset it always
 RequestHeader unset REMOTE_USER
 

slapos/recipe/erp5/template/logrotate_entry.in

-%(file_list)s {
-  daily
-  dateext
-  rotate 3650
-  compress
-  notifempty
-  sharedscripts
-  create
-  postrotate
-    %(postrotate)s
-  endscript
-  olddir %(olddir)s
-}

slapos/recipe/erp5/template/tidstorage.py.in

-known_tid_storage_identifier_dict = %(known_tid_storage_identifier_dict)s
-base_url = '%(base_url)s'
-address = '%(host)s'
-port = %(port)s
-
-#fork = False
-#setuid = None
-#setgid = None
-burst_period = 30
-full_dump_period = 300
-
-timestamp_file_path = '%(timestamp_file_path)s'
-logfile_name = '%(logfile)s'
-pidfile_name = '%(pidfile)s'
-status_file = '%(statusfile)s'

slapos/recipe/erp5/template/zope-deadlockdebugger-snippet.conf.in

-
-# DeadlockDebugger configuration
-<product-config DeadlockDebugger>
-  dump_url %(dump_url)s
-  secret %(secret)s
-</product-config>
-

slapos/recipe/erp5/template/zope-tidstorage-snippet.conf.in

-
-# TIDStorage connection
-<product-config TIDStorage>
-  backend-ip %(host)s
-  backend-port %(port)s
-</product-config>

slapos/recipe/erp5/template/zope-zeo-snippet.conf.in

-<zodb_db %(storage_name)s>
-  cache-size %(zodb_cache_size)d
-  mount-point %(mount_point)s
-  <zeoclient>
-    cache-size %(zeo_client_cache_size)s
-    server %(address)s
-    storage %(storage_name)s
-    name %(storage_name)s
-  </zeoclient>
-</zodb_db>

slapos/recipe/erp5/template/zope-zodb-snippet.conf.in

-<zodb_db root>
-    cache-size %(zodb_cache_size)d
-    <filestorage>
-      path %(zodb_root_path)s
-    </filestorage>
-    mount-point /
-</zodb_db>

slapos/recipe/erp5/test_suite_runner.py

-import os
-import sys
-def runTestSuite(args):
-  env = os.environ.copy()
-  d = args[0]
-  env['OPENSSL_BINARY'] = d['openssl_binary']
-  env['TEST_CA_PATH'] = d['test_ca_path']
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
-  env['INSTANCE_HOME'] = d['instance_home']
-  env['REAL_INSTANCE_HOME'] = d['instance_home']
-  # Deal with Shebang size limitation
-  executable_filepath = d['call_list'][0]
-  file_object = open(executable_filepath, 'r')
-  line = file_object.readline()
-  file_object.close()
-  argument_list = []
-  if line[:2] == '#!':
-    executable_filepath = line[2:].strip()
-    argument_list.append(executable_filepath)
-  argument_list.extend(d['call_list'])
-  argument_list.extend(sys.argv[1:])
-  argument_list.append(env)
-  os.execle(executable_filepath, *argument_list)

slapos/recipe/erp5/testrunner.py

-import os
-import sys
-def runUnitTest(args):
-  env = os.environ.copy()
-  d = args[0]
-  env['OPENSSL_BINARY'] = d['openssl_binary']
-  env['TEST_CA_PATH'] = d['test_ca_path']
-  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
-  env['INSTANCE_HOME'] = d['instance_home']
-  env['REAL_INSTANCE_HOME'] = d['instance_home']
-  # Deal with Shebang size limitation
-  executable_filepath = d['call_list'][0]
-  file_object = open(executable_filepath, 'r')
-  line = file_object.readline()
-  file_object.close()
-  argument_list = []
-  if line[:2] == '#!':
-    executable_filepath = line[2:].strip()
-    argument_list.append(executable_filepath)
-  argument_list.extend(d['call_list'])
-  argument_list.extend(sys.argv[1:])
-  argument_list.append(env)
-  os.execle(executable_filepath, *argument_list)

slapos/recipe/erp5_test/__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 GenericBaseRecipe
+import urlparse
+
+class Recipe(GenericBaseRecipe):
+  def install(self):
+    testinstance = self.options['test-instance-path']
+    mysql_connection_string_list = []
+    path_list = []
+    # XXX: assume existence of 100 test databases, because slaves are not
+    # functional yet in slapos: testdb_0...testdb_100, with testuser_N
+    mysql_template = "%s@%s:%s %s %s"
+    mysql_parsed = urlparse.urlparse(self.options['mysql-url'])
+    for i in range(0, 100):
+      mysql_connection_string_list.append(mysql_template % ('testdb_%s'% i,
+        mysql_parsed.hostname, mysql_parsed.port, 'testuser_%s'% i, mysql_parsed.password))
+    mysql_connection_string = mysql_template % ('erp5_test', mysql_parsed.hostname,
+      mysql_parsed.port, 'erp5_test', mysql_parsed.password)
+    cloudooo_parsed = urlparse.urlparse(self.options['cloudooo-url'])
+    memcached_parsed = urlparse.urlparse(self.options['memcached-url'])
+    kumofs_parsed = urlparse.urlparse(self.options['kumofs-url'])
+    common_dict = dict(
+        instance_home=testinstance,
+        prepend_path=self.options['prepend-path'],
+        openssl_binary=self.options['openssl-binary'],
+        test_ca_path=self.options['certificate-authority-path'],
+    )
+    common_list = [
+      '--conversion_server_hostname=%s' % cloudooo_parsed.hostname,
+      '--conversion_server_port=%s' % cloudooo_parsed.port,
+      '--volatile_memcached_server_hostname=%s' % memcached_parsed.hostname,
+      '--volatile_memcached_server_port=%s' % memcached_parsed.port,
+      '--persistent_memcached_server_hostname=%s' % kumofs_parsed.hostname,
+      '--persistent_memcached_server_port=%s' % kumofs_parsed.port,
+    ]
+    path_list.append(self.createPythonScript(self.options['run-unit-test'],
+        __name__ + '.test.runUnitTest', [dict(
+        call_list=[self.options['run-unit-test-binary'],
+          '--erp5_sql_connection_string', mysql_connection_string,
+          '--extra_sql_connection_string_list', ','.join(
+            mysql_connection_string_list),
+          ] + common_list, **common_dict)]))
+    path_list.append(self.createPythonScript(self.options['run-test-suite'],
+        __name__ + '.test.runUnitTest', [dict(
+        call_list=[self.options['run-test-suite-binary'],
+          '--db_list', ','.join(mysql_connection_string_list),
+          ] + common_list, **common_dict)]))
+
+    return path_list

slapos/recipe/erp5_test/test.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 sys
+def runTestSuite(args):
+  env = os.environ.copy()
+  d = args[0]
+  env['OPENSSL_BINARY'] = d['openssl_binary']
+  env['TEST_CA_PATH'] = d['test_ca_path']
+  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
+  env['INSTANCE_HOME'] = d['instance_home']
+  env['REAL_INSTANCE_HOME'] = d['instance_home']
+  # Deal with Shebang size limitation
+  executable_filepath = d['call_list'][0]
+  file_object = open(executable_filepath, 'r')
+  line = file_object.readline()
+  file_object.close()
+  argument_list = []
+  if line[:2] == '#!':
+    executable_filepath = line[2:].strip()
+    argument_list.append(executable_filepath)
+  argument_list.extend(d['call_list'])
+  argument_list.extend(sys.argv[1:])
+  argument_list.append(env)
+  os.execle(executable_filepath, *argument_list)
+
+def runUnitTest(args):
+  env = os.environ.copy()
+  d = args[0]
+  env['OPENSSL_BINARY'] = d['openssl_binary']
+  env['TEST_CA_PATH'] = d['test_ca_path']
+  env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
+  env['INSTANCE_HOME'] = d['instance_home']
+  env['REAL_INSTANCE_HOME'] = d['instance_home']
+  # Deal with Shebang size limitation
+  executable_filepath = d['call_list'][0]
+  file_object = open(executable_filepath, 'r')
+  line = file_object.readline()
+  file_object.close()
+  argument_list = []
+  if line[:2] == '#!':
+    executable_filepath = line[2:].strip()
+    argument_list.append(executable_filepath)
+  argument_list.extend(d['call_list'])
+  argument_list.extend(sys.argv[1:])
+  argument_list.append(env)
+  os.execle(executable_filepath, *argument_list)
+

slapos/recipe/erp5_update/__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.
+#
+##############################################################################
+import urlparse
+from slapos.recipe.librecipe import GenericSlapRecipe
+
+class Recipe(GenericSlapRecipe):
+  def _install(self):
+    conversion_server = None
+    if 'cloudooo-url' in self.options and self.options['cloudooo-url']:
+      parsed = urlparse.urlparse(self.options['cloudooo-url'])
+      conversion_server = "%s:%s" % (parsed.hostname, parsed.port)
+    memcached = None
+    if 'memcached-url' in self.options and self.options['memcached-url']:
+      parsed = urlparse.urlparse(self.options['memcached-url'])
+      memcached = "%s:%s" % (parsed.hostname, parsed.port)
+    kumofs = None
+    if 'kumofs-url' in self.options and self.options['kumofs-url']:
+      parsed = urlparse.urlparse(self.options['kumofs-url'])
+      kumofs = "%s:%s" % (parsed.hostname, parsed.port)
+
+    parsed = urlparse.urlparse(self.options['mysql-url'])
+    mysql_connection_string = "%(database)s@%(hostname)s:%(port)s "\
+        "%(username)s %(password)s" % dict(
+      database=parsed.path.split('/')[1],
+      hostname=parsed.hostname,
+      port=parsed.port,
+      username=parsed.username,
+      password=parsed.password
+    )
+
+    parsed = urlparse.urlparse(self.options['url'])
+    zope_user = parsed.username
+    zope_password = parsed.password
+    zope_host = '%s:%s' % (parsed.hostname, parsed.port)
+    bt5_list = []
+    if len(self.parameter_dict.get("bt5_list", "").strip()):
+      bt5_list = self.parameter_dict["bt5_list"].split()
+    elif self.parameter_dict.get("flavour", "default") == 'configurator':
+      bt5_list = self.options['configurator-bt5-list'].split()
+    bt5_repository_list = self.parameter_dict.get("bt5_repository_list",
+      "").split() or self.options['bt5-repository-list'].split()
+
+    script = self.createPythonScript(self.options['update-wrapper'],
+      __name__+'.erp5.updateERP5', [
+        self.options['site-id'], mysql_connection_string,
+        [zope_user, zope_password, zope_host],
+        memcached, conversion_server, kumofs, bt5_list, bt5_repository_list,
+        self.options['cadir-path'], self.options['openssl-binary']])
+    return [script]

slapos/recipe/erp5/erp5.py → slapos/recipe/erp5_update/erp5.py

@@ -251,16 +251,6 @@ class ERP5Updater(object):
       return True
     return False
 
-  def isCertificateAuthorityConfigured(self):
-    """ Check if certificate Authority is configured correctly. """
-    external_connection_dict = self.system_signature_dict[
-      'external_connection_dict']
-    if self.certificate_authority_path == external_connection_dict.get(
-          'portal_certificate_authority/certificate_authority_path') and \
-       self.openssl_binary == external_connection_dict.get(
-          'portal_certificate_authority/openssl_binary'):
-      return True
-    return False
   def isCertificateAuthorityConfigured(self):
     """ Check if certificate Authority is configured correctly. """
     external_connection_dict = self.system_signature_dict[
@@ -303,6 +293,7 @@ class ERP5Updater(object):
 
   def updateERP5Site(self):
     if not self.isERP5Present():
+      self.log('INFO', 'No site present, adding new with id %r' % self.site_id)
       self.POST('/manage_addProduct/ERP5/manage_addERP5Site', {
           "id": self.site_id,
           "erp5_catalog_storage": self.erp5_catalog_storage,
@@ -330,6 +321,7 @@ class ERP5Updater(object):
   def run(self):
     """ Keep running until kill"""
     while 1:
+      self.log('INFO', 'Sleeping for %s' % self.short_sleeping_time)
       time.sleep(self.short_sleeping_time)
       if not self.updateERP5Site():
         self.loadSystemSignatureDict()

slapos/recipe/erp5testnode/__init__.py

@@ -24,86 +24,80 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import BaseSlapRecipe
+import ConfigParser
+import json
 import os
-import pkg_resources
-import zc.buildout
-import zc.recipe.egg
-import sys
+import StringIO
 
-class Recipe(BaseSlapRecipe):
-  def __init__(self, buildout, name, options):
-    self.egg = zc.recipe.egg.Egg(buildout, options['recipe'], options)
-    BaseSlapRecipe.__init__(self, buildout, name, options)
+from slapos.recipe.librecipe import GenericBaseRecipe
 
-  def _install(self):
-    self.requirements, self.ws = self.egg.working_set()
+class Recipe(GenericBaseRecipe):
+  def install(self):
     path_list = []
-    CONFIG = dict()
-    CONFIG['slapos_directory'] = self.createDataDirectory('slapos')
-    CONFIG['working_directory'] = self.createDataDirectory('testnode')
-    CONFIG['test_suite_directory'] = self.createDataDirectory('test_suite')
-    CONFIG['proxy_host'] = self.getLocalIPv4Address()
-    CONFIG['proxy_port'] = '5000'
-    CONFIG['log_directory'] = self.createDataDirectory('testnodelog')
-    CONFIG['run_directory'] = self.createDataDirectory('testnoderun')
-    CONFIG['test_suite_title'] = self.parameter_dict.get('test_suite_title')
-    CONFIG['test_node_title'] = self.parameter_dict.get('test_node_title')
-    CONFIG['test_suite'] = self.parameter_dict.get('test_suite')
-    CONFIG['node_quantity'] = self.parameter_dict.get('node_quantity', '1')
-    CONFIG['project_title'] = self.parameter_dict.get('project_title')
-    CONFIG['ipv4_address'] = self.getLocalIPv4Address()
-    CONFIG['ipv6_address'] = self.getGlobalIPv6Address()
-    CONFIG['test_suite_master_url'] = self.parameter_dict.get(
-                                'test_suite_master_url', None)
-    CONFIG['git_binary'] = self.options['git_binary']
-    CONFIG['slapgrid_partition_binary'] = self.options[
-      'slapgrid_partition_binary']
-    CONFIG['slapgrid_software_binary'] = self.options[
-      'slapgrid_software_binary']
-    CONFIG['slapproxy_binary'] = self.options['slapproxy_binary']
-    CONFIG['zip_binary'] = self.options['zip_binary']
+    options = self.options.copy()
+    del options['recipe']
+    CONFIG = {k.replace('-', '_'): v for k, v in options.iteritems()}
     CONFIG['PATH'] = os.environ['PATH']
-    additional_bt5_repository_id = \
-        self.parameter_dict.get('additional_bt5_repository_id')
 
-    CONFIG['bt5_path'] = None
-    if additional_bt5_repository_id is not None:
-      CONFIG['bt5_path'] = ""
-      additional_bt5_repository_id_list = additional_bt5_repository_id.split(",")
-      for id in additional_bt5_repository_id_list:
-        id_path = os.path.join(CONFIG['slapos_directory'], id)
+    if CONFIG['bt5_path']:
+      additional_bt5_repository_id_list = CONFIG['bt5_path'].split(",")
+      CONFIG['bt5_path'] = ''
+      for bt5_repository_id in additional_bt5_repository_id_list:
+        id_path = os.path.join(CONFIG['slapos_directory'], bt5_repository_id)
         bt_path = os.path.join(id_path, "bt5")
         CONFIG['bt5_path'] += "%s,%s," % (id_path, bt_path)
-    CONFIG['instance_dict'] = ''
-    if 'instance_dict' in self.parameter_dict:
-      CONFIG['instance_dict'] = '[instance_dict]\n'
-      for k,v in eval(self.parameter_dict['instance_dict']).iteritems():
-        CONFIG['instance_dict'] += '%s = %s\n' % (k,v)
 
-    CONFIG['repository_list'] = ''
+    if self.options['instance-dict']:
+      config_instance_dict = ConfigParser.ConfigParser()
+      config_instance_dict.add_section('instance_dict')
+      instance_dict = json.loads(self.options['instance-dict'])
+
+      for k ,v in instance_dict.iteritems():
+        config_instance_dict.set('instance_dict', k, v)
+      value = StringIO.StringIO()
+      config_instance_dict.write(value)
+      CONFIG['instance_dict'] = value.getvalue()
+
+    vcs_repository_list = json.loads(self.options['repository-list'])
+    config_repository_list = ConfigParser.ConfigParser()
     i = 0
-    for repository in eval(self.parameter_dict['vcs_repository_list']):
-      CONFIG['repository_list'] += '[vcs_repository_%s]\n' % i
-      CONFIG['repository_list'] += 'url = %s\n' % repository['url']
+    for repository in vcs_repository_list:
+      section_name = 'vcs_repository_%d' % i
+      config_repository_list.add_section(section_name)
+      config_repository_list.set(section_name, 'url', repository['url'])
       if 'branch' in repository:
-        CONFIG['repository_list'] += 'branch = %s\n' % repository['branch']
+        config_repository_list.set(section_name, 'branch', repository['branch'])
       if 'profile_path' in repository:
-        CONFIG['repository_list'] += 'profile_path = %s\n' % repository[
-          'profile_path']
+        config_repository_list.set(section_name, 'profile_path',
+                                   repository['profile_path'])
       if 'buildout_section_id' in repository:
-        CONFIG['repository_list'] += 'buildout_section_id = %s\n' % repository[
-          'buildout_section_id']
-      CONFIG['repository_list'] += '\n'
+        config_repository_list.set(section_name, 'buildout_section_id',
+                                   repository['buildout_section_id'])
       i += 1
-    testnode_config = self.createConfigurationFile('erp5testnode.cfg',
-        self.substituteTemplate(pkg_resources.resource_filename(__name__,
-          'template/erp5testnode.cfg.in'), CONFIG))
-    testnode_log = os.path.join(self.log_directory, 'erp5testnode.log')
-    wrapper = zc.buildout.easy_install.scripts([('erp5testnode',
-     'slapos.recipe.librecipe.execute', 'executee')], self.ws, sys.executable,
-      self.wrapper_directory, arguments=[[self.options['testnode'], '-l',
-      testnode_log, testnode_config], {'GIT_SSL_NO_VERIFY': '1'}])[0]
-    path_list.append(testnode_config)
-    path_list.append(wrapper)
+    value = StringIO.StringIO()
+    config_repository_list.write(value)
+    CONFIG['repository_list'] = value.getvalue()
+
+    configuration_file = self.createFile(
+      self.options['configuration-file'],
+      self.substituteTemplate(
+        self.getTemplateFilename('erp5testnode.cfg.in'),
+        CONFIG
+      ),
+    )
+    path_list.append(configuration_file)
+    path_list.append(
+      self.createPythonScript(
+        self.options['wrapper'],
+        'slapos.recipe.librecipe.execute.executee',
+        [ # Executable
+          [ self.options['testnode'], '-l', self.options['log-file'],
+            configuration_file],
+          # Environment
+          {
+            'GIT_SSL_NO_VERIFY': '1',
+          }
+        ],
+      )
+    )
     return path_list

slapos/recipe/fontconfig/__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 pkg_resources
+import os
+import zc.buildout
+
+class Recipe(GenericBaseRecipe):
+  """
+  fontconfig instance configuration.
+
+  conf-path -- location of the configuration file
+
+  font-system-folder -- fonts installed by software release
+
+  font-folder -- location where to download fonts
+
+  url-list -- From where to download fonts
+  """
+
+  def install(self):
+    created_file_list = []
+    font_folder = self.options['font-folder']
+    service_folder = self.options['service-folder']
+    snippet_filename = self.getTemplateFilename(
+                                    'fontconfig-snippet.cfg.in')
+    font_snippet_list = [self.substituteTemplate(snippet_filename,
+                    dict(font_folder_path=self.options['font-system-folder']))]
+    font_snippet_list.append(self.substituteTemplate(snippet_filename,
+                                           dict(font_folder_path=font_folder)))
+
+    config = dict(
+        font_folder_path_snippet=''.join(font_snippet_list),
+        )
+    template_filename = self.getTemplateFilename('fontconfig.cfg.in')
+    configuration_path = self.createFile(
+        self.options['conf-path'],
+        self.substituteTemplate(template_filename, config))
+
+    created_file_list.append(configuration_path)
+    # Instanciate onetimedownloads, one for each url
+    wrapper_template_location = pkg_resources.resource_filename(
+                                        __name__, os.path.join(
+                                        'template', 'onetimedownload_run.in'))
+
+    onetimedownload_config = {}
+    onetimedownload_config.update(self.options)
+    for index, url in enumerate(self.options['url-list'].split()):
+      if not url.strip():
+        continue
+      bin_path = os.path.join(service_folder, 'onetimedownload%s' % index)
+      file_path = os.path.join(font_folder, '%s' % index)
+      onetimedownload_config['url'] = url
+      onetimedownload_config['file_path'] = file_path
+      onetimedownload_runner_path = self.createExecutable(bin_path,
+          self.substituteTemplate(wrapper_template_location, 
+                                  onetimedownload_config))
+
+      created_file_list.append(onetimedownload_runner_path)
+
+    return created_file_list

slapos/recipe/fontconfig/template/fontconfig-snippet.cfg.in

+<dir>%(font_folder_path)s</dir>

slapos/recipe/fontconfig/template/fontconfig.cfg.in

+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+%(font_folder_path_snippet)s
+</fontconfig>
\ No newline at end of file

slapos/recipe/fontconfig/template/onetimedownload_run.in

+#!/bin/sh
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+exec %(onetimedownload_path)s "%(url)s" "%(file_path)s"

slapos/recipe/generate_cloudooo.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 GenericSlapRecipe
+import os
+import json
+import traceback
+
+
+class Recipe(GenericSlapRecipe):
+  def _options(self, options):
+    self.dirname = os.path.join(self.buildout['buildout']['parts-directory'],
+                                self.name)
+    options['output'] = os.path.join(self.dirname, self.name + '.cfg')
+
+  def _generateRealTemplate(self):
+    # TODO check json against schema
+    json_data = {}
+    if self.parameter_dict.get('cloudooo-json', None):
+      json_data = json.loads(self.parameter_dict['cloudooo-json'])
+    # dymanic fonts
+    font_url_list = json_data.get('font_url_list', [])
+    fontconfig_template = open(self.options['template']).read()
+    fontconfig = open(self.options['snippet-fontconfig']).read()
+    fontconfig_extension = fontconfig % dict(font_url_list=' '.join(font_url_list))
+    with open(self.options['output'], 'w') as f:
+      f.write(fontconfig_template + fontconfig_extension)
+
+  def _install(self):
+    if not os.path.exists(self.dirname):
+      os.mkdir(self.dirname)
+    try:
+      self._generateRealTemplate()
+    except Exception:
+      print 'Ignored issue during template generation:\n%s' % \
+        traceback.format_exc()
+    return [self.dirname]

slapos/recipe/generate_erp5_tidstorage.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 GenericSlapRecipe
+import os
+import json
+import traceback
+
+SECTION_BACKEND_PUBLISHER = """[publish-apache-backend-list]
+recipe = slapos.cookbook:publish"""
+ZOPE_PORT_BASE = 12000
+ZEO_PORT_BASE = 15000
+HAPROXY_PORT_BASE = 11000
+APACHE_PORT_BASE = 10000
+
+class Recipe(GenericSlapRecipe):
+  def _options(self, options):
+    self.dirname = os.path.join(self.buildout['buildout']['parts-directory'],
+      self.name)
+    options['output'] = os.path.join(self.dirname, self.name + '.cfg')
+
+  def _generateRealTemplate(self):
+    current_zeo_port = ZEO_PORT_BASE
+    current_zope_port = ZOPE_PORT_BASE
+    current_apache_port = APACHE_PORT_BASE
+    current_haproxy_port = HAPROXY_PORT_BASE
+    json_data = json.loads(self.parameter_dict['json'])
+    site_id = str(json_data['site-id'])
+    # prepare zeo
+    output = ''
+    part_list = []
+    zope_dict = {}
+    zope_connection_dict = {}
+    known_tid_storage_identifier_dict = {}
+    snippet_zeo = open(self.options['snippet-zeo']).read()
+    for zeo_id, zeo_configuration_list in json_data['zeo'].iteritems():
+      storage_list = []
+      a = storage_list.append
+      for zeo_slave in zeo_configuration_list:
+        zope_connection_dict[zeo_slave['storage-name']] = {
+          'zope-cache-size': zeo_slave['zope-cache-size'],
+          'zeo-cache-size': zeo_slave['zeo-cache-size'],
+          'mount-point': zeo_slave['mount-point'] % {'site-id': site_id},
+          'storage-name': zeo_slave['storage-name'],
+          'server': '${zeo-instance-%(zeo-id)s:ip}:${zeo-instance-%(zeo-id)s:port}' % {'zeo-id': zeo_id}
+        }
+        zodb_path = os.path.join('${directory:zodb}', zeo_slave['storage-name'] + '.fs')
+        a('  storage-name=%(storage-name)s zodb-path=%(zodb-path)s' % {'zodb-path': zodb_path, 'storage-name': zeo_slave['storage-name']})
+        known_tid_storage_identifier_dict[
+          "((('%(ip)s', %(port)s),), '%(storage_name)s')" % dict(
+            ip='${zeo-instance-%s:ip}' % zeo_id,
+            port='${zeo-instance-%s:port}' % zeo_id,
+            storage_name=zeo_slave['storage-name'])] = (zodb_path, '${directory:zodb-backup}/%s/' % zeo_slave['storage-name'], zeo_slave['serialize-path'] % {'site-id': site_id})
+      current_zeo_port += 1
+      output += snippet_zeo % dict(
+        zeo_id=zeo_id,
+        zeo_port=current_zeo_port,
+        storage_list='\n'.join(storage_list)
+      )
+      part_list.extend([
+        "zeo-instance-%s" % zeo_id,
+        "logrotate-entry-zeo-%s" % zeo_id
+      ])
+
+    zeo_connection_list = []
+    a = zeo_connection_list.append
+    for k, v in zope_connection_dict.iteritems():
+      a('  zeo-cache-size=%(zeo-cache-size)s zope-cache-size=%(zope-cache-size)s server=%(server)s mount-point=%(mount-point)s storage-name=%(storage-name)s' % v)
+    zeo_connection_string = '\n'.join(zeo_connection_list)
+    zope_dict.update(
+      timezone=json_data['timezone'],
+      zeo_connection_string=zeo_connection_string
+    )
+    # always one distribution node
+    current_zope_port += 1
+    snippet_zope = open(self.options['snippet-zope']).read()
+    zope_id = 'zope-distribution'
+    part_list.append(zope_id)
+    part_list.append('logrotate-entry-%s' % zope_id)
+    output += snippet_zope % dict(zope_thread_amount=1, zope_id=zope_id,
+      zope_port=current_zope_port, zope_timeserver=True, 
+      longrequest_logger_file='', longrequest_logger_timeout='', 
+      longrequest_logger_interval='', **zope_dict)
+    # always one admin node
+    current_zope_port += 1
+    zope_id = 'zope-admin'
+    part_list.append(zope_id)
+    part_list.append('logrotate-entry-%s' % zope_id)
+    output += snippet_zope % dict(zope_thread_amount=1, zope_id=zope_id,
+      zope_port=current_zope_port, zope_timeserver=False, 
+      longrequest_logger_file='', longrequest_logger_timeout='', 
+      longrequest_logger_interval='', **zope_dict)
+    # handle activity key
+    for q in range(1, json_data['activity']['zopecount'] + 1):
+      current_zope_port += 1
+      part_name = 'zope-activity-%s' % q
+      part_list.append(part_name)
+      part_list.append('logrotate-entry-%s' % part_name)
+      output += snippet_zope % dict(zope_thread_amount=1, zope_id=part_name,
+        zope_port=current_zope_port, zope_timeserver=True,
+        longrequest_logger_file='', longrequest_logger_timeout='', 
+        longrequest_logger_interval='', **zope_dict)
+    # handle backend key
+    snippet_backend = open(self.options['snippet-backend']).read()
+    publish_url_list = []
+    for backend_name, backend_configuration in json_data['backend'].iteritems():
+      haproxy_backend_list = []
+      for q in range(1, backend_configuration['zopecount'] + 1):
+        current_zope_port += 1
+        part_name = 'zope-%s-%s' % (backend_name, q)
+        part_list.append(part_name)
+        part_list.append('logrotate-entry-%s' % part_name)
+        longrequest_logger = backend_configuration.get("longrequest-logger", None)
+        if longrequest_logger is not None:
+          longrequest_part_name = '%s-longrequest' %part_name 
+          longrequest_logger_file = '${basedirectory:log}/%s.log' \
+                                      %longrequest_part_name
+          longrequest_logger_timeout = longrequest_logger.get('timeout', '4')
+          longrequest_logger_interval = longrequest_logger.get('interval', '2')
+        else:
+          longrequest_logger_file = longrequest_logger_timeout = \
+            longrequest_logger_interval = ''
+        output += snippet_zope % dict(
+          zope_thread_amount=backend_configuration['thread-amount'],
+          zope_id=part_name, zope_port=current_zope_port, zope_timeserver=False,
+          longrequest_logger_file=longrequest_logger_file, 
+          longrequest_logger_timeout=longrequest_logger_timeout, 
+          longrequest_logger_interval=longrequest_logger_interval,
+          **zope_dict)
+        haproxy_backend_list.append('${%(part_name)s:ip}:${%(part_name)s:port}' % dict(part_name=part_name))
+      # now generate backend access
+      current_apache_port += 1
+      current_haproxy_port += 1
+      part_list.append('apache-%(backend_name)s ca-apache-%(backend_name)s logrotate-entry-apache-%(backend_name)s haproxy-%(backend_name)s' % dict(backend_name=backend_name))
+      backend_dict = dict(
+        backend_name=backend_name,
+        apache_port=current_apache_port,
+        haproxy_port=current_haproxy_port,
+        access_control_string=backend_configuration['access-control-string'],
+        maxconn=backend_configuration['maxconn'],
+        server_check_path='/%s/getId' % site_id,
+        haproxy_backend_list=' '.join(haproxy_backend_list)
+      )
+      publish_url_list.append('url-%(backend_name)s = https://[${apache-%(backend_name)s:ip}]:${apache-%(backend_name)s:port}' % dict(
+        backend_name=backend_name))
+      output += snippet_backend % backend_dict
+    output += SECTION_BACKEND_PUBLISHER + '\n'
+    output += '\n'.join(publish_url_list)
+    part_list.append('publish-apache-backend-list')
+    prepend = open(self.options['snippet-master']).read() % dict(
+        part_list='  \n'.join(['  '+q for q in part_list]),
+        known_tid_storage_identifier_dict=known_tid_storage_identifier_dict,
+        haproxy_section="haproxy-%s" % backend_name,
+        zope_section=zope_id,
+        site_id=site_id,
+        **self.parameter_dict
+        )
+    output = prepend + output
+    with open(self.options['output'], 'w') as f:
+      f.write(output)
+
+  def _install(self):
+    if not os.path.exists(self.dirname):
+      os.mkdir(self.dirname)
+    if not "json" in self.parameter_dict:
+      # no json transimtted, nothing to do
+      with open(self.options['output'], 'w') as f:
+        f.write("[buildout]\nparts =\n")
+    else:
+      try:
+        self._generateRealTemplate()
+      except Exception:
+        print 'Ignored issue during template generation:\n%s' % \
+          traceback.format_exc()
+    return [self.dirname]

slapos/recipe/erp5/template/cloudooo.cfg.in → slapos/recipe/generic_cloudooo/template/cloudooo.cfg.in

@@ -34,6 +34,7 @@ application_hostname = %(ip)s
 openoffice_port = %(openoffice_port)s
 # LD_LIBRARY_PATH passed to OpenOffice
 env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s
+env-FONTCONFIG_FILE = %(FONTCONFIG_FILE)s
 
 #
 # Mimetype Registry