Merge remote-tracking branch 'origin/master' into zope4

README.update-hash.rst

+update-hash
+===========
+
+``update-hash`` is a tool to assist software release developers in the management of ``buildout.hash.cfg`` files.
+
+A lot of recipes which uses hashing for referenced files. Updating the hash results in part uninstallation and installation, which is desired behaviour, as the file might have to be redownloaded. By using ``update-hash`` with ``buildout.hash.cfg`` the developer does not have to do the calculations and updates manually, just calling the tool is enough.
+
+Generally each Buildout profile which references some file shall use this approach to improve development process and minimise risk of using incorrect data from such entires.
+
+Working with ``buildout.hash.cfg``
+----------------------------------
+
+``buildout.hash.cfg`` files are buildout-style simplified configparser files to have a easy way to update MD5 hashes of provided files for download. They look like::
+
+  [section]
+  md5sum = <hash>
+  filename = <relative-path>
+
+Where ``<hash>`` is an automatically calculated checksum of ``<relative-path>``.
+
+Then ``buildout.hash.cfg`` can be included in software profile by ``extends`` of ``[buildout]`` section, and the section's ``md5sum`` and ``filename`` can be used.
+
+Special cases of ``filename`` key
+---------------------------------
+
+In case if section recipe has special unwanted behaviour for ``filename`` field the ``_update_hash_filename_`` key can be used like::
+
+  [section]
+  md5sum = <hash>
+  _update_hash_filename_ = <relative-path>
+
+Working with ``update-hash``
+----------------------------
+
+In order to update the ``buildout.hash.cfg`` one just need to call ``update-hash`` while being in the directory containing the file.

component/ZEO/buildout.cfg

+# SlapOS component for ZEO.
+# https://zeo.readthedocs.io/
+
+[buildout]
+extends =
+    ../git/buildout.cfg
+
+parts = ZEO/scripts
+
+
+# ZEO allows to use either ZEO4 or ZEO5
+# To select which version to use users should do:
+#
+#   [ZEO]
+#   egg = ${ZEO<version>:egg}
+#
+# By default ZEO4 is used.
+[ZEO]
+recipe  = zc.recipe.egg:eggs
+egg     = ${ZEO4:egg}
+eggs    = ${:egg}
+
+
+# ZEO/scripts installs scripts from ZEO
+[ZEO/scripts]
+recipe  = zc.recipe.egg:scripts
+eggs    = ${ZEO:egg}
+
+
+# ZEO4: we maintain our own 4-nxd branch with patches
+[ZEO4]
+recipe  = zc.recipe.egg:develop
+setup   = ${ZEO4-repository:location}
+egg     = ZEO
+
+[ZEO4-repository]
+recipe  = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/ZEO.git
+branch  = 4-nxd
+revision= 5114f909e5a5
+location = ${buildout:parts-directory}/ZEO4
+git-executable = ${git:location}/bin/git
+
+
+# ZEO5 is plain upstream egg
+[ZEO5]
+recipe  = zc.recipe.egg:eggs
+egg     = ZEO
+eggs    = ${:egg}

component/apache/buildout.cfg

@@ -39,9 +39,9 @@ configure-options =
 [apache]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 2.4.43
+version = 2.4.46
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 791c986b1e70fe61eb44060aacc89a64
+md5sum = 7d661ea5e736dac5e2761d9f49fe8361
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer

component/bash-completion/buildout.cfg

+[buildout]
+extends = ../xz-utils/buildout.cfg
+parts = bash-completion
+
+[bash-completion]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/scop/bash-completion/releases/download/2.11/bash-completion-2.11.tar.xz
+md5sum = 2514c6772d0de6254758b98c53f91861
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/caddy/buildout.cfg

 [buildout]
 extends =
   ../../component/golang/buildout.cfg
+  gowork.cfg
 
 parts =
+  gowork
   caddy
 
+[gowork.goinstall]
+command = bash -c ". ${gowork:env.sh} && cd ${go_github.com_caddyserver_caddy:location} && GO111MODULE=on go install -v $(echo -n '${gowork:install}' |tr '\n' ' ')"
+
 [gowork]
-# Caddy 1.x+ uses go modules, for which gowork does not work yet
-golang  = ${golang1.12:location}
+golang  = ${golang1.14:location}
 install =
-
-[gowork.goinstall]
-command = :
-depends =
-  ${caddy:recipe}
+  github.com/caddyserver/caddy/...
 
 [caddy]
-# revision and repository can be used to control which caddy version is used
-revision = v1.0.3
-repository = github.com/caddyserver/caddy/caddy
-
 recipe = plone.recipe.command
+command = exit 0
 update-command = ${:command}
-stop-on-error = True
-# GO111MODULE=on enables go modules support
-# the chmod is needed as modules are fetched with u-w
-command =
-  . ${gowork:env.sh} &&
-  cd ${gowork:directory} &&
-  export GO111MODULE=on &&
-  go get ${:repository}@${:revision} &&
-  chmod -R u+w .
 output = ${gowork:bin}/caddy
 location = ${:output}

component/caddy/gowork.cfg

+# Code generated by gowork-snapshot; DO NOT EDIT.
+
+# list of go git repositories to fetch
+[gowork.goinstall]
+depends_gitfetch  =
+    ${go_github.com_caddyserver_caddy:recipe}
+
+[go_github.com_caddyserver_caddy]
+<= go-git-package
+go.importpath = github.com/caddyserver/caddy
+repository    = https://lab.nexedi.com/nexedi/caddy.git
+revision      = nxd-v1.0.3-1-g2c11cedc

component/cmake/buildout.cfg

@@ -9,8 +9,8 @@ parts =
 [cmake]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://cmake.org/files/v3.7/cmake-3.7.2.tar.gz
-md5sum = 79bd7e65cd81ea3aa2619484ad6ff25a
+url = https://cmake.org/files/v3.18/cmake-3.18.4.tar.gz
+md5sum = 0380beaee1c39a22455db02651abe7be
 environment =
   CMAKE_INCLUDE_PATH=${ncurses:location}/include:${openssl:location}/include
   CMAKE_LIBRARY_PATH=${ncurses:location}/lib:${openssl:location}/lib

component/cuneiform/buildout.cfg

-[buildout]
-extends =
-  ../cmake/buildout.cfg
-  ../imagemagick/buildout.cfg
-parts = cuneiform
-
-[cuneiform]
-recipe = slapos.recipe.cmmi
-url = http://launchpad.net/cuneiform-linux/1.0/1.0/+download/cuneiform-linux-1.0.0.tar.bz2
-md5sum = 785232ffffad7d82446fbac08a1c3ef9
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-command =
-  mkdir build && cd build && \
-  ${cmake:location}/bin/cmake \
-    -DCMAKE_INSTALL_RPATH=${:location}/lib64:${:location}/lib \
-    -DCMAKE_INSTALL_PREFIX=${:location} \
-    -DNO_SYSTEM_ENVIRONMENT_PATH=ON \
-    -DCMAKE_INCLUDE_PATH=${imagemagick:location}/include \
-    -DCMAKE_LIBRARY_PATH=${imagemagick:location}/lib \
-    -DCMAKE_INSTALL_RPATH=${:location}/lib64:${:location}/lib:${imagemagick:location}/lib \
-    -DCMAKE_BUILD_TYPE=release \
-    ..
-make-binary =
-  cd build && make

component/cython/buildout.cfg

@@ -6,4 +6,4 @@ recipe = zc.recipe.egg:custom
 egg = cython
 
 [versions]
-Cython = 0.28.2
+Cython = 0.29.21

software/cython-test/software.cfg → component/cythonplus/buildout.cfg

 [buildout]
 extends =
-  ../../stack/slapos.cfg
-  ../../component/numpy/buildout.cfg
+  ../defaults.cfg
+  ../git/buildout.cfg
+  ../numpy/buildout.cfg
 
-parts =
-  slapos-cookbook
-  template
+parts = cythonplus_env.sh
+
+[gcc]
+min_version = 8.4
 
 [python]
 part = python3
 
-[template]
-recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:directory}/template.cfg
-template =
-  inline:[buildout]
-  eggs-directory = ${buildout:eggs-directory}
-  develop-eggs-directory = ${buildout:develop-eggs-directory}
-  parts = runTestSuite
-
-  [slap-configuration]
-  recipe = slapos.cookbook:slapconfiguration.serialised
-  computer = $${slap-connection:computer-id}
-  partition = $${slap-connection:partition-id}
-  url = $${slap-connection:server-url}
-  key = $${slap-connection:key-file}
-  cert = $${slap-connection:cert-file}
-
-  [directory]
-  recipe = slapos.cookbook:mkdirectory
-  bin = $${buildout:directory}/bin
-  tmp = $${buildout:directory}/tmp
-
-  [runTestSuite]
-  recipe = slapos.recipe.template:jinja2
-  rendered = $${directory:bin}/$${:_buildout_section_name_}
-  template = ${runTestSuite.in:target}
-  mode = 0755
-  context =
-    key tmpdir directory:tmp
-    key slapparameter_dict slap-configuration:configuration
-    key cython_repository cython-repository:location
-    raw runTestSuite_py ${runTestSuite_py:bin-directory}/${runTestSuite_py:interpreter}
-    raw cython_env_sh ${cython_env.sh:rendered}
-
-  [cython-repository]
-  recipe = slapos.recipe.build:gitclone
-  repository = ${cython-repository:location}
-  git-executable = ${git:location}/bin/git
-  shared = true
-
-[cython-repository]
-recipe = slapos.recipe.build:gitclone
-repository = https://lab.nexedi.com/nexedi/cython.git
-git-executable = ${git:location}/bin/git
-sparse-checkout = /.gitignore
-
-[runTestSuite.in]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/${:_buildout_section_name_}
-md5sum = 02094e80cde9631081077fc96b401065
-
-[runTestSuite_py]
-recipe = zc.recipe.egg
-eggs = erp5.util
-interpreter = ${:_buildout_section_name_}
-
+# Dependencies for the Cython+ test suite
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -73,7 +20,13 @@ eggs =
   coverage
   pycodestyle
 
-[cython_env.sh]
+[cythonplus-repository]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/cython.git
+revision = cythonplus-0.1
+git-executable = ${git:location}/bin/git
+
+[cythonplus_env.sh]
 recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:directory}/${:_buildout_section_name_}
 template =
@@ -81,26 +34,25 @@ template =
   {% if 'part' in gcc -%}
   {%   set path = path + ':' + gcc.prefix + '/bin' -%}
   {% endif -%}
-  export PATH={{ path }}:$PATH
+  export PATH={{ path }}$${PATH:+:$PATH}
   export PYTHON={{ python }}
+  export PYTHONPATH={{ cythonplus_repository }}$${PYTHONPATH:+:$PYTHONPATH}
   export PYTHONPATH={{ ':'.join(easy_install.working_set(eggs['eggs'].split(), [
       eggs['develop-eggs-directory'],
       eggs['eggs-directory'],
     ]).entries) }}$${PYTHONPATH:+:$PYTHONPATH}
