Merge remote-tracking branch 'origin/master' into erp5-cluster

component/apache-php/buildout.cfg

@@ -21,9 +21,6 @@ extends =
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
-depends =
-  ${mariadb:version}
-  ${libpng:so_version}
 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
 md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =
@@ -70,9 +67,6 @@ environment =
 [apache-php-postgres]
 # Note: Shall react on each build of apache and reinstall itself
 recipe = slapos.recipe.cmmi
-depends =
-   ${postgresql:url}
-   ${libpng:so_version}
 url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
 md5sum = 5c7b614242ae12e9cacca21c8ab84818
 configure-options =

component/apache/buildout.cfg

@@ -28,15 +28,9 @@ url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2
 md5sum = 6f3417691c7a27090f36e7cf4d94b36e
 
 [apache]
-# apache-antiloris should be rebuilt when apache is rebuilt. to
-# achieve this, please modify 'revision' value below each time you
-# modify anything (but version) in [apache] target.
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-depends =
-  ${gdbm:version}
 version = 2.4.10
-revision = 2
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 44543dff14a4ebc1e9e2d86780507156
 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
@@ -106,10 +100,6 @@ patch-options = -p0
 # http://www.apachelounge.com/viewtopic.php?p=20551
 patches =
   ${:_profile_base_location_}/mod_antiloris-apache-2.4.patch#4f074f035d3b37f3f3e71cd9616440f3
-depends =
-  ${apache:version}
-  ${apache:revision}
-  ${gdbm:version}
 configure-command = ${apache:location}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}
@@ -117,13 +107,9 @@ make-options = -i -a -n antiloris mod_antiloris.la
 make-targets =
 
 [apache-2.2]
-# apache-antiloris-apache-2.2 should be rebuilt when apache-2.2 is
-# rebuilt. to achieve this, please modify 'revision' value below each
-# time you modify anything (but version) in [apache] target.
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
 version = 2.2.27
-revision = 1
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 8faef0decf3fa7e69b2568eb2105a3d8
 patch-options = -p1
@@ -186,9 +172,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
 md5sum = 66862bf10e9be3a023e475604a28a0b4
-depends =
-  ${apache-2.2:version}
-  ${apache-2.2:revision}
 configure-command = ${apache-2.2:location}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}

component/aspell/buildout.cfg

@@ -16,7 +16,6 @@ stop-on-error = yes
 
 [aspell]
 recipe = slapos.recipe.cmmi
-revision = 1
 url = http://ftp.gnu.org/gnu/aspell/aspell-0.60.6.1.tar.gz
 md5sum = e66a9c9af6a60dc46134fdacf6ce97d7
 environment =
@@ -29,6 +28,3 @@ recipe = slapos.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
-depends =
-  ${aspell:url}
-  ${aspell:revision}

component/curl/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 
 [curl]
 recipe = slapos.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.37.0.tar.bz2
-md5sum = 7dda0cc2e4136f78d5801ac347be696b
+url = http://curl.haxx.se/download/curl-7.37.1.tar.bz2
+md5sum = 95c627abcf6494f5abe55effe7cd6a57
 configure-options =
   --disable-static
   --disable-ldap

component/ffmpeg/buildout.cfg

@@ -33,8 +33,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
-depends =
-  ${libpng:so_version}
 patches =
   ${:_profile_base_location_}/libtheora-png_sizeof.patch#eaa1454081b50f05b59495a12f52b0d5
 

component/freetype/buildout.cfg

@@ -16,8 +16,6 @@ recipe = slapos.recipe.cmmi
 url = http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.bz2
 md5sum = d6b60f06bfc046e43ab2a6cbfd171d65
 pkg_config_depends = ${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
-depends =
-  ${libpng:so_version}
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options =
   --disable-static

component/gcc/buildout.cfg

@@ -55,18 +55,6 @@ environment =
   PATH=${m4:location}/bin:%(PATH)s
   LDFLAGS=-Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${ppl:location}/lib
 
-[gcc-download]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-recipe = hexagonit.recipe.download
-url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
-md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
-strip-top-level-dir = True
-destination = ${gcc-source:location}
-
-[gcc-source]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-
 [gcc-multiarch.patch]
 recipe = hexagonit.recipe.download
 md5sum = 819e6735270c8a432b0512b49f40219f
@@ -75,12 +63,9 @@ filename = ${:_buildout_section_name_}
 download-only = true
 
 [gcc]
-hack-revision = ${gcc-interconnection-workaround:hack-revision}
-depends =
-  ${gcc-download:location}
 recipe = slapos.recipe.cmmi
-path = ${gcc-source:location}
-md5sum = bb3265edf0fa7543e50cedb93e04e427
+url = http://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-4.5.3/gcc-4.5.3.tar.bz2
+md5sum = 8e0b5c12212e185f3e4383106bfa9cc6
 patches =
   ${gcc-multiarch.patch:location}/${gcc-multiarch.patch:filename}
 patch-options = -p2
@@ -120,10 +105,3 @@ environment =
   LDFLAGS=-Wl,-rpath=${mpfr:location}/lib -Wl,-rpath=${gmp-4:location}/lib -Wl,-rpath=${mpc:location}/lib
 # make install does not work when several core are used
 make-targets = install -j1
-
-[gcc-interconnection-workaround]
-# gcc parts are interconnected, so buildout is not capable to clean them up
-# until gcc will be simplified by using more robust build recipe (like
-# slapos.recipe.build) each time any of parts which reuses this one gets updated
-# the hack-revision have to be increased
-hack-revision = 2

component/ghostscript/buildout.cfg

@@ -11,8 +11,6 @@ parts = ghostscript
 
 [ghostscript-common]
 recipe = slapos.recipe.cmmi
-depends =
-  ${libtiff:version}
 pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
 configure-options =
   --disable-cups

component/git/buildout.cfg

@@ -15,8 +15,8 @@ parts =
 
 [git]
 recipe = slapos.recipe.cmmi
-url = https://www.kernel.org/pub/software/scm/git/git-2.0.1.tar.xz
-md5sum = 6d28a5d112379c20c7f7df9e0ffb070c
+url = https://www.kernel.org/pub/software/scm/git/git-2.0.4.tar.xz
+md5sum = 0caa9c54bb04612062d21823163ecb13
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/gnutls/buildout.cfg

@@ -28,8 +28,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.15.tar.xz
 md5sum = ec3b06f80e312137386c5d322183ca5a
-depends =
-  ${gmp:version}
 configure-options =
   --disable-static
   --disable-libdane

component/graphviz/buildout.cfg

@@ -19,8 +19,6 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.36.0.tar.gz
 md5sum = 1f41664dba0c93109ac8b71216bf2b57
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}
 configure-options =
   --with-included-ltdl

component/groonga/buildout.cfg

@@ -31,8 +31,6 @@ version = 1.0.6
 url = http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-${:version}.tar.gz
 md5sum = 12740a835cfdf4b0dac66c3f2f152d84
 location = ${groonga:location}
-depends =
-  ${groonga:version}
 configure-options =
   --disable-static
 environment =

component/gtk-2/buildout.cfg

@@ -26,8 +26,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://cairographics.org/releases/cairo-1.12.16.tar.xz
 md5sum = a1304edcdc99282f478b995ee5f8f854
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${pixman:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
 patch-options = -p1
 patches =
@@ -69,8 +67,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/pango/1.36/pango-1.36.1.tar.xz
 md5sum = 9e0d3a1ea395172f8c39ba98a4d2081a
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}
 configure-options =
   --disable-static
@@ -112,8 +108,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.22.tar.xz
 md5sum = 5fbbfb7637bbd571a572a2dae0e736d2
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/gtkmm/buildout.cfg

