Merge remote-tracking branch 'origin/master'

CHANGES.txt

 Changes
 =======
 
-0.60 (Unreleased)
+0.61 (Unreleased)
 -----------------
 
+* No change yet.
+
+0.61 (2012-08-17)
+-----------------
+
+  * Add "debug" option for slaprunner. [Alain Takoudjou]
+
+0.60 (2012-08-13)
+-----------------
+
+  * New recipe: requestoptional, like "request", but won't fail if instance is
+    not ready. [Cedric de Saint Martin]
+  * Update zabbix to return strings as parameters. [Cedric de Saint Martin]
+  * Add check in check_url_promise in case of empty URL. [Cedric de Saint
+    Martin]
+  * Upgrade slaprunner recipe to be compatible with newest version. [Alain
+    Takoudjou]
 
 0.59 (2012-07-12)
 -----------------
@@ -91,7 +108,7 @@ Changes
     [Cedric de Saint Martin]
   * Apache Frontend: listens to plain http port as well to redirect to https.
     [Cedric de Saint Martin]
-  
+
 0.49 (2012-05-10)
 -----------------
 
@@ -157,7 +174,7 @@ Changes
 -----------------
 
  * apache_frontend initial release. [Cedric de Saint Martin]
- 
+
 0.39 (2012-02-20)
 -----------------
 
@@ -210,7 +227,7 @@ Changes
 0.32 (2011-10-28)
 -----------------
 
-  * LAMP : Recipe can now call lampconfigure from slapos.toolbox which will 
+  * LAMP : Recipe can now call lampconfigure from slapos.toolbox which will
    configure PHP application instance when needed. [Alain Takoudjou Kamdem]
 
 0.31 (2011-10-16)

component/apache-php/buildout.cfg

@@ -20,6 +20,8 @@ extends =
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = hexagonit.recipe.cmmi
+depends =
+  ${mariadb:version}
 url = http://fr2.php.net/distributions/php-5.3.13.tar.gz
 md5sum = 179c67ce347680f468edbfc3c425476a
 configure-options =

component/apache/buildout.cfg

@@ -30,10 +30,10 @@ md5sum = 52b31b33fb1aa16e65ddaefc76e41151
 recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
-version = 2.4.1
+version = 2.4.2
 revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 7d3001c7a26b985d17caa367a868f11c
+md5sum = 6bb12f726e22656f0ad2baf91f1f8329
 configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
 configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
                     --disable-static

component/aspell/buildout.cfg

 [buildout]
 parts =
   aspell
+  aspell-en-dictonary
 
 extends = 
   ../ncurses/buildout.cfg
 
+[aspell-common-dictionary]
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+recipe = plone.recipe.command
+command = mkdir -p ${:location}
+update-command = ${:command}
+stop-on-error = yes
+
 [aspell]
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
+
+[aspell-en-dictionary]
+recipe = hexagonit.recipe.cmmi
+url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
+md5sum = beba5e8f3afd3ed1644653bb685b2dfb
+configure-command = ./configure --vars ASPELL=${aspell:location}/bin/aspell PREZIP=${aspell:location}/bin/prezip-bin
\ No newline at end of file

component/autoconf/buildout.cfg

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

component/automake/buildout.cfg

@@ -3,11 +3,11 @@ extends =
   ../autoconf/buildout.cfg
   ../perl/buildout.cfg
 parts =
-  automake-1.11
+  automake
 
-[automake-1.11]
+[automake]
 recipe = hexagonit.recipe.cmmi
-md5sum = 93ecb319f0365cb801990b00f658d026
-url = http://ftp.gnu.org/gnu/automake/automake-1.11.3.tar.gz
+md5sum = e620cb9e0259159341c0e0d6b712b67a
+url = http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz
 environment =
   PATH =${autoconf:location}/bin:${perl:location}/bin:%(PATH)s

component/bison/buildout.cfg

@@ -4,7 +4,19 @@ extends =
 parts =
   bison
 