-  # EmbedTest needs libintl.
+  {# Set path to libintl needed for cython EmbedTest #}
   export LD_RUN_PATH={{ gettext }}/lib$${LD_RUN_PATH:+:$LD_RUN_PATH}
   export LIBRARY_PATH={{ gettext }}/lib$${LIBRARY_PATH:+:$LIBRARY_PATH}
-  {##}
 context =
   section eggs eggs
   section gcc gcc
+  key cythonplus_repository cythonplus-repository:location
   key gettext gettext:location
   key python python:executable
   import os os
   import easy_install zc.buildout.easy_install
 
 [versions]
-slapos.recipe.template = 4.4
 coverage = 4.5.1
-numpy = 1.16.4
 pycodestyle = 2.5.0

component/defaults.cfg

@@ -34,7 +34,7 @@ depends =
   ${patch:recipe}
 recipe = slapos.recipe.build
 # Latest version provided by SlapOS.
-part = gcc-8.2
+part = gcc-8.4
 # Minimum version for all components that might be required for
 # slapos.rebootstrap (see https://bugs.python.org/issue34112 about Python 3.7+).
 min_version = 5.4

component/egg-patch/ZEO4/TCP_NODELAY.patch

-From 8b31ccec54584a287cc61501948283d7d6ee7073 Mon Sep 17 00:00:00 2001
-From: Julien Muchembled <jm@nexedi.com>
-Date: Mon, 26 Mar 2018 20:39:07 +0200
-Subject: [PATCH] Enable TCP_NODELAY for inet(6) sockets
-
-See commit 3d886d426243655b9f5a2528636e42b5c7662c19.
----
- src/ZEO/zrpc/client.py | 2 ++
- src/ZEO/zrpc/server.py | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/ZEO/zrpc/client.py b/src/ZEO/zrpc/client.py
-index 32a7a877..669f5962 100644
---- a/src/ZEO/zrpc/client.py
-+++ b/src/ZEO/zrpc/client.py
-@@ -568,6 +568,8 @@ def __init__(self, domain, addr, mgr, client):
-             self.close()
-             return
-         self.sock.setblocking(0)
-+        if domain in (socket.AF_INET, socket.AF_INET6):
-+            self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-         self.state = "opened"
- 
-     def connect_procedure(self):
-diff --git a/src/ZEO/zrpc/server.py b/src/ZEO/zrpc/server.py
-index b83cc004..af91e3e4 100644
---- a/src/ZEO/zrpc/server.py
-+++ b/src/ZEO/zrpc/server.py
-@@ -66,6 +66,7 @@ def _open_socket(self):
-                         socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, True)
-             else:
-                 self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
-+            self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-         else:
-             self.create_socket(socket.AF_UNIX, socket.SOCK_STREAM)
-         self.set_reuse_addr()
--- 
-2.14.1
-

component/fmtlib/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+parts =
+  fmtlib
+
+[fmtlib]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz
+md5sum = 57392b7ea09592a2b237a02950f35bb0
+configure-command = ${cmake:location}/bin/cmake
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DBUILD_SHARED_LIBS=ON
+  -DFMT_TEST=OFF

component/fonts/buildout.cfg

@@ -64,6 +64,16 @@ environment =
 url = https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_2_37/dejavu-fonts-ttf-2.37.tar.bz2
 md5sum = d0efec10b9f110a32e9b8f796e21782c
 
+[source-code-pro-fonts]
+<= fonts-base
+url = https://codeload.github.com/adobe-fonts/source-code-pro/zip/235b72fc43a46cacf36e7c9b45d8d4fc0d121099
+md5sum = b25e165c3fb984bbf6d847adfbd9d694
+
+[jetbrains-mono-fonts]
+<= fonts-base
+url = https://download.jetbrains.com/fonts/JetBrainsMono-2.001.zip
+md5sum = 62f02985bfef43a27dbdd17641fec210
+
 # Microsoft's TrueType core fonts
 # non-free so not enabled by default
 [msttcore-fonts]

component/garbage-collector/buildout.cfg

@@ -7,8 +7,8 @@ parts = garbage-collector
 [garbage-collector]
 recipe = slapos.recipe.cmmi
 shared = true
-md5sum = 6f77f9fff5fb5bf96adfc1e93cd035b6
-url = http://www.hboehm.info/gc/gc_source/gc-7.2g.tar.gz
+md5sum = 67a5093e2f9f381bd550aa891d00b54b
+url = http://www.hboehm.info/gc/gc_source/gc-8.0.4.tar.gz
 configure-options =
   --enable-cplusplus
   --disable-gcj-support

component/gcc/buildout.cfg

@@ -10,7 +10,7 @@ extends =
   ../binutils/buildout.cfg
 
 parts =
-  gcc-8.2
+  gcc-8.4
 
 [gcc-common]
 recipe = slapos.recipe.cmmi
@@ -42,13 +42,11 @@ post-install =
   done
   cat <<EOF >ld
   #!/bin/sh -e
-  case \$#:\$1 in 0:|1:-*) ;; *)
-    if [ "\$LD_RUN_PATH" ]
-    then LD_RUN_PATH=\$LD_RUN_PATH$1
-    else set -- "\$@" $2
-    fi
+  for x; do case \$x in -rpath|-rpath=*)
+    set -- "\$@" $2
+    ! break
     ;;
-  esac
+  esac; done && export LD_RUN_PATH=\$${LD_RUN_PATH:+\$LD_RUN_PATH:}$${1#:}
   exec ${binutils:location}/bin/ld "\$@"
   EOF
   chmod +x ld
@@ -66,17 +64,17 @@ patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/libsanitizer_Use_pre-computed_size_of_struct_ustat_for_Linux.patch#1e5f33e89f9fe1ca3e406eabcc621762
+  ${:_profile_base_location_}/glibc2.30-ipc_perm.patch#563b7f5a38c2ea6bf741c328422b4c98
 
-[gcc-8.2]
+[gcc-8.4]
 <= gcc-common
-version = 8.2.0
-md5sum = 4ab282f414676496483b3e1793d07862
-patch-binary = ${patch:location}/bin/patch
-patch-options = -p1
-# glibc-2.31-libsanitizer comes from https://github.com/spack/spack/pull/15403
-patches =
-  ${:_profile_base_location_}/glibc-2.31-libsanitizer-1.patch
-  ${:_profile_base_location_}/glibc-2.31-libsanitizer-2.patch
+version = 8.4.0
+md5sum = bb815a8e3b7be43c4a26fa89dbbd9795
+
+[gcc-10.2]
+<= gcc-common
+version = 10.2.0
+md5sum = e9fd9b1789155ad09bcf3ae747596b50
 
 [gcc-minimal]
 <= gcc-5.5

component/gcc/glibc-2.31-libsanitizer-1.patch

-From ce9568e9e9cf6094be30e748821421e703754ffc Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Fri, 8 Nov 2019 19:53:18 +0100
-Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
- bootstrap due to libsanitizer)
-
-	Backported from mainline
-	2019-10-22  Tamar Christina  <tamar.christina@arm.com>
-
-	PR sanitizer/92154
-	* sanitizer_common/sanitizer_platform_limits_posix.cc:
-	Cherry-pick compiler-rt revision r375220.
-
-From-SVN: r277981
----
- libsanitizer/ChangeLog                                   | 9 +++++++++
- .../sanitizer_common/sanitizer_platform_limits_posix.cc  | 6 +++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 6cd4a5bac8b0..06a605ff4670 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -1156,8 +1156,12 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
- CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
- CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
- CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
--#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
-+#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
-+    !defined(__arm__)
- /* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
-+/* On Arm glibc 2.31 and later provide a different mode field, this field is
-+   never used by libsanitizer so we can simply ignore this assert for all glibc
-+   versions.  */
- CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
- #endif
- 

component/gcc/glibc-2.31-libsanitizer-2.patch