@@ -18,8 +18,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://cairographics.org/releases/cairomm-1.11.2.tar.gz
 md5sum = 732a3ff5b57401eb5dfeef795a2a0c52
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${cairo:location}/lib/pkgconfig:${cairo:pkg_config_depends}:${libsigc:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/imagemagick/buildout.cfg

@@ -27,10 +27,6 @@ recipe = slapos.recipe.cmmi
 version = 6.8.9-1
 url = http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${:version}.tar.xz
 md5sum = bde038ae05fb20d29cebf88ab9cbdce5
-depends =
-  ${libtiff:version}
-  ${libpng:so_version}
-  ${webp:so_version}
 pkg_config_depends = ${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${xz-utils:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/inkscape/buildout.cfg

@@ -36,8 +36,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/inkscape/files/inkscape/0.48.4/inkscape-0.48.4.tar.bz2
 md5sum = 47bd8546e42ba396624eef9eb66b9b6c
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
 patch-options = -p0
 patches =

component/intltool/buildout.cfg

@@ -12,7 +12,6 @@ recipe = slapos.recipe.cmmi
 url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz
 md5sum = d6c91bf06681919ccfdf3624035b75dc
 depends =
-  ${perl:version}
   ${perl-XML-Parser:location}
 environment =
   PATH=${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s

component/lcms/buildout.cfg

@@ -15,9 +15,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/lcms/lcms/2.6/lcms2-2.6.tar.gz
 md5sum = f4c08d38ceade4a664ebff7228910a33
-depends =
-  ${libpng:so_version}
-  ${libtiff:version}
 configure-options =
   --disable-static
 environment =

component/leptonica/buildout.cfg

@@ -13,9 +13,6 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
 md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
-depends =
-  ${libpng:so_version}
-  ${webp:so_version}
 configure-command =
   ./autogen.sh
   ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static

component/libdmtx/buildout.cfg

@@ -23,9 +23,6 @@ configure-options =
 recipe = slapos.recipe.cmmi
 url = http://prdownloads.sourceforge.net/libdmtx/dmtx-utils-0.7.4.tar.bz2
 md5sum = b132ab9fb1d289869469b8bb4959a08a
-depends =
-  ${libpng:so_version}
-  ${imagemagick:version}
 configure-options =
   --disable-static
 environment =

component/libpng/buildout.cfg

@@ -28,6 +28,5 @@ md5sum = 23fb6a0e9f4dbaab7b34b6fd317a4f2d
 
 [libpng]
 <= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.6.10.tar.xz
-md5sum = 5f414b20f683b1d96b163c89e3eff768
-so_version = 16
+url = http://download.sourceforge.net/libpng/libpng-1.6.12.tar.xz
+md5sum = ee752da8aa75076500e4cf31318e636e

component/librsvg/buildout.cfg

@@ -25,8 +25,6 @@ environment =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-2.40.2.tar.xz
 md5sum = acdecdb9f08f3bf662a68bf7dafb8b82
-depends =
-  ${libpng:so_version}
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${zlib:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig
 configure-options =
   --disable-static

component/mariadb/buildout.cfg

@@ -18,14 +18,10 @@ parts =
   mariadb
 
 [mariadb]
-# mroonga-mariadb should be rebuilt when mariadb is rebuilt. to
-# achieve this, please modify 'revision' value below each time you
-# modify anything (but version) in [mariadb] target.
 recipe = slapos.recipe.cmmi
-version = 10.0.12
-revision = 2
+version = 10.0.13
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = 6e9a7c075526f8f2f83ad8e0933bab2f
+md5sum = 7b2e88864b51d7d0607dc37abb8a0adb
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0
@@ -67,10 +63,6 @@ configure-options =
   --with-mysql-config=${mariadb:location}/bin/mysql_config
   --disable-static
   --disable-document
-depends =
-  ${mariadb:version}
-  ${mariadb:revision}
-  ${groonga-normalizer-mysql:version}
 environment =
   PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga

component/mydumper/buildout.cfg

@@ -15,8 +15,6 @@ parts = mydumper
 # mydumper that works
 [mydumper]
 recipe = slapos.recipe.build
-depends =
-  ${mariadb:version}
 url = https://launchpad.net/mydumper/0.5/0.5.1/+download/mydumper-0.5.1.tar.gz
 md5sum = b4df42dfe23f308ab13eb6ecb73a0d21
 buildout-bin-dir = ${buildout:bin-directory}

component/mysql-python/buildout.cfg

@@ -13,8 +13,6 @@ 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/

component/nettle/buildout.cfg

@@ -14,8 +14,6 @@ md5sum = 41dd0ce2a73487929bdc637b75dd62c9
 recipe = slapos.recipe.cmmi
 url = http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz
 md5sum = 003d5147911317931dd453520eb234a5
-depends =
-  ${gmp:version}
 patches =
   ${nettle-lib-location.patch:location}/${nettle-lib-location.patch:filename}
 configure-option =

component/openssl/buildout.cfg

@@ -18,8 +18,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = https://www.openssl.org/source/openssl-1.0.1i.tar.gz
 md5sum = c8dc151a671b9b92ff3e4c118b174972
-depends =
-  ${ca-certificates:version}
 patch-binary = ${patch:location}/bin/patch
 patches =
   ${:_profile_base_location_}/openssl-nodoc.patch#b4887a7b4e18402447bc6227d2493b92

component/percona-toolkit/buildout.cfg

@@ -8,10 +8,8 @@ parts =
 
 [percona-toolkit]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
-version = 2.2.9
+version = 2.2.10
 url = http://www.percona.com/redir/downloads/percona-toolkit/${:version}/percona-toolkit-${:version}.tar.gz
-md5sum = f0a24d89e56bd01c6c8c5fdfdb5cad44
+md5sum = 9a5f464942c1aafe89a982c031e5e9fa
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/perl-Class-Accessor/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-Class-Accessor]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Class/Class-Accessor-0.34.tar.gz
 md5sum = 0d9640d237a13276145f7e44b4855b89
 configure-command =

component/perl-Config-General/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-Config-General]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Config/Config-General-2.56.tar.gz
 md5sum = 8cf9dd044d016f27b4dc26077606736d
 configure-command =

component/perl-DBD-MySQL/buildout.cfg

@@ -9,8 +9,7 @@ parts =
 [perl-DBD-MySQL-common]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
-  ${perl-DBI:version}
+  ${perl-DBI:location}
 url = http://www.cpan.org/modules/by-module/DBD/DBD-mysql-4.027.tar.gz
 md5sum = 11fa6449715ba9d3fa5f4ee5ae688d6f
 patches =

component/perl-DBI/buildout.cfg

@@ -6,11 +6,6 @@ parts =
 
 [perl-DBI]
 recipe = slapos.recipe.cmmi
-version = 1.616
-# binary library should be rebuilt when perl is updated.
-depends =
-  ${perl:version}
-  ${perl:revision}
 url = http://www.cpan.org/modules/by-module/DBI/DBI-1.631.tar.gz
 md5sum = 444d3c305e86597e11092b517794a840
 configure-command =

component/perl-Data-Dump/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-Data-Dump]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Data/Data-Dump-1.22.tar.gz
 md5sum = db211fe64a5cab15b1e86e5b0dc379a4
 configure-command =

component/perl-Encode-HanExtra/buildout.cfg

@@ -6,10 +6,6 @@ parts =
 
 [perl-Encode-HanExtra]
 recipe = slapos.recipe.cmmi
-# binary library should be rebuilt when perl is updated.
-depends =
-  ${perl:version}
-  ${perl:revision}
 url = http://www.cpan.org/modules/by-module/Encode/Encode-HanExtra-0.23.tar.gz
 md5sum = e1d3bc32c1c8ee304235a06fbcd5d5a4
 configure-command =

component/perl-Encode-Locale/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-Encode-Locale]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Encode/Encode-Locale-1.03.tar.gz
 md5sum = de8422d068634e7c1068dab4e18b452f
 configure-command =

component/perl-File-Listing/buildout.cfg

@@ -8,7 +8,6 @@ parts =
 [perl-File-Listing]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
   ${perl-HTTP-Date:location}
 url = http://www.cpan.org/modules/by-module/File/File-Listing-6.04.tar.gz
 md5sum = 83f636b477741f3a014585bb9cc079a6

component/perl-HTML-Encoding/buildout.cfg

@@ -8,7 +8,6 @@ parts =
 [perl-HTML-Encoding]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
   ${perl-HTTP-Message:location}
 url = http://www.cpan.org/modules/by-module/HTML/HTML-Encoding-0.61.tar.gz
 md5sum = bce9f00f04ad055feaa4d6511b30e421

component/perl-HTML-Parser/buildout.cfg

@@ -7,10 +7,7 @@ parts =
 
 [perl-HTML-Parser]
 recipe = slapos.recipe.cmmi
-# binary library should be rebuilt when perl is updated.
 depends =
-  ${perl:version}
-  ${perl:revision}
   ${perl-HTML-Tagset:location}
 url = http://www.cpan.org/modules/by-module/HTML/HTML-Parser-3.71.tar.gz
 md5sum = 9128a45893097dfa3bf03301b19c5efe

component/perl-HTML-Tagset/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-HTML-Tagset]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/HTML/HTML-Tagset-3.20.tar.gz
 md5sum = d2bfa18fe1904df7f683e96611e87437
 configure-command =

component/perl-HTML-Template/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-HTML-Template]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/HTML/HTML-Template-2.95.tar.gz
 md5sum = 6f08e9631af52e6a5f6e4648b89265fe
 configure-command =

component/perl-HTTP-Cookies/buildout.cfg

@@ -8,7 +8,6 @@ parts =
 [perl-HTTP-Cookies]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
   ${perl-HTTP-Message:location}
 url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Cookies-6.01.tar.gz
 md5sum = ecfd0eeb88512033352c2f13c9580f03

component/perl-HTTP-Daemon/buildout.cfg

@@ -8,7 +8,6 @@ parts =
 [perl-HTTP-Daemon]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
   ${perl-HTTP-Message:location}
 url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Daemon-6.01.tar.gz
 md5sum = ed0ae02d25d7f1e89456d4d69732adc2

component/perl-HTTP-Date/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-HTTP-Date]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Date-6.02.tar.gz
 md5sum = 52b7a0d5982d61be1edb217751d7daba
 configure-command =

component/perl-HTTP-Message/buildout.cfg

@@ -12,7 +12,6 @@ parts =
 [perl-HTTP-Message]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
   ${perl-Encode-Locale:location}
   ${perl-HTTP-Date:location}
   ${perl-IO-HTML:location}

component/perl-HTTP-Negotiate/buildout.cfg

@@ -8,7 +8,6 @@ parts =
 [perl-HTTP-Negotiate]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
   ${perl-HTTP-Message:location}
 url = http://www.cpan.org/modules/by-module/HTTP/HTTP-Negotiate-6.01.tar.gz
 md5sum = 1236195250e264d7436e7bb02031671b

