Update Release candidate

Conflicts:
	software/erp5/software.cfg

README.rst

@@ -2,3 +2,14 @@ slapos.cookbook
 ===============
 
 Cookbook of SlapOS recipes.
+
+
+testing
+=======
+
+Unit tests for recipes can be found under ``slapos/test/recipe``. To run the
+tests use provided unittest.defaultTestLoader inside ``slapos/test/test_recipe``
+by invoking 
+
+    python setup.py test --test-suite slapos.test.test_recipe.additional_tests
+

component/alsa/buildout.cfg

@@ -5,15 +5,12 @@ parts =
 [alsa]
 # Contains libasound
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.24.1.tar.bz2
-md5sum = 7cc05f25e1d5b65da8fb3fdcd540f226
+url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.3.tar.bz2
+md5sum = eefe5992567ba00d6110a540657aaf5c
 configure-options =
   --disable-static
   --disable-aload
-  --disable-mixer
   --disable-rawmidi
-  --disable-hwdep
-  --disable-seq
   --disable-ucm
   --disable-alisp
   --disable-old-symbols

component/apache/apache-backend.conf.in

@@ -108,12 +108,16 @@ SSLProxyEngine On
 
 # As backend is trusting REMOTE_USER header unset it always
 RequestHeader unset REMOTE_USER
+RequestHeader unset SSL_CLIENT_SERIAL
 {% if parameter_dict['ca-cert'] -%}
-SSLVerifyClient require
+SSLVerifyClient optional
 RequestHeader set REMOTE_USER %{SSL_CLIENT_S_DN_CN}s
+RequestHeader set SSL_CLIENT_SERIAL "%{SSL_CLIENT_M_SERIAL}s"
 SSLCACertificateFile {{ parameter_dict['ca-cert'] }}
+{%   if parameter_dict['crl'] -%}
 SSLCARevocationCheck chain
 SSLCARevocationFile {{ parameter_dict['crl'] }}
+{%-   endif %}
 {%- endif %}
 
 ErrorLog "{{ parameter_dict['error-log'] }}"
@@ -128,12 +132,24 @@ CustomLog "{{ parameter_dict['access-log'] }}" combined
 </Directory>
 
 RewriteEngine On
-{% for port, _, backend in parameter_dict['backend-list'] -%}
+{% for port, _, backend, enable_authentication in parameter_dict['backend-list'] -%}
 {%   for ip in parameter_dict['ip-list'] -%}
 Listen {{ ip }}:{{ port }}
 {%   endfor -%}
 <VirtualHost *:{{ port }}>
   SSLEngine on
+{% if enable_authentication and parameter_dict['ca-cert'] and parameter_dict['crl'] -%}
+  SSLVerifyClient require
+  SSLCACertificateFile {{ parameter_dict['ca-cert'] }}
+  SSLCARevocationCheck chain
+  SSLCARevocationFile {{ parameter_dict['crl'] }}
+
+  LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
+
+  # We would like to separate the the authentificated logs.
+  ErrorLog "{{ parameter_dict['log-dir'] }}/apache-service-error.log"
+  CustomLog "{{ parameter_dict['log-dir'] }}/apache-service-access.log" combined
+{% endif -%}
   RewriteRule ^/(.*) {{ backend }}/$1 [L,P]
 </VirtualHost>
 {% endfor -%}

component/apache/buildout.cfg

@@ -34,9 +34,9 @@ md5sum = 2202b18f269ad606d70e1864857ed93c
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-version = 2.4.25
+version = 2.4.26
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 2826f49619112ad5813c0be5afcc7ddb
+md5sum = d4d47749a44461cb2e6c9d78a22b522b
 pre-configure =
   cp -ar ${apr:location}/apr-${apr:version} srclib/apr/ &&
   cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util
@@ -190,5 +190,5 @@ make-targets =
 [template-apache-backend-conf]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/apache-backend.conf.in
-md5sum = feef079241bda3407b7ceed5876cb61f
+md5sum = 8f1f92ad308ab6bad973c790ee583428
 mode = 640

component/automake/buildout.cfg

@@ -9,8 +9,8 @@ parts =
 
 [automake]
 recipe = slapos.recipe.cmmi
-md5sum = 9a1ddb0e053474d9d1105cfe39b0c48d
-url = http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz
+md5sum = 24cd3501b6ad8cd4d7e2546f07e8b4d4
+url = http://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.xz
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/automake-1.15-shebang_workaround.patch#203f9199b0e629de3630b5959f8cf73e

component/bcrypt/buildout.cfg

+[buildout]
+extends =
+  ../libffi/buildout.cfg
+
+parts =
+  bcrypt
+
+[bcrypt-env]
+CPPFLAGS=-I${libffi:location}/include
+CFLAGS=-I${libffi:location}/include
+
+[bcrypt]
+recipe = zc.recipe.egg:custom
+egg = bcrypt
+
+rpath =
+  ${libffi:location}/lib/
+environment = bcrypt-env

component/ca-certificates/buildout.cfg

@@ -11,9 +11,9 @@ parts =
 
 [ca-certificates]
 recipe = slapos.recipe.cmmi
-url = http://http.debian.net/debian/pool/main/c/ca-certificates/ca-certificates_20161130.tar.xz
+url = http://http.debian.net/debian/pool/main/c/ca-certificates/ca-certificates_20161130+nmu1.tar.xz
 patch-binary = ${patch:location}/bin/patch
-md5sum = 1a0a3a1b3390dc83affed4b0c2ae1c05
+md5sum = a09e8b63126188fd0ed77f6fbaf5d35f
 patches =
   ${:_profile_base_location_}/ca-certificates-any-python.patch#087b5e860c7a4b8ff6656c95c5835ee2
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b

component/consul/buildout.cfg

+[buildout]
+
+
+parts =
+  consul
+
+[consul]
+recipe = slapos.recipe.build
+
+# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
+url_x86-64 = https://releases.hashicorp.com/consul/0.8.3/consul_0.8.3_linux_amd64.zip
+url_x86 = https://releases.hashicorp.com/consul/0.8.3/consul_0.8.3_linux_386.zip
+
+# supported architectures md5sums
+md5sum_x86 = dfdc0eedd79baab7e6bc56c1582fd02e
+md5sum_x86-64 = d6bc0898ea37ae2198370a9e1978d1bb
+
+# script to install.
+script =
+  location = %(location)r
+  self.failIfPathExists(location)
+  import sys
+  ARCH_DIR_MAP = { 'x86': 'x86', 'x86-64': 'x86_64' }
+  WK_SUFIX_MAP = { 'x86': 'i386', 'x86-64': 'amd64' }
+  platform = guessPlatform()
+  url = self.options['url_' + platform]
+  md5sum = self.options['md5sum_' + platform]
+  extract_dir = self.extract(self.download(url, md5sum))
+  shutil.move(extract_dir, location)

component/curl/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 
 [curl]
 recipe = slapos.recipe.cmmi
-url = http://curl.haxx.se/download/curl-7.54.0.tar.bz2
-md5sum = 89bb7ba87384dfbf4f1a3f953da42458
+url = http://curl.haxx.se/download/curl-7.54.1.tar.bz2
+md5sum = 6b6eb722f512e7a24855ff084f54fe55
 configure-options =
   --disable-static
   --disable-ldap

component/firewalld/buildout.cfg

@@ -68,7 +68,7 @@ configure-options =
   --disable-static
 
 environment =