+[bison-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = ac06cbaa298ac686d0b0c04bc03e6ad8
+download-only = true
+filename = drop.gets.patch
+
 [bison]
+virtual-depends = ${bison-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${bison-drop.gets.patch:location}/${bison-drop.gets.patch:filename}
+
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2
 md5sum = 9dba20116b13fc61a0846b0058fbe004

component/bison/drop.gets.patch

+diff -ur bison-2.5.orig/lib/stdio.in.h bison-2.5/lib/stdio.in.h
+--- bison-2.5.orig/lib/stdio.in.h	2011-05-15 00:23:46.000000000 +0200
++++ bison-2.5/lib/stdio.in.h	2012-07-23 16:30:56.366722487 +0200
+@@ -181,7 +181,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/busybox/buildout.cfg

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

component/busybox/busybox-1.19.3.packed_hack.patch

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

component/ca-certificates/buildout.cfg

@@ -21,6 +21,7 @@ recipe = hexagonit.recipe.cmmi
 version = 20120623
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
 patch-binary = ${patch:location}/bin/patch
+md5sum = 5105d4cc086f0d4ecf7bf2e4c4667289
 patches =
   ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}
 patch-options = -p0

component/cloud9/buildout.cfg

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

component/cloudooo/buildout.cfg

@@ -5,21 +5,43 @@ extends =
 parts =
   cloudooo
 
-sources = sources
+develop +=
+  ${:parts-directory}/cloudooo-repository
 
-[sources]
-# Include information related to official cloudooo source code.
-cloudooo = git http://git.erp5.org/repos/cloudooo.git
+[cloudooo-check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
 
-[lxml-python]
-python = python2.6
+[cloudooo-repository]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+repository = http://git.erp5.org/repos/cloudooo.git
+branch = master
+revision =
+command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
 
 [cloudooo]
 recipe = zc.recipe.egg
 python = python2.6
+extra-paths = ${cloudooo-repository:location}
 eggs =
   ${lxml-python:egg}
-  cloudooo
   PasteScript
-scripts =
+  python-magic
+  psutil
+  WSGIUtils
+  cloudooo
+entry-points =
+  main=cloudooo.paster_application:application
+  cloudooo_tester=cloudooo.bin.cloudooo_tester:main
+  runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run
+  runCloudoooTestSuite=cloudooo.tests.runTestSuite:run
+scripts = 
   paster=cloudooo_paster
+  runCloudoooUnitTest
+  runCloudoooTestSuite
+ugly-depend-on = ${cloudooo-repository:command} ${cloudooo-repository:update-command} ${cloudooo-check-recipe:command}

component/cloudooo/buildout.eggversion.cfg

+[buildout]
+extends =
+  ../lxml-python/buildout.cfg
+
+parts =
+  cloudooo
+
+[lxml-python]
+python = python2.6
+
+[cloudooo]
+recipe = zc.recipe.egg
+python = python2.6
+eggs =
+  ${lxml-python:egg}
+  cloudooo
+  cloudooo.handler.ooo
+  cloudooo.handler.pdf
+  cloudooo.handler.ffmpeg
+  cloudooo.handler.imagemagick
+  PasteScript
+  python-magic
+entry-points =
+  cloudooo_tester=cloudooo.bin.cloudooo_tester:main
+  runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run
+
+scripts =
+  paster=cloudooo_paster
+  runCloudoooUnitTest
+
+

component/cmake/buildout.cfg

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

component/coreutils/buildout.cfg

@@ -2,10 +2,23 @@
 parts =
   coreutils
 
+[coreutils-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 63c2299d92d23e4748abb9668b7e62ea
+download-only = true
+filename = drop.gets.patch
+
 [coreutils]
+virtual-depends = ${coreutils-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.12.tar.gz
 md5sum = fce7999953a67243d00d75cc86dbcaa6
+
+patch-options = -p1
+patches =
+  ${coreutils-drop.gets.patch:location}/${coreutils-drop.gets.patch:filename}
+
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --enable-install-program=tr,basename,uname,cat,cp,ls
 environment =

component/coreutils/drop.gets.patch

+diff -ur coreutils-8.12.old/lib/stdio.in.h coreutils-8.12/lib/stdio.in.h
+--- coreutils-8.12.old/lib/stdio.in.h	2011-04-25 11:01:29.000000000 +0200
++++ coreutils-8.12/lib/stdio.in.h	2012-07-23 16:02:17.591610452 +0200
+@@ -181,7 +181,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/cpio/buildout.cfg

@@ -2,7 +2,19 @@
 [buildout]
 parts = cpio
 
+[cpio-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 6c79cb9caf407063543efff93647c450
+download-only = true
+filename = drop.gets.patch
+
 [cpio]
+virtual-depends =
+  ${cpio-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${cpio-drop.gets.patch:location}/${cpio-drop.gets.patch:filename}
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/cpio/cpio-2.11.tar.bz2
 md5sum = 20fc912915c629e809f80b96b2e75d7d

component/cpio/drop.gets.patch

+diff -ur cpio-2.11.orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h
+--- cpio-2.11.orig/gnu/stdio.in.h	2010-03-10 10:27:03.000000000 +0100
++++ cpio-2.11/gnu/stdio.in.h	2012-07-23 13:04:56.075242094 +0200
+@@ -139,7 +139,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/ffmpeg/buildout.cfg

@@ -9,7 +9,7 @@ parts =
   ffmpeg
 
 [ffmpeg]
-<= ffmpeg-0.6
+<= ffmpeg-0.8
 
 [libogg]
 recipe = hexagonit.recipe.cmmi
@@ -53,8 +53,8 @@ environment =
 
 [libx264]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20110412-2245.tar.bz2
-md5sum = 423c402214544d0e2f21455175a0d01f
+url = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20111005-2245-stable.tar.bz2
+md5sum = f86260b2ea6d6cb5186937c9363891d7
 configure-options =
   --enable-shared
   --enable-pic
@@ -76,10 +76,10 @@ md5sum = 8e8b8b253eb046340ff7b6bf7a6ccd3e
 configure-options =
   --disable-static
 
-[ffmpeg-0.6]
+[ffmpeg-0.8]
 recipe = hexagonit.recipe.cmmi
-url = http://www.ffmpeg.org/releases/ffmpeg-0.6.3.tar.bz2
-md5sum = cdf4ad9b2a4d195b5ca874494bc7b0b0
+url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2
+md5sum = 726877b19ece7ea64def8b7e6727e182
 configure-options = 
  --enable-gpl
  --enable-version3

component/fontconfig/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [fontconfig]
 recipe = hexagonit.recipe.cmmi
-url = http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
-md5sum = 77e15a92006ddc2adbb06f840d591c0e
+url = http://fontconfig.org/release/fontconfig-2.9.0.tar.gz
+md5sum = 26c83855ed256b5c032baae032fadc4f
 # XXX-Cedric : should we use --with-add-fonts={somefont:location}/share,{someotherfont:location}/share?
 configure-options =
   --disable-static

component/gettext/buildout.cfg

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

component/gettext/drop.gets.patch

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

component/giflib/buildout.cfg

+[buildout]
+parts =
+  giflib
+
+[giflib]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download
+md5sum = 711ad48551ee14db7c200b5f402df849
+configure-options =
+  --without-x
+  --disable-x11
+  --disable-static
+
+# restrict building to libraries only, we don't care about binaries
+# and specially docs which would require more dependencies (e.g. xmlto):
+make-options =
+  SUBDIRS=lib
\ No newline at end of file

component/groff/buildout.cfg

+[buildout]
+parts =
+  groff
+
+[groff]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz
+md5sum = 8b8cd29385b97616a0f0d96d0951c5bf
+configure-options =
+  --disable-static
+  --without-x

component/groonga/buildout.cfg

@@ -7,11 +7,12 @@ parts =
 
 [groonga]
 recipe = hexagonit.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-2.0.0.tar.gz
-md5sum = 09e6a34db15cf42b6a3aff07e0f841ff
+url = http://packages.groonga.org/source/groonga/groonga-2.0.5.tar.gz
+md5sum = 6ea6634ceee97f701add89ee39f4c1da
 configure-options =
   --disable-static
   --disable-glibtest
   --disable-benchmark
   --disable-document
+  --disable-nginx
   --without-mecab

component/gzip/buildout.cfg

@@ -2,7 +2,20 @@
 parts =
   gzip
 
+[gzip-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = d9b1156f912c8cf006f140482918ebc9
+download-only = true
+filename = drop.gets.patch
+
 [gzip]
+virtual-depends = ${gzip-drop.gets.patch:md5sum}
 recipe = hexagonit.recipe.cmmi
+
+patch-options = -p1
+patches =
+  ${gzip-drop.gets.patch:location}/${gzip-drop.gets.patch:filename}
+
 url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.4.tar.gz
 md5sum = e381b8506210c794278f5527cba0e765

component/gzip/drop.gets.patch

+diff -ur gzip-1.4.orig/lib/stdio.in.h gzip-1.4/lib/stdio.in.h
+--- gzip-1.4.orig/lib/stdio.in.h	2010-01-20 14:20:36.000000000 +0100
++++ gzip-1.4/lib/stdio.in.h	2012-07-23 16:20:24.299373437 +0200
+@@ -125,7 +125,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/haproxy/buildout.cfg

+# HAProxy - The Reliable, High Performance TCP/HTTP Load Balancer
+# http://haproxy.1wt.eu/
+
 [buildout]
+extends =
+  ../pcre/buildout.cfg
+
 parts = haproxy
 
 [haproxy]
 recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.19.tar.gz
-md5sum = 41392d738460dbf99295fd928031c6a4
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.21.tar.gz
+md5sum = f36d5d13fd4a44ab454eee5d06cb38a2
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".
@@ -13,3 +19,7 @@ make-options =
   TARGET="$(uname -sr 2>/dev/null|grep -Eq '^Linux (2\.6|3)' && echo linux26 || echo generic)"
   ARCH="$(uname -m 2>/dev/null|grep -E '^(x86_64|i[3456]86)$')"
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  USE_PCRE=1
+  ADDLIB=-Wl,-rpath=${pcre:location}/lib
+environment =
+  PATH=${pcre:location}/bin:%(PATH)s

component/imagemagick/buildout.cfg

@@ -8,6 +8,7 @@ extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
   ../ghostscript/buildout.cfg
+  ../librsvg/buildout.cfg
   ../libjpeg/buildout.cfg
   ../libpng/buildout.cfg
   ../libtiff/buildout.cfg
@@ -27,10 +28,11 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.5-10.tar.bz2
-md5sum = 99bc7ec1e756fa75f1af6150df3d1383
+url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.8-6.tar.bz2
+md5sum = e9d90a09b42fe8d9a8cf807274adff30
 depends =
   ${libtiff:version}
+  ${librsvg:version}
 configure-options =
   --disable-static
   --without-x
@@ -50,19 +52,19 @@ configure-options =
   --without-lzma
   --without-openexr
   --without-pango
-  --without-rsvg
   --without-wmf
   --without-xml
   --with-bzlib=${bzip2:location}
   --with-zlib=${zlib:location}
   --with-ltdl-include=${libtool:location}/include
   --with-ltdl-lib=${libtool:location}/lib
+  --with-rsvg=${librsvg:location}
   --with-frozenpaths
 patch-options = -p1
 patches =
   ${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:location}/${imagemagick-6.6.6-1-no-gsx-gsc-probe.patch:filename}
 environment =
   PATH=${freetype:location}/bin:${ghostscript:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${fontconfig:location}/lib/pkgconfig:${librsvg:location}/lib/pkgconfig
   CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib

component/java/buildout.cfg

@@ -29,9 +29,11 @@ slapos_promisee =
   directory:javaws
   file:lib/rt.jar
   file:bin/java
-x86 = http://download.oracle.com/otn-pub/java/jdk/6u30-b12/jre-6u30-linux-i586.bin 3e80243483bc825c34ae01a4373cce5f
-x86-64 = http://download.oracle.com/otn-pub/java/jdk/6u30-b12/jre-6u30-linux-x64.bin a4d28c49251d6b9c2d300b3d61f1ce95
+# http://java.com/en/download/manual.jsp?locale=en
+x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=59621 7466b0b86bef21e3e31ae578b2b9f472
+x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=59623 c5cfb8393d257b51e7a70e56b7784ac9
 script =
+  import glob
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')
   download_file = self.download(self.options['url'], self.options.get('md5sum'))
   extract_dir = tempfile.mkdtemp(self.name)
@@ -43,7 +45,7 @@ script =
   subprocess.call([auto_extract_bin])
   self.cleanup_dir_list.append(extract_dir)
   workdir = guessworkdir(extract_dir)
-  self.copyTree(os.path.join(workdir, "jre1.6.0_30"), "%(location)s")
+  self.copyTree(glob.glob(os.path.join(workdir, "jre1.6.0_*"))[0], "%(location)s")
 
 [java-sdk-1.6.0]
 recipe = slapos.recipe.build

component/leptonica/buildout.cfg

+[buildout]
+parts = leptonica
+extends =
+  ../libtool/buildout.cfg
+  ../zlib/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../webp/buildout.cfg
+  ../giflib/buildout.cfg
+
+[leptonica]
+recipe = hexagonit.recipe.cmmi
+url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
+md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
+configure-command =
+  ./autogen.sh
+  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static
+patch-options = -p1
+patches =
+  ${leptonica-1.69-zlib-include.patch:location}/${leptonica-1.69-zlib-include.patch:filename}
+environment =
+  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
+  CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib
+
+[leptonica-1.69-zlib-include.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = cff3dc942075190939b407c38e0d3201
+download-only = true
+filename = ${:_buildout_section_name_}

component/leptonica/leptonica-1.69-zlib-include.patch

+This patch is originally taken from:
+
+http://leptonica.googlecode.com/issues/attachment?aid=560001000&name=zlib-include.patch&token=m2sugSYxB4xwAuNgrKXyHTxBYNg%3A1337345966091
+
+To fix the following issue with leptonica:
+
+http://code.google.com/p/leptonica/issues/detail?id=56
+
+diff -Nurd -x'*~' leptonica-1.68.orig/src/pngio.c leptonica-1.68/src/pngio.c
+--- leptonica-1.68.orig/src/pngio.c	2011-02-01 00:41:12.000000000 -0500
++++ leptonica-1.68/src/pngio.c	2011-07-09 09:17:17.000000000 -0400
+@@ -108,6 +108,10 @@
+ 
+ #include "png.h"
+ 
++#ifdef HAVE_LIBZ
++#include "zlib.h"
++#endif
++
+ /* ----------------Set defaults for read/write options ----------------- */
+     /* strip 16 bpp --> 8 bpp on reading png; default is for stripping */
+ static l_int32   var_PNG_STRIP_16_TO_8 = 1;

component/libdmtx/buildout.cfg

+# libdmtx - open source software for reading and writing Data Matrix barcodes.
+# http://www.libdmtx.org/
+
+[buildout]
+extends =
+  ../imagemagick/buildout.cfg
+  ../jbigkit/buildout.cfg
+parts =
+  libdmtx
+  dmtx-utils
+
+[libdmtx]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/libdmtx/libdmtx-0.7.4.tar.bz2
+md5sum = d3a4c0becd92895eb606dbdb78b023e2
+configure-options =
+  --disable-static
+
+[dmtx-utils]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
+md5sum = b132ab9fb1d289869469b8bb4959a08a
+configure-options =
+  --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${imagemagick:location}/lib/pkgconfig:${libdmtx:location}/lib/pkgconfig
+  CPPFLAGS=-I${libdmtx:location}/include
+  LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib

component/libexpat/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [libexpat]
 recipe = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/expat/files/expat/2.0.1/expat-2.0.1.tar.gz/download
-md5sum = ee8b492592568805593f81f8cdf2a04c
+url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
+md5sum = dd7dab7a5fea97d2a6a43f511449b7cd
 configure-options =
   --disable-static

component/libpng/buildout.cfg

@@ -16,10 +16,10 @@ environment =
 
 [libpng12]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.47.tar.bz2
-md5sum = 4389dab9fcd2f9d57ac14701b9115f59
+url = http://download.sourceforge.net/libpng/libpng-1.2.50.tar.bz2
+md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.9.tar.bz2
-md5sum = 684ba5f05da436a99c6303a83c7856d6
+url = http://download.sourceforge.net/libpng/libpng-1.5.12.tar.bz2
+md5sum = d87f9c34ccab8242c00e41925839f6c9

component/libreoffice-bin/buildout.cfg

@@ -12,12 +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).
-version = 3.5.1
+version = 3.5.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 = ee46fdafb8361b8e131994508c2723b3
-md5sum_x86-64 = ddda58719358e5c97ca5d1c118646574
+md5sum_x86 = 88434a91af56a751fad2e737c2ad6bba
+md5sum_x86-64 = a8c2c35af75807c3ed6c8d04fe6c6419
 
 # where office code can be found?
 officedir = libreoffice3.5

component/librsvg/buildout.cfg

+[buildout]
+parts = librsvg
+extends = 
+  ../bzip2/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../zlib/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../xorg/buildout.cfg
+
+[libcroco]
+recipe = hexagonit.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.3.tar.bz2
+md5sum = e1e93eeff4367c896f3959af34ba20eb
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+
+[librsvg]
+recipe = hexagonit.recipe.cmmi
+version = 2.36.1
+url = http://www.nexedi.org/static/tarballs/librsvg/librsvg-${:version}.tar.gz
+md5sum = 699cb7124d319035346e69782baa7c36
+# The original source provided by gnome is tar.xz and it is not a supported compression
+# on hexagonit.recipe.cmmi neither by slapos.recipe.build, so keep alternative source
+# with tar.gz format as a temporary alternative for this.
+# url = http://ftp.acc.umu.se/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.1.tar.xz
+configure-options =
+  --disable-static
+  --disable-gtk-theme
+  --disable-pixbuf-loader
+  --disable-gtk-doc
+  --disable-tools
+  --disable-gtk-doc-html
+  --enable-introspection=no
+environment = 
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib

component/libtiff/buildout.cfg

@@ -9,14 +9,15 @@ parts =
 
 [libtiff]
 recipe = hexagonit.recipe.cmmi
-version = 4.0.1
+version = 4.0.2
 #url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
 # server is down - circumvent
 url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
-md5sum = fae149cc9da35c598d8be897826dfc63
+md5sum = 04a08fa1e07e696e820a0c3f32465a13
 configure-options =
   --disable-static
   --without-x
+  --disable-lzma
 environment =
   CPPFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libuuid/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [libuuid]
 recipe = hexagonit.recipe.cmmi
-url = http://mirror.be.gbxs.net/pub/linux/utils/util-linux-ng/v2.18/util-linux-ng-2.18.tar.bz2
+url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
 md5sum = 2f5f71e6af969d041d73ab778c141a77
 configure-options =
   --disable-static

component/libxml2/buildout.cfg

@@ -8,11 +8,12 @@ parts =
 
 [libxml2]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz
-md5sum = 8127a65e8c3b08856093099b52599c86
+url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz
+md5sum = c62106f02ee00b6437f0fb9d370c1093
 configure-options =
   --disable-static
   --without-python
+  --without-lzma
   --with-zlib=${zlib:location}
 environment =
     LDFLAGS = -Wl,-rpath=${zlib:location}/lib

component/m4/buildout.cfg

@@ -2,7 +2,19 @@
 parts =
   m4
 
+[m4-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = dc5f06fb42649e181c40177eb1edc333
+download-only = true
+filename = drop.gets.patch
+
 [m4]
+virtual-depends = ${m4-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${m4-drop.gets.patch:location}/${m4-drop.gets.patch:filename}
+
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
 md5sum = 8a7cef47fecab6272eb86a6be6363b2f

component/m4/drop.gets.patch

+diff -ur m4-1.4.16.orig/lib/stdio.in.h m4-1.4.16/lib/stdio.in.h
+--- m4-1.4.16.orig/lib/stdio.in.h	2011-03-01 17:39:29.000000000 +0100
++++ m4-1.4.16/lib/stdio.in.h	2012-07-23 09:28:57.945703705 +0200
+@@ -162,7 +162,9 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if defined(__GLIBC__) && !defined(__UCLIBC__) && !__GLIBC_PREREQ(2, 16)
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@

component/mariadb/buildout.cfg

@@ -16,74 +16,6 @@ extends =
 parts =
   mariadb
 
-[mariadb-no_test-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = d65f61829cfbcd5062f49db2b00bd6fe
-filename = mysql_create_system_tables__no_test.patch
-download-only = true
-
-[mariadb-handler_socket-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = be3bd5a5cc5fc56a398e6762494c8232
-filename = plugin_handler_socket_libhsclient_fatal.patch
-download-only = true
-
-[mariadb]
-recipe = hexagonit.recipe.cmmi
-version = 5.3.5-ga
-url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 98ce0441b37c8d681855150495fdc03b
-# compile directory is required to build mysql plugins.
-keep-compile-dir = true
-# configure: how to avoid searching for my.cnf?
-#  - like in mysql part in http://svn.zope.org/zodbshootout/trunk/buildout.cfg?view=markup
-# we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --disable-static
-  --enable-thread-safe-client
-  --enable-local-infile
-  --enable-assembler
-  --with-pic
-  --with-fast-mutexes
-  --with-charset=utf8
-  --with-extra-charsets=complex
-  --with-collation=utf8_unicode_ci
-  --with-big-tables
-  --without-embedded-server
-  --with-plugins=max-no-ndb
-  --with-aria-tmp-tables
-  --without-plugin-oqgraph
-  --without-readline
-  --with-ssl
-  --with-libevent=${libevent:location}
-  --with-zlib-dir=${zlib:location}
-
-patch-options = -p0
-patches =
-  ${mariadb-no_test-patch:location}/${mariadb-no_test-patch:filename}
-  ${mariadb-handler_socket-patch:location}/${mariadb-handler_socket-patch:filename}
-environment =
-  CPPFLAGS=-I${ncurses:location}/include -I${readline5:location}/include
-  LDFLAGS=-Wl,-rpath=${libevent:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline5:location}/lib -Wl,-rpath=${readline5:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[mroonga-mariadb]
-recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.00.tar.gz
-md5sum = 49dab92863b5c3fa1d49344c73357ca2
-configure-options =
-  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
-  --with-mysql-config=${mariadb:location}/bin/mysql_config
-depends =
-  ${mariadb:version}
-environment =
-  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${groonga:location}/include/groonga
-  LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
-
 [mariadb-5.5-no_test-patch]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
@@ -91,11 +23,12 @@ md5sum = 14e6d713c16298a10f40d29f2b799aca
 filename = mariadb_5.5_create_system_tables__no_test.patch
 download-only = true
 
-[mariadb-5.5]
+[mariadb]
 recipe = hexagonit.recipe.cmmi
-version = 5.5.20
+version = 5.5.25
+revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = e618343b5039fa468c0e1e6098785e3c
+md5sum = 943f67c267d73a4080ab497e11740daf
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -111,12 +44,13 @@ configure-options =
   -DWITH_ZLIB=system
   -DWITH_READLINE=0
   -DWITH_PIC=1
+  -DENABLE_DTRACE=0
   -DWITH_EXTRA_CHARSETS=complex
   -DWITH_EMBEDDED_SERVER=0
   -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
   -DWITHOUT_DAEMON_EXAMPLE=1
-  -DWITH_SPHINX_STORAGE_ENGINE=1
   -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
+  -DCMAKE_CXX_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
   -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
@@ -124,17 +58,20 @@ environment =
   CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
   LDFLAGS=-L${libaio:location}/lib
 
-[mroonga-mariadb-5.5]
+[mroonga-mariadb]
 recipe = hexagonit.recipe.cmmi
-url = https://github.com/downloads/mroonga/mroonga/mroonga-2.00.tar.gz
-md5sum = 49dab92863b5c3fa1d49344c73357ca2
+url = https://github.com/downloads/mroonga/mroonga/mroonga-2.05.tar.gz
+md5sum = 6aee0e6ff948bba7c02854326afc11df
 configure-options =
-  --with-mysql-source=${mariadb-5.5:location}__compile__/mariadb-${mariadb-5.5:version}
-  --with-mysql-config=${mariadb-5.5:location}/bin/mysql_config
+  --with-mysql-source=${mariadb:location}__compile__/mariadb-${mariadb:version}
+  --with-mysql-config=${mariadb:location}/bin/mysql_config
 depends =
-  ${mariadb-5.5:version}
+  ${mariadb:version}
+  ${mariadb:revision}
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga
   LDFLAGS=-L${groonga:location}/lib
   PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig
+  CXXFLAGS=-Wno-deprecated
+# CXXFLAGS workaround: avoid depracation warning in order to compile on gcc 4.7+

component/mariadb/mariadb_5.5_create_system_tables__no_test.patch

+# 33_scripts__mysql_create_system_tables__no_test.dpatch by  <ch@debian.org>
+
+A user with no password prevents a normal user from login under certain
+circumstances as it is checked first.
+See http://bugs.debian.org/301741
+and http://bugs.mysql.com/bug.php?id=6901
+
+--- scripts/mysql_system_tables_data.sql	2008-12-04 22:59:44.000000000 +0100
++++ scripts/mysql_system_tables_data.sql	2008-12-04 23:00:07.000000000 +0100
+@@ -27,8 +27,6 @@
+ -- Fill "db" table with default grants for anyone to
+ -- access database 'test' and 'test_%' if "db" table didn't exist
+ CREATE TEMPORARY TABLE tmp_db LIKE db;
+-INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+-INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y');
+ INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
+ DROP TABLE tmp_db;
+ 
+@@ -41,8 +39,6 @@
+ REPLACE INTO tmp_user SELECT @current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','' FROM dual WHERE LOWER( @current_hostname) != 'localhost';
+ REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
+ REPLACE INTO tmp_user VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','');
+-INSERT INTO tmp_user (host,user) VALUES ('localhost','');
+-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
+ INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
+ DROP TABLE tmp_user;
+ 

component/mariadb/mroonga-2.01-mariadb-5.5.23.patch

+--- ha_mroonga.cc.orig	2012-04-11 17:59:24.171323133 +0200
++++ ha_mroonga.cc	2012-04-11 18:01:50.431325458 +0200
+@@ -10319,10 +10319,11 @@
+ bool ha_mroonga::wrapper_auto_repair() const
+ {
+   bool res;
++  int ha_err = 0;
+   MRN_DBUG_ENTER_METHOD();
+   MRN_SET_WRAP_SHARE_KEY(share, table->s);
+   MRN_SET_WRAP_TABLE_KEY(this, table);
+-  res = wrap_handler->auto_repair();
++  res = wrap_handler->auto_repair(ha_err);
+   MRN_SET_BASE_SHARE_KEY(share, table->s);
+   MRN_SET_BASE_TABLE_KEY(this, table);
+   DBUG_RETURN(res);
+@@ -10330,9 +10331,10 @@
+ 
+ bool ha_mroonga::storage_auto_repair() const
+ {
++  int ha_err = 0;
+   MRN_DBUG_ENTER_METHOD();
+   // XXX: success is valid variable name?
+-  bool success = handler::auto_repair();
++  bool success = handler::auto_repair(ha_err);
+   DBUG_RETURN(success);
+ }
+ 

component/memcached/buildout.cfg

@@ -27,9 +27,9 @@ patches =
   ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename} ${memcached-gcc-4.4.patch:location}/${memcached-gcc-4.4.patch:filename}
 patch-options = -p1
 configure-command =
-  aclocal-1.11
+  aclocal
   autoheader
-  automake-1.11 --foreign
+  automake --foreign
   autoconf
   ./configure
 configure-options =
@@ -37,5 +37,5 @@ configure-options =
   --with-libevent=${libevent:location}
   --disable-docs
 environment =
-  PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s
   LDFLAGS =-Wl,-rpath=${libevent:location}/lib

component/memstrike/buildout.cfg

@@ -19,7 +19,7 @@ configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-libmemcached=${libmemcached:location}
 environment =
-  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s
+  PATH =${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
   LDFLAGS =-Wl,-rpath=${libmemcached:location}/lib
 
 [memstrikesource]

component/mydumper/buildout.cfg

@@ -13,6 +13,8 @@ parts = mydumper
 # mydumper that works
 [mydumper]
 recipe = slapos.recipe.build
+depends =
+  ${mariadb:version}
 url = http://launchpad.net/mydumper/0.2/0.2.3/+download/mydumper-0.2.3.tar.gz
 md5sum = 36e6a1c97a9634a6882ddaac5e2697d5
 buildout-bin-dir = ${buildout:bin-directory}
@@ -21,9 +23,9 @@ 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/
+libraries = ${zlib:location}/lib/:${glib:location}/lib/:${pcre:location}/lib/:${mariadb:location}/lib/
+includes = ${zlib:location}/include/:${glib:location}/include/:${pcre:location}/include/:${mariadb:location}/include/mysql
+cflags = -I${zlib:location}/include/ -I${glib:location}/include/ -I${pcre:location}/include/ -I${mariadb:location}/include/mysql
 mydumper-patches =
    ${:_profile_base_location_}/mydumper-remove-warnings-errors.patch 917fea16b5ddea195cfa33fbd9827f57 -p1
 slapos_promise =

component/mysql-5.1/buildout.cfg

@@ -69,7 +69,7 @@ patches =
   ${mysql-5.1-sphinx-patch:location}/${mysql-5.1-sphinx-patch:filename}
   ${mysql-5.1-no_test-patch:location}/${mysql-5.1-no_test-patch:filename}
 environment =
-  PATH =${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
+  PATH =${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
   CPPFLAGS =-I${ncurses:location}/include -I${readline:location}/include
   LDFLAGS =-L${readline:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib
 

component/mysql-5.5/buildout.cfg

@@ -57,7 +57,7 @@ configure-options =
   -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${zlib:location}/include"
   -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${zlib:location}/lib
 environment =
-  CMAKE_PROGRAM_PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${cmake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin
+  CMAKE_PROGRAM_PATH=${autoconf:location}/bin:${automake:location}/bin:${cmake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin
   CMAKE_INCLUDE_PATH=${libaio:location}/include:${ncurses:location}/include:${zlib:location}/include
   CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${zlib:location}/lib
   LDFLAGS=-L${libaio:location}/lib

component/mysql-python/buildout.cfg

@@ -13,8 +13,13 @@ PATH =${mariadb:location}/bin:%(PATH)s
 [mysql-python]
 recipe = zc.recipe.egg:custom
 egg = MySQL-python
+depends =
+  ${mariadb:version}
 environment = mysql-python-env
+library-dirs =
+  ${zlib:location}/lib/
+  ${openssl:location}/lib/
 rpath =
-  ${mariadb:location}/lib/mysql/
+  ${mariadb:location}/lib/
   ${zlib:location}/lib/
   ${openssl:location}/lib/

component/mysql-tritonn-5.0/buildout.cfg

@@ -33,7 +33,7 @@ configure-options =
 make-options =
   LIBTOOL=libtool
 environment =
-  PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
 
 [mysql-5.0-tritonn-patch]
 recipe = hexagonit.recipe.download
@@ -87,6 +87,6 @@ patches =
   ${mysql-5.0-tritonn-patch:location}/${mysql-5.0-tritonn-patch:filename}
   ${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
+    PATH=${senna:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin:%(PATH)s
     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/noVNC/buildout.cfg

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

component/nodejs/buildout.cfg

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

component/openldap/buildout.cfg

@@ -2,13 +2,14 @@
 parts =
   openldap
 extends =
+  ../groff/buildout.cfg
   ../openssl/buildout.cfg
   ../cyrus-sasl/buildout.cfg
 
 [openldap]
 recipe = hexagonit.recipe.cmmi
-url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.26.tgz
-md5sum = f36f3086031dd56ae94f722ffae8df5e
+url = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.31.tgz
+md5sum = 804c6cb5698db30b75ad0ff1c25baefd
 configure-options =
   --disable-static
   --disable-slapd
@@ -24,3 +25,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${openssl:location}/include -I${cyrus-sasl:location}/include
   LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${cyrus-sasl:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib
+  PATH=${groff:location}/bin:%(PATH)s

component/openssl/buildout.cfg

@@ -29,8 +29,8 @@ download-only = true
 
 [openssl]
 recipe = hexagonit.recipe.cmmi
-url = https://www.openssl.org/source/openssl-1.0.1.tar.gz
-md5sum = 134f168bc2a8333f19f81d684841710b
+url = https://www.openssl.org/source/openssl-1.0.1c.tar.gz
+md5sum = ae412727c8c15b67880aef7bd2999b2e
 patch-binary = ${patch:location}/bin/patch
 patches =
   ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}

component/perl-DBD-mariadb/buildout.cfg

@@ -10,6 +10,7 @@ parts =
 recipe = hexagonit.recipe.cmmi
 version = 4.019
 depends =
+  ${mariadb:version}
   ${perl:version}
   ${perl-DBI:version}
 url = http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.019.tar.gz
@@ -20,4 +21,4 @@ patch-options = -p1
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config
 environment =
-  OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib
+  OTHERLDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -Wl,-rpath=${openssl:location}/lib
\ No newline at end of file

component/perl/buildout.cfg

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

component/pil-python/buildout.cfg

+[buildout]
+extends =
+  ../freetype/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../zlib/buildout.cfg
+
+parts =
+  pil-python
+
+[pil-python]
+recipe = zc.recipe.egg:custom
+egg = PIL
+include-dirs =
+  ${freetype:location}/include
+  ${libjpeg:location}/include
+  ${zlib:location}/include
+library-dirs =
+  ${freetype:location}/lib
+  ${libjpeg:location}/lib
+  ${zlib:location}/lib
+rpath =
+  ${freetype:location}/lib
+  ${libjpeg:location}/lib
+  ${zlib:location}/lib

component/poppler/buildout.cfg

@@ -12,12 +12,9 @@ extends =
   ../zlib/buildout.cfg
 
 [poppler]
-<= poppler-0.17.1
-
-[poppler-0.17.1]
 recipe = hexagonit.recipe.cmmi
-md5sum = b566d1fbaa29b9257bf0ecc130e7b2ca
-url = http://poppler.freedesktop.org/poppler-0.17.2.tar.gz
+md5sum = 45dd2c16c8c4d1a39e830e45745c4e25
+url = http://poppler.freedesktop.org/poppler-0.20.2.tar.gz
 depends =
   ${libtiff:version}
 configure-options =

component/python-2.6/buildout.cfg

@@ -10,6 +10,7 @@ extends =
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
+  ../file/buildout.cfg
 
 parts =
     python2.6
@@ -31,12 +32,12 @@ depends =
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
 version = 2.6
 package_version = ${:version}.8
-package_version_suffix = rc1
+package_version_suffix =
 executable = ${:prefix}/bin/python${:version}
 
 url =
   http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.bz2
-md5sum = df6ccdac7da3b7c7c79124b92110277e
+md5sum = c6e0420a21d8b23dee8b0195c9b9a125
 patch-options = -p1
 patches =
   ${python-2.6.6-no_system_inc_dirs.patch:location}/${python-2.6.6-no_system_inc_dirs.patch:filename}
@@ -45,9 +46,11 @@ configure-options =
   --enable-unicode=ucs4
   --with-threads
 
+# the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
+# which would otherwise load the system libmagic.so with ctypes
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
 
 [bootstrap2.6]
 recipe = zc.recipe.egg

component/python-2.7/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
+  ../file/buildout.cfg
 
 parts =
     python2.7
@@ -25,8 +26,8 @@ python = python2.7
 [python2.7]
 recipe = hexagonit.recipe.cmmi
 package_version = 2.7.3
-package_version_suffix = rc1
-md5sum = 72aaa940dfa2777de161d7cb27c91df7
+package_version_suffix =
+md5sum = c57477edd6d18bd9eeca2f21add73919
 
 depends =
   ${gdbm:version}
@@ -44,6 +45,8 @@ configure-options =
   --with-system-expat
   --with-threads
 
+# the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
+# which would otherwise load the system libmagic.so with ctypes
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib

component/rpm2cpio/buildout.cfg

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

component/slapos/buildout.cfg

@@ -28,7 +28,6 @@ parts =
 
 find-links =
   http://www.nexedi.org/static/packages/source/slapos.buildout/
-  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
 
 versions = versions
 
@@ -116,9 +115,7 @@ scripts =
 
 [versions]
 zc.buildout = 1.6.0-dev-SlapOS-006
-hexagonit.recipe.download = 1.5.1-dev-slapos-002
 
-# Generated by buildout-versions
 Jinja2 = 2.6
 Pygments = 1.5
 Werkzeug = 0.8.3
@@ -127,17 +124,17 @@ collective.recipe.template = 1.9
 docutils = 0.9.1
 hexagonit.recipe.cmmi = 1.6
 ipython = 0.13
-lxml = 2.3.4
+lxml = 2.3.5
 meld3 = 0.6.8
 netaddr = 0.7.7
-slapos.core = 0.26.1
+slapos.core = 0.27
 slapos.libnetworkcache = 0.12
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.27
 Flask = 0.9
 
 # Required by:
@@ -145,11 +142,15 @@ Flask = 0.9
 Sphinx = 1.1.3
 
 # Required by:
-# slapos.core==0.26.1
+# hexagonit.recipe.cmmi==1.6
+hexagonit.recipe.download = 1.5.1
+
+# Required by:
+# slapos.core==0.27
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.27
 # slapos.libnetworkcache==0.12
 # supervisor==3.0a12
 # zc.buildout==1.6.0-dev-SlapOS-006
@@ -157,9 +158,9 @@ netifaces = 0.8
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.27
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.26.1
+# slapos.core==0.27
 zope.interface = 4.0.1

component/sphinx/buildout.cfg

@@ -18,10 +18,14 @@ filename = sphinx-1.10-beta-snowball.patch
 
 [sphinx]
 recipe = hexagonit.recipe.cmmi
+depends =
+  ${mariadb:version}
 url = http://sphinxsearch.com/files/sphinx-2.0.2-beta.tar.gz
 md5sum = fafe0f1a71d0ded32404c067eba7d0b3
 configure-options =
-  --with-mysql=${mariadb:location}
+  --with-mysql
+  --with-mysql-includes=${mariadb:location}/include/mysql
+  --with-mysql-libs=${mariadb:location}/lib
   --with-libstemmer
   --with-iconv
   --without-pgsql
@@ -30,5 +34,6 @@ patch-options = -p1
 patches =
   ${sphinx-1.10-beta-snowball.patch:location}/${sphinx-1.10-beta-snowball.patch:filename}
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib/mysql -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib
+  CPPFLAGS=-I${zlib:location}/include -I${libexpat:location}/include -fpermissive
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -L${libexpat:location}/lib -Wl,-rpath=${libexpat:location}/lib
+# Note: -fpermissive added to allow compilation on recent gcc 4.7+

component/sqlite3/buildout.cfg

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

component/tesseract/buildout.cfg

 [buildout]
 extends =
+  ../automake/buildout.cfg
+  ../libtool/buildout.cfg
+  ../leptonica/buildout.cfg
   ../jbigkit/buildout.cfg
-  ../libjpeg/buildout.cfg
-  ../libpng/buildout.cfg
-  ../libtiff/buildout.cfg
-  ../zlib/buildout.cfg
 
 parts =
-  tesseract-eng-traineddata-unzip
   tesseract
 
-[tesseract-share]
-# XXX: tesseract seems not easy configurable on runtime about where to find
-# its trained data, so just move out its datadir to own controlled location
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = mkdir -p ${:location} && mkdir -p ${:location}/tessdata
-update-command = ${:command}
-stop-on-error = yes
+[tesseract-gcc-4.7-build-patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+filename = tesseract-3.00-gcc-4.7-build.patch
+md5sum = ca80db3ec489c547b03f3ee48879c1b1
+
+[tesseract-3.01-remove-bom.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+filename = ${:_buildout_section_name_}
+md5sum = 2e691858cb492b7c17d23bf0912b3d24
 
 [tesseract]
 recipe = hexagonit.recipe.cmmi
-url = http://tesseract-ocr.googlecode.com/files/tesseract-3.00.tar.gz
-md5sum = cc812a261088ea0c3d2da735be35d09f
-depends =
-  ${libtiff:version}
-configure-options =
-  --disable-static
-  --datarootdir=${tesseract-share:location}
+url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
+md5sum = 1ba496e51a42358fb9d3ffe781b2d20a
+patch-options =
+  -p1
+patches =
+  ${tesseract-gcc-4.7-build-patch:location}/${tesseract-gcc-4.7-build-patch:filename}
+  ${tesseract-3.01-remove-bom.patch:location}/${tesseract-3.01-remove-bom.patch:filename}
+configure-command =
+  aclocal -I ${libtool:location}/share/aclocal -I config
+  libtoolize -f -c
+  libtoolize --automake
+  autoheader -f
+  automake -c -a -f
+  autoconf -Wno-portability
+  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --datarootdir=${tesseract-eng-traineddata:location}
+# XXX: tesseract seems not easily configurable at runtime about where to find
+# its trained data, so we set its datarootdir above to a controlled location
+
+# tesseract has a non-standard way of testing for leptonica, hence the
+# LIBLEPT_HEADERSDIR entry below:
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include
-  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:%(PATH)s
+  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
+  LIBLEPT_HEADERSDIR=${leptonica:location}/include
+  CPPFLAGS=-I${leptonica:location}/include
+  LDFLAGS =-L${leptonica:location}/lib -Wl,-rpath=${leptonica:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
 [tesseract-eng-traineddata]
 recipe = hexagonit.recipe.download
-download-only = true
-url = http://tesseract-ocr.googlecode.com/files/eng.traineddata.gz
-md5sum = d91041ad156cf2db36664e91ef799451
-
-[tesseract-eng-traineddata-unzip]
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-recipe = plone.recipe.command
-command = gunzip ${tesseract-eng-traineddata:location}/eng.traineddata.gz -c > ${tesseract-share:location}/tessdata/eng.traineddata
-update-command = ${:command}
-stop-on-error = yes
+strip-top-level-dir = true
+url = http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.01.eng.tar.gz
+md5sum = 89c139a73e0e7b1225809fc7b226b6c9

component/tesseract/tesseract-3.00-gcc-4.7-build.patch

+--- tesseract-3.00/viewer/svutil.cpp.old	2012-04-11 09:34:26.168608940 +0200
++++ tesseract-3.00/viewer/svutil.cpp	2012-04-11 09:34:46.108565692 +0200
+@@ -21,6 +21,7 @@
+ // thread/process creation & synchronization and network connection.
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #ifdef WIN32
+ #include <windows.h>
+ #include <winsock.h>

component/tesseract/tesseract-3.01-remove-bom.patch

+The patch below removes a utf-8 BOM mark.
+
+Avoid touching it as the BOM is invisible, and copy/pasting might not work.
+
+It is needed because old compilers treat the BOM as garbage instead of
+whitespace.
+
+--- tesseract-3.01/ccutil/strngs.h.orig	2012-05-24 15:13:22.743808379 +0200
++++ tesseract-3.01/ccutil/strngs.h	2012-05-24 15:16:54.468858282 +0200
+@@ -1,4 +1,4 @@
+-/**********************************************************************
++/**********************************************************************
+  * File:        strngs.h  (Formerly strings.h)
+  * Description: STRING class definition.
+  * Author:					Ray Smith

component/varnish/buildout.cfg

@@ -5,7 +5,7 @@
 parts =
   varnish
   varnish-2.1
-
+  varnish-3.0
 extends =
   ../ncurses/buildout.cfg
   ../pcre/buildout.cfg
@@ -30,8 +30,15 @@ url = http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz
 md5sum = 2d2f227da36a2a240c475304c717b8e3
 configure-options =
   --disable-static
+  --without-rst2html
+  --without-rst2man
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
   CPPFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+
+[varnish-3.0]
+<= varnish-2.1
+url = http://repo.varnish-cache.org/source/varnish-3.0.2.tar.gz
+md5sum = c8eae0aabbe66b6daabdf3a1f58cd47a

component/w3m/buildout.cfg

@@ -17,6 +17,9 @@ download-only = true
 md5sum = 75422a6f7f671b3a6d9add6724cc0945
 
 [w3m]
+virtual-depend =
+  ${w3m-w3m.gcc.forward.compat.patch:md5sum}
+
 recipe = hexagonit.recipe.cmmi
 md5sum = 1b845a983a50b8dec0169ac48479eacc
 url = http://downloads.sourceforge.net/project/w3m/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz
@@ -42,6 +45,6 @@ patches =
 
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkconfig
+  CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/ -I${garbage-collector:location}/include
   LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/webp/buildout.cfg

+[buildout]
+parts =
+  webp
+
+[webp]
+recipe = hexagonit.recipe.cmmi
+url = https://webp.googlecode.com/files/libwebp-0.1.3.tar.gz
+md5sum = 254d4670e14e9ed881f0536b006ab336
+configure-options =
+  --disable-static

component/wget/buildout.cfg

@@ -6,7 +6,19 @@ extends =
 parts =
   wget
 
+[wget-drop.gets.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 866907ebc89fc2e76b44c519cb84930f
+download-only = true
+filename = drop.gets.patch
+
 [wget]
+virtual-depends = ${wget-drop.gets.patch:md5sum}
+patch-options = -p1
+patches =
+  ${wget-drop.gets.patch:location}/${wget-drop.gets.patch:filename}
+
 recipe = hexagonit.recipe.cmmi
 url = http://ftp.gnu.org/gnu/wget/wget-1.13.4.tar.bz2
 md5sum = 12115c3750a4d92f9c6ac62bac372e85

component/wget/drop.gets.patch

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

component/xorg/buildout.cfg

@@ -145,6 +145,7 @@ configure-options =
   --disable-specs
   --without-xmlto
   --without-fop
+  XEXT_LIBS=-lX11
 patches =
   ${libXext-patch-link-error:location}/${libXext-patch-link-error:filename}
 patch-options = -p1

component/xtrabackup/buildout.cfg

@@ -59,6 +59,6 @@ configure-command = ln -sf ${mysql-5.1-download:location}/${mysql-5.1-download:f
 environment =
   CPPFLAGS =-I${zlib:location}/include -I${ncurses:location}/include -I${readline:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib
-  PATH=${autoconf:location}/bin:${automake-1.11:location}/bin:${libtool:location}/bin:${flex:location}/bin:%(PATH)s:${bison:location}/bin
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${flex:location}/bin:%(PATH)s:${bison:location}/bin
 make-options =
   -j1

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.60-dev'
+version = '0.61-dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"
@@ -66,6 +66,7 @@ setup(name=name,
           'onetimeupload = slapos.recipe.onetimeupload:Recipe',
           'helloworld = slapos.recipe.helloworld:Recipe',
           'generic.cloudooo = slapos.recipe.generic_cloudooo:Recipe',
+          'cloudooo.test = slapos.recipe.cloudooo_test:Recipe',
           'firefox = slapos.recipe.firefox:Recipe',
           'fontconfig = slapos.recipe.fontconfig:Recipe',
           'java = slapos.recipe.java:Recipe',
@@ -98,12 +99,15 @@ setup(name=name,
           'publish = slapos.recipe.publish:Recipe',
           'publishurl = slapos.recipe.publishurl:Recipe',
           'pwgen = slapos.recipe.pwgen:Recipe',
+          'pwgen.stable = slapos.recipe.pwgen:StablePasswordGeneratorRecipe',
           'proactive = slapos.recipe.proactive:Recipe',
           'request = slapos.recipe.request:Recipe',
+          'requestoptional = slapos.recipe.requestoptional:Recipe',
           'seleniumrunner = slapos.recipe.seleniumrunner:Recipe',
           'sheepdogtestbed = slapos.recipe.sheepdogtestbed:SheepDogTestBed',
           'shell = slapos.recipe.shell:Recipe',
           'shellinabox = slapos.recipe.shellinabox:Recipe',
+          'slapconfiguration = slapos.recipe.slapconfiguration:Recipe',
           'symbolic.link = slapos.recipe.symbolic_link:Recipe',
           'softwaretype = slapos.recipe.softwaretype:Recipe',
           'siptester = slapos.recipe.siptester:SipTesterRecipe',
@@ -124,8 +128,6 @@ setup(name=name,
           '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.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',

slapos/recipe/README.generic_varnish.txt

+generic_varnish
+===============
+
+This recipe creates a varnish instance dedicated for ERP5 with a web checker[1]
+set up.
+
+How to Use
+==========
+
+On slap console, you can instanciate varnish like this:
+
+instance = request(
+  software_type='varnish',
+  partition_parameter_kw={
+     'tidstorage-url':'http://[your tidstrage address]:your tid strage port',
+     'web-checker-frontend-url':'http://www.example.com',
+     'web-checker-mail-address':'web-checker-result@example.com',
+     'web-checker-smtp-host':'mail.example.com',
+  }
+)
+
+tidstrage-url is the backend url that varnish will cache. It is expected that
+the backend is created by tidstorage recipe.
+
+web-checker-frontend-url is the entry-point-url that web checker will check
+the HTTP headers of all the pages in the web site.
+
+web-checker-mail-address is the email address where web checker will send
+the HTTP Cache cheking result.
+
+web-checker-smtp-host is the smtp server to be used to send the web checker
+result.
+
+[Note]
+When web-checker-* parameters are not given, web_checker will be disabled.
+
+TODO
+====
+
+We need to merge this and apache_frontend recipe.
+
+References
+==========
+
+[1] web_checker (it is a part of erp5.util)
+http://pypi.python.org/pypi/erp5.util
+web_checker: Web site HTTP Cache header checking tool
+

slapos/recipe/apache_zope_backend/__init__.py

@@ -70,7 +70,7 @@ class Recipe(GenericBaseRecipe):
     apache_conf['server_name'] = '%s' % apache_conf['ip']
     apache_conf['path'] = '/'
     apache_conf['access_control_string'] = access_control_string
-    apache_conf['rewrite_rule'] = "RewriteRule (.*) %s%s [L,P]" % (backend,
+    apache_conf['rewrite_rule'] = "RewriteRule (.*) %s%s$1 [L,P]" % (backend,
       self.options.get('backend-path', '/'))
     apache_conf_string = pkg_resources.resource_string(__name__,
           'template/apache.zope.conf.in') % apache_conf

slapos/recipe/check_url_available/template/check_url.in

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

slapos/recipe/cloudooo/__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.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
-import os
-import pkg_resources
-import sys
-import zc.buildout
-import zc.recipe.egg
-
-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([__name__])
-    # Use killpidfromfile from ERP5.
-    self.killpidfromfile = zc.buildout.easy_install.scripts(
-        [('killpidfromfile', __name__ + 'slapos.recipe.erp5.killpidfromfile',
-          'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0]
-    self.path_list.append(self.killpidfromfile)
-    conversion_server_conf = self.installConversionServer(
-        self.getLocalIPv4Address(), 23000, 23060)
-
-    self.linkBinary()
-    self.setConnectionDict(dict(
-      site_url="http://%s:%s/" % (self.getLocalIPv4Address(), 23000),
-    ))
-    return self.path_list
-
-  def linkBinary(self):
-    """Links binaries to instance's bin directory for easier exposal"""
-    for linkline in self.options.get('link_binary_list', '').splitlines():
-      if not linkline:
-        continue
-      target = linkline.split()
-      if len(target) == 1:
-        target = target[0]
-        path, linkname = os.path.split(target)
-      else:
-        linkname = target[1]
-        target = target[0]
-      link = os.path.join(self.bin_directory, linkname)
-      if os.path.lexists(link):
-        if not os.path.islink(link):
-          raise zc.buildout.UserError(
-              'Target link already %r exists but it is not link' % link)
-        os.unlink(link)
-      os.symlink(target, link)
-      self.logger.debug('Created link %r -> %r' % (link, target))
-      self.path_list.append(link)
-
-  def installConversionServer(self, ip, port, openoffice_port):
-    name = 'conversion_server'
-    working_directory = self.createDataDirectory(name)
-    conversion_server_dict = dict(
-      working_path=working_directory,
-      uno_path=self.options['ooo_uno_path'],
-      office_binary_path=self.options['ooo_binary_path'],
-      ip=ip,
-      port=port,
-      openoffice_port=openoffice_port,
-    )
-    for env_line in self.options['environment'].splitlines():
-      env_line = env_line.strip()
-      if not env_line:
-        continue
-      if '=' in env_line:
-        env_key, env_value = env_line.split('=')
-        conversion_server_dict[env_key.strip()] = env_value.strip()
-      else:
-        raise zc.buildout.UserError('Line %r in environment parameter is '
-            'incorrect' % env_line)
-    config_file = self.createConfigurationFile(name + '.cfg',
-        self.substituteTemplate(self.getTemplateFilename('cloudooo.cfg.in'),
-          conversion_server_dict))
-    self.path_list.append(config_file)
-    # Use execute from erp5.
-    self.path_list.extend(zc.buildout.easy_install.scripts([(name,
-      __name__ + 'slapos.recipe.librecipe.execute',
-      'execute_with_signal_translation')], self.ws,
-      sys.executable, self.wrapper_directory,
-      arguments=[self.options['ooo_paster'].strip(), 'serve', config_file]))
-    return {
-      name + '_port': conversion_server_dict['port'],
-      name + '_ip': conversion_server_dict['ip']
-      }

slapos/recipe/cloudooo/template/cloudooo.cfg.in

-[app:main]
-use = egg:cloudooo
-#
-## System config
-#
-debug_mode = True
-# Folder where pid files, lock files and virtual frame buffer mappings
-# are stored. In this folder is necessary create a folder tmp, because this
-# folder is used to create all temporary documents.
-working_path = %(working_path)s
-# Folder where UNO library is installed
-uno_path = %(uno_path)s
-# Folder where soffice.bin is installed
-office_binary_path = %(office_binary_path)s
-#
-## Monitor Settings
-#
-# Limit to use the Openoffice Instance. if pass of the limit, the instance is
-# stopped and another is started.
-limit_number_request = 100
-# Interval to check the factory
-monitor_interval = 10
-timeout_response = 180
-enable_memory_monitor = True
-# Set the limit in MB
-# e.g 1000 = 1 GB, 100 = 100 MB
-limit_memory_used = 3000
-#
-## OOFactory Settings
-#
-# The pool consist of several OpenOffice.org instances
-application_hostname = %(ip)s
-# OpenOffice Port
-openoffice_port = %(openoffice_port)s
-# LD_LIBRARY_PATH passed to OpenOffice
-env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s
-
-#
-# Mimetype Registry
-# It is used to select the handler that will be used in conversion.
-# Priority matters, first match take precedence on next lines.
-mimetype_registry =
-  application/pdf * ooo
-  video/* * ffmpeg
-  audio/* * ffmpeg
-  application/x-shockwave-flash * ffmpeg
-  application/ogg * ffmpeg
-  application/ogv * ffmpeg
-  image/* * ooo
-  text/* * ooo
-  application/zip * ooo
-  application/msword * ooo
-  application/vnd* * ooo
-  application/x-vnd* * ooo
-  application/postscript * ooo
-  application/wmf * ooo
-  application/csv * ooo
-  application/x-openoffice-gdimetafile * ooo
-  application/x-emf * ooo
-  application/emf * ooo
-  application/octet* * ooo
-  * application/vnd.oasis.opendocument* ooo
-
-[server:main]
-use = egg:PasteScript#wsgiutils
-host = %(ip)s
-port = %(port)s

slapos/recipe/cloudooo_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):
+    path_list = []
+    common_dict = dict(
+        prepend_path=self.options['prepend-path'],
+    )
+    common_list = [
+           "--paster_path", self.options['ooo-paster'],
+           self.options['configuration-file']
+          ]
+    run_unit_test_path = self.createPythonScript(self.options['run-unit-test'],
+        __name__ + '.test.runUnitTest', [dict(
+        call_list=[self.options['run-unit-test-binary'],
+          ] + common_list, **common_dict)])
+
+    path_list.append(run_unit_test_path)
+    path_list.append(self.createPythonScript(self.options['run-test-suite'],
+        __name__ + '.test.runTestSuite', [dict(
+        call_list=[self.options['run-test-suite-binary'],
+          ], **common_dict)]))
+
+    return path_list

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

 ##############################################################################
 #
-# Copyright (c) 2011 Vifib SARL and Contributors. All Rights Reserved.
+# 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
@@ -24,37 +24,41 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.recipe.librecipe import GenericSlapRecipe
 import os
-import json
-import traceback
+import sys
+def runTestSuite(args):
+  env = os.environ.copy()
+  d = args[0]
+  env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
+  # Deal with Shebang size limitation
+  executable_filepath = d['call_list'][0]
+  file_object = open(executable_filepath, 'r')
+  line = file_object.readline()
+  file_object.close()
+  argument_list = []
+  if line[:2] == '#!':
+    executable_filepath = line[2:].strip()
+    argument_list.append(executable_filepath)
+  argument_list.extend(d['call_list'])
+  argument_list.extend(sys.argv[1:])
+  argument_list.append(env)
+  os.execle(executable_filepath, *argument_list)
 
+def runUnitTest(args):
+  env = os.environ.copy()
+  d = args[0]
+  env['PATH'] = ':'.join([d['prepend_path']] + os.environ.get('PATH', '').split(':'))
+  # Deal with Shebang size limitation
+  executable_filepath = d['call_list'][0]
+  file_object = open(executable_filepath, 'r')
+  line = file_object.readline()
+  file_object.close()
+  argument_list = []
+  if line[:2] == '#!':
+    executable_filepath = line[2:].strip()
+    argument_list.append(executable_filepath)
+  argument_list.extend(d['call_list'])
+  argument_list.extend(sys.argv[1:])
+  argument_list.append(env)
+  os.execle(executable_filepath, *argument_list)
 
-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/erp5_bootstrap/template/erp5_bootstrap.in

@@ -22,6 +22,9 @@ result = zope_connection.getresponse()
 
 if result.status == 204: # and (result.read() == "False"):
 
+  # Use a new connection
+  zope_connection = httplib.HTTPConnection(host)
+
   # Create the expected ERP5 instance
   zope_connection.request(
     'POST', '/manage_addProduct/ERP5/manage_addERP5Site',
@@ -32,4 +35,11 @@ if result.status == 204: # and (result.read() == "False"):
       'cmf_activity_sql_connection_string': mysql_url,
     }),
     headers=header_dict)
+  # Wait for the erp5 response, to prevent multiple requests
+  # been done by the same script.
+  result = zope_connection.getresponse()
 
+  # Read result make sure the site really finished to 
+  #created the ERP5 site.
+  result.read()
+  print "ERP5 site created."

slapos/recipe/erp5_update/__init__.py

@@ -29,6 +29,7 @@ from slapos.recipe.librecipe import GenericSlapRecipe
 
 class Recipe(GenericSlapRecipe):
   def _install(self):
+    self.logger.warn('DEPRECATED: Please update your configuration to use erp5.promise and erp5.bootstrap instead.')
     conversion_server = None
     if 'cloudooo-url' in self.options and self.options['cloudooo-url']:
       parsed = urlparse.urlparse(self.options['cloudooo-url'])

slapos/recipe/fontconfig/__init__.py

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

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

@@ -32,6 +32,7 @@ limit_memory_used = 3000
 application_hostname = %(ip)s
 # OpenOffice Port
 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
@@ -41,12 +42,30 @@ env-FONTCONFIG_FILE = %(FONTCONFIG_FILE)s
 # It is used to select the handler that will be used in conversion.
 # Priority matters, first match take precedence on next lines.
 mimetype_registry =
-  application/pdf * pdf
   application/vnd.oasis.opendocument* * ooo
   application/vnd.sun.xml* * ooo
-  text/* * ooo
-  image/* image/* imagemagick
+  application/pdf text/* pdf
+  application/pdf * ooo
   video/* * ffmpeg
+  audio/* * ffmpeg
+  application/x-shockwave-flash * ffmpeg
+  application/ogg * ffmpeg
+  application/ogv * ffmpeg
+  image/png image/jpeg imagemagick
+  image/png * ooo
+  image/* image/* imagemagick
+  text/* * ooo
+  application/zip * ooo
+  application/msword * ooo
+  application/vnd* * ooo
+  application/x-vnd* * ooo
+  application/postscript * ooo
+  application/wmf * ooo
+  application/csv * ooo
+  application/x-openoffice-gdimetafile * ooo
+  application/x-emf * ooo
+  application/emf * ooo
+  application/octet* * ooo
   * application/vnd.oasis.opendocument* ooo
 
 [server:main]

slapos/recipe/generic_mysql/__init__.py

@@ -31,8 +31,10 @@ class Recipe(GenericBaseRecipe):
 
   def _options(self, options):
     options['password'] = self.generatePassword()
-    options['test-password'] = self.generatePassword()
-    for x in xrange(0, int(options['parallel-test-database-amount'])):
+    if 'test-database' in options:
+      options['test-password'] = self.generatePassword()
+    options.setdefault('parallel-test-database-amount', '0')
+    for x in xrange(int(options['parallel-test-database-amount'])):
       options['test-password-%s' % x] = self.generatePassword()
 
   def install(self):
@@ -40,28 +42,27 @@ class Recipe(GenericBaseRecipe):
 
     template_filename = self.getTemplateFilename('my.cnf.in')
 
-    mysql_conf = dict(
-        ip=self.options['ip'],
-        data_directory=self.options['data-directory'],
-        tcp_port=self.options['port'],
-        pid_file=self.options['pid-file'],
-        socket=self.options['socket'],
-        error_log=self.options['error-log'],
-        slow_query_log=self.options['slow-query-log'],
-        mysql_database=self.options['database'],
-        mysql_user=self.options['user'],
-        mysql_password=self.options['password'],
-        mysql_test_database=self.options['test-database'],
-        mysql_test_user=self.options['test-user'],
-        mysql_test_password=self.options['test-password'],
-    )
-
     mysql_binary = self.options['mysql-binary']
-    socket = self.options['socket'],
+    socket = self.options['socket']
+
+    if 'ip' in self.options:
+      networking = 'port = %s\nbind-address = %s' % (
+        self.options['port'],
+        self.options['ip'],
+      )
+    else:
+      networking = 'skip-networking'
 
     mysql_conf_file = self.createFile(
       self.options['conf-file'],
-      self.substituteTemplate(template_filename, mysql_conf)
+      self.substituteTemplate(template_filename, {
+        'networking': networking,
+        'data_directory': self.options['data-directory'],
+        'pid_file': self.options['pid-file'],
+        'socket': self.options['socket'],
+        'error_log': self.options['error-log'],
+        'slow_query_log': self.options['slow-query-log'],
+      })
     )
     path_list.append(mysql_conf_file)
 
@@ -77,22 +78,23 @@ class Recipe(GenericBaseRecipe):
     mysql_script_list.append(self.substituteTemplate(
       self.getTemplateFilename('initmysql.sql.in'),
       {
-        'mysql_database': mysql_conf['mysql_database'],
-        'mysql_user': mysql_conf['mysql_user'],
-        'mysql_password': mysql_conf['mysql_password']
+        'mysql_database': self.options['database'],
+        'mysql_user': self.options['user'],
+        'mysql_password': self.options['password']
       }
     ))
     # default test database
-    mysql_script_list.append(self.substituteTemplate(
-      self.getTemplateFilename('initmysql.sql.in'),
-      {
-        'mysql_database': mysql_conf['mysql_test_database'],
-        'mysql_user': mysql_conf['mysql_test_user'],
-        'mysql_password': mysql_conf['mysql_test_password']
-      }
-    ))
+    if 'test-database' in self.options:
+      mysql_script_list.append(self.substituteTemplate(
+        self.getTemplateFilename('initmysql.sql.in'),
+        {
+          'mysql_database': self.options['test-database'],
+          'mysql_user': self.options['test-user'],
+          'mysql_password': self.options['test-password']
+        }
+      ))
     # parallel test databases
-    for x in xrange(0, int(self.options['parallel-test-database-amount'])):
+    for x in xrange(int(self.options['parallel-test-database-amount'])):
       mysql_script_list.append(self.substituteTemplate(
         self.getTemplateFilename('initmysql.sql.in'),
         {
@@ -122,31 +124,35 @@ class Recipe(GenericBaseRecipe):
       self.options['wrapper'],
       '%s.mysql.runMysql' % __name__,
       [dict(
+        mysql_base_directory=self.options['mysql-base-directory'],
         mysql_install_binary=self.options['mysql-install-binary'],
         mysqld_binary=mysqld_binary,
-        data_directory=mysql_conf['data_directory'],
+        data_directory=self.options['data-directory'],
         mysql_binary=mysql_binary,
         socket=socket,
         configuration_file=mysql_conf_file,
        )]
     )
     path_list.append(mysqld)
-    # backup configuration
-    full_backup = self.options['full-backup-directory']
-    incremental_backup = self.options['incremental-backup-directory']
-    innobackupex_argument_list = [self.options['perl-binary'],
-        self.options['innobackupex-binary'],
-        '--defaults-file=%s' % mysql_conf_file,
-        '--socket=%s' %mysql_conf['socket'].strip(), '--user=root',
-        '--ibbackup=%s'% self.options['xtrabackup-binary']]
-    environment = dict(PATH='%s' % self.options['bin-directory'])
-    innobackupex_incremental = self.createPythonScript(self.options['innobackupex-incremental'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list + ['--incremental'], environment])
-    path_list.append(innobackupex_incremental)
-    innobackupex_full = self.createPythonScript(self.options['innobackupex-full'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list, environment])
-    path_list.append(innobackupex_full)
-    backup_controller = self.createPythonScript(self.options['backup-script'], __name__ + '.innobackupex.controller', [innobackupex_incremental, innobackupex_full, full_backup, incremental_backup])
-    path_list.append(backup_controller)
-    # maatkit installation
+    # TODO: move to a separate recipe (ack'ed by Cedric)
+    if 'backup-script' in self.options:
+      # backup configuration
+      full_backup = self.options['full-backup-directory']
+      incremental_backup = self.options['incremental-backup-directory']
+      innobackupex_argument_list = [self.options['perl-binary'],
+          self.options['innobackupex-binary'],
+          '--defaults-file=%s' % mysql_conf_file,
+          '--socket=%s' % socket.strip(), '--user=root',
+          '--ibbackup=%s'% self.options['xtrabackup-binary']]
+      environment = dict(PATH='%s' % self.options['bin-directory'])
+      innobackupex_incremental = self.createPythonScript(self.options['innobackupex-incremental'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list + ['--incremental'], environment])
+      path_list.append(innobackupex_incremental)
+      innobackupex_full = self.createPythonScript(self.options['innobackupex-full'], 'slapos.recipe.librecipe.execute.executee', [innobackupex_argument_list, environment])
+      path_list.append(innobackupex_full)
+      backup_controller = self.createPythonScript(self.options['backup-script'], __name__ + '.innobackupex.controller', [innobackupex_incremental, innobackupex_full, full_backup, incremental_backup])
+      path_list.append(backup_controller)
+    # TODO: move to a separate recipe (ack'ed by Cedric)
+    # percona toolkit (formerly known as maatkit) installation
     for pt_script_name in (
         'pt-archiver',
         'pt-config-diff',
@@ -174,10 +180,13 @@ class Recipe(GenericBaseRecipe):
         'pt-variable-advisor',
         'pt-visual-explain',
         ):
+      option_name = pt_script_name + '-binary'
+      if option_name not in self.options:
+        continue
       pt_argument_list = [self.options['perl-binary'],
-          self.options['%s-binary' % pt_script_name],
+          self.options[option_name],
           '--defaults-file=%s' % mysql_conf_file,
-          '--socket=%s' %mysql_conf['socket'].strip(), '--user=root',
+          '--socket=%s' % socket.strip(), '--user=root',
           ]
       pt_exe = self.createPythonScript(os.path.join(self.options['bin-directory'], pt_script_name), 'slapos.recipe.librecipe.execute.executee', [pt_argument_list, environment])
       path_list.append(pt_exe)

slapos/recipe/generic_mysql/mysql.py

@@ -16,8 +16,9 @@ def runMysql(args):
       # XXX: Protect with proper root password
       # XXX: Follow http://dev.mysql.com/doc/refman/5.0/en/default-privileges.html
       popen = subprocess.Popen([conf['mysql_install_binary'],
-        '--skip-name-resolve', '--no-defaults', '--datadir=%s' %
-        conf['data_directory']],
+        '--skip-name-resolve', '--no-defaults',
+        '--datadir=%s' % conf['data_directory'],
+        '--basedir=%s' % conf['mysql_base_directory']],
         stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
       result = popen.communicate()[0]
       if popen.returncode is None or popen.returncode != 0:

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

@@ -8,9 +8,12 @@
 # Loud fail is really required in such case.
 sql-mode="NO_ENGINE_SUBSTITUTION"
 
+# Workaround for https://bugs.launchpad.net/maria/+bug/985828
+# that causes wrong result in Resource_zGetInventoryList etc.
+optimizer_switch = derived_merge=off
+
 skip-show-database
-port = %(tcp_port)s
-bind-address = %(ip)s
+%(networking)s
 socket = %(socket)s
 datadir = %(data_directory)s
 pid-file = %(pid_file)s

slapos/recipe/generic_mysql/template/mysql-init-function.sql.in

@@ -2,4 +2,4 @@ USE mysql;
 DROP FUNCTION IF EXISTS last_insert_grn_id;
 CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME 'ha_mroonga.so';
 DROP FUNCTION IF EXISTS sphinx_snippets;
-CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'sphinx.so';
+#CREATE FUNCTION sphinx_snippets RETURNS STRING SONAME 'ha_sphinx.so';

slapos/recipe/generic_varnish/__init__.py

@@ -38,7 +38,7 @@ class Recipe(GenericSlapRecipe):
   def _install(self):
     ip = self.options['ip']
     backend_url = self.parameter_dict['tidstorage-url']
-    backend_ip, backend_port = self._getBackendServer(backend_url)
+    backend_server, backend_port = self._getBackendServer(backend_url)
     varnishd_manager_port = int(self.options['manager-port'])
     varnishd_server_port = int(self.options['server-port'])
     path_list = []
@@ -53,9 +53,8 @@ class Recipe(GenericSlapRecipe):
       varnish_data=self.options['varnish-data'],
       shell_path=self.options['shell-path'],
       vcl_file=self.options['vcl-file'],
-      backend_ip = backend_ip,
-      backend_port = backend_port,
-      backend_server = "[%s]" % backend_ip,
+      backend_port=backend_port,
+      backend_server=backend_server,
     )
 
     path_list.append(self.createExecutable(self.options['varnishd-wrapper'],
@@ -70,7 +69,7 @@ class Recipe(GenericSlapRecipe):
     return path_list
 
   def _getBackendServer(self, url):
-    r = re.compile('\/\/\[(.*)\]:(\d*)')
+    r = re.compile('\/\/(\[.+\]|[\d.]+):(\d*)')
     result = r.search(url)
     ip = result.groups()[0]
     port = result.groups()[1]

slapos/recipe/generic_varnish/template/default.vcl.in

@@ -5,120 +5,181 @@
 #server.
 #
 backend default {
-  .host = "%(backend_ip)s";
-  .port = "%(backend_port)s";
-  .probe = {
-           .timeout = 30s;
-           .interval = 5s;
-           .window = 4;
-           .threshold = 3;
-           .request =
-             "OPTIONS /erp5/getId HTTP/1.1"
-             "Host: %(backend_server)s:%(backend_port)s"
-             "Accept-Encoding: identity"
-             "Connection: close"
-             "User-Agent: Varnish";
-  }
+    .host = "%(backend_server)s";
+    .port = "%(backend_port)s";
+    .probe = {
+        .timeout = 30s;
+        .interval = 5s;
+        .window = 4;
+        .threshold = 3;
+        .request =
+            "OPTIONS /erp5/getId HTTP/1.1"
+            "Host: %(backend_server)s:%(backend_port)s"
+            "Accept-Encoding: identity"
+            "Connection: close"
+            "User-Agent: Varnish";
+    }
 }
-#
-#Below is a commented-out copy of the default VCL logic.  If you
-#redefine any of these subroutines, the built-in logic will be
-#appended to your code.
-#
 
+# Called at the beginning of a request, after the complete request has been received and parsed
 sub vcl_recv {
-  if (req.request != "GET" &&
-    req.request != "HEAD" &&
-    req.request != "PUT" &&
-    req.request != "POST" &&
-    req.request != "TRACE" &&
-    req.request != "OPTIONS" &&
-    req.request != "PURGE" &&
-    req.request != "DELETE") {
-      /* Non-RFC2616 or CONNECT which is weird. */
-      pipe;
-  }
-  if (req.request != "GET" && req.request != "HEAD" && req.request != "PURGE") {
-      /* We only deal with GET and HEAD by default */
-      pass;
-  }
-  remove req.http.Cookie;
-  remove req.http.Set-Cookie;
-  if (req.http.Accept-Encoding) {
-    if (req.http.Accept-Encoding ~ "gzip") {
-      set req.http.Accept-Encoding = "gzip";
-    } elsif (req.http.Accept-Encoding ~ "deflate") {
-      set req.http.Accept-Encoding = "deflate";
+    # Force lookup if the request is a no-cache request from the client
+    if (req.http.cache-control ~ "no-cache") {
+        ban_url(req.url);
+    }
+    # Pass any requests that Varnish does not understand straight to the backend.
+    if (req.request != "GET" &&
+        req.request != "HEAD" &&
+        req.request != "PUT" &&
+        req.request != "POST" &&
+        req.request != "TRACE" &&
+        req.request != "OPTIONS" &&
+        req.request != "PURGE" &&
+        req.request != "DELETE") {
+        /* Non-RFC2616 or CONNECT which is weird. */
+        return(pipe);
+    }
+    # Pass anything other than GET and HEAD and PURGE directly.
+    if (req.request != "GET" && req.request != "HEAD" && req.request != "PURGE") {
+        /* We only deal with GET and HEAD by default */
+        return(pass);
+    }
+    if (req.http.Authorization) {
+        /* Not cacheable by default */
+        return (pass);
+    }
+
+    # no need to have cookies for the resources
+    if (req.url ~ "\.(css|js|ico)$") {
+        unset req.http.cookie;
+    }
+    # remove bogus cookies
+    if (req.http.Cookie) {
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__utm.=[^;]+;? *", "\1");
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__ac_name=\x22\x22;? *", "\1");
+        set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__ac=\x22Og.3D.3D\x22;? *", "\1");
+    }
+    if (req.http.Cookie == "") {
+        remove req.http.Cookie;
+    }
+    if (req.http.Cookie && req.http.Cookie ~ "(^|; ) *__ac=") {
+        /* Not cacheable for authorised users,
+           but KM images are cacheable */
+        if (!(req.url ~ "/km_img/.*\.(png|gif)$")) {
+            return (pass);
+        }
+    }
+    # XXX Is it OK to remove this of all the case?
+    remove req.http.Set-Cookie;
+
+    if (req.http.Accept-Encoding) {
+        if (req.http.Accept-Encoding ~ "gzip") {
+            set req.http.Accept-Encoding = "gzip";
+        } elsif (req.http.Accept-Encoding ~ "deflate") {
+            set req.http.Accept-Encoding = "deflate";
+        } else {
+            # unkown algorithm
+            remove req.http.Accept-Encoding;
+        }
+    }
+    # We do not care about Accept-Language, this is url controlled
+    remove req.http.Accept-Language;
+
+    ## XXX login form can defer based on __ac_name cookie value
+    if (req.url ~ "/(login_form|WebSite_viewLoginDialog)($|\?)") {
+        return (pass);
+    }
+
+    if (req.backend.healthy) {
+        set req.grace = 1h;
     } else {
-      # unkown algorithm
-      remove req.http.Accept-Encoding;
-    }
-  }
-  # Force deflate
-  remove req.http.Accept-Encoding;
-  # We do not care about Accept-Language, this is url controlled
-  remove req.http.Accept-Language;
-  #if (req.request == "PURGE") {
-  #  if (!client.ip ~ purge) {
-  #    error 405 "Not allowed.";
-  #  }
-  #  purge_url(req.url);
-  #  error 200 "HASHPURGED";
-  #  unset req.http.x;
-  #}
-  set req.grace = 30d;
-  lookup;
+        set req.grace = 1w;
+    }
+    return(lookup);
 }
 
+# Creates the varnish cache key by the url
 sub vcl_hash {
-    set req.hash += req.url;
-    hash;
+    hash_data(req.url);
+    return(hash);
 }
 
+# Called after a cache lookup if the requested document was found in the cache
 sub vcl_hit {
-   #if (req.request == "PURGE" && client.ip ~ purge) {
-   #  set obj.ttl = 0s;
-   #  error 200 "Purged.";
-   #}
-
-   #if (client.ip ~ purge){
-   #  # Force refresh from localhost
-   #  set obj.ttl = 0s;
-   #  return (restart);
-   #}
-   # According Vary Header do not return those headers
-   remove req.http.Accept-Language;
-   remove req.http.Accept-Encoding;
-   remove req.http.Cookie;
-   deliver;
+    # According Vary Header do not return those headers
+    remove req.http.Accept-Language;
+    remove req.http.Accept-Encoding;
+    remove req.http.Cookie;
+    return(deliver);
 }
 
+# Called after a cache lookup if the requested document was not found in the cache
 sub vcl_miss {
-    fetch;
+    return(fetch);
 }
 
+# Called after a document has been successfully retrieved from the backend
 sub vcl_fetch {
+    # we only cache 200 (OK) and 304 (Not Modified) responses.
+    if (beresp.status != 200 && beresp.status != 304) {
+        set beresp.ttl = 0s;
+    }
+
+    if (beresp.http.cache-control ~ "no-cache") {
+        set beresp.ttl = 0s;
+    }
+
+    if (beresp.ttl == 0s) {
+        unset beresp.http.expires;
+        set beresp.http.cache-control = "no-cache";
+        return(hit_for_pass);
+    }
+
+    # we don't care haproxy's cookie.
+    if (beresp.http.Set-Cookie && beresp.http.Set-Cookie !~ "^SERVERID=[^;]+; path=/$") {
+        return(hit_for_pass);
+    }
+
+    if (req.url ~ "\.(css|js|ico)$") {
+        unset beresp.http.set-cookie;
+        set beresp.http.cache-control = regsub(beresp.http.cache-control, "^", "public,");
+        set beresp.http.cache-control = regsub(beresp.http.cache-control, ",$", "");
+    }
+
+    # remove some headers added by caching policy manager to avoid
+    # '304 Not Modified' in case of login <-> logout switching.
+    if (beresp.http.content-type ~ "^text/html") {
+       unset beresp.http.last-modified;
+    }
+
+    set beresp.grace = 1w;
     /* Never send request to backend even if client ask refreshed content */
-    if (obj.cacheable) {
-       /* Setup grace period for 30days for all cacheable contents */
-      #set req.grace = 30d;
-      set obj.grace = 30d;
-      }
-   deliver;
-   }
+    if (beresp.ttl > 0s) {
+        /* Setup grace period for 30days for all cacheable contents */
+        set beresp.grace = 30d;
+        # /* Set the clients TTL on this object */
+        # set beresp.http.cache-control = "max-age = 300";
+        /* Set how long Varnish will keep it */
+        set beresp.ttl = 1w;
+        /* marker for vcl_deliver to reset Age: */
+        set beresp.http.magicmarker = "1";
+    }
 
+    return(deliver);
+}
 
+# Called before a cached object is delivered to the client
 sub vcl_deliver {
-   if (obj.hits > 0) {
-     set resp.http.X-Cache = obj.hits;
-   } else {
-     set resp.http.X-Cache = "MISS";
-   }
-   #if (obj.hash) {
-   #  set resp.http.X-Hash = obj.hash;
-   #} else {
-   #  set resp.http.X-Hash = "No hash";
-   #}
-
-   deliver;
+    if (resp.http.magicmarker) {
+        /* Remove the magic marker */
+        unset resp.http.magicmarker;
+        /* By definition we have a fresh object */
+        set resp.http.age = "0";
+    }
+    if (obj.hits > 0) {
+        set resp.http.X-Cache = obj.hits;
+    } else {
+        set resp.http.X-Cache = "MISS";
+    }
+    return(deliver);
 }

slapos/recipe/generic_varnish/template/varnishlog.in

 #!%(shell_path)s
 
-DAEMON_OPTS="-a %(varnish_ip)s:%(varnishd_server_port)s \
-             -n %(varnish_instance_name)s"
+DAEMON_OPTS="-a -n %(varnish_instance_name)s"
 
 exec %(varnishlog_binary)s ${DAEMON_OPTS} "$@"

slapos/recipe/generic_zope/__init__.py

@@ -93,7 +93,6 @@ class Recipe(GenericBaseRecipe):
 
     # Create zope configuration file
     zope_config = dict(
-        products=self.options['products'],
         thread_amount=self.options['thread-amount'],
         zodb_root_path=self.options['zodb-path'],
         zodb_cache_size=int(self.options['zodb-cache-size']),
@@ -112,14 +111,7 @@ class Recipe(GenericBaseRecipe):
     zope_config['z2_log'] = self.options['z2-log']
     zope_config['pid-filename'] = self.options['pid-file']
     zope_config['lock-filename'] = self.options['lock-file']
-    prefixed_products = []
-    for product in reversed(zope_config['products'].split()):
-      product = product.strip()
-      if product:
-        prefixed_products.append('products %s' % product)
-    prefixed_products.insert(0, 'products %s' % self.options[
-      'instance-products'])
-    zope_config['products'] = '\n'.join(prefixed_products)
+    zope_config['products'] = 'products %s' % self.options['instance-products']
     zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
     zope_config.update(dump_url=self.options['deadlock-path'],
       secret=self.options['deadlock-password'])

slapos/recipe/generic_zope_zeo_client/__init__.py

@@ -43,7 +43,6 @@ def Zope2InitUser(path, username, password):
 class Recipe(GenericBaseRecipe):
   def _options(self, options):
     options['password'] = self.generatePassword()
-    options['deadlock-password'] = self.generatePassword()
 
   def install(self):
     """
@@ -91,25 +90,6 @@ class Recipe(GenericBaseRecipe):
         # Always provide a URL-Type
         append("file://" + link)
 
-    # Generate Zeo connections
-    zeo_snippet_template = open(self.getTemplateFilename('zope.zeo.entry.conf.in'
-      )).read()
-    zeo_snippet_list = []
-    for zeo_line in self.options['zeo-connection-string'].splitlines():
-      zeo_line.strip()
-      if not zeo_line:
-        continue
-      d = dict()
-      for param in zeo_line.split():
-        k, v = param.split('=')
-        d[k.strip()] = v.strip()
-      zeo_snippet_list.append(zeo_snippet_template % d)
-    # Create zope configuration file
-    zope_config = dict(
-        products=self.options['products'],
-        thread_amount=self.options['thread-amount'],
-        zodb_configuration='\n'.join(zeo_snippet_list)
-    )
     zope_environment = dict(
       TMP=self.options['tmp-path'],
       TMPDIR=self.options['tmp-path'],
@@ -134,44 +114,7 @@ class Recipe(GenericBaseRecipe):
     # configure default Zope2 zcml
     open(self.options['site-zcml'], 'w').write(open(self.getTemplateFilename(
         'site.zcml')).read())
-    zope_config['instance'] = self.options['instance-path']
-    zope_config['event_log'] = self.options['event-log']
-    zope_config['z2_log'] = self.options['z2-log']
-    zope_config['pid-filename'] = self.options['pid-file']
-    zope_config['lock-filename'] = self.options['lock-file']
-    prefixed_products = []
-    for product in reversed(zope_config['products'].split()):
-      product = product.strip()
-      if product:
-        prefixed_products.append('products %s' % product)
-    prefixed_products.insert(0, 'products %s' % self.options[
-      'instance-products'])
-    zope_config['products'] = '\n'.join(prefixed_products)
-    zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
-    zope_config.update(dump_url=self.options['deadlock-path'],
-      secret=self.options['deadlock-password'])
-
-    zope_wrapper_template_location = self.getTemplateFilename('zope.conf.in')
-    zope_conf_content = self.substituteTemplate(zope_wrapper_template_location,
-      zope_config)
-    if self.isTrueValue(self.options['timeserver']):
-      zope_conf_content += self.substituteTemplate(self.getTemplateFilename(
-          'zope.conf.timeserver.in'), {})
-    if 'tidstorage-ip' in self.options:
-      zope_conf_content += self.substituteTemplate(self.getTemplateFilename(
-          'zope.conf.tidstorage.in'), {
-            'tidstorage-ip': self.options['tidstorage-ip'],
-            'tidstorage-port': self.options['tidstorage-port'],
-            })
-    if ('promise-path' in self.options) and ('site-id' in self.options):
-      zope_conf_content += self.substituteTemplate(self.getTemplateFilename(
-          'zope.conf.promise.in'), {
-            'site-id': self.options['site-id'],
-            'promise-path': self.options['promise-path'],
-            })
 
-    zope_conf_path = self.createFile(self.options['configuration-file'], zope_conf_content)
-    path_list.append(zope_conf_path)
     # Create init script
-    path_list.append(self.createPythonScript(self.options['wrapper'], 'slapos.recipe.librecipe.execute.executee', [[self.options['runzope-binary'].strip(), '-C', zope_conf_path], zope_environment]))
+    path_list.append(self.createPythonScript(self.options['wrapper'], 'slapos.recipe.librecipe.execute.executee', [[self.options['runzope-binary'].strip(), '-C', self.options['configuration-file']], zope_environment]))
     return path_list

slapos/recipe/haproxy/__init__.py

@@ -77,13 +77,13 @@ class Recipe(GenericBaseRecipe):
       i += 1
       server_snippet += self.substituteTemplate(
           snippet_filename, dict(
-             name='%s_%s' % (name, i), 
+             name='%s_%s' % (name, i),
              address=address,
              cluster_zope_thread_amount=self.options['maxconn']))
 
     config = dict(
-        name=name, 
-        ip=self.options['ip'], 
+        name=name,
+        ip=self.options['ip'],
         port=self.options['port'],
         server_text=server_snippet,
         server_check_path=self.options['server-check-path'],)