component/perl-IO-HTML/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-IO-HTML]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/IO/IO-HTML-1.00.tar.gz
 md5sum = fdfa3fe3d61a7fda9236c8d9776cdd65
 configure-command =

component/perl-Image-Magick/buildout.cfg

@@ -6,9 +6,6 @@ parts = perl-Image-Magick
 
 [perl-Image-Magick]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
-  ${imagemagick:location}
 url = http://search.cpan.org/CPAN/authors/id/J/JC/JCRISTY/PerlMagick-6.77.tar.gz
 md5sum = fa0f66fa0cabbd1b196254f94dec8e99
 patch-options = -p0

component/perl-JSON/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-JSON]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/JSON/JSON-2.90.tar.gz
 md5sum = e1512169a623e790a3f69b599cc1d3b9
 configure-command =

component/perl-LWP-MediaTypes/buildout.cfg

@@ -8,7 +8,6 @@ parts =
 [perl-LWP-MediaTypes]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
   ${perl-URI:location}
 url = http://www.cpan.org/modules/by-module/LWP/LWP-MediaTypes-6.02.tar.gz
 md5sum = 8c5f25fb64b974d22aff424476ba13c9

component/perl-Net-HTTP/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-Net-HTTP]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Net/Net-HTTP-6.06.tar.gz
 md5sum = 6e74d76205f168775de68347266793a7
 configure-command =

component/perl-Net-IP/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-Net-IP]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/Net/Net-IP-1.26.tar.gz
 md5sum = 3a98e3ac45d69ea38a63a7e678bd716d
 configure-command =

component/perl-SGML-Parser-OpenSP/buildout.cfg

@@ -8,10 +8,7 @@ parts =
 
 [perl-SGML-Parser-OpenSP]
 recipe = slapos.recipe.cmmi
-# binary library should be rebuilt when perl is updated.
 depends =
-  ${perl:version}
-  ${perl:revision}
   ${perl-Class-Accessor:location}
 url = http://www.cpan.org/modules/by-module/SGML/SGML-Parser-OpenSP-0.994.tar.gz
 md5sum = b1ee0244e9daa4d37f28cf32c4753691

component/perl-Term-ReadLine-Gnu/buildout.cfg

@@ -14,8 +14,6 @@ filename = ${:_buildout_section_name_}
 
 [perl-Term-ReadLine-Gnu]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://search.cpan.org/CPAN/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.20.tar.gz
 md5sum = fa33510193b89a2ada74fcef00816322
 patch-options = -p0

component/perl-URI/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-URI]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/URI/URI-1.60.tar.gz
 md5sum = 70f739be8ce28b8baba7c5920ffee4dc
 configure-command =

component/perl-WWW-RobotRules/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-WWW-RobotRules]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/WWW/WWW-RobotRules-6.02.tar.gz
 md5sum = b7186e8b8b3701e70c22abf430742403
 configure-command =

component/perl-XML-LibXML/buildout.cfg

@@ -10,10 +10,7 @@ parts =
 
 [perl-XML-LibXML]
 recipe = slapos.recipe.cmmi
-# binary library should be rebuilt when perl is updated.
 depends =
-  ${perl:version}
-  ${perl:revision}
   ${perl-XML-NamespaceSupport:location}
   ${perl-XML-SAX:location}
 url = http://www.cpan.org/modules/by-module/XML/XML-LibXML-2.0116.tar.gz

component/perl-XML-NamespaceSupport/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-XML-NamespaceSupport]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/XML/XML-NamespaceSupport-1.11.tar.gz
 md5sum = 222cca76161cd956d724286d36b607da
 configure-command =

component/perl-XML-Parser/buildout.cfg

@@ -9,7 +9,6 @@ parts =
 [perl-XML-Parser]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
   ${perl-libwww-perl:location}
 url = http://www.cpan.org/modules/by-module/XML/XML-Parser-2.41.tar.gz
 md5sum = c320d2ffa459e6cdc6f9f59c1185855e

component/perl-XML-SAX-Base/buildout.cfg

@@ -6,8 +6,6 @@ parts =
 
 [perl-XML-SAX-Base]
 recipe = slapos.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://www.cpan.org/modules/by-module/XML/XML-SAX-Base-1.08.tar.gz
 md5sum = 38c8c3247dfd080712596118d70dbe32
 configure-command =

component/perl-XML-SAX/buildout.cfg

@@ -9,7 +9,6 @@ parts =
 [perl-XML-SAX]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
   ${perl-XML-NamespaceSupport:location}
   ${perl-XML-SAX-Base:location}
 url = http://www.cpan.org/modules/by-module/XML/XML-SAX-0.99.tar.gz

component/perl-libwww-perl/buildout.cfg

@@ -19,7 +19,6 @@ parts =
 [perl-libwww-perl]
 recipe = slapos.recipe.cmmi
 depends =
-  ${perl:version}
   ${perl-Data-Dump:location}
   ${perl-Encode-Locale:location}
   ${perl-File-Listing:location}

component/perl/buildout.cfg

@@ -7,11 +7,7 @@ parts =
 
 [perl]
 recipe = slapos.recipe.cmmi
-depends =
-  ${gdbm:version}
 version = 5.20.0
-# increase revision when we need to rebuild binary libraries.
-revision = 1
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
 md5sum = 20cbecd4e9e880ee7a50a136c8b1484e
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}

component/poppler/buildout.cfg

@@ -17,9 +17,6 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://poppler.freedesktop.org/poppler-0.26.0.tar.xz
 md5sum = 76c3b2f18002a0f1e2bbbc7cccd1b957
-depends =
-  ${libtiff:version}
-  ${libpng:so_version}
 configure-options =
   --disable-cairo-output
   --disable-cms

component/pycrypto-python/buildout.cfg

@@ -11,8 +11,6 @@ versions = versions
 recipe = zc.recipe.egg:custom
 egg = pycrypto
 environment = pycrypto-python-env
-depends =
-  ${gmp:version}
 include-dirs =
   ${gmp:location}/include
 library-dirs =

component/python-2.6/buildout.cfg

@@ -25,8 +25,6 @@ filename = python-2.6.6-no_system_inc_dirs.patch
 
 [python2.6]
 recipe = slapos.recipe.cmmi
-depends =
-  ${gdbm:version}
 # This is actually the default setting for prefix, but we can't use it in
 # other settings in this part if we don't set it explicitly here.
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}

component/python-2.7/buildout.cfg

@@ -31,8 +31,6 @@ package_version = 2.7.8
 package_version_suffix =
 md5sum = d235bdfa75b8396942e360a70487ee00
 
-depends =
-  ${gdbm:version}
 # This is actually the default setting for prefix, but we can't use it in
 # other settings in this part if we don't set it explicitly here.
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}

component/qemu-kvm/buildout.cfg

@@ -17,8 +17,6 @@ recipe = slapos.recipe.cmmi
 # qemu-kvm and qemu are now the same since 1.3.
 url = http://wiki.qemu-project.org/download/qemu-1.6.1.tar.bz2
 md5sum = 3a897d722457c5a895cd6ac79a28fda0
-depends =
-  ${libpng:so_version}
 configure-options =
   --target-list=x86_64-softmmu
   --enable-system

component/slapos/buildout.cfg

@@ -135,7 +135,7 @@ mr.developer = 1.30
 netaddr = 0.7.11
 pyparsing = 2.0.2
 six = 1.7.3
-slapos.core = 1.1.2
+slapos.core = 1.1.3
 slapos.libnetworkcache = 0.14.1
 slapos.recipe.cmmi = 0.2
 stevedore = 0.15
@@ -143,29 +143,29 @@ xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 Flask = 0.10.1
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 cliff = 1.6.1
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 netifaces = 0.10.4
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 psutil = 2.1.1
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 requests = 2.3.0
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 supervisor = 3.0
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 zope.interface = 4.1.1

component/sphinx/buildout.cfg

@@ -18,8 +18,6 @@ filename = sphinx-1.10-beta-snowball.patch
 
 [sphinx]
 recipe = slapos.recipe.cmmi
-depends =
-  ${mariadb:version}
 url = http://sphinxsearch.com/files/sphinx-2.0.5-release.tar.gz
 md5sum = e71fdb5b0c2911247d48fb30550b9584
 configure-options =

component/tesseract/buildout.cfg

@@ -14,9 +14,6 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
 md5sum = 1ba496e51a42358fb9d3ffe781b2d20a
-depends =
-  ${libpng:so_version}
-  ${webp:so_version}
 patch-options =
   -p1
 patches =

component/webp/buildout.cfg

@@ -12,9 +12,6 @@ extends =
 recipe = slapos.recipe.cmmi
 url = https://webp.googlecode.com/files/libwebp-0.3.0.tar.gz
 md5sum = 4183f4f51ada98976f14e7bd51f30938
-depends =
-  ${libpng:so_version}
-so_version = 4
 configure-options =
   --disable-static
   --with-jpegincludedir=${libjpeg:location}/include

component/xapian/buildout.cfg

 [buildout]
 parts =
   xapian
-depends =
+extends =
   ../zlib/buildout.cfg
   ../libuuid/buildout.cfg
 

component/xorg/buildout.cfg

