Merge branch 'master' into aurelien-test-wendelin

50c51b4d · Aurélien Vermylen · 780fa27d · 20c21929 · 50c51b4d · 50c51b4d
Commit 50c51b4d authored Sep 20, 2017 by Aurélien Vermylen
59 changed files
--- a/CHANGES.rst
+++ b/CHANGES.rst
 Changes
 =======

+1.0.53 (2017-09-13)
+-------------------
+
+  * check_port_listening: workaround for sheband limitation, reduce to a single file
+  * erp5.test: pass new --conversion_server_url option to runUnitTest
+
 1.0.52 (2017-07-04)
 -------------------


--- a/component/file/buildout.cfg
+++ b/component/file/buildout.cfg
@@ -8,8 +8,8 @@ extends =

 [file]
 recipe = slapos.recipe.cmmi
-url = http://ftp.icm.edu.pl/packages/file/file-5.23.tar.gz
-md5sum = 61db35209ce71a6d576392ce6e1d2f80
+url = http://ftp.icm.edu.pl/packages/file/file-5.32.tar.gz
+md5sum = 4f2503752ff041895090ed6435610435
 configure-options =
  --disable-static
 environment =

--- a/component/gnutls/buildout.cfg
+++ b/component/gnutls/buildout.cfg
@@ -14,6 +14,7 @@ url = http://www.gnupg.org/ftp/gcrypt/${:_buildout_section_name_}/${:_buildout_s
 configure-options = ${:configure-options-extra}
  --enable-option-checking=fatal
  --disable-dependency-tracking
+  --disable-doc
 environment = ${:environment-extra}
  PATH=${gettext:location}/bin:%(PATH)s
 environment-extra =
@@ -23,25 +24,22 @@ environment-extra =
 version = 1.27
 md5sum = 5217ef3e76a7275a2a3b569a12ddc989
 configure-options-extra =
-  --disable-doc
  --disable-tests

 [libgcrypt]
 <= gpg-common
-version = 1.7.7
-md5sum = d1769481b1b506a632fd66c5e5f62e41
+version = 1.8.1
+md5sum = b21817f9d850064d2177285f1073ec55
 configure-options-extra =
  --with-gpg-error-prefix=${libgpg-error:location}
-  --disable-doc
 environment-extra =
  LDFLAGS=-Wl,-rpath=${libgpg-error:location}/lib

 [gnutls]
 <= gpg-common
-url = http://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.13.tar.xz
-md5sum = 4fd41ad86572933c2379b4cc321a0959
+url = http://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.15.tar.xz
+md5sum = bcdcbc65c50a7499617ad9f4d0058de9
 configure-options-extra =
-  --disable-doc
  --disable-static
  --disable-libdane
  --disable-guile

--- a/component/jupyter/buildout.cfg
+++ b/component/jupyter/buildout.cfg
@@ -39,6 +39,9 @@ eggs =
  ${seaborn:egg}
  ${statsmodels:egg}
  patsy
+# additional eggs for jupyterlab
+  jupyterlab
+  jupyterlab-launcher

 interpreter = pythonjupyter

@@ -69,6 +72,9 @@ scripts =
  jupyter-nbextension
  jupyter-notebook
  jupyter-serverextension
+  jupyter-lab
+  jupyter-labextension
+  jupyter-labhub

 initialization =
  # https://github.com/ipython/ipython/issues/5420

--- a/component/libxml2/buildout.cfg
+++ b/component/libxml2/buildout.cfg
@@ -11,8 +11,8 @@ parts =

 [libxml2]
 recipe = slapos.recipe.cmmi
-url = http://xmlsoft.org/sources/libxml2-2.9.4.tar.gz
-md5sum = ae249165c173b1ff386ee8ad676815f5
+url = http://xmlsoft.org/sources/libxml2-2.9.5.tar.gz
+md5sum = 5ce0da9bdaa267b40c4ca36d35363b8b
 configure-options =
  --disable-static
  --without-python

--- a/component/libxslt/buildout.cfg
+++ b/component/libxslt/buildout.cfg
@@ -7,8 +7,8 @@ parts =
  libxslt

 [libxslt]
-url = ftp://xmlsoft.org/libxslt/libxslt-1.1.29.tar.gz
-md5sum = a129d3c44c022de3b9dcf6d6f288d72e
+url = ftp://xmlsoft.org/libxslt/libxslt-1.1.30.tar.gz
+md5sum = 70becbbcb1dad55f14de0b84171b91d5
 recipe = slapos.recipe.cmmi
 configure-options =
  --disable-static