-From 75003cdd23c310ec385344e8040d490e8dd6d2be Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Fri, 20 Dec 2019 17:58:35 +0100
-Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
- bootstrap due to libsanitizer)
-
-	Backported from mainline
-	2019-11-26  Jakub Jelinek  <jakub@redhat.com>
-
-	PR sanitizer/92154
-	* sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
-	llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
-	* sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.
-
-From-SVN: r279653
----
- libsanitizer/ChangeLog                            | 10 ++++++++++
- .../sanitizer_platform_limits_posix.cc            |  9 +++------
- .../sanitizer_platform_limits_posix.h             | 15 +--------------
- 3 files changed, 14 insertions(+), 20 deletions(-)
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 06a605ff4670..d823a12190c0 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -1156,12 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
- CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
- CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
- CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
--#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
--    !defined(__arm__)
--/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
--/* On Arm glibc 2.31 and later provide a different mode field, this field is
--   never used by libsanitizer so we can simply ignore this assert for all glibc
--   versions.  */
-+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
-+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
-+   on many architectures.  */
- CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
- #endif
- 
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
-index 73af92af1e8f..6a673a7c9959 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -211,26 +211,13 @@ namespace __sanitizer {
-     u64 __unused1;
-     u64 __unused2;
- #elif defined(__sparc__)
--#if defined(__arch64__)
-     unsigned mode;
--    unsigned short __pad1;
--#else
--    unsigned short __pad1;
--    unsigned short mode;
-     unsigned short __pad2;
--#endif
-     unsigned short __seq;
-     unsigned long long __unused1;
-     unsigned long long __unused2;
--#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
--    unsigned int mode;
--    unsigned short __seq;
--    unsigned short __pad1;
--    unsigned long __unused1;
--    unsigned long __unused2;
- #else
--    unsigned short mode;
--    unsigned short __pad1;
-+    unsigned int mode;
-     unsigned short __seq;
-     unsigned short __pad2;
- #if defined(__x86_64__) && !defined(_LP64)

component/gcc/glibc2.30-ipc_perm.patch

+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h    2020-02-28 11:49:29.763277856 +0000
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h    2020-02-28 11:49:45.092909823 +0000
+@@ -198,8 +198,7 @@
+     unsigned long long __unused1;
+     unsigned long long __unused2;
+ #else
+-    unsigned short mode;
+-    unsigned short __pad1;
++    unsigned int mode;
+     unsigned short __seq;
+     unsigned short __pad2;
+ #if defined(__x86_64__) && !defined(_LP64)

component/gdb/buildout.cfg

+# SlapOS component for GDB.
+# https://www.gnu.org/software/gdb
+
+[buildout]
+extends =
+  ../xz-utils/buildout.cfg
+  ../binutils/buildout.cfg
+  ../libexpat/buildout.cfg
+  ../texinfo/buildout.cfg
+
+parts = gdb
+
+[gdb]
+recipe = slapos.recipe.cmmi
+shared = true
+url = http://ftp.gnu.org/gnu/gdb/gdb-9.2.tar.xz
+md5sum = db95524e554870209ab7d9f8fd8dc557
+location = @@LOCATION@@
+# gdb refuses to build in-tree -> build it inside build/
+pre-configure =
+  mkdir -p build
+configure-command =
+  cd build && ../configure
+configure-options =
+  --prefix=${:location}
+  --disable-bootstrap
+  --with-mpc=${mpc:location}
+  --with-mpfr=${mpfr:location}
+  --with-gmp=${gmp:location}
+  --with-isl=${isl:location}
+  --with-expat=${libexpat:location}
+make-binary =
+make-targets = cd build && make && make install
+environment =
+  PATH=${texinfo:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${libexpat:location}/lib

component/golang/buildout.cfg

@@ -6,7 +6,7 @@ extends =
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
 
-parts = gowork
+parts = gowork go
 
 # ---- Go builds itself ----
 
@@ -32,37 +32,10 @@ environment-extra =
 make-targets= cd src && ./make.bash && cp -alf .. ${:location}
 
 
-[golang19]
-<= golang-common
-url = https://dl.google.com/go/go1.9.7.src.tar.gz
-md5sum = 3c2cf876ed6612a022574a565206c6ea
-
-# go1.9 needs go1.4 to bootstrap
-environment-extra =
-  GOROOT_BOOTSTRAP=${golang14:location}
-
-[golang1.10]
-<= golang-common
-url = https://dl.google.com/go/go1.10.3.src.tar.gz
-md5sum = d15dfb264105c5e84fbe33f4a4aa5021
-
-# go1.10 needs go1.4 to bootstrap
-environment-extra =
-  GOROOT_BOOTSTRAP=${golang14:location}
-
-[golang1.11]
-<= golang-common
-url = https://dl.google.com/go/go1.11.4.src.tar.gz
-md5sum = a77697673215be465d1b583680ef2318
-
-# go1.11 needs go1.4 to bootstrap
-environment-extra =
-  GOROOT_BOOTSTRAP=${golang14:location}
-
 [golang1.12]
 <= golang-common
-url = https://dl.google.com/go/go1.12.9.src.tar.gz
-md5sum = 6132109d4050da349eadc9f7b0304ef4
+url = https://golang.org/dl/go1.12.17.src.tar.gz
+md5sum = 6b607fc795391dc609ffd79ebf41f080
 
 # go1.12 needs go1.4 to bootstrap
 environment-extra =
@@ -70,8 +43,8 @@ environment-extra =
 
 [golang1.13]
 <= golang-common
-url = https://dl.google.com/go/go1.13.9.src.tar.gz
-md5sum = 4ad8b04f962be93a32f3021e6f35b3b9
+url = https://golang.org/dl/go1.13.15.src.tar.gz
+md5sum = 4f4af14d88352a62761a9dcedf863ac0
 
 # go1.13 needs go1.4 to bootstrap
 environment-extra =
@@ -79,13 +52,23 @@ environment-extra =
 
 [golang1.14]
 <= golang-common
-url = https://dl.google.com/go/go1.14.3.src.tar.gz
-md5sum = 6b1fb42d219e2ea8925002013c76d4c7
+url = https://golang.org/dl/go1.14.12.src.tar.gz
+md5sum = ae124560e0185a82883b57cc9662aa73
 
 # go1.14 needs go1.4 to bootstrap
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
+[golang1.15]
+<= golang-common
+url = https://golang.org/dl/go1.15.5.src.tar.gz
+md5sum = 12a60d319ff58c03c323e8dcc125ae81
+
+# go1.15 needs go1.4 to bootstrap
+environment-extra =
+  GOROOT_BOOTSTRAP=${golang14:location}
+
+
 # ---- infrastructure to build Go workspaces / projects ----
 
 # gowork is a top-level section representing workspace
@@ -111,6 +94,18 @@ environment-extra =
 #
 #   [gowork]
 #   buildflags = -race
+#
+# ${go:exe} is standalone executable that runs go in activated gowork environment.
+[go]
+recipe  = slapos.recipe.template:jinja2
+exe     = ${buildout:bin-directory}/go
+rendered= ${:exe}
+mode    = 755
+template= inline:
+  #!/bin/sh -e
+  . ${gowork:env.sh}
+  exec go "$@"
+
 [gowork]
 directory = ${buildout:directory}/go.work
 src	= ${:directory}/src
@@ -118,7 +113,7 @@ bin	= ${:directory}/bin
 depends = ${gowork.goinstall:recipe}
 
 # go version used for the workspace (possible to override in applications)
-golang  = ${golang1.10:location}
+golang  = ${golang1.14:location}
 
 # no special build flags by default
 buildflags =
@@ -138,7 +133,7 @@ recipe	= slapos.recipe.template
 url     = ${:_profile_base_location_}/goenv.sh.in
 output	= ${gowork:directory}/env.sh
 depends = ${gowork.mkdir:recipe}
-md5sum	= 6bcf96cf18ea68ce6e378ed8d49346a3
+md5sum	= f89553711ea95ad1f6727b76747a62bf
 
 [gowork.mkdir]
 # NOTE do not use slapos.cookbook:mkdirectory here - if anything in software (not instance)

component/golang/goenv.sh.in

@@ -12,6 +12,8 @@ export PKG_CONFIG_PATH=$(echo -n "${gowork:cpkgpath}" |tr '\n' ':'):$PKG_CONFIG_
 export GOPATH=$X:$GOPATH
 export PATH=$X/bin:$PATH
 export PS1="(`basename $X`) $PS1"
+export GOCACHE=$X/cache
+export GOENV=$X/goenv
 
 # strip trailing : from $GOPATH, $PKG_CONFIG_PATH
 GOPATH=$${GOPATH%:}

component/h2o/buildout.cfg

@@ -14,7 +14,7 @@ recipe = slapos.recipe.cmmi
 shared = True
 url = https://github.com/h2o/h2o/archive/v2.2.6.tar.gz
 md5sum = 075283f92347fcb7b2f87dcc5251b922
-configure-command = ${cmake:location}/bin/cmake .
+configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
   -DWITH_MRUBY=on

component/haproxy/buildout.cfg

@@ -13,8 +13,8 @@ parts = haproxy
 [haproxy]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.15.tar.gz
-md5sum = 59f892991476f08e2d16ac460c502f61
+url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.17.tar.gz
+md5sum = 786a967c73cc1455c938d42fbe333bfe
 configure-command = true
 # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
 # otherwise use "generic".

component/helloweb/buildout.cfg

@@ -25,7 +25,7 @@ parts =
 install =
     lab.nexedi.com/nexedi/helloweb/go/...
 
-golang  = ${golang1.12:location}
+golang  = ${golang1.15:location}
 
 # -*- go -*-
 [helloweb-go]

component/inkscape/buildout.cfg

@@ -41,11 +41,10 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://inkscape.org/gallery/item/13330/inkscape-0.92.4_A6N0YOn.tar.bz2
 md5sum = ac30f6d5747fd9c620c00dad500f414f
-location = @@LOCATION@@
 pkg_config_depends = ${freetype:location}/lib/pkgconfig:${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
-  -DCMAKE_INSTALL_PREFIX=${:location}
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
   -DENABLE_POPPLER=OFF
   -DWITH_GNOME_VFS=OFF
   -DWITH_IMAGE_MAGICK=OFF

component/jupyter-py2/README.md

+This directory is only temporary (until ERP5 is Python3) and will not actively
+be maintained.
+
+It has to be removed once ERP5 uses `software/jupyter` or do not use jupyter at
+all.

component/jupyter-py2/buildout.cfg

+[buildout]
+extends = 
+  buildout.hash.cfg
+  ../../stack/slapos.cfg
+  ../openssl/buildout.cfg
+  ../jupyter/buildout.cfg
+  ../../stack/monitor/buildout.cfg
+parts +=
+  slapos-cookbook
+  jupyter
+  jupyter-notebook-initialized-scripts
+  instance-jupyter-notebook
+
+[gcc]
+# Always build GCC for Fortran (see openblas).
+max_version = 0
+
+[jupyter]
+python_executable = ${buildout:bin-directory}/${:interpreter}
+
+[download-file-base]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:filename}
+download-only = true
+mode = 0644
+
+[jupyter-notebook-config]
+<= download-file-base
+
+[jupyter-set-password]
+<= download-file-base
+
+[erp5-kernel]
+<= download-file-base
+
+[kernel-json]
+<= download-file-base
+
+[custom-js]
+<= download-file-base
+
+[instance-jupyter-notebook]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/${:filename}
+rendered = ${buildout:directory}/template.cfg
+mode = 0644
+context =
+  key bin_directory buildout:bin-directory
+  key develop_eggs_directory buildout:develop-eggs-directory
+  key eggs_directory buildout:eggs-directory
+  key openssl_output openssl-output:openssl
+  key python_executable jupyter:python_executable
+  key jupyter_config_location jupyter-notebook-config:location
+  key jupyter_config_filename jupyter-notebook-config:filename
+  key jupyter_set_password_location jupyter-set-password:location
+  key jupyter_set_password_filename jupyter-set-password:filename
+  key erp5_kernel_location erp5-kernel:location
+  key erp5_kernel_filename erp5-kernel:filename
+  key kernel_json_location kernel-json:location
+  key kernel_json_filename kernel-json:filename
+  key custom_js_location custom-js:location
+  key custom_js_filename custom-js:filename
+  key monitor_template_rendered buildout:directory
+
+[versions]
+Pygments = 2.2.0
+astor = 0.5
+backports-abc = 0.5
+backports.functools-lru-cache = 1.6.1
+backports.shutil-get-terminal-size = 1.0.0
+cycler = 0.10.0
+ipykernel = 4.5.2
+ipython = 5.3.0
+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.1.2
+mistune = 0.7.3
+nbformat = 4.3.0
+notebook = 4.4.1
+pandas = 0.19.2
+plone.recipe.command = 1.1
+prompt-toolkit = 1.0.13
+ptyprocess = 0.5.1
+pyzmq = 16.0.2
+scikit-learn = 0.18.1
+seaborn = 0.7.1
+simplegeneric = 0.8.1
+statsmodels = 0.8.0
+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
+certifi = 2020.6.20
+
+# Required by:
+# notebook==4.3.2
+# nbconvert 4.2.0 depends on entrypoints egg that is not available as tar/zip source.
+nbconvert = 4.1.0
+
+# Required by:
+# ipython==5.3.0
+pathlib2 = 2.2.1
+
+# Required by:
+# statsmodels==0.8.0
+patsy = 0.4.1
+
+# Required by:
+# ipython==5.3.0
+pexpect = 4.2.1
+
+# Required by:
+# ipython==5.3.0
+pickleshare = 0.7.4
+
+# Required by:
+# matplotlib==2.1.2
+# pandas==0.19.2
+python-dateutil = 2.6.0
+
+# Required by:
+# pathlib2==2.2.1
+scandir = 1.5
+
+# Required by:
+# statsmodels==0.8.0
+scipy = 0.19.0
+
+# Required by:
+# tornado==4.4.2
+singledispatch = 3.4.0.3
+
+# Required by:
+# prompt-toolkit==1.0.13
+wcwidth = 0.1.7
+
+jupyter = 1.0.0
+jupyter-console = 5.1.0
+
+# Required by:
+# jupyter==1.0.0
+qtconsole = 4.3.0
+
+et-xmlfile = 1.0.1
+h5py = 2.7.1
+mpmath = 1.0.0
+openpyxl = 2.5.2
+sympy = 1.1.1
+xlrd = 1.1.0
+
+# Required by:
+# openpyxl==2.5.2
+jdcal = 1.4

component/jupyter-py2/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
+#     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).
+
+[instance-jupyter-notebook]
+filename = instance.cfg.in
+md5sum = 1d5fe6cc4e48672ae7be1c223794a932
+
+[jupyter-notebook-config]
+filename = jupyter_notebook_config.py.jinja
+md5sum = 720e90a829c63371696bc3009917a743
+
+[jupyter-set-password]
+filename = jupyter_set_password.cgi.jinja
+md5sum = ac10fbcf790bd8e58750cfdd069812d2
+
+[erp5-kernel]
+filename = ERP5kernel.py
+md5sum = 7d5309fe79afbcb455c0d8181b42e56c
+
+[kernel-json]
+filename = kernel.json.jinja
+md5sum = 33547be93a67530165e079dc3ecfdac3
+
+[custom-js]
+filename = custom.js
+md5sum = 147ccce38f7d7cf10664975d0dd80e33

component/jupyter-py2/custom.js

+// leave at least 2 line with only a star on it below, or doc generation fails
+/**
+ *
+ *
+ * Placeholder for custom user javascript
+ * mainly to be overridden in profile/static/custom/custom.js
+ * This will always be an empty file in IPython
+ *
+ * User could add any javascript in the `profile/static/custom/custom.js` file.
+ * It will be executed by the ipython notebook at load time.
+ *
+ * Same thing with `profile/static/custom/custom.css` to inject custom css into the notebook.
+ *
+ *
+ * The object available at load time depend on the version of IPython in use.
+ * there is no guaranties of API stability.
+ *
+ * The example below explain the principle, and might not be valid.
+ *
+ * Instances are created after the loading of this file and might need to be accessed using events:
+ *     define([
+ *        'base/js/namespace',
+ *        'base/js/events'
+ *     ], function(IPython, events) {
+ *         events.on("app_initialized.NotebookApp", function () {
+ *             IPython.keyboard_manager....
+ *         });
+ *     });
+ *
+ * __Example 1:__
+ *
+ * Create a custom button in toolbar that execute `%qtconsole` in kernel
+ * and hence open a qtconsole attached to the same kernel as the current notebook
+ *
+ *    define([
+ *        'base/js/namespace',
+ *        'base/js/events'
+ *    ], function(IPython, events) {
+ *        events.on('app_initialized.NotebookApp', function(){
+ *            IPython.toolbar.add_buttons_group([
+ *                {
+ *                    'label'   : 'run qtconsole',
+ *                    'icon'    : 'icon-terminal', // select your icon from http://fortawesome.github.io/Font-Awesome/icons
+ *                    'callback': function () {
+ *                        IPython.notebook.kernel.execute('%qtconsole')
+ *                    }
+ *                }
+ *                // add more button here if needed.
+ *                ]);
+ *        });
+ *    });
+ *
+ * __Example 2:__
+ *
+ * At the completion of the dashboard loading, load an unofficial javascript extension
+ * that is installed in profile/static/custom/
+ *
+ *    define([
+ *        'base/js/events'
+ *    ], function(events) {
+ *        events.on('app_initialized.DashboardApp', function(){
+ *            require(['custom/unofficial_extension.js'])
+ *        });
+ *    });
+ *
+ * __Example 3:__
+ *
+ *  Use `jQuery.getScript(url [, success(script, textStatus, jqXHR)] );`
+ *  to load custom script into the notebook.
+ *
+ *    // to load the metadata ui extension example.
+ *    $.getScript('/static/notebook/js/celltoolbarpresets/example.js');
+ *    // or
+ *    // to load the metadata ui extension to control slideshow mode / reveal js for nbconvert
+ *    $.getScript('/static/notebook/js/celltoolbarpresets/slideshow.js');
+ *
+ *
+ * @module IPython
+ * @namespace IPython
+ * @class customjs
+ * @static
+ */
+
+$([Jupyter.events]).on('notebook_loaded.Notebook', function(){
+  var kernelname = Jupyter.notebook.kernel_selector.current_selection;
+  var display_text="<div class='output_subarea output_text output_result'>\
+  <pre>Follow these steps to customize your notebook with ERP5 kernel :-</br>\
+  1. Make sure you have 'erp5_data_notebook' business template installed in your ERP5</br>\
+  2. <b>%erp5_user &lt;your_erp5_username&gt;</b></br>\
+  3. <b>%erp5_password &lt;your_erp5_password&gt;</b></br>\
+  4. <b>%notebook_set_reference &lt;your_notebook_reference&gt;</b></br>\
+  It would be better to set the reference to match with erp5 reference pattern.</br>\
+  5. As soon as you see 'Please Proceed' message you can now access your erp5 using notebook.</br>\
+  <p><u>OTHER USEFUL MAGICS</u> -</br>\
+  <b>%my_notebooks</b> -This is used to display all the notebooks created by the specific user.</br>\
+  <b>%notebook_set_title</b> -This sets the title of the current notebook.</br>\
+  NOTE: Do not dynamically alter imported module objects as they are not being saved in DB, </br>\
+  so changes to them would be disregarded and would throw an error.</br>\
+  <p><u>About classes, functions and global state on modules:</u></p>\
+  Your code is going to be executed by ERP5, which can have many nodes </br>\
+  and there is no guarantee that your code is always going to be executed by the same server.</br>\
+  This means that objects which cannot be stored in the ZODB, like functions, classes and modules </br>\
+  won't be available across nodes. To solve this issue, you need to use a special object </br>\
+  called 'environment' to store your global setup. This object was designed to hold global </br>\
+  state and restore it for each code cell. Example:</br></br>\
+  <b>def my_setup():</br>\
+     # import modules, define functions and classes</br>\
+     # and set global state on modules</br>\
+     # return dict of variables to be available in code cells</br>\
+     {'my_var': 1}</br>\
+  environment.define(my_setup, 'my custom setup')</b></br></br>\
+  After you execute this cell, the <b>my_setup</b> function will run before each of the</br>\
+  following cells and the <b>my_var</b> variable will be created and set to 1.</br></br>\
+  <b>WARNING:</b> it is not recommended to have too many setup functions in the environment, </br>\
+  because they will be executed in every code cell and can cause a substantial slow down.\
+  </pre></div>";
+  if (kernelname=="erp5"){
+  $('div#notebook-container').prepend(display_text);
+  }
+  });

component/jupyter-py2/instance.cfg.in

+[buildout]
+parts =
+  instance
+  jupyter_notebook
+  read-knowledge0
+  publish-connection-parameter
+  jupyter-notebook-config
+  erp5-kernel
+  kernel-json
+  custom-js
+  monitor-base
+extends =
+  {{ monitor_template_rendered }}/template-monitor.cfg
+
+
+eggs-directory = {{ eggs_directory }}
+develop-eggs-directory = {{ develop_eggs_directory }}
+offline = true
+
+[slapconfiguration]
+recipe = slapos.cookbook:slapconfiguration.serialised
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+
+# ERP5 URL to use in Jupyter by default
+# default value is empty - which means no default ERP5 URL
+configuration.erp5-url =
+
+[instance-parameter]
+port = 8888
+host = ${slapconfiguration:ipv6-random}
+cert_file = ${generate-certificate:cert_file}
+key_file = ${generate-certificate:key_file}
+logfile = ${directory:log}/jupyter_notebook.log
+notebook_dir = ${directory:notebook_dir}
+
+[dynamic-jinja2-template-base]
+recipe = slapos.recipe.template:jinja2
+mode = 0644
+
+[generate-certificate]
+; TODO: there is a slapos recipe to generate certificates. Use it instead
+recipe = plone.recipe.command
+command =
+  if [ ! -e ${instance-parameter:key_file} ]
+  then
+    {{ openssl_output }} req -x509 -nodes -days 3650 \
+      -subj "/C=AA/ST=X/L=X/O=Dis/CN=${instance-parameter:host}" \
+      -newkey rsa:1024 -keyout ${instance-parameter:key_file} \
+      -out ${instance-parameter:cert_file}
+  fi
+update-command = ${:command}
+cert_file = ${directory:etc}/jupyter_cert.crt
+key_file = ${directory:etc}/jupyter_cert.key
+
+[instance]
+recipe = slapos.cookbook:wrapper
+command-line =
+  {{ bin_directory }}/jupyter-lab
+  --no-browser
+  --ip=${instance-parameter:host}
+  --port=${instance-parameter:port}
+  --port-retries=0
+  --certfile=${instance-parameter:cert_file}
+  --keyfile=${instance-parameter:key_file}
+  --notebook-dir=${instance-parameter:notebook_dir}
+  --log-level="DEBUG"
+wrapper-path = ${directory:service}/jupyter-lab
+environment =
+  JUPYTER_PATH=${directory:jupyter_dir}
+  JUPYTER_CONFIG_DIR=${directory:jupyter_config_dir}
+  JUPYTER_RUNTIME_DIR=${directory:jupyter_runtime_dir}
+  LANG=C.UTF-8
+
+[jupyter-notebook-config]
+<= dynamic-jinja2-template-base
+template = {{ jupyter_config_location }}/{{ jupyter_config_filename }}
+rendered = ${directory:jupyter_config_dir}/jupyter_notebook_config.py
+mode = 0744
+context =
+  raw config_cfg ${buildout:directory}/knowledge0.cfg
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+home = ${buildout:directory}
+etc = ${:home}/etc
+var = ${:home}/var
+script = ${:etc}/run/
+service = ${:etc}/service
+log = ${:var}/log
+notebook_dir = ${:var}/notebooks
+# Add folders to explicitly define jupyter directory
+jupyter_dir = ${:home}/jupyter
+jupyter_config_dir = ${:jupyter_dir}/etc
+jupyter_kernel_dir = ${:jupyter_dir}/kernels
+jupyter_runtime_dir = ${:jupyter_dir}/runtime
+jupyter_custom_dir = ${:jupyter_config_dir}/custom
+jupyter_nbextensions_dir = ${:jupyter_dir}/nbextensions
+erp5_kernel_dir = ${:jupyter_kernel_dir}/ERP5
+
+[jupyter_notebook]
+# This part is called like this because knowledge0.write uses the part name for
+# the section name in the config file.
+recipe = slapos.cookbook:zero-knowledge.write
+password = 
+filename = knowledge0.cfg
+
+[read-knowledge0]
+recipe = slapos.cookbook:zero-knowledge.read
+filename = knowledge0.cfg
+password =
+
+[monitor-instance-parameter]
+monitor-base-url = ${monitor-frontend-promise:url}
+# In case you're using a developer instance you should edit these in:
+# monitor-base-url = ${monitor-httpd-conf-parameter:url}
+# cors-domains = softinstXXXXX.host.vifib.net (or equivalent)
+# interface-url = https://softinstXXXXX.host.vifib.net/erp5/web_site_module/monitoring_rjs_unsafe
+instance-configuration =
+  raw jupyter-password ${read-knowledge0:password}
+
+[publish-connection-parameter]
+recipe = slapos.cookbook:publish.serialised
+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
+link-binary = {{ erp5_kernel_location }}/{{ erp5_kernel_filename }}
+target-directory = ${directory:erp5_kernel_dir}
+
+[kernel-json]
+<= dynamic-jinja2-template-base
+template = {{ kernel_json_location }}/{{ kernel_json_filename }}
+rendered = ${directory:erp5_kernel_dir}/kernel.json
+# Use python2.7 executable bin file for kernel config
+context =
+  raw python_executable {{ python_executable }}
+  raw kernel_dir ${erp5-kernel:target-directory}/{{ erp5_kernel_filename }}
+  key erp5_url slapconfiguration:configuration.erp5-url 
+  raw display_name ERP5
+  raw language_name python
+
+[custom-js]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${directory:jupyter_custom_dir}
+link-binary = {{ custom_js_location }}/custom.js

component/jupyter-py2/jupyter_notebook_config.py.jinja

+'''
+  This script initializes Jupyter's configuration such as passwords and other
+  things. It is run by IPython hence why it can use functions like get_config().
+'''
+import ConfigParser
+import random
+from notebook.auth import passwd
+import os
+
+def random_password(length = 10):
+  result = ""
+  for i in range(0, length):
+    result = result + chr(random.randint(0, 25) + ord('a'))
+  return result
+
+knowledge_0 = '{{ config_cfg }}'
+
+if not os.path.exists(knowledge_0):
+  print "Your software does <b>not</b> embed 0-knowledge. \
+  This interface is useless in this case</body></html>"
+  exit(0)
+
+c = get_config()
+
+parser = ConfigParser.ConfigParser()
+parser.read(knowledge_0)
+
+if not parser.has_section("jupyter_notebook"):
+  parser.add_section("jupyter_notebook")
+
+if not parser.has_option("jupyter_notebook", "password") or \
+  parser.get("jupyter_notebook", "password") == "":
+  parser.set("jupyter_notebook", "password", random_password())
+
+c.NotebookApp.password = passwd(parser.get("jupyter_notebook", "password"))
+
+with open(knowledge_0, 'w') as file:
+  parser.write(file)

component/jupyter-py2/jupyter_set_password.cgi.jinja

+#!{{ python_executable }}
+
+import cgi
+import cgitb
+import ConfigParser
+import os
+import re
+import subprocess
+
+from IPython.lib import passwd
+
+#cgitb.enable(display=0, logdir="/tmp/cgi.log")
+cgitb.enable()
+form = cgi.FieldStorage()
+
+config_file = "{{ config_cfg }}"
+
+
+if not os.path.exists(config_file):
+  print "Your software does <b>not</b> embed 0-knowledge. \
+  This interface is useless in this case</body></html>"
+  exit(0)
+
+
+parser = ConfigParser.ConfigParser()
+parser.read(config_file)
+if not parser.has_section("jupyter_notebook"):
+  parser.add_section("jupyter_notebook")
+
+if not parser.has_option("jupyter_notebook", "password"):
+  parser.set("jupyter_notebook", "password", "")
+
+if "password" in form:
+  parser.set("jupyter_notebook", "password", passwd(form["password"].value))
+  # subprocess.call('{{ httpd_graceful }}')
+  # TODO: we should restart jupyter
+
+with open(config_file, 'w') as file:
+  parser.write(file)
+
+# TODO cleanup
+print "<html><head>"
+print "<link rel=\"stylesheet\" href=\"static/pure-min.css\">"
+print "<link rel=\"stylesheet\" href=\"static/style.css\">"
+print "</head><body>"
+print "<h1>Jupyter Notebook Password :</h1>"
+print "<form action=\"/index.cgi\" method=\"post\" class=\"pure-form-aligned\">"
+print "<input type=\"hidden\" name=\"posting-script\" value=\"{{ pwd }}/{{ this_file }}\">"
+
+print """<div class="pure-control-group">
+<label for="password">Password*:</label>
+<input placeholder="Set your password" type="password" name="password" id="password"></br>
+</div><div class="pure-control-group">
+<label for="password">Verify Password*:</label>
+<input placeholder="Verify password" type="password" name="password_2" id="password_2"></br>
+</div><p id="validate-status" style="color:red"></p>
+<div class="pure-controls">
+<button id="register-button" type="submit" class="pure-button pure-button-primary" disabled>Access</button></div>
+</form>
+<script type="text/javascript" src="static/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="static/monitor-register.js"></script>
+</body></html>
+"""

component/jupyter-py2/kernel.json.jinja

+{
+  "argv": [
+    "{{python_executable}}",
+    "{{kernel_dir}}",
+    "{{erp5_url}}",
+    "-f",
+    "{connection_file}"
+  ],
+  "display_name": "{{display_name}}",
+  "language": "{{language_name}}",
+  "language_info": {"name": "python"}
+}

component/libzip/buildout.cfg

@@ -13,17 +13,16 @@ shared = true
 url = https://libzip.org/download/libzip-1.5.2.tar.xz
 md5sum = f9dd38d273bcdec5d3d1498fe6684f42
 location = @@LOCATION@@
-configure-command =
-  mkdir build && cd build && \
-  ${cmake:location}/bin/cmake \
-    -DCMAKE_INSTALL_PREFIX=${:location} \
-    -DCMAKE_INCLUDE_PATH=${zlib:location}/include:${bzip2:location}/include \
-    -DCMAKE_LIBRARY_PATH=${zlib:location}/lib:${bzip2:location}/lib \
-    ..
-make-binary =
-  cd build && make
+configure-command = cmake
+configure-options =
+  -Bbuild
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_INSTALL_PREFIX=${:location}
+  -DCMAKE_INCLUDE_PATH=${zlib:location}/include:${bzip2:location}/include
+  -DCMAKE_LIBRARY_PATH=${zlib:location}/lib:${bzip2:location}/lib
+make-options = -C build
 environment =
   PATH=${cmake:location}/bin:%(PATH)s
   CMAKE_INCLUDE_PATH=${zlib:location}/include:${bzip2:location}/include
   CMAKE_LIBRARY_PATH=${zlib:location}/lib:${bzip2:location}/lib
-  LDFLAGS=-L${:location}/lib -Wl,-rpath=${:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib
+  LDFLAGS=-Wl,-rpath=${:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib

component/llvm/buildout.cfg

+[buildout]
+extends =
+    ../cmake/buildout.cfg
+    ../git/buildout.cfg
+
+parts = llvm
+
+[llvm]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/llvm/llvm-project/releases/download/llvmorg-${:version}/llvm-${:version}.src.tar.xz
+version = 11.0.0
+md5sum = 85844102335b2e01b3c64b6734fb56f2
+configure-command = ${cmake:location}/bin/cmake
+configure-options =
+    -Bbuild
+    -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+    -DCMAKE_BUILD_TYPE=Release
+    -DLLVM_INSTALL_UTILS=ON
+    -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
+    -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}"
+make-options = -C build
+CMAKE_CFLAGS = -I${libxml2:location}/include/libxml2 -I${ncurses:location}/include -I${zlib:location}/include
+environment =
+    PATH=${git:location}/bin:%(PATH)s
+    LDFLAGS=-L${libxml2:location}/lib -L${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${zlib:location}/lib

component/logrotate/buildout.cfg

@@ -8,8 +8,8 @@ parts = logrotate
 [logrotate]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/logrotate/logrotate/releases/download/3.15.0/logrotate-3.15.0.tar.xz
-md5sum = 320046f0b9fc38337e8827d4c5a866a0
+url = https://github.com/logrotate/logrotate/releases/download/3.17.0/logrotate-3.17.0.tar.xz
+md5sum = ac2a7151fc8a187201872358a20a2813
 # BBB this is only for backward-compatibility.
 post-install =
   ln -nsf . @@LOCATION@@/usr

component/logrotate/logrotate-3.7.9-O_CLOEXEC.optional.patch

-diff --git a/config.c b/config.c
-index e6d5d1d..dd004a9 100644
---- a/config.c
-+++ b/config.c
-@@ -519,7 +519,11 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
-        length arrays -- of course, if we aren't run setuid it doesn't
-        matter much */
- 
-+#ifdef O_CLOEXEC
-     fd = open(configFile, O_RDONLY | O_CLOEXEC);
-+#else
-+    fd = open(configFile, O_RDONLY);
-+#endif
-     if (fd < 0) {
- 	message(MESS_ERROR, "failed to open config file %s: %s\n",
- 		configFile, strerror(errno));

component/lz4/buildout.cfg

@@ -6,6 +6,6 @@ parts =
 [lz4]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/lz4/lz4/archive/v1.9.2.tar.gz
-md5sum = 3898c56c82fb3d9455aefd48db48eaad
+url = https://github.com/lz4/lz4/archive/v1.9.3.tar.gz
+md5sum = 3a1ab1684e14fc1afc66228ce61b2db3
 configure-command = true

component/mariadb/buildout.cfg

@@ -26,12 +26,12 @@ extends =
 parts =
   mariadb
 
-[mariadb]
+[mariadb-10.4]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
-version = 10.4.14
-md5sum = 9801120ae8acb33904ab4a3366a7714f
+url = https://archive.mariadb.org//mariadb-${:version}/source/mariadb-${:version}.tar.gz
+version = 10.4.17
+md5sum = e8193b9cd008b6d7f177f5a5c44c7a9f
 location = @@LOCATION@@
 pre-configure =
   set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
@@ -125,3 +125,22 @@ environment =
   CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
   LDFLAGS=-L${groonga:location}/lib
   PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig
+
+
+### XXX keep using mariadb 10.3.22 because 10.4 cause crash
+### (we just override here for easier revert)
+[mariadb-10.3]
+<= mariadb-10.4
+version = 10.3.27
+md5sum = 6ab2934a671191d8ca8730e9a626c5c9
+post-install =
+  ldd=`ldd ${:location}/lib/plugin/ha_rocksdb.so`
+  for x in ${lz4:location} ${snappy:location} ${zstd:location}
+  do echo "$ldd" |grep -qF " $x/lib/"
+  done
+  mkdir -p ${:location}/include/wsrep &&
+  cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
+
+[mariadb]
+location = ${mariadb-10.3:location}
+### /XXX keep using mariadb 10.3.22 because 10.4 cause crash

component/nginx/buildout.cfg

@@ -13,8 +13,8 @@ parts = nginx-output
 [nginx-common]
 recipe = slapos.recipe.cmmi
 shared = false
-url = https://nginx.org/download/nginx-1.17.6.tar.gz
-md5sum = 55022aa5715386c994f6773478822853
+url = https://nginx.org/download/nginx-1.19.2.tar.gz
+md5sum = 3dc55f6451ed6f819f1c796f4e5e9617
 
 [nginx]
 <= nginx-common
@@ -26,8 +26,8 @@ configure-options=
   --with-http_realip_module
   --with-mail
   --with-mail_ssl_module
-  --with-ld-opt="-L ${openssl-1.0:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
-  --with-cc-opt="-I ${openssl-1.0:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
+  --with-ld-opt="-L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  --with-cc-opt="-I ${openssl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
 
 [nginx-dav-ext-module]
 recipe = slapos.recipe.build:download-unpacked
@@ -46,8 +46,8 @@ configure-options =
   --with-mail
   --with-mail_ssl_module
   --error-log-path=var/log/nginx.error.log
-  --with-ld-opt=" -L ${libexpat:location}/lib -L ${openssl-1.0:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
-  --with-cc-opt="-I ${libexpat:location}/include -I ${openssl-1.0:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
+  --with-ld-opt=" -L ${libexpat:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  --with-cc-opt="-I ${libexpat:location}/include -I ${openssl:location}/include -I ${pcre:location}/include -I ${zlib:location}/include"
   --with-http_dav_module 
   --add-module='${nginx-dav-ext-module:location}'
 
@@ -73,8 +73,8 @@ strip-top-level-dir = true
 configure-options=
   --with-ipv6
   --with-http_ssl_module
-  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl-1.0:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include -I ${openssl-1.0:location}/include -I ${zlib:location}/include"
+  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
+  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
   --add-module=${hexaglobe-nginx-module:location}/sub_module
 # --add-module=${hexaglobe-nginx-module:location}/nginx-upstream-fair
 
@@ -91,8 +91,8 @@ configure-options=
   --with-http_ssl_module
   --with-http_v2_module
   --with-http_gzip_static_module
-  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl-1.0:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include -I ${openssl-1.0:location}/include -I ${zlib:location}/include -Wno-error"
+  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
+  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include -Wno-error"
   --add-module=${nginx-push-stream-module:location}
 
 [nginx-push-stream-output]

component/nodejs/buildout.cfg

@@ -14,6 +14,12 @@ parts =
 [nodejs]
 <= nodejs-8.9.4
 
+[nodejs-12.18.3]
+<= nodejs-base
+openssl_location = ${openssl:location}
+version = v12.18.3
+md5sum = 28bf6a4d98b238403fa58a0805f4a979
+
 [nodejs-10.19.0]
 <= nodejs-base
 openssl_location = ${openssl:location}

component/numpy/buildout.cfg

@@ -4,3 +4,7 @@ parts = numpy
 [numpy]
 recipe = zc.recipe.egg:custom
 egg = numpy
+
+
+[versions]
+numpy = 1.16.4

component/nxdtest/buildout.cfg

+[buildout]
+extends =
+  ../pygolang/buildout.cfg
+  ../git/buildout.cfg
+
+
+[nxdtest]
+recipe  = zc.recipe.egg:scripts
+eggs    = ${pygolang:egg}
+          ${nxdtest-egg:egg}
+scripts = nxdtest
+# convenience for nxdtest users
+exe     = ${buildout:bin-directory}/nxdtest
+
+[nxdtest-egg]
+recipe  = zc.recipe.egg:develop
+setup   = ${nxdtest-repository:location}
+egg     = nxdtest
+
+[nxdtest-repository]
+recipe  = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/nxdtest.git
+revision = 40e2c4ab
+location = ${buildout:parts-directory}/nxdtest
+git-executable = ${git:location}/bin/git

component/nxdtest/test-py3.cfg

+# SlapOS software release to test nxdtest on Nexedi testing infrastructure.
+[buildout]
+extends =
+  ../defaults.cfg
+  test.cfg
+
+[python]
+part = python3

component/nxdtest/test.cfg

+# SlapOS software release to test nxdtest on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+    ../../stack/nxdtest.cfg
+    ../pytest/buildout.cfg
+
+parts =
+    python-interpreter
+    slapos-cookbook
+    instance.cfg
+
+# override to install test extra
+[nxdtest-egg]
+egg = nxdtest[test]
+
+[python-interpreter]
+eggs +=
+  ${pytest:eggs}
+  ${nxdtest:eggs}
+
+# env.sh for interpreter to be on $PATH.
+[nxdtest-env.sh]
+recipe   = slapos.recipe.template:jinja2
+rendered = ${buildout:directory}/${:_buildout_section_name_}
+template = inline:
+  export PS1="(nxdtest-env) $PS1"
+  export PATH=${buildout:bin-directory}:$PATH
+
+# instance to run nxdtest.
+[instance.cfg]
+<= jinja2-template
+template = inline:
+  [buildout]
+  extends = ${nxdtest-instance.cfg:rendered}
+
+  [runTestSuite]
+  env.sh  = ${nxdtest-env.sh:rendered}
+  workdir = ${nxdtest-repository:location}
+

component/openblas/buildout.cfg

 [buildout]
 extends =
-  ../patch/buildout.cfg
   ../perl/buildout.cfg
 
 parts =
@@ -9,32 +8,27 @@ parts =
 [openblas]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://github.com/xianyi/OpenBLAS/archive/v0.2.18.tar.gz
-md5sum = 805e7f660877d588ea7e3792cda2ee65
-patch-options = -p0
-patches =
-  ${:_profile_base_location_}/disable_openmp_if_single_core.patch#ee553ccaf9dd4bc37374588e49956f62
+url = https://github.com/xianyi/OpenBLAS/archive/v0.3.10.tar.gz
+md5sum = 4727a1333a380b67c8d7c7787a3d9c9a
 
-build-common-options = BINARY="$(uname -m | grep -q x86_64 && echo 64 || echo 32)" NO_STATIC=1 USE_OPENMP=1 USE_THREAD=1
+build-common-options = NO_STATIC=1 USE_OPENMP=1 USE_THREAD=1 DYNAMIC_ARCH=1
 
-# You can specify more options with openblas:build-ext-options parameter.
+# We build for multiple targets with runtime detection of the target CPU but
+# you can specify more options with openblas:build-ext-options parameter.
 # Example :
-# * to build generic binary that supports multiple architecture in one binary
-#   DYNAMIC_ARCH=1
-# * to specify target explicitly
-#   (see https://github.com/xianyi/OpenBLAS/blob/v0.2.15/TargetList.txt )
+# * to specify the oldest model you expect to encounter
+#   (see https://github.com/xianyi/OpenBLAS/blob/v0.2.18/TargetList.txt )
 #   TARGET=HASWELL
 build-ext-options =
 
 # Fortran is required for LAPACK, which is required for matplotlib.
 pre-configure = type gfortran
 
-# First try with auto-detected target and if it fails try TARGET=GENERIC.
 configure-command =
-  make ${:build-common-options} ${:build-ext-options} || (make -j1 clean && make ${:build-common-options} TARGET=GENERIC)
+  make ${:build-common-options} ${:build-ext-options}
 make-options =
   dummy
 make-targets =
   PREFIX="@@LOCATION@@" install
 environment =
-  PATH=${patch:location}/bin:${perl:location}/bin:%(PATH)s
+  PATH={perl:location}/bin:%(PATH)s

component/openblas/disable_openmp_if_single_core.patch

-diff --git Makefile.system Makefile.system
-index 42ad498..d43aa7a 100644
---- Makefile.system
-+++ Makefile.system
-@@ -171,6 +171,7 @@ endif
- 
- ifeq ($(NUM_THREADS), 1)
- override USE_THREAD = 0
-+override USE_OPENMP = 0
- endif
- 
- ifdef USE_THREAD

component/openssl/buildout.cfg

@@ -17,8 +17,8 @@ parts =
 [openssl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://www.openssl.org/source/openssl-1.1.1g.tar.gz
-md5sum = 76766e98997660138cdaf13a187bd234
+url = https://www.openssl.org/source/openssl-1.1.1i.tar.gz
+md5sum = 08987c3cf125202e2b0840035efb392c
 location = @@LOCATION@@
 # 'prefix' option to override --openssldir/--prefix (which is useful
 # when combined with DESTDIR). Used by slapos.package.git/obs
@@ -53,6 +53,7 @@ stop-on-error = true
 update-command = ${:command}
 command = ${coreutils-output:test} -x ${:openssl}
 openssl = ${openssl:location}/bin/openssl
+bin = ${openssl:location}
 
 [openssl-1.0]
 recipe = slapos.recipe.cmmi

component/postfix/buildout.cfg

@@ -8,19 +8,19 @@ extends =
   ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../cyrus-sasl/buildout.cfg
+  ../m4/buildout.cfg
 
 [postfix]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.11.6.tar.gz
-md5sum = c3277d05b78eaaf5955406bc7b6d2b9f
+url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.5.8.tar.gz
+md5sum = c7c55ccc1db2a30d35c3867c21fe7109
 location = @@LOCATION@@
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/noroot.patch#738bcc97b8044c45b58708bdf3a84b8e
-  ${:_profile_base_location_}/skip-libdb-check.patch#f7fdbd8787874b535fee548b0139c0d8
+  ${:_profile_base_location_}/noroot.patch#05fc6333e05576ea8e5a49f27a6ef951
 configure-command = make
 configure-options = makefiles CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl-1.0:location}/include -I${cyrus-sasl:location}/include/sasl' AUXLIBS='-L${openssl-1.0:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -L${cyrus-sasl:location}/lib -lssl -lpcre -ldb -lcrypto -lsasl2 -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib'
 make-targets = non-interactive-package install_root=${:location}
 environment =
-  PATH=${patch:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${m4:location}/bin:%(PATH)s

component/postfix/noroot.patch

@@ -2,16 +2,16 @@ diff --git a/src/global/mail_params.c b/src/global/mail_params.c
 index 2d91977..0f06298 100644
 --- a/src/global/mail_params.c
 +++ b/src/global/mail_params.c
-@@ -721,7 +721,9 @@ void    mail_params_init()
+@@ -911,7 +911,9 @@ void    mail_params_init()
      check_default_privs();
      check_mail_owner();
      check_sgid_group();
 +    /*
      check_overlap();
 +    */
- #ifdef HAS_DB
      dict_db_cache_size = var_db_read_buf;
- #endif
+     dict_lmdb_map_size = var_lmdb_map_size;
+     inet_windowsize = var_inet_windowsize;
 diff --git a/src/master/master.c b/src/master/master.c
 index a9d5d1b..db88c55 100644
 --- a/src/master/master.c
@@ -29,12 +29,13 @@ index a9d5d1b..db88c55 100644
  
      /*
       * Process JCL.
-@@ -392,8 +392,10 @@ int     main(int argc, char **argv)
+@@ -433,9 +433,11 @@ int     main(int argc, char **argv)
       * all MTA processes cleanly. Give up if we can't separate from our
       * parent process. We're not supposed to blow away the parent.
       */
 +    /*
-     if (debug_me == 0 && master_detach != 0 && setsid() == -1 && getsid(0) != getpid())
+     if (init_mode == 0 && debug_me == 0 && master_detach != 0
+ 	&& setsid() == -1 && getsid(0) != getpid())
  	msg_fatal("unable to set session and process group ID: %m");
 +    */
  

component/postfix/skip-libdb-check.patch

-diff --git a/makedefs b/makedefs
-index dd5f256..e90880e 100644
---- a/makedefs
-+++ b/makedefs
-@@ -299,13 +299,13 @@ case "$SYSTEM.$RELEASE" in
- 		    elif [ -f /usr/include/db/db.h ]
- 		    then
- 			CCARGS="$CCARGS -I/usr/include/db"
--		    else
-+		    #else
- 			# No, we're not going to try db1 db2 db3 etc.
- 			# On a properly installed system, Postfix builds
- 			# by including <db.h> and by linking with -ldb
--			echo "No <db.h> include file found." 1>&2
--			echo "Install the appropriate db*-devel package first." 1>&2
--			exit 1
-+			#echo "No <db.h> include file found." 1>&2
-+			#echo "Install the appropriate db*-devel package first." 1>&2
-+			#exit 1
- 		    fi
- 		    SYSLIBS="-ldb"
- 		    ;;
-@@ -372,12 +372,12 @@ EOF
- 		    elif [ -f /usr/include/db/db.h ]
- 		    then
- 			CCARGS="$CCARGS -I/usr/include/db"
--		    else
-+		    #else
- 			# On a properly installed system, Postfix builds
- 			# by including <db.h> and by linking with -ldb
--			echo "No <db.h> include file found." 1>&2
--			echo "Install the appropriate db*-devel package first." 1>&2
--			exit 1
-+			#echo "No <db.h> include file found." 1>&2
-+			#echo "Install the appropriate db*-devel package first." 1>&2
-+			#exit 1
- 		    fi
- 		    SYSLIBS="-ldb"
- 		    ;;
-@@ -403,12 +403,12 @@ EOF
- 		    elif [ -f /usr/include/db/db.h ]
- 		    then
- 			CCARGS="$CCARGS -I/usr/include/db"
--		    else
-+		    #else
- 			# On a properly installed system, Postfix builds
- 			# by including <db.h> and by linking with -ldb
--			echo "No <db.h> include file found." 1>&2
--			echo "Install the appropriate db*-devel package first." 1>&2
--			exit 1
-+			#echo "No <db.h> include file found." 1>&2
-+			#echo "Install the appropriate db*-devel package first." 1>&2
-+			#exit 1
- 		    fi
- 		    SYSLIBS="-ldb"
- 		    ;;

component/proftpd/buildout.cfg

@@ -33,6 +33,7 @@ configure-options =
   --with-modules=mod_sftp:mod_ban
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
 environment =
+  CFLAGS=-DPR_RUN_DIR=\"/proc/self/cwd/var\"
   CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
   install_user=${proftpd-environment:USER}

component/pure-ftpd/buildout.cfg

@@ -3,8 +3,8 @@ parts = pure-ftpd
 
 [pure-ftpd]
 recipe = slapos.recipe.cmmi
-url = https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.46.tar.bz2
-md5sum = efce5529c1f0a39dafdd532c619503f1 
+url = https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.bz2
+md5sum = b7025f469711d88bd84a3518f67c1470 
 
 # See https://download.pureftpd.org/pub/pure-ftpd/doc/README for more configurations
 # We need the trick about UPLOAD_PIPE_FILE and UPLOAD_PIPE_LOCK so that the files are created inside the $CWD/var/run

component/pygolang/buildout-dev.cfg

+# SlapOS component for pygolang development.
+
+[buildout]
+extends =
+    buildout.cfg
+    ../git/buildout.cfg
+
+# override pygolang to install it from latest git version
+[pygolang]
+recipe  = zc.recipe.egg:develop
+setup   = ${pygolang-repository:location}
+
+[pygolang-repository]
+recipe  = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/pygolang.git
+branch  = master
+location = ${buildout:parts-directory}/pygolang-dev
+git-executable = ${git:location}/bin/git
+
+
+# unpin pygolang from versions, so that buildout does not fallback to
+# installing non-dev egg if dev one has changed its version.
+[versions]
+pygolang =

component/pygolang/buildout.cfg

+# SlapOS component for pygolang.
+# pygolang.nexedi.com
+
+[buildout]
+extends =
+    ../../component/cython/buildout.cfg
+
+parts =
+    pygolang
+    gpython
+
+
+# pygolang installed from released egg from pypi
+[pygolang]
+recipe  = zc.recipe.egg:custom
+egg     = pygolang
+setup-eggs =
+    ${cython:egg}
+    setuptools-dso
+    gevent
+
+# gpython program
+[gpython]
+recipe  = zc.recipe.egg:scripts
+eggs    = ${pygolang:egg}
+scripts = gpython
+# convenience for gpython users
+exe     = ${buildout:bin-directory}/gpython
+
+# python-interpreter provides python interpreter with all specified eggs.
+# eggs default to pygolang, but can be overwritten or changed in inherited section.
+# if eggs are changes, they must still have pygolang.
+[python-interpreter]
+recipe = zc.recipe.egg:scripts
+eggs   = ${pygolang:egg}
+interpreter = python
+# interpreter code that buildout generates cannot process `-m pytest --<pytest-option>`
+# -> use pymain from gpython to workaround that.
+initialization =
+  # tail to pymain
+  from gpython import pymain
+  pymain(sys.argv)
+  sys.exit(0)
+# don't install scripts from listed eggs (avoid conflict with other sections
+# that use zc.recipe.egg with eggs overlapping with ${:eggs} - ex neoppod)
+# (we cannot use zc.recipe.egg:eggs because interpreter does not work there)
+# NOTE with scripts=ø interpreter is not handled, so we use `scripts=python` as
+# a workaround.
+scripts = ${:interpreter}
+
+
+[versions]
+pygolang = 0.0.8

component/pygolang/test-py3.cfg

+# SlapOS software release to test pygolang/py3 on Nexedi testing infrastructure.
+
+[buildout]
+extends = test.cfg
+
+[python]
+part = python3

component/pygolang/test.cfg

+# SlapOS software release to test pygolang on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+    ../../stack/nxdtest.cfg
+    ../pytest/buildout.cfg
+    ../numpy/buildout.cfg
+    buildout-dev.cfg
+
+parts =
+    pygolang
+    gpython
+    pygolang-python
+
+#   for instance
+    slapos-cookbook
+    instance.cfg
+
+
+# tune pygolang to install with all and for-tests extras.
+[pygolang]
+egg = pygolang[all_test]
+
+# bin/python is preinstalled with sys.path to pygolang & friends.
+[pygolang-python]
+<= python-interpreter
+eggs = ${pygolang:egg}
+
+# env.sh for pygolang's python/gpython to be on $PATH.
+[pygolang-env.sh]
+recipe   = slapos.recipe.template:jinja2
+rendered = ${buildout:directory}/${:_buildout_section_name_}
+template = inline:
+  export PS1="(pygolang-env) $PS1"
+  export PATH=${buildout:bin-directory}:$PATH
+
+# instance to run nxdtest.
+[instance.cfg]
+<= jinja2-template
+template = inline:
+  [buildout]
+  extends = ${nxdtest-instance.cfg:rendered}
+
+  [runTestSuite]
+  env.sh  = ${pygolang-env.sh:rendered}
+  workdir = ${pygolang-repository:location}
+
+
+[versions]
+ipython = 5.10.0
+ipython-genutils = 0.2.0
+
+traitlets = 4.3.3
+simplegeneric = 0.8.1
+Pygments = 2.5.2
+prompt-toolkit = 1.0.18
+pickleshare = 0.7.5
+pexpect = 4.8.0
+backports.shutil-get-terminal-size = 1.0.0
+ptyprocess = 0.6.0

component/pypy/buildout.cfg

@@ -23,7 +23,7 @@ make-targets = python setup.py install --install-lib @@LOCATION@@
 [pypy2]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.1-src.tar.bz2
+url = https://downloads.python.org/pypy/pypy2.7-v7.3.1-src.tar.bz2
 md5sum = 7608bd58940ffc5403632c2c786d83bb
 configure-command =
   sed -i '/"_tkinter":/s/^/#/' lib_pypy/tools/build_cffi_imports.py

component/pytest/buildout.cfg

+# SlapOS component for pytest.
+# https://pytest.org
+
+[buildout]
+parts = pytest/scripts
+
+[pytest]
+recipe  = zc.recipe.egg:eggs
+eggs    = pytest
+
+[pytest/scripts]
+recipe  = zc.recipe.egg:scripts
+eggs    = ${pytest:eggs}
+
+
+[versions]
+pytest  = 4.6.11

component/qemu-kvm/buildout.cfg

@@ -72,8 +72,8 @@ md5sum = 6097fdb9cbab47c96471274b9044e983
 # XXX: This is not the latest version because
 #      Debian does not provide a stable URL for it.
 <= debian-amd64-netinst-base
-version = 10.4.0
-md5sum = e2ddc8268e4c164c32b4ba25be52c9af
+version = 10.5.0
+md5sum = a3ebc76aec372808ad80000108a2593a
 
 [debian-amd64-testing-netinst.iso]
 <= debian-amd64-netinst-base

component/quickjs/buildout.cfg

+[buildout]
+extends =
+  ../xz-utils/buildout.cfg
+parts = quickjs
+
+[quickjs]
+recipe = slapos.recipe.cmmi
+configure-command = true
+url = https://bellard.org/quickjs/quickjs-2020-09-06.tar.xz
+md5sum = 47cb6def3263d6a631b647b268b1c554
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/rust/buildout.cfg

+[buildout]
+extends =
+    ../llvm/buildout.cfg
+    ../openssl/buildout.cfg
+    ../pkgconfig/buildout.cfg
+
+parts = rustc
+
+[rustc]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://static.rust-lang.org/dist/rustc-1.47.0-src.tar.gz
+md5sum = a460bed79b92f6a7833ba6e6390ee6ae
+# --sysconfdir is a workaround for https://github.com/rust-lang/rust/issues/63915
+configure-options =
+    --enable-extended
+    --llvm-config=${llvm:location}/bin/llvm-config
+    --sysconfdir=@@LOCATION@@/etc
+environment =
+    PATH=${curl:location}/bin/:${git:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+    PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
+    RUSTFLAGS=-C link-arg=-Wl,-rpath=${openssl:location}/lib -C link-arg=-L${libxml2:location}/lib -C link-arg=-L${ncurses:location}/lib -C link-arg=-L${zlib:location}/lib -C link-arg=-Wl,-rpath=${libxml2:location}/lib -C link-arg=-Wl,-rpath=${ncurses:location}/lib -C link-arg=-Wl,-rpath=${zlib:location}/lib

component/snappy/buildout.cfg

@@ -9,10 +9,8 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://github.com/google/snappy/archive/1.1.8.tar.gz
 md5sum = 70e48cba7fecf289153d009791c9977f
-location = @@LOCATION@@
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
-  -DCMAKE_INSTALL_PREFIX=${:location}
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
   -DBUILD_SHARED_LIBS=ON
-environment =
-  CMAKE_PROGRAM_PATH=${cmake:location}/bin

component/socat/buildout.cfg

@@ -7,6 +7,7 @@ parts =
 
 [socat]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.dest-unreach.org/socat/download/socat-${:version}.tar.gz
 version = 1.7.3.2
 md5sum = aec3154f7854580cfab0c2d81e910519

component/srslte/buildout.cfg

@@ -15,28 +15,22 @@ parts =
 recipe = slapos.recipe.cmmi
 url = https://github.com/srsLTE/srsLTE/archive/release_18_09.zip
 md5sum = d9007ff9bd03ba67c6ed8acfd9bf2a7a 
-pre-configure = 
-  mkdir -p build
-configure-command = cd build && ${cmake:location}/bin/cmake ../  
-
-make-binary =
-make-targets= cd build &&
-    make DESTDIR=@@LOCATION@@ -j1 install
-
-
+configure-command = cmake
 configure-options =
+  -Bbuild
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
   -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
   -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}"
   -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}
   -DCMAKE_INCLUDE_PATH=${mbedtls:location}/include
   -DCMAKE_LIBRARY_PATH=${mbedtls:location}/lib
+make-options = -C build
 
 CMAKE_CFLAGS = -I${bzip2:location}/include -I${fftw3:location}/include -I${mbedtls:location}/include -I${lksctp-tools:location}/include -I${libconfig:location}/include -I${boost-lib:location}/include 
 CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${mbedtls:location}/lib:${lksctp-tools:location}/lib:${libconfig:location}/lib:${boost-lib:location}/lib:${fftw3:location}/lib
 
 environment =
   CMAKE_INSTALL_PREFIX=${buildout:directory}/bin
-  CMAKE_PROGRAM_PATH=${cmake:location}/bin
   CMAKE_INCLUDE_PATH=${bzip2:location}/include:${mbedtls:location}/include:${lksctp-tools:location}/include:${libconfig:location}/include:${boost-lib:location}/include:${fftw3:location}/include
   CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
   CPPFLAGS=${:CMAKE_CFLAGS}

component/tomcat/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 <= tomcat9
 
 [tomcat7]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 ignore-existing = true
 strip-top-level-dir = true
 url = https://archive.apache.org/dist/tomcat/tomcat-7/v${:version}/bin/apache-tomcat-${:version}.tar.gz
@@ -18,7 +18,7 @@ version = 7.0.100
 md5sum = 79be4ba5a6e770730a4be3d5cb3c7862
 
 [tomcat9]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 ignore-existing = true
 strip-top-level-dir = true
 url = https://archive.apache.org/dist/tomcat/tomcat-9/v${:version}/bin/apache-tomcat-${:version}.tar.gz

component/trafficserver/buildout.cfg

 [buildout]
 extends =
+  ../defaults.cfg
   ../libtool/buildout.cfg
   ../libxml2/buildout.cfg
   ../make/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
@@ -14,11 +16,19 @@ extends =
 parts =
   trafficserver
 
+[gcc]
+# For ATS v8.0.0 and later, a compiler with support for C++17 is required.
+# https://cwiki.apache.org/confluence/display/TS/Building
+min_version = 8
+
 [trafficserver]
 recipe = slapos.recipe.cmmi
-url = http://apache.claz.org/trafficserver/trafficserver-7.1.11.tar.bz2
-md5sum = 74e8c1e2d7cdc0b97420d8b813321258
+url = http://apache.claz.org/trafficserver/trafficserver-8.1.1.tar.bz2
+md5sum = 4f4d1e7de19c77157be0c2a825b31026
 shared = true
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/trafficserver-8.1-stale-negative-cache-not-returnable.patch#e1a2f8a23f00cee1301ccf1a84e46763
 configure-options =
   --with-openssl=${openssl:location}
   --with-pcre=${pcre:location}
@@ -31,8 +41,9 @@ configure-options =
   --enable-experimental-plugins
   --disable-posix-cap
 environment =
-  PATH=${libtool:location}/bin:${make:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${libtool:location}/bin:${make:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+
 make-target =
   check
   install

component/trafficserver/trafficserver-8.1-stale-negative-cache-not-returnable.patch

+--- trafficserver-8.1.1/proxy/http/HttpTransact.cc.orig	2020-12-01 00:30:26.000000000 +0100
++++ trafficserver-8.1.1/proxy/http/HttpTransact.cc	2021-01-11 11:35:41.946893735 +0100
+@@ -5752,6 +5752,7 @@
+ HttpTransact::is_stale_cache_response_returnable(State *s)
+ {
+   HTTPHdr *cached_response = s->cache_info.object_read->response_get();
++  HTTPStatus cache_response_code = cached_response->status_get();
+ 
+   // First check if client allows cached response
+   // Note does_client_permit_lookup was set to
+@@ -5760,6 +5761,12 @@
+   if (!s->cache_info.directives.does_client_permit_lookup) {
+     return false;
+   }
++  // We don't serve stale negative cache.
++  if (cache_response_code == HTTP_STATUS_INTERNAL_SERVER_ERROR || cache_response_code == HTTP_STATUS_GATEWAY_TIMEOUT ||
++      cache_response_code == HTTP_STATUS_BAD_GATEWAY || cache_response_code == HTTP_STATUS_SERVICE_UNAVAILABLE) {
++    TxnDebug("http_trans", "[is_stale_cache_response_returnable] stale negative cache");
++    return false;
++  }
+   // Spec says that we can not serve a stale document with a
+   //   "must-revalidate header"
+   // How about "s-maxage" and "no-cache" directives?

component/userhosts/buildout.cfg

@@ -2,7 +2,8 @@
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://lab.nexedi.com/nexedi/userhosts/repository/${:revision}/archive.tar.gz
-revision = 1d3b463e7856db6e674a06258c0840206e6a7b72
+revision = a05fe5a3a5cb7005351ef4ec41460089f3ce4d0a
+md5sum = 5a80b4d962d975f290a60cf790c3334d
 configure-command = true
 make-options = PREFIX=@@LOCATION@@
 make-targets = check install

component/wendelin.core/buildout.cfg

+# SlapOS component for wendelin.core
+
 [buildout]
-extends = ../git/buildout.cfg
+extends =
+  ../pygolang/buildout.cfg
+  ../numpy/buildout.cfg
+  ../git/buildout.cfg
+
 parts =
   wendelin.core
 
 
-# wendelin.core installed from released egg from pypi
+# wendelin.core is installed from git checkout
 [wendelin.core]
-recipe = zc.recipe.egg:custom
+recipe = zc.recipe.egg:develop
+setup = ${wendelin.core-repository:location}
 egg = wendelin.core
+setup-eggs =
+    ${pygolang:egg}[pyx.build]
+environment = wendelin.core-env
 
+# dependent eggs that must come through in-tree recipes
+depends =
+    ${numpy:egg}
 
-# wendelin.core installed from latest git version
-[wendelin.core-dev]
-recipe = zc.recipe.egg:develop
-egg = wendelin.core
-setup = ${wendelin.core-repository:location}
-environment = wendelin.core-dev-env
 
-[wendelin.core-dev-env]
-# wendelin.core-dev needs git to build
+[wendelin.core-env]
+# wendelin.core needs git(dev) to build
 PATH = ${git:location}/bin:%(PATH)s
 
 
 [wendelin.core-repository]
 recipe  = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/wendelin.core.git
-# dir is pretty name as top-level -dev recipe
-location = ${buildout:parts-directory}/wendelin.core-dev
+branch   = master
+revision = v0.13-0-gb26ba55
+# dir is pretty name as top-level recipe
+location = ${buildout:parts-directory}/wendelin.core
 git-executable = ${git:location}/bin/git

component/wendelin.core/test-common.cfg

+# SlapOS software release to test wendelin.core on Nexedi testing infrastructure.
+# Common parts.
+
+[buildout]
+extends =
+# test*.cfg first extend from neoppod/software<ZODB-flavour>.cfg to use
+# appropriate ZODB and versions of other components.
+
+    ../pytest/buildout.cfg
+    ../gdb/buildout.cfg
+    ../../stack/nxdtest.cfg
+    buildout.cfg
+
+parts =
+# keep neoppod first and in parts so that ZODB is built correctly
+    neoppod
+
+    wendelin.core
+
+#   for instance
+    wendelin.core-python
+    slapos-cookbook
+    instance.cfg
+
+
+# bin/python s python interpreter with wendelin.core and all other eggs.
+[wendelin.core-python]
+<= python-interpreter
+eggs =
+    wendelin.core[test]
+    pygolang[pyx.build]
+    neoppod[tests]
+    ZEO[test]
+
+# env.sh for that python to be on $PATH
+[wendelin.core-env.sh]
+recipe   = slapos.recipe.template:jinja2
+rendered = ${buildout:directory}/${:_buildout_section_name_}
+template = inline:
+  export PS1="(wendelin.core-env) $PS1"
+  export PATH=${buildout:bin-directory}:${gdb:location}/bin:$PATH
+
+# instance to run nxdtest.
+[instance.cfg]
+<= jinja2-template
+template = inline:
+  [buildout]
+  extends = ${nxdtest-instance.cfg:rendered}
+
+  [runTestSuite]
+  env.sh  = ${wendelin.core-env.sh:rendered}
+  workdir = ${wendelin.core-repository:location}
+
+
+[versions]
+neoppod = 1.12.0
+
+zope.testrunner = 5.2
+random2 = 1.0.1
+manuel = 1.10.1

component/wendelin.core/test-zodb5.cfg

+# SlapOS software release to test wendelin.core/ZODB5 on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+    ../../stack/erp5/buildout.cfg
+    ../../software/neoppod/software-zodb5.cfg
+    test-common.cfg

component/wendelin.core/test.cfg

+# SlapOS software release to test wendelin.core on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+    ../../stack/erp5/buildout.cfg
+    ../../software/neoppod/software.cfg
+    test-common.cfg

component/yaml-cpp/buildout.cfg

@@ -10,11 +10,9 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.3.tar.gz
 md5sum = b45bf1089a382e81f6b661062c10d0c2
-location = @@LOCATION@@
-configure-command =
-  mkdir build && cd build && \
-  ${cmake:location}/bin/cmake \
-    -DYAML_BUILD_SHARED_LIBS=ON \
-    -DCMAKE_INSTALL_PREFIX=${:location} \
-    ..
+configure-command = ${cmake:location}/bin/cmake
+configure-options =
+    -Bbuild
+    -DYAML_BUILD_SHARED_LIBS=ON
+    -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
 make-options = -C build

component/zbar/buildout.cfg

@@ -5,8 +5,10 @@ parts=
 [zbar]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://jaist.dl.sourceforge.net/project/zbar/zbar/0.10/zbar-0.10.tar.bz2
-md5sum = 0fd61eb590ac1bab62a77913c8b086a5
+url = https://github.com/mchehab/zbar/archive/0.23.1.tar.gz
+md5sum = 04f1ffafd0f12473d82763931d9c7c68
+pre-configure =
+  autoreconf -vfi -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal
 configure-options = 
   --disable-video
   --without-imagemagick
@@ -17,4 +19,5 @@ configure-options =
   --without-x
   --without-jpg
 environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${gettext:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
   CFLAGS=

component/zodbtools/buildout-dev.cfg

+# SlapOS component for zodbtools development.
+
+[buildout]
+extends =
+    buildout.cfg
+    ../git/buildout.cfg
+
+# override zodbtools to install it from latest git version
+[zodbtools]
+recipe  = zc.recipe.egg:develop
+setup   = ${zodbtools-repository:location}
+
+[zodbtools-repository]
+recipe  = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/zodbtools.git
+branch  = master
+location = ${buildout:parts-directory}/zodbtools-dev
+git-executable = ${git:location}/bin/git
+
+
+# unpin zodbtools from versions, so that buildout does not fallback to
+# installing non-dev egg if dev one has changed its version.
+[versions]
+zodbtools =

component/zodbtools/buildout.cfg

+# SlapOS component for zodbtools.
+# https://lab.nexedi.com/nexedi/zodbtools
+
+[buildout]
+extends =
+    ../pygolang/buildout.cfg
+    ../ZEO/buildout.cfg
+
+parts =
+    zodbtools/scripts
+
+
+[zodbtools]
+recipe  = zc.recipe.egg:eggs
+egg     = zodbtools
+eggs    =
+    ${:egg}
+
+# dependent eggs that must come through in-tree recipes
+depends =
+    ${pygolang:egg}
+# ZEO comes through zodbtools -> zodburi -> ZEO
+    ${ZEO:egg}
+
+[zodbtools/scripts]
+recipe  = zc.recipe.egg:scripts
+eggs    = ${zodbtools:eggs}
+
+
+[versions]
+zodbtools = 0.0.0.dev8

component/zodbtools/test-common.cfg

+# SlapOS software release to test zodbtools on Nexedi testing infrastructure.
+# Common parts.
+
+[buildout]
+extends =
+# test*.cfg first extend from neoppod/software<ZODB-flabour>.cfg to use
+# appropriate ZODB and versions of other components.
+
+    ../../stack/nxdtest.cfg
+    ../pytest/buildout.cfg
+    buildout-dev.cfg
+
+parts =
+    zodbtools
+
+#   for instance
+    zodbtools-python
+    slapos-cookbook
+    instance.cfg
+
+
+# bin/python is preinstalled with sys.path to zodbtools & friends.
+[zodbtools-python]
+<= python-interpreter
+eggs = zodbtools[test]
+
+# env.sh for zodbtools's python to be on $PATH.
+[zodbtools-env.sh]
+recipe   = slapos.recipe.template:jinja2
+rendered = ${buildout:directory}/${:_buildout_section_name_}
+template = inline:
+  export PS1="(zodbtools-env) $PS1"
+  export PATH=${buildout:bin-directory}:$PATH
+
+# instance to run nxdtest.
+[instance.cfg]
+<= jinja2-template
+template = inline:
+  [buildout]
+  extends = ${nxdtest-instance.cfg:rendered}
+
+  [runTestSuite]
+  env.sh  = ${zodbtools-env.sh:rendered}
+  workdir = ${zodbtools-repository:location}
+
+
+[versions]
+freezegun = 1.0.0

component/zodbtools/test-zodb5.cfg

+# SlapOS software release to test zodbtools/ZODB5 on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+    ../../software/neoppod/software-zodb5.cfg
+    test-common.cfg

component/zodbtools/test.cfg

+# SlapOS software release to test zodbtools on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+    ../../software/neoppod/software.cfg
+    test-common.cfg

package.json

 {
   "dependencies": {
-    "eclint": "^2.8.1",
     "husky": "^1.1.2",
     "lint-staged": "^7.3.0"
   },
   "lint-staged": {
-    "*": [
-      "eclint fix",
-      "git add"
-    ],
     "*.json": [
       "python2 ./format-json",
       "git add"
     ],
-    "{components,software,stack}/**": [
+    "{component,software,stack}/**": [
       "python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"python2\", \"./update-hash\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'",
       "python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"git\", \"add\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'"
     ]

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.152'
+version = '1.0.171'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 
@@ -116,8 +116,6 @@ setup(name=name,
           'ipv6toipv4 = slapos.recipe.6tunnel:SixToFour',
           'jsondump = slapos.recipe.jsondump:Recipe',
           'kvm.frontend = slapos.recipe.kvm_frontend:Recipe',
-          'libcloud = slapos.recipe.libcloud:Recipe',
-          'libcloudrequest = slapos.recipe.libcloudrequest:Recipe',
           'logrotate = slapos.recipe.logrotate:Recipe',
           'logrotate.d = slapos.recipe.logrotate:Part',
           'mkdirectory = slapos.recipe.mkdirectory:Recipe',
@@ -159,7 +157,6 @@ setup(name=name,
           'signalwrapper= slapos.recipe.signal_wrapper:Recipe',
           'simplelogger = slapos.recipe.simplelogger:Recipe',
           'simplehttpserver = slapos.recipe.simplehttpserver:Recipe',
-          'siptester = slapos.recipe.siptester:SipTesterRecipe',
           'slapconfiguration = slapos.recipe.slapconfiguration:Recipe',
           'slapconfiguration.serialised = slapos.recipe.slapconfiguration:Serialised',
           'slapconfiguration.jsondump = slapos.recipe.slapconfiguration:JsonDump',

slapos/recipe/README.generic_varnish.rst

@@ -7,7 +7,7 @@ set up.
 How to Use generic_varnish ?
 ============================
 
-On slap console, you can instanciate varnish like this::
+On slap console, you can instantiate varnish like this::
   
   instance = request(
     software_type='varnish',

slapos/recipe/README.libcloud.rst

-libcloud
-========
-
-Slapified recipe to interact with any libcloud supported IaaS system

slapos/recipe/erp5testnode/__init__.py

@@ -36,7 +36,7 @@ class Recipe(GenericBaseRecipe):
     self.path_list = []
     options = self.options.copy()
     del options['recipe']
-    CONFIG = {k.replace('-', '_'): v for k, v in options.iteritems()}
+    CONFIG = {k.replace('-', '_'): v for k, v in options.items()}
     CONFIG['PATH'] = os.environ['PATH']
 
     if self.options['instance-dict']:
@@ -44,7 +44,7 @@ class Recipe(GenericBaseRecipe):
       config_instance_dict.add_section('instance_dict')
       instance_dict = json.loads(self.options['instance-dict'])
 
-      for k ,v in instance_dict.iteritems():
+      for k ,v in instance_dict.items():
         config_instance_dict.set('instance_dict', k, v)
       value = io.StringIO()
       config_instance_dict.write(value)
@@ -58,7 +58,6 @@ class Recipe(GenericBaseRecipe):
           "\npath_list = %s" % ",".join(software_path_list) 
     CONFIG['computer_id'] = self.buildout['slap-connection']['computer-id']
     CONFIG['server_url'] = self.buildout['slap-connection']['server-url']
-    CONFIG['frontend_url'] = self.buildout['testnode-frontend']['connection-secure_access']
     configuration_file = self.createFile(
       self.options['configuration-file'],
       self.substituteTemplate(

slapos/recipe/erp5testnode/template/erp5testnode.cfg.in

@@ -20,6 +20,7 @@ httpd_software_access_port = %(httpd_software_access_port)s
 computer_id = %(computer_id)s
 server_url = %(server_url)s
 frontend_url = %(frontend_url)s
+log_frontend_url = %(log_frontend_url)s
 keep_log_days = %(keep_log_days)s
 
 # Binaries

slapos/recipe/libcloud/__init__.py

-from slapos.recipe.librecipe import BaseSlapRecipe
-import os
-import sys
-import zc.buildout
-import zc.recipe.egg
-from slapos.slap.slap import ServerError
-from slapos.tool.cloudmgr.cloudinterface import NodeInterface
-from pprint import pformat
-class SlavePartitionError(Exception):
-  pass
-
-class Recipe(BaseSlapRecipe):
-  SECURITY_GROUP_NAME = 'VifibEC2Security'
-  def __init__(self, buildout, name, options):
-    BaseSlapRecipe.__init__(self, buildout, name, options)
-    self.destroy_wrapper_location = os.path.join(self.bin_directory, 'destroy')
-    self.running_wrapper_location = os.path.join(self.bin_directory, 'run')
-
-    # wrapper parts
-    options['scripts'] = '''
-      run
-      destroy
-    '''
-    options['entry-points'] = '''
-      run=slapos.recipe.libcloud.run:run
-      destroy=slapos.recipe.libcloud.destroy:destroy
-    '''
-    self.egg = zc.recipe.egg.Egg(buildout, '', options)
-
-    self.configuration_file = os.path.join(self.etc_directory, 'cloudmgr.cnf')
-
-  def _loadSecretAndKey(self):
-    """Loads security parameters for connection"""
-    self.secret = open(os.path.join(self.work_directory, 'secret.txt')
-        ).read().strip()
-    self.key = open(os.path.join(self.work_directory, 'key.txt')
-        ).read().strip()
-
-  def _updateConfigurationFile(self):
-    configuration_dict = dict(
-      key=self.key,
-      secret=self.secret,
-      node_list=self.slave_partition_configuration_dict_list
-    )
-    self._writeFile(self.configuration_file, pformat(configuration_dict))
-
-  def _install(self):
-    """libcloud compatible machine is installed by creating wrapper, which
-    will run succesfully as long as the machine is available.
-    """
-    self._loadSecretAndKey()
-    self.slave_partition_configuration_dict_list = []
-    self.egg.extra_paths = sys.path
-    for slave_partition in [self.slap.registerComputerPartition(
-      self.computer_id, slave_id) for slave_id in self.computer_partition\
-          .getInstanceParameterDict()['slave_id_list']]:
-      try:
-        self.slave_partition_configuration_dict_list.append(
-            self._installSlavePartition(slave_partition))
-      except SlavePartitionError as e:
-        self.logger.warning('Slave Parttion %r not installed, issue: %r'%(
-          slave_partition.getId(), e))
-    # Installs wrappers
-    self._updateConfigurationFile()
-    self.options['arguments'] = "server_binary = %r, configuration_file = %r"%(
-        self.options['server_binary'], self.configuration_file)
-    self.egg.install()
-    os.chmod(os.path.join(
-      self.running_wrapper_location), int('0700', 8))
-    os.chmod(os.path.join(
-      self.destroy_wrapper_location), int('0700', 8))
-    return []
-
-  def _installSlavePartition(self, slave_partition):
-    requested_dict = slave_partition.getInstanceParameterDict()
-    requested_dict.setdefault('service', 'EC2_EU_WEST')
-    requested_dict.setdefault('location', '0')
-    requested_dict.setdefault('image', 'ami-05cae171')
-    requested_dict.setdefault('size', 'm1.smal')
-    requested_dict.setdefault('security_group', 'VifibEC2Security')
-    connection_dict = slave_partition.getConnectionDict()
-    node_kw = dict(
-      key = self.key,
-      secret = self.secret,
-      service = requested_dict['service'],
-      location = requested_dict['location'],
-      node_uuid = connection_dict.get('node_uuid', None),
-      ssh_key = connection_dict.get('ssh_key', None)
-    )
-    node = NodeInterface(**node_kw)
-    update_kw = dict(
-      image = requested_dict['image'],
-      size = requested_dict['size'],
-      security_group = requested_dict['security_group'],
-    )
-    self.logger.info('Updating %r' % slave_partition.getId())
-    connection_dict.update(node.update(**update_kw))
-    self.logger.info('Fetching public ip of %r' % slave_partition.getId())
-    connection_dict.update(node.getPublicIpList())
-    slave_partition.available()
-    connection_dict.setdefault('username', 'root')
-    slave_partition.setConnectionDict(connection_dict)
-    requested_dict.update(connection_dict)
-    slave_partition_state = slave_partition.getState()
-    # as cloudmgr is not related with slap and runs as async process to recipe
-    # assume that whatever came from slave is correctly done
-    if slave_partition_state in ['started', 'stopped']:
-      # stopped cannot be supported, because in case of libcloud it is equal
-      # to destroyed
-      # even worse: stopped is the first state for installed partition
-      try:
-        getattr(slave_partition, slave_partition_state)()
-      except ServerError:
-        # Recipe is becoming responsible for system state, so it have to
-        # not die in case of slap server error
-        pass
-      requested_dict['requested_state'] = 'started'
-    elif slave_partition_state == 'destroyed':
-      requested_dict['requested_state'] = slave_partition_state
-      try:
-        slave_partition.destroyed()
-      except ServerError:
-        # Recipe is becoming responsible for system state, so it have to
-        # not die in case of slap server error
-        pass
-    return requested_dict
-

slapos/recipe/libcloud/run.py

-from os import execl
-import sys
-
-def run(server_binary, configuration_file):
-  sys.stdout.flush()
-  execl(server_binary, server_binary, configuration_file)

slapos/recipe/libcloud/template/cloudmgr.cnf.in

-

slapos/recipe/libcloudrequest.py

-from slapos.recipe.librecipe import BaseSlapRecipe
-import zc.buildout
-class Recipe(BaseSlapRecipe):
-  def _install(self):
-    amazon = self.request(
-        'https://svn.erp5.org/repos/public/slapos/trunk/software_release/libcloud/software.cfg',
-        'Amazon EC Image',
-        'Amazon EC Connector Partition',
-        True)
-    amazon_dict = amazon.getConnectionDict()
-    if amazon_dict == {}:
-      raise zc.buildout.UserError('Slave not installed yet')
-    self.computer_partition.setConnectionDict(amazon.getConnectionDict())
-    return []

slapos/recipe/siptester/__init__.py

-import os
-import pkg_resources
-from slapos.recipe.librecipe import BaseSlapRecipe
-
-class SipTesterRecipe(BaseSlapRecipe):
-  def __init__(self, buildout, name, options):
-    BaseSlapRecipe.__init__(self, buildout, name, options)
-    self.pjsua_configuration_file = os.path.join(self.etc_directory,
-                                                 'pjsua.conf')
-
-  def _createPJSUAConfiguration(self, template_name):
-    pjsua_input = pkg_resources.resource_string(__name__, os.path.join(
-                                                  'template', template_name))
-    if self._writeFile(self.pjsua_configuration_file,
-                       pjsua_input % self.options):
-      # XXX: How to inform slap/slapgrid that something changed and it might
-      #      be not bad idea to restart CP?
-      pass
-    return self.pjsua_configuration_file
-
-  def _install(self):
-    path = self._createPJSUAConfiguration(self.config_template)
-
-    d = {}
-    d.update(self.options)
-    d['pjsua_configuration_file'] = self.pjsua_configuration_file
-    # XXX Hardcoded path
-    d['pjsua_binary'] = os.path.join(self.buildout['software_definition'
-          ]['software_home'].strip(), 'parts', 'pjproject-1.7', 'bin', 'pjsua')
-    d['siptester_binary'] = os.path.join(self.buildout['software_definition'
-          ]['software_home'].strip(), 'bin', 'siptester')
-    self.running_wrapper_location = pkg_resources.resource_filename(__name__, os.path.join(
-                                                  'template',
-                                                  self.wrapper_template))
-    self._createRunningWrapper(d)
-    return [path, wrapper_path]
-
-  update = install
-
-class ReceiverRecipe(SipTesterRecipe):
-  config_template = "pjsua_receiver.conf.in"
-  wrapper_template = "init_receiver.in"
-
-class CallerRecipe(SipTesterRecipe):
-  config_template = "pjsua_caller.conf.in"
-  wrapper_template = "init_caller.in"
-
-  def _install(self):
-    # First of all, ask for a sipreceiver
-    self.request(self.software_release_url, 'sipreceiver')
-    return SipTesterRecipe._install(self)

slapos/recipe/siptester/template/init_caller.in

-#!/bin/sh
-# BEWARE: This file is operated by slapgrid
-# BEWARE: It will be overwritten automatically
-exec %(siptester_binary)s %(pjsua_binary)s %(pjsua_configuration_file)s %(caller_destination)s

slapos/recipe/siptester/template/init_receiver.in

-#!/bin/sh
-# BEWARE: This file is operated by slapgrid
-# BEWARE: It will be overwritten automatically
-exec %(siptester_binary)s %(pjsua_binary)s %(pjsua_configuration_file)s

slapos/recipe/siptester/template/pjsua_caller.conf.in

-#
-# Logging options:
-#
---log-level 0
---app-log-level 0
-
-#
-# Account 0:
-#
---id %(caller_id)s
---registrar  %(caller_registrar)s
---realm %(caller_realm)s
---username %(caller_username)s
---password %(caller_password)s
-
---reg-timeout 300
-#
-# Network settings:
-#
---local-port 5060
-
-#
-# Media settings:
-#
---null-audio
---playback-lat 100
---rtp-port 4000
-
-#
-# User agent:
-#
---max-calls 4
---duration 300

slapos/recipe/siptester/template/pjsua_receiver.conf.in

-#
-# Logging options:
-#
---log-level 0
---app-log-level 0
-
-#
-# Account 0:
-#
---id %(receiver_id)s
---registrar %(receiver_registrar)s
---realm %(receiver_realm)s
---username %(receiver_username)s
---password %(receiver_password)s
---reg-timeout 300
-
-#
-# Network settings:
-#
---local-port 5060
-
-#
-# Media settings:
-#
---null-audio
---auto-play
---play-file %(wav_path)s
---playback-lat 100
---rtp-port 4000
-
-#
-# User agent:
-#
---auto-answer 200
---max-calls 4

slapos/recipe/switch_softwaretype.py

@@ -25,8 +25,45 @@
 #
 ##############################################################################
 
-import os, subprocess, sys
-import six
+
+from zc.buildout.buildout import Buildout
+
+
+class SubBuildout(Buildout):
+  """Run buildout in buildout, partially copied from infrae.buildout
+  """
+  def __init__(self, main_buildout, config, options, **kwargs):
+    # Use same logger
+    self._logger = main_buildout._logger
+    self._log_level = main_buildout._log_level
+
+    # Use same options
+    for opt in (
+        'offline',
+        'verbosity',
+        'newest',
+        'directory',
+        'eggs-directory',
+        'develop-eggs-directory',
+    ):
+      if opt in main_buildout['buildout']:
+        options.append((
+            'buildout',
+            opt,
+            main_buildout['buildout'][opt],
+        ))
+    # Use same slap connection
+    for k, v in main_buildout["slap-connection"].items():
+      options.append(('slap-connection', k, v))
+
+    Buildout.__init__(self, config, options, **kwargs)
+
+  def _setup_logging(self):
+    """We don't want to setup any logging, since it's already done
+    by the main buildout.
+    """
+    pass
+
 
 class Recipe:
 
@@ -39,26 +76,23 @@ class Recipe:
     self.base = self.buildout[section][key]
 
   def install(self):
-    # XXX-Antoine: We gotta find a better way to do this. I tried to check
-    # out how slapgrid-cp was running buildout. But it is worse than that.
-    args = sys.argv[:]
-    for x in six.iteritems(self.buildout["slap-connection"]):
-      args.append("slap-connection:%s=%s" % x)
-    for x in "directory", "eggs-directory", "develop-eggs-directory":
-      args.append("buildout:%s=%s" % (x, self.buildout["buildout"][x]))
-    args.append("buildout:installed=.installed-%s.cfg" % self.name)
-    # Options.get (from zc.buildout) should deserialize.
+    options = [("buildout", "installed", ".installed-%s.cfg" % self.name)]
+    profile = self.base
     try:
-      override = self.options["override"][self.software_type]
+      # XXX this assume using slapos.buildout, which serializes arbitrary python objects for options
+      extended_profile = self.options["override"][self.software_type]
     except (KeyError, TypeError):
-      buildout = self.base
+      pass
     else:
-      # unfortunately, buildout:extends does not work when given at command line
-      buildout = os.path.join(self.buildout["buildout"]["parts-directory"],
-                              self.name + ".cfg")
-      with open(override) as src, open(buildout, "w", 0) as dst:
-        dst.write("[buildout]\nextends = %s\n\n" % self.base + src.read())
-    subprocess.check_call(args + ["-oc", buildout])
-    return []
+      options.append(["buildout", "extends", profile])
+      profile = extended_profile
+
+    sub_buildout = SubBuildout(
+        self.buildout,
+        profile,
+        options,
+    )
+
+    sub_buildout.install([])
 
   update = install