@@ -314,7 +314,6 @@ recipe = slapos.recipe.cmmi
 url = http://www.x.org/releases/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2
 md5sum = e7e31da9adb56ba52b5c18226b8cbef3
 depends =
-  ${perl:version}
   ${perl-XML-Parser:location}
 configure-options =
   --disable-static

software/MediaWiki/software.cfg

@@ -52,7 +52,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -104,12 +103,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/ajaxplorer/software.cfg

@@ -205,8 +205,6 @@ numpy = 1.6.2
 websockify = 0.3.0
 slapos.cookbook=0.78.1
 
-setuptools = 0.6c12dev-r88846
-
 Jinja2 = 2.7
 MarkupSafe = 0.18
 Werkzeug = 0.8.3

software/b2evolution/software.cfg

@@ -37,7 +37,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -89,12 +88,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/backupserver/software.cfg

@@ -247,7 +247,6 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-010
 rdiff-backup = 1.0.5
 Jinja2 = 2.7
 MarkupSafe = 0.18
@@ -298,13 +297,6 @@ pyflakes = 0.7.3
 # slapos.cookbook==0.78.1
 pytz = 2013b
 
-# Required by:
-# slapos.cookbook==0.78.1
-# slapos.core==0.35.1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zc.recipe.egg==1.3.2
-setuptools = 0.9.5
-
 # Required by:
 # slapos.cookbook==0.78.1
 slapos.core = 0.35.1

software/boinc-client/software.cfg

@@ -176,15 +176,6 @@ netifaces = 0.10.4
 # slapos.core==0.35.1
 pyflakes = 0.7.2
 
-# Required by:
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.78.1
-# slapos.core==0.35.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.core==0.35.1
 supervisor = 3.0b1

software/cmsmadesimple/software.cfg

@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10
@@ -126,4 +119,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True
+stop-on-error = True
\ No newline at end of file

software/condor/software.cfg

@@ -212,15 +212,6 @@ netifaces = 0.10.4
 # slapos.core==0.35.1
 pyflakes = 0.7.2
 
-# Required by:
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.78.1
-# slapos.core==0.35.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.core==0.35.1
 supervisor = 3.0b1

software/coppermine/software.cfg

@@ -47,7 +47,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -99,12 +98,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/dotclear/software.cfg

@@ -47,7 +47,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -99,12 +98,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/dotproject/software.cfg

@@ -47,7 +47,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -99,12 +98,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/eSKUeL/software.cfg

@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/erp5-util-testing/software.cfg

@@ -88,14 +88,6 @@ netaddr = 0.7.10
 # slapos.core==0.28.5
 netifaces = 0.10.4
 
-# Required by:
-# erp5.util==0.4.7
-# slapos.cookbook==0.65
-# slapos.core==0.28.5
-# zc.buildout==1.6.0-dev-SlapOS-006
-# zc.recipe.egg==1.3.2
-setuptools = 0.9.8
-
 # Required by:
 # slapos.cookbook==0.65
 slapos.core = 0.28.5

software/erp5/software-erp5-component.cfg

+# This file is for building ERP5 software release using erp5-component
+# branch.
+
+[buildout]
+extends =
+  software.cfg
+
+[slapos.cookbook-repository]
+branch = erp5-component
+
+[erp5]
+branch = erp5-component

software/erp5testnode/software.cfg

@@ -182,9 +182,6 @@ signature-certificate-list =
 # use newest version of pytz
 pytz =
 
-# pin version of setuptools
-setuptools = 2.2
-
 Jinja2 = 2.7.3
 MarkupSafe = 0.23
 PyXML = 0.8.5

software/ezpublish/software.cfg

@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/freeglobes/software.cfg

@@ -51,7 +51,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -63,4 +62,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True  
+stop-on-error = True  
\ No newline at end of file

software/freewebshop/software.cfg

@@ -44,7 +44,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -56,4 +55,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True
+stop-on-error = True
\ No newline at end of file

software/fusionnews/software.cfg

@@ -44,7 +44,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -56,4 +55,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True
+stop-on-error = True
\ No newline at end of file

software/guppy/software.cfg

@@ -38,7 +38,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -50,4 +49,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True  
+stop-on-error = True  
\ No newline at end of file

software/html5as/software.cfg

@@ -152,14 +152,6 @@ pyflakes = 0.7
 # slapos.cookbook==0.82
 pytz = 2013b
 
-# Required by:
-# slapos.cookbook==0.82
-# slapos.core==0.35.1
-# slapos.toolbox==0.34.0
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.82
 # slapos.toolbox==0.34.0

software/jio/software.cfg

@@ -78,17 +78,6 @@ pyflakes = 0.6.1
 # slapos.cookbook==0.76.0
 pytz = 2013b
 
-# Required by:
-# collective.recipe.template==1.10
-# erp5.util==0.4.33
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.76.0
-# slapos.core==0.35.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 1.4.2
-
 # Required by:
 # slapos.cookbook==0.76.0
 slapos.core = 0.35.1

software/lamp-template-static/software.cfg

@@ -38,7 +38,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-003
 slapos.cookbook = 0.20
 
 # Generated by buildout-versions
@@ -73,13 +72,6 @@ netaddr = 0.7.6
 # slapos.core==0.21
 netifaces = 0.6
 
-# Required by:
-# slapos.cookbook==0.20
-# slapos.core==0.21
-# zc.buildout==1.6.0-dev-SlapOS-003
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.20
 slapos.core = 0.21

software/lamp-template/software.cfg

@@ -2,6 +2,7 @@
 
 extends =
   ../../stack/lamp/buildout.cfg
+  ../../stack/slapos.cfg
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
@@ -19,4 +20,5 @@ mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [application-configuration]
-location = Student shall put here relative path to application top level directory where configuration shall be created
+#Student shall put here relative path to application top level directory where configuration shall be created
+#location = 

software/magento/software.cfg

@@ -35,7 +35,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -87,12 +86,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/mantis/software.cfg

@@ -42,7 +42,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -54,4 +53,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True  
+stop-on-error = True  
\ No newline at end of file

software/mariadb/software.cfg

@@ -124,13 +124,6 @@ pyflakes = 0.6.1
 # slapos.cookbook==0.72.0
 pytz = 2012j
 
-# Required by:
-# slapos.cookbook==0.72.0
-# slapos.core==0.35
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.72.0
 slapos.core = 0.35

software/memcached/software.cfg

@@ -37,13 +37,6 @@ mode = 0644
 [versions]
 slapos.cookbook = 0.7
 
-# Required by slapos.cookbook==0.7
-slapos.core = 0.2
-collective.recipe.template = 1.8
-netaddr = 0.7.5
-xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88795
-
 hexagonit.recipe.cmmi = 1.5.0
 hexagonit.recipe.download = 1.6nxd002
 plone.recipe.command = 1.1

software/mioga/software.cfg

@@ -53,8 +53,6 @@ eggs =
 # override perl here to keep using 5.14.x.
 [perl]
 recipe = hexagonit.recipe.cmmi
-depends =
-  ${gdbm:version}
 version = 5.14.2
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
 md5sum = 04a4c5d3c1f9f19d77daff8e8cd19a26
@@ -114,8 +112,6 @@ cpan-configuration =
 
 [perl-String-Checker-mioga]
 recipe = hexagonit.recipe.cmmi
-depends =
-  ${perl:version}
 url = http://packages.alixen.org/contribs/String-Checker-0.03.tar.gz
 md5sum = c750a33505609544f95eace7a2896c84
 configure-command =

software/monitor/index.cgi.in

+#!{{ extra_eggs_interpreter }}
+
+print "OK"

software/monitor/instance.cfg

+[buildout]
+
+parts =
+  publish-connection-informations
+  cron
+  certificate-authority
+  cron-entry-monitor
+  cron-entry-rss
+  deploy-index
+  deploy-settings-cgi
+  deploy-status-cgi
+  deploy-status-history-cgi
+  setup-static-files
+  certificate-authority
+  zero-parameters
+  public-symlink
+  cgi-httpd-wrapper
+  cgi-httpd-graceful-wrapper
+  monitor-promise
+  monitor-instance-log-access
+  cron-rsync-logs
+  plot-html
+  dygraph-js
+  
+extends = ${monitor-template:output}
+
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[cron-rsync-logs]
+<= cron
+recipe = slapos.cookbook:cron.d
+name = rsync-logs
+frequency = * * * * *
+command = $${rsync-logs:rendered}
+
+[rsync-logs]
+recipe = slapos.recipe.template:jinja2
+template = ${rsync-logs-script:output}
+rendered = $${monitor-directory:bin}/rsync-logs.sh
+mode = 0744
+context =
+  key buildout_directory buildout:directory
+  raw rsync_binary ${rsync:location}/bin/rsync
+  key server_log_directory monitor-directory:server-log 
+
+[plot-html]
+recipe = slapos.recipe.template:jinja2
+template = ${template-plot-html:output}
+rendered = $${monitor-directory:server-log}/plot.html
+mode = 0644
+context =
+
+[dygraph-js]
+recipe = slapos.recipe.template:jinja2
+template = ${template-dygraph-js:output}
+rendered = $${monitor-directory:server-log}/dygraph-combined.js
+mode = 0644
+context =
+
+[pwgen]
+recipe = slapos.cookbook:generate.password
+user = admin
+bytes = 16
+
+[pwgen32]
+recipe = slapos.cookbook:generate.password
+user = admin
+bytes = 16
+
+[htpasswd-generate]
+recipe = plone.recipe.command
+output = $${monitor-parameters:htaccess-file}
+long_passwd = $${pwgen:passwd}$${pwgen32:passwd} 
+update-command = $${:command}
+command =
+  echo ${apache:location}/bin/htpasswd $${:output} $${pwgen:user} $${:long_passwd}
+  ${apache:location}/bin/htpasswd -cb $${:output} $${pwgen:user} $${:long_passwd}
+
+[monitor-directory]
+server-log = $${:private-directory}/server-log
+
+[monitor-parameters]
+url = https://$${pwgen:user}:$${htpasswd-generate:long_passwd}@[$${slap-parameters:ipv6-random}]:$${:port}
+