@@ -18,5 +18,7 @@ configure-options =
  --without-debug
  --without-debugger
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${libxml2:location}/include 
-  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CPPFLAGS=-I${zlib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LIBXML_CFLAGS=-I${libxml2:location}/include
+  LIBXML_LIBS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib
--- a/component/mariadb/buildout.cfg
+++ b/component/mariadb/buildout.cfg
@@ -17,6 +17,9 @@ extends =
  ../readline/buildout.cfg
  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg
+# The following lines are only for mariarocks.cfg
+# to be extended last without touching 'parts'.
+  ../gcc/buildout.cfg

 parts =
  mariadb
@@ -55,15 +58,17 @@ configure-options =
  -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
  -DWITHOUT_MROONGA_STORAGE_ENGINE=1
  -DWITHOUT_DAEMON_EXAMPLE=1
-  -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=${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
+  -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
+  -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}"
+  -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}
+CMAKE_CFLAGS = -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
+CMAKE_LIBRARY_PATH = ${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${:extra_library_path}
+extra_library_path =
 environment =
  CMAKE_PROGRAM_PATH=${cmake:location}/bin
  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
+  CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
+  LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${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 &&
@@ -78,7 +83,12 @@ md5sum = d289667a60a6aa78d8bc276ab61b2996
 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
+  test -d ${mariadb:location}/include/mysql/server/private && (
+    mkdir -p fake_mariadb_source/sql
+    cp -a ${mariadb:location}/include/mysql/server/private/* fake_mariadb_source/sql
+    cp -a ${mariadb:location}/include/mysql/server/*.h fake_mariadb_source/sql
+    cp -a ${mariadb:location}/include/mysql/server/mysql fake_mariadb_source/sql
+  ) || 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

--- a/component/mariadb/mariarocks.cfg
+++ b/component/mariadb/mariarocks.cfg
+# Do not extend any file that touch buildout:parts.
+
 [mariadb]
-url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.6/source/mariadb-10.2.6.tar.gz
-md5sum = 3d454cdadbd3208e1c9c23e5338a62b0
+url = https://downloads.mariadb.org/f/mariadb-10.2.8/source/mariadb-10.2.8.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
+md5sum = f93cbd5bfde3c0d082994764ff7db580
 stable-patches =
 configure-options +=
  -DPLUGIN_DAEMON_EXAMPLE=NO
@@ -8,4 +10,4 @@ configure-options +=
  -DPLUGIN_MROONGA=NO
  -DCMAKE_C_COMPILER=${gcc:location}/bin/gcc
  -DCMAKE_CXX_COMPILER=${gcc:location}/bin/g++
-  -DCMAKE_INSTALL_RPATH=${gcc:location}/lib:${gcc:location}/lib64:${:CMAKE_INSTALL_RPATH}
+extra_library_path = :${gcc:location}/lib:${gcc:location}/lib64
--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
@@ -13,7 +13,6 @@ extends =
  ../zlib/buildout.cfg
  ../file/buildout.cfg
  ../xz-utils/buildout.cfg
-  ../gcc/buildout.cfg

 parts =
    python2.7

--- a/component/python-mysqlclient/buildout.cfg
+++ b/component/python-mysqlclient/buildout.cfg
@@ -16,6 +16,7 @@ recipe = zc.recipe.egg:custom
 egg = mysqlclient
 patches =
  https://github.com/PyMySQL/mysqlclient-python/commit/1693848c9f6ca863868d94d63499830f7f4f3a1f.diff#a493a91f9263243eb331fcab9901b8b0
+  ${:_profile_base_location_}/mysqlclient-1.3.10-mariadb-10.2.8.patch#807b694fcd7ade4da4bcca321b1a29d2
 patch-options = -p1
 patch-binary = ${patch:location}/bin/patch
 environment = python-mysqlclient-env

--- a/component/python-mysqlclient/mysqlclient-1.3.10-mariadb-10.2.8.patch
+++ b/component/python-mysqlclient/mysqlclient-1.3.10-mariadb-10.2.8.patch
+diff -ur mysqlclient-1.3.10.orig/_mysql.c mysqlclient-1.3.10/_mysql.c
+--- mysqlclient-1.3.10.orig/_mysql.c	2017-01-04 13:47:08.000000000 +0100
+++ mysqlclient-1.3.10/_mysql.c	2017-08-21 10:53:21.014929937 +0200
+@@ -1060,7 +1060,7 @@
+ 	if (self && PyModule_Check((PyObject*)self))
+ 		self = NULL;
+ 	if (self && self->open) {
+-#if MYSQL_VERSION_ID >= 50707 && !defined(MARIADB_BASE_VERSION)
+#if MYSQL_VERSION_ID >= 50707 && (!defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID))
+ 		len = mysql_real_escape_string_quote(&(self->connection), out, in, size, '\'');
+ #else
+ 		len = mysql_real_escape_string(&(self->connection), out, in, size);
+@@ -1118,7 +1118,7 @@
+ 	out = PyBytes_AS_STRING(str);
+ 	check_server_init(NULL);
+ 	if (self && self->open) {
+-#if MYSQL_VERSION_ID >= 50707 && !defined(MARIADB_BASE_VERSION)
+#if MYSQL_VERSION_ID >= 50707 && (!defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID))
+ 		len = mysql_real_escape_string_quote(&(self->connection), out+1, in, size, '\'');
+ #else
+ 		len = mysql_real_escape_string(&(self->connection), out+1, in, size);
+diff -ur mysqlclient-1.3.10.orig/setup_posix.py mysqlclient-1.3.10/setup_posix.py
+--- mysqlclient-1.3.10.orig/setup_posix.py	2016-07-26 10:12:24.000000000 +0200
+++ mysqlclient-1.3.10/setup_posix.py	2017-08-21 10:54:59.643071374 +0200
+@@ -63,7 +63,7 @@
+         if extra_compile_args[i] == '-arch':
+             extra_link_args += ['-arch', extra_compile_args[i + 1]]
+ 
+-    include_dirs = [dequote(i[2:])
+    include_dirs = [dequote(os.path.isdir(i[2:]+'/server') and i[2:]+'/server' or i[2:])
+                     for i in mysql_config('include') if i.startswith('-I')]
+ 
+     if static:
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os

-version = '1.0.52'
+version = '1.0.54.dev0'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read() + "\n" + \
    open("CHANGES.rst").read() + "\n"
@@ -101,7 +101,6 @@ setup(name=name,
          'duplicity = slapos.recipe.duplicity:Recipe',
          'egg_test = slapos.recipe.erp5_test:EggTestRecipe',
          'equeue = slapos.recipe.equeue:Recipe',
-          'erp5.bootstrap = slapos.recipe.erp5_bootstrap:Recipe',
          'erp5.promise = slapos.recipe.erp5_promise:Recipe',
          'erp5.test = slapos.recipe.erp5_test:Recipe',
          'erp5scalabilitytestbed = slapos.recipe.erp5scalabilitytestbed:Recipe',

--- a/slapos/recipe/check_port_listening/__init__.py
+++ b/slapos/recipe/check_port_listening/__init__.py
@@ -26,24 +26,35 @@
 #
 ##############################################################################
 from slapos.recipe.librecipe import GenericBaseRecipe
+from zc.buildout.easy_install import _safe_arg, script_header
 import sys

+template = script_header + r"""
+# BEWARE: This file is operated by slapgrid
+# BEWARE: It will be overwritten automatically
+import socket
+import sys
+
+addr = "%(hostname)s", %(port)s
+
+try:
+  socket.create_connection(addr).close()
+except (socket.error, socket.timeout):
+  sys.stderr.write("%%s on %%s isn't listening\n" %% addr)
+  sys.exit(127)
+"""
+
 class Recipe(GenericBaseRecipe):
  """
  Check listening port promise
  """

  def install(self):
-    config = dict(
-      hostname=self.options['hostname'],
-      port=self.options['port'],
-      python_path=sys.executable,
-    )
-
-    vnc_promise = self.createExecutable(
-      self.options['path'],
-      self.substituteTemplate(
-        self.getTemplateFilename('socket_connection_attempt.py.in'),
-        config))
+    promise = self.createExecutable(self.options['path'], template % {
+      'python': _safe_arg(sys.executable),
+      'dash_S': '', # BBB buildout 1.x
+      'hostname': self.options['hostname'],
+      'port': self.options['port'],
+      })

-    return [vnc_promise]
+    return [promise]
--- a/slapos/recipe/check_port_listening/template/socket_connection_attempt.py.in
+++ b/slapos/recipe/check_port_listening/template/socket_connection_attempt.py.in
-#!%(python_path)s
-# BEWARE: This file is operated by slapgrid
-# BEWARE: It will be overwritten automatically
-import socket
-import sys
-
-hostname = "%(hostname)s"
-port = %(port)s
-
-try:
-  s = socket.create_connection((hostname, port))
-  s.close()
-except (socket.error, socket.timeout):
-  sys.stderr.write("%(port)s on %(hostname)s isn't listening\n")
-  sys.exit(127)
-
--- a/slapos/recipe/erp5_bootstrap/__init__.py
+++ b/slapos/recipe/erp5_bootstrap/__init__.py
-##############################################################################
-#
-# Copyright (c) 2012-2014 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from slapos.recipe.librecipe import GenericBaseRecipe
-import sys
-import urlparse
-
-class Recipe(GenericBaseRecipe):
-  """
-  Instanciate ERP5 in Zope
-  """
-
-  def install(self):
-    mysql = urlparse.urlsplit(self.options['mysql-url'])
-    zope = urlparse.urlsplit(self.options['zope-url'])
-    # Note: raises when there is more than a single element in path, as it's
-    # not supported by manage_addERP5Site anyway.
-    _, zope_path = zope.path.split('/')
-    return [self.createExecutable(
-      self.options['runner-path'],
-      self.substituteTemplate(
-        self.getTemplateFilename('erp5_bootstrap.in'),
-        {
-          'python_path': sys.executable,
-          'base_url': urlparse.urlunsplit((zope.scheme, zope.netloc, '', '', '')),
-          'site_id': zope_path,
-          'sql_connection_string': '%(database)s@%(hostname)s:%(port)s %(username)s %(password)s' % {
-            'database': mysql.path.split('/')[1],
-            'hostname': mysql.hostname,
-            'port': mysql.port,
-            'username': mysql.username,
-            'password': mysql.password
-          },
-        },
-    ))]
--- a/slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in
+++ b/slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in
-#!%(python_path)s
-import urllib
-
-import ssl
-if hasattr(ssl, '_create_unverified_context'):
-  ssl._create_default_https_context = ssl._create_unverified_context
-
-def isSuccess(response):
-  return 200 <= response.code < 300
-
-base_url = %(base_url)r
-response = urllib.urlopen(base_url + '/isERP5SitePresent')
-if isSuccess(response) and response.read() == '':
-  mysql_url = %(sql_connection_string)r
-  response = urllib.urlopen(
-    base_url + '/manage_addProduct/ERP5/manage_addERP5Site',
-    data=urllib.urlencode({
-      'id': %(site_id)r,
-      'erp5_catalog_storage': 'erp5_mysql_innodb_catalog',
-      'erp5_sql_connection_string': mysql_url,
-      'cmf_activity_sql_connection_string': mysql_url,
-    }),
-  )
-  if not isSuccess(response):
-    raise ValueError('Failed creating site, status=%%i: %%s' %% (response.code, response.read()))
-  print "ERP5 site created."
--- a/software/agent/software.cfg
+++ b/software/agent/software.cfg
@@ -51,29 +51,29 @@ pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.download = 1.0
 slapos.recipe.template = 3.0
-slapos.toolbox = 0.70
+slapos.toolbox = 0.71
 smmap = 0.9.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 GitPython = 2.0.8

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 atomize = 0.2.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 feedparser = 5.2.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 lockfile = 0.12.2

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 paramiko = 2.0.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 rpdb = 0.1.5
--- a/software/apache-frontend/software.cfg
+++ b/software/apache-frontend/software.cfg
@@ -11,7 +11,7 @@ plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 3.0
-slapos.toolbox = 0.70
+slapos.toolbox = 0.71
 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.70
+# slapos.toolbox==0.71
 dnspython = 1.15.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 erp5.util = 0.4.49

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 passlib = 1.6.5

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 GitPython = 2.0.8

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 atomize = 0.2.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 feedparser = 5.2.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 lockfile = 0.12.2

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 paramiko = 2.0.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 pycurl = 7.43.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 rpdb = 0.1.5
--- a/software/cloudooo/software-common.cfg
+++ b/software/cloudooo/software-common.cfg
@@ -10,7 +10,6 @@ parts =
  ${stack-cloudooo-buildout:parts}
 # Local development
  cloudooo-develop
-  slapos-cookbook-develop
  slapos-cookbook

 [slap-parameters]

--- a/software/dream/software.cfg
+++ b/software/dream/software.cfg
@@ -48,7 +48,7 @@ scipy = 0.13.3
 simpy = 3.0.5
 zope.dottedname = 4.1.0
 tablib = 0.10.0
-mysqlclient = 1.3.10+SlapOSPatched001
+mysqlclient = 1.3.10+SlapOSPatched002

 # indirect dependancies
 cp.recipe.cmd = 0.5

--- a/software/erp5/instance-erp5-input-schema.json
+++ b/software/erp5/instance-erp5-input-schema.json
@@ -13,7 +13,7 @@
      "type": "object"
    },
    "site-id": {
-      "description": "ERP5Site object's id",
+      "description": "ERP5Site object's id. An empty value disables automatic site creation.",
      "default": "erp5",
      "type": "string"
    },

--- a/software/erp5/software-erp5-component.cfg
+++ b/software/erp5/software-erp5-component.cfg
@@ -4,6 +4,7 @@
 [buildout]
 extends =
  software.cfg
+  ../../component/mariadb/mariarocks.cfg

 [slapos.cookbook-repository]
 branch = erp5-component

--- a/software/erp5testnode/buildout.hash.cfg
+++ b/software/erp5testnode/buildout.hash.cfg
+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     But avoid directories, they are not portable.
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+[template]
+filename = instance.cfg
+md5sum = 307663d73ef3ef94b02567ecd322252e
+
+[template-default]
+filename = instance-default.cfg
+md5sum = 76f63d443c5fdcea6fac68791c6bb65b
--- a/software/erp5testnode/instance-default.cfg
+++ b/software/erp5testnode/instance-default.cfg
@@ -17,6 +17,7 @@ parts =
  monitor-base
  monitor-publish
  testnode-frontend
+  resiliency-exclude-file
  
 [monitor-publish]
 recipe = slapos.cookbook:publish
@@ -162,6 +163,12 @@ software = $${rootdirectory:srv}/software
 shellinabox = $${rootdirectory:srv}/shellinabox
 ca-dir = $${rootdirectory:srv}/ca

+[resiliency-exclude-file]
+# Generate rdiff exclude file in case of resiliency
+recipe = collective.recipe.template
+input = inline: **
+output = $${directory:srv}/exporter.exclude
+
 [testnode-frontend]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional

--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
 [buildout]
 extends =
+  buildout.hash.cfg
  ../../stack/slapos.cfg
  ../../component/git/buildout.cfg
  ../../component/lxml-python/buildout.cfg
@@ -49,17 +50,43 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = 307663d73ef3ef94b02567ecd322252e

 [template-default]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-default.cfg
 output = ${buildout:directory}/template-default.cfg
 mode = 0644
-md5sum = 05519f3887a309d3ec069e0aa9f52ebc

 [versions]
 PyXML = 0.8.5
 erp5.util = 0.4.49
 slapos.recipe.template = 3.0
 ipython = 5.3.0
+apache-libcloud = 2.1.0
+gitdb2 = 2.0.2
+pyasn1 = 0.3.2
+smmap2 = 2.0.3
+
+# Required by:
+# slapos.toolbox==0.70
+GitPython = 2.1.5
+
+# Required by:
+# slapos.toolbox==0.70
+atomize = 0.2.0
+
+# Required by:
+# slapos.toolbox==0.70
+dnspython = 1.15.0
+
+# Required by:
+# slapos.toolbox==0.70
+feedparser = 5.2.1
+
+# Required by:
+# slapos.toolbox==0.70
+lockfile = 0.12.2
+
+# Required by:
+# slapos.toolbox==0.70
+passlib = 1.7.1
--- a/software/gitlab/software.cfg
+++ b/software/gitlab/software.cfg
@@ -46,10 +46,6 @@ parts =
 #   for instance
    instance.cfg

-# TODO stop using slapos.cookbook-develop once 571d6514 gets into released
-# slapos.cookbook egg
-    slapos-cookbook-develop
-
    slapos-cookbook
    eggs


--- a/software/jupyter/buildout.hash.cfg
+++ b/software/jupyter/buildout.hash.cfg
@@ -16,7 +16,7 @@

 [instance-jupyter-notebook]
 filename = instance.cfg.in
-md5sum = 27bb1bcf71a2f637f539af697ed73445
+md5sum = e287ff4ca6dbec019d8f1491e14c00b4

 [jupyter-notebook-config]
 filename = jupyter_notebook_config.py.jinja

--- a/software/jupyter/instance.cfg.in
+++ b/software/jupyter/instance.cfg.in
@@ -59,7 +59,7 @@ key_file = ${directory:etc}/jupyter_cert.key
 [instance]
 recipe = slapos.cookbook:wrapper
 command-line =
-  {{ bin_directory }}/jupyter-notebook
+  {{ bin_directory }}/jupyter-lab
  --no-browser
  --ip=${instance-parameter:host}
  --port=${instance-parameter:port}
@@ -68,7 +68,7 @@ command-line =
  --keyfile=${instance-parameter:key_file}
  --notebook-dir=${instance-parameter:notebook_dir}
  --log-level="DEBUG"
-wrapper-path = ${directory:service}/jupyter-notebook
+wrapper-path = ${directory:service}/jupyter-lab
 parameters-extra = true
 environment =
  JUPYTER_PATH=${directory:jupyter_dir}
@@ -126,7 +126,9 @@ instance-configuration =

 [publish-connection-parameter]
 recipe = slapos.cookbook:publish.serialised
-url = https://[${instance-parameter:host}]:${instance-parameter:port}
+jupyter-classic-url = https://[${instance-parameter:host}]:${instance-parameter:port}/tree
+url = ${:jupyter-classic-url}
+jupyterlab-url = https://[${instance-parameter:host}]:${instance-parameter:port}/lab

 [erp5-kernel]
 recipe = slapos.cookbook:symbolic.link

--- a/software/jupyter/software.cfg
+++ b/software/jupyter/software.cfg
@@ -71,6 +71,8 @@ ipython-genutils = 0.1.0
 ipywidgets = 6.0.0
 jupyter-client = 5.0.0
 jupyter-core = 4.3.0
+jupyterlab = 0.26.3
+jupyterlab-launcher = 0.3.1
 matplotlib = 2.0.0
 mistune = 0.7.3
 nbformat = 4.3.0
@@ -89,6 +91,9 @@ terminado = 0.6
 tornado = 4.4.2
 traitlets = 4.3.2
 widgetsnbextension = 2.0.0
+# numpy >= 1.13.1 is required for numpy.core.multiarray
+numpy = 1.13.1
+

 # Required by:
 # tornado==4.4.2
@@ -99,10 +104,6 @@ certifi = 2017.1.23
 # nbconvert 4.2.0 depends on entrypoints egg that is not available as tar/zip source.
 nbconvert = 4.1.0

-# Required by:
-# patsy==0.4.1
-numpy = 1.12.0
-
 # Required by:
 # ipython==5.3.0
 pathlib2 = 2.2.1

--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
@@ -5,7 +5,7 @@ extends = common.cfg
 # XXX - use websockify = 0.5.1 for compatibility with kvm frontend
 websockify = 0.5.1

-slapos.toolbox = 0.70
+slapos.toolbox = 0.71
 erp5.util = 0.4.49
 apache-libcloud = 1.1.0
 collective.recipe.environment = 0.2.0
@@ -16,23 +16,23 @@ smmap = 0.9.0
 # websockify = 0.8.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 GitPython = 2.0.8

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 atomize = 0.2.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 dnspython = 1.14.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 feedparser = 5.2.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 lockfile = 0.12.2

 # Required by:
@@ -40,9 +40,9 @@ lockfile = 0.12.2
 numpy = 1.11.2rc1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 paramiko = 2.0.2

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 passlib = 1.6.5
\ No newline at end of file
--- a/software/nayuos/README.md
+++ b/software/nayuos/README.md
@@ -37,10 +37,11 @@ it is **necessary** to add `sudo` rules for that release as shown there.

 In the vifib parameters (softinst\<nb\>.host.vifib.net \> Services \> Parameters):

-*   **board** / ex: peppy, swanky, ... (choosing daisy will accept all licenses for the daisy board build only, in order to use Mali drivers, see [chromium mailing list](https://groups.google.com/a/chromium.org/forum/#!topic/chromium-os-dev/Pf9ZG2itxWM))
+*   **board** / ex: peppy, swanky, ... Complete list of devices and board names on [chromiumOS developer guide](http://www.chromium.org/chromium-os/developer-information-for-chrome-os-devices)
 *   **branch** / ex: release-R46-7390.B (you can find the release in the [Chromium OS source tree](https://chromium.googlesource.com/chromiumos/manifest/+refs))
 *   **keep_cache** / yes|no (choosing "no" saves about 15Go of disk space per board, choosing "yes" will makes next build faster and less expensive in term of needed ressources because of not rebuilding everything)

+//Choosing board daisy will accept all licenses for the daisy board build only, in order to use Mali drivers, see [chromium mailing list](https://groups.google.com/a/chromium.org/forum/#!topic/chromium-os-dev/Pf9ZG2itxWM)

 ## Output

@@ -57,6 +58,7 @@ Build produces

 *   [ `repo` command reference ](https://source.android.com/source/using-repo.html)
 *   [ NayuOS official website ](https://nayuos.nexedi.com)
+*   [ Board names list ](http://www.chromium.org/chromium-os/developer-information-for-chrome-os-devices)
 *   [ crouton for chroot ](https://github.com/dnschneid/crouton) ([warning about verified boot](https://github.com/dnschneid/crouton/blob/2a1fc9da380650f47e2bcf37d00962bfb68c4830/installer/main.sh#L517-L536))

 ## Notes for possible improvements

--- a/software/nayuos/instance.cfg
+++ b/software/nayuos/instance.cfg
@@ -28,7 +28,7 @@ git-executable = {{ git_path }}/bin/git
 [customize-path]
 # add depot tools directory (for cros_sdk binary among others) and git directory to the path
 command =
-  export PATH="${directory:wrapper_dir}":"{{ git_path }}/bin":"{{ curl_path }}/bin":"${depot-tools:location}":"$PATH";
+  export PATH="${directory:wrapper_dir}":"{{ git_path }}/bin":"{{ curl_path }}/bin":"${depot-tools:location}":"{{thin_provisioning_tools}}/sbin":"$PATH";

 [nayuos-ebuilds]
 recipe = slapos.recipe.build:gitclone
@@ -99,7 +99,7 @@ context =
 recipe = slapos.recipe.template:jinja2
 template = {{ software_dir }}/scripts/cros_full_build.in
 rendered = ${directory:run}/cros_full_build
-md5sum = 2bb9dd83260ea96dd6a6602f6faa9794
+md5sum = 2a64b5cc0314ec2221a949928956f5c0
 mode = 0700
 context =
  key bash_path                         bin:bash

--- a/software/nayuos/scripts/cros_full_build.in
+++ b/software/nayuos/scripts/cros_full_build.in
 #! {{ bash_path }}

+
 function increase_revision_number() {
  # this increase the revision number an ebuild
  # (except for revision number 9999 which is a value for "live ebuild", for dev revisions)
@@ -35,6 +36,7 @@ function increase_revision_number() {
  fi
 }

+
 function insert_packages_into_ebuild() {
  # Insert packages (in form of "category/package") into RDEPEND part of ebuild.
  # Optionally increasing version of given ebuild.
@@ -61,6 +63,14 @@ function insert_packages_into_ebuild() {
  fi
 }

+
+function latest_ebuild() {
+  # find the latest ebuild file (previously we hardcoded the versions)
+  # @argument ebuild directory to find the file in
+  find $1 -type f -name '*ebuild' | sort -r | head -1
+}
+
+
 ######################## Download of sources using the "repo" command ########################
 DL_LOG="{{ instance_log_dir }}/cros_sources_dl.log"
 BRANCH="{{ branch }}"
@@ -124,24 +134,25 @@ install -m 770 "{{ scripts_dir }}/test_nayuos_image" "{{ cros_location }}/{{ bra

 # make virtual ebuild responsible for installing all packages dependent on NayuOS own packages
 insert_packages_into_ebuild \
-  ${CHROMIUM_OVERLAY}/virtual/target-chromium-os-dev/target-chromium-os-dev-1.ebuild \
+  $(latest_ebuild ${CHROMIUM_OVERLAY}/virtual/target-chromium-os-dev) \
  {{ nayu_dev_packages }}

 # insert policies into /etc/chromium/policies/recommended with NayuOS customizations
 insert_packages_into_ebuild \
-  ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-dev-root/chromeos-dev-root-0.0.1.ebuild \
+  $(latest_ebuild ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-dev-root) \
  {{ nayu_dev_rootfs_packages }}

-
 # do not install the Upstart init script that starts ssh daemon at boot time
-rm ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/files/openssh-server.conf
+find ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init* -name openssh-server.conf -delete
+
 # strip away the src_install part because it only sets up booting scripts
-sed -i -n '/src_install/q;p' ${CHROMIUM_OVERLAY}/chromeos-base/openssh-server-init/openssh-server-init-0.0.1.ebuild
-sed -i -n '/src_install/q;p' ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/chromeos-sshd-init-0.0.1.ebuild
-# increase version in case of other overlays with the same packages
+# and increase version in case of other overlays with the same packages
+sed -i -n '/src_install/q;p' $(latest_ebuild ${CHROMIUM_OVERLAY}/chromeos-base/openssh-server-init)
 increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/openssh-server-init/
+sed -i -n '/src_install/q;p' $(latest_ebuild ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init)
 increase_revision_number ${CHROMIUM_OVERLAY}/chromeos-base/chromeos-sshd-init/

+
 # bashrc modifications
 BASH_EBUILD_DIR="${PORTAGE_STABLE}/app-shells/bash"
 if ! grep "BEGIN NayuOS configuration" "${BASH_EBUILD_DIR}/files/dot-bashrc" > /dev/null ; then
@@ -292,7 +303,7 @@ for board in ${BOARDS} ; do
  # preparing packages (for chroot and image)
  date >> "${BUILD_LOG}"
  echo "building packages for a ${board}-flavoured Chromium OS..." >> "${BUILD_LOG}"
-  cros_sdk -- ./build_packages --board=${board} >> "${BUILD_LOG}"
+  cros_sdk --nouse-image -- ./build_packages --board=${board} >> "${BUILD_LOG}"

  # change boot pictures
  cros_sdk -- cros_workon --board=${board} start chromiumos-assets
@@ -305,12 +316,12 @@ for board in ${BOARDS} ; do
  NAYU_IMAGE_LOCATION=/tmp/${board}.nayuos.img

  # rebuild packages with boot pictures
-  cros_sdk -- ./build_packages --board=${board} >> "${BUILD_LOG}"
+  cros_sdk --nouse-image-- ./build_packages --board=${board} >> "${BUILD_LOG}"

  # NayuOS images
  date >> "${BUILD_LOG}"
  echo "building image" >> "${BUILD_LOG}"
-  cros_sdk -- ./build_image --board=${board} dev >> "${BUILD_LOG}" \
+  cros_sdk --nouse-image -- ./build_image --board=${board} dev >> "${BUILD_LOG}" \
    && cros_sdk -- rm -f $NAYU_IMAGE_LOCATION && cros_sdk -- touch $NAYU_IMAGE_LOCATION \
    && cros_sdk -- cros flash --board=${board} file://$NAYU_IMAGE_LOCATION >> "${BUILD_LOG}" \
    && cros_sdk -- ./test_nayuos_image ${board} > "${TEST_LOG}" \

--- a/software/nayuos/software.cfg
+++ b/software/nayuos/software.cfg
@@ -2,16 +2,20 @@
 extends =
 # basic needs
  ../../stack/slapos.cfg
+  ../../component/automake/buildout.cfg
+  ../../component/libexpat/buildout.cfg
+  ../../component/libaio/buildout.cfg
+  ../../component/boost-lib/buildout.cfg

 parts +=
  slapos-cookbook
  template-instance
  git
  curl
+  thin-provisioning-tools

 versions = versions

-
 [versions]
 slapos.recipe.template = 3.0

@@ -22,7 +26,7 @@ recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg
 rendered = ${buildout:directory}/instance.cfg
 mode = 0644
-md5sum = 154882944c6a58642629c17d47b4f6fc
+md5sum = 73f964d73367dbf280d904e408a7f9b8
 context =
  key software_dir            :_profile_base_location_
  key instance_dir            buildout:directory
@@ -30,4 +34,23 @@ context =
  key git_path                git:location
  key eggs_directory          buildout:eggs-directory
  key develop_eggs_directory  buildout:develop-eggs-directory
+  key thin_provisioning_tools thin-provisioning-tools:location

+[thin-provisioning-tools]
+recipe = slapos.recipe.cmmi
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+url = https://github.com/jthornber/thin-provisioning-tools/archive/v0.7.1.tar.gz
+md5sum = 44cc03dd39a55b2f0364b330850d63fd
+pre-configure = ${autoconf:location}/bin/autoconf
+make-options = PREFIX=${:location}
+# environment has to define CXXFLAGS and not CPPFLAGS because of the ./configure
+# which has kind-of special behaviour
+environment =
+  PATH=${m4:location}/bin:${automake:location}/bin:${autoconf:location}/bin:%(PATH)s
+  CXXFLAGS=-I${libexpat:location}/include -I${libaio:location}/include -I${boost-lib:location}/include
+  LDFLAGS=-L${libexpat:location}/lib -L${libaio:location}/lib -L${boost-lib:location}/lib
+dependencies =
+  automake
+  libexpat
+  libaio
+  boost-lib
--- a/software/neoppod/software-common.cfg
+++ b/software/neoppod/software-common.cfg
@@ -23,7 +23,6 @@ parts =
    neoppod-develop
    neoppod
    slapos-deps-eggs
-    slapos-cookbook-develop
    slapos-cookbook

 [neoppod-repository]
@@ -113,44 +112,44 @@ apache-libcloud = 1.5.0
 ecdsa = 0.13
 gitdb2 = 2.0.0
 msgpack-python = 0.4.8
-mysqlclient = 1.3.10+SlapOSPatched001
+mysqlclient = 1.3.10+SlapOSPatched002
 persistent = 4.2.3
 pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.template = 3.0
-slapos.toolbox = 0.70
+slapos.toolbox = 0.71
 smmap2 = 2.0.1
 transaction = 1.7.0
 zodbpickle = 0.6.0
 zodbtools = 0.0.0.dev3

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 GitPython = 2.1.3

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 PyRSS2Gen = 1.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 atomize = 0.2.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 dnspython = 1.14.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 feedparser = 5.2.1

-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 lockfile = 0.12.2

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 paramiko = 2.1.2

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 passlib = 1.7.1
--- a/software/neoppod/software-zodb5.cfg
+++ b/software/neoppod/software-zodb5.cfg
@@ -2,5 +2,5 @@
 extends = software.cfg

 [versions]
-ZODB = 5.1.1
-transaction = 2.0.3
+ZODB = 5.3.0
+transaction = 2.1.2
--- a/software/nginx-push-stream/software.cfg
+++ b/software/nginx-push-stream/software.cfg
@@ -46,4 +46,4 @@ mode = 0644

 [versions]
 slapos.recipe.template = 3.0
-slapos.toolbox = 0.70
+slapos.toolbox = 0.71
--- a/software/re6stnet/software.cfg
+++ b/software/re6stnet/software.cfg
@@ -15,7 +15,6 @@ extends =
  ../../stack/monitor/buildout.cfg

 parts +=
-  slapos-cookbook-develop
  slapos-cookbook
  eggs
  dash
@@ -112,15 +111,15 @@ plone.recipe.command = 1.1
 pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.template = 3.0
-slapos.toolbox = 0.70
+slapos.toolbox = 0.71
 smmap = 0.9.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 GitPython = 2.0.8

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 atomize = 0.2.0

 # Required by:
@@ -128,11 +127,11 @@ atomize = 0.2.0
 backports.ssl-match-hostname = 3.4.0.2

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 feedparser = 5.1.3

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 lockfile = 0.12.2

 # Required by:
@@ -140,10 +139,10 @@ lockfile = 0.12.2
 miniupnpc = 1.9

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 paramiko = 2.0.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 rpdb = 0.1.5

--- a/software/slapos-master/buildout.hash.cfg
+++ b/software/slapos-master/buildout.hash.cfg
@@ -19,7 +19,7 @@ md5sum = aa10af616493b97d2b630c46d869a9d7

 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = 5562e6738470b0fc96211f46bf8d41bc
+md5sum = c5ce18fa4d4be9b9a2d789f3bbd37840

 [template-apache-backend-conf]
 filename = apache-backend.conf.in

--- a/software/slapos-master/instance-balancer.cfg.in
+++ b/software/slapos-master/instance-balancer.cfg.in
@@ -204,7 +204,7 @@ crl =
 {%     do part_list.append('logrotate-' ~ base_name) -%}
 {%     do apache_service_log_list.__setitem__(family_name, base_name) -%}
 [logrotate-{{ base_name }}]
- < = logrotate-entry-base
+< = logrotate-entry-base
 name = {{ base_name }}
 log = ${apache-conf-parameter-dict:log-dir}/{{ base_name }}-error.log ${apache-conf-parameter-dict:log-dir}/{{ base_name }}-access.log
 post = test ! -s ${apache-conf-parameter-dict:pid-file} || {{ parameter_dict['bin-directory'] }}/slapos-kill --pidfile ${apache-conf-parameter-dict:pid-file} -s USR1

--- a/software/slapos-master/software.cfg
+++ b/software/slapos-master/software.cfg
@@ -31,9 +31,6 @@ update-command = ${:command}

 [eggs]
 eggs +=
-  suds
-  facebook-sdk
-  spyne
  slapos.core
  
 dummy +=
@@ -67,6 +64,3 @@ filename = instance-create-erp5-site-real.cfg.in

 [versions]
 python-memcached = 1.47
-facebook-sdk = 2.0.0
-erp5diff = 0.8.1.6
-
--- a/software/slaprunner/buildout.hash.cfg
+++ b/software/slaprunner/buildout.hash.cfg
@@ -31,7 +31,7 @@ md5sum = 5cfa49bcf20612844e1c50a85740d0b3

 [template-runner-export-script]
 filename = template/runner-export.sh.jinja2
-md5sum = ef87691a9675beb646ae1c99ef69e551
+md5sum = 94c0eddb2af3290942f64e04f95a707c

 [instance-runner-export]
 filename = instance-runner-export.cfg.in

--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -17,41 +17,41 @@ gunicorn = 19.4.5
 prettytable = 0.7.2
 pycurl = 7.43.0
 slapos.recipe.template = 3.0
-slapos.toolbox = 0.70
+slapos.toolbox = 0.71
 smmap = 0.9.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 GitPython = 2.0.8

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 PyRSS2Gen = 1.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 atomize = 0.2.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 dnspython = 1.14.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 erp5.util = 0.4.49

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 feedparser = 5.2.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 lockfile = 0.12.2

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 paramiko = 2.0.2

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 passlib = 1.6.5
--- a/software/slaprunner/template/runner-export.sh.jinja2
+++ b/software/slaprunner/template/runner-export.sh.jinja2
@@ -20,7 +20,7 @@ tmp_directory='{{ directory["tmp"] }}'

 rsync () {
  set -x
-  '{{ rsync_binary }}' -rlptgov --stats --safe-links --delete --delete-excluded "$@"
+  '{{ rsync_binary }}' -rlptgov --stats --safe-links --ignore-missing-args --delete --delete-excluded "$@"
  set +x
 }


--- a/software/wendelin/software.cfg
+++ b/software/wendelin/software.cfg
@@ -68,15 +68,15 @@ initialization =
 repository_id_list += wendelin

 [local-bt5-repository]
-# we need to override it
-list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${wendelin:location}/bt5/
+list += ${wendelin:location}/bt5

 # Jupyter is by default enabled in Wendelin
 [erp5-defaults]
 jupyter-enable-default = true

 [wendelin]
-<= erp5
+recipe = slapos.recipe.build:gitclone
+git-executable = ${git:location}/bin/git
 repository = https://lab.nexedi.com/nexedi/wendelin.git
 branch = master


--- a/stack/boinc/buildout.cfg
+++ b/stack/boinc/buildout.cfg
@@ -69,7 +69,7 @@ pycrypto = 2.6
 apache-libcloud = 0.12.4
 async = 0.6.1
 gitdb = 0.5.4
-mysqlclient = 1.3.10+SlapOSPatched001
+mysqlclient = 1.3.10+SlapOSPatched002
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.4

--- a/stack/caucase/buildout.cfg
+++ b/stack/caucase/buildout.cfg
@@ -95,7 +95,7 @@ futures = 3.1.1
 gitdb2 = 2.0.2
 gunicorn = 19.7.1
 slapos.recipe.template = 3.0
-slapos.toolbox = 0.70
+slapos.toolbox = 0.71
 smmap2 = 2.0.3

 # Required by:
@@ -124,11 +124,11 @@ Flask-Script = 2.0.5
 Flask-WTF = 0.14.2

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 GitPython = 2.1.5

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 PyRSS2Gen = 1.1

 # Required by:
@@ -144,7 +144,7 @@ Unipath = 1.1
 WTForms = 2.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 atomize = 0.2.0

 # Required by:
@@ -152,23 +152,23 @@ atomize = 0.2.0
 blinker = 1.4

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 dnspython = 1.15.0

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 erp5.util = 0.4.49

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 feedparser = 5.2.1

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 lockfile = 0.12.2

 # Required by:
-# slapos.toolbox==0.70
+# slapos.toolbox==0.71
 passlib = 1.7.1

 # Required by:

--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -28,6 +28,8 @@ extends =
  ../../component/matplotlib/buildout.cfg
  ../../component/mesa/buildout.cfg
  ../../component/numpy/buildout.cfg
+  ../../component/statsmodels/buildout.cfg
+  ../../component/h5py/buildout.cfg
  ../../component/ocropy/buildout.cfg
  ../../component/onlyoffice-x2t/buildout.cfg
  ../../component/pandas/buildout.cfg
@@ -69,7 +71,6 @@ extends =

 parts +=
  erp5-util-develop
-  slapos-cookbook-develop
  slapos-cookbook
  rdiff-backup
  aspell
@@ -210,12 +211,6 @@ link-binary =
 [template-mariadb-initial-setup]
 <= download-base

-[template-create-erp5-site]
-<= download-base
-
-[template-create-erp5-site-real]
-<= download-base
-
 [template-postfix]
 < = download-base

@@ -303,8 +298,6 @@ context =
    key template_apache_conf template-apache-backend-conf:target
    key template_balancer template-balancer:target
    key template_cloudooo template-cloudooo:target
-    key template_create_erp5_site template-create-erp5-site:target
-    key template_create_erp5_site_real template-create-erp5-site-real:target
    key template_erp5 template-erp5:target
    key template_haproxy_cfg template-haproxy-cfg:target
    key template_jupyter_cfg instance-jupyter-notebook:rendered
@@ -384,7 +377,7 @@ recipe = plone.recipe.command
 stop-on-error = true
 genbt5list = ${erp5:location}/product/ERP5/bin/genbt5list
 command =
-  ${buildout:executable} ${:genbt5list} ${local-bt5-repository:list}
+  echo '${local-bt5-repository:list}' |xargs ${buildout:executable} ${:genbt5list}
 update-command = ${:command}

 [erp5_repository_list]
@@ -472,6 +465,10 @@ eggs = ${neoppod:eggs}
  ${pycrypto-python:egg}
  ${scipy:egg}
  ${scikit-learn:egg}
+  sympy
+  ${h5py:egg}
+  openpyxl
+  ${statsmodels:egg}
  lock_file
  astor
  APacheDEX
@@ -561,9 +558,13 @@ eggs = ${neoppod:eggs}

 # Needed for parsing .po files from our Localizer subset
  polib
+
 # Needed for Google OAuth
  google-api-python-client

+# Need for Facebook OAuth
+  facebook-sdk
+
 # Used by ERP5 Jupyter backend
  ipykernel

@@ -651,9 +652,6 @@ Products.PluggableAuthService = 1.9.0
 # we are still using this old stable version.
 rdiff-backup = 1.0.5+SlapOSPatched001

-# use newest version of slapos.cookbook
-slapos.cookbook =
-
 # modified version that works fine for buildout installation
 SOAPpy = 0.12.0nxd001

@@ -681,7 +679,7 @@ Products.DCWorkflowGraph = 0.4.1
 # Products.ExternalEditor 2.0.0's dtml is not based on Zope2 OFS's one.
 Products.ExternalEditor = 1.1.1
 Products.GenericSetup = 1.8.6
-Products.LongRequestLogger = 2.0.0
+Products.LongRequestLogger = 2.1.0
 # Products.MimetypesRegistry 2.1 requires AccessControl>=3.0.0Acquisition.
 Products.MimetypesRegistry = 2.0.10
 Products.PluginRegistry = 1.4
@@ -735,6 +733,7 @@ rtjp-eventlet = 0.3.2
 socketpool = 0.5.3
 spyne = 2.12.14
 suds = 0.4
+facebook-sdk = 2.0.0
 threadframe = 0.2
 timerserver = 2.0.2
 urlnorm = 1.1.4
@@ -780,3 +779,14 @@ zope.app.dependable = 3.5.1
 # Products.CMFCalendar==2.2.3
 # five.formlib==1.0.4
 zope.app.form = 4.0.2
+
+Cython = 0.26.1
+et-xmlfile = 1.0.1
+h5py = 2.7.1
+mpmath = 0.19
+openpyxl = 2.4.8
+sympy = 1.1.1
+
+# Required by:
+# openpyxl==2.4.8
+jdcal = 1.3
--- a/stack/erp5/buildout.hash.cfg
+++ b/stack/erp5/buildout.hash.cfg
@@ -39,7 +39,7 @@ md5sum = 76f9e8c8cdc352081e34539d8fc17026

 [template-zope-conf]
 filename = zope.conf.in
-md5sum = 77ab4f229a92e02603028a0bd3772edd
+md5sum = bbea91bc8f0b2d455d9824928abfad5b

 [site-zcml]
 filename = site.zcml
@@ -53,14 +53,6 @@ md5sum = d814b984abf2dc444af2a0bc6287e7f5
 filename = mariadb_initial_setup.sql.in
 md5sum = 6465212fdc7fe9076a0c929d9f14da14

-[template-create-erp5-site]
-filename = instance-create-erp5-site.cfg.in
-md5sum = 1186c5804bdc679d8a31ac70cd85d51f
-
-[template-create-erp5-site-real]
-filename = instance-create-erp5-site-real.cfg.in
-md5sum = 79f789360e71146486c82a7a10834bae
-
 [template-postfix]
 filename = instance-postfix.cfg.in
 md5sum = e217f8b55f22d99ee2352eba6807d6f6
@@ -79,7 +71,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0

 [template]
 filename = instance.cfg.in
-md5sum = cbe1df5dbd9b79ed7adc027fd183e186
+md5sum = 258146a9d979b9981d18875fcac4de73

 [monitor-template-dummy]
 filename = dummy.cfg
@@ -87,7 +79,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e

 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 8d9420da8f22dd41d5f076d7506a6620
+md5sum = 909c8eb4f1f2f2d58ad982cec67228bc

 [template-zeo]
 filename = instance-zeo.cfg.in
@@ -95,7 +87,7 @@ md5sum = d1f33d406d528ae27d973e2dd0efb1ba

 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = a2377d5c53fd2a441ea713b428e4844b
+md5sum = 27d26c6380883cf3bd7b2f003f7888d8

 [template-balancer]
 filename = instance-balancer.cfg.in

--- a/stack/erp5/instance-create-erp5-site-real.cfg.in
+++ b/stack/erp5/instance-create-erp5-site-real.cfg.in
-[directory]
-recipe = slapos.cookbook:mkdirectory
-etc = ${buildout:directory}/etc
-services = ${:etc}/run
-promise = ${:etc}/promise
-
-[erp5-bootstrap]
-recipe = slapos.cookbook:erp5.bootstrap
-runner-path = ${directory:services}/erp5-bootstrap
-{# Note: a random domain name will be picked if several point to the same IP -#}
-{% set reverse_hosts = {} -%}
-{% for x, y in publish['hosts-dict'].iteritems() -%}
-{%   do reverse_hosts.__setitem__(y, x) -%}
-{% endfor -%}
-{# XXX: Expect the first database to be the one to use for catalog. -#}
-{% set mysql_parsed = urlparse.urlparse(publish['mariadb-database-list'][0]) -%}
-mysql-url = {{ dumps(urlparse.urlunparse(mysql_parsed[:1] + (mysql_parsed.username + ":" + mysql_parsed.password + "@" + reverse_hosts.get(mysql_parsed.hostname, mysql_parsed.hostname) + ':' ~ mysql_parsed.port, ) + mysql_parsed[2:])) }}
-{# Pick the first http[s] family found, they should be all equivalent anyway. -#}
-{% set family_list = [] -%}
-{% for key, value in publish.items() -%}
-{%   if key.startswith('family-') and value.startswith('http') -%}
-{%     do family_list.append(value.split('://', 1)) -%}
-{%   endif -%}
-{%  endfor -%}
-zope-url = {{ dumps(family_list[0][0] + '://' + publish['inituser-login'] + ':' + publish_early['inituser-password'] + '@' + family_list[0][1] + '/' + publish['site-id']) }}
-
-[promise-erp5-site]
-recipe = slapos.cookbook:check_url_available
-url = ${erp5-bootstrap:zope-url}
-path = ${directory:promise}/erp5-site
-dash_path = {{ parameter_dict['dash-location'] }}/bin/dash
-curl_path = {{ parameter_dict['curl-location'] }}/bin/curl
-
-[buildout]
-parts = promise-erp5-site
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
--- a/stack/erp5/instance-create-erp5-site.cfg.in
+++ b/stack/erp5/instance-create-erp5-site.cfg.in
-{# To create the script (wrapper) which creates the ERP5Site object, pieces
- # of what is published by extended file are required. Because they are not
- # available at the time the file you are reading is rendered, and because
- # those values are composed (lists, dicts...) of which items are needed,
- # they cannot be accessed. Instead, make buildout provide these values to
- # a second template, rendered at a convenient time.
-#}
-[instance-create-erp5-site-real-parameters]
-dash-location = {{ parameter_dict['dash-location'] }}
-curl-location = {{ parameter_dict['curl-location'] }}
-
-[instance-create-erp5-site-real]
-recipe = slapos.recipe.template:jinja2
-template = {{ parameter_dict['template-create-erp5-site-real'] }}
-rendered = ${buildout:directory}/instance-create-erp5-site-real.cfg
-extensions = jinja2.ext.do
-mode = 644
-context =
-  import urlparse urlparse
-  section publish publish
-  section publish_early publish-early
-  section parameter_dict instance-create-erp5-site-real-parameters
-  key eggs_directory buildout:eggs-directory
-  key develop_eggs_directory buildout:develop-eggs-directory
-
-[instance-create-erp5-site-real-run]
-recipe = slapos.recipe.build
-script =
-  import subprocess, sys
-  subprocess.check_call([
-    sys.argv[0],
-    "buildout:directory=${buildout:directory}",
-    "buildout:installed=.installed-${:_buildout_section_name_}.cfg",
-    "-Uoc", self.options['run'],
-  ])
-run = ${instance-create-erp5-site-real:rendered}
-slapos_promise =
-
-[buildout]
-extends = {{ parameter_dict['instance-erp5'] }}
-parts +=
-  instance-create-erp5-site-real-run
--- a/stack/erp5/instance-erp5.cfg.in
+++ b/stack/erp5/instance-erp5.cfg.in
@@ -210,7 +210,6 @@ config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longreque
 config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longrequest-logger-timeout', 1)) }}
 config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
 config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }}
-config-name = {{ partition_name }}
 {% endfor -%}

 {# if not explicitly configured, connect jupyter to first zope family, which  -#}

--- a/stack/erp5/instance-zope.cfg.in
+++ b/stack/erp5/instance-zope.cfg.in
@@ -222,6 +222,23 @@ once = ${:rendered}_done
 [zope-conf-parameter-base]
 ip = {{ ipv4 }}
 site-id = {{ site_id }}
+{% if site_id -%}
+mysql-url = {{ slapparameter_dict['mysql-url-list'][0] }}
+inituser = {{ slapparameter_dict['inituser-login'] }}
+{%  set mysql = urlparse.urlsplit(slapparameter_dict['mysql-url-list'][0]) -%}
+sql-connection-string = {{ '%s@erp5-catalog-0:%s %s %s' % (
+    mysql.path.split('/')[1], mysql.port, mysql.username, mysql.password) }}
+bt5 = {{ slapparameter_dict['bt5'] }}
+bt5-repository-url = {{ slapparameter_dict['bt5-repository-url'] }}
+home = ${buildout:directory}
+# We only want to change the hostname to 'erp5-cloudooo' if we use the internal
+# cloudooo. We plan to remove the ability to have an internal one, so this
+# heuristic is enough.
+{%  set cloudooo = urlparse.urlsplit(slapparameter_dict['cloudooo-url']) -%}
+cloudooo-url = {{ (cloudooo if cloudooo.port == None else
+  cloudooo._replace(netloc='erp5-cloudooo:%s' % cloudooo.port)).geturl() }}
+
+{% endif -%}
 {% set zeo_dict = slapparameter_dict.get('zodb-zeo', {}) -%}
 {% for name, zodb in zodb_dict.iteritems() -%}
 {%   set storage_dict = zodb.setdefault('storage-dict', {}) -%}
@@ -249,7 +266,6 @@ deadlock-debugger-password = {{ dumps(slapparameter_dict['deadlock-debugger-pass
 tidstorage-ip = {{ dumps(slapparameter_dict['tidstorage-ip']) }}
 tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }}
 {% endif -%}
-promise-path = ${erp5-promise:promise-path}
 {% set thread_amount = slapparameter_dict['thread-amount'] -%}
 thread-amount = {{ thread_amount }}
 {% set webdav = slapparameter_dict['webdav'] -%}
@@ -308,8 +324,10 @@ longrequest-logger-file =
 [{{ conf_name }}]
 < = zope-conf-base
 rendered = ${directory:etc}/{{ name }}.conf
+extensions = jinja2.ext.do
 context =
  section parameter_dict {{ conf_parameter_name }}
+  import os os

 [{{ section(name) }}]
 < = runzope-base
@@ -381,16 +399,6 @@ hard to guess.
 hosts-dict = {{ dumps(hosts_dict) }}
 monitor-base-url = ${monitor-publish-parameters:monitor-base-url}

-[erp5-promise]
-recipe = slapos.cookbook:erp5.promise
-promise-path = ${directory:etc}/erp5promise.cfg
-kumofs-url = {{ dumps(slapparameter_dict['kumofs-url']) }}
-memcached-url = {{ dumps(slapparameter_dict['memcached-url']) }}
-cloudooo-url = {{ dumps(slapparameter_dict['cloudooo-url']) }}
-smtp-url = {{ dumps(slapparameter_dict['smtp-url']) }}
-bt5 = {{ dumps(slapparameter_dict['bt5']) }}
-bt5-repository-url = {{ dumps(slapparameter_dict['bt5-repository-url']) }}
-
 [monitor-instance-parameter]
 monitor-httpd-ipv6 = {{ (ipv6_set | list)[0] }}
 monitor-httpd-port = {{ next_port() }}
@@ -402,6 +410,5 @@ extends =
  {{ logrotate_cfg }}
  {{ parameter_dict['template-monitor'] }}
 parts +=
-  erp5-promise
  {{ part_list | join('\n  ') }}
  publish
--- a/stack/erp5/instance.cfg.in
+++ b/stack/erp5/instance.cfg.in
@@ -73,7 +73,7 @@ extra-context =

 [dynamic-template-erp5-parameters]
 jupyter-enable-default = {{ jupyter_enable_default }}
-local-bt5-repository = {{ local_bt5_repository }}
+local-bt5-repository = {{ ' '.join(local_bt5_repository.split()) }}
 template-monitor = {{ dumps(template_monitor) }}

 [dynamic-template-erp5]
@@ -194,19 +194,6 @@ filename = instance-mariadb.cfg
 extra-context =
    section parameter_dict dynamic-template-mariadb-parameters

-[dynamic-template-create-erp5-site-parameters]
-instance-erp5 = ${dynamic-template-erp5:rendered}
-template-create-erp5-site-real = {{ template_create_erp5_site_real }}
-dash-location = {{ dash_location }}
-curl-location = {{ curl_location }}
-
-[dynamic-template-create-erp5-site]
-<= jinja2-template-base
-template = {{ template_create_erp5_site }}
-filename = instance-create-erp5-site.cfg
-extra-context =
-    section parameter_dict dynamic-template-create-erp5-site-parameters
-
 # we need this value to be present in a section,
 # for slapos.cookbook:switch-softwaretype to work
 [dynamic-template-jupyter]
@@ -218,7 +205,6 @@ override = {{ dumps(override_switch_softwaretype |default) }}

 # Public software types
 default = dynamic-template-erp5:rendered
-create-erp5-site = dynamic-template-create-erp5-site:rendered
 # BBB
 RootSoftwareInstance = ${:default}
 # Internal software types

--- a/stack/erp5/zope.conf.in
+++ b/stack/erp5/zope.conf.in
@@ -69,10 +69,24 @@ products {{ parameter_dict['instance-products'] }}
 </timer-server>

 {% endif -%}
-{% set promise_path = parameter_dict['promise-path'] -%}
-{% if promise_path -%}
-<product-config /{{ parameter_dict['site-id'] }}>
-  promise_path {{ promise_path }}
+{% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}
+{% if sql_connection_string -%}
+{%   set bt5_repository_url = [] -%}
+{%   set sr_path = os.path.realpath(parameter_dict['home'] + '/software_release') + '/' -%}
+{%   for url in parameter_dict['bt5-repository-url'].split() -%}
+{%     if url.startswith(sr_path) -%}
+{%       set url = '~/software_release/' + url[len(sr_path):] -%}
+{%     endif -%}
+{%     do bt5_repository_url.append(url) -%}
+{%   endfor -%}
+<product-config initsite>
+  id {{ parameter_dict['site-id'] }}
+  owner {{ parameter_dict['inituser'] }}
+  erp5_sql_connection_string {{ sql_connection_string }}
+  cmf_activity_sql_connection_string {{ sql_connection_string }}
+  bt5_repository_url {{ ' '.join(bt5_repository_url) }}
+  bt5 {{ parameter_dict['bt5'] }}
+  cloudooo_url {{ parameter_dict['cloudooo-url'] }}
 </product-config>

 {% endif -%}

--- a/stack/lamp.cfg
+++ b/stack/lamp.cfg
@@ -42,7 +42,7 @@ keep-compile-dir = false
 apache-libcloud = 0.9.1
 async = 0.6.1
 gitdb = 0.5.4
-mysqlclient = 1.3.10+SlapOSPatched001
+mysqlclient = 1.3.10+SlapOSPatched002
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.3
 slapos.toolbox = 0.40.4

--- a/stack/lamp/buildout.cfg
+++ b/stack/lamp/buildout.cfg
@@ -185,7 +185,7 @@ eggs =
 apache-libcloud = 0.12.3
 async = 0.6.1
 gitdb = 0.5.4
-mysqlclient = 1.3.10+SlapOSPatched001
+mysqlclient = 1.3.10+SlapOSPatched002
 pycrypto = 2.6
 rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 2.4.2

--- a/stack/monitor/buildout.cfg
+++ b/stack/monitor/buildout.cfg
@@ -131,5 +131,5 @@ depends =
 PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
 pycurl = 7.43.0
-slapos.toolbox = 0.70
+slapos.toolbox = 0.71

--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -116,7 +116,7 @@ click = 6.7
 cliff = 2.4.0
 cmd2 = 0.7.0
 collective.recipe.template = 2.0
-cryptography = 1.8.1
+cryptography = 2.0.3
 decorator = 4.0.11
 idna = 2.2
 inotifyx = 0.2.2
@@ -129,14 +129,14 @@ pbr = 2.0.0
 plone.recipe.command = 1.1
 prettytable = 0.7.2
 psutil = 5.2.0
-pyOpenSSL = 16.2.0
+pyOpenSSL = 17.2.0
 pyparsing = 2.2.0
 pytz = 2016.10
 requests = 2.13.0
 setuptools = 33.1.1
 six = 1.10.0
-slapos.cookbook = 1.0.52
-slapos.core = 1.3.18
+slapos.cookbook = 1.0.53
+slapos.core = 1.4.0
 slapos.extension.strip = 0.4
 slapos.libnetworkcache = 0.15
 slapos.rebootstrap = 4.1
@@ -148,7 +148,7 @@ xml-marshaller = 0.9.7
 paramiko = 2.1.3

 # Required by:
-# slapos.core==1.3.18
+# slapos.core==1.4.0
 Flask = 0.12

 # Required by:
@@ -164,11 +164,11 @@ functools32 = 3.2.3.post2
 ipaddress = 1.0.18

 # Required by:
-# slapos.cookbook==1.0.52
+# slapos.cookbook==1.0.53
 jsonschema = 2.6.0

 # Required by:
-# slapos.core==1.3.18
+# slapos.core==1.4.0
 # XXX 'slapos node format' raises an exception with netifaces 0.10.5.
 netifaces = 0.10.4

@@ -181,15 +181,15 @@ packaging = 16.8
 pycparser = 2.17

 # Required by:
-# slapos.core==1.3.18
+# slapos.core==1.4.0
 supervisor = 3.3.3

 # Required by:
-# slapos.core==1.3.18
+# slapos.core==1.4.0
 uritemplate = 3.0.0

 # Required by:
-# slapos.core==1.3.18
+# slapos.core==1.4.0
 zope.interface = 4.3.3

 [networkcache]