-  PATH=${pkgconfig:location}/bin:${gettext:location}/bin:${glib:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${gettext:location}/bin:${glib:location}/bin:${xz-utils:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
   CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
   LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi

component/fonts/buildout.cfg

@@ -20,10 +20,9 @@ strip-top-level-dir = true
 
 # Liberation(tm) Fonts - a font family which aims at metric
 # compatibility with Arial, Times New Roman, and Courier New.
-# https://fedorahosted.org/liberation-fonts/
 [liberation-fonts]
 <= fonts-base
-url = https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz
+url = https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz
 md5sum = 5c781723a0d9ed6188960defba8e91cf
 
 # IPAex and IPA Font - Japanese fonts provided by IPA

component/glib/buildout.cfg

@@ -14,7 +14,7 @@ recipe = slapos.recipe.cmmi
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/glib-2.50.2.tar.xz
 md5sum = 5eeb2bfaf78a07be59585e8b6e80b1d6
 configure-options =
-  --with-python=${python2.7:location}/bin/python2.7
+  --with-python=${buildout:executable}
   --disable-libmount
   --disable-static
   --disable-selinux

component/gnutls/buildout.cfg

 [buildout]
 extends =
+  ../gettext/buildout.cfg
   ../gmp/buildout.cfg
   ../nettle/buildout.cfg
   ../p11-kit/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../lunzip/buildout.cfg
-  ../zlib/buildout.cfg
 
 parts = gnutls
 
-[gpg-error]
+[gpg-common]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.26.tar.bz2
-md5sum = 97456709dbbcbb69354317ffe3e347cd
+url = http://www.gnupg.org/ftp/gcrypt/${:_buildout_section_name_}/${:_buildout_section_name_}-${:version}.tar.bz2
+# we'd like to combine <= and +=
+configure-options = ${:configure-options-extra}
+  --enable-option-checking=fatal
+  --disable-dependency-tracking
+environment = ${:environment-extra}
+  PATH=${gettext:location}/bin:%(PATH)s
+environment-extra =
 
-[gcrypt]
-recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.6.tar.bz2
-md5sum = 944cf6595021d0c33478148a315b335b
-configure-options =
-  --with-gpg-error-prefix=${gpg-error:location}
-environment =
-  CPPFLAGS=-I${gpg-error:location}/include
-  LDFLAGS=-L${gpg-error:location}/lib -Wl,-rpath=${gpg-error:location}/lib
+[libgpg-error]
+<= gpg-common
+version = 1.27
+md5sum = 5217ef3e76a7275a2a3b569a12ddc989
+configure-options-extra =
+  --disable-doc
+  --disable-tests
+
+[libgcrypt]
+<= gpg-common
+version = 1.7.7
+md5sum = d1769481b1b506a632fd66c5e5f62e41
+configure-options-extra =
+  --with-gpg-error-prefix=${libgpg-error:location}
+  --disable-doc
+environment-extra =
+  LDFLAGS=-Wl,-rpath=${libgpg-error:location}/lib
 
 [gnutls]
-recipe = slapos.recipe.cmmi
-url = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-3.3.26.tar.xz
-md5sum = 9840c06019bfa7db07ed8fd5e63106d5
-configure-options =
+<= gpg-common
+url = http://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.13.tar.xz
+md5sum = 4fd41ad86572933c2379b4cc321a0959
+configure-options-extra =
+  --disable-doc
   --disable-static
   --disable-libdane
   --disable-guile
-  --disable-crywrap
   --without-tpm
+  --with-included-unistring
+pkg-config-path = ${libtasn1:location}/lib/pkgconfig:${nettle:location}/lib/pkgconfig:${p11-kit:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
 environment =
   PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${nettle:location}/lib/pkgconfig:${p11-kit:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
-  CPPFLAGS=-I${gmp:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${nettle:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  PKG_CONFIG_PATH=${:pkg-config-path}
+  CPPFLAGS=-I${gmp:location}/include -I${libtasn1:location}/include
+  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${nettle:location}/lib -Wl,-rpath=${zlib:location}/lib

component/groonga/buildout.cfg

@@ -14,8 +14,8 @@ extends =
 
 [groonga]
 recipe = slapos.recipe.cmmi
-url = http://packages.groonga.org/source/groonga/groonga-7.0.0.tar.gz
-md5sum = 1b5383359ba1901e66b9e0910712569f
+url = http://packages.groonga.org/source/groonga/groonga-7.0.3.tar.gz
+md5sum = 4bddc049d43e8bbe40fae636ce03ac50
 # temporary patch to respect more tokens in natural language mode.
 patches =
   ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b

component/haproxy/buildout.cfg

@@ -12,8 +12,8 @@ parts = haproxy
 
 [haproxy]
 recipe = slapos.recipe.cmmi
-url = http://www.haproxy.org/download/1.7/src/haproxy-1.7.2.tar.gz
-md5sum = 7330b36f3764ebe409e9305803dc30e2
+url = http://www.haproxy.org/download/1.7/src/haproxy-1.7.5.tar.gz
+md5sum = ed84c80cb97852d2aa3161ed16c48a1c
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/headless-chromium/buildout.cfg

+[buildout]
+extends =
+  ../binutils/buildout.cfg
+  ../bison/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../gperf/buildout.cfg
+  ../ninja/buildout.cfg
+  ../freetype/buildout.cfg
+  ../cmake/buildout.cfg
+  ../git/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../cups/buildout.cfg
+  ../coreutils/buildout.cfg
+  ../depot_tools/buildout.cfg
+  ../findutils/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../gettext/buildout.cfg
+  ../glib/buildout.cfg
+  ../gtk-2/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../libffi/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libxml2/buildout.cfg
+  ../mesa/buildout.cfg
+  ../nspr/buildout.cfg
+  ../nss/buildout.cfg
+  ../pcre/buildout.cfg
+  ../sqlite3/buildout.cfg
+  ../xorg/buildout.cfg
+  ../zlib/buildout.cfg
+
+parts =
+  chromium
+
+[gconf]
+recipe = slapos.recipe.cmmi
+url = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
+md5sum = 2b16996d0e4b112856ee5c59130e822c
+configure-options = --disable-orbit --disable-static
+environment =
+  PATH=${pkgconfig:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:$PKG_CONFIG_PATH
+
+[chromedriver]
+recipe = hexagonit.recipe.download
+url = https://chromedriver.storage.googleapis.com/2.28/chromedriver_linux64.zip
+md5sum = a72088c0a6b018ded2c0fff616da8f65
+
+[chromium-download]
+recipe = plone.recipe.command
+# This revision is 56.0.2924.122. Because the chromedriver only support some certain
+# version. Which version 56 is in the middle of 55-57.
+revision = faf03429d9c3dbd483700dd42316b20776cbbd3c
+path = ${buildout:parts-directory}/${:_buildout_section_name_}
+command =
+  set -e
+  PATH=${depot_tools:location}:${git:location}/bin:$PATH
+  [ -d ${:path} ] && rm -r ${:path}
+  mkdir -p ${:path}
+  cd ${:path}
+  # Do never use `fetch` with the `--no-history` option unless you find an
+  # option to fetch directly at the wanted revision. `--no-history` could
+  # reduce the download size significantly but even if it retrieves enough
+  # commits at the time you test this section, development continues upstream
+  # and at some point the next command (gclient) would break.
+  # ...
+  # This command only could work in an empty dir.
+  fetch --nohooks chromium
+  gclient sync --revision ${:revision} --with_branch_heads
+stop-on-error = true
+
+[chromium]
+recipe = slapos.recipe.cmmi
+path = ${chromium-download:path}/src
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+configure-command =
+  gclient runhooks
+  mkdir -p ${:location}
+  echo 'use_udev = true
+  is_debug = false
+  enable_nacl = false' > ${:location}/args.gn
+  gn gen ${:location}
+
+# Note you can run Chromium manually by: ${:location}/chrome --headless --no-sandbox --disable-gpu
+make-binary = ninja -C ${:location} chrome
+environment =
+  PKG_CONFIG_PATH=${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:$PKG_CONFIG_PATH
+  PATH=${chromedriver:location}:${dbus:location}/bin:${depot_tools:location}:${pkgconfig:location}/bin:${ninja:path}/:${bison:location}/bin:${gperf:location}/bin:${xserver:location}/bin:%(PATH)s
+  CPATH=${dbus:location}/include/dbus-1.0:${dbus:location}/lib/dbus-1.0/include/:${freetype:location}/include/freetype2:${libffi:location}/include:${mpfr:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline:location}/include:${sqlite3:location}/include:${zlib:location}/include:${bzip2:location}/include:$CPATH
+  LD_LIBRARY_PATH=${alsa:location}/lib:${gconf:location}/lib:${libXScrnSaver:location}/lib:${glib:location}/lib:${atk:location}/lib:${cairo:location}/lib:${cups:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib/:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcomposite:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXi:location}/lib:${libXrender:location}/lib/:${libXtst:location}/lib:${libexpat:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libpng12:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${mesa:location}/lib:${nspr:location}/lib:${nss:location}/lib:${pango:location}/lib:${pcre:location}/lib:${pixman:location}/lib:${sqlite3:location}/lib:${xdamage:location}/lib:${xfixes:location}/lib:${zlib:location}/lib:$LD_LIBRARY_PATH

component/intltool/buildout.cfg

 [buildout]
 extends =
   ../gettext/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../perl-XML-Parser/buildout.cfg
 
@@ -9,10 +10,13 @@ parts =
 
 [intltool]
 recipe = slapos.recipe.cmmi
-url = http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-0.41.1.tar.gz
-md5sum = d6c91bf06681919ccfdf3624035b75dc
+url = http://edge.launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
+md5sum = 12e517cac2b57a0121cda351570f1e63
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/intltool-0.51.0.regexp.patch#3e7736d5ce7876e9a8d078c35e7f327b
 depends =
   ${perl-XML-Parser:location}
 environment =
-  PATH=${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${perl:location}/bin:${gettext:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${perl:location}/lib/pkgconfig

component/intltool/intltool-0.51.0.regexp.patch

+--- intltool-0.51.0.orig/intltool-update.in	2015-03-09 02:39:54.000000000 +0100
++++ intltool-0.51.0.orig/intltool-update.in	2015-06-19 01:52:07.171228154 +0200
+@@ -1062,7 +1062,7 @@
+ 	}
+     }
+ 
+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+ 	my $rest = $3;
+ 	my $untouched = $1;
+@@ -1190,10 +1190,10 @@
+ 	$name    =~ s/\(+$//g;
+ 	$version =~ s/\(+$//g;
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
++	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+     }
+ 
+     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+@@ -1219,11 +1219,11 @@
+ 	$version =~ s/\(+$//g;
+         $bugurl  =~ s/\(+$//g if (defined $bugurl);
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
++	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
++        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
+     }
+ 
+     # \s makes this not work, why?

component/libexpat/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [libexpat]
 recipe = slapos.recipe.cmmi
-url = http://downloads.sourceforge.net/project/expat/expat/2.2.0/expat-2.2.0.tar.bz2
-md5sum = 2f47841c829facb346eb6e3fab5212e2
+url = http://downloads.sourceforge.net/project/expat/expat/2.2.1/expat-2.2.1.tar.bz2
+md5sum = d9c3baeab58774cefc2f04faf29f2cf8
 configure-options =
   --disable-static

component/libtasn1/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [libtasn1]
 recipe = slapos.recipe.cmmi
-url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.8.tar.gz
-md5sum = 9a6767705725544f2b86670dcfb34107
+url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.12.tar.gz
+md5sum = 5c724bd1f73aaf4a311833e1cd297b21
 configure-options =
   --disable-static
   --disable-gtk-doc-html

component/libtiff/buildout.cfg

@@ -18,7 +18,7 @@ configure-options =
   --disable-lzma
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/tiff_4.0.7-5.debian.patch#f132ec0dc5cde03f9bbbe90b7a79fed4
+  ${:_profile_base_location_}/tiff_4.0.7-6.debian.patch#b9249bb352e693b7975f9d343018994d
 environment =
   CPPFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/mariadb/buildout.cfg

@@ -3,6 +3,7 @@
 
 [buildout]
 extends =
+  ../bzip2/buildout.cfg
   ../cmake/buildout.cfg
   ../groonga/buildout.cfg
   ../jemalloc/buildout.cfg
@@ -22,11 +23,13 @@ parts =
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-url = https://downloads.mariadb.com/MariaDB/mariadb-10.1.21/source/mariadb-10.1.21.tar.gz
-md5sum = ff8b96edeeb22425117309a249055310
+url = https://downloads.mariadb.com/MariaDB/mariadb-10.1.24/source/mariadb-10.1.24.tar.gz
+md5sum = e1af4c62e3345b65975f2fa43a0040d2
 patch-options = -p0
 patches =
   ${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3
+  ${:stable-patches}
+stable-patches =
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
@@ -43,7 +46,7 @@ configure-options =
   -DWITH_EXTRA_CHARSETS=complex
   -DWITH_EMBEDDED_SERVER=0
   -DWITH_JEMALLOC=yes
-  -DWITH_INNODB_BZIP2=OFF
+  -DWITH_INNODB_BZIP2=ON
   -DWITH_INNODB_LZ4=OFF
   -DWITH_INNODB_LZMA=ON
   -DWITH_INNODB_LZO=OFF
@@ -52,15 +55,15 @@ configure-options =
   -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
   -DWITHOUT_MROONGA_STORAGE_ENGINE=1
   -DWITHOUT_DAEMON_EXAMPLE=1
-  -DCMAKE_C_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
-  -DCMAKE_CXX_FLAGS="-I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
+  -DCMAKE_C_FLAGS="-I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
+  -DCMAKE_CXX_FLAGS="-I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include"
   -DCMAKE_INSTALL_RPATH=${:CMAKE_INSTALL_RPATH}
-CMAKE_INSTALL_RPATH=${jemalloc: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
+CMAKE_INSTALL_RPATH=${bzip2:location}/lib:${jemalloc: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
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  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
+  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${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=${bzip2:location}/lib:${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${bzip2:location}/lib -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 &&
@@ -70,11 +73,15 @@ 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-7.00.tar.gz
-md5sum = befcbb7de8f5dd27366ea513dc092f3f
-pre-configure =
-  mkdir fake_mariadb_source &&
+url = http://packages.groonga.org/source/mroonga/mroonga-7.03.tar.gz
+md5sum = 045be7c932e80cedaa756ea94ae24883
+pre-configure = set -e
+  rm -rf fake_mariadb_source
+  mkdir -p fake_mariadb_source
   ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql
+  cp -ar ${mariadb:location}/include fake_mariadb_source/include
+  ! test -f fake_mariadb_source/include/mysql/mariadb_stmt.h ||
+  sed -i -E -e '/^enum enum_(cursor|indicator)_type$/,/};/d' fake_mariadb_source/include/mysql/mariadb_stmt.h
 configure-options =
   --with-mysql-source=fake_mariadb_source
   --with-mysql-config=${mariadb:location}/bin/mysql_config
@@ -83,6 +90,8 @@ configure-options =
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/mroonga_boolean.patch#29f85fc98e85d39b31e53b1e1683d288
+pre-build =
+  sed -i -e "s,${mariadb:location}/include,$(pwd)/fake_mariadb_source/include,g" Makefile */Makefile
 environment =
   PATH=${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include

component/mariadb/mariarocks.cfg

 [mariadb]
-url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.5/source/mariadb-10.2.5.tar.gz
-md5sum = 16fb01bb375c8d8a91a9ecf491397d51
-pre-configure =
-  sed -i -e '/(rc == -1 || errno == EINTR)/s/||/\&\&/' libmariadb/plugins/pvio/pvio_socket.c
-  sed -i -e 's,set(SYSTEM_LIBS $${CMAKE_THREAD_LIBS_INIT}),set(SYSTEM_LIBS $${CMAKE_THREAD_LIBS_INIT} $${LIBRT}),' storage/rocksdb/build_rocksdb.cmake
+url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.6/source/mariadb-10.2.6.tar.gz
+md5sum = 3d454cdadbd3208e1c9c23e5338a62b0
+stable-patches =
 configure-options +=
   -DPLUGIN_DAEMON_EXAMPLE=NO
   -DPLUGIN_EXAMPLE=NO

component/matplotlib/buildout.cfg

@@ -29,7 +29,10 @@ CFLAGS = -I${libpng:location}/include -I${freetype:location}/include
 recipe = zc.recipe.egg:custom
 egg = matplotlib
 environment = matplotlib-env
-setup-eggs = ${numpy:egg}
+setup-eggs =
+  cycler
+  python-dateutil
+  ${numpy:egg}
 rpath =
   ${libpng:location}/lib
   ${freetype:location}/lib

component/mysql-5.5/buildout.cfg

-[buildout]
-extends =
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
-  ../bison/buildout.cfg
-  ../cmake/buildout.cfg
-  ../groonga/buildout.cfg
-  ../libaio/buildout.cfg
-  ../libtool/buildout.cfg
-  ../ncurses/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../zlib/buildout.cfg
-
-parts =
-    mysql-5.5
-
-[mysql-5.5-sphinx-patch]
-# this patch comes from sphinx-2.0.1-beta including changes for
-# MySQL-5.5 in
-# http://code.google.com/p/sphinxsearch/source/detail?r=2921
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 04549822ebfa91b5f84025ff49ef24c2
-filename = mysql-5.5-sphinx-2.0.1-beta.diff
-download-only = true
-
-[mysql-5.5-no_test-patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-md5sum = bb7ee34b9a98da1f913566c63ffbc6f5
-filename = mysql_create_system_tables__no_test.patch
-download-only = true
-
-[mysql-5.5]
-recipe = slapos.recipe.cmmi
-version = 5.5.16
-url = http://mysql.he.net/Downloads/MySQL-5.5/mysql-${:version}.tar.gz
-md5sum = 462ab3752dd666ec06ca32f92673b59e
-# compile directory is required to build mysql plugins.
-keep-compile-dir = true
-patch-options = -p0
-patches =
-  ${mysql-5.5-sphinx-patch:location}/${mysql-5.5-sphinx-patch:filename}
-  ${mysql-5.5-no_test-patch:location}/${mysql-5.5-no_test-patch:filename}
-configure-command = ${cmake:location}/bin/cmake
-# we use embeded yassl instead of openssl to avoid compilation errors on sphinx search engine.
-configure-options =
-  -DCMAKE_INSTALL_PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
-  -DBUILD_CONFIG=mysql_release
-  -DDEFAULT_CHARSET=utf8
-  -DDEFAULT_COLLATION=utf8_unicode_ci
-  -DWITH_SSL=bundled
-  -DWITH_ZLIB=system
-  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
-  -DWITHOUT_DAEMON_EXAMPLE=1
-  -DWITH_SPHINX_STORAGE_ENGINE=1
-  -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${zlib:location}/include"
-  -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${zlib:location}/lib
-environment =
-  CMAKE_PROGRAM_PATH=${autoconf:location}/bin:${automake:location}/bin:${cmake:location}/bin:${libtool:location}/bin:${bison:location}/bin:${flex:location}/bin
-  CMAKE_INCLUDE_PATH=${libaio:location}/include:${ncurses:location}/include:${zlib:location}/include
-  CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${zlib:location}/lib
-  LDFLAGS=-L${libaio:location}/lib
-
-[groonga-storage-engine-mysql-5.5]
-recipe = slapos.recipe.cmmi
-url = http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-1.0.0.tar.gz
-md5sum = 289b8b7919e790599ea79b6fe9270e04
-configure-options =
-  --with-mysql-source=${mysql-5.5:location}__compile__/mysql-${mysql-5.5:version}
-  --with-mysql-config=${mysql-5.5:location}/bin/mysql_config
-environment =
-  PATH=${groonga:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  CPPFLAGS=-I${groonga:location}/include/groonga
-  LDFLAGS=-L${groonga:location}/lib
-  PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig

component/mysql-5.5/mysql_create_system_tables__no_test.patch

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

component/mysql-python/buildout.cfg

-[buildout]
-extends =
-  ../mariadb/buildout.cfg
-  ../openssl/buildout.cfg
-  ../zlib/buildout.cfg
-
-parts =
-  mysql-python
-
-[mysql-python-env]
-PATH =${mariadb:location}/bin:%(PATH)s
-
-[mysql-python]
-recipe = zc.recipe.egg:custom
-egg = MySQL-python
-environment = mysql-python-env
-library-dirs =
-  ${zlib:location}/lib/
-  ${openssl:location}/lib/
-rpath =
-  ${mariadb:location}/lib/
-  ${zlib:location}/lib/
-  ${openssl:location}/lib/

component/nano/buildout.cfg

 [buildout]
 parts =
   nano
-  
+
 extends = 
+  ../file/buildout.cfg
   ../ncurses/buildout.cfg
 
 [nano]
 recipe = slapos.recipe.cmmi
-version = 2.2.6
-url = http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz
-md5sum = 03233ae480689a008eb98feb1b599807
+url = http://www.nano-editor.org/dist/v2.8/nano-2.8.4.tar.xz
+md5sum = 02ff28870194178595b287fc16fa611b
+# The dummy PKG_CONFIG is in the case that both pkg-config and ncursesw
+# are installed on the system.
 environment=
-    CFLAGS=-I${ncurses:location}/include
-    LDFLAGS=-L${ncurses:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/
\ No newline at end of file
+  PKG_CONFIG=false
+  NCURSESW_CONFIG=${ncurses:location}/bin/ncursesw6-config
+  CPPFLAGS=-I${file:location}/include
+  LDFLAGS=-L${file:location}/lib/ -Wl,-rpath=${file:location}/lib/
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+post-install =
+  cd ${:location} && mkdir etc &&
+  echo include "${:location}/share/nano/*.nanorc" > etc/nanorc

component/nettle/buildout.cfg

@@ -6,10 +6,10 @@ extends =
 
 [nettle]
 recipe = slapos.recipe.cmmi
-url = http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz
-md5sum = 003d5147911317931dd453520eb234a5
+url = http://ftp.gnu.org/gnu/nettle/nettle-3.3.tar.gz
+md5sum = 10f969f78a463704ae73529978148dbe
 patches =
-  ${:_profile_base_location_}/nettle-lib-location.patch#41dd0ce2a73487929bdc637b75dd62c9
+  ${:_profile_base_location_}/nettle-lib-location.patch#3c5f5b285ffd5bc30436ee0f4c662084
 configure-option =
   --disable-static
   --disable-assembler

component/nettle/nettle-lib-location.patch

---- configure.orig	2013-07-05 15:37:28.000000000 +0200
-+++ configure	2013-07-05 15:47:48.000000000 +0200
-@@ -4680,52 +4680,6 @@
+--- configure.orig	2016-10-01 09:28:38.000000000 +0200
++++ configure	2017-06-22 11:22:13.865295091 +0200
+@@ -6779,58 +6779,6 @@
  if test "x$ABI" != xstandard ; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: Compiler uses $ABI-bit ABI. To change, set CC." >&5
  $as_echo "$as_me: Compiler uses $ABI-bit ABI. To change, set CC." >&6;}
@@ -43,6 +43,12 @@
 -      *:freebsd*:64)
 -	libdir='${exec_prefix}/lib'
 -	;;
+-      *:irix*:32)
+-	libdir='${exec_prefix}/lib32'
+-	;;
+-      *:irix*:64)
+-	libdir='${exec_prefix}/lib64'
+-	;;
 -      *)
 -        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't know where to install $ABI-bit libraries on this system." >&5
 -$as_echo "$as_me: WARNING: Don't know where to install $ABI-bit libraries on this system." >&2;};
@@ -52,4 +58,4 @@
 -  fi
  fi
  
- # Select assembler code
+ OPT_NETTLE_SOURCES=""

component/nghttp2/buildout.cfg

@@ -3,6 +3,8 @@ extends =
   ../automake/buildout.cfg
   ../libtool/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../python-2.7/buildout.cfg
+  ../python-setuptools/buildout.cfg
 
 parts =
   nghttp2
@@ -18,4 +20,4 @@ pre-configure =
   automake
   autoconf
 environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${git: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:${python2.7:location}/bin:%(PATH)s

component/ninja/buildout.cfg

+[buildout]
+parts =
+  ninja
+
+[ninja]
+recipe = slapos.recipe.cmmi
+version = v1.7.1
+url = https://github.com/ninja-build/ninja/archive/${:version}.tar.gz
+configure-command = ./configure.py
+configure-options = --bootstrap
+make-binary = true
+post-install = ls && cp -r ./* ${buildout:parts-directory}/${:_buildout_section_name_}/

component/ocropy/buildout.cfg

+[buildout]
+extends =
+  ../git/buildout.cfg
+  ../gzip/buildout.cfg
+  ../scipy/buildout.cfg
+  ../lxml-python/buildout.cfg
+  ../matplotlib/buildout.cfg
+  ../numpy/buildout.cfg
+  ../patch/buildout.cfg
+  ../pillow/buildout.cfg
+  ../numpy/buildout.cfg
+
+parts = ocropy
+
+[ocropy-eng-traineddata]
+recipe = hexagonit.recipe.download
+filename = en-default.pyrnn.gz
+md5sum = cedd140c7d7650e910f0550ad0f04727
+download-only = true
+url = http://www.tmbdev.net/en-default.pyrnn.gz
+
+[ocropy-env]
+OCROPY_MODEL_PATH = ${ocropy-eng-traineddata:location}/${ocropy-eng-traineddata:filename}
+HOME = ${ocropy:egg}
+
+[ocropy]
+recipe = zc.recipe.egg:custom
+egg = ocropy
+setup-eggs =
+  ${numpy:egg}
+  ${scipy:egg}
+  ${matplotlib:egg}
+  ${pillow-python:egg}
+patches =
+  ${:_profile_base_location_}/ocropy.patch
+patch-options = -p0
+patch-binary = ${patch:location}/bin/patch
+environment = ocropy-env
+find-links = https://github.com/tmbdev/ocropy/tarball/4efbddca22bb2f0c639af0694e7a1386f2f097b5/ocropy-1.0.tar.gz
+md5sum = 240b8866dd7248816e01af469a328c09

component/ocropy/ocropy.patch

+diff --git ocrolib/__init__.py ocrolib/__init__.py
+index 1e0d627..81e85fb 100644
+--- ocrolib/__init__.py
++++ ocrolib/__init__.py
+@@ -1,7 +1,7 @@
+ __all__ = [
+     "binnednn","cairoextras","common","components","dbtables",
+     "fgen","gmmtree","gtkyield","hocr","lang","native",
+-    "mlp","multiclass","default","lineest"
++    "mlp","multiclass","default","lineest", "psegutils"
+ ]
+ 
+ ################################################################
+@@ -9,5 +9,6 @@ __all__ = [
+ ################################################################
+ 
+ import default
++from psegutils import *
+ from common import *
+ from default import traceback as trace
+diff --git ocrolib/common.py ocrolib/common.py
+index 27c0f26..14f088f 100644
+--- ocrolib/common.py
++++ ocrolib/common.py
+@@ -14,6 +14,7 @@ import unicodedata
+ import inspect
+ import glob
+ import cPickle
++import gzip
+ from ocrolib.exceptions import (BadClassLabel, BadInput, FileNotFound,
+                                 OcropusException)
+ 
+@@ -428,6 +429,7 @@ def unpickle_find_global(mname,cname):
+         exec "import "+mname
+     return getattr(sys.modules[mname],cname)
+ 
++
+ def load_object(fname,zip=0,nofind=0,verbose=0):
+     """Loads an object from disk. By default, this handles zipped files
+     and searches in the usual places for OCRopus. It also handles some
+@@ -439,8 +441,7 @@ def load_object(fname,zip=0,nofind=0,verbose=0):
+     if zip==0 and fname.endswith(".gz"):
+         zip = 1
+     if zip>0:
+-        # with gzip.GzipFile(fname,"rb") as stream:
+-        with os.popen("gunzip < '%s'"%fname,"rb") as stream:
++        with gzip.GzipFile(fname,"rb") as stream:
+             unpickler = cPickle.Unpickler(stream)
+             unpickler.find_global = unpickle_find_global
+             return unpickler.load()
+@@ -618,7 +619,7 @@ def ocropus_find_file(fname, gz=True):
+ 
+     possible_prefixes.append(os.path.normpath(os.path.join(
+         os.path.dirname(inspect.getfile(inspect.currentframe())),
+-        os.pardir, os.pardir, os.pardir, os.pardir, "share", "ocropus")))
++        os.pardir, "share", "ocropus")))
+ 
+     possible_prefixes.append("/usr/local/share/ocropus")
+ 
+diff --git ocrolib/native.py ocrolib/native.py
+index b7a207f..240450b 100644
+--- ocrolib/native.py
++++ ocrolib/native.py
+@@ -44,6 +44,7 @@ class CompileError(Exception):
+ 
+ def compile_and_find(c_string,prefix=".pynative",opt="-g -O4",libs="-lm",
+                      options="-shared -fopenmp -std=c99 -fPIC",verbose=0):
++    prefix = os.path.join(os.path.dirname(__file__), prefix)
+     if not os.path.exists(prefix):
+         os.mkdir(prefix)
+     m = hashlib.md5()
+diff --git setup.py setup.py
+index 2ec5832..6697b12 100644
+--- setup.py
++++ setup.py
+@@ -10,7 +10,9 @@ assert sys.version_info[0]==2 and sys.version_info[1]>=7,\
+ from distutils.core import setup #, Extension, Command
+ #from distutils.command.install_data import install_data
+ 
+-if not os.path.exists("models/en-default.pyrnn.gz"):
++models = os.environ.get('OCROPY_MODEL_PATH', '').split(':') or \
++    [c for c in glob.glob("models/*pyrnn.gz")]
++if not models:
+     print()
+     print("You should download the default model 'en-default.pyrnn.gz'")
+     print("and put it into ./models.")
+@@ -18,16 +20,23 @@ if not os.path.exists("models/en-default.pyrnn.gz"):
+     print("Check https://github.com/tmbdev/ocropy for the location")
+     print("of model files.")
+     print()
++    sys.exit(1)
+ 
+-models = [c for c in glob.glob("models/*pyrnn.gz")]
+ scripts = [c for c in glob.glob("ocropus-*") if "." not in c and "~" not in c]
+ 
++# compile pynative files now and include them in the build
++sys.path.insert(0, os.curdir)
++import ocrolib.nutils
++pynative_files = [os.path.join(*c.split(os.path.sep)[1:]) \
++    for c in glob.glob('ocrolib/.pynative/*')]
++
+ setup(
+     name = 'ocropy',
+     version = 'v1.0',
+     author = "Thomas Breuel",
+     description = "The OCRopy RNN-based Text Line Recognizer",
+     packages = ["ocrolib"],
+-    data_files= [('share/ocropus', models)],
++    package_data = {'ocrolib': pynative_files},
++    data_files= [('share/ocropus', models), ("", ["LICENSE"])],
+     scripts = scripts,
+     )

component/p11-kit/buildout.cfg

@@ -9,8 +9,9 @@ extends =
 
 [p11-kit]
 recipe = slapos.recipe.cmmi
-url = http://p11-glue.freedesktop.org/releases/p11-kit-0.23.1.tar.gz
-md5sum = 96f073270c489c9a594e1c9413f42db8
+url = https://github.com/p11-glue/p11-kit/releases/download/${:version}/p11-kit-${:version}.tar.gz
+version = 0.23.7
+md5sum = ebbefd123210594231adb4bde21b8560
 configure-options =
   --disable-static
   --disable-doc-html

component/perl-CGI/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+parts =
+  perl-CGI
+
+[perl-CGI]
+recipe = slapos.recipe.cmmi
+url = http://www.cpan.org/modules/by-module/CGI/CGI-4.36.tar.gz
+md5sum = 48566d81f430a7f755bb4d8f426ce35d
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL

component/perl-DBD-MySQL/DBD-mysql-4.042.mariadb.patch

+diff -u DBD-mysql-4.042/dbdimp.c DBD-mysql-4.042/dbdimp.c
+--- DBD-mysql-4.042/dbdimp.c	2017-02-28 14:36:40.000000000 +0100
++++ DBD-mysql-4.042/dbdimp.c	2017-06-08 12:43:39.704228470 +0200
+@@ -2139,6 +2139,7 @@
+ 
+     if (result)
+     {
++      my_bool reconnect= 0;
+ #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION
+       /* connection succeeded. */
+       /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs
+@@ -2155,7 +2156,7 @@
+         we turn off Mysql's auto reconnect and handle re-connecting ourselves
+         so that we can keep track of when this happens.
+       */
+-      result->reconnect=0;
++      mysql_options(result, MYSQL_OPT_RECONNECT, &reconnect);
+     }
+     else {
+       /* 
+diff -u DBD-mysql-4.042/dbdimp.h DBD-mysql-4.042/dbdimp.h
+--- DBD-mysql-4.042/dbdimp.h	2017-02-28 14:36:40.000000000 +0100
++++ DBD-mysql-4.042/dbdimp.h	2017-06-08 12:44:21.233948264 +0200
+@@ -67,6 +67,12 @@
+ #define SSL_LAST_VERIFY_VERSION 50799
+ #define MYSQL_VERSION_5_0 50001
+ /* This is to avoid the ugly #ifdef mess in dbdimp.c */
++
++/* MariaDB Connector/C has MARIADB_VERSION_ID instead of MYSQL_VERSION_ID */
++#if !defined(MYSQL_VERSION_ID) && defined(MARIADB_VERSION_ID)
++#define MYSQL_VERSION_ID MARIADB_VERSION_ID
++#endif
++
+ #if MYSQL_VERSION_ID < SQL_STATE_VERSION
+ #define mysql_sqlstate(svsock) (NULL)
+ #endif

component/perl-DBD-MySQL/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../mysql-tritonn-5.0/buildout.cfg
   ../mariadb/buildout.cfg
   ../patch/buildout.cfg
+  ../perl-Devel-CheckLib/buildout.cfg
 
 parts =
   perl-DBD-MySQL
@@ -11,24 +12,24 @@ parts =
 recipe = slapos.recipe.cmmi
 depends =
   ${perl-DBI:location}
-url = http://www.cpan.org/modules/by-module/DBD/DBD-mysql-4.027.tar.gz
-md5sum = 11fa6449715ba9d3fa5f4ee5ae688d6f
+  ${perl-Devel-CheckLib:location}
+url = http://www.cpan.org/modules/by-module/DBD/DBD-mysql-4.042.tar.gz
+md5sum = a144bd950b55af68835d44bc4ea6e5aa
 patches =
   ${:_profile_base_location_}/DBD-mysql-4.027.rpathsupport.patch#a932982b7725e6621cfce3a3d7917e03
+  ${:_profile_base_location_}/DBD-mysql-4.042.mariadb.patch#5864d36d19c4a05034b3a4873f7c659a
 patch-options = -p1
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL --libs="-L${zlib:location}/lib -L${openssl:location}/lib $(mysql_config --libs)"
 
 [perl-DBD-MySQL]
 <= perl-DBD-MySQL-common
-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
+  PATH=${mysql-tritonn-5.0:location}/bin:${patch:location}/bin:%(PATH)s
 
 [perl-DBD-mariadb]
 <= perl-DBD-MySQL-common
-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
+  OTHERLDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${mariadb:location}/lib -Wl,-rpath=${openssl:location}/lib
+  PATH=${mariadb:location}/bin:${patch:location}/bin:%(PATH)s

component/perl-Devel-CheckLib/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+
+[perl-Devel-CheckLib]
+recipe = slapos.recipe.cmmi
+url = http://www.cpan.org/modules/by-module/Devel/Devel-CheckLib-1.11.tar.gz
+md5sum = c20873798591176283f51af4ad8088cd
+configure-command =
+  ${perl:location}/bin/perl Makefile.PL

component/perl-Encode-HanExtra/buildout.cfg

@@ -10,7 +10,7 @@ recipe = slapos.recipe.cmmi
 url = http://www.cpan.org/modules/by-module/Encode/Encode-HanExtra-0.23.tar.gz
 md5sum = e1d3bc32c1c8ee304235a06fbcd5d5a4
 configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+  ${perl:location}/bin/perl -I. Makefile.PL
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/Encode-HanExtra-0.23_use_shebang.patch#4ac804013a68a3e6b7c3bc4115d25a5e

component/perl-URI/buildout.cfg

@@ -6,7 +6,7 @@ parts =
 
 [perl-URI]
 recipe = slapos.recipe.cmmi
-url = http://www.cpan.org/modules/by-module/URI/URI-1.60.tar.gz
-md5sum = 70f739be8ce28b8baba7c5920ffee4dc
+url = http://www.cpan.org/modules/by-module/URI/URI-1.71.tar.gz
+md5sum = 247c3da29a794f72730e01aa5a715daf
 configure-command =
   ${perl:location}/bin/perl Makefile.PL

component/perl-XML-NamespaceSupport/buildout.cfg

@@ -9,4 +9,4 @@ recipe = slapos.recipe.cmmi
 url = http://www.cpan.org/modules/by-module/XML/XML-NamespaceSupport-1.11.tar.gz
 md5sum = 222cca76161cd956d724286d36b607da
 configure-command =
-  ${perl:location}/bin/perl Makefile.PL
+  ${perl:location}/bin/perl -I. Makefile.PL

component/perl/buildout.cfg

@@ -7,9 +7,9 @@ parts =
 
 [perl]
 recipe = slapos.recipe.cmmi
-version = 5.20.2
+version = 5.26.0
 url = http://www.cpan.org/src/5.0/perl-${:version}.tar.bz2
-md5sum = 21062666f1c627aeb6dbff3c6952738b
+md5sum = 8d34cb5a4eccd66e7a6a80e62b7b4aec
 siteprefix = ${buildout:parts-directory}/site_${:_buildout_section_name_}
 patch-options = -p1
 patches =
@@ -25,4 +25,4 @@ configure-command =
     -Dusethreads
 environment =
   PATH=${patch:location}/bin:%(PATH)s
-post-make-hook = ${:_profile_base_location_}/perl-create-libs-symlink.py#28d12de5c9c7985e65233d56817e3bec:post_make_hook
+post-make-hook = ${:_profile_base_location_}/perl-create-libs-symlink.py#943453b7d3ff8d49ed12d44a7f7076ee:post_make_hook

component/perl/perl-create-libs-symlink.py

-
+from zc.buildout import UserError
 import fnmatch
 import os
-import pprint
-
 
 def post_make_hook(options, buildout):
   location = options['location']
-  matches = []
-  for root, dirnames, filenames in os.walk(location):
-    for filename in fnmatch.filter(filenames, 'libperl.a'):
-      matches.append(os.path.join(root, filename))
-  nr_matches = len(matches)
-  if nr_matches == 0:
-    print "ERROR - no libperl.* found!"
-    exit
-  elif nr_matches > 1:
-    print "WARNING - several libperl.a found, taking only the first one:", "\n".join(matches)
-  
+  matches = [os.path.join(root, filename)
+    for root, dirnames, filenames in os.walk(location)
+    for filename in fnmatch.filter(filenames, 'libperl.a')]
+  if not matches:
+    raise UserError("ERROR - no libperl.* found!")
+  if len(matches) > 1:
+    print("WARNING - several libperl.a found, taking only the first one:",
+          "\n".join(matches))
+
   # matches[0] is a prefix of "location"
   # For the symlink, we want the relative path.
   rel_link = os.path.relpath(os.path.dirname(matches[0]), location)
@@ -24,4 +20,4 @@ def post_make_hook(options, buildout):
   if os.path.islink(simlink_location):
     os.unlink(simlink_location)
   os.symlink(rel_link, simlink_location)
-  print "Created symlink \"libs-c\" to", rel_link
+  print("Created symlink \"libs-c\" to", rel_link)

component/powerdns/buildout.cfg

@@ -23,12 +23,13 @@ url = http://downloads.powerdns.com/releases/pdns-3.3.1.tar.gz
 md5sum = 074e2ff211fd12ecad25b5c1cc190dd4
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-boost=${boost-lib:location}
   --with-modules="geo"
   --with-dynmodules=""
   --without-lua
 environment =
-  PATH=${make:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:${bison:location}/bin:${flex:location}/bin:${git:location}/bin:${ragel:location}/bin:%(PATH)s
-  LDFLAGS = -L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lz
+  PATH=${gcc:location}/bin:${make:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:${bison:location}/bin:${flex:location}/bin:${git:location}/bin:${ragel:location}/bin:%(PATH)s
+  LDFLAGS=-L${boost-lib:location}/lib -Wl,-rpath=${boost-lib:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lz
   CPPFLAGS=-I${boost-lib:location}/include
 make-target =
   install

component/python-2.4/buildout.cfg

-[buildout]
-extends =
-  ../bzip2/buildout.cfg
-  ../gdbm/buildout.cfg
-  ../gettext/buildout.cfg
-  ../ncurses/buildout.cfg
-  ../openssl/buildout.cfg
-  ../readline/buildout.cfg
-  ../sqlite3/buildout.cfg
-  ../zlib/buildout.cfg
-
-parts =
-    pythonbin2.4
-
-[python2.4-dbm-patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-# original patch from http://bugs.gentoo.org/attachment.cgi?id=109117
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 8611020af1463b42f253ac73a91b09a1
-download-only = true
-filename = python2.4-dbm.patch
-
-[python2.4-no_system_inc_dirs-patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 65c1193ac42c15109be0e6f9b7a671b8
-download-only = true
-filename = python2.4-no_system_inc_dirs.patch
-
-[python2.4-CPPFLAGS-patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 912b6d4b107e3f382995a4d3afcd3eca
-download-only = true
-filename = python2.4-backport-CPPFLAGS-setup-from-python2.6.patch
-
-[python2.4]
-recipe = slapos.recipe.cmmi
-# 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_}
-version = 2.4
-package_version = ${:version}.6
-executable = ${:prefix}/bin/python${:version}
-
-python_version_major = 2.4
-python_version_minor = 6
-python_version_full = ${:python_version_major}.${:python_version_minor}
-url =
-  http://python.org/ftp/python/${:python_version_full}/Python-${:python_version_full}.tgz
-patches =
-	${python2.4-dbm-patch:location}/${python2.4-dbm-patch:filename}
-        ${python2.4-no_system_inc_dirs-patch:location}/${python2.4-no_system_inc_dirs-patch:filename}
-        ${python2.4-CPPFLAGS-patch:location}/${python2.4-CPPFLAGS-patch:filename}
-
-configure-options =
-  --enable-unicode=ucs4
-  --with-threads
-
-environment =
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
-
-[pythonbin2.4]
-# XXX/Note: This is hackish way to have fully featured python interpreter
-recipe = zc.recipe.egg:scripts
-python = python2.4
-eggs = ${eggs:eggs}
-  invokepython>=0.4
-extra-paths =
-  ${zope-2.8:location}/lib/python
-scripts =
-  invokepython=python${python2.4:python_version_major}
-  ipython=ipython${python2.4:python_version_major}
-
-[bootstrap2.4]
-recipe = zc.recipe.egg
-eggs = zc.buildout
-suffix =
-scripts =
-    buildout=bootstrap2.4
-arguments = sys.argv[1:] + ["bootstrap"]
-suffix = 2.4
-python = python2.4

component/python-2.4/python2.4-backport-CPPFLAGS-setup-from-python2.6.patch

-From: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
-Date: Mon, 7 Mar 2011 13:02:05 +0900
-Subject: [PATCH] Pass CPPFLAGS when building modules in Python 2.4
-
-In contrary to Python 2.6, when building Python 2.4 modules, CPPFLAGS 
-specified to configure script is not passed at all. This patch backports
-the fix from Python 2.6.
-
---- Makefile.pre.in	2006-10-09 02:41:25.000000000 +0900
-+++ Makefile.pre.in	2011-03-07 14:58:34.368000777 +0900
-@@ -56,7 +56,10 @@
- OPT=		@OPT@
- BASECFLAGS=	@BASECFLAGS@
- CFLAGS=		$(BASECFLAGS) $(OPT)
--CPPFLAGS=	-I. -I$(srcdir)/Include
-+# Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
-+# be able to build extension modules using the directories specified in the
-+# environment variables
-+CPPFLAGS=	-I. -I$(srcdir)/Include @CPPFLAGS@
- LDFLAGS=	@LDFLAGS@
- LDLAST=		@LDLAST@
- SGI_ABI=	@SGI_ABI@
---- setup.py	2006-10-09 02:41:25.000000000 +0900
-+++ setup.py	2011-03-07 14:53:36.208000779 +0900
-@@ -3,7 +3,7 @@
- 
- __version__ = "$Revision: 52231 $"
- 
--import sys, os, getopt, imp, re
-+import sys, os, getopt, imp, re, optparse
- 
- from distutils import log
- from distutils import sysconfig
-@@ -243,6 +243,39 @@
-         add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- 
-+        # Add paths specified in the environment variables LDFLAGS and
-+        # CPPFLAGS for header and library files.
-+        # We must get the values from the Makefile and not the environment
-+        # directly since an inconsistently reproducible issue comes up where
-+        # the environment variable is not set even though the value were passed
-+        # into configure and stored in the Makefile (issue found on OS X 10.3).
-+        for env_var, arg_name, dir_list in (
-+                ('LDFLAGS', '-L', self.compiler.library_dirs),
-+                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-+            env_val = sysconfig.get_config_var(env_var)
-+            if env_val:
-+                # To prevent optparse from raising an exception about any
-+                # options in env_val that is doesn't know about we strip out
-+                # all double dashes and any dashes followed by a character
-+                # that is not for the option we are dealing with.
-+                #
-+                # Please note that order of the regex is important!  We must
-+                # strip out double-dashes first so that we don't end up with
-+                # substituting "--Long" to "-Long" and thus lead to "ong" being
-+                # used for a library directory.
-+                env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
-+                                 ' ', env_val)
-+                parser = optparse.OptionParser()
-+                # Make sure that allowing args interspersed with options is
-+                # allowed
-+                parser.allow_interspersed_args = True
-+                parser.error = lambda msg: None
-+                parser.add_option(arg_name, dest="dirs", action="append")
-+                options = parser.parse_args(env_val.split())[0]
-+                if options.dirs:
-+                    for directory in reversed(options.dirs):
-+                        add_dir_to_list(dir_list, directory)
-+
-         # Add paths to popular package managers on OS X/darwin
-         if sys.platform == "darwin":
-             # Fink installs into /sw by default
---- Lib/optparse.py	2006-05-29 03:15:43.000000000 +0900
-+++ Lib/optparse.py	2011-03-07 21:20:17.192000789 +0900
-@@ -69,7 +69,13 @@
- import sys, os
- import types
- import textwrap
--from gettext import gettext as _
-+
-+try:
-+    from gettext import gettext
-+except ImportError:
-+    def gettext(message):
-+        return message
-+_ = gettext
- 
- def _repr(self):
-     return "<%s at 0x%x: %s>" % (self.__class__.__name__, id(self), self)
-

component/python-2.4/python2.4-no_system_inc_dirs.patch

-From: Arnaud Fontaine <arnaud.fontaine@nexedi.com>
-Date: Mon, 7 Mar 2011 14:10:31 +0900
-Subject: [PATCH] Do not use system include directory
-
-Backport python-2.6.6-no_system_inc_dirs.patch to Python 2.4.
-
---- setup.py	2006-10-09 02:41:25.000000000 +0900
-+++ setup.py	2011-03-07 15:15:00.724000778 +0900
-@@ -270,7 +270,7 @@
-             '/lib64', '/usr/lib64',
-             '/lib', '/usr/lib',
-             ]
--        inc_dirs = self.compiler.include_dirs + ['/usr/include']
-+        inc_dirs = self.compiler.include_dirs
-         exts = []
- 
-         platform = self.get_platform()
-@@ -528,31 +528,7 @@
- 
-         # construct a list of paths to look for the header file in on
-         # top of the normal inc_dirs.
--        db_inc_paths = [
--            '/usr/include/db4',
--            '/usr/local/include/db4',
--            '/opt/sfw/include/db4',
--            '/sw/include/db4',
--            '/usr/include/db3',
--            '/usr/local/include/db3',
--            '/opt/sfw/include/db3',
--            '/sw/include/db3',
--        ]
--        # 4.x minor number specific paths
--        for x in (0,1,2,3,4):
--            db_inc_paths.append('/usr/include/db4%d' % x)
--            db_inc_paths.append('/usr/include/db4.%d' % x)
--            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
--            db_inc_paths.append('/usr/local/include/db4%d' % x)
--            db_inc_paths.append('/pkg/db-4.%d/include' % x)
--            db_inc_paths.append('/opt/db-4.%d/include' % x)
--        # 3.x minor number specific paths
--        for x in (2,3):
--            db_inc_paths.append('/usr/include/db3%d' % x)
--            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
--            db_inc_paths.append('/usr/local/include/db3%d' % x)
--            db_inc_paths.append('/pkg/db-3.%d/include' % x)
--            db_inc_paths.append('/opt/db-3.%d/include' % x)
-+        db_inc_paths = []
- 
-         # Add some common subdirectories for Sleepycat DB to the list,
-         # based on the standard include directories. This way DB3/4 gets

component/python-2.6/python-2.6.6-no_system_inc_dirs.patch

---- Python-2.6.6/setup.py~	2010-12-11 12:05:13.000000000 +0100
-+++ Python-2.6.6/setup.py	2011-03-05 13:33:04.556662701 +0100
-@@ -411,7 +411,7 @@
-             '/lib64', '/usr/lib64',
-             '/lib', '/usr/lib',
-             ]
--        inc_dirs = self.compiler.include_dirs + ['/usr/include']
-+        inc_dirs = self.compiler.include_dirs
-         exts = []
-         missing = []
- 
-@@ -818,15 +818,6 @@
-         # construct a list of paths to look for the header file in on
-         # top of the normal inc_dirs.
-         db_inc_paths = [
--            '/usr/include/db4',
--            '/usr/local/include/db4',
--            '/opt/sfw/include/db4',
--            '/usr/include/db3',
--            '/usr/local/include/db3',
--            '/opt/sfw/include/db3',
--            # Fink defaults (http://fink.sourceforge.net/)
--            '/sw/include/db4',
--            '/sw/include/db3',
-         ]
-         # 4.x minor number specific paths
-         for x in gen_db_minor_ver_nums(4):

component/python-2.7/buildout.cfg

@@ -56,9 +56,10 @@ configure-options =
 make-binary =
 make-targets = make profile-opt && make install
 
+extra-ldflags =
 # 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=${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
+  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 ${:extra-ldflags}

component/python-mysqlclient/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../mariadb/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -13,6 +14,10 @@ PATH =${mariadb:location}/bin:%(PATH)s
 [python-mysqlclient]
 recipe = zc.recipe.egg:custom
 egg = mysqlclient
+patches =
+  https://github.com/PyMySQL/mysqlclient-python/commit/1693848c9f6ca863868d94d63499830f7f4f3a1f.diff#a493a91f9263243eb331fcab9901b8b0
+patch-options = -p1
+patch-binary = ${patch:location}/bin/patch
 environment = python-mysqlclient-env
 library-dirs =
   ${zlib:location}/lib/

component/python-slip/buildout.cfg

@@ -5,7 +5,7 @@ parts =
 
 [python-slip]
 recipe = slapos.recipe.cmmi
-url = https://fedorahosted.org/released/python-slip/python-slip-0.6.1.tar.bz2
+url = https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.1/python-slip-0.6.1.tar.bz2
 md5sum = a6d8ee96245fc21785d4c1c062c85f2f
 configure-command = true
 make-targets = 

component/python-2.6/buildout.cfg → component/python3/buildout.cfg

-
 [buildout]
-# XXX: Extends shall not jump out of software
 extends =
   ../bzip2/buildout.cfg
+  ../file/buildout.cfg
   ../gdbm/buildout.cfg
   ../gettext/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../libffi/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
-  ../file/buildout.cfg
 
 parts =
-    python2.6
+    python3.5
 
-[python-2.6.6-no_system_inc_dirs.patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-path = ${:filename}
-md5sum = ed7f8e11a97e45e5e09649c8b242e917
-download-only = true
-filename = python-2.6.6-no_system_inc_dirs.patch
-
-[python2.6]
+[python3-common]
 recipe = slapos.recipe.cmmi
+package_version_suffix =
+
 # 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_}
-version = 2.6
-package_version = ${:version}.8
-package_version_suffix =
-executable = ${:prefix}/bin/python${:version}
+executable = ${:prefix}/bin/${:_buildout_section_name_}
 
-url =
-  http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.bz2
-md5sum = c6e0420a21d8b23dee8b0195c9b9a125
 patch-options = -p1
 patches =
-  ${python-2.6.6-no_system_inc_dirs.patch:location}/${python-2.6.6-no_system_inc_dirs.patch:filename}
+  ${:_profile_base_location_}/default_encoding.patch#4ad9664e622d5556b4c32b1d9cb587ff
+url =
+  http://www.python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.xz
 configure-options =
   --enable-ipv6
-  --enable-unicode=ucs4
+  --without-ensurepip
+  --with-system-expat
+  --with-system-ffi
   --with-threads
+# Profiled build:
+  --enable-optimizations
+pre-install = mkdir profile-opt
 
 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
 # which would otherwise load the system libmagic.so with ctypes
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${ncurses:location}/include/ -I${ncurses:location}/include/ncursesw/ -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
+  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  CPPFLAGS=-I${zlib:location}/include -I${xz-utils: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${xz-utils: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=${xz-utils: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
 
-[bootstrap2.6]
-recipe = zc.recipe.egg
-eggs = zc.buildout
-suffix =
-scripts =
-    buildout=bootstrap2.6
-arguments = sys.argv[1:] + ["bootstrap"]
-python = python2.6
+[python3.5]
+<= python3-common
+package_version = 3.5.3
+md5sum = 57d1f8bfbabf4f2500273fb0706e6f21

component/python3/default_encoding.patch

+--- Python-3.5.3/Programs/python.c.orig	2017-01-17 08:57:53.000000000 +0100
++++ Python-3.5.3/Programs/python.c	2017-06-08 19:30:42.927077437 +0200
+@@ -24,6 +24,9 @@
+     int i, res;
+     char *oldloc;
+ 
++    if (!getenv("LC_CTYPE") && !getenv("LC_ALL"))
++        setenv("LANG", "C.UTF-8", 0);
++
+     argv_copy = (wchar_t **)PyMem_RawMalloc(sizeof(wchar_t*) * (argc+1));
+     argv_copy2 = (wchar_t **)PyMem_RawMalloc(sizeof(wchar_t*) * (argc+1));
+     if (!argv_copy || !argv_copy2) {

component/qemu-kvm/buildout.cfg

@@ -37,7 +37,7 @@ configure-options =
   --enable-vnc-png
   --disable-vnc-jpeg
   --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${ncurses:location}/include -I${zlib:location}/include -I${libpng:location}/include -I${libaio:location}/include -I${attr:location}/include -I${libcap:location}/include"
-  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${gpg-error:location}/lib -L${gpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib"
+  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libgpg-error:location}/lib -L${libgpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib"
   --disable-werror
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s

component/screen/buildout.cfg

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

component/screen/screen-4.0.3-stropts.patch

-diff -up screen-4.0.3/tty.sh.stropts screen-4.0.3/tty.sh
---- screen-4.0.3/tty.sh.stropts	2003-09-08 16:24:25.000000000 +0200
-+++ screen-4.0.3/tty.sh	2008-04-07 11:28:34.000000000 +0200
-@@ -76,7 +76,7 @@ exit 0
- #endif
- 
- #include "config.h"
--#ifdef SVR4
-+#if 0
- #include <sys/stropts.h>	/* for I_POP */
- #endif
- 
-diff -up screen-4.0.3/screen.c.stropts screen-4.0.3/screen.c
---- screen-4.0.3/screen.c.stropts	2008-04-07 11:25:21.000000000 +0200
-+++ screen-4.0.3/screen.c	2008-04-07 11:29:14.000000000 +0200
-@@ -50,7 +50,7 @@
- 
- #include "config.h"
- 
--#ifdef SVR4
-+#if 0
- # include <sys/stropts.h>
- #endif
- 
-diff -up screen-4.0.3/process.c.stropts screen-4.0.3/process.c
---- screen-4.0.3/process.c.stropts	2003-09-18 14:53:54.000000000 +0200
-+++ screen-4.0.3/process.c	2008-04-07 11:29:47.000000000 +0200
-@@ -37,7 +37,7 @@
- #include "config.h"
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others: */
--#ifdef SVR4
-+#if 0 
- # include <sys/stropts.h>
- #endif
- 
-diff -up screen-4.0.3/pty.c.stropts screen-4.0.3/pty.c
---- screen-4.0.3/pty.c.stropts	2003-09-08 16:26:18.000000000 +0200
-+++ screen-4.0.3/pty.c	2008-04-07 11:30:07.000000000 +0200
-@@ -34,7 +34,7 @@
- #endif
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
-+#if 0 
- # include <sys/stropts.h>
- #endif
- 

component/slapos/buildout.cfg

@@ -28,8 +28,6 @@ parts =
   py
   firewalld-patch
 
-rebootstrap-directory = rebootstrap
-
 [environment]
 # Note: For now original PATH is appended to the end, as not all tools are
 #       provided by SlapOS

component/sqlite3/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 
 [sqlite3]
 recipe = slapos.recipe.cmmi
-url = http://sqlite.org/2015/sqlite-autoconf-3081101.tar.gz
-md5sum = 298c8d6af7ca314f68de92bc7a356cbe
+url = http://sqlite.org/2017/sqlite-autoconf-3190000.tar.gz
+md5sum = 2426883b4dd3a9fd6aeb28a16b81a72b
 configure-options =
   --disable-static
   --enable-readline

component/w3-validator/buildout.cfg

 [buildout]
 extends =
   ../perl/buildout.cfg
+  ../perl-CGI/buildout.cfg
   ../perl-Config-General/buildout.cfg
   ../perl-Encode-HanExtra/buildout.cfg
   ../perl-HTML-Encoding/buildout.cfg
@@ -23,6 +24,7 @@ erp5.recipe.w3validator = 1.0.2
 [w3-validator]
 recipe = erp5.recipe.w3validator
 depends =
+  ${perl-CGI:location}
   ${perl-Config-General:location}
   ${perl-Encode-HanExtra:location}
   ${perl-HTML-Encoding:location}

component/xorg/buildout.cfg

@@ -525,9 +525,9 @@ configure-options =
   --with-sha1=libgcrypt
 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
+  CPPFLAGS=-I${bzip2:location}/include -I${libgcrypt:location}/include -I${libgpg-error:location}/include -I${zlib:location}/include
   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
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libgcrypt:location}/lib -Wl,-rpath=${libgcrypt:location}/lib -L${libgpg-error:location}/lib -Wl,-rpath=${libgpg-error:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
 [libXi]
 recipe = slapos.recipe.cmmi
@@ -557,3 +557,20 @@ configure-options =
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${libXi:location}/lib/pkgconfig:${recordproto:location}/lib/pkgconfig
+
+[scrnsaverproto]
+recipe = slapos.recipe.cmmi
+url = https://www.x.org/releases/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2
+md5sum = edd8a73775e8ece1d69515dd17767bfb
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
+
+[libXScrnSaver]
+recipe = slapos.recipe.cmmi
+url = https://www.x.org/releases/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2
+md5sum = 7a773b16165e39e938650bcc9027c1d5
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${scrnsaverproto:location}/lib/pkgconfig
+

component/zope-2.12/buildout.cfg

-[buildout]
-# adapt https://svn.erp5.org/repos/public/experimental/erp5.buildout-zope-2.12/

component/zope-2.8/buildout.cfg

-# based on https://svn.erp5.org/repos/public/experimental/erp5.buildout
-[buildout]
-extends=
-  ../python-2.4/buildout.cfg
-
-[zope-2.8]
-recipe = erp5.recipe.zope2install
-url = http://www.zope.org/Products/Zope/2.8.11/Zope-2.8.11-final.tgz
-md5sum = eff3e52d6ecde2d3669ea81e445b5a3a
-python = python2.4
-skip-fake-eggs =
-  ClientForm
-  mechanize
-  pytz

schema.json

@@ -2,49 +2,56 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "description": "Slapos Software Release instantiation descriptor",
   "additionalProperties": false,
+  "required": [
+    "software-type"
+  ],
   "properties": {
     "name": {
       "description": "A short human-friendly name for the sofware release",
+      "default": "",
       "type": "string"
     },
     "description": {
       "description": "A short description of the sofware release",
+      "default": "",
       "type": "string"
     },
     "serialisation": {
       "description": "How the parameters and results are serialised",
-      "require": true,
       "enum": ["xml", "json-in-xml"],
       "type": "string"
     },
     "software-type": {
       "description": "Existing software types",
-      "require": true,
       "patternProperties": {
         ".*": {
           "description": "Software type declaration",
           "additionalProperties": false,
+          "required": [
+            "request",
+            "response"
+          ],
           "properties": {
             "title": {
               "description": "A human-friendly title of the software type",
+              "default": "",
               "type": "string"
             },
             "description": {
               "description": "A human-friendly description of the software type",
+              "default": "",
               "type": "string"
             },
             "serialisation": {
-              "description": "How the parameters and results are serialised, if different from global setting",
+              "description": "How the parameters and results are serialised, if different from global setting, required if global setting is not provided",
               "enum": ["xml", "json-in-xml"],
               "type": "string"
             },
             "request": {
-              "require": true,
               "description": "URL, relative to Software Release base path, of a json schema for values expected by instance of current software type",
               "type": "string"
             },
             "response": {
-              "require": true,
               "description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type",
               "type": "string"
             },
@@ -54,10 +61,12 @@
             },
             "shared" : {
               "description": "Define if the request will request a Slave or Software Instance.",
+              "default": "false",
               "type": "boolean"
             },
             "index": {
               "description": "Value to use instead of software type id to sort them (in order to display most relevant software types earlier in a list, for example)",
+              "default": 0,
               "type": "number"
             }
           },

setup.py

@@ -163,6 +163,7 @@ setup(name=name,
           'publishsection = slapos.recipe.publish:PublishSection',
           'publishurl = slapos.recipe.publishurl:Recipe',
           'random.time = slapos.recipe.random:Time',
+          'random.integer = slapos.recipe.random:Integer',
           'readline = slapos.recipe.readline:Recipe',
           'redis.server = slapos.recipe.redis:Recipe',
           'request = slapos.recipe.request:Recipe',

slapos/recipe/check_url_available/__init__.py

@@ -42,6 +42,9 @@ class Recipe(GenericBaseRecipe):
       'check_secure': self.options.get('check-secure', 0),
       'http_code': self.options.get('http_code', '200'),
       'time_out': self.options.get('timeout-file-path', timeout_file),
+      'ca-cert-file': self.options.get('ca-cert-file', ''),
+      'cert-file': self.options.get('cert-file', ''),
+      'key-file': self.options.get('key-file', ''),
     }
 
     # XXX-Cedric in this script, curl won't check certificate

slapos/recipe/check_url_available/template/check_url.in

@@ -5,6 +5,9 @@
 URL="%(url)s"
 F_TIMEOUT="%(time_out)s"
 TIMEOUT=20
+CA_CERT="%(ca-cert-file)s"
+CERT="%(cert-file)s"
+KEY="%(key-file)s"
 
 if [ -z "$URL" ]; then
   echo "No URL specified." >&2
@@ -20,7 +23,11 @@ if [ -s "$F_TIMEOUT" ]; then
   fi
 fi
 
-CODE=$(%(curl_path)s -g -k -sL $URL -w %%{http_code} --max-time $TIMEOUT -o /dev/null)
+if [ -z "$CA_CERT" ] || [ -z "$CERT" ] || [ -z "$KEY" ]; then
+  CODE=$(%(curl_path)s -g -k -sL $URL -w %%{http_code} --max-time $TIMEOUT -o /dev/null)
+else
+  CODE=$(%(curl_path)s -g -k -sL $URL -w %%{http_code} --max-time $TIMEOUT -o /dev/null --cacert $CA_CERT --cert $CERT --key $KEY)
+fi
 
 if [ $? -eq 3 ]; then
   echo "URL malformed: $URL." >&2

slapos/recipe/librecipe/execute.py

@@ -22,8 +22,8 @@ def _wait_files_creation(file_list):
     watchdescriptors = dict()
     for dirname in directories.keys():
       wd = inotifyx.add_watch(fd,
-                              dirname,
-                              inotifyx.IN_CREATE | inotifyx.IN_DELETE)
+                      dirname,
+                      inotifyx.IN_CREATE | inotifyx.IN_DELETE | inotifyx.IN_MOVE)
       watchdescriptors[wd] = dirname
 
     # Set to True the file wich exists

slapos/recipe/librecipe/generic.py

@@ -131,7 +131,7 @@ class GenericBaseRecipe(object):
 
   def createWrapper(self, name, command, parameters, comments=[],
       parameters_extra=False, environment=None,
-      pidfile=None
+      pidfile=None, reserve_cpu=False
   ):
     """
     Creates a shell script for process replacement.
@@ -139,6 +139,8 @@ class GenericBaseRecipe(object):
     Takes care of #! line limitation when the wrapped command is a script.
     if pidfile parameter is specified, then it will make the wrapper a singleton,
     accepting to run only if no other instance is running.
+
+    :param reserve_cpu: bool, try to reserve one core for the `command`
     """
 
     lines = [ '#!/bin/sh' ]
@@ -163,6 +165,14 @@ class GenericBaseRecipe(object):
           fi
           echo $$ > $pidfile""" % shlex.quote(pidfile)))
 
+    if reserve_cpu:
+      # if the CGROUPS cpuset is available (and prepared by slap format)
+      # request an exclusive CPU core for this process
+      lines.append(dedent("""
+        # put own PID into waiting list for exclusive CPU-core access
+        echo $$ >> ~/.slapos-cpu-exclusive
+        """))
+
     lines.append(dedent('''
     # If the wrapped command uses a shebang, execute the referenced
     # executable passing the script path as first argument.

slapos/recipe/neoppod.py

@@ -43,6 +43,7 @@ class NeoBaseRecipe(GenericBaseRecipe):
       # useful, as per NEO deploying constraints.
       raise UserError('"masters" parameter is mandatory')
     option_list = [
+      # Keep the -l option first, as expected by logrotate snippets.
       '-l', options['logfile'],
       '-m', options['masters'],
       '-b', self._getBindingAddress(),
@@ -91,6 +92,8 @@ class Storage(NeoBaseRecipe):
     engine = self.options.get('engine')
     if engine: # old versions of NEO don't support -e
       r  += '-e', engine
+    if self.options.get('disable-drop-partitions'):
+      r.append('--disable-drop-partitions')
     return r
 
 class Admin(NeoBaseRecipe):

slapos/recipe/random.py

@@ -39,6 +39,28 @@ import string
 
 from slapos.recipe.librecipe import GenericBaseRecipe
 
+class Integer(object):
+  """
+  Generate a random integer (see standard random.randint documentation).
+
+  Input options:
+  minimum (required)
+    integer(-ish) minmum bound, included.
+  maximum (required)
+    integer(-ish) maximum bound, included.
+
+  Output options:
+  value
+    Resulting integer.
+  """
+  def __init__(self, buildout, name, options):
+    options['value'] = random.randint(int(options['minimum']), int(options['maximum']))
+
+  def install(self):
+    pass
+
+  update = install
+
 class Time(object):
   """Generate a random time from a 24h time clock"""
 
@@ -101,7 +123,6 @@ class Password(object):
   """
 
   def __init__(self, buildout, name, options):
-    options_get = options.get
     self.create_once = options.get('create-once', 'True').lower() \
           in GenericBaseRecipe.TRUE_VALUES
     try:
@@ -118,13 +139,21 @@ class Password(object):
         if e.errno != errno.ENOENT:
           raise
     if not passwd:
-      passwd = self.generatePassword(int(options_get('bytes', '8')))
+      passwd = self.generatePassword(int(options.get('bytes', '8')))
       self.update = self.install
     self.passwd = passwd.strip('\n')
     # Password must not go into .installed file, for 2 reasons:
     # security of course but also to prevent buildout to always reinstall.
-    options.get = lambda option, *args, **kw: passwd \
-      if option == 'passwd' else options_get(option, *args, **kw)
+    def get(option, *args, **kw):
+      return passwd if option == 'passwd' else options_get(option, *args, **kw)
+
+    try:
+      options_get = options._get
+    except AttributeError:
+      options_get = options.get
+      options.get = get
+    else:
+      options._get = get
 
   generatePassword = staticmethod(generatePassword)
 

slapos/recipe/request.py

@@ -170,6 +170,20 @@ class Recipe(object):
           # Backward compatibility. Old SlapOS master and core don't know this.
           self.logger.warning("Impossible to fetch instance GUID nor state.")
     except (slapmodule.NotFoundError, slapmodule.ServerError, slapmodule.ResourceNotReady) as exc:
+      self.logger.warning(
+        'Request for %(request_name)r with software release '
+        '%(software_release)r and software type %(software_type)r failed '
+        'with partition_parameter_kw=%(partition_parameter_kw)r, '
+        'filter_kw=%(filter_kw)r, shared=%(shared)r, state=%(state)r.', dict(
+          software_release=software_url,
+          software_type=software_type,
+          request_name=name,
+          partition_parameter_kw=partition_parameter_kw,
+          filter_kw=filter_kw,
+          shared=slave,
+          state=requested_state
+        )
+      )
       self._raise_request_exception = exc
       self._raise_request_exception_formatted = traceback.format_exc()
       return_parameter_dict = {}

slapos/recipe/slapconfiguration.py

@@ -26,6 +26,7 @@
 ##############################################################################
 
 import json
+import logging
 import os
 
 import slapos.slap
@@ -33,15 +34,21 @@ from slapos.recipe.librecipe import unwrap
 from ConfigParser import RawConfigParser
 from netaddr import valid_ipv4, valid_ipv6
 from slapos.util import mkdir_p
+from slapos import format as slapformat
+
+
+logger = logging.getLogger("slapos")
+
 
 class Recipe(object):
   """
-  Retrieves slap partition parameters, and makes them available to other
-  buildout section in various ways, and in various encodings.
-  Populates the buildout section it is used in with all slap partition
-  parameters.
-  Also provides access to partition properties: all IPv4, IPv6 and tap
-  interfaces it is allowed to use.
+  Retrieve slap partition parameters and make them available in buildout section.
+
+  There are two sources of parameters. First is configuration file slapos.cfg and
+  derived information.
+  Second is partition's resource_file which is made available in form of keys joined
+  with "-" and with all "_" replaced by "-".
+  For example {"tun": {"ipv4": <addr>}} would be available in buildout as ${instance:tun-ipv4}.
 
   Input:
     url
@@ -67,7 +74,7 @@ class Recipe(object):
       Example:
         ${storage-configuration:storage-home}
 
-  Output:
+  Output (keys derived from SlapOS configuration):
     root-instance-title
       Hosting subscription or root instance title
     instance-title
@@ -122,6 +129,12 @@ class Recipe(object):
           options['configuration.' + key] = value
 
   def fetch_parameter_dict(self, options, instance_root):
+      """Gather parameters about current computer and partition.
+
+      Use two sources of truth
+      1. SlapOS Master - for external computer/partition information
+      2. format.Partition.resource_file - for partition specific details
+      """
       slap = slapos.slap.slap()
       slap.initializeConnection(
           options['url'],
@@ -233,6 +246,27 @@ class Recipe(object):
       options['storage-dict'] = storage_dict
 
       options['tap'] = tap_set
+
+      # The external information transfered from Slap Master has been processed
+      # so we extend with information gathered from partition resource file
+      if hasattr(slapformat.Partition, "resource_file"):
+        resource_home = instance_root
+        while not os.path.exists(os.path.join(resource_home, slapformat.Partition.resource_file)):
+          resource_home = os.path.normpath(os.path.join(resource_home, '..'))
+          if resource_home == "/":
+            break
+        else:
+          # no break happened - let's add partition resources into options
+          logger.debug("Using partition resource file {}".format(
+            os.path.join(resource_home, slapformat.Partition.resource_file)))
+          with open(os.path.join(resource_home, slapformat.Partition.resource_file)) as fi:
+            partition_params = json.load(fi)
+          # be very careful with overriding master's information
+          for key, value in flatten_dict(partition_params).items():
+            if key not in options:
+              options[key] = value
+      # print out augmented options to see what we are passing
+      logger.debug(str(options))
       return self._expandParameterDict(options, parameter_dict)
 
   def _expandParameterDict(self, options, parameter_dict):
@@ -261,3 +295,14 @@ class JsonDump(Recipe):
 
     update = install
 
+
+def flatten_dict(data, key_prefix=''):
+  """Transform folded dict into one-level key-subkey-subsubkey dictionary."""
+  output = {}
+  for key, value in data.items():
+    prefixed_key = key_prefix + key.replace("_", "-")  # to be consistent with `fetch_parameter_dict`
+    if isinstance(value, dict):
+      output.update(flatten_dict(value, key_prefix=prefixed_key + "-"))
+      continue
+    output[prefixed_key] = value
+  return output

slapos/recipe/wrapper.py

@@ -31,6 +31,16 @@ import os
 from slapos.recipe.librecipe import GenericBaseRecipe
 
 class Recipe(GenericBaseRecipe):
+    """Recipe to create a script from given command and options.
+
+    :param str command-line: shell command which launches the intended process
+    :param str wrapper-path: absolute path to file's destination
+
+    :param lines wait-for-files: list of files to wait for
+    :param str pidfile: path to pidfile ensure exclusivity for the process
+    :param bool parameters-extra: whether wrapper parameters are passed onto command
+    :param bool reserve-cpu: command will ask for an exclusive CPU core
+    """
     def install(self):
         command_line = shlex.split(self.options['command-line'])
         wrapper_path = self.options['wrapper-path']
@@ -38,6 +48,7 @@ class Recipe(GenericBaseRecipe):
         environment = self.options.get('environment')
         parameters_extra = self.options.get('parameters-extra')
         pidfile = self.options.get('pidfile')
+        reserve_cpu = self.options.get('reserve-cpu', False)
 
         if not wait_files and not environment:
           # Create a simple wrapper as shell script
@@ -47,6 +58,7 @@ class Recipe(GenericBaseRecipe):
              parameters=command_line[1:],
              parameters_extra=parameters_extra,
              pidfile=pidfile,
+             reserve_cpu=reserve_cpu
           )]
 
         # More complex needs: create a Python script as wrapper
@@ -76,5 +88,6 @@ class Recipe(GenericBaseRecipe):
              parameters=[],
              parameters_extra=parameters_extra,
              pidfile=pidfile,
+             reserve_cpu=reserve_cpu
         )]
 

slapos/recipe/zero_knowledge.py

@@ -36,32 +36,36 @@ class WriteRecipe(GenericBaseRecipe):
   """
   """
   def __init__(self, buildout, name, options):
-    if not "filename" in options:
-      raise zc.buildout.UserError("You have to provide the parameter \"filename\"")
+    if not "filename" in options and not "file-path" in options:
+      raise zc.buildout.UserError("You have to provide the parameter either \"filename\" or \"file-path\"")
 
-    self.filename = options['filename'].strip()
-    self.path = os.path.join(buildout['buildout']['directory'], self.filename)
+    self._options = options.copy()
+    if options.get('filename'):
+      self.filename = options['filename'].strip()
+      self.path = os.path.join(buildout['buildout']['directory'], self.filename)
+      del self._options['filename']
+    else:
+      self.path = options['file-path'].strip()
+      del self._options['file-path']
+    del self._options['recipe']
     self.name = name
-    self.options = options.copy()
-    del self.options['filename']
-    del self.options['recipe']
+
+  def install(self):
 
     # Set up the parser, and write config file if needed
     self.parser = ConfigParser.ConfigParser()
     try:
       self.parser.read(self.path)
       #clean_options(options)
-      for key in self.options:
+      for key in self._options:
         if key not in self.parser.options(self.name):
-          self.parser.set(self.name, key, self.options[key])
+          self.parser.set(self.name, key, self._options[key])
       with open(self.path, 'w') as file:
         self.parser.write(file)
     # If the file or section do not exist
     except (ConfigParser.NoSectionError, IOError) as e:
       self.full_install()
 
-  install = update = lambda self: []
-
   def full_install(self):
     """XXX-Nicolas : when some parameter's value is changed in
     buildout profile, this will override custom user defined values"""
@@ -69,21 +73,25 @@ class WriteRecipe(GenericBaseRecipe):
     if self.parser.has_section(self.name):
       self.parser.remove_section(self.name)
     self.parser.add_section(self.name)
-    for key in self.options:
-      self.parser.set(self.name, key, self.options[key])
+    for key in self._options:
+      self.parser.set(self.name, key, self._options[key])
     with open(self.path, 'w') as file:
       self.parser.write(file)
 
+  update = install
 
 class ReadRecipe(GenericBaseRecipe):
   """
   """
   def __init__(self, buildout, name, options):
-    if not "filename" in options:
-      raise zc.buildout.UserError("You have to provide the parameter \"filename\"")
+    if not "filename" in options and not "file-path" in options:
+      raise zc.buildout.UserError("You have to provide the parameter either \"filename\" or file-path")
 
-    self.filename = options['filename'].strip()
-    self.path = os.path.join(buildout['buildout']['directory'], self.filename)
+    if options.get('filename'):
+      self.filename = options['filename'].strip()
+      self.path = os.path.join(buildout['buildout']['directory'], self.filename)
+    else:
+      self.path = options['file-path'].strip()
 
     # Set up the parser, and write config file if needed
     self.parser = ConfigParser.ConfigParser()

slapos/test/recipe/test_slaposconfiguration.py

+# coding: utf-8
+import json
+import mock
+import os
+import unittest
+from collections import defaultdict
+from slapos.recipe import slapconfiguration
+from slapos import format as slapformat
+
+
+class SlapConfigurationTest(unittest.TestCase):
+
+  def setUp(self):
+    """Prepare files on filesystem."""
+    self.instance_root = "/tmp/instance_test_resourcefile"
+    os.mkdir(self.instance_root)
+    # create testing resource file
+    self.resource_file = os.path.join(self.instance_root, slapformat.Partition.resource_file)
+    self.resource = {
+      "tun": {
+        "ipv4": "192.168.0.1"
+      },
+      "address_list": [
+        10, 20
+      ]
+    }
+    with open(self.resource_file, "wt") as fo:
+      json.dump(self.resource, fo)
+    # do your tests inside try block and clean up in finally
+    self.buildout = {
+      "buildout": {
+        "directory": self.instance_root
+      }
+    }
+
+  def tearDown(self):
+    os.unlink(self.resource_file)
+    os.rmdir(self.instance_root)
+
+  @mock.patch("slapos.slap.slap")
+  def test_correct_naming(self, MockClient):
+    """Test correct naming of variables from resource file."""
+    MockClient.initializeConnection.return_value = None
+    MockClient.getInstanceParameterDict.return_value = dict()
+  
+    options = defaultdict(str)
+    recipe = slapconfiguration.Recipe(self.buildout, "slapconfiguration", options)
+
+    self.assertEqual(options['tun-ipv4'], "192.168.0.1",
+      "Folded attrs should be separated by -")
+
+    self.assertEqual(options['address-list'], [10, 20],
+      "All underscores should be replaced with -")

software/agent/software.cfg

@@ -45,35 +45,35 @@ eggs =
 [versions]
 apache-libcloud = 0.18.0
 ecdsa = 0.13
-erp5.util = 0.4.46
+erp5.util = 0.4.49
 gitdb = 0.6.4
 pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.download = 1.0
-slapos.recipe.template = 2.8
-slapos.toolbox = 0.67
+slapos.recipe.template = 3.0
+slapos.toolbox = 0.69
 smmap = 0.9.0
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 GitPython = 2.0.8
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 feedparser = 5.2.1
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 lockfile = 0.12.2
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 paramiko = 2.0.1
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 rpdb = 0.1.5

software/apache-frontend/buildout.hash.cfg

@@ -19,15 +19,15 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
-md5sum = e2f60121bc1116319b4d20b4c4badc1c
+md5sum = 979eecabeaad0114fb24f65bf52f7e6a
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 9b17c835bcd927269cf510bf612f5985
+md5sum = c55506cfb92d87f915d50d32fb129a28
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = 8a8db11499f0e3b00c0bd7d1e5afc99b
+md5sum = 4010f7366262d00c33f9e7f53f63d42e
 
 [template-slave-configuration]
 filename = templates/custom-virtualhost.conf.in
@@ -39,11 +39,11 @@ md5sum = 665e83d660c9b779249b2179d7ce4b4e
 
 [template-apache-frontend-configuration]
 filename = templates/apache.conf.in
-md5sum = 51e0c8957e3cf30e09c7b836143c15c9
+md5sum = 82cdb4ab02fec36285b9c1ce502f82f0
 
 [template-custom-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = 8a8db11499f0e3b00c0bd7d1e5afc99b
+md5sum = 4010f7366262d00c33f9e7f53f63d42e
 
 [template-not-found-html]
 filename = templates/notfound.html
@@ -55,7 +55,7 @@ md5sum = d98a01182f38868612948c87d5231428
 
 [template-default-slave-virtualhost]
 filename = templates/default-virtualhost.conf.in
-md5sum = 8fda2e88476ccb3652036302364f3506
+md5sum = 5344bff68a3f7dead633a35771ad1a19
 
 [template-cached-slave-virtualhost]
 filename = templates/cached-virtualhost.conf.in
@@ -92,3 +92,11 @@ md5sum = a5186f666acb2f040ede04c91e60408f
 [template-nginx-notebook-slave-virtualhost]
 filename = templates/nginx-notebook-slave.conf.in
 md5sum = 82d74a7f2aceb2b4a7acc6259291b7f2
+
+[template-apache-lazy-script-call]
+filename = templates/apache-lazy-script-call.sh.in
+md5sum = ebe5d3d19923eb812a40019cb11276d8
+
+[template-apache-graceful-script]
+filename = templates/apache-graceful-script.sh.in
+md5sum = 41299cc64200e7b8217fb9dec20bb8b9

software/apache-frontend/common.cfg

@@ -141,6 +141,14 @@ url = ${:_profile_base_location_}/templates/nginx.cfg.in
 output = ${buildout:directory}/template-nginx.cfg.in
 mode = 0644
 
+[template-apache-lazy-script-call]
+<=download-template
+filename = apache-lazy-script-call.sh.in
+
+[template-apache-graceful-script]
+<=download-template
+filename = apache-graceful-script.sh.in
+
 [template-nginx-eventsource-slave-virtualhost]
 <=download-template
 filename = nginx-eventsource-slave.conf.in

software/apache-frontend/instance-apache-frontend.cfg

@@ -23,6 +23,7 @@ parts =
   promise-apache-frontend-cached
   promise-apache-frontend-ssl-cached
   promise-apache-is-process-older-than-dependency-set
+  promise-apache-mpm-watchdog
 
   promise-nginx-frontend-v4-https
   promise-nginx-frontend-v4-http
@@ -44,7 +45,6 @@ parts =
 ## Nginx
   nginx-frontend
 
-
 ## Monitor for apache
   monitor-base
   monitor-ats-cache-stats-wrapper
@@ -172,8 +172,6 @@ extra-context =
     key nginx_configuration_directory apache-directory:nginx-slave-configuration
     key apache_cached_configuration_directory apache-directory:slave-with-cache-configuration
     key slave_with_cache_configuration_directory apache-directory:slave-with-cache-configuration
-    key cached_port apache-configuration:cache-through-port
-    key ssl_cached_port apache-configuration:ssl-cache-through-port
     key http_port instance-parameter:configuration.plain_http_port
     key https_port instance-parameter:configuration.port
     key nginx_http_port instance-parameter:configuration.plain_nginx_port
@@ -185,7 +183,6 @@ extra-context =
     key apache_log_directory apache-directory:slave-log
     key local_ipv4 instance-parameter:ipv4-random
     key global_ipv6 slap-network-information:global-ipv6
-    key cache_port apache-configuration:cache-port
     key varnginx directory:varnginx
     key empty_template software-release-path:template-empty
     key template_custom_slave_configuration software-release-path:template-slave-configuration
@@ -194,6 +191,7 @@ extra-context =
     key template_eventsource_slave_configuration software-release-path:template-nginx-eventsource-slave-virtualhost
     key template_notebook_slave_configuration software-release-path:template-nginx-notebook-slave-virtualhost
     raw software_type single-custom-personal
+    key frontend_lazy_graceful_reload frontend-apache-lazy-graceful:rendered
     section logrotate_dict logrotate
     section frontend_configuration frontend-configuration
     section apache_configuration apache-configuration
@@ -372,7 +370,7 @@ name = apache
 log = $${apache-configuration:error-log} $${apache-configuration:access-log}
 frequency = daily
 rotatep-num = 30
-post = $${apache-configuration:frontend-graceful-command}
+post = $${frontend-apache-lazy-graceful:rendered} &
 sharedscripts = true
 notifempty = true
 create = true
@@ -500,14 +498,35 @@ mode = 700
 ### End of ATS sections
 
 ### Apaches Graceful and promises
-[frontend-apache-graceful]
+[frontend-apache-graceful-bin]
 < = jinja2-template-base
 template = ${template-wrapper:output}
-rendered = $${directory:etc-run}/frontend-apache-safe-graceful
+rendered = $${directory:bin}/frontend-apache-safe-graceful
 mode = 0700
 extra-context =
     key content apache-configuration:frontend-graceful-command
 
+[frontend-apache-graceful]
+< = jinja2-template-base
+template = ${template-apache-graceful-script:target}
+rendered = $${directory:etc-run}/frontend-apache-safe-graceful
+mode = 0700
+extra-context =
+    key directory_run directory:run
+    key directory_etc directory:etc
+    key apache_graceful_reload_command apache-configuration:frontend-graceful-command
+
+[frontend-apache-lazy-graceful]
+< = jinja2-template-base
+template = ${template-apache-lazy-script-call:target}
+rendered = $${directory:bin}/frontend-apache-lazy-graceful
+mode = 0700
+pid-file = $${directory:run}/lazy-graceful.pid
+extra-context =
+    key pid_file :pid-file
+    raw wait_time 60
+    key lazy_command apache-configuration:frontend-graceful-command
+
 # Promises checking configuration:
 [promise-frontend-apache-configuration]
 < = jinja2-template-base
@@ -553,13 +572,18 @@ path = $${directory:promise}/apache_ssl_cached
 hostname = $${instance-parameter:ipv4-random}
 port = $${apache-configuration:ssl-cache-through-port}
 
-
 [promise-apache-is-process-older-than-dependency-set]
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/is-process-older-than-dependency-set $${apache-configuration:pid-file} 
 wrapper-path = $${directory:promise}/apache-frontend-is-running-actual-software-release
 parameters-extra = true
 
+[promise-apache-mpm-watchdog]
+recipe = slapos.cookbook:wrapper
+command-line = ${buildout:bin-directory}/apache-mpm-watchdog --url http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u admin -p $${monitor-htpasswd:passwd} -d $${directory:run}/apache-mpm-watchdog.json 
+wrapper-path = $${directory:promise}/apache-mpm-watchdog
+parameters-extra = true
+
 
 [slap_connection]
 # Kept for backward compatiblity
@@ -589,7 +613,7 @@ extra_slave_instance_list =
 frontend-name =
 monitor-cors-domains =
 monitor-httpd-port = 8072
-monitor-username = $${monitor-htpasswd:username}
+monitor-username = $${monitor-instance-parameter:username}
 monitor-password = $${monitor-htpasswd:passwd}
 
 #######
@@ -631,7 +655,7 @@ extra-context =
 template = ${template-wrapper:output}
 rendered = $${monitor-directory:reports}/monitor-apache-server-status-wrapper
 mode = 0700
-command = ${curl:location}/bin/curl -s http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u $${monitor-htpasswd:username}:$${monitor-htpasswd:passwd} 2>&1 
+command = ${curl:location}/bin/curl -s http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u $${monitor-instance-parameter:username}:$${monitor-htpasswd:passwd} 2>&1
 extra-context =
   key content monitor-apache-server-status-wrapper:command
 

software/apache-frontend/instance-apache-input-schema.json

@@ -14,7 +14,44 @@
 			"description": "Value used to set IPReadLimit Parameter for antiloris.",
 			"type": "integer",
 			"default": 10
-		},		
+		},
+                "mpm-server-limit": {
+                        "title": "ServerLimit",
+                        "description": "Value used to set ServerLimit on apache configuration.",
+                        "type": "integer",
+                        "default": 16
+                },
+                "mpm-max-clients": {
+                        "title": "MaxClients",
+                        "description": "Value used to set MaxClients on apache configuration.",
+                        "type": "integer",
+                        "default": 400
+                },
+                "mpm-start-servers": {
+                        "title": "StartServers",
+                        "description": "Value used to set StartServers on apache configuration.",
+                        "type": "integer",
+                        "default": 3
+                },
+                "mpm-thread-per-child": {
+                        "title": "ThreadsPerChild",
+                        "description": "Value used to set ThreadsPerChild on apache configuration.",
+                        "type": "integer",
+                        "default": 25
+                },
+                "mpm-graceful-shutdown-timeout": {
+                        "title": "ThreadsPerChild",
+                        "description": "Value used to set ThreadsPerChild on apache configuration.",
+                        "type": "integer",
+                        "default": 5
+                },
+                "enable-http2-by-default": {
+                        "title": "Enable HTTP2 by Default",
+                        "description": "Use HTTP2 as default Protocol",
+                        "type": "string",
+                        "default": "true",
+                        "enum": ["true", "false"]
+                },
                 "re6st-verification-url": {
 			"title": "Test Verification URL",
 			"description": "Url to verify if the internet and/or re6stnet is working.",

software/apache-frontend/instance-apache-replicate.cfg.in

@@ -81,7 +81,7 @@ context =
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
-config-monitor-username = ${monitor-htpasswd:username}
+config-monitor-username = ${monitor-instance-parameter:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
 
 {% set frontend_software_url_key = "-frontend-software-release-url" %}

software/apache-frontend/instance-slave-apache-input-schema.json

@@ -140,7 +140,13 @@
       "default": "false",
       "enum": ["false", "true"]
     },
-
+    "enable-http2": {
+      "title": "Enable HTTP2 Protocol",
+      "description": "Use HTTP2 Protocol for the site",
+      "type": "string",
+      "default": "true",
+      "enum": ["true", "false"]
+    },
     "prefer-gzip-encoding-to-backend": {
       "title": "Prefer gzip Encoding for Backend",
       "description": "If set to true, frontend will rewrite Accept-Encoding request header to simply 'gzip' for all variants of Accept-Encoding containing 'gzip', in order to maximize cache hits for resources cached with Vary: Accept-Encoding when enable_cache is used",

software/apache-frontend/software.cfg

@@ -10,8 +10,8 @@ gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5+SlapOSPatched001
-slapos.recipe.template = 2.8
-slapos.toolbox = 0.67
+slapos.recipe.template = 3.0
+slapos.toolbox = 0.69
 smmap = 0.9.0
 numpy = 1.11.2
 pyasn1 = 0.2.3
@@ -19,41 +19,41 @@ pyasn1 = 0.2.3
 websockify = 0.8.0
 
 # Required by:
-# slapos.toolbox==0.61
+# slapos.toolbox==0.69
 dnspython = 1.15.0
 
 # Required by:
-# slapos.toolbox==0.61
-erp5.util = 0.4.46
+# slapos.toolbox==0.69
+erp5.util = 0.4.49
 
 # Required by:
-# slapos.toolbox==0.61
+# slapos.toolbox==0.69
 passlib = 1.6.5
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 GitPython = 2.0.8
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 feedparser = 5.2.1
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 lockfile = 0.12.2
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 paramiko = 2.0.1
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 pycurl = 7.43.0
 
 # Required by:
-# slapos.toolbox = 0.67
+# slapos.toolbox==0.69
 rpdb = 0.1.5

software/apache-frontend/templates/apache-custom-slave-list.cfg.in

@@ -2,6 +2,9 @@
 
 {% set cached_server_dict = {} -%}
 {% set part_list = [] -%}
+{% set cache_port = apache_configuration.get('cache-port') %}
+{% set cached_port = apache_configuration.get('cache-through-port') %}
+{% set ssl_cached_port = apache_configuration.get('ssl-cache-through-port') %}
 {% set cache_access = "http://%s:%s" % (local_ipv4, cache_port) -%}
 {% set ssl_cache_access = "http://%s:%s/HTTPS" % (local_ipv4, cache_port) -%}
 {% set TRUE_VALUES = ['y', 'yes', '1', 'true'] -%}
@@ -27,7 +30,7 @@ context =
 {{ key }} = {{ value }}
 {% endfor %}
 
-post = {{ apache_configuration.get('frontend-graceful-command') }}
+post = {{ frontend_lazy_graceful_reload }} &
 frequency = daily
 rotatep-num = 30
 sharedscripts = true
@@ -106,7 +109,7 @@ crl = {{ custom_ssl_directory }}/crl/
 {%   endif -%}
 
 [slave-log-directories]
-{{slave_reference}}-log-folder = {{ slave_log_folder }}
+{{slave_reference}} = {{ slave_log_folder }}
 
 {# Set slave logrotate entry #}
 [{{slave_logrotate_section}}]

software/apache-frontend/templates/apache-graceful-script.sh.in

+#!/bin/sh
+
+RUN_DIR={{ directory_run }}
+ETC_DIR={{ directory_etc }}
+
+APACHE_SIGNATURE_FILE=$RUN_DIR/apache_configuration.signature
+NAPACHE_SIGNATURE_FILE=$RUN_DIR/napache_configuration.signature
+
+touch $APACHE_SIGNATURE_FILE
+sha256sum $ETC_DIR/apache*.conf $ETC_DIR/apache-*.d/*.conf $ETC_DIR/apache-*.d/ssl/*.*key $ETC_DIR/apache-*.d/ssl/*.*crt* | sort -k 66 > $NAPACHE_SIGNATURE_FILE 
+
+# If no diff, no restart for now
+if diff "$APACHE_SIGNATURE_FILE" "$NAPACHE_SIGNATURE_FILE"; then
+  echo "Nothing Changed, so nothing to reload"
+  exit 0
+fi
+echo "Reloading apache.."
+
+{{ apache_graceful_reload_command }}
+
+mv "$NAPACHE_SIGNATURE_FILE" "$APACHE_SIGNATURE_FILE" 

software/apache-frontend/templates/apache-lazy-script-call.sh.in

+#!/bin/bash
+
+PID=$$
+PIDFILE={{ pid_file }}
+
+sleep $((RANDOM % 10))
+
+if [ ! -f $PIDFILE ]; then
+  echo $PID > $PIDFILE
+  sleep {{ wait_time }}
+  {{ lazy_command }}
+else
+  ps --pid `cat $PIDFILE` &>/dev/null
+  if [ $? -eq 0 ]; then
+    echo "Skipped"
+  else
+    echo $PID > $PIDFILE
+    sleep {{ wait_time }}
+    {{ lazy_command }}
+  fi
+fi
+

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

@@ -16,7 +16,6 @@ ServerRoot {{ instance_home }}
 {% endfor -%}
 
 ServerAdmin {{ server_admin }}
-DefaultType text/plain
 TypesConfig {{ httpd_home }}/conf/mime.types
 AddType application/x-compress .Z
 AddType application/x-gzip .gz .tgz
@@ -31,7 +30,7 @@ TraceEnable off
 
 # Log configuration
 ErrorLog "{{ error_log }}"
-LogLevel info
+LogLevel notice
 # LogFormat "%h %{REMOTE_USER}i %{Host}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 # LogFormat "%h %{REMOTE_USER}i %{Host}i %l %u %t \"%r\" %>s %b" common
 # CustomLog "{{ access_log }}" common
@@ -83,6 +82,7 @@ LoadModule filter_module       {{ httpd_home }}/modules/mod_filter.so
 LoadModule http2_module       {{ httpd_home }}/modules/mod_http2.so
 LoadModule info_module        {{ httpd_home }}/modules/mod_info.so
 LoadModule status_module      {{ httpd_home }}/modules/mod_status.so
+LoadModule reqtimeout_module  {{ httpd_home }}/modules/mod_reqtimeout.so
 
 # The following directives modify normal HTTP response behavior to
 # handle known problems with browser implementations.
@@ -105,6 +105,11 @@ BrowserMatch "^gnome-vfs" redirect-carefully
 BrowserMatch "^XML Spy" redirect-carefully
 BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
 
+
+{% if slapparameter_dict.get('enable-http2-by-default', 'true') == 'true' %}
+Protocols h2 http/1.1
+{% endif %}
+
 # Increase IPReadLimit to 10
 <IfModule antiloris_module>
    # IPReadLimit - Maximum simultaneous connections in READ state per IP address 
@@ -125,7 +130,12 @@ ExtendedStatus On
     Require valid-user
 </Location>
 
-
+ServerLimit {{ slapparameter_dict.get('mpm-server-limit', '16') }}
+MaxClients {{ slapparameter_dict.get('mpm-max-clients', '400') }}
+StartServers {{ slapparameter_dict.get('mpm-start-servers', '3') }}
+ThreadsPerChild {{ slapparameter_dict.get('mpm-thread-per-child', '25') }}
+#MaxRequestsPerChild 0 // Default value is 0
+GracefulShutdownTimeout {{ slapparameter_dict.get('mpm-graceful-shutdown-timeout', '5') }}
 
 # Deflate
 AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/x-javascript application/javascript
@@ -156,13 +166,7 @@ SSLProxyCheckPeerCN off
 SSLProxyCheckPeerExpire off
 
 include {{frontend_configuration.get('log-access-configuration')}}
-
-NameVirtualHost *:{{ http_port }}
-NameVirtualHost *:{{ https_port }}
 include {{ slave_configuration_directory }}/*.conf
-
-NameVirtualHost *:{{ cached_port }}
-NameVirtualHost *:{{ ssl_cached_port }}
 include {{ slave_with_cache_configuration_directory }}/*.conf
 
 ErrorDocument 404 /notfound.html

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

@@ -3,6 +3,7 @@
 {%- set disable_via_header = ('' ~ slave_parameter.get('disable-via-header', '')).lower() in TRUE_VALUES -%}
 {%- set prefer_gzip = ('' ~ slave_parameter.get('prefer-gzip-encoding-to-backend', '')).lower() in TRUE_VALUES -%}
 {%- set server_alias_list =  slave_parameter.get('server-alias', '').split() -%}
+{%- set enable_h2 = ('' ~ slave_parameter.get('enable-http2', 'true')).lower() in TRUE_VALUES -%}
 {%- set ssl_proxy_verify = ('' ~ slave_parameter.get('ssl-proxy-verify', '')).lower() in TRUE_VALUES -%}
 {%- set disabled_cookie_list =  slave_parameter.get('disabled-cookie-list', '').split() -%}
 {%- set https_only = ('' ~ slave_parameter.get('https-only', '')).lower() in TRUE_VALUES -%}
@@ -33,8 +34,10 @@
   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
-  Protocols h2 http/1.1
 
+{% if enable_h2 %}
+  Protocols h2 http/1.1
+{% endif -%}
 
 {% for key, value in ssl_configuration_list -%}
 {%   if value in slave_parameter -%}
@@ -44,7 +47,7 @@
 
   # One Slave two logs
   ErrorLog "{{ slave_parameter.get('error_log') }}"
-  LogLevel info
+  LogLevel notice
   LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
   CustomLog "{{ slave_parameter.get('access_log') }}" combined
 
@@ -116,14 +119,16 @@
 
   # One Slave two logs
   ErrorLog "{{ slave_parameter.get('error_log') }}"
-  LogLevel info
+  LogLevel notice
   LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
   CustomLog "{{ slave_parameter.get('access_log') }}" combined
 
   # Remove "Secure" from cookies, as backend may be https
   Header edit Set-Cookie "(?i)^(.+);secure$" "$1"
 
+{% if enable_h2 %}
   Protocols h2 http/1.1
+{% endif -%}
 
 {% if disable_no_cache_header %}
   RequestHeader unset Cache-Control

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

+{
+  "type": "object",
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "title": "Input Parameters",
+  "properties": {
+    "server-port": {
+      "title": "http port to use",
+      "description": "Caucase http port to use.",
+      "type": "integer",
+      "default": 8009,
+      "minimum": 1,
+      "maximum": 65535
+    },
+    "server-https-port": {
+      "title": "https port to use",
+      "description": "Caucase port to use for https connexion.",
+      "type": "integer",
+      "default": 8010,
+      "minimum": 1,
+      "maximum": 65535
+    },
+    "external-url": {
+      "title": "External http url",
+      "description": "External http url which point to caucase on http. This url will be added in signed certificate as CRL distribution point URI",
+      "type": "string",
+      "format": "uri"
+    },
+    "ca-subject": {
+      "title": "Subject of CA Certificate",
+      "description": "CA certificate subject as string. The format is: /C=XX/ST=State/L=City/OU=OUnit/O=Company/CN=CA Auth/emailAddress=xx@example.com. Only /CN is mandatory.",
+      "type": "string",
+      "default": "/C=FR/O=Company/CN=SlapOS Certificate Authority/emailAddress=xx@example.com"
+    },
+    "max-request-amount": {
+      "title": "Number of pending csr to accept",
+      "description": "Number of pending csr to accept. If this limit is reached, no more csr will be accepted by the CA.",
+      "type": "integer",
+      "default": 10
+    },
+    "crt-life-time": {
+      "title": "Signed Certificate life time",
+      "description": "The time in seconds before a generated certificate will expire. Default: 365*24*60*60 seconds (1 year)",
+      "type": "integer",
+      "default": 31536000,
+      "minimum": 86400
+    },
+    "crl-life-period": {
+      "title": "CRL life time period",
+      "description": "Number of individual certificate validity periods during which the CRL is valid. Default: 1/50.0",
+      "type": "float",
+      "default": 0.2
+    },
+    "ca-life-period": {
+      "title": "CA Certificate life period",
+      "description": "Number of individual certificate validity periods during which the CA certificate is valid. Default: 10",
+      "type": "float",
+      "default": 10
+    },
+    "crt-keep-time": {
+      "title": "Time before cleanup certificate content on CA",
+      "description": "The time in seconds before a generated certificate will be deleted on CA server. Set 0 to never delete. Default: 30*24*60*60 seconds (30 days)",
+      "default": 5184000,
+      "type": "integer"
+    }
+  }
+}
\ No newline at end of file

software/caucase/instance-caucase-output-schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Values returned by Caucase instantiation",
+  "properties": {
+    "http-url": {
+      "description": "Caucase URL on HTTP",
+      "type": "string"
+    },
+    "https-url": {
+      "description": "Caucase URL on HTTPS",
+      "type": "string"
+    }
+  },
+  "type": "object"
+}

software/caucase/software.cfg

+[buildout]
+extends =
+  ../../stack/caucase/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts = 
+  slapos-cookbook
+  extra-eggs
+  instance-caucase
+

software/caucase/software.cfg.json

+{
+    "name": "Caucase",
+    "description": "Caucase certificate authority",
+    "serialisation": "json-in-xml",
+    "software-type": {
+        "default": {
+            "title": "Default",
+            "description": "Single caucase instance",
+            "request": "instance-caucase-input-schema.json",
+            "response": "instance-caucase-output-schema.json",
+            "index": 0
+        }
+    }
+}
\ No newline at end of file

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.46
+erp5.util = 0.4.49
 plone.recipe.command = 1.1
-slapos.recipe.template = 2.8
+slapos.recipe.template = 3.0

software/cloudooo/instance-cloudooo.cfg.in

@@ -42,7 +42,7 @@
 {%   do apache_ip_list.append('[' ~ ipv6 ~ ']') -%}
 {% endif -%}
 {% set apache_dict = {} -%}
-{% do apache_dict.__setitem__(publish_url_name, (apache_port, "https", 'http://' ~ ipv4 ~ ':' ~ haproxy_port)) -%}
+{% do apache_dict.__setitem__(publish_url_name, (apache_port, "https", 'http://' ~ ipv4 ~ ':' ~ haproxy_port, False)) -%}
 
 {% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
 {% set section_list = [] -%}

software/cloudooo/software-common.cfg

@@ -83,5 +83,5 @@ template-logrotate-base = ${template-logrotate-base:rendered}
 [template-cloudooo-instance]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-cloudooo.cfg.in
-md5sum = e1a4a73aeb8b978e953a3f4f39b98a4d
+md5sum = 0a260754586e2a44010f3303c58a927a
 mode = 640

software/dream/software.cfg

@@ -48,12 +48,12 @@ scipy = 0.13.3
 simpy = 3.0.5
 zope.dottedname = 4.1.0
 tablib = 0.10.0
-mysqlclient = 1.3.10
+mysqlclient = 1.3.10+SlapOSPatched001
 
 # indirect dependancies
 cp.recipe.cmd = 0.5
 plone.recipe.command = 1.1
-slapos.recipe.template = 2.8
+slapos.recipe.template = 3.0
 zope.exceptions = 4.0.7
 zope.testing = 4.1.3
 zc.recipe.testrunner = 2.0.0