software/monitor/plot.html.in

+<html>
+  <head>
+    <meta charset="utf-8">
+     <style>
+
+div {
+  float: left;
+  margin: 5px;
+}
+
+    </style>
+
+  </head>
+  <body>
+    
+    <div> <b> LOADAVG </b> <div class="chart"id="loadavg"> </div></div>
+    <div> <b> CPU PERCENT </b> <div class="chart"id="cpu_percent"> </div></div>
+    <div> <b> MEMORY USED </b> <div class="chart"id="memory_used"> </div></div>
+    <div> <b> MEMORY FREE </b> <div class="chart"id="memory_free"> </div></div>
+    <div> <b> NET IN BYTES </b> <div class="chart"id="net_in_bytes"> </div></div>
+    <div> <b> NET IN ERROR </b> <div class="chart"id="net_in_errors"> </div></div>
+    <div> <b> NET IN DROPPED </b> <div class="chart"id="net_in_dropped"> </div></div>
+    <div> <b> NET OUT BYTES </b> <div class="chart"id="net_out_bytes"> </div></div>
+    <div> <b> NET OUT ERRORS </b> <div class="chart"id="net_out_errors"> </div></div>
+    <div> <b> NET OUT DROPPED </b> <div class="chart"id="net_out_dropped"> </div></div>
+    
+    <script type="text/javascript" src="dygraph-combined.js"></script>
+    <script>
+    new Dygraph(
+        document.getElementById("loadavg"), "system_loadavg.csv");
+    
+    new Dygraph(
+        document.getElementById("cpu_percent"), "system_cpu_percent.csv");
+    
+    new Dygraph(
+        document.getElementById("memory_used"), "system_memory_used.csv");
+    
+    new Dygraph(
+        document.getElementById("memory_free"), "system_memory_free.csv");
+    
+    new Dygraph(
+        document.getElementById("net_in_bytes"), "system_net_in_bytes.csv");
+    
+    new Dygraph(
+        document.getElementById("net_in_errors"), "system_net_in_errors.csv");
+    
+    new Dygraph(
+        document.getElementById("net_in_dropped"), "system_net_in_dropped.csv");
+    
+    new Dygraph(
+        document.getElementById("net_out_bytes"), "system_net_out_bytes.csv");
+    
+    new Dygraph(
+        document.getElementById("net_out_errors"), "system_net_out_errors.csv");
+    
+    new Dygraph(
+        document.getElementById("net_out_dropped"), "system_net_out_dropped.csv");
+    
+    </script>
+
+  </body>
+</html>

software/monitor/rsync-logs.sh.in

+#!${dash-output:dash}
+
+RSYNC_BIN={{ rsync_binary }}
+SLAPGRID_LOGS={{ buildout_directory }}/../var/data-logs/
+SERVERLOGS={{ server_log_directory }}
+
+$RSYNC_BIN -a $SLAPGRID_LOGS $SERVERLOGS

software/monitor/software.cfg

+[buildout]
+
+extends =
+  ../../stack/monitor/buildout.cfg
+  ../../stack/slapos.cfg
+  ../../component/rsync/buildout.cfg
+
+parts = 
+  slapos-cookbook
+  template
+  eggs
+  rsync
+  
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/instance.cfg
+md5sum = 68e146558156c0702344c83876b4daf8 
+mode = 0644
+
+# stupify index for now
+[index]
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 99ad2a7a9dbdae35e3d9aef352c4f0d5 
+
+[rsync-logs-script]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/rsync-logs.sh.in
+md5sum = e48c41cf1cebcaf33353e950edc94717 
+output = ${buildout:directory}/template-rsync-logs.sh.in
+mode = 0644
+
+[template-plot-html]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/plot.html.in
+md5sum = 7f9f201f6695ae56b26b742e571478f5 
+output = ${buildout:directory}/template-plot-html.in
+mode = 0644
+
+[template-dygraph-js]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/dygraph-combined.js
+md5sum = 9bbf0b64dc1ee1ed3b6f4e2c302e21aa
+output = ${buildout:directory}/dygraph-combined.js
+mode = 0644
+
+[eggs]
+recipe = z3c.recipe.scripts
+eggs = 
+  cns.recipe.symlink
+  slapos.cookbook
+  slapos.recipe.cmmi
+  hexagonit.recipe.download
+  plone.recipe.command
+  
+[versions]
+hexagonit.recipe.download = 1.7nxd002
+Jinja2 = 2.7.3
+MarkupSafe = 0.23
+PyRSS2Gen = 1.1
+Werkzeug = 0.9.6
+buildout-versions = 1.7
+cffi = 0.8.6
+cmd2 = 0.6.7
+cns.recipe.symlink = 0.2.3
+cryptography = 0.5.2
+itsdangerous = 0.24
+meld3 = 1.0.0
+mr.developer = 1.30
+plone.recipe.command = 1.1
+pyOpenSSL = 0.14
+pyparsing = 2.0.2
+six = 1.7.3
+slapos.cookbook = 0.87
+slapos.recipe.cmmi = 0.2
+slapos.recipe.template = 2.5
+stevedore = 0.15
+z3c.recipe.scripts = 1.0.1
+
+# Required by:
+# slapos.core==1.1.2
+Flask = 0.10.1
+
+# Required by:
+# cliff==1.6.1
+argparse = 1.2.1
+
+# Required by:
+# slapos.core==1.1.2
+cliff = 1.6.1
+
+# Required by:
+# slapos.cookbook==0.87
+inotifyx = 0.2.0-1
+
+# Required by:
+# slapos.cookbook==0.87
+lock-file = 2.0
+
+# Required by:
+# slapos.cookbook==0.87
+# slapos.core==1.1.2
+# xml-marshaller==0.9.7
+lxml = 3.3.5
+
+# Required by:
+# slapos.cookbook==0.87
+netaddr = 0.7.12
+
+# Required by:
+# slapos.core==1.1.2
+netifaces = 0.10.4
+
+# Required by:
+# slapos.core==1.1.2
+psutil = 2.1.1
+
+# Required by:
+# cffi==0.8.6
+pycparser = 2.10
+
+# Required by:
+# slapos.cookbook==0.87
+pytz = 2014.4
+
+# Required by:
+# slapos.core==1.1.2
+requests = 2.3.0
+
+# Required by:
+# slapos.cookbook==0.87
+slapos.core = 1.1.2
+
+# Required by:
+# slapos.core==1.1.2
+supervisor = 3.0
+
+# Required by:
+# slapos.cookbook==0.87
+xml-marshaller = 0.9.7
+
+# Required by:
+# slapos.core==1.1.2
+zope.interface = 4.1.1

software/moregroupware/software.cfg

@@ -41,7 +41,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -53,4 +52,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True
+stop-on-error = True
\ No newline at end of file

software/mysql-5.1/software.cfg

@@ -44,7 +44,6 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-003
 # Use old cookbook version
 slapos.cookbook = 0.13
 
@@ -79,13 +78,6 @@ netaddr = 0.7.6
 # slapos.core==0.21
 netifaces = 0.6
 
-# Required by:
-# slapos.cookbook==0.13
-# slapos.core==0.21
-# zc.buildout==1.6.0-dev-SlapOS-003
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.13
 slapos.core = 0.21

software/net2ftp/software.cfg

@@ -60,7 +60,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -112,12 +111,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/nucleus/software.cfg

@@ -51,7 +51,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -63,4 +62,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True  
+stop-on-error = True  
\ No newline at end of file

software/officejs/software.cfg

@@ -79,17 +79,6 @@ pyflakes = 0.6.1
 # slapos.cookbook==0.76.0
 pytz = 2013b
 
-# Required by:
-# collective.recipe.template==1.10
-# erp5.util==0.4.33
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.76.0
-# slapos.core==0.35.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.76.0
 slapos.core = 0.35.1

software/openX/software.cfg

@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/openemr/software.cfg

@@ -51,7 +51,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -63,4 +62,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True
+stop-on-error = True
\ No newline at end of file

software/os-commerce/software.cfg

@@ -37,7 +37,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -89,12 +88,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/phpbb/software.cfg

@@ -39,7 +39,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -91,12 +90,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/phpmyadmin/software.cfg

@@ -47,7 +47,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -99,12 +98,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/phpmybackup/software.cfg

@@ -41,7 +41,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -53,4 +52,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True
+stop-on-error = True
\ No newline at end of file

software/phpnuke/software.cfg

@@ -48,7 +48,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -100,12 +99,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/phprojekt/software.cfg

