Merge branch 'master' into 1.0

component/apache/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../libuuid/buildout.cfg
   ../libxml2/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
@@ -106,6 +107,8 @@ configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}
 make-options = -i -a -n antiloris mod_antiloris.la
 make-targets =
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
 
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
@@ -163,7 +166,7 @@ configure-options = --disable-static
                     --without-iconv
 
 environment =
-  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
   CPPFLAGS =-I${libuuid:location}/include
   LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib

component/bash/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 extends =
   ../ncurses/buildout.cfg
+  ../patch/buildout.cfg
 
 [bash]
 recipe = slapos.recipe.cmmi
@@ -45,3 +46,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/bison/buildout.cfg

 [buildout]
 extends =
   ../m4/buildout.cfg
+  ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
   bison
@@ -11,4 +12,4 @@ url = http://ftp.gnu.org/gnu/bison/bison-3.0.2.tar.xz
 md5sum = 146be9ff9fbd27497f0bf2286a5a2082
 environment =
   M4=${m4:location}/bin/m4
-  PATH=${xz-utils:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s

component/boa/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 
 parts = boa
 
@@ -35,3 +37,5 @@ script =
     os.chmod('%(location)s/bin/boa', 0755)
     shutil.copyfile(workdir + '/src/boa_indexer', '%(location)s/bin/boa_indexer')
     os.chmod('%(location)s/bin/boa_indexer', 0755)
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/busybox/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 
 parts = busybox
 
@@ -19,3 +21,5 @@ script =
     self.logger.info("Installing")
     call(['make', 'CONFIG_PREFIX=%(location)s', 'install'], cwd=workdir, env=env)
     self.logger.info("Installation finished")
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/coreutils/buildout.cfg

 [buildout]
 extends =
   ../gmp/buildout.cfg
+  ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
   coreutils-output
@@ -9,10 +10,8 @@ parts =
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz
 md5sum = abed135279f87ad6762ce57ff6d89c41
-configure-options =
-  -enable-install-program=tr,basename,uname,cat,cp,ls
 environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
   LDFLAGS=-Wl,--as-needed -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib
 
 [coreutils-output]

component/dcron/buildout.cfg

 [buildout]
 extends =
   ../coreutils/buildout.cfg
+  ../patch/buildout.cfg
 
 parts = dcron-output
 
@@ -15,6 +16,8 @@ patch-options = -p1
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
 post-make-hook = ${:_profile_base_location_}/dcron-hooks.py#860e914dff4108b47565965fe5ebc7b5:post_make_hook
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
 
 [dcron-output]
 # Shared binary location to ease migration

component/dropbear/buildout.cfg

@@ -8,6 +8,7 @@
 extends =
   ../zlib/buildout.cfg
   ../coreutils/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   dropbear-output
@@ -26,6 +27,7 @@ configure-options =
 environment =
   CPPFLAGS =-I${zlib:location}/include
   LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s
 
 patches=
   ${:_profile_base_location_}/userspace.patch#3d934c2c90e8c57536a4fa2cf8ad216d

component/firefox/buildout.cfg

@@ -26,12 +26,12 @@ depends =
   ${liberation-fonts:location}
   ${ipaex-fonts:location}
 
-version = 40.0.2
+version = 45.0.1
 
 # MD5SUMs are available at :
 # https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${:version}/MD5SUMS
-x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 91005730fe4de7504e1d21d80e427377
-x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 2cf6af6369c01f9b49ad69aa12a705b4
+x86 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 3756c8d06d6f915a3dff1dae643ee74b
+x86-64 = http://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 0409177ef649ec90ffe7a421a19bc156
 
 script =
   if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ')

component/firewalld/buildout.cfg

@@ -19,6 +19,7 @@ extends =
   ../flex/buildout.cfg
   ../bison/buildout.cfg
   ../xz-utils/buildout.cfg
+  ../perl/buildout.cfg
 
 [firewalld]
 recipe = slapos.recipe.cmmi
@@ -32,7 +33,7 @@ pre-configure =
 
 environment =
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:${perl:location}/bin:%(PATH)s
   CPPFLAGS=-I${gettext:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
   PYTHON=${python2.7:location}/bin/python2.7

component/gcc/buildout.cfg

@@ -3,6 +3,8 @@
 [buildout]
 extends =
   ../gmp/buildout.cfg
+  ../perl/buildout.cfg
+  ../tar/buildout.cfg
   ../xz-utils/buildout.cfg
 
 parts =
@@ -59,6 +61,7 @@ configure-options =
   --with-isl=${isl:location}
 environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
+  PATH=${perl:location}/bin:${tar:location}/bin:%(PATH)s
 
 [gcc-minimal]
 <= gcc-common
@@ -73,6 +76,7 @@ configure-options =
   --without-cloog
 environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
+  PATH=${perl:location}/bin:${tar:location}/bin:%(PATH)s
 
 [gcc-fortran]
 <= gcc-common
@@ -86,3 +90,4 @@ configure-options =
   --with-isl=${isl:location}
 environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
+  PATH=${perl:location}/bin:${tar:location}/bin:%(PATH)s

component/git/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../openssl/buildout.cfg
   ../pcre/buildout.cfg
   ../perl/buildout.cfg
+  ../tar/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 parts =
@@ -28,7 +29,7 @@ configure-options =
 environment =
   NO_PYTHON=y
   NO_TCLTK=y
-  PATH=${curl:location}/bin:${gettext:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${curl:location}/bin:${gettext:location}/bin:${tar:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib
 

component/groonga/buildout.cfg

@@ -8,13 +8,14 @@ parts =
 extends =
   ../jemalloc/buildout.cfg
   ../libstemmer/buildout.cfg
+  ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
 [groonga]
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-6.0.0.tar.gz
-md5sum = cf230a41c73574db321eaf831fae3566
+url = http://packages.groonga.org/source/groonga/groonga-6.0.1.tar.gz
+md5sum = 8bcb172634d9b2fd869f04e8d0eeed9c
 # temporary patch to respect more tokens in natural language mode.
 patches =
   ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
@@ -34,6 +35,7 @@ configure-options =
 environment =
   CPPFLAGS=-I${libstemmer:location}/include -I${libstemmer:location}/include -I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${jemalloc:location}/lib -L${jemalloc:location}/lib -Wl,-rpath=${libstemmer:location}/lib -L${libstemmer:location}/lib -Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s
 
 [groonga-normalizer-mysql]
 recipe = slapos.recipe.cmmi

component/gzip/buildout.cfg

 [buildout]
 extends =
+  ../patch/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
   gzip
@@ -9,7 +10,7 @@ recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.6.tar.xz
 md5sum = da981f86677d58a106496e68de6f8995
 environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
 patch-options = -p1
 # The --rsyncable patch is from debian/ubuntu,
 # specifically https://launchpad.net/ubuntu/+source/gzip/1.6-3ubuntu1

component/imagemagick/buildout.cfg

@@ -17,6 +17,7 @@ extends =
   ../libxml2/buildout.cfg
   ../jasper/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../webp/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -60,7 +61,7 @@ patch-options = -p1
 patches =
   ${:_profile_base_location_}/imagemagick-6.6.6-1-no-gsx-gsc-probe.patch#3f28ecd9f6722cf2c3238ce6ec3d7a68
 environment =
-  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${inkscape:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${freetype:location}/bin:${ghostscript:location}/bin:${inkscape:location}/bin:${libxml2:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include -I${jasper:location}/include -I${freetype:location}/include -I${webp:location}/include -I${lcms2:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${jasper:location}/lib -Wl,-rpath=${jasper:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${lcms2:location}/lib -Wl,-rpath=${lcms2:location}/lib

component/ipython/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../numpy/buildout.cfg
   ../matplotlib/buildout.cfg
+  ../python-pyzmq/buildout.cfg
 
 parts =
   ipython
@@ -13,14 +14,18 @@ parts =
 recipe = zc.recipe.egg:custom
 egg = ipython
 environment = ipython-env
-setup-eggs = ${numpy:egg}
+setup-eggs =
+  ${numpy:egg}
+  ${python-pyzmq:egg}
 
 [ipython-notebook]
 recipe = zc.recipe.egg:scripts
 eggs = ipython[notebook]
   ${matplotlib:egg}
 environment = ipython-env
-setup-eggs = ${numpy:egg}
+setup-eggs =
+  ${numpy:egg}
+  ${python-pyzmq:egg}
 initialization =
   # https://github.com/ipython/ipython/issues/5420
   import os

component/jasper/buildout.cfg

 [buildout]
 extends =
   ../libjpeg/buildout.cfg
+  ../patch/buildout.cfg
 parts =
   jasper
 
@@ -25,3 +26,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${libjpeg:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/jbigkit/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   jbigkit
 
@@ -16,3 +19,5 @@ patches =
 configure-command = true
 make-targets = lib pbm
 post-make-hook = ${:_profile_base_location_}/jbigkit-hooks.py#f1edb4ddd212d2d100d7ea8b2e42d21f:post_make_hook
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/json-c/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   json-c
 
@@ -25,3 +28,5 @@ patch-options = -p1
 patches =
   ${json-c-patch-3859e99f50abe11a8dade28efa9ea3d99dfaac11:location}/${json-c-patch-3859e99f50abe11a8dade28efa9ea3d99dfaac11:filename}
   ${json-c-patch-89ae583a8624fad6be4a7d1da084b0c410e4fc63:location}/${json-c-patch-89ae583a8624fad6be4a7d1da084b0c410e4fc63:filename}
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/kumo/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../tokyocabinet/buildout.cfg
   ../messagepack/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../zlib/buildout.cfg
 
 parts = kumo
@@ -24,3 +25,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${tokyocabinet:location}/lib -Wl,-rpath=${messagepack:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/leptonica/buildout.cfg

@@ -7,6 +7,7 @@ extends =
   ../libtiff/buildout.cfg
   ../webp/buildout.cfg
   ../giflib/buildout.cfg
+  ../patch/buildout.cfg
 
 [leptonica]
 recipe = slapos.recipe.cmmi
@@ -20,3 +21,4 @@ patches =
 environment =
   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
+  PATH=${patch:location}/bin:%(PATH)s

component/libatlas/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   libatlas
 
@@ -35,5 +38,5 @@ configure-options =
 make-options =
   -C build
 environment =
-  PATH=${gcc-fortran:location}/bin:%(PATH)s
+  PATH=${gcc-fortran:location}/bin:${patch:location}/bin:%(PATH)s
   LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64

component/libffi/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   libffi
 
@@ -16,3 +19,5 @@ configure-options =
 # on x86_64 OpenSuse, libraries are installed under parts/libffi/lib64.
 make-targets =
   install && cp -av ${:location}/lib64/* ${:location}/lib/ || true
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/libsodium/buildout.cfg

+[buildout]
+parts =
+  libsodium
+
+[libsodium]
+recipe = slapos.recipe.cmmi
+url = https://download.libsodium.org/libsodium/releases/libsodium-1.0.8.tar.gz
+md5sum = 0a66b86fd3aab3fe4c858edcd2772760
+configure-options =
+  --disable-static

component/libstemmer/buildout.cfg

 # libstemmer
 # http://snowball.tartarus.org/
 
+[buildout]
+extends =
+  ../patch/buildout.cfg
+
 [libstemmer]
 recipe = slapos.recipe.cmmi
 url = http://snowball.tartarus.org/dist/libstemmer_c.tgz
@@ -11,4 +15,5 @@ patches =
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = true
 make-options = DESTDIR=${:location}
-
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/libtiff/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../libjpeg/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../patch/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -22,3 +23,4 @@ configure-options =
 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
+  PATH=${patch:location}/bin:%(PATH)s

component/libzmq/buildout.cfg

+[buildout]
+extends =
+  ../libsodium/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  libzmq
+
+[libzmq]
+recipe = slapos.recipe.cmmi
+url = http://download.zeromq.org/zeromq-4.1.4.tar.gz
+md5sum = a611ecc93fffeb6d058c0e6edf4ad4fb
+configure-options =
+  --without-documentation
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libsodium:location}/lib/pkgconfig

component/logrotate/buildout.cfg

 [buildout]
 extends =
+  ../patch/buildout.cfg
   ../popt/buildout.cfg
 parts = logrotate
 
@@ -13,4 +14,5 @@ patches =
 configure-command = true
 make-options = PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} 
 environment =
+  PATH=${patch:location}/bin:%(PATH)s
   POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib

component/make/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   make
 
@@ -16,3 +19,5 @@ md5sum = 7c93b1ab4680eb21c2c13f4f47741e2d
 patches =
   ${:_profile_base_location_}/make-dfsg_3.81-8.2.diff#fa77bb989a096fafbe7c78582e9415e3
 patch-options = -p1
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/mariadb/buildout.cfg

@@ -10,6 +10,7 @@ extends =
   ../libxml2/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../readline/buildout.cfg
@@ -21,9 +22,9 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 10.1.12
-url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb
-md5sum = a2c0809f27ec112139c2c50f03569b2b
+version = 10.1.13
+url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http:/ftp.osuosl.org/pub/mariadb/?serve
+md5sum = aa881ff81a181c7357a90b8a357dee7c
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 patch-options = -p0
 patches =
@@ -60,6 +61,7 @@ environment =
   CMAKE_INCLUDE_PATH=${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include
   CMAKE_LIBRARY_PATH=${libaio:location}/lib:{libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib
   LDFLAGS=-L${jemalloc:location}/lib -Wl,-rpath=${jemalloc:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${pcre:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s
 post-install =
   mkdir -p ${:location}/include/wsrep &&
   cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
@@ -68,8 +70,8 @@ post-install =
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/mroonga/mroonga-6.00.tar.gz
-md5sum = f2ee5867cb820c88fa5d9eada3dbabc6
+url = http://packages.groonga.org/source/mroonga/mroonga-6.01.tar.gz
+md5sum = 65bccc04872361590fd0f7c8fc94e947
 pre-configure =
   mkdir fake_mariadb_source &&
   ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql
@@ -82,7 +84,7 @@ patch-options = -p1
 patches =
   ${:_profile_base_location_}/mroonga_boolean.patch#29f85fc98e85d39b31e53b1e1683d288
 environment =
-  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
   LDFLAGS=-L${groonga:location}/lib
   PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig

component/nettle/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../gmp/buildout.cfg
   ../m4/buildout.cfg
+  ../patch/buildout.cfg
 
 [nettle]
 recipe = slapos.recipe.cmmi
@@ -15,6 +16,6 @@ configure-option =
   --disable-openssl
   --disable-documentation
 environment =
-  PATH=${m4:location}/bin:%(PATH)s
+  PATH=${m4:location}/bin:${patch:location}/bin:%(PATH)s
   CPPFLAGS=-I${gmp:location}/include
   LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib

component/nginx/buildout.cfg

@@ -11,8 +11,8 @@ parts = nginx-output
 
 [nginx-common]
 recipe = slapos.recipe.cmmi
-url = http://nginx.org/download/nginx-1.9.12.tar.gz
-md5sum = 0afe4a7e589a0de43b7b54aa055a4351
+url = http://nginx.org/download/nginx-1.9.14.tar.gz
+md5sum = a25818039f34b5d54b017d44c76321c4
 
 [nginx]
 <= nginx-common

component/nodejs/buildout.cfg

@@ -9,13 +9,65 @@ parts =
   nodejs
 
 [nodejs]
-<= nodejs-0.10
+<= nodejs-0.12
+
+[nodejs-5]
+# Server-side Javascript.
+recipe = slapos.recipe.cmmi
+version = v5.9.1
+url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
+md5sum = 346c9325912271dc7614fe955c75c3a6
+configure-options =
+  --shared-openssl
+  --shared-openssl-includes=${openssl:location}/include
+  --shared-openssl-libpath=${openssl:location}/lib
+environment =
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[nodejs-4]
+# Server-side Javascript.
+recipe = slapos.recipe.cmmi
+version = v4.4.1
+url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
+md5sum = ef756c3e773f08bccada08eb37ee699c
+configure-options =
+  --shared-openssl
+  --shared-openssl-includes=${openssl:location}/include
+  --shared-openssl-libpath=${openssl:location}/lib
+environment =
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
+[nodejs-0.12]
+# Server-side Javascript.
+recipe = slapos.recipe.cmmi
+version = v0.12.12
+url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
+md5sum = 366f3f65352e6887cc6c06aa96c25c3c
+configure-options =
+  --openssl-includes=${openssl:location}/include
+  --openssl-libpath=${openssl:location}/lib
+environment =
+  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
 
 [nodejs-0.10]
 # Server-side Javascript.
 recipe = slapos.recipe.cmmi
-url = http://nodejs.org/dist/v0.10.36/node-v0.10.36.tar.gz
-md5sum = 4b3527b830f2dacaba01aececd509c6f
+version = v0.10.43
+url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
+md5sum = 2356f55d70a013d7952aad17c25cbcfe
 configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib

component/nspr/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts = nspr
 
 [nspr-pkgconfig-patch-download]
@@ -23,3 +26,5 @@ configure-options =
   --enable-64bit
 make-options =
   -C mozilla/nsprpub
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/ocropus/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts = ocropus
 
 [ocropus-patch-scons]
@@ -17,7 +20,7 @@ configure-options =
 patches = ${ocropus-patch-scons:location}/${ocropus-patch-scons:filename}
 patch-options = -p1
 environment =
-  PATH =${scons-bin:destination_directory}:%(PATH)s
+  PATH=${patch:destination_directory}:${scons-bin:destination_directory}:%(PATH)s
 
 [scons-local]
 recipe = hexagonit.recipe.download
@@ -44,4 +47,4 @@ md5sum = 3d9754dbd64c56029ce1cd7c2f61894c
 patches = ${iulib-patch-scons:location}/${iulib-patch-scons:filename}
 patch-options = -p1
 environment =
-  PATH =${scons-bin:destination_directory}:%(PATH)s
+  PATH=${patch:destination_directory}:${scons-bin:destination_directory}:%(PATH)s

component/openblas/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+  ../perl/buildout.cfg
+
 parts =
   openblas
 
@@ -32,6 +36,6 @@ make-options =
 make-targets =
   PREFIX="${buildout:parts-directory}/${:_buildout_section_name_}" install
 environment =
-  PATH=${gcc-fortran:location}/bin:%(PATH)s
+  PATH=${gcc-fortran:location}/bin:${patch:location}/bin:${perl:location}/bin:%(PATH)s
   LD_LIBRARY_PATH=${gcc-fortran:location}/lib:${gcc-fortran:location}/lib64
   LDFLAGS=-Wl,-rpath=${gcc-fortran:location}/lib -Wl,-rpath=${gcc-fortran:location}/lib64

component/perl-DBD-MySQL/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../mysql-tritonn-5.0/buildout.cfg
   ../mariadb/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   perl-DBD-MySQL
@@ -22,6 +23,7 @@ configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mysql-tritonn-5.0:location}/bin/mysql_config
 environment =
   OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mysql-tritonn-5.0:location}/lib/mysql -Wl,-rpath=${openssl:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s
 
 [perl-DBD-mariadb]
 <= perl-DBD-MySQL-common
@@ -29,3 +31,4 @@ configure-command =
   ${perl:location}/bin/perl Makefile.PL --mysql_config=${mariadb:location}/bin/mysql_config
 environment =
   OTHERLDFLAGS=-L${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -Wl,-rpath=${openssl:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/perl-Image-Magick/buildout.cfg

 [buildout]
 extends =
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../imagemagick/buildout.cfg
 parts = perl-Image-Magick
@@ -13,3 +14,5 @@ patches =
   ${:_profile_base_location_}/perl-Image-Magick_MakefilePL.patch#31043e2b79e725d3b251aa09b4549046
 configure-command =
   ${perl:location}/bin/perl Makefile.PL LIBS="-L${imagemagick:location}/lib -Wl,-R${imagemagick:location}/lib -L${perl:location}/libs-c -Wl,-R${perl:location}/libs-c" INC="-I${imagemagick:location}/include/ImageMagick"
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

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

 [buildout]
 extends =
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../ncurses/buildout.cfg
   ../readline/buildout.cfg
@@ -14,3 +15,5 @@ patches =
   ${:_profile_base_location_}/perl-Term-ReadLine-Gnu.patch#d4e4624e717c8da63e4d153149d57b68
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --libdir=${readline:location}/lib --includedir="${readline:location}/include" LIBS="-Wl,-R${readline:location}/lib -L${ncurses:location}/lib -Wl,-R${ncurses:location}/lib" INC="-I${ncurses:location}/include"
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/postfix/buildout.cfg

@@ -5,6 +5,7 @@
 extends =
   ../libdb/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../cyrus-sasl/buildout.cfg
 
@@ -20,3 +21,5 @@ patches =
 configure-command = make
 configure-options = makefiles CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl:location}/include -I${cyrus-sasl:location}/include/sasl' AUXLIBS='-L${openssl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -L${cyrus-sasl:location}/lib -lssl -lpcre -ldb -lcrypto -lsasl2 -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib'
 make-targets = non-interactive-package install_root=${:location}
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/postgresql/buildout.cfg

@@ -33,5 +33,5 @@ environment =
 
 [postgresql92]
 <= postgresql-common
-url = http://ftp.postgresql.org/pub/source/v9.2.15/postgresql-9.2.15.tar.bz2
-md5sum = 235b4fc09eff4569a7972be65c449ecc
+url = http://ftp.postgresql.org/pub/source/v9.2.16/postgresql-9.2.16.tar.bz2
+md5sum = a6ced0ccd4ce3279acfef9bac16a95ee

component/pycuda/buildout.cfg

+[buildout]
+extends =
+  ../numpy/buildout.cfg
+
+parts = 
+  pycuda
+
+[pycuda-env]
+<= numpy-env
+
+[pycuda]
+recipe = zc.recipe.egg:custom
+egg = pycuda
+environment = pycuda-env
+setup-eggs =
+  ${numpy:egg}

component/pysvn-python/buildout.cfg

 [buildout]
 extends =
   ../apache/buildout.cfg
+  ../patch/buildout.cfg
   ../subversion/buildout.cfg
 
 parts =
@@ -15,6 +16,7 @@ patches =
   ${:_profile_base_location_}/pysvn-1.7.10-inc_lib_dir.patch#02d00b58d537242aa5bb5c9202dedbf1
   ${:_profile_base_location_}/pysvn-issue-179.patch#bd3f9629f95f0f749c5a5e93c797ee2b
 patch-options = -p1
+patch-binary = ${patch:location}/bin/patch
 include-dirs =
   ${subversion:location}/include/subversion-1
   ${apache:location}/include

component/python-2.7/buildout.cfg

@@ -7,6 +7,7 @@ extends =
   ../libffi/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../zlib/buildout.cfg
@@ -57,6 +58,6 @@ make-targets = make profile-opt && make install
 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
 # which would otherwise load the system libmagic.so with ctypes
 environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi: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${libffi: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=${libffi: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/python-ldap-python/buildout.cfg

@@ -5,6 +5,7 @@ extends =
   ../cyrus-sasl/buildout.cfg
   ../openldap/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
 
 [python-ldap-python]
 recipe = zc.recipe.egg:custom
@@ -12,6 +13,7 @@ egg = python-ldap
 patches =
   ${:_profile_base_location_}/python-ldap-no_default_dirs.patch#959115f13f1de5c63654c69b8dfacd69
 patch-options = -p1
+patch-binary = ${patch:location}/bin/patch
 rpath =
   ${openldap:location}/lib
   ${cyrus-sasl:location}/lib

component/python-pyzmq/buildout.cfg

+[buildout]
+extends =
+  ../libzmq/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  python-pyzmq
+
+[python-pyzmq-env]
+PATH =${pkgconfig:location}/bin:%(PATH)s
+PKG_CONFIG_PATH=${libzmq:location}/lib/pkgconfig
+
+[python-pyzmq]
+recipe = zc.recipe.egg:custom
+egg = pyzmq
+environment = python-pyzmq-env
+rpath =
+  ${libzmq:location}/lib

component/readline/buildout.cfg

 [buildout]
 extends =
   ../ncurses/buildout.cfg
+  ../patch/buildout.cfg
 
 parts =
   readline5
@@ -29,6 +30,8 @@ md5sum = e39331f32ad14009b9ff49cc10c5e751
 configure-options =
   --enable-multibyte
   --disable-static
+environment =
+  PATH=${patch:location}/bin:%(PATH)s
 
 [readline]
 recipe = slapos.recipe.cmmi
@@ -50,3 +53,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${ncurses:location}/include/ncurses
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/redis/buildout.cfg

@@ -3,7 +3,9 @@
 parts =
   redis
 
-extends = ../tcl/buildout.cfg
+extends =
+  ../patch/buildout.cfg
+  ../tcl/buildout.cfg
 
 [redis]
 <= redis28
@@ -21,7 +23,7 @@ make-targets =
   install
   test
 environment =
-  PATH=${tcl:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${tcl:location}/bin:%(PATH)s
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/0001-tests-Disable-replication-psync-for-now.patch#1ed899443ed70fce02d9b95f5e7ca046

component/rsync/buildout.cfg

 [buildout]
+extends =
+  ../perl/buildout.cfg
+
 parts =
   rsync
 
@@ -8,3 +11,5 @@ url = http://rsync.samba.org/ftp/rsync/src/rsync-3.1.1.tar.gz
 md5sum = 43bd6676f0b404326eee2d63be3cdcfe
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+environment =
+  PATH=${perl:location}/bin:%(PATH)s

component/screen/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
+
 parts =
   screen
 
@@ -10,10 +13,11 @@ recipe = slapos.recipe.cmmi
 version = 4.0.3
 url = http://ftp.gnu.org/gnu/screen/screen-4.0.3.tar.gz
 md5sum = 8506fd205028a96c741e4037de6e3c42
-environment=
-    CFLAGS=-I${ncurses:location}/include
-    LDFLAGS=-L${ncurses:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/
 # Compatibility with CentOS
 patch-options = -p1 -b
 patches =
   ${:_profile_base_location_}/screen-4.0.3-stropts.patch#5677917353067ffbcb08a23a59605aa4
+environment =
+  CFLAGS=-I${ncurses:location}/include
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  PATH=${patch:location}/bin:%(PATH)s

component/shellinabox/buildout.cfg

@@ -44,7 +44,7 @@ configure-command =
   ${autoconf:location}/bin/autoreconf -vif
   ./configure
 environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${git:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
   CFLAGS = -I${zlib:location}/include -I${openssl:location}/include
   LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
   PKG_CONFIG_PATH = ${openssl:location}/lib/pkgconfig/

component/subversion/buildout.cfg

@@ -8,6 +8,7 @@ extends =
   ../libuuid/buildout.cfg
   ../neon/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../serf/buildout.cfg
@@ -50,7 +51,7 @@ configure-options =
   --disable-nls
 make-targets = install -j1
 environment =
-  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${apache:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${serf:location}/lib/pkgconfig
   CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include
   LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${openssl:location}/lib

component/tar/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 
 parts = tar
 
@@ -12,3 +14,4 @@ url = http://ftp.gnu.org/gnu/tar/tar-1.26.tar.gz
 md5sum = 00d1e769c6af702c542cca54b728920d
 environment =
   FORCE_UNSAFE_CONFIGURE=1
+  PATH=${patch:location}/bin:%(PATH)s

component/tesseract/buildout.cfg

@@ -6,6 +6,7 @@ extends =
   ../leptonica/buildout.cfg
   ../libpng/buildout.cfg
   ../libtool/buildout.cfg
+  ../patch/buildout.cfg
   ../webp/buildout.cfg
 
 parts =
@@ -35,7 +36,7 @@ configure-options =
 # tesseract has a non-standard way of testing for leptonica, hence the
 # LIBLEPT_HEADERSDIR entry below:
 environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${patch:location}/bin:%(PATH)s
   ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
   LIBLEPT_HEADERSDIR=${leptonica:location}/include
   CPPFLAGS=-I${leptonica:location}/include

component/trafficserver/buildout.cfg

 [buildout]
 extends =
-  ../../component/lua/buildout.cfg
-  ../../component/pkgconfig/buildout.cfg
-  ../../component/libtool/buildout.cfg
-  ../../component/make/buildout.cfg
-  ../../component/openssl/buildout.cfg
-  ../../component/tcl/buildout.cfg
-  ../../component/libxml2/buildout.cfg
-  ../../component/pcre/buildout.cfg
-  ../../component/libcap/buildout.cfg
-  ../../component/flex/buildout.cfg
-  ../../component/ncurses/buildout.cfg
-  ../../component/curl/buildout.cfg
-  ../../component/zlib/buildout.cfg
+  ../libtool/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../make/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../openssl/buildout.cfg
+  ../pcre/buildout.cfg
+  ../perl/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../tcl/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts =
   trafficserver
@@ -26,7 +23,7 @@ configure-options =
   --with-xml=libxml2
   --with-libxml2=${libxml2:location}
   --with-pcre=${pcre:location}
-  --with-lua=${lua:location}
+  --without-lua
   --with-ncurses=${ncurses:location}
   --with-tcl=${tcl:location}/lib/
   --with-lzma=${xz-utils:location}
@@ -34,8 +31,8 @@ configure-options =
   --disable-hwloc
   --enable-experimental-plugins
 environment =
-  PATH=${make:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  LDFLAGS =-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  PATH=${libtool:location}/bin:${make:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  LDFLAGS =-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 make-target =
   check
   install

component/userhosts/buildout.cfg

@@ -13,6 +13,6 @@ location = ${userhosts-get:location}/userhosts
 [userhosts-get]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/userhosts.git
-revision = d3080ad4b82c91dc14fd2ad2a8e9b2512e600c2a
+revision = 48241da33416ef76097c9cdd6c70b8a57b4b69a8
 git-executable = ${git:location}/bin/git
 location = ${buildout:parts-directory}/userhosts

component/w3m/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../garbage-collector/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
@@ -38,7 +39,7 @@ patches =
   ${:_profile_base_location_}/w3m-0.5.2-gc72.patch#5a74b6379240c8dd1372efa7926c8bdc
 
 environment =
-  PATH=${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig
   CPPFLAGS=-I${ncurses:location}/include/ -I${zlib:location}/include/ -I${garbage-collector:location}/include
   LDFLAGS=-Wl,--as-needed -L${garbage-collector:location}/lib -Wl,-rpath=${garbage-collector:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/wget/buildout.cfg

 [buildout]
 extends =
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -27,7 +28,7 @@ patches =
   ${:_profile_base_location_}/wget-doc.makefile.patch#0d23cf1ee81268a94699aebbb26058e6
 
 environment =
-  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${openssl:location}/lib
   CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -I${pcre:location}/include

component/xorg/buildout.cfg

@@ -12,6 +12,7 @@ extends =
   ../libxml2/buildout.cfg
   ../libxslt/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
@@ -69,7 +70,7 @@ configure-options =
   --without-fop
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
 
 [libXau]
 recipe = slapos.recipe.cmmi
@@ -106,7 +107,7 @@ configure-options =
   --disable-build-docs
 environment =
   PKG_CONFIG_PATH=${libXau:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
-  PATH=${pkgconfig:location}/bin:${libxslt:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${pkgconfig:location}/bin:${libxslt:location}/bin:%(PATH)s
   PYTHON=${buildout:executable}
 # Python note: libxcb requires python with ElementTree. In case of appliance
 # non system python is used, and this binary contains ElementTree. In case of
@@ -525,5 +526,5 @@ configure-options =
 environment =
   PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${fixesproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xcmiscproto:location}/lib/pkgconfig:${xtrans:location}/share/pkgconfig:${bigreqsproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${inputproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${fontsproto:location}/lib/pkgconfig:${videoproto:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig:${resourceproto:location}/lib/pkgconfig:${xineramaproto:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxkbfile:location}/lib/pkgconfig:${libXfont:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libfontenc:location}/lib/pkgconfig:${freetype:pkg_config_depends}:${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   CPPFLAGS=-I${bzip2:location}/include -I${gcrypt:location}/include -I${gpg-error:location}/include -I${zlib:location}/include
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gcrypt:location}/lib -Wl,-rpath=${gcrypt:location}/lib -L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/xtrabackup/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../flex/buildout.cfg
   ../libtool/buildout.cfg
   ../ncurses/buildout.cfg
+  ../patch/buildout.cfg
   ../readline/buildout.cfg
   ../zlib/buildout.cfg
 
@@ -45,6 +46,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:location}/bin:${libtool:location}/bin:${flex:location}/bin:%(PATH)s:${bison:location}/bin
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${bison:location}/bin:${libtool:location}/bin:${flex:location}/bin:${patch:location}/bin:%(PATH)s
 make-options =
   -j1

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

@@ -2,8 +2,8 @@ SSLCertificateFile %(certificate)s
 SSLCertificateKeyFile %(key)s
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
-SSLProtocol -ALL +SSLv3 +TLSv1
-SSLHonorCipherOrder On
-SSLCipherSuite RC4-SHA:HIGH:!ADH
+SSLProtocol all -SSLv2 -SSLv3
+SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on
 SSLSessionCache shmcb:%(ssl_session_cache)s(512000)
 SSLProxyEngine On

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

@@ -3,7 +3,7 @@ SSLCertificateFile %(login_certificate)s
 SSLCertificateKeyFile %(login_key)s
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
-SSLProtocol -ALL +SSLv3 +TLSv1
-SSLCipherSuite ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM
-
+SSLProtocol all -SSLv2 -SSLv3
+SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on
 SSLProxyEngine On

slapos/recipe/erp5testnode/template/httpd.conf.in

@@ -45,9 +45,9 @@ SSLCertificateFile %(certificate)s
 SSLCertificateKeyFile %(key)s
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
-SSLProtocol -ALL +SSLv3 +TLSv1
-SSLHonorCipherOrder On
-SSLCipherSuite RC4-SHA:HIGH:!ADH
+SSLProtocol all -SSLv2 -SSLv3
+SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on
 SSLProxyEngine On
 
 

slapos/recipe/slapconfiguration.py

@@ -150,11 +150,11 @@ class Recipe(object):
               pass
           else:
               options[his_key.replace('_', '-')] = value
-      # Get Instance and root instance title or return UNKNOW if not set
+      # Get Instance and root instance title or return UNKNOWN if not set
       options['instance-title'] = parameter_dict.pop('instance_title',
-                                                      'UNKNOW Instance')
+                                            'UNKNOWN Instance').encode('UTF-8')
       options['root-instance-title'] = parameter_dict.pop('root_instance_title',
-                                                      'UNKNOW')
+                                            'UNKNOWN').encode('UTF-8')
 
       ipv4_set = set()
       v4_add = ipv4_set.add

software/agent/software.cfg

@@ -43,7 +43,7 @@ eggs =
 [versions]
 apache-libcloud = 0.18.0
 ecdsa = 0.13
-erp5.util = 0.4.43
+erp5.util = 0.4.44
 gitdb = 0.6.4
 pycrypto = 2.6.1
 slapos.recipe.download = 1.0

software/apache-frontend/README.apache_frontend.txt

@@ -440,9 +440,9 @@ the proxy::
   ServerAdmin example.org
   SSLEngine on
   SSLProxyEngine on
-  SSLProtocol -ALL +SSLv3 +TLSv1
-  SSLHonorCipherOrder On
-  SSLCipherSuite RC4-SHA:HIGH:!ADH
+  SSLProtocol all -SSLv2 -SSLv3
+  SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+  SSLHonorCipherOrder on
   # Use personal ssl certificates
   SSLCertificateFile %(ssl_crt)s
   SSLCertificateKeyFile %(ssl_key)s

software/apache-frontend/common.cfg

@@ -96,7 +96,7 @@ mode = 640
 [template-apache-frontend-configuration]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/apache.conf.in
-md5sum = 09ffa9a94cc7506d32c2c422853106b6
+md5sum = 8ff17b2a0d0495ec935e378f3976de71
 mode = 640
 
 [template-apache-cached-configuration]
@@ -164,7 +164,7 @@ md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
 [template-trafficserver-records-config]
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/templates/trafficserver/${:filename}
-md5sum = c68fc90886c3314466b459520692e145 
+md5sum = 65afeef0229430ad8a6fbc57298b787b
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = records.config.jinja2
 download-only = true

software/apache-frontend/templates/apache.conf.in

@@ -123,7 +123,8 @@ SSLSessionCacheTimeout  300
 SSLRandomSeed startup /dev/urandom 256
 SSLRandomSeed connect builtin
 SSLProtocol all -SSLv2 -SSLv3
-SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!RC4
+SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on
 <FilesMatch "\.(cgi|shtml|phtml|php)$">
       SSLOptions +StdEnvVars
 </FilesMatch>

software/apache-frontend/templates/trafficserver/records.config.jinja2

@@ -492,18 +492,19 @@ CONFIG proxy.config.url_remap.pristine_host_hdr INT 1
    # proxy.config.exec_thread.autoconfig.scale by default. You can
    # override that here (set it to a non-zero value).
 CONFIG proxy.config.ssl.number.threads INT 0
-   # The following three variables can be
-   # set to 0 to disable SSLv2, SSLv3, and/or TLSv1.
-   # SSLv2 is disabled by default for security concern.
+   # The following variables control SSL protocols.
 CONFIG proxy.config.ssl.SSLv2 INT 0
-CONFIG proxy.config.ssl.SSLv3 INT 1
+CONFIG proxy.config.ssl.SSLv3 INT 0
 CONFIG proxy.config.ssl.TLSv1 INT 1
+CONFIG proxy.config.ssl.TLSv1_1 INT 1
+CONFIG proxy.config.ssl.TLSv1_2 INT 1
    # The following two variables control the Cipher Suite traffic Server
    # uses for HTTPS connnections and whether to prefer the client
    # selected (default) or the server selected
    # Our default SSL Cipher Suite tries to be reasonably fast and strong.
-CONFIG proxy.config.ssl.server.cipher_suite STRING RC4-SHA:AES128-SHA:DES-CBC3-SHA:AES256-SHA:ALL:!aNULL:!EXP:!LOW:!MD5:!SSLV2:!NULL
-CONFIG proxy.config.ssl.server.honor_cipher_order INT 0
+CONFIG proxy.config.ssl.server.cipher_suite STRING ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+
+CONFIG proxy.config.ssl.server.honor_cipher_order INT 1
    # Control if SSL should perform content compression or not
 CONFIG proxy.config.ssl.compression INT 0
    # Client certification level should be:

software/cdn-me/software.cfg

@@ -38,6 +38,6 @@ eggs =
 [versions]
 cns.recipe.symlink = 0.2.3
 collective.recipe.environment = 0.2.0
-erp5.util = 0.4.43
+erp5.util = 0.4.44
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.8

software/erp5/instance-erp5-input-schema.json

@@ -4,7 +4,7 @@
   "additionalProperties": false,
   "properties": {
     "sla-dict": {
-      "description": "Where to request instances. Each key is a query string for criterions (e.g. \"computer_guid=foo\"), and each value is a list of partition references.",
+      "description": "Where to request instances. Each key is a query string for criterions (e.g. \"computer_guid=foo\"), and each value is a list of partition references (note: Zope partitions reference must be prefixed with \"zope-\").",
       "additionalProperties": {
         "type": "array",
         "items": { "type": "string" },

software/gateone/software.cfg

@@ -111,7 +111,7 @@ extra-context =
 < = download-base
 url = ${:_profile_base_location_}/templates/${:filename}.in
 filename = nginx.conf
-md5sum = 72f4cc110f618b317793e21124f45121
+md5sum = 3d80d73a9cfffca6687813d86ddc25ba
 
 [check-recipe]
 recipe = plone.recipe.command

software/gateone/templates/nginx.conf.in

@@ -24,8 +24,9 @@ http {
         server_name _;
         ssl_certificate     {{ parameter_dict['ssl-certificate'] }};
         ssl_certificate_key {{ parameter_dict['ssl-key'] }};
-        ssl_protocols       SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-        ssl_ciphers         HIGH:!aNULL:!MD5;
+        ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+        ssl_ciphers         ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+        ssl_prefer_server_ciphers on;
         keepalive_timeout 90s;
         client_body_temp_path {{ param_tempdir['client_body_temp_path'] }};
         proxy_temp_path {{ param_tempdir['proxy_temp_path'] }};

software/html5ide/software.cfg

@@ -32,7 +32,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/httpd.conf.jinja2
 download-only = true
-md5sum = 0c9e75bcbaf5ed97f7b33d472107b634
+md5sum = 97d84138323b1e3214847b1b7de9a10e
 filename = httpd_conf.in
 mode = 0644
 

software/html5ide/template/httpd.conf.jinja2

@@ -35,9 +35,9 @@ SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 SSLRandomSeed startup /dev/urandom 256
 SSLRandomSeed connect builtin
-SSLProtocol -ALL +SSLv3 +TLSv1
-SSLHonorCipherOrder On
-SSLCipherSuite RC4-SHA:HIGH:!ADH
+SSLProtocol all -SSLv2 -SSLv3
+SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on
 SSLEngine   On
 
 

software/ipython_notebook/instance.cfg.in

@@ -2,27 +2,6 @@
 parts =
   instance
   publish-connection-parameter
-## Monitoring part XXX whe should not have to specify all parts like this
-## Parts to add for monitoring
-  certificate-authority
-  cron
-  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
-## Monitor for ipython
-  monitor-current-log-access
-  monitor-deploy-set-password-cgi
   erp5-kernel
   kernel-json
   custom-js
@@ -101,22 +80,30 @@ mode = 0744
 context =
   raw config_cfg ${buildout:directory}/knowledge0.cfg
 
-[monitor-current-log-access]
-< = monitor-directory-access
-source = ${instance-parameter:logfile}
+[monitor-instance-parameter]
+monitor-base-url = ${monitor-frontend-promise:url}
+# XXX Monitor will request frontend and check frontend promise
+#     If required use ipv6 url bellow
+#monitor-base-url = ${monitor-httpd-conf-parameter:url}
+cors-domains = ${slap-parameter:monitor-cors-domains}
 
+[monitor-conf-parameters]
+private-path-list += 
+  ${instance-parameter:logfile}
+
+# XXX need to convert this for new Monitor
 [monitor-deploy-set-password-cgi]
 <= dynamic-jinja2-template-base
 template = {{ ipython_notebook_set_password_location }}/{{ ipython_notebook_set_password_filename }}
-rendered = ${monitor-directory:knowledge0-cgi}/${:filename}
+rendered = ${directory:etc}/${:filename}
 filename = ipython-notebook-password.cgi
 mode = 0744
 context =
   raw config_cfg ${buildout:directory}/knowledge0.cfg
   raw python_executable {{ bin_directory }}/ipython
-  key pwd monitor-directory:knowledge0-cgi
+#  key pwd monitor-directory:knowledge0-cgi
   key this_file :filename
-  key httpd_graceful cgi-httpd-graceful-wrapper:rendered
+#  key httpd_graceful cgi-httpd-graceful-wrapper:rendered
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -136,7 +123,10 @@ erp5_kernel_dir = ${:ipython_kernel_dir}/ERP5
 [publish-connection-parameter]
 recipe = slapos.cookbook:publish.serialised
 url = https://[${instance-parameter:host}]:${instance-parameter:port}
-monitor_url = ${monitor-parameters:url}
+monitor-base-url = ${publish:monitor-base-url}
+monitor-url = ${publish:monitor-url}
+monitor-user = ${publish:monitor-user}
+monitor-password = ${publish:monitor-password}
 
 [erp5-kernel]
 <= dynamic-jinja2-template-base
@@ -163,3 +153,6 @@ context =
 template = {{ custom_js_location }}/{{ custom_js_filename }}
 rendered = ${directory:ipython_dir}/profile_default/static/custom/custom.js
 mode = 0744
+
+[slap-parameter]
+monitor-cors-domains = monitor.node.vifib.com

software/ipython_notebook/software.cfg

@@ -60,12 +60,12 @@ recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
 rendered = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = c6b82a386a72ed72301302c3132ffb71
+md5sum = 060487563061b596af08815bf146190b
 context =
   key bin_directory buildout:bin-directory
   key develop_eggs_directory buildout:develop-eggs-directory
   key eggs_directory buildout:eggs-directory
-  key monitor_template monitor-template:output
+  key monitor_template monitor-template:rendered
   key openssl_output openssl-output:openssl
   key python_executable python2.7:executable
   key ipython_notebook_config_location ipython-notebook-config:location

software/jstestnode/instance.cfg.in

+[buildout]
+parts =
+  nginx-service
+  runTestSuite-instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
+[publish]
+recipe = slapos.cookbook:publish
+nginx = http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+etc = $${buildout:directory}/etc
+bin = $${buildout:directory}/bin
+srv = $${buildout:directory}/srv
+var = $${buildout:directory}/var
+run = $${:var}/run
+log = $${:var}/log
+varnginx = $${:var}/nginx
+scripts = $${:etc}/run
+services = $${:etc}/service
+promise = $${:etc}/promise/
+www = $${:srv}/www
+home = $${:etc}/home
+ssl = $${:etc}/ssl
+framebuffer = $${:srv}/framebuffer
+
+#################################
+# Firefox
+#################################
+
+[runTestSuite-instance]
+recipe = slapos.recipe.template
+url = ${template-runTestSuite:output}
+output = $${directory:bin}/runTestSuite
+mode = 0700
+
+[firefox-instance]
+recipe = slapos.cookbook:firefox
+executable = firefox
+runner-path = $${directory:bin}/$${:executable}
+firefox-path = ${firefox:location}/firefox-slapos
+prefsjs-path = $${directory:etc}/prefs.js
+shell-path = ${dash:location}/bin/dash
+tmp-path = $${xvfb-instance:tmp-path}
+
+[xvfb-instance]
+recipe = slapos.cookbook:xvfb
+runner-path = $${directory:services}/xvfb
+xvfb-path = ${xserver:location}/bin/Xvfb
+fbdir-path = $${directory:framebuffer}
+tmp-path = $${directory:run}
+shell-path = ${dash:location}/bin/dash
+
+xwd-path = ${xwd:location}/bin/xwd
+xwd-hook-path = $${directory:bin}/xwd
+
+#################################
+# Nginx service
+#################################
+[nginx-service]
+recipe = slapos.recipe.template
+url = ${template-nginx-service:output}
+output = $${directory:services}/nginx
+mode = 0700
+virtual-depends = 
+  $${nginx-configuration:ip}
+
+[nginx-configuration]
+recipe = slapos.recipe.template
+url = ${template-nginx-configuration:output}
+output = $${directory:etc}/nginx.cfg
+mode = 0600
+access_log = $${directory:log}/nginx-access.log
+error_log = $${directory:log}/nginx-error.log
+ip = $${instance-parameter:ipv6-random}
+port = 9443
+ssl_key = $${directory:ssl}/nginx.key
+ssl_csr = $${directory:ssl}/nginx.csr
+ssl_crt = $${directory:ssl}/nginx.crt
+
+#################################
+# SlapOS service
+#################################
+[instance-parameter]
+recipe = slapos.cookbook:slapconfiguration
+computer = $${slap_connection:computer_id}
+partition = $${slap_connection:partition_id}
+url = $${slap_connection:server_url}
+key = $${slap_connection:key_file}
+cert = $${slap_connection:cert_file}
\ No newline at end of file

software/jstestnode/runTestSuite.in

+#!${buildout:directory}/bin/${eggs:interpreter}
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+"""
+  Script to run jIO/renderJS test suite using Nexedi's test node framework.
+"""
+import argparse, os, re, shutil, subprocess, sys, traceback
+from erp5.util import taskdistribution
+from time import gmtime, strftime
+from selenium import webdriver
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+
+# Put a 'firefox' executable in the path
+# otherwise, WebDriver refuses to start
+os.environ['PATH'] = '$${directory:bin}' + os.pathsep + os.environ['PATH']
+
+FIREFOX_EXECUTABLE = '$${firefox-instance:executable}'
+BASE_URL = 'http://[$${nginx-configuration:ip}]:$${nginx-configuration:port}/'
+
+def main():
+  parser = argparse.ArgumentParser(description='Run a test suite.')
+  parser.add_argument('--test_suite', help='The test suite name')
+  parser.add_argument('--test_suite_title', help='The test suite title')
+  parser.add_argument('--test_node_title', help='The test node title')
+  parser.add_argument('--project_title', help='The project title')
+  parser.add_argument('--revision', help='The revision to test',
+                      default='dummy_revision')
+  parser.add_argument('--node_quantity', help='ignored', type=int)
+  parser.add_argument('--master_url',
+                      help='The Url of Master controling many suites')
+
+  args = parser.parse_args()
+
+  try:
+    test_suite_title = args.test_suite_title or args.test_suite
+    test_suite = args.test_suite
+    revision = args.revision
+
+    test_line_dict = {}
+
+    if ('jio' in test_suite):
+      url = BASE_URL + 'jio/test/tests.html'
+    else:
+      url = BASE_URL + 'renderjs/test/'
+
+    date = strftime("%Y/%m/%d %H:%M:%S", gmtime())
+
+    ##########################
+    # Run all tests
+    ##########################
+    firefox_binary = webdriver.firefox.firefox_binary.FirefoxBinary(firefox_path=FIREFOX_EXECUTABLE)
+    browser = webdriver.Firefox(firefox_binary=firefox_binary)
+
+    agent = browser.execute_script("return navigator.userAgent")
+    print agent
+    print url
+
+    browser.get(url)
+    WebDriverWait(browser, 60).until(EC.presence_of_element_located((
+      By.XPATH, '//p[@id="qunit-testresult" and contains(text(), "completed")]')
+    ))
+
+    browser.title.encode('UTF-8')
+    print browser.find_element_by_id("qunit-testresult").text
+
+    for elt in browser.find_elements_by_xpath('//ol[@id="qunit-tests"]/li'):
+      test_name = '%s: %s' % (
+        elt.find_element_by_xpath('.//span[@class="module-name"]').text,
+        elt.find_element_by_xpath('.//span[@class="test-name"]').text
+      )
+      print elt.get_attribute('class'), elt.find_element_by_tag_name('strong').text
+      # print elt.find_element_by_tag_name('ol').get_attribute('innerHTML')
+
+      failure = int(elt.find_element_by_xpath('.//b[@class="failed"]').text)
+      success = int(elt.find_element_by_xpath('.//b[@class="passed"]').text)
+      test_line_dict[test_name] = {
+        'test_count': success + failure,
+        'error_count': 0,
+        'failure_count': failure,
+        'skip_count': 0,
+        'duration': int(elt.find_element_by_xpath('.//span[@class="runtime"]').text.split()[0]),
+        'command': elt.find_element_by_xpath('.//a[text()="Rerun"]').get_attribute('href'),
+        'stdout': agent,
+        'stderr': '',
+        'html_test_result': elt.find_element_by_tag_name('ol').get_attribute('innerHTML')
+      }
+
+    browser.quit()
+
+    tool = taskdistribution.TaskDistributionTool(portal_url=args.master_url)
+    test_result = tool.createTestResult(revision = revision,
+                                        test_name_list = test_line_dict.keys(),
+                                        node_title = args.test_node_title,
+                                        test_title = test_suite_title,
+                                        project_title = args.project_title)
+    if test_result is None:
+      return
+    # report test results
+    while 1:
+      test_result_line = test_result.start()
+      if not test_result_line:
+        print 'No test result anymore.'
+        break
+
+      print 'Submitting: "%s"' % test_result_line.name
+      # report status back to Nexedi ERP5
+      test_result_line.stop(**test_line_dict[test_result_line.name])
+
+  except:
+    # Catch any exception here, to warn user instead of being silent,
+    # by generating fake error result
+    print traceback.format_exc()
+    result = dict(status_code=-1,
+                  command=url,
+                  stderr=traceback.format_exc(),
+                  stdout='')
+    # XXX: inform test node master of error
+    raise EnvironmentError(result)
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file

software/jstestnode/software.cfg

+[buildout]
+extends =
+  ../../stack/slapos.cfg
+  ../../stack/nodejs.cfg
+  ../../component/git/buildout.cfg
+  ../../component/xorg/buildout.cfg
+  ../../component/firefox/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/nginx/buildout.cfg
+  ../../component/openssl/buildout.cfg
+
+parts =
+  slapos-cookbook
+  nodejs
+  git
+  eggs
+  xserver
+  firefox
+  xwd
+  renderjs-install
+  jio-install
+  nginx
+  openssl
+  instance
+
+[instance]
+recipe = slapos.recipe.template
+md5sum = 25a9c895fff279b71b0dbbad6647181b
+url = ${:_profile_base_location_}/instance.cfg.in
+output = ${buildout:directory}/instance.cfg
+mode = 0644
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  erp5.util
+  selenium
+interpreter = pythonwitheggs
+
+[renderjs-repository.git]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/renderjs.git
+branch = master
+git-executable = ${git:location}/bin/git
+develop = true
+
+[renderjs-install]
+recipe = plone.recipe.command
+stop-on-error = true
+command = cd ${renderjs-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
+update_command = ${:command}
+
+[jio-repository.git]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/jio.git
+branch = master
+git-executable = ${git:location}/bin/git
+develop = true
+
+[jio-install]
+recipe = plone.recipe.command
+stop-on-error = true
+command = cd ${jio-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
+update_command = ${:command}
+
+[rsvp-repository.git]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/rsvp.js.git
+branch = master
+git-executable = ${git:location}/bin/git
+develop = true
+
+[rsvp-install]
+recipe = plone.recipe.command
+stop-on-error = true
+command = cd ${rsvp-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
+update_command = ${:command}
+
+[uritemplate-repository.git]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/uritemplate-js.git
+branch = master
+git-executable = ${git:location}/bin/git
+develop = true
+
+[uritemplate-install]
+recipe = plone.recipe.command
+stop-on-error = true
+command = cd ${uritemplate-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
+update_command = ${:command}
+
+[template-nginx-service]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/template-nginx-service.sh.in
+md5sum = 529532e1240a66bdf39e3cbbef90ba87
+output = ${buildout:directory}/template-nginx-service.sh.in
+mode = 0644
+
+[template-nginx-configuration]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/template-nginx.cfg.in
+md5sum = 9f22db89a2679534aa8fd37dbca86782
+output = ${buildout:directory}/template-nginx.cfg.in
+mode = 0644
+
+[template-runTestSuite]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/runTestSuite.in
+md5sum = bc1eca131cfa4e9f424d52788a6e051e
+output = ${buildout:directory}/runTestSuite.in
+mode = 0644
+
+[versions]
+erp5.util = 0.4.44
+slapos.recipe.template = 2.9
+selenium = 2.53.1
\ No newline at end of file

software/jstestnode/template-nginx-service.sh.in

+#!${dash-output:dash}
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+
+if [ ! -e $${nginx-configuration:ssl_crt} ]
+then
+  ${openssl-output:openssl} genrsa -out $${nginx-configuration:ssl_key} 2048
+  ${openssl-output:openssl} req -new \
+    -subj "/C=AA/ST=Denial/L=Nowhere/O=Dis/CN=$${nginx-configuration:ip}" \
+    -key $${nginx-configuration:ssl_key} -out $${nginx-configuration:ssl_csr}
+  ${openssl-output:openssl} x509 -req -days 365 \
+    -in $${nginx-configuration:ssl_csr} \
+    -signkey $${nginx-configuration:ssl_key} \
+    -out $${nginx-configuration:ssl_crt}
+fi
+
+exec ${nginx-output:nginx} \
+  -c $${nginx-configuration:output}
\ No newline at end of file

software/jstestnode/template-nginx.cfg.in

+daemon off; # run in the foreground so supervisord can look after it
+
+worker_processes 4;
+pid $${directory:run}/nginx.pid;
+
+events {
+  worker_connections 768;
+  # multi_accept on;
+}
+
+error_log $${nginx-configuration:error_log};
+
+http {  
+  
+  ##
+  # Basic Settings
+  ##
+  
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  keepalive_timeout 65;
+  types_hash_max_size 2048;
+  server_tokens off;
+
+  # server_names_hash_bucket_size 64;
+  # server_name_in_redirect off;
+
+  default_type application/octet-stream;
+  include ${nginx-output:mime};
+
+  ##
+  # Logging Settings
+  ##
+  
+  access_log $${nginx-configuration:access_log};
+  error_log $${nginx-configuration:error_log};
+
+  ##
+  # Gzip Settings
+  ##
+  
+  gzip on;
+  gzip_disable "msie6";
+
+  gzip_vary on;
+  gzip_proxied any;
+  gzip_comp_level 6;
+  gzip_buffers 16 8k;
+  gzip_http_version 1.1;
+  gzip_types text/html text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+server {
+  listen [$${nginx-configuration:ip}]:$${nginx-configuration:port};
+
+  # ssl                 on;
+  # ssl_certificate $${nginx-configuration:ssl_crt};
+  # ssl_certificate_key $${nginx-configuration:ssl_key};
+
+  fastcgi_temp_path  $${directory:varnginx} 1 2;
+  uwsgi_temp_path  $${directory:varnginx} 1 2;
+  scgi_temp_path  $${directory:varnginx} 1 2;
+
+  client_body_temp_path $${directory:varnginx} 1 2;
+  proxy_temp_path $${directory:varnginx} 1 2;
+
+  ## Only allow GET and HEAD request methods
+  if ($request_method !~ ^(GET|HEAD)$ ) {
+     return 444;
+  }
+
+  ## Serve an error 204 (No Content) for favicon.ico
+  location = /favicon.ico {
+    return 204;
+  }
+  location /renderjs
+  {   
+      alias ${renderjs-repository.git:location};
+      autoindex on;
+      disable_symlinks on;
+  }
+  location /jio
+  {   
+      alias ${jio-repository.git:location};
+      autoindex on;
+      disable_symlinks on;
+  }
+  location /rsvp
+  {   
+      alias ${rsvp-repository.git:location};
+      autoindex on;
+      disable_symlinks on;
+  }
+  location /uritemplate
+  {   
+      alias ${uritemplate-repository.git:location};
+      autoindex on;
+      disable_symlinks on;
+  }
+  location /
+  {   
+      root $${directory:www};
+      # autoindex on;
+      disable_symlinks on;
+#       index index.html;
+  }
+}
+
+}

software/kvm/common.cfg

@@ -90,7 +90,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = c597309c00b657db92f8c43e733b1763
+md5sum = 3950ee70a0a612d12b67e32854768af6
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -98,7 +98,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = de733ac612bf498199e68d1d6b7d8ac9
+md5sum = 341bb135769421fdb1bc3666c921dbb2
 download-only = true
 on-update = true
 
@@ -128,7 +128,7 @@ on-update = true
 
 [template-kvm-import]
 recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/instance-kvm-import.cfg.in
+url = ${:_profile_base_location_}/instance-kvm-import.cfg.jinja2.in
 md5sum = 3177381b65b4b95ba29190a6ac03b771
 mode = 0644
 download-only = true
@@ -203,7 +203,7 @@ recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/template/apache.conf.in
 mode = 644
 filename = apache.conf.in
-md5sum = 355fdabdb86fee8e9714b6d357149958
+md5sum = ac97f6a52e1c5a19a646242ef85abb8a
 download-only = true
 on-update = true
 

software/kvm/instance-for-erp5testnode.cfg.in

@@ -13,7 +13,7 @@ nbd = ${template-nbd:output}
 frontend = ${template-frontend:output}
 
 kvm-resilient = $${dynamic-template-kvm-resilient:rendered}
-kvm-import = ${template-kvm-import:output}
+kvm-import = $${dynamic-template-kvm-import:rendered}
 kvm-export = $${dynamic-template-kvm-export:rendered}
 
 # Used for the test of resiliency. The system wants a "test" software_type.
@@ -50,10 +50,12 @@ context =
     key slapparameter_dict slap-configuration:configuration
     key storage_dict slap-configuration:storage-dict
     key tap_network_dict slap-configuration:tap-network-information-dict
+    raw ansible_promise_tpl ${template-ansible-promise:location}/${template-ansible-promise:filename}
     raw curl_executable_location ${curl:location}/bin/curl
     raw dash_executable_location ${dash:location}/bin/dash
     raw dcron_executable_location ${dcron:location}/sbin/crond
     raw debian_amd64_netinst_location ${debian-amd64-netinst.iso:location}/${debian-amd64-netinst.iso:filename}
+    raw logrotate_cfg ${template-logrotate-base:rendered}
     raw novnc_location ${noVNC:location}
     raw netcat_bin ${netcat:location}/bin/netcat
     raw openssl_executable_location ${openssl:location}/bin/openssl
@@ -63,6 +65,9 @@ context =
     raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
     raw template_httpd_cfg ${template-httpd:rendered}
     raw template_content ${template-content:location}/${template-content:filename}
+    raw template_kvm_controller_run ${template-kvm-controller:location}/${template-kvm-controller:filename}
+    raw template_kvm_run ${template-kvm-run:location}/${template-kvm-run:filename}
+    raw template_monitor ${monitor2-template:rendered}
     raw websockify_executable_location ${buildout:directory}/bin/websockify
 template-parts-destination = ${template-parts:destination}
 template-replicated-destination = ${template-replicated:destination}
@@ -80,12 +85,29 @@ context =
     key eggs_directory buildout:eggs-directory
     key slapparameter_dict slap-configuration:configuration
     raw curl_executable_location ${curl:location}/bin/curl
+    raw template_monitor ${monitor2-template:rendered}
 template-parts-destination = ${template-parts:destination}
 template-replicated-destination = ${template-replicated:destination}
 import-list = file parts :template-parts-destination
               file replicated :template-replicated-destination
 mode = 0644
 
+[dynamic-template-kvm-import]
+recipe = slapos.recipe.template:jinja2
+template = ${template-kvm-import:location}/instance-kvm-import.cfg.jinja2.in
+rendered = $${buildout:directory}/template-kvm-import.cfg
+extensions = jinja2.ext.do
+context =
+    key develop_eggs_directory buildout:develop-eggs-directory
+    key eggs_directory buildout:eggs-directory
+    raw template_kvm_import ${template-kvm-import-script:location}/${template-kvm-import-script:filename}
+    raw pbsready_import_template ${pbsready-import:output}
+    raw template_monitor ${monitor2-template:rendered}
+    key slapparameter_dict slap-configuration:configuration
+    raw zcat_binary ${gzip:location}/bin/zcat
+    raw gzip_binary ${gzip:location}/bin/gzip
+mode = 0644
+
 [dynamic-template-kvm-export]
 recipe = slapos.recipe.template:jinja2
 template = ${template-kvm-export:location}/instance-kvm-export.cfg.jinja2
@@ -98,6 +120,7 @@ context =
     raw template_kvm_export ${template-kvm-export-script:location}/${template-kvm-export-script:filename}
     raw pbsready_export_template ${pbsready-export:output}
     raw gzip_binary ${gzip:location}/bin/gzip
+    key slapparameter_dict slap-configuration:configuration
 mode = 0644
 
 [dynamic-template-kvm-resilient-test]

software/kvm/instance-kvm.cfg.jinja2

@@ -360,7 +360,7 @@ tap-ipv4 = ${slap-network-information:tap-ipv4}
 {%   if use_nat == 'true' -%}
 {%     set kvm_http = 'http://10.0.2.100' -%}
 {%   endif %}
-{%   if slapparameter_dict.get('authorized-key', '') -%}
+{%   if slapparameter_dict.get('authorized-key', '') and slapparameter_dict.get('type', '') == 'cluster' -%}
 7_info = Get the publick key file in your VM with the command: wget {{ kvm_http }}/authorized_keys
 {%   endif %}
 {% endif %}
@@ -501,7 +501,7 @@ context =
 recipe = slapos.cookbook:cron.d
 name = logrotate
 # One time per week
-frequency = 0 0 * * * 0
+frequency = 0 0 * * *
 command = ${logrotate:wrapper}
 
 [logrotate-vm-bootstrap]
@@ -581,7 +581,7 @@ keyboard-layout-language = fr
 {% if use_tap == 'true' and tap_network_dict.has_key('ipv4') and disable_ansible_promise == 'false' %}
 {%   do part_list.extend(['ansible-vm-promise', 'logrotate-vm-bootstrap']) -%}
 {% endif -%}
-{% if slapparameter_dict.get('authorized-key', '') %}
+{% if slapparameter_dict.get('authorized-key', '') and slapparameter_dict.get('type', '') == 'cluster' %}
 {%   do part_list.append('get-authorized-key') -%}
 {%   endif -%}
 

software/kvm/instance.cfg.in

@@ -142,7 +142,7 @@ mode = 0644
 
 [dynamic-template-kvm-import]
 recipe = slapos.recipe.template:jinja2
-template = ${template-kvm-import:location}/instance-kvm-import.cfg.in
+template = ${template-kvm-import:location}/instance-kvm-import.cfg.jinja2.in
 rendered = $${buildout:directory}/template-kvm-import.cfg
 extensions = jinja2.ext.do
 context =

software/kvm/software-for-erp5testnode.cfg

@@ -5,6 +5,6 @@ extends = development.cfg
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-for-erp5testnode.cfg.in
-md5sum = b8e3cd7b88f491e361e0a2e30ed4e58e
+md5sum = c528f36ffc119af457e318c5f1aec5b6
 output = ${buildout:directory}/template.cfg
 mode = 0644
\ No newline at end of file

software/kvm/software.cfg

@@ -15,7 +15,7 @@ plone.recipe.command = 1.1
 pycrypto = 2.6.1
 slapos.recipe.template = 2.7
 smmap = 0.9.0
-erp5.util = 0.4.43
+erp5.util = 0.4.44
 pycurl = 7.19.5.1
 
 # Required by:

software/kvm/template/apache.conf.in

@@ -33,7 +33,9 @@ SSLCertificateFile {{ cert }}
 SSLCertificateKeyFile {{ key }}
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
-SSLProtocol All -SSLv2
+SSLProtocol all -SSLv2 -SSLv3
+SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on
 SSLProxyEngine On
 
 DocumentRoot {{ document_root }}

software/monitor/cgi-httpd.conf.in

@@ -46,9 +46,9 @@ SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 SSLRandomSeed startup /dev/urandom 256
 SSLRandomSeed connect builtin
-SSLProtocol -ALL +SSLv3 +TLSv1
-SSLHonorCipherOrder On
-SSLCipherSuite RC4-SHA:HIGH:!ADH
+SSLProtocol all -SSLv2 -SSLv3
+SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on
 SSLSessionCache shmcb:/{{ directory.get("mod-ssl") }}/ssl_scache(512000)
 SSLSessionCacheTimeout  300
 </IfDefine>

software/neoppod/instance-neo-storage-mysql.cfg.in

@@ -125,6 +125,7 @@ etc_run =  ${:etc}/run
 var_run =  ${:var}/run
 srv_mariadb = ${buildout:directory}/srv/mariadb
 log = ${buildout:directory}/var/log
+tmp = ${buildout:directory}/tmp
 
 [logrotate-mysql]
 recipe = slapos.cookbook:logrotate.d
@@ -134,6 +135,19 @@ name = mariadb
 log = ${my-cnf-parameters:error-log} ${my-cnf-parameters:slow-query-log}
 post = ${mysqld:mysql-base-directory}/bin/mysql --defaults-file="${my-cnf:rendered}" -e "FLUSH LOGS"
 
+{% if runTestSuite_in is defined -%}
+# bin/runTestSuite to run NEO tests
+[{{ section('runTestSuite') }}]
+recipe = slapos.recipe.template:jinja2
+rendered = ${directory:bin}/${:_buildout_section_name_}
+template = {{ runTestSuite_in }}
+mode = 0755
+context =
+    section directory         directory
+    section my_cnf_parameters my-cnf-parameters
+    raw     bin_directory     {{ bin_directory }}
+{% endif -%}
+
 [buildout]
 extends =
   {{ logrotate_cfg }}

software/neoppod/instance.cfg.in

@@ -12,6 +12,10 @@ extra-context =
 import-list =
     rawfile root_common {{ root_common }}
 
+[neo-storage-mysql]
+extra-context +=
+    raw runTestSuite_in {{ runTestSuite_in }}
+
 [switch-softwaretype]
 recipe = slapos.cookbook:switch-softwaretype
 override = {{ dumps(override_switch_softwaretype |default) }}

software/neoppod/runTestSuite.in

+#!{{ bin_directory }}/runTestSuite_py
+"""
+  Script to run NEO test suite using Nexedi's test node framework.
+"""
+import argparse, os, re, shutil, subprocess, sys, traceback
+from erp5.util import taskdistribution
+from time import gmtime, strftime
+
+# pattern to get test counts from stdout
+SUMMARY_RE = re.compile(
+  r'^(.*)Summary (.*) (?P<test_count>\d+) (.*) (?P<unexpected_count>\d+|\.)'
+  r' (.*) (?P<expected_count>\d+|\.) (.*) (?P<skip_count>\d+|\.)'
+  r' (.*) (?P<duration>\d+(\.\d*)?|\.\d+)s', re.MULTILINE)
+
+# NEO specific environment
+TEMP_DIRECTORY  = '{{directory.tmp}}/neo_tests'
+NEO_DB_SOCKET = '{{my_cnf_parameters.socket}}'
+RUN_NEO_TESTS_COMMAND = '{{ bin_directory }}/neotestrunner'
+
+def parseTestStdOut(data):
+  """
+  Parse output of NEO testrunner script.
+  """
+  test_count = 0
+  unexpected_count = 0
+  expected_count = 0
+  skip_count = 0
+  duration = 0
+  search = SUMMARY_RE.search(data)
+  if search:
+    groupdict = search.groupdict()
+    test_count = int(groupdict['test_count'])
+    duration = float(groupdict['duration'])
+    try:
+      # it can match '.'!
+      skip_count = int(groupdict['skip_count'])
+    except ValueError:
+      pass
+    try:
+      # it can match '.'!
+      unexpected_count = int(groupdict['unexpected_count'])
+    except ValueError:
+      pass
+    try:
+      # it can match '.'!
+      expected_count = int(groupdict['expected_count'])
+    except ValueError:
+      pass
+
+  return test_count, unexpected_count, expected_count, skip_count, duration
+
+def main():
+  parser = argparse.ArgumentParser(description='Run a test suite.')
+  parser.add_argument('--test_suite', help='The test suite name')
+  parser.add_argument('--test_suite_title', help='The test suite title')
+  parser.add_argument('--test_node_title', help='The test node title')
+  parser.add_argument('--project_title', help='The project title')
+  parser.add_argument('--revision', help='The revision to test',
+                      default='dummy_revision')
+  parser.add_argument('--node_quantity', help='ignored', type=int)
+  parser.add_argument('--master_url',
+                      help='The Url of Master controling many suites')
+
+  args = parser.parse_args()
+
+  test_suite_title = args.test_suite_title or args.test_suite
+  revision = args.revision
+
+  test_name_list = 'SQLite', 'MySQL'
+
+  tool = taskdistribution.TaskDistributionTool(portal_url = args.master_url)
+  test_result = tool.createTestResult(revision = revision,
+                                      test_name_list = test_name_list,
+                                      node_title = args.test_node_title,
+                                      test_title = test_suite_title,
+                                      project_title = args.project_title)
+  if test_result is None:
+    return
+  # run NEO tests
+  while 1:
+    test_result_line = test_result.start()
+    if not test_result_line:
+      break
+
+    if os.path.exists(TEMP_DIRECTORY):
+      shutil.rmtree(TEMP_DIRECTORY)
+    os.mkdir(TEMP_DIRECTORY)
+
+    args = [RUN_NEO_TESTS_COMMAND, '-ufz']
+    command = ' '.join(args)
+    env = {'TEMP': TEMP_DIRECTORY,
+           'NEO_TESTS_ADAPTER': test_result_line.name,
+           'NEO_TEST_ZODB_FUNCTIONAL': '1',
+           'NEO_DB_USER': 'root',
+           'NEO_DB_SOCKET': NEO_DB_SOCKET}
+    try:
+      with open(os.devnull) as stdin:
+        p = subprocess.Popen(args, stdin=stdin, stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE, env=env)
+    except Exception:
+      # Catch any exception here, to warn user instead of being silent,
+      # by generating fake error result
+      result = dict(status_code=-1,
+                    command=command,
+                    stderr=traceback.format_exc(),
+                    stdout='')
+      # XXX: inform test node master of error
+      raise EnvironmentError(result)
+
+    # parse test stdout / stderr, hint to speed up use files first!
+    stdout, stderr = p.communicate()
+    date = strftime("%Y/%m/%d %H:%M:%S", gmtime())
+    test_count, unexpected_count, expected_count, skip_count, duration = \
+      parseTestStdOut(stdout)
+
+    # print to stdout so we can see in testnode logs
+    sys.stdout.write(stdout)
+    sys.stderr.write(stderr)
+
+    # report status back to Nexedi ERP5
+    test_result_line.stop(
+        test_count = test_count,
+        error_count = unexpected_count, # XXX
+        failure_count = expected_count, # XXX
+        skip_count = skip_count,
+        duration = duration,
+        date = date,
+        command = command,
+        stdout= stdout,
+        stderr= stderr,
+        html_test_result='')
+
+if __name__ == "__main__":
+    main()

software/neoppod/software-common.cfg

@@ -13,6 +13,7 @@ extends =
 #LXML
     ../../component/lxml-python/buildout.cfg
 #END LXML
+    ../../component/patch/buildout.cfg
     ../../component/python-mysqlclient/buildout.cfg
     ../../component/pycrypto-python/buildout.cfg
 
@@ -36,9 +37,10 @@ setup = ${neoppod-repository:location}
 
 [neoppod]
 recipe = zc.recipe.egg
-eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb]
+eggs = neoppod[admin, ctl, master, storage-importer, storage-mysqldb, tests]
   ${python-mysqlclient:egg}
   ZODB3
+patch-binary = ${patch:location}/bin/patch
 ZODB3-patches =
   ${:_profile_base_location_}/../../component/egg-patch/ZODB3-3.10.5.patch#c5fe331b1e3a930446f93ab4f6e97c6e
 ZODB3-patch-options = -p1
@@ -102,7 +104,7 @@ md5sum = 82f3f76f54ee9db355966a7ada61f56e
 
 [instance-neo-storage-mysql]
 <= download-base-neo
-md5sum = 84b1150ce30ec827485f9c17debd6b44
+md5sum = 4572f8d3f92f1b1639600d0eb7119ab5
 
 [template-neo-my-cnf]
 <= download-base-neo

software/neoppod/software-zodb4.cfg

+[buildout]
+extends = software.cfg
+
+[neoppod]
+eggs = neoppod
+  ${python-mysqlclient:egg}
+  psutil
+  ZODB
+  zope.testing
+ZODB-patches =
+  ${neoppod-repository:location}/ZODB.patch
+ZODB-patch-options = -p1
+
+[versions]
+ZODB = 4.2.0+SlapOSPatched001
+transaction =
+zdaemon =

software/neoppod/software.cfg

@@ -5,23 +5,41 @@ extends =
 parts +=
 # NEO instanciation
     template
+    runTestSuite_py
 
 [template]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 777c00a7dbcb145a75f980421a9b20b5
+md5sum = aaf5da66d45d4c08cadb0cd1c5342c54
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 rendered = ${buildout:directory}/template.cfg
 context =
     key cluster cluster:target
     key instance_common_cfg instance-common:rendered
     key root_common root-common:target
+    key runTestSuite_in runTestSuite.in:target
 
 [cluster]
 <= download-base-neo
 md5sum = ee8401a4e7d82bf488a57e3399f9ce48
 
+[runTestSuite.in]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:_buildout_section_name_}
+md5sum = 1c8d903624310166629a173ecb8ad9f5
+
+[runTestSuite_py]
+recipe = zc.recipe.egg
+eggs = erp5.util
+interpreter = ${:_buildout_section_name_}
+
+[neoppod]
+ZODB3-patches +=
+  ${neoppod-repository:location}/ZODB3.patch
+
 [versions]
+ZODB3 = 3.10.5+SlapOSPatched002
+erp5.util = 0.4.44
 # To match ERP5
 transaction = 1.1.1
 ZConfig = 2.9.1

software/re6stnet/apache.conf.in

@@ -37,7 +37,9 @@ SSLCertificateFile {{ certificate }}
 SSLCertificateKeyFile {{ key }}
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
-SSLProtocol ALL -SSLv2
+SSLProtocol all -SSLv2 -SSLv3
+SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
+SSLHonorCipherOrder on
 {% endif -%}
 
 <Directory />

software/re6stnet/software.cfg

@@ -91,7 +91,7 @@ extra-context =
 [template-apache-conf]
 < = download-base
 filename = apache.conf.in
-md5sum = 6fcf417f6b9651b1ed442f00c094f50c
+md5sum = d64cafda1139b740a49a9f5e30a1b57b
 
 [template-re6st-registry-conf]
 < = download-base

software/slapos-master/apache.conf.in

@@ -36,10 +36,12 @@ SSLCertificateFile {{ parameter_dict['cert'] }}
 SSLCertificateKeyFile {{ parameter_dict['key'] }}
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
-SSLProtocol All -SSLv2
-#SSLHonorCipherOrder on
+SSLProtocol all -SSLv2 -SSLv3
+SSLHonorCipherOrder on
 {% if parameter_dict['cipher'] -%}
 SSLCipherSuite {{ parameter_dict['cipher'] }}
+{% else %}
+SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:HIGH:!aNULL:!MD5
 {%- endif %}
 SSLSessionCache shmcb:{{ parameter_dict['ssl-session-cache'] }}(512000)
 SSLProxyEngine On