@@ -41,7 +41,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -53,4 +52,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True
+stop-on-error = True
\ No newline at end of file

software/pimcore/software.cfg

@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/piwigo/software.cfg

@@ -48,7 +48,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -100,12 +99,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/piwik/software.cfg

@@ -38,7 +38,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -90,12 +89,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/postgres/software.cfg

@@ -168,14 +168,6 @@ netifaces = 0.10.4
 # slapos.core==0.34
 pyflakes = 0.6.0
 
-# Required by:
-# slapos.cookbook==0.73.1
-# slapos.core==0.34
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.3
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.core==0.34
 supervisor = 3.0b1

software/prestashop/software.cfg

@@ -39,7 +39,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -91,12 +90,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/punbb/software.cfg

@@ -47,7 +47,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -99,12 +98,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/quick-cart/software.cfg

@@ -38,7 +38,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -50,4 +49,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True  
+stop-on-error = True  
\ No newline at end of file

software/quick-cms/software.cfg

@@ -38,7 +38,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -50,4 +49,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True  
+stop-on-error = True  
\ No newline at end of file

software/redis-server/software.cfg

@@ -189,15 +189,6 @@ netifaces = 0.10.4
 # slapos.core==0.35.1
 pyflakes = 0.7.2
 
-# Required by:
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.78.1
-# slapos.core==0.35.1
-# supervisor==3.0b2
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.core==0.35.1
 supervisor = 3.0b2

software/seleniumrunner/software.cfg

@@ -47,9 +47,6 @@ output = ${buildout:directory}/template-selenium.cfg
 mode = 0644
 
 [versions]
-# pin version of setuptools
-setuptools = 2.2
-
 Jinja2 = 2.7.3
 MarkupSafe = 0.23
 Werkzeug = 0.9.4

software/silverstripe/software.cfg

@@ -38,7 +38,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 slapos.cookbook = 0.32
 
 [downloadcache-workaround]

software/simple-invoicing/software.cfg

@@ -37,7 +37,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -49,4 +48,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True
+stop-on-error = True
\ No newline at end of file

software/simpleMachineForum/software.cfg

@@ -37,7 +37,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -89,12 +88,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/slapos-testing/software.cfg

@@ -133,7 +133,6 @@ signature-certificate-list =
   -----END CERTIFICATE-----
 
 [versions]
-setuptools = 1.4.2
 Jinja2 = 2.7.1
 MarkupSafe = 0.18
 Pygments = 1.6

software/slaprunner-lite/software.cfg

@@ -103,17 +103,6 @@ psutil = 0.6.1
 # slapos.core==0.34
 pyflakes = 0.5.0
 
-# Required by:
-# cns.recipe.symlink==0.2.3
-# slapos.cookbook==0.71.1
-# slapos.core==0.34
-# slapos.libnetworkcache==0.13.3
-# slapos.toolbox==0.34.0
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.3
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.core==0.34
 supervisor = 3.0b1

software/slaprunner/README.txt

@@ -144,7 +144,7 @@ As you can see in instance-runner-*.cfg, the buildout section extends a hard-cod
 List of ports used by the webrunner:
 ------------------------------------
 8602 : slapproxy, while running tests
-8080 : shellinabox
+8949 : shellinabox
 9684 : apache (monitoring of slaprunner, git access)
 22222 : dropbear
 50000 : slapproxy
@@ -152,4 +152,4 @@ List of ports used by the webrunner:
 
 Tips:
 -----
-You can use shellinabox in fullscreen, by accessing : https://[IPV6]:8080
+You can use shellinabox in fullscreen, by accessing : https://[IPV6]:8949

software/slaprunner/common.cfg

@@ -28,7 +28,7 @@ parts =
   instance-runner-import
   instance-runner-export
   slapos-cookbook
-  slapos-cfg-template
+  template-slapos-cfg
 # XXX: we have to manually add this for resilience
   rdiff-backup
   collective.recipe.template-egg
@@ -44,7 +44,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 1c084d9aa33202ccba58be750f0698a5
+md5sum = 9878115a2969489b57e8563ef3d4d6d3
 mode = 0644
 
 [template-runner-import-script]
@@ -66,7 +66,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/runner-export.sh.jinja2
 download-only = true
-md5sum = ea478351883e6e716c044771f69a09ac
+md5sum = 246167ed081027618ef127a6fffd13ed
 filename = runner-export.sh.jinja2
 mode = 0644
 
@@ -74,13 +74,13 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 output = ${buildout:directory}/instance-runner-export.cfg
-md5sum = cf43eb1d6e9eea545858a86ea790a1cb
+md5sum = 6930a0d6c88896c43a8e60509ba6bd1c
 mode = 0644
 
 [template-resilient]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = ab564b9a9de3e44884adf072fc740d23
+md5sum = 1f7332d0b0671929a2de87ef9ce998c8
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 
@@ -88,7 +88,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
 download-only = true
-md5sum = 07241952e1dce8688b2da5c1a14c3e6a
+md5sum = abba49f5f397bfe6f6ea5e5dd185b1e9
 filename = instance-resilient-test.cfg.jinja2
 mode = 0644
 
@@ -104,7 +104,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/httpd_conf.in
 download-only = true
-md5sum = 47ba63d87a7fdc91568581226f0063f6
+md5sum = 63782f8eaa94af729ec6bba80e062d8f
 filename = httpd_conf.in
 mode = 0644
 
@@ -116,10 +116,10 @@ filename = launcher.in
 mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
-[slapos-cfg-template]
+[template-slapos-cfg]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/${:filename}
-md5sum = 788795524769f6d946526ac282508b69
+md5sum = 847df63cf5a226ed338d7ca34b0220b5
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = slapos.cfg.in
 download-only = true

software/slaprunner/development.cfg

@@ -21,7 +21,7 @@ parts =
   instance-runner-import
   instance-runner-export
   slapos-cookbook
-  slapos-cfg-template
+  template-slapos-cfg
 # XXX: we have to manually add this for resilience
   rdiff-backup
   collective.recipe.template-egg

software/slaprunner/httpd_conf.in

@@ -46,8 +46,14 @@ Alias /public {{ parameters.runner_home }}/public
 <Directory {{ parameters.runner_home }}/public>
     Order Allow,Deny
     Allow from all
+    AllowOverride All
     Satisfy Any
     Options Indexes FollowSymLinks
+    DirectoryIndex index.html
+    <Files .htaccess>
+        order allow,deny
+        deny from all
+    </Files>
 </Directory>
 
 

software/slaprunner/instance-resilient-test.cfg.jinja2

@@ -47,6 +47,7 @@ config = resiliency-backup-periodicity {{ cluster_parameter_dict.keys() | join('
 config-{{ key }} = {{ dumps(value) }}
 {% endfor -%}
 config-resiliency-backup-periodicity = */6 * * * *
+config-resilient-clone-number = 2
 # XXX hardcoded
 #config-frontend-domain = google.com
 # XXX Hack to deploy Root Instance on the same computer as the type-test Instance

software/slaprunner/instance-resilient.cfg.jinja2

@@ -5,6 +5,11 @@
 # set to false (else it could be dangerous)
 {% do slapparameter_dict.__setitem__('auto-deploy', slapparameter_dict.get('auto-deploy', 'true')) %}
 {% do slapparameter_dict.__setitem__('auto-deploy-instance', slapparameter_dict.get('auto-deploy-instance', 'false')) %}
+# let decide the number of clones we want. We can't have more than 2 clones
+{% set number_of_instances = slapparameter_dict.get('resilient-clone-number', 1)|int %}
+{% if number_of_instances > 2 %}
+  {% set number_of_instances = 2 %}
+{% endif %}
 
 {% import 'parts' as parts %}
 {% import 'replicated' as replicated %}
@@ -16,10 +21,10 @@ offline = true
 
 # += because we need to take up parts (like instance-custom, slapmonitor etc) from the profile we extended
 parts +=
-  {{ parts.replicate("runner", "3") }}
+  {{ parts.replicate("runner", number_of_instances + 1) }}
   publish-connection-informations
 
-{{ replicated.replicate("runner", "3", "runner-export", "runner-import", slapparameter_dict=slapparameter_dict) }}
+{{ replicated.replicate("runner", number_of_instances + 1, "runner-export", "runner-import", slapparameter_dict=slapparameter_dict) }}
 
 # Bubble up the parameters
 [request-runner]
@@ -41,14 +46,13 @@ public_url = ${request-runner:connection-public_url}
 # Default parameters for distributed deployment
 # I.e state "backup1 of maria should go there, ..."
 # XXX-Cedric: Hardcoded number of backups. Should be dynamically generated.
-runner1-computer-guid =
-pbs-runner1-computer-guid =
-runner2-computer-guid =
-pbs-runner2-computer-guid =
-runner3-computer-guid =
-pbs-runner3-computer-guid =
+{% for nb in range(1,number_of_instances+1) %}
+runner{{nb}}-computer-guid =
+pbs-runner{{nb}}-computer-guid =
+{% endfor %}
 # XXX-Cedric: Hardcoded parameters. Should be dynamically generated.
 domain =
 authorized-key =
 instance-amount = 10
 debug = false
+resilient-clone-number = 1

software/slaprunner/instance-runner-export.cfg.in

@@ -26,6 +26,7 @@ parts +=
   cron-entry-backup
   cron-entry-prepare-software
   deploy-instance-parameters
+  minishell-cwd
 ## Monitoring part
 ###Parts to add for monitoring
   cron
@@ -46,6 +47,7 @@ parts +=
   monitor-instance-log-access
 ## Monitor for runner
   monitor-current-log-access
+  monitor-check-resilient-feed-file
 
 
 [exporter]

software/slaprunner/instance-runner.cfg

@@ -23,6 +23,7 @@ parts =
   cron-entry-prepare-software
   deploy-instance-parameters
   instance-software-type
+  minishell-cwd
 {% if slapparameter_dict.get('custom-frontend-backend-url') %}
   custom-frontend-promise
 {% endif %}
@@ -180,16 +181,20 @@ auto_deploy = $${slap-parameter:auto-deploy}
 auto_deploy_instance = $${slap-parameter:auto-deploy-instance}
 autorun = $${slap-parameter:autorun}
 knowledge0_file = $${buildout:directory}/$${public:filename}
+minishell_cwd_file = $${directory:etc}/.minishell-cwd
+minishell_history_file = $${directory:etc}/.minishell_history
 
 [test-runner]
 <= slaprunner
 slapos.cfg = $${directory:etc}/slapos-test.cfg
 working-directory = $${runnerdirectory:test}
 project-directory = $${runnerdirectory:project-test}
-software-directory = $${runnerdirectory:software-test}
-instance-directory = $${runnerdirectory:instance-test}
+software_root = $${runnerdirectory:software-test}
+instance_root = $${runnerdirectory:instance-test}
 proxy_port = 8602
 etc_dir = $${directory:test}
+autorun = False
+auto_deploy = True
 
 [runtestsuite]
 recipe = slapos.cookbook:wrapper
@@ -313,7 +318,7 @@ var_dir = $${directory:var}
 project_folder = $${directory:project}
 runner_home = $${runnerdirectory:home}
 git_http_backend = ${git:location}/libexec/git-core/git-http-backend
-cgi_httpd_conf = $${cgi-httpd-configuration-file:output}
+cgi_httpd_conf = $${monitor-httpd-configuration-file:rendered}
 
 [httpd-conf]
 recipe = slapos.recipe.template:jinja2
@@ -341,7 +346,8 @@ path_pid = $${directory:run}/gunicorn.pid
 
 [gunicorn-launcher]
 recipe = slapos.cookbook:wrapper
-command-line = $${gunicorn:bin_gunicorn} slapos.runner:app -p $${gunicorn:path_pid} -b unix:$${gunicorn:socket} -e RUNNER_CONFIG=$${slaprunner:slapos.cfg} --preload
+command-line = $${gunicorn:bin_gunicorn} slapos.runner:app -p $${gunicorn:path_pid} -b unix:$${gunicorn:socket} -e RUNNER_CONFIG=$${slaprunner:slapos.cfg} --error-logfile $${directory:log}/$${:error-log-file} --log-level error --preload 
+error-log-file = gunicorn-error.log
 wrapper-path = $${gunicorn:bin_launcher}
 environment = PATH=$${environ:PATH}:${git:location}/bin/
   RUNNER_CONFIG=$${slaprunner:slapos.cfg}
@@ -415,7 +421,7 @@ name = Monitor Frontend
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
 slave = true
 config = url domain
-config-url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor-parameters:port}
+config-url = https://[$${monitor-httpd-configuration:listening-ip}]:$${monitor-parameters:port}
 config-domain = $${slap-parameter:frontend-domain}
 return = site_url domain
 
@@ -492,7 +498,7 @@ port = $${slap-parameter:monitor-port}
 
 [slapos-cfg]
 recipe = slapos.recipe.template:jinja2
-template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
+template = ${template-slapos-cfg:location}/${template-slapos-cfg:filename}
 rendered = $${slaprunner:slapos.cfg}
 mode = 700
 context =
@@ -500,7 +506,7 @@ context =
 
 [slapos-test-cfg]
 recipe = slapos.recipe.template:jinja2
-template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
+template = ${template-slapos-cfg:location}/${template-slapos-cfg:filename}
 rendered = $${test-runner:slapos.cfg}
 mode = 700
 context =
@@ -509,7 +515,7 @@ context =
 [shellinabox]
 recipe = slapos.cookbook:shellinabox
 ipv6 = $${slap-network-information:global-ipv6}
-port = 8080
+port = 8949
 shell = $${shell:wrapper}
 wrapper = $${directory:bin}/shellinaboxd
 shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
@@ -598,6 +604,12 @@ recovery-code = $${recovery-code:passwd}
 [zero-parameters]
 
 
+[minishell-cwd]
+recipe = plone.recipe.command
+command = if [ ! -f $${slaprunner:minishell_cwd_file} ]; then echo $${runnerdirectory:home} > $${slaprunner:minishell_cwd_file}; fi
+location = $${slaprunner:minishell_cwd_file}
+stop-on-error = true
+
 [monitor-current-log-access]
 < = monitor-directory-access
 source = $${directory:log}

software/slaprunner/node-frontend.in

-#!{{ shell_path }}
-# BEWARE: This file is operated by slapgrid
-# BEWARE: It will be overwritten automatically
-export NODE_PATH={{ node_env }}
-exec {{ node_path }} {{ conf_path }} {{ ip }} {{ port }} {{ key }} {{ certificate }} {{ backend_ip }} {{ backend_port }}
\ No newline at end of file

software/slaprunner/schema.json

@@ -79,5 +79,10 @@
                                 "type": "integer",
                                 "default": 9684
                         }
+                        "resilient-clone-number": {
+                                "description": "is the number of clones to be deployed when a resilient runner is ordered. Its value can be 1 or 2",
+                                "type": "integer",
+                                "default" : 1
+                        }
                 }
 }

software/slaprunner/software.cfg

@@ -213,7 +213,7 @@ slapos.recipe.build = 0.11.5
 slapos.recipe.cmmi = 0.2
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.39.3
+slapos.toolbox = 0.39.4
 smmap = 0.8.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
@@ -254,17 +254,6 @@ psutil = 0.6.1
 # slapos.core==0.34
 pyflakes = 0.5.0
 
-# Required by:
-# cns.recipe.symlink==0.2.3
-# slapos.cookbook==0.71.1
-# slapos.core==0.34
-# slapos.libnetworkcache==0.13.3
-# slapos.toolbox==0.34.0
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.3
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.core==0.34
 supervisor = 3.0b1

software/slaprunner/template/runner-export.sh.jinja2

 #!{{ shell_binary }}
+LANG=en_US
+export $LANG
 umask 077
 sync_element () {
   path=$1

software/slaprunner/template/slapos.cfg.in

@@ -31,6 +31,8 @@ auto_deploy = {{ slaprunner['auto_deploy'] }}
 auto_deploy_instance = {{ slaprunner['auto_deploy_instance'] }}
 autorun = {{ slaprunner['autorun'] }}
 knowledge0_cfg = {{ slaprunner['knowledge0_file'] }}
+minishell_cwd_file = {{ slaprunner['minishell_cwd_file'] }}
+minishell_history_file = {{ slaprunner['minishell_history_file'] }}
 
 [slapproxy]
 host = {{ slaprunner['ipv4'] }}

software/spip/software.cfg

@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/statusnet/software.cfg

@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/sugar-crm/software.cfg

@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/test-slave-instance-deployment/software.cfg

@@ -167,7 +167,7 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-012
+zc.buildout = 1.6.0-dev-SlapOS-013
 # zc.recipe.egg 2.x is for Buildout 2
 zc.recipe.egg = 1.3.2
 # Use own version of h.r.download to be able to open xz-like archives

software/thelia/software.cfg

@@ -42,7 +42,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -54,4 +53,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True
+stop-on-error = True
\ No newline at end of file

software/tiki/software.cfg

@@ -36,7 +36,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -88,12 +87,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/trac-svn/software.cfg

@@ -360,15 +360,6 @@ psutil = 0.7.0
 # slapos.core==0.35.1
 pyflakes = 0.7.1
 
-# Required by:
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.78.1
-# slapos.core==0.35.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.toolbox==0.34.0
 slapos.core = 0.35.1

software/ultimate-php-borad/software.cfg

@@ -40,7 +40,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically
@@ -52,4 +51,4 @@ recipe = plone.recipe.command
 download-cache = ${buildout:directory}/downloads
 command = [ -d ${:download-cache} ] && rm -fr ${:download-cache}/* || exit 0
 update-command = ${:command}
-stop-on-error = True
+stop-on-error = True
\ No newline at end of file

software/xoops/software.cfg

@@ -37,7 +37,6 @@ eggs = ${instance-recipe:egg}
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -89,12 +88,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/xwiki/software.cfg

@@ -66,11 +66,7 @@ slapos.core = 0.13
 collective.recipe.template = 1.8
 netaddr = 0.7.5
 xml-marshaller = 0.9.7
-setuptools = 0.6c12dev-r88846
 
 hexagonit.recipe.cmmi = 1.5.0
 hexagonit.recipe.download = 1.6nxd002
 plone.recipe.command = 1.1
-
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-009

software/zabbix-agent/software.cfg

@@ -77,15 +77,6 @@ netifaces = 0.10.4
 # slapos.core==0.35.1
 pyflakes = 0.7.2
 
-# Required by:
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.78.0
-# slapos.core==0.35.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.core==0.35.1
 supervisor = 3.0b1

software/zencart/software.cfg

@@ -49,7 +49,6 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-010
 
 Jinja2 = 2.6
 MySQL-python = 1.2.3
@@ -101,12 +100,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.10
 psutil = 0.3.0
 
-# Required by:
-# slapos.cookbook==0.34
-# slapos.core==0.18
-# slapos.toolbox==0.10
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.34
 # slapos.toolbox==0.10

software/zimbra-kvm/software.cfg

@@ -117,12 +117,6 @@ pyflakes = 0.6.1
 # slapos.cookbook==0.73.1
 pytz = 2012j
 
-# Required by:
-# slapos.cookbook==0.73.1
-# slapos.core==0.35.1
-# slapos.toolbox==0.33.1
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.73.1
 # slapos.toolbox==0.33.1

stack/boinc/buildout.cfg

@@ -181,7 +181,6 @@ signature-certificate-list =
 [versions]
 pycrypto = 2.6
 lxml = 3.2.1
-setuptools = 0.6c12dev-r88846
 
 Jinja2 = 2.7
 MarkupSafe = 0.18

stack/cloudooo.cfg

@@ -81,37 +81,37 @@ MarkupSafe = 0.23
 Paste = 1.7.5.1
 PasteScript = 1.7.5
 WSGIUtils = 0.7
-Werkzeug = 0.9.4
+Werkzeug = 0.9.6
 buildout-versions = 1.7
-cffi = 0.8.2
+cffi = 0.8.6
 cliff = 1.6.1
 cmd2 = 0.6.7
-cryptography = 0.4
+cryptography = 0.5.3
 inotifyx = 0.2.0-1
 itsdangerous = 0.24
 lxml = 3.3.5
 meld3 = 1.0.0
 mr.developer = 1.30
-netaddr = 0.7.11
+netaddr = 0.7.12
 netifaces = 0.10.4
 plone.recipe.command = 1.1
 pyOpenSSL = 0.14
 pyparsing = 2.0.2
 python-magic = 0.4.6
-pytz = 2014.3
+pytz = 2014.4
 rdiff-backup = 1.0.5
 requests = 2.3.0
 six = 1.7.3
-slapos.core = 1.1.2
+slapos.core = 1.1.3
 slapos.recipe.build = 0.12
 slapos.recipe.cmmi = 0.2
 slapos.recipe.template = 2.5
 stevedore = 0.15
-supervisor = 3.0
+supervisor = 3.1.1
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 Flask = 0.10.1
 
 # Required by:
@@ -125,21 +125,21 @@ argparse = 1.2.1
 
 # Required by:
 # cloudooo==1.2.5-dev
-erp5.util = 0.4.38
+erp5.util = 0.4.41
 
 # Required by:
 # slapos.cookbook==0.87
 lock-file = 2.0
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 psutil = 2.1.1
 
 # Required by:
-# cffi==0.8.2
+# cffi==0.8.6
 pycparser = 2.10
 
 # Required by:
 # cloudooo==1.2.5-dev
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 zope.interface = 4.1.1

stack/erp5/buildout.cfg

@@ -621,7 +621,6 @@ argparse = 1.2.1
 coverage = 3.7.1
 lxml = 3.3.5
 mr.developer = 1.30
-setuptools = 2.2
 
 # huBarcode 1.0.0 has an issue with importing PIL.
 huBarcode = 0.63
@@ -643,7 +642,7 @@ rdiff-backup = 1.0.5
 slapos.cookbook =
 
 # we need to define an explicit version of slapos.core that is propagated to instances
-slapos.core = 1.1.2
+slapos.core = 1.1.3
 
 # modified version that works fine for buildout installation
 SOAPpy = 0.12.0nxd001
@@ -676,7 +675,7 @@ Products.LongRequestLogger = 1.1.0
 Products.MimetypesRegistry = 2.0.5
 Products.PluginRegistry = 1.3
 Products.TIDStorage = 5.4.9
-PyPDF2 = 1.22
+PyPDF2 = 1.23
 PyXML = 0.8.5
 Pympler = 0.3.1
 StructuredText = 2.11.1
@@ -727,7 +726,7 @@ rtjp-eventlet = 0.3.2
 slapos.recipe.build = 0.12
 slapos.recipe.cmmi = 0.2
 slapos.recipe.template = 2.5
-slapos.toolbox = 0.39.3
+slapos.toolbox = 0.39.4
 smmap = 0.8.2
 socketpool = 0.5.3
 spyne = 2.11.0
@@ -742,12 +741,12 @@ xupdate-processor = 0.4
 xfw = 0.10
 
 # Required by:
-# slapos.core==1.1.2
-# slapos.toolbox==0.39.3
+# slapos.core==1.1.3
+# slapos.toolbox==0.39.4
 Flask = 0.10.1
 
 # Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.39.4
 GitPython = 0.3.2.RC1
 
 # Required by:
@@ -755,11 +754,11 @@ GitPython = 0.3.2.RC1
 Products.ZSQLMethods = 2.13.4
 
 # Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.39.4
 atomize = 0.2.0
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 cliff = 1.6.1
 
 # Required by:
@@ -771,7 +770,7 @@ ecdsa = 0.11
 erp5.util = 0.4.41
 
 # Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.39.4
 feedparser = 5.1.3
 
 # Required by:
@@ -796,7 +795,7 @@ minitage.core = 2.0.57
 minitage.recipe.common = 1.90
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 netifaces = 0.10.4
 
 # Required by:
@@ -804,16 +803,16 @@ netifaces = 0.10.4
 ordereddict = 1.1
 
 # Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.39.4
 paramiko = 1.14.0
 
 # Required by:
-# slapos.core==1.1.2
-# slapos.toolbox==0.39.3
+# slapos.core==1.1.3
+# slapos.toolbox==0.39.4
 psutil = 2.1.1
 
 # Required by:
-# slapos.core==1.1.2
+# slapos.core==1.1.3
 requests = 2.3.0
 
 # Required by:
@@ -821,11 +820,11 @@ requests = 2.3.0
 six = 1.7.3
 
 # Required by:
-# slapos.core==1.1.2
-supervisor = 3.1.0
+# slapos.core==1.1.3
+supervisor = 3.1.1
 
 # Required by:
-# slapos.toolbox==0.39.3
+# slapos.toolbox==0.39.4
 xml-marshaller = 0.9.7
 
 # Required by:

stack/lamp.cfg

@@ -161,12 +161,6 @@ paramiko = 1.7.7.1
 # slapos.toolbox==0.23
 psutil = 0.4.1
 
-# Required by:
-# slapos.cookbook==0.45
-# slapos.core==0.24
-# slapos.toolbox==0.23
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.45
 # slapos.toolbox==0.23

stack/lamp/buildout.cfg

@@ -366,16 +366,6 @@ psutil = 0.6.1
 # slapos.core==0.35.1
 pyflakes = 0.6.1
 
-# Required by:
-# hexagonit.recipe.download==1.6nxd002
-# slapos.cookbook==0.78.0
-# slapos.core==0.35.1
-# slapos.toolbox==0.34.0
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.toolbox==0.34.0
 slapos.core = 0.35.1

stack/lapp/buildout.cfg

@@ -382,16 +382,6 @@ pyflakes = 0.6.1
 # slapos.cookbook==0.74.1-dev
 pytz = 2013b
 
-# Required by:
-# slapos.cookbook==0.74.1-dev
-# slapos.core==0.35.1
-# slapos.recipe.maarch==0.4
-# slapos.toolbox==0.33.1
-# supervisor==3.0b1
-# zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.5
-setuptools = 0.6c12dev-r88846
-
 # Required by:
 # slapos.cookbook==0.74.1-dev
 # slapos.toolbox==0.33.1

stack/monitor/buildout.cfg

@@ -41,7 +41,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/monitor.cfg.in
 output = ${buildout:directory}/monitor.cfg
 filename = monitor.cfg
-md5sum = b330a6fbac771ef5db3e66933f6df8d0
+md5sum = 4d0c3b847c18a56068f04dd926487272
 mode = 0644
 
 [monitor-bin]

stack/monitor/monitor.cfg.in

@@ -193,6 +193,7 @@ recipe = plone.recipe.command
 command = if [ -d $${:source} ]; then ln -s $${:source} $${monitor-directory:private-directory}/instance-logs; fi
 update-command = if [ -d $${:source} ]; then ln -s $${:source} $${monitor-directory:private-directory}/instance-logs; fi
 source = $${monitor-directory:home}/.slapgrid/log/
+location = $${:source}
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory

stack/slapos.cfg

@@ -85,14 +85,14 @@ eggs =
 
 [versions]
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-012
+zc.buildout = 1.6.0-dev-SlapOS-013
 # zc.recipe.egg 2.x is for Buildout 2
 zc.recipe.egg = 1.3.2
 # Use own version of h.r.download to be able to open xz-like archives
 hexagonit.recipe.download = 1.7nxd002
 # Use pinned version of setuptools. Other versions work, but changing
 # version makes buildout recompile everything. Developers' nightmare.
-setuptools = 0.9.8
+setuptools = 5.5.1
 # Official egg of prettytable has permission problems in EGG-INFO.
 prettytable = 0.7.3-nxd001