Merge remote-tracking branch 'aurel/py2zope4' into py3zope4

component/ZEO/buildout.cfg

+# SlapOS component for ZEO.
+# https://zeo.readthedocs.io/
+
+[buildout]
+extends =
+    ../ZODB/buildout.cfg
+    ../git/buildout.cfg
+
+parts = ZEO/scripts
+
+
+# ZEO provides ZEO<X> depending on ZODB major version.
+#
+# - ZEO4 works only with ZODB4
+#   https://github.com/zopefoundation/ZEO/blob/4.3.1-1-g47d3fbe8/setup.py#L122
+# - ZEO5 works only with ZODB5
+#   https://github.com/zopefoundation/ZEO/blob/5.2.2-1-g3d90ed42/setup.py#L20
+[ZEO]
+recipe  = slapos.recipe.build
+depends = ${ZODB:egg}
+init =
+  # link/depend to ZEO<ZODB.major>
+  zodb = self.buildout['ZODB']
+  zmajor = zodb['major']
+  zeo_x = self.buildout['ZEO'+zmajor]
+  options['depends'] += '$${%s:egg}' % zeo_x.name
+  options['egg'] = zeo_x['egg']
+
+  # update [versions] from what is needed by ZEO<X>
+  self.buildout.parse('[_ZEO-versions]\n' + zeo_x['egg-versions'])
+  versions = self.buildout['versions']
+  versions.update(self.buildout['_ZEO-versions'])
+  # propagate updated [versions] -> easy_install
+  # (buildout does this in Buildout constructor)
+  import zc.buildout.easy_install
+  zc.buildout.easy_install.default_versions(versions)
+
+
+# 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
+egg-versions =
+
+[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}
+
+egg-versions =
+  ZEO = 5.2.2
+  trollius = 2.2.post1
+  futures = 3.2.0
+
+
+# ZEO4-wc2 is ZEO4 version with patches for wendelin.core 2 to work correctly.
+# The patches are backports of what is in ZEO master (ZEO5), but since upstream
+# considers 4 branch to be "dead", we have to maintain it by ourselves.
+# See https://github.com/zopefoundation/ZEO/pull/161 for the reference.
+[ZEO4-wc2]
+<= ZEO4
+revisions = bf80d23d3506
+location = ${buildout:parts-directory}/ZEO4-wc2

component/ZODB/buildout.cfg

+# SlapOS component for ZODB.
+# https://zodb.org/
+
+[buildout]
+extends =
+    ../git/buildout.cfg
+    ../python-cffi/buildout.cfg
+
+parts = ZODB/scripts
+
+
+# ZODB allows to use either ZODB4, ZODB4-wc2 or ZODB5.
+# To select which version to use users should do:
+#
+#   [ZODB]
+#   major = <ZODB-version-major>
+#
+# By default ZODB4 is used.
+[ZODB]
+recipe = slapos.recipe.build
+major  = 4
+init =
+  # link/depend ZODB -> ZODB<X>
+  zodb_x = 'ZODB'+options['major']
+  zodb_x = self.buildout[zodb_x]
+  options['depends'] = '$${%s:egg}' % zodb_x.name
+
+  options['egg'] = zodb_x['egg']
+
+  # update [versions] from what is needed by ZODB<X>
+  self.buildout.parse('[_ZODB-versions]\n' + zodb_x['egg-versions'])
+  versions = self.buildout['versions']
+  versions.update(self.buildout['_ZODB-versions'])
+  # propagate updated [versions] -> easy_install
+  # (buildout does this in Buildout constructor)
+  import zc.buildout.easy_install
+  zc.buildout.easy_install.default_versions(versions)
+
+
+# ZODB/scripts installs scripts from ZODB
+[ZODB/scripts]
+recipe  = zc.recipe.egg:scripts
+eggs    = ${ZODB:egg}
+
+# ZODB4 and ZODB5 are plain upstream eggs
+[_ZODB]
+recipe  = zc.recipe.egg:eggs
+egg     = ZODB
+eggs    = ${:egg}
+depends = ${persistent:egg} ${BTrees:egg}
+
+[ZODB4]
+<= _ZODB
+egg-versions =
+  ZODB = 4.4.5
+  transaction = 1.7.0
+
+[ZODB5]
+<= _ZODB
+egg-versions =
+  ZODB = 5.6.0
+  transaction = 2.4.0
+
+
+# ZODB4-wc2 is ZODB4 version with patches for wendelin.core 2 to work correctly.
+# The main change is backport of the way MVCC is handled by always calling
+# loadBefore instead of load.
+# See https://lab.nexedi.com/nexedi/ZODB/commit/8e7eab33 for details.
+[ZODB4-wc2]
+<= ZODB4
+recipe = zc.recipe.egg:develop
+setup = ${ZODB4-wc2-repository:location}
+
+[ZODB4-wc2-repository]
+recipe  = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/ZODB.git
+git-executable = ${git:location}/bin/git
+branch = 4-nxd+MVCC-load-before
+revision = 4.4.5-9-g8e7eab330
+location = ${buildout:parts-directory}/ZODB4-wc2
+
+
+# XXX: buildout fails to install properly eggs with setup_requires
+[BTrees]
+recipe = zc.recipe.egg:custom
+egg = ${:_buildout_section_name_}
+setup-eggs = ${persistent:egg}
+
+[persistent]
+recipe = zc.recipe.egg:custom
+egg = ${:_buildout_section_name_}
+setup-eggs = ${python-cffi:egg}
+
+
+# eggs that are common to ZODB4 and ZODB5.
+[versions]
+BTrees = 4.5.1
+persistent = 4.6.4
+zodbpickle = 1.0.4
+
+# Provide ZODB3 for those eggs that still care about ZODB3 compatibility -
+# for example wendelin.core. ZODB3 3.11 is just a dependency egg on _latest_
+# ZODB, persistent, BTrees and ZEO.
+ZODB3 = 3.11.0

component/ZODB/test-zodb4-wc2.cfg

+# SlapOS software release to test ZODB4-wc2 on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+# test<X>.cfg configures ZODB.major=<X>.
+
+    ../../stack/nxdtest.cfg
+    ../pygolang/buildout.cfg
+    ../python-manuel/buildout.cfg
+    buildout.cfg
+    ../ZEO/buildout.cfg
+
+parts =
+    ZODB
+    .nxdtest
+
+#   for instance
+    ZODB-python
+    slapos-cookbook
+    instance.cfg
+
+[ZODB]
+major = 4-wc2
+[ZODB4-wc2-repository]
+revision =
+
+# we need persistent to be a git checkout because persistent tests want to
+# discover in-tree files that are not present in persistent egg when it is
+# installed in non-development mode:
+#
+#   https://erp5.nexedi.net/test_result_module/20201123-3F859E35/7
+#   (look for "AssertionError: could not find my setup.py")
+#
+#   https://github.com/zopefoundation/persistent/blob/4.6.4-0-g7ed95cf/persistent/tests/test_docs.py#L37-L43
+[persistent]
+recipe = zc.recipe.egg:develop
+setup = ${persistent-repository:location}
+
+[persistent-repository]
+recipe  = slapos.recipe.build:gitclone
+location = ${buildout:parts-directory}/persistent
+repository = https://github.com/zopefoundation/persistent.git
+branch = master
+revision = 4.6.4-0-g7ed95cf
+git-executable = ${git:location}/bin/git
+
+
+# test-dependent eggs that must come through in-tree recipes.
+[ZODB]
+depends += ${manuel:egg}
+
+
+# bin/python is preinstalled with sys.path to ZODB & friends.
+[ZODB-python]
+<= python-interpreter
+eggs +=
+  ${ZODB:egg}[test]
+  ${ZEO:egg}[test]
+  transaction[test]
+
+# env.sh for ZODB's python to be on $PATH.
+[ZODB-env.sh]
+recipe   = slapos.recipe.template:jinja2
+rendered = ${buildout:directory}/${:_buildout_section_name_}
+template = inline:
+  export PS1="(ZODB-env) $PS1"
+  export PATH=${buildout:bin-directory}:$PATH
+
+# .nxdtest to run ZODB tests
+[.nxdtest]
+<= jinja2-template
+template =
+  inline:
+  # determine where ZODB & friends were installed
+  from subprocess import check_output
+  where = check_output(['python', '-c', """if 1:
+        from os.path import dirname
+        for m in "ZODB", "persistent", "BTrees", "transaction", "ZEO":
+            print(dirname(__import__(m).__file__))
+  """])
+  ZODB, persistent, BTrees, transaction, ZEO = where.split()
+
+  # run tests for whole ZODB stack
+  TestCase('ZODB/unit',       ['python', '-m', 'zope.testrunner', '-uv', '--package-path', ZODB, 'ZODB'])
+  TestCase('ZODB/functional', ['python', '-m', 'zope.testrunner', '-fv', '--package-path', ZODB, 'ZODB'])
+
+  TestCase('ZEO/unit',       ['python', '-m', 'zope.testrunner', '-uv', '--package-path', ZEO, 'ZEO'])
+  TestCase('ZEO/functional', ['python', '-m', 'zope.testrunner', '-fv', '--package-path', ZEO, 'ZEO'])
+
+  TestCase('persistent', ['python', '-m', 'zope.testrunner', '-v', '--package-path', persistent, 'persistent'])
+  TestCase('BTrees',     ['python', '-m', 'zope.testrunner', '-v', '--package-path', BTrees, 'BTrees'])
+
+  # transaction uses unittest instead of zope.testrunner
+  import os.path
+  def P(path): return os.path.join(path, '..')
+  TestCase('transaction',['python', '-m', 'unittest', 'discover', '-s', P(transaction)])
+
+
+# instance to run nxdtest.
+[instance.cfg]
+<= jinja2-template
+template = inline:
+  [buildout]
+  extends = ${nxdtest-instance.cfg:rendered}
+
+  [runTestSuite]
+  env.sh  = ${ZODB-env.sh:rendered}
+  workdir = ${buildout:directory}
+
+
+[versions]
+mock = 3.0.5
+random2 = 1.0.1
+zope.testing = 4.7
+zope.testrunner = 5.2
+zope.exceptions = 4.4

component/apache-php/buildout.cfg

@@ -112,56 +112,11 @@ environment =
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
   CPPFLAGS=-I${libzip:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib
   TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
   HOME=${apache:location}
 
 
-
-[apache-php-postgres]
-# Note: Shall react on each build of apache and reinstall itself
-recipe = slapos.recipe.cmmi
-url = http://fr2.php.net/distributions/php-5.4.12.tar.bz2
-md5sum = 5c7b614242ae12e9cacca21c8ab84818
-configure-options =
-  --with-apxs2=${apache:location}/bin/apxs
-  --with-libxml-dir=${libxml2:location}
-  --with-zlib-dir=${zlib:location}
-  --with-bz2=${bzip2:location}
-  --with-mcrypt=${libmcrypt:location}
-  --with-gd
-  --with-jpeg-dir=${libjpeg:location}
-  --with-png-dir=${libpng:location}
-  --enable-gd-native-ttf
-  --with-freetype-dir=${freetype:location}
-  --with-curl=${curl:location}
-  --with-imap=${cclient:location}
-  --with-iconv-dir=${libiconv:location}
-  --with-gettext=${gettext:location}
-  --with-ldap=${openldap:location}
-  --with-imap-ssl
-  --with-openssl=${openssl:location}
-  --enable-libxml
-  --enable-mbstring
-  --enable-session
-  --enable-exif
-  --enable-zip
-  --enable-ftp
-  --with-pgsql=${postgresql:location}
-
-# Changing TMPDIR is required for PEAR installation.
-# It will create a pear/temp directory under the SR instead of a shared /tmp/pear/temp.
-# XXX we could mkdir tmp there
-
-environment =
-  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
-  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
-  LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
-  TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
-  HOME=${apache:location}
-
-
-
 [libmcrypt]
 recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2

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/bcrypt/buildout.cfg

 [buildout]
 extends =
   ../libffi/buildout.cfg
+  ../python-cffi/buildout.cfg
 
 parts =
   bcrypt
@@ -16,3 +17,5 @@ egg = bcrypt
 rpath =
   ${libffi:location}/lib/
 environment = bcrypt-env
+setup-eggs =
+  ${python-cffi:egg}

component/ca-certificates/buildout.cfg

@@ -12,11 +12,11 @@ parts =
 [ca-certificates]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://deb.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20190110.tar.xz
-md5sum = e91d3d9259127ba2dbb65fda58d73f31
+url = http://deb.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20210119.tar.xz
+md5sum = c02582bf9ae338e558617291897615eb
 patch-binary = ${patch:location}/bin/patch
 patches =
-  ${:_profile_base_location_}/ca-certificates-any-python.patch#087b5e860c7a4b8ff6656c95c5835ee2
+  ${:_profile_base_location_}/ca-certificates-any-python.patch#47c2509f1346bd5af8123fb1a2751c2c
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
 patch-options = -p0
 configure-command = true

component/ca-certificates/ca-certificates-any-python.patch

@@ -15,7 +15,7 @@
  #
  
  all:
--	python certdata2pem.py
+-	python3 certdata2pem.py
 +	for x in '' 2 3; do type python$$x && break; done >/dev/null \
 +	&& python$$x certdata2pem.py
  

component/caddy/buildout.cfg

@@ -3,33 +3,23 @@ extends =
   ../../component/golang/buildout.cfg
 
 parts =
+  gowork
   caddy
 
+[caddy-get]
+<= go-git-package
+go.importpath = github.com/caddyserver/caddy
+repository    = https://lab.nexedi.com/nexedi/caddy.git
+revision      = nxd-v1.0.3-1-g2c11cedc
+
 [gowork]
-# Caddy 1.x+ uses go modules, for which gowork does not work yet
-golang  = ${golang1.12:location}
+golang  = ${golang1.16:location}
 install =
-
-[gowork.goinstall]
-command = :
-depends =
-  ${caddy:recipe}
+  ${caddy-get:location}:./...
 
 [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
+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/chromedriver/buildout.cfg

 # ChromeDriver - Webdriver for Chrome
-# http://chromedriver.chromium.org/
+# https://chromedriver.chromium.org/
 # This is a binary download with wrapper scripts.
 
 [buildout]
@@ -7,11 +7,16 @@ extends =
   ../chromium/buildout.cfg
   ../nss/buildout.cfg
   ../nspr/buildout.cfg
+  ../xorg/buildout.cfg
 
 parts =
   chromedriver-wrapper
 
 
+[chromedriver-wrapper-91]
+<= chromedriver-wrapper
+wrapper-name = chromedriver-91
+part = ${chromedriver-91:location}
 
 [chromedriver-wrapper-2.41]
 <= chromedriver-wrapper
@@ -45,7 +50,7 @@ install =
 
 
 [chromedriver]
-<= chromedriver-2.41
+<= chromedriver-91
 
 [chromedriver-2.41]
 <= chromedriver-download
@@ -53,6 +58,11 @@ version = 2.41
 # Supports Chrome v67-69
 md5sum-x86_64 = fbd8b9561575054e0e7e9cc53b680a70
 
+[chromedriver-91]
+<= chromedriver-download
+version = 91.0.4472.101
+# Supports Chrome v91
+md5sum-x86_64 = cc43ba0babbfff7f22b48165ec8e8c81
 
 [chromedriver-download]
 # Installs chromedriver ${version}.
@@ -65,6 +75,7 @@ x86-64 = https://chromedriver.storage.googleapis.com/${:version}/chromedriver_li
 library =
   ${nss:location}/lib
   ${nspr:location}/lib
+  ${libX11:location}/lib
 path =
 install =
   import os, shutil

component/chromium/buildout.cfg

@@ -66,16 +66,27 @@ install =
   ))
     os.fchmod(f.fileno(), 0o755)
 
+[chromium-wrapper-91]
+<= chromium-wrapper
+wrapper-name = chromium-91
+part = ${chromium-91:location}
+
 [chromium-wrapper-69]
 <= chromium-wrapper
 wrapper-name = chromium-69
 part = ${chromium-69:location}
 
 
+[chromium]
+<= chromium-91
 
+[chromium-91]
+<= chromium-download
+version = 91.0.4472.114
 
-[chromium]
-<= chromium-69
+revision_x86-64 = 870763
+md5sum-x86_64 = 74eab41580469c2b8117cf396db823cb
+generation-x86_64 = 1617926496067901
 
 
 [chromium-69]
@@ -111,6 +122,7 @@ x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snaps
 library =
   ${atk:location}/lib
   ${at-spi2-atk:location}/lib
+  ${at-spi2-core:location}/lib
   ${alsa:location}/lib
   ${cairo:location}/lib
   ${cups:location}/lib
@@ -133,11 +145,14 @@ library =
   ${libXtst:location}/lib
   ${libXScrnSaver:location}/lib
   ${libXrandr:location}/lib
+  ${libdrm:location}/lib
   ${libexpat:location}/lib
   ${libffi:location}/lib
   ${libpng:location}/lib
   ${libpng12:location}/lib
   ${libxcb:location}/lib
+  ${libxkbcommon:location}/lib
+  ${libxshmfence:location}/lib
   ${libxml2:location}/lib
   ${mesa:location}/lib
   ${nspr:location}/lib

component/cloudooo/buildout.cfg

@@ -14,7 +14,7 @@ recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/cloudooo.git
 branch = master
 git-executable = ${git:location}/bin/git
-revision = bf99e5dea3ecf45c59083085540316c48cfa5488
+revision = 0b5ff71a2ede76499e81659aed392057ae910917
 
 [cloudooo]
 recipe = zc.recipe.egg

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/curl/buildout.cfg

@@ -7,6 +7,7 @@ extends =
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg
+  ../zstd/buildout.cfg
   ../zlib/buildout.cfg
   ../nghttp2/buildout.cfg
 parts =
@@ -15,11 +16,11 @@ parts =
 [curl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://curl.haxx.se/download/curl-7.67.0.tar.xz
-md5sum = d55351b88dec558dd3a24dabb2c2d899
+url = http://curl.haxx.se/download/curl-7.76.0.tar.xz
+md5sum = 41178ceea57c863f883b6fe2c3ac276f
 configure-options =
   --disable-static
-  --disable-esni
+  --disable-ech
   --disable-ldap
   --disable-ldaps
   --disable-rtsp
@@ -30,6 +31,7 @@ configure-options =
   --disable-imap
   --disable-smtp
   --disable-gopher
+  --disable-mqtt
   --disable-manual
   --enable-ipv6
   --disable-sspi
@@ -42,8 +44,10 @@ configure-options =
   --without-mesalink
   --without-nss
   --without-libpsl
+  --without-libgsasl
   --without-libmetalink
   --without-libssh2
+  --without-libssh
   --without-librtmp
   --without-libidn2
   --with-nghttp2=${nghttp2:location}
@@ -52,8 +56,11 @@ configure-options =
   --without-quiche
   --without-zsh-functions-dir
   --without-fish-functions-dir
+  --without-brotli
+  --with-zstd=${zstd:location}
+  --without-gssapi
 
 environment =
   PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${nghttp2:location}/lib/pkgconfig
-  LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${nghttp2:location}/lib
+  LDFLAGS=-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${nghttp2:location}/lib -Wl,-rpath=${zstd:location}/lib

component/cyrus-sasl/0001-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch

+From af48f6fec9a7b6374d4153c5db894d4a1f349645 Mon Sep 17 00:00:00 2001
+From: Jonas Jelten <jj@sft.mx>
+Date: Sat, 2 Feb 2019 20:53:37 +0100
+Subject: [RFC] db_gdbm: fix gdbm_errno overlay from gdbm_close
+
+`gdbm_close` also sets gdbm_errno since version 1.17.
+This leads to a problem in `libsasl` as the `gdbm_close` incovation overlays
+the `gdbm_errno` value which is then later used for the error handling.
+---
+ sasldb/db_gdbm.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/sasldb/db_gdbm.c b/sasldb/db_gdbm.c
+index ee56a6b..c908808 100644
+--- a/sasldb/db_gdbm.c
++++ b/sasldb/db_gdbm.c
+@@ -107,9 +107,11 @@ int _sasldb_getdata(const sasl_utils_t *utils,
+   gkey.dptr = key;
+   gkey.dsize = key_len;
+   gvalue = gdbm_fetch(db, gkey);
++  int fetch_errno = gdbm_errno;
++
+   gdbm_close(db);
+   if (! gvalue.dptr) {
+-      if (gdbm_errno == GDBM_ITEM_NOT_FOUND) {
++      if (fetch_errno == GDBM_ITEM_NOT_FOUND) {
+           utils->seterror(conn, SASL_NOLOG,
+ 			  "user: %s@%s property: %s not found in %s",
+ 			  authid, realm, propName, path);
+-- 
+2.30.1
+

component/cyrus-sasl/buildout.cfg

@@ -15,6 +15,9 @@ shared = true
 url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
 md5sum = a7f4e5e559a0e37b3ffc438c9456e425
 location = @@LOCATION@@
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/0001-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch#eef9bb30101c29f045ed68db45d5e5b3
 pre-configure =
   "${libtool:location}/bin/libtoolize" -c -f &&
   "${automake:location}/bin/aclocal" -I "${libtool:location}/share/aclocal" -I config -I cmulocal &&

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.2
+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/dbus/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 [dbus]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://dbus.freedesktop.org/releases/dbus/dbus-1.11.6.tar.gz
-md5sum = fdb03ad2f2861a171fe7d0caad3b415f 
+url = https://dbus.freedesktop.org/releases/dbus/dbus-1.12.20.tar.gz
+md5sum = dfe8a71f412e0b53be26ed4fbfdc91c4
 location = @@LOCATION@@
 configure-options =
   --disable-static
@@ -21,14 +21,14 @@ make-targets = install && ${:location}/bin/dbus-uuidgen > ${:location}/var/lib/d
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig
-  CPPFLAGS=-I${libexpat:location}/include
-  LDFLAGS=-L${libexpat:location}/lib
+  EXPAT_CFLAGS=-I${libexpat:location}/include
+  EXPAT_LIBS=-L${libexpat:location}/lib -lexpat
 
 [dbus-glib]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.104.tar.gz
-md5sum = 5497d2070709cf796f1878c75a72a039
+url = https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz
+md5sum = d7cebf1d69445cbd28b4983392145192
 configure-options =
   --disable-static
   --disable-gtk-doc-html

component/dcron/buildout.cfg

@@ -9,17 +9,17 @@ parts = dcron-output
 [dcron]
 recipe = slapos.recipe.cmmi
 shared = false
-url = http://www.jimpryor.net/linux/releases/dcron-4.4.tar.gz
-md5sum = 02d848ba043a9df5bf2102a9f4bc04bd
+url = http://www.jimpryor.net/linux/releases/dcron-4.5.tar.gz
+md5sum = 078833f3281f96944fc30392b1888326
 configure-command = true
+patch-binary = ${patch:location}/bin/patch
 patches =
-  ${:_profile_base_location_}/dcron-4.4.noroot.no.globals.patch#d5408ab682b65cc1eda40d588fcd7db8
+  ${:_profile_base_location_}/noroot-no-globals.patch#623379916f48bd8292a28057c8bd30f7
 patch-options = -p1
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
-post-make-hook = ${:_profile_base_location_}/dcron-hooks.py#d7985eef1ceef01af00ffb1d38708c8d:post_make_hook
-environment =
-  PATH=${patch:location}/bin:%(PATH)s
+post-install =
+  chmod u-s %(location)s/bin/crontab
 dummy = ${randomsleep:recipe}
 
 [dcron-output]

component/dcron/dcron-hooks.py

-import os
-import shutil
-def post_make_hook(options, buildout):
-  crontab_path = os.path.join(options['location'], 'bin', 'crontab')
-  os.chmod(crontab_path, 0o750)

component/dcron/dcron-4.4.noroot.no.globals.patch → component/dcron/noroot-no-globals.patch

-diff -ru dcron-4.4.org/chuser.c dcron-4.4/chuser.c
---- dcron-4.4.org/chuser.c	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/chuser.c	2013-07-18 18:17:16.342147418 +0200
-@@ -14,47 +14,6 @@
+--- dcron-4.5/chuser.c
++++ dcron-4.5/chuser.c
+@@ -14,6 +14,7 @@
  int
  ChangeUser(const char *user, char *dochdir)
  {
--	struct passwd *pas;
--
--	/*
--	 * Obtain password entry and change privilages
--	 */
--
--	if ((pas = getpwnam(user)) == 0) {
--		printlogf(LOG_ERR, "failed to get uid for %s\n", user);
--		return(-1);
--	}
--	setenv("USER", pas->pw_name, 1);
--	setenv("HOME", pas->pw_dir, 1);
--	setenv("SHELL", "/bin/sh", 1);
--
--	/*
--	 * Change running state to the user in question
--	 */
--
--	if (initgroups(user, pas->pw_gid) < 0) {
--		printlogf(LOG_ERR, "initgroups failed: %s %s\n", user, strerror(errno));
--		return(-1);
--	}
--	if (setregid(pas->pw_gid, pas->pw_gid) < 0) {
--		printlogf(LOG_ERR, "setregid failed: %s %d\n", user, pas->pw_gid);
--		return(-1);
--	}
--	if (setreuid(pas->pw_uid, pas->pw_uid) < 0) {
--		printlogf(LOG_ERR, "setreuid failed: %s %d\n", user, pas->pw_uid);
--		return(-1);
--	}
--	if (dochdir) {
--		/* try to change to $HOME */
--		if (chdir(pas->pw_dir) < 0) {
--			printlogf(LOG_ERR, "chdir failed: %s %s\n", user, pas->pw_dir);
--			/* dochdir is a backup directory, usually /tmp */
--			if (chdir(dochdir) < 0) {
--				printlogf(LOG_ERR, "chdir failed: %s %s\n", user, dochdir);
--				return(-1);
--			}
--		}
--	}
--	return(pas->pw_uid);
-+  return getpwnam(user);
++#if 0
+ 	struct passwd *pas;
+ 
+ 	/*
+@@ -57,5 +58,8 @@
+ 		}
+ 	}
+ 	return(pas->pw_uid);
++#else
++	return getpwnam(user);
++#endif
  }
  
-diff -ru dcron-4.4.org/crontab.c dcron-4.4/crontab.c
---- dcron-4.4.org/crontab.c	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/crontab.c	2013-07-18 18:18:07.768535485 +0200
+--- dcron-4.5/crontab.c
++++ dcron-4.5/crontab.c
 @@ -88,7 +88,7 @@
  				break;
  			case 'c':
@@ -81,9 +47,8 @@ diff -ru dcron-4.4.org/crontab.c dcron-4.4/crontab.c
  		if ((ptr = getenv("EDITOR")) == NULL || strlen(ptr) >= sizeof(visual))
  			if ((ptr = getenv("VISUAL")) == NULL || strlen(ptr) >= sizeof(visual))
  				ptr = PATH_VI;
-diff -ru dcron-4.4.org/job.c dcron-4.4/job.c
---- dcron-4.4.org/job.c	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/job.c	2013-07-18 18:17:16.342147418 +0200
+--- dcron-4.5/job.c
++++ dcron-4.5/job.c
 @@ -62,14 +62,6 @@
  		 * Change running state to the user in question
  		 */
@@ -114,9 +79,8 @@ diff -ru dcron-4.4.org/job.c dcron-4.4/job.c
  		/* from this point we are unpriviledged */
  
  		/*
-diff -ru dcron-4.4.org/Makefile dcron-4.4/Makefile
---- dcron-4.4.org/Makefile	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/Makefile	2013-07-18 18:17:16.342147418 +0200
+--- dcron-4.5/Makefile
++++ dcron-4.5/Makefile
 @@ -3,7 +3,6 @@
  
  # these variables can be configured by e.g. `make SCRONTABS=/different/path`
@@ -137,9 +101,9 @@ diff -ru dcron-4.4.org/Makefile dcron-4.4/Makefile
 +INSTALL_DATA = $(INSTALL) -D -m0644
 +INSTALL_DIR = $(INSTALL) -d -m0755
  CFLAGS ?= -O2
- CFLAGS += -Wall -Wstrict-prototypes
+ CFLAGS += -Wall -Wstrict-prototypes -Wno-missing-field-initializers
  SRCS = main.c subs.c database.c job.c concat.c chuser.c
-@@ -44,7 +43,6 @@
+@@ -45,7 +44,6 @@
  	echo "SBINDIR = $(SBINDIR)" >> config
  	echo "BINDIR = $(BINDIR)" >> config
  	echo "MANDIR = $(MANDIR)" >> config
@@ -147,8 +111,8 @@ diff -ru dcron-4.4.org/Makefile dcron-4.4/Makefile
  	echo "SCRONTABS = $(SCRONTABS)" >> config
  	echo "CRONTABS = $(CRONTABS)" >> config
  	echo "CRONSTAMPS = $(CRONSTAMPS)" >> config
-@@ -62,13 +60,10 @@
- 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $< -o $@
+@@ -63,13 +61,10 @@
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(DEFS) $< -o $@
  
  install:
 -	$(INSTALL_PROGRAM) -m0700 -g root crond $(DESTDIR)$(SBINDIR)/crond

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.5
 # 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
@@ -49,11 +49,11 @@ init =
     current = subprocess.check_output(('gcc', '-dumpversion'),
                                       universal_newlines=True).strip()
   self.system_version = current
-  # If we're still going to use the same GCC,
-  # the conditions have no impact on the dependant parts.
+# If we're still going to use the same GCC,
+# the conditions have no impact on the dependant parts.
   min_version = options.pop('min_version', None)
   max_version = options.pop('max_version', None)
-  ###
+###
   if (parse_version(min_version or current)
       <= parse_version(current)
       <= parse_version(max_version or current)):
@@ -61,7 +61,7 @@ init =
     for path in os.getenv('PATH', '').split(os.pathsep): # PY3: shutil.which
       gcc = os.path.join(path, 'gcc')
       if os.access(gcc, os.X_OK) and not os.path.isdir(gcc):
-        options['prefix'] = os.path.dirname(path)
+        options['prefix'] = os.path.dirname(os.path.normpath(path))
         break
   else:
     options['prefix'] = self.buildout[options['part']]['location']
@@ -72,6 +72,7 @@ update =
     env = os.environ
     env['PATH'] = os.pathsep.join((
       os.path.join(options['prefix'], 'bin'),
+      os.path.join(self.buildout['binutils']['location'], 'bin'),
       env['PATH']
     ))
   else:

component/egg-patch/Acquisition/aq_dynamic-4.7.patch

+diff -Naur Acquisition-4.7.orig/src/Acquisition/_Acquisition.c Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/_Acquisition.c
+--- Acquisition-4.7.orig/src/Acquisition/_Acquisition.c	2021-03-17 16:22:28.266539592 +0100
++++ Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/_Acquisition.c	2021-03-17 16:28:59.609842948 +0100
+@@ -543,6 +543,64 @@
+ }
+ 
+ static PyObject *
++Wrapper_GetAttr(PyObject *self, PyObject *attr_name, PyObject *orig)
++{
++  /* This function retrieves an attribute from an object by PyObject_GetAttr.
++
++     The main difference between Wrapper_GetAttr and PyObject_GetAttr is that
++     Wrapper_GetAttr calls _aq_dynamic to generate an attribute dynamically, if
++     the attribute is not found.
++  */
++  PyObject *r, *v, *tb;
++  PyObject *d, *m;
++  PyObject *o;
++
++  if (isWrapper (self))
++    o = WRAPPER(self)->obj;
++  else
++    o = self;
++  
++  /* Try to get an attribute in the normal way first.  */
++  r = PyObject_GetAttr(o, attr_name);
++  if (r)
++    return r;
++
++  /* If an unexpected error happens, return immediately.  */
++  PyErr_Fetch(&r,&v,&tb);
++  if (r != PyExc_AttributeError)
++    {
++      PyErr_Restore(r,v,tb);
++      return NULL;
++    }
++
++  /* Try to get _aq_dynamic.  */
++  m = PyObject_GetAttrString(o, "_aq_dynamic");
++  if (! m) {
++    PyErr_Restore(r,v,tb);
++    return NULL;
++  }
++
++  /* Call _aq_dynamic in the context of the original acquisition wrapper.  */
++  if (PyECMethod_Check(m) && PyECMethod_Self(m)==o)
++    ASSIGN(m,PyECMethod_New(m,OBJECT(self)));
++  else if (has__of__(m)) ASSIGN(m,__of__(m,OBJECT(self)));
++  d = PyObject_CallFunction(m, "O", attr_name);
++  Py_DECREF(m);
++
++  /* In the case of None, assume that the attribute is not found.  */
++  if (d == Py_None) {
++    Py_DECREF(d);
++    PyErr_Restore(r,v,tb);
++    return NULL;
++  }
++
++  Py_XDECREF(r);
++  Py_XDECREF(v);
++  Py_XDECREF(tb);
++  return d;
++}
++
++static PyObject *
+ Wrapper_acquire(Wrapper *self, PyObject *oname,
+                 PyObject *filter, PyObject *extra, PyObject *orig,
+                 int explicit, int containment);
+@@ -677,8 +735,8 @@
+             return NULL;
+         }
+ 
+-        /* normal attribute lookup */
+-        else if ((r = PyObject_GetAttr(self->obj, oname))) {
++        /* Give _aq_dynamic a chance, then normal attribute lookup */
++        else if ((r = Wrapper_GetAttr(OBJECT(self), oname, orig))) {
+             if (r == Acquired) {
+                 Py_DECREF(r);
+                 return Wrapper_acquire(
+@@ -806,7 +864,7 @@
+             return NULL;
+         }
+ 
+-        if ((r = PyObject_GetAttr(self->container, oname)) == NULL) {
++        if ((r = Wrapper_GetAttr(self->container, oname, orig)) == NULL) {
+             /* May be AttributeError or some other kind of error */
+             return NULL;
+         }
+@@ -830,7 +888,7 @@
+ static PyObject *
+ Wrapper_getattro(Wrapper *self, PyObject *oname)
+ {
+-    return Wrapper_findattr(self, oname, NULL, NULL, NULL, 1, 1, 0, 0);
++    return Wrapper_findattr(self, oname, NULL, NULL, OBJECT(self), 1, 1, 0, 0);
+ }
+ 
+ static PyObject *
+@@ -846,7 +904,7 @@
+     if (STR_EQ(PyBytes_AS_STRING(tmp), "acquire")) {
+         result = Py_FindAttr(OBJECT(self), oname);
+     } else {
+-        result = Wrapper_findattr(self, oname, NULL, NULL, NULL, 1, 0, 0, 0);
++        result = Wrapper_findattr(self, oname, NULL, NULL, OBJECT(self), 1, 0, 0, 0);
+     }
+ 
+     Py_DECREF(tmp);
+diff -Naur Acquisition-4.7.orig/src/Acquisition/test_dynamic_acquisition.py Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/test_dynamic_acquisition.py
+--- Acquisition-4.7.orig/src/Acquisition/test_dynamic_acquisition.py	1970-01-01 01:00:00.000000000 +0100
++++ Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/test_dynamic_acquisition.py	2021-03-17 16:30:07.082413986 +0100
+@@ -0,0 +1,160 @@
++##############################################################################
++#
++# Copyright (c) 1996-2002 Zope Corporation and Contributors.
++# All Rights Reserved.
++#
++# This software is subject to the provisions of the Zope Public License,
++# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
++# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
++# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
++# FOR A PARTICULAR PURPOSE
++#
++##############################################################################
++import Acquisition
++
++def checkContext(self, o):
++    # Python equivalent to aq_inContextOf
++    from Acquisition import aq_base, aq_parent, aq_inner
++    subob = self
++    o = aq_base(o)
++    while 1:
++        if aq_base(subob) is o:
++            return True
++        self = aq_inner(subob)
++        if self is None: break
++        subob = aq_parent(self)
++        if subob is None: break
++    return False
++
++class B(Acquisition.Implicit):
++    color='red'
++
++    def __init__(self, name='b'):
++        self.name = name
++
++    def _aq_dynamic(self, attr):
++        if attr == 'bonjour': return None
++
++        def dynmethod():
++            chain = ' <- '.join(repr(obj) for obj in Acquisition.aq_chain(self))
++            print repr(self) + '.' + attr
++            print 'chain:', chain
++
++        return dynmethod
++
++    def __repr__(self):
++        return "%s(%r)" % (self.__class__.__name__, self.name)
++
++class A(Acquisition.Implicit):
++
++    def __init__(self, name='a'):
++        self.name = name
++
++    def hi(self):
++        print self, self.color
++
++    def _aq_dynamic(self, attr):
++        return None
++
++    def __repr__(self):
++        return "%s(%r)" % (self.__class__.__name__, self.name)
++
++def test_dynamic():
++    r'''
++    The _aq_dynamic functionality allows an object to dynamically provide an
++    attribute.
++    
++    If an object doesn't have an attribute, Acquisition checks to see if the
++    object has a _aq_dynamic method, which is then called. It is functionally
++    equivalent to __getattr__, but _aq_dynamic is called with 'self' as the
++    acquisition wrapped object where as __getattr__ is called with self as the
++    unwrapped object.
++
++    Let's see how this works. In the examples below, the A class defines
++    '_aq_dynamic', but returns 'None' for all attempts, which means that no new
++    attributes should be generated dynamically. It also doesn't define 'color'
++    attribute, even though it uses it in the 'hi' method.
++
++        >>> A().hi()
++        Traceback (most recent call last):
++        ...
++        AttributeError: color
++    
++    The class B, on the other hand, generates all attributes dynamically,
++    except if it is called 'bonjour'.
++    
++    First we need to check that, even if an object provides '_aq_dynamic',
++    "regular" Aquisition attribute access should still work:
++
++        >>> b=B()
++        >>> b.a=A()
++        >>> b.a.hi()
++        A('a') red
++        >>> b.a.color='green'
++        >>> b.a.hi()
++        A('a') green
++
++    Now, let's see some dynamically generated action. B does not define a
++    'salut' method, but remember that it dynamically generates a method for
++    every attribute access:
++
++        >>> b.a.salut()
++        B('b').salut
++        chain: B('b')
++
++        >>> a=A('a1')
++        >>> a.b=B('b1')
++        >>> a.b.salut()
++        B('b1').salut
++        chain: B('b1') <- A('a1')
++
++        >>> b.a.bonjour()
++        Traceback (most recent call last):
++        ...
++        AttributeError: bonjour
++
++        >>> a.b.bonjour()
++        Traceback (most recent call last):
++        ...
++        AttributeError: bonjour
++
++    '''
++
++def test_wrapper_comparissons():
++    r'''
++
++    Test wrapper comparisons in presence of _aq_dynamic
++
++        >>> b=B()
++        >>> b.a=A()
++        >>> foo = b.a
++        >>> bar = b.a
++        >>> assert( foo == bar )
++        >>> c = A('c')
++        >>> b.c = c
++        >>> b.c.d = c
++        >>> b.c.d == c
++        True
++        >>> b.c.d == b.c
++        True
++        >>> b.c == c
++        True
++
++    Test contextuality in presence of _aq_dynamic
++
++        >>> checkContext(b.c, b)
++        True
++        >>> checkContext(b.c, b.a)
++        False
++
++        >>> assert b.a.aq_inContextOf(b)
++        >>> assert b.c.aq_inContextOf(b)
++        >>> assert b.c.d.aq_inContextOf(b)
++        >>> assert b.c.d.aq_inContextOf(c)
++        >>> assert b.c.d.aq_inContextOf(b.c)
++        >>> assert not b.c.aq_inContextOf(foo)
++        >>> assert not b.c.aq_inContextOf(b.a)
++        >>> assert not b.a.aq_inContextOf('somestring')
++'''
++
+diff -Naur Acquisition-4.7.orig/src/Acquisition/tests.py Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/tests.py
+--- Acquisition-4.7.orig/src/Acquisition/tests.py	2021-03-17 16:22:28.266539592 +0100
++++ Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition/tests.py	2021-03-17 16:31:31.971132854 +0100
+@@ -3366,6 +3366,7 @@
+ 
+     suites = [
+         DocTestSuite(),
++        DocTestSuite('Acquisition.test_dynamic_acquisition'),
+         unittest.defaultTestLoader.loadTestsFromName(__name__),
+     ]
+ 
+diff -Naur Acquisition-4.7.orig/src/Acquisition.egg-info/SOURCES.txt Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition.egg-info/SOURCES.txt
+--- Acquisition-4.7.orig/src/Acquisition.egg-info/SOURCES.txt	2021-03-17 16:22:28.262539558 +0100
++++ Acquisition-4.7-py2.7-linux-x86_64.egg/src/Acquisition.egg-info/SOURCES.txt	2021-03-17 16:32:31.619638229 +0100
+@@ -15,9 +15,10 @@
+ src/Acquisition/__init__.py
+ src/Acquisition/interfaces.py
+ src/Acquisition/tests.py
++src/Acquisition/test_dynamic_acquisition.py
+ src/Acquisition.egg-info/PKG-INFO
+ src/Acquisition.egg-info/SOURCES.txt
+ src/Acquisition.egg-info/dependency_links.txt
+ src/Acquisition.egg-info/not-zip-safe
+ src/Acquisition.egg-info/requires.txt
+-src/Acquisition.egg-info/top_level.txt
+\ Pas de fin de ligne à la fin du fichier
++src/Acquisition.egg-info/top_level.txt

component/egg-patch/Products.DCWorkflow/workflow_method-2.4.1.patch

+diff -Naur Products.DCWorkflow-2.4.1.orig/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.4.1/Products/DCWorkflow/DCWorkflow.py
+--- Products.DCWorkflow-2.4.1.orig/Products/DCWorkflow/DCWorkflow.py	2020-03-09 22:05:43.000000000 +0100
++++ Products.DCWorkflow-2.4.1/Products/DCWorkflow/DCWorkflow.py	2021-03-18 15:43:47.791236880 +0100
+@@ -38,6 +38,7 @@
+ from Products.DCWorkflow.interfaces import IDCWorkflowDefinition
+ from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC
+ from Products.DCWorkflow.Transitions import TRIGGER_USER_ACTION
++from Products.DCWorkflow.Transitions import TRIGGER_WORKFLOW_METHOD
+ from Products.DCWorkflow.utils import Message as _
+ from Products.DCWorkflow.utils import modifyRolesForGroup
+ from Products.DCWorkflow.utils import modifyRolesForPermission
+@@ -279,6 +280,52 @@
+         self._changeStateOf(ob, tdef, kw)
+ 
+     @security.private
++    def isWorkflowMethodSupported(self, ob, method_id):
++        '''
++        Returns a true value if the given workflow method
++        is supported in the current state.
++        '''
++        sdef = self._getWorkflowStateOf(ob)
++        if sdef is None:
++            return 0
++        if method_id in sdef.transitions:
++            tdef = self.transitions.get(method_id, None)
++            if (tdef is not None and
++                tdef.trigger_type == TRIGGER_WORKFLOW_METHOD and
++                self._checkTransitionGuard(tdef, ob)):
++                return 1
++        return 0
++
++    @security.private
++    def wrapWorkflowMethod(self, ob, method_id, func, args, kw):
++        '''
++        Allows the user to request a workflow action.  This method
++        must perform its own security checks.
++        '''
++        sdef = self._getWorkflowStateOf(ob)
++        if sdef is None:
++            raise WorkflowException('Object is in an undefined state')
++        if method_id not in sdef.transitions:
++            raise Unauthorized(method_id)
++        tdef = self.transitions.get(method_id, None)
++        if tdef is None or tdef.trigger_type != TRIGGER_WORKFLOW_METHOD:
++            raise WorkflowException(
++                'Transition %s is not triggered by a workflow method'
++                % method_id)
++        if not self._checkTransitionGuard(tdef, ob):
++            raise Unauthorized(method_id)
++        res = func(*args, **kw)
++        try:
++            self._changeStateOf(ob, tdef)
++        except ObjectDeleted:
++            # Re-raise with a different result.
++            raise ObjectDeleted(res)
++        except ObjectMoved as ex:
++            # Re-raise with a different result.
++            raise ObjectMoved(ex.getNewObject(), res)
++        return res
++
++    @security.private
+     def isInfoSupported(self, ob, name):
+         '''
+         Returns a true value if the given info name is supported.
+diff -Naur Products.DCWorkflow-2.4.1.orig/Products/DCWorkflow/dtml/transition_properties.dtml Products.DCWorkflow-2.4.1/Products/DCWorkflow/dtml/transition_properties.dtml
+--- Products.DCWorkflow-2.4.1.orig/Products/DCWorkflow/dtml/transition_properties.dtml	2020-03-09 22:05:43.000000000 +0100
++++ Products.DCWorkflow-2.4.1/Products/DCWorkflow/dtml/transition_properties.dtml	2021-03-18 15:37:55.144028451 +0100
+@@ -56,6 +56,16 @@
+ </tr>
+ 
+ <tr>
++<th></th>
++<td>
++<dtml-let checked="trigger_type==2 and 'checked' or ' '">
++<input type="radio" name="trigger_type" value="2" &dtml-checked; />
++Initiated by WorkflowMethod
++</dtml-let>
++</td>
++</tr>
++
++<tr>
+ <th align="left">Script (before)</th>
+ <td>
+ <select name="script_name">
+diff -Naur Products.DCWorkflow-2.4.1.orig/Products/DCWorkflow/dtml/transitions.dtml Products.DCWorkflow-2.4.1/Products/DCWorkflow/dtml/transitions.dtml
+--- Products.DCWorkflow-2.4.1.orig/Products/DCWorkflow/dtml/transitions.dtml	2020-03-09 22:05:43.000000000 +0100
++++ Products.DCWorkflow-2.4.1/Products/DCWorkflow/dtml/transitions.dtml	2021-03-18 15:37:55.144028451 +0100
+@@ -17,7 +17,8 @@
+   <td>
+    Destination state: <code><dtml-if new_state_id>&dtml-new_state_id;<dtml-else>(Remain in state)</dtml-if></code> <br />
+    Trigger: <dtml-var expr="(trigger_type == 0 and 'Automatic') or
+-                            (trigger_type == 1 and 'User action')">
++                            (trigger_type == 1 and 'User action') or
++                            (trigger_type == 2 and 'WorkflowMethod')">
+    <br />
+    <dtml-if script_name>
+      Script (before): &dtml-script_name;
+diff -Naur Products.DCWorkflow-2.4.1.orig/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.4.1/Products/DCWorkflow/exportimport.py
+--- Products.DCWorkflow-2.4.1.orig/Products/DCWorkflow/exportimport.py	2020-03-09 22:05:43.000000000 +0100
++++ Products.DCWorkflow-2.4.1/Products/DCWorkflow/exportimport.py	2021-03-18 15:44:34.903667147 +0100
+@@ -40,7 +40,7 @@
+ from Products.DCWorkflow.utils import _xmldir
+ 
+ 
+-TRIGGER_TYPES = ('AUTOMATIC', 'USER')
++TRIGGER_TYPES = ('AUTOMATIC', 'USER', 'METHOD' )
+ _FILENAME = 'workflows.xml'
+ 
+ 
+diff -Naur Products.DCWorkflow-2.4.1.orig/Products/DCWorkflow/Transitions.py Products.DCWorkflow-2.4.1/Products/DCWorkflow/Transitions.py
+--- Products.DCWorkflow-2.4.1.orig/Products/DCWorkflow/Transitions.py	2020-03-09 22:05:43.000000000 +0100
++++ Products.DCWorkflow-2.4.1/Products/DCWorkflow/Transitions.py	2021-03-18 15:37:55.148028486 +0100
+@@ -31,6 +31,7 @@
+ 
+ TRIGGER_AUTOMATIC = 0
+ TRIGGER_USER_ACTION = 1
++TRIGGER_WORKFLOW_METHOD = 2
+ 
+ 
+ class TransitionDefinition(SimpleItem):

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/faketime/buildout.cfg

@@ -6,11 +6,9 @@ parts = faketime
 
 [faketime]
 recipe = slapos.recipe.cmmi
-url = http://www.code-wizards.com/projects/libfaketime/libfaketime-0.9.1.tar.gz
-md5sum = ce3f996dfd5826b4ac62f1a7cc36ea27
+url = https://github.com/wolfcw/libfaketime/archive/refs/tags/v0.9.9.tar.gz
+md5sum = 1f784c9c0ec7807b9d1107d1730dbb41
 configure-command = true
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
-make-binary = make -e -C src
 make-targets = install
-post-install = sed -i -e "16c\FTPL_PATH=${buildout:parts-directory}/${:_buildout_section_name_}/lib/faketime" ${buildout:parts-directory}/${:_buildout_section_name_}/bin/faketime

component/file/buildout.cfg

@@ -4,21 +4,21 @@
 [buildout]
 parts = file
 extends =
-  ../patch/buildout.cfg
+  ../bzip2/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
 
 [file]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.icm.edu.pl/packages/file/file-5.37.tar.gz
-md5sum = 80c29aca745466c6c24d11f059329075
+url = http://ftp.icm.edu.pl/packages/file/file-5.39.tar.gz
+md5sum = 1c450306053622803a25647d88f80f25
 configure-options =
   --disable-static
+  --disable-libseccomp
+  --enable-zlib
+  --enable-bzlib
+  --enable-xzlib
 environment =
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-patch-binary = ${patch:location}/bin/patch
-patch-options = -p1
-patches =
-  https://git.in-ulm.de/cbiedl/file/raw/debian/1%255.37-6/debian/patches/cherry-pick.FILE5_37-67-g46a8443f.limit-the-number-of-elements-in-a-vector-found-by-oss-fuzz.patch#fb6f7d32ce89573bf4b4b302c812e394
+  CPPFLAGS=-I${bzip2:location}/include -I${xz-utils:location}/include -I${zlib:location}/include
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/firefox/buildout.cfg

@@ -51,6 +51,11 @@ install =
   ))
     os.fchmod(f.fileno(), 0o755)
 
+[firefox-wrapper-78]
+<= firefox-wrapper
+wrapper-name = firefox-78
+part = ${firefox-78:location}
+
 [firefox-wrapper-68]
 <= firefox-wrapper
 wrapper-name = firefox-68
@@ -95,6 +100,12 @@ cache-dir =
 # would not be created.
 <= firefox-68
 
+[firefox-78]
+<= firefox-download
+version = 78.1.0esr
+i686-md5sum = 09595a1b9a99d17a618a51bc1f971e5e
+x86_64-md5sum = 06f4d488721ce7229d9a86cb4c6786f3
+
 [firefox-68]
 <= firefox-download
 version = 68.0.2esr

component/firewalld/buildout.cfg

@@ -10,22 +10,37 @@ extends =
   ../python-slip/buildout.cfg
   ../dbus/buildout.cfg
   ../flex/buildout.cfg
+  ../nftables/buildout.cfg
 
 [firewalld]
 recipe = slapos.recipe.cmmi
-url = https://github.com/t-woerner/firewalld/archive/v0.3.14.2.tar.gz
-md5sum = b8f81b536ede502721f69300d374447b
+url = https://github.com/firewalld/firewalld/releases/download/v0.8.6/firewalld-0.8.6.tar.gz
+md5sum = a120286a2c2bc12ece24d719ef2879b5
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python${python:version}/site-packages
+location = @@LOCATION@@
+sbin-dir = sbin-orig
+etc-root = ${:location}/etc
+etc-dir = ${:etc-root}/firewalld
 pre-configure =
   sed -i -E 's,(^SUBDIRS *=.*) doc(\b.*),\1\2,' Makefile.am
   aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal
   ./autogen.sh
+configure-options =
+  --sbindir=${:location}/${:sbin-dir}
+  --sysconfdir=${:etc-root}
+  --disable-docs
+  --with-iptables=${iptables:location}/sbin/iptables-legacy
+  --with-iptables-restore=${iptables:location}/sbin/iptables-legacy-restore
+  --with-ip6tables=${iptables:location}/sbin/ip6tables-legacy
+  --with-ip6tables-restore=${iptables:location}/sbin/ip6tables-legacy-restore
+  --with-ebtables=${iptables:location}/sbin/ebtables-legacy
+  --with-ebtables-restore=${iptables:location}/sbin/ebtables-legacy-restore
+  --with-ipset=/bin/false
 
 environment =
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
   PATH=${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:${perl:location}/bin:%(PATH)s
   CPPFLAGS=-I${gettext:location}/include
-  LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
   M4=${m4:location}/bin/m4
   ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal:${glib:location}/share/aclocal:${intltool:location}/share/aclocal
   FIREWALLD_DEVEL_ENV=${buildout:parts-directory}/${:_buildout_section_name_}/src
@@ -33,9 +48,9 @@ environment =
 
 [dbus-python]
 recipe = slapos.recipe.cmmi
-version = 1.2.4
+version = 1.2.16
 url = http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${:version}.tar.gz
-md5sum = 7372a588c83a7232b4e08159bfd48fe5 
+md5sum = 51a45c973d82bedff033a4b57d69d5d8
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python${python:version}/site-packages
 environment =
   PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
@@ -83,8 +98,6 @@ environment =
   FFI_LIBS=-L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
   CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${gettext:location}/include -I${libffi:location}/include
   LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
-#  GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
-#  GLIB_LIBS=-L${glib:location}/lib -lgobject-2.0 -lgthread-2.0 -pthread -lrt -lglib-2.0
   GIO_LIBS=-L${glib:location}/lib -lgio-2.0
   GI_CFLAGS=-I${gobject-introspection:location}/include/gobject-introspection-1.0
   GI_LIBS=-L${gobject-introspection:location}/lib -lgirepository-1.0
@@ -100,18 +113,32 @@ md5sum = 893752ba2e93a1e96334dfee19f884ad
 [firewalld-patch]
 recipe = plone.recipe.command
 python = ${buildout:bin-directory}/${firewalld-eggs:interpreter}
+stop-on-error = True
 command =
-  sed -i 's#/usr/bin/python -Es#${:python}#' ${firewalld:location}/bin/firewall-cmd
-  sed -i 's#/usr/bin/python -Es#${:python}#' ${firewalld:location}/sbin/firewalld
-  sed -i 's#DefaultZone=public#DefaultZone=trusted#' ${firewalld:location}/etc/firewalld/firewalld.conf
-  sed -i 's#/usr/lib/firewalld#${firewalld:location}/lib/firewalld#' ${firewalld:python-egg}/firewall/config/__init__.py
-  sed -i 's#/usr/share/#${firewalld:location}/share#' ${firewalld:python-egg}/firewall/config/__init__.py
+  set -e
+  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-applet
+  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-cmd
+  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-config
+  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-offline-cmd
+  sed -i 's#python2.7#${:python}#' ${firewalld:location}/${firewalld:sbin-dir}/firewalld
+
+  sed -i 's#python2.7 /usr/bin/firewall-config#${:python} ${firewalld:location}/bin/firewall-config#' ${firewalld:etc-dir}/lockdown-whitelist.xml
+
+  sed -i 's#DefaultZone=public#DefaultZone=trusted#' ${firewalld:etc-dir}/firewalld.conf
+  sed -i 's#FirewallBackend=nftables#FirewallBackend=iptables#' ${firewalld:etc-dir}/firewalld.conf
+
+  sed -i "s#'/etc/firewalld'#'${firewalld:etc-dir}'#"     ${firewalld:python-egg}/firewall/config/__init__.py
+  sed -i "s#'/usr/lib/firewalld'#'${firewalld:location}/lib/firewalld'#" ${firewalld:python-egg}/firewall/config/__init__.py
+  sed -i "s#'/usr/share/'#'${firewalld:location}/share'#"                ${firewalld:python-egg}/firewall/config/__init__.py
+
   sed -i "s#import sys#import sys, os\n\nos.environ['GI_TYPELIB_PATH'] = '${gobject-introspection:location}/lib/girepository-1.0/'#" ${:python}
-  sed -i 's#<syslog/>#<!-- no syslog -->#' ${dbus:location}/etc/dbus-1/system.conf
   sed -i 's#<user>messagebus</user>#<user>slapsoft</user>#' ${dbus:location}/share/dbus-1/system.conf
-  cp -f ${firewalld:location}/lib/firewalld/zones/trusted.xml ${firewalld:location}/etc/firewalld/zones/
-  cp -f ${firewalld:location}/etc/dbus-1/system.d/FirewallD.conf ${dbus:location}/share/dbus-1/system.d/
-  mkdir -p ${buildout:directory}/sbin
+  cp -f ${firewalld:location}/lib/firewalld/zones/trusted.xml ${firewalld:etc-dir}/zones/
+  cp -f ${firewalld:location}/share/dbus-1/system.d/FirewallD.conf ${dbus:location}/share/dbus-1/system.d/
+  mkdir -p ${firewalld:location}/sbin
+  echo -n '#!/bin/sh\nLD_LIBRARY_PATH=${nftables:location}/lib exec ${firewalld:location}/${firewalld:sbin-dir}/firewalld "$@"' > ${firewalld:location}/sbin/firewalld
+  chmod a+x ${firewalld:location}/sbin/firewalld
+
 update-command = ${:command}
 stop-on-error = true
 
@@ -127,3 +154,4 @@ extra-paths =
   ${dbus-python:python-egg}
   ${firewalld:python-egg}
   ${pygobject3:python-egg}
+  ${nftables:python-egg}

component/fish-shell/buildout.cfg

@@ -9,12 +9,13 @@ extends =
   ../ncurses/buildout.cfg
   ../readline/buildout.cfg
   ../gettext/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 [fish-shell]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/fish-shell/fish-shell/releases/download/3.1.0/fish-3.1.0.tar.gz
-md5sum = 8c9995a5a6d07ce05a1413ca24e16691
+url = https://github.com/fish-shell/fish-shell/releases/download/3.2.2/fish-3.2.2.tar.xz
+md5sum = 606253699ce41991b03a93bcc6047d51
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}
@@ -26,6 +27,7 @@ environment =
   CMAKE_INCLUDE_PATH=${bzip2:location}/include:${zlib:location}/include:${ncurses:location}/include:${gettext:location}/include:${readline:location}/include
   CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  PATH=${xz-utils:location}/bin/:%(PATH)s
 
 CMAKE_CFLAGS = -I${bzip2:location}/include -I${zlib:location}/include -I${ncurses:location}/include -I${gettext:location}/include -I${readline:location}/include
 CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${zlib:location}/lib:${ncurses:location}/lib:${gettext:location}/lib:${readline:location}/lib

component/fluentd/buildout.cfg

@@ -10,9 +10,24 @@ recipe = rubygemsrecipe
 url = https://rubygems.org/rubygems/rubygems-2.4.8.zip
 ruby-executable = ${ruby:location}/bin/ruby
 gems =
+  msgpack==1.3.3
+  cool.io==1.4.6
+  http_parser.rb==0.6.0
+  sigdump==0.2.4
+  serverengine==2.2.3
+  strptime==0.1.9
+  thread_safe==0.3.6
+  tzinfo==1.2.9
+  tzinfo-data==1.2021.1
+  yajl-ruby==1.4.1
   fluentd==0.14.14
+  httpclient==2.8.3
+  json==2.5.1
+  td-client==0.8.85
   fluent-plugin-td==0.10.29
-gem-options = --no-ri --no-rdoc --with-icu-lib=${icu:location}/lib/ --with-icu-dir=${icu:location}/
+gem-options =
+  --with-icu-lib=${icu:location}/lib/
+  --with-icu-dir=${icu:location}/
 environment =
   LDFLAGS = -L${icu:location}/lib -Wl,-rpath=${icu:location}/lib
   CFLAGS = -I${icu:location}/include

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/fontconfig/buildout.hash.cfg

 [template-fonts-conf]
 filename = fonts.conf.in
-md5sum = 6967e553630d107fc0a59b14de8b0251
+md5sum = a31030785c7b54bfd33320c87f6b5699

component/fontconfig/fonts.conf.in

@@ -14,10 +14,14 @@
  #}
 <fontconfig>
   <cachedir>{{ cachedir | escape}}</cachedir>
-  {% for font in fonts.splitlines() -%}
-    <dir>{{ font | escape}}</dir>
-  {% endfor %}
-  {% for include in includes.splitlines() -%}
-    <include>{{ include | escape}}</include>
-  {% endfor %}
-</fontconfig>
+  {%- for font in fonts.splitlines() -%}
+    {% if font.strip() %}
+    <dir>{{ font.strip() | escape}}</dir>
+    {%- endif %}
+  {%- endfor %}
+  {%- for include in includes.splitlines() -%}
+    {% if include.strip() %}
\ No newline at end of file
+    <include>{{ include.strip() | escape}}</include>
+    {%- endif %}
+  {%- endfor %}
+</fontconfig>

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.5
 
 [gcc-common]
 recipe = slapos.recipe.cmmi
@@ -33,6 +33,9 @@ configure-options =
   --with-ld=@@LOCATION@@/bin/ld
   --with-as=${binutils:location}/bin/as
   --with-internal-zlib
+  ${:extra-configure-options}
+extra-configure-options =
+
 post-install =
   cd '%(location)s/bin'
   ln -s gcc cc
@@ -42,13 +45,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
@@ -56,6 +57,12 @@ environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
   PATH=${binutils:location}/bin:${gettext:location}/bin:${perl:location}/bin:${tar:location}/bin:%(PATH)s
 
+[gcc-common:os.path.isdir('/usr/lib/arm-linux-gnueabihf') and os.access('/proc/device-tree/model', os.R_OK) and 'OLinuXino-LIME2' in open('/proc/device-tree/model').read()]
+extra-configure-options =
+  --with-arch=armv7-a
+  --with-fpu=vfp
+  --with-float=hard
+
 [gcc-5.5]
 <= gcc-common
 version = 5.5.0
@@ -66,17 +73,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.5]
 <= 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.5.0
+md5sum = 0c1f625768840187ef3b10adebe8e3b0
+
+[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/gdbm/buildout.cfg

 [buildout]
-extends =
-  ../patch/buildout.cfg
 parts =
   gdbm
 
 [gdbm]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 1.18
-url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
-md5sum = e316f8e4a3e7e4f23955be65d54fec48
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/extern_parseopt.patch#30baeaaa0c6a6e6be8cf56a875726619
+version = 1.19
+url = http://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
+md5sum = aeb29c6a90350a4c959cd1df38cd0a7e
 configure-options =
   --disable-static
   --enable-libgdbm-compat
-environment =
-  PATH=${patch:location}/bin:%(PATH)s
-# install as parts/gdbm/include/gdbm/*.h etc. because some softwares
-# (eg. python's dbmmodule.c extension) assume the location like this.
-includedir = @@LOCATION@@/include
-make-targets =
-  install includedir=${:includedir}/gdbm && rm -f ${:includedir}/*.h && ln -sf gdbm/gdbm.h ${:includedir}/gdbm.h

component/gdbm/extern_parseopt.patch

---- a/src/parseopt.c
-+++ b/src/parseopt.c
-@@ -255,8 +255,8 @@
- }
- 
- char *parseopt_program_name;
--char *parseopt_program_doc;
--char *parseopt_program_args;
-+extern char *parseopt_program_doc;
-+extern char *parseopt_program_args;
- const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
- void (*parseopt_help_hook) (FILE *stream);
- 

component/gettext/buildout.cfg

@@ -11,8 +11,8 @@ extends =
 [gettext]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.1.tar.lz
-md5sum = d838d2c4144261d0c5fbab4a0aceb5c1
+url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.21.tar.lz
+md5sum = 65c9a4d0a2d180e3c2afc2b3440382ef
 
 configure-options =
   --disable-static

component/ghostscript/buildout.cfg

@@ -2,17 +2,22 @@
 extends =
   ../fontconfig/buildout.cfg
   ../freetype/buildout.cfg
+  ../libjpeg/buildout.cfg
   ../libtiff/buildout.cfg
   ../libxml2/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../tesseract/buildout.cfg
   ../xz-utils/buildout.cfg
 
 parts = ghostscript
 
-[ghostscript-common]
+[ghostscript]
 recipe = slapos.recipe.cmmi
 shared = true
-pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
+url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9540/ghostscript-9.54.0.tar.gz
+md5sum = 5d571792a8eb826c9f618fb69918d9fc
+pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
+# XXX --with-tessdata work arounds a slaprunner bug of having softwares installed in a path containing //
 configure-options =
   --disable-cups
   --disable-threadsafe
@@ -20,18 +25,18 @@ configure-options =
   --without-libidn
   --without-x
   --with-drivers=FILES
-# it seems that parallel build sometimes fails for ghostscript.
-make-options = -j1
+  --with-tessdata=$(python -c 'print("""${:tessdata-location}""".replace("//", "/"))')
 environment =
   PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
-  LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -Wl,-rpath=${freetype:location}/lib -Wl,-rpath=${libtiff:location}/lib
+  CFLAGS=-I${libjpeg:location}/include
+  LDFLAGS=-Wl,-rpath=${fontconfig:location}/lib -Wl,-rpath=${freetype:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib
   LD_LIBRARY_PATH=${fontconfig:location}/lib:${freetype:location}/lib:${libtiff:location}/lib:${libxml2:location}/lib
 
-[ghostscript]
-<= ghostscript-9
+# configure gives priority to local jpeg library and refuse mixing local libjpeg with "system" libtiff.
+# We remove this local jpeg library source folder so that configure picks up the slapos versions of these libraries.
+pre-configure = rm -r jpeg
 
-[ghostscript-9]
-<= ghostscript-common
-url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs950/ghostscript-9.50.tar.xz
-md5sum = 6cea6bae4a7cdfac6ccb09f07f0caf8c
+post-make-hook = ${tesseract-download-traineddata:post-make-hook}
+tessdata-location = @@LOCATION@@/share/tessdata/
+tessdata-urls = ${tesseract-download-traineddata:urls}

component/gmp/buildout.cfg

@@ -9,10 +9,12 @@ parts =
 [gmp]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 6.1.1
+version = 6.2.1
 url = https://gmplib.org/download/gmp/gmp-${:version}.tar.xz
-md5sum = e70e183609244a332d80529e7e155a35
+md5sum = 0b82665c4a92fd2ade7440c13fcaa42b
 configure-options =
+  --disable-assembly
+  --host=none-pc-linux-gnu
   --enable-cxx
   --disable-static
 environment =

component/golang/buildout.cfg

@@ -5,8 +5,9 @@ extends =
   ../gcc/buildout.cfg
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ./buildout.hash.cfg
 
-parts = gowork
+parts = gowork go
 
 # ---- Go builds itself ----
 
@@ -16,7 +17,7 @@ shared = true
 configure-command = :
 location = @@LOCATION@@
 make-binary =
-make-targets= cd src && ./all.bash && cp -alf .. ${:location}
+make-targets= cd src && unset GOBIN && ./all.bash && cp -alf .. ${:location}
 # some testdata files have an issue with slapos.extension.strip.
 post-install = ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
 environment =
@@ -29,7 +30,7 @@ environment =
 url = https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz
 md5sum = dbf727a4b0e365bf88d97cbfde590016
 environment-extra =
-make-targets= cd src && ./make.bash && cp -alf .. ${:location}
+make-targets= cd src && unset GOBIN && ./make.bash && cp -alf .. ${:location}
 
 
 [golang1.12]
@@ -41,57 +42,86 @@ md5sum = 6b607fc795391dc609ffd79ebf41f080
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
-[golang1.13]
+[golang1.15]
 <= golang-common
-url = https://golang.org/dl/go1.13.15.src.tar.gz
-md5sum = 4f4af14d88352a62761a9dcedf863ac0
+url = https://golang.org/dl/go1.15.12.src.tar.gz
+md5sum = b3a5dafa7028fa00083ce4aeaf5bcb9a
 
-# go1.13 needs go1.4 to bootstrap
+# go1.15 needs go1.4 to bootstrap
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
-[golang1.14]
+[golang1.16]
 <= golang-common
-url = https://golang.org/dl/go1.14.9.src.tar.gz
-md5sum = 6f6dd1377421d27ca4bb607283b31738
+url = https://golang.org/dl/go1.16.4.src.tar.gz
+md5sum = 5884a4cb49067b9bcf6e69a1ef44259c
 
-# go1.14 needs go1.4 to bootstrap
+# go1.16 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
+# gowork is the top-level section that defines Go workspace.
+#
+# It specifies global settings that are used to build Go programs:
 #
-# users should add `install` field to [gowork] to describe packages they want to
-# be installed (+ automatically their dependencies are installed too). e.g.
+# - Go toolchain to use, e.g.
 #
 #   [gowork]
-#   install =
-#       lab.nexedi.com/kirr/neo/go/...
-#       github.com/pkg/profile
-#       golang.org/x/perf/cmd/benchstat
+#   golang = ${golang1.15:location}
 #
-# For Cgo support pkg-config is made pre-available by gowork, and users
-# should list paths where to search for pkg-config files, e.g. this way:
+# - For Cgo support pkg-config is made pre-available by gowork, and users
+#   should list paths where to search for pkg-config files, e.g. this way:
 #
 #   [gowork]
 #   cpkgpath =
 #       ${sqlite3:location}/lib/pkgconfig
 #       ${zlib:location}/lib/pkgconfig
 #
-# It is also possible to specify Go build flags used for compilation e.g. this way:
+# - It is also possible to specify Go build flags used for compilation e.g. this way:
 #
 #   [gowork]
 #   buildflags = -race
+#
+# - If some environment variables are needed during the build, they can be
+#   added with environment option, e.g. this way:
+#
+#   [gowork]
+#   environment =
+#     CGO_ENABLED = 1
+#     FOO = bar
+#
+# Users can also add `install` field to [gowork] to request Go programs to be
+# automatically installed, for example:
+#
+#   [gowork]
+#   install =
+#       lab.nexedi.com/kirr/neo/go/...@v0.0.0-20210103165133-f3effa6c535f
+#       golang.org/x/tools/gopls@v0.4.3
+#       ${helloweb:location}/go:./...
+#
+#
+# ${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
-bin	= ${:directory}/bin
+directory = ${gowork.dir:directory}
+src	= ${gowork.dir:src}
+bin	= ${gowork.dir:bin}
 depends = ${gowork.goinstall:recipe}
 
 # go version used for the workspace (possible to override in applications)
-golang  = ${golang1.14:location}
+golang  = ${golang1.16:location}
 
 # no special build flags by default
 buildflags =
@@ -99,6 +129,12 @@ buildflags =
 # empty pkg-config path by default
 cpkgpath =
 
+# by default don't `go install` anything
+install =
+
+# empty key=value environment by default
+environment =
+
 # everything is done by dependent parts
 recipe  = plone.recipe.command
 command = :
@@ -108,25 +144,53 @@ env.sh  = ${gowork-env.sh:output}
 
 [gowork-env.sh]
 recipe	= slapos.recipe.template
-url     = ${:_profile_base_location_}/goenv.sh.in
-output	= ${gowork:directory}/env.sh
-depends = ${gowork.mkdir:recipe}
-md5sum	= f89553711ea95ad1f6727b76747a62bf
+url     = ${:_profile_base_location_}/${:filename}
+output	= ${gowork.dir:directory}/env.sh
+depends = ${gowork.dir:recipe}
 
-[gowork.mkdir]
+[gowork.dir]
+directory = ${buildout:directory}/go.work
+src	= ${:directory}/src
+bin	= ${:directory}/bin
 # NOTE do not use slapos.cookbook:mkdirectory here - if anything in software (not instance)
 # uses slapos.cookbook:* in recipe - slapos.cookbook will get compiled against system
 # libxml/libxslt or fail to bootstrap at all if those are not present.
 recipe  = plone.recipe.command
-command = mkdir -p ${gowork:directory}
+command = mkdir -p ${:directory}
 update-command = ${:command}
 stop-on-error = true
 
-# install go packages
-# clients should put package list to install to gowork:install ("..." requests installing everything)
+# install go programs
+# clients can put program list to install to gowork:install
 [gowork.goinstall]
 recipe  = plone.recipe.command
-command = bash -c ". ${gowork:env.sh} && go install ${gowork:buildflags} -v $(echo -n '${gowork:install}' |tr '\n' ' ')"
+command = bash -c ". ${gowork:env.sh}
+	set -e
+	for x in $(echo -n '${gowork:install}' |tr '\n' ' '); do
+		case "\$x" in
+
+		# external module, e.g. golang.org/x/tools/gopls@v0.4.3
+		*@*)
+			echo GOMOD \$x
+			GO111MODULE=on go install ${gowork:buildflags} -v \$x
+			;;
+
+		# locally-cloned module source, e.g. <module-src-location>:./...
+		*:*)
+			echo GOMODSRC \$x
+			dir=\"\$${x%%:*}\"
+			arg=\"\$${x#*:}\"
+			(cd \$dir && GO111MODULE=on go install ${gowork:buildflags} -v \$arg)
+			;;
+
+		# non-module
+		*)
+			echo GOPKG \$x
+			GO111MODULE=off go install ${gowork:buildflags} -v \$x
+			;;
+		esac
+	done
+	"
 update-command = ${:command}
 stop-on-error = true
 
@@ -144,4 +208,4 @@ git-executable = ${git:location}/bin/git
 # generated with the help of gowork-snapshot tool.
 [go-git-package]
 <= git-repository
-location = ${gowork:src}/${:go.importpath}
+location = ${gowork.dir:src}/${:go.importpath}

component/golang/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).
+
+[gowork-env.sh]
+filename = goenv.sh.in
+md5sum = f6d0fc24e3f08f27bc2bd85003ca5ec2

component/golang/goenv.sh.in

@@ -2,6 +2,17 @@
 # Usage: env.sh [/path/to/env.sh]
 
 # ---- 8< ---- (buildout substitution here)
+# extend environment
+while read x ; do
+  k=$(echo $x | cut -d '=' -f 1  | sed -e 's/[[:space:]]*$//' )
+  v=$(echo $x | cut -d '=' -f 2- | sed -e 's/^[[:space:]]*//' )
+  if [ -n "$k" ]
+    then export $k="$v"
+  fi
+done <<-EOF
+  ${gowork:environment}
+EOF
+
 # PATH so that go & friends work out of the box
 export PATH=${gowork:golang}/bin:${git:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:${gcc:prefix}/bin:$PATH
 X=${gowork:directory}
@@ -10,11 +21,18 @@ export PKG_CONFIG_PATH=$(echo -n "${gowork:cpkgpath}" |tr '\n' ':'):$PKG_CONFIG_
 # ---- 8< ----
 
 export GOPATH=$X:$GOPATH
-export PATH=$X/bin:$PATH
-export PS1="(`basename $X`) $PS1"
+export GOBIN=$X/bin
 export GOCACHE=$X/cache
+export GOMODCACHE=$X/pkg/mod
 export GOENV=$X/goenv
 
+export PATH=$GOBIN:$PATH
+export PS1="(`basename $X`) $PS1"
+
+# by default make go run in module-aware mode only if go.mod is present, and in GOPATH-mode otherwise.
+# (we still have some GOPATH uses; TODO -> default to "on" after GOPATH-mode usage is gone)
+export GO111MODULE=auto
+
 # strip trailing : from $GOPATH, $PKG_CONFIG_PATH
 GOPATH=$${GOPATH%:}
 PKG_CONFIG_PATH=$${PKG_CONFIG_PATH%:}

component/groonga/buildout.cfg

@@ -15,12 +15,12 @@ extends =
 [groonga]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://packages.groonga.org/source/groonga/groonga-10.0.5.tar.gz
-md5sum = 12f5c7b522afd72d0be2caa1e5f254da
+url = https://packages.groonga.org/source/groonga/groonga-11.0.2.tar.gz
+md5sum = 753ba6fad77598baf93615c4b9c535b1
 groonga-plugin-dir =  @@LOCATION@@/lib/groonga/plugins/
 # temporary patch to respect more tokens in natural language mode.
 patches =
-  ${:_profile_base_location_}/groonga.patch#9ed02fbe8400402d3eab47eee149978b
+  ${:_profile_base_location_}/groonga.patch#5d831331ddfdcd87e91b68949c339a1d
 patch-options = -p1
 configure-options =
   --disable-static

component/groonga/groonga.patch

-diff --git a/lib/ii.c b/lib/ii.c
-index d10b84d..e20bdce 100644
 --- a/lib/ii.c
 +++ b/lib/ii.c
-@@ -5695,7 +5695,9 @@ grn_ii_similar_search(grn_ctx *ctx, grn_ii *ii,
-     ? (optarg->similarity_threshold > GRN_HASH_SIZE(h)
+@@ -10387,7 +10387,9 @@
+     ? (data->optarg->similarity_threshold > GRN_HASH_SIZE(h)
         ? GRN_HASH_SIZE(h)
-        : optarg->similarity_threshold)
+        : data->optarg->similarity_threshold)
 -    : (GRN_HASH_SIZE(h) >> 3) + 1;
 +    : (GRN_HASH_SIZE(h) < 8
 +       ? GRN_HASH_SIZE(h)

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/h5py/buildout.cfg

@@ -17,6 +17,8 @@ egg = h5py
 setup-eggs = 
   ${cython:egg}
   ${numpy:egg}
+  pkgconfig
+  six
 include-dirs =
   ${hdf5:location}/include
 library-dirs =

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.17.tar.gz
-md5sum = 786a967c73cc1455c938d42fbe333bfe
+url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.22.tar.gz
+md5sum = 4d6d5debca0d1bcf51293fb58914f1a3
 configure-command = true
 # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
 # otherwise use "generic".

component/headless-chromium/buildout.cfg

@@ -85,6 +85,6 @@ configure-command =
 make-binary = ninja -C ${:location} chrome
 environment =
   PKG_CONFIG_PATH=${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:$PKG_CONFIG_PATH
-  PATH=${chromedriver:location}:${dbus:location}/bin:${depot_tools:location}:${pkgconfig:location}/bin:${ninja:path}/:${bison:location}/bin:${gperf:location}/bin:${xserver:location}/bin:%(PATH)s
+  PATH=${chromedriver:location}:${dbus:location}/bin:${depot_tools:location}:${pkgconfig:location}/bin:${ninja:location}/bin:${bison:location}/bin:${gperf:location}/bin:${xserver:location}/bin:%(PATH)s
   CPATH=${dbus:location}/include/dbus-1.0:${dbus:location}/lib/dbus-1.0/include/:${freetype:location}/include/freetype2:${libffi:location}/include:${mpfr:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline:location}/include:${sqlite3:location}/include:${zlib:location}/include:${bzip2:location}/include:$CPATH
   LD_LIBRARY_PATH=${alsa:location}/lib:${gconf:location}/lib:${libXScrnSaver:location}/lib:${glib:location}/lib:${atk:location}/lib:${cairo:location}/lib:${cups:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib/:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcomposite:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXi:location}/lib:${libXrender:location}/lib/:${libXtst:location}/lib:${libexpat:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libpng12:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${mesa:location}/lib:${nspr:location}/lib:${nss:location}/lib:${pango:location}/lib:${pcre:location}/lib:${pixman:location}/lib:${sqlite3:location}/lib:${xdamage:location}/lib:${xfixes:location}/lib:${zlib:location}/lib:$LD_LIBRARY_PATH

component/helloweb/buildout.cfg

@@ -4,7 +4,6 @@ extends =
   ../git/buildout.cfg
   ../ruby/buildout.cfg
   ../golang/buildout.cfg
-  gowork.cfg
 
 parts =
   helloweb-python
@@ -21,11 +20,15 @@ parts =
 # cloning+building manually. However to be able to use third-party Go packages
 # we need gowork support, and other languages can use helloweb repository from
 # under gowork as well.
+[helloweb]
+<= go-git-package
+go.importpath = lab.nexedi.com/nexedi/helloweb
+repository    = https://lab.nexedi.com/nexedi/helloweb.git
+revision      = a7c788ae71
+
 [gowork]
 install =
-    lab.nexedi.com/nexedi/helloweb/go/...
-
-golang  = ${golang1.14:location}
+    ${helloweb:location}/go:./...
 
 # -*- go -*-
 [helloweb-go]
@@ -44,7 +47,7 @@ input   = inline:
 [helloweb-egg]
 recipe  = zc.recipe.egg:develop
 egg     = helloweb
-setup   = ${gowork:src}/lab.nexedi.com/nexedi/helloweb/python/
+setup   = ${helloweb:location}/python/
 
 [helloweb-python]
 recipe  = zc.recipe.egg:scripts
@@ -86,7 +89,7 @@ environment =
 
 [helloweb-ruby-bundle]
 recipe  = slapos.recipe.cmmi
-path    = ${gowork:src}/lab.nexedi.com/nexedi/helloweb/ruby/
+path    = ${helloweb:location}/ruby/
 
 configure-command = :
 make-binary =

component/helloweb/gowork.cfg

-# Code generated by gowork-snapshot; DO NOT EDIT.
-
-# list of go git repositories to fetch
-[gowork.goinstall]
-depends_gitfetch  =
-    ${go_lab.nexedi.com_nexedi_helloweb:recipe}
-
-
-[go_lab.nexedi.com_nexedi_helloweb]
-<= go-git-package
-go.importpath = lab.nexedi.com/nexedi/helloweb
-repository    = https://lab.nexedi.com/nexedi/helloweb.git
-revision      = 8bfedac656

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/jq/buildout.cfg

+[buildout]
+parts =
+  jq
+extends =
+  ../oniguruma/buildout.cfg
+
+[jq]
+recipe = slapos.recipe.cmmi
+url = https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz
+md5sum = e68fbd6a992e36f1ac48c99bbf825d6b
+shared = true
+configure-options =  
+  --with-oniguruma=${oniguruma:location}
+

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]
+extra-eggs =
+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.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
+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:
+# 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)

software/jupyter/jupyter_set_password.cgi.jinja → component/jupyter-py2/jupyter_set_password.cgi.jinja

@@ -61,4 +61,3 @@ print """<div class="pure-control-group">
 <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/jupyter/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../numpy/openblas.cfg
   ../matplotlib/buildout.cfg
   ../ipython/buildout.cfg
+  ../python-cffi/buildout.cfg
   ../python-pyzmq/buildout.cfg
   ../scipy/buildout.cfg
   ../scikit-learn/buildout.cfg
@@ -14,6 +15,11 @@ parts =
   jupyter
   jupyter-notebook-scripts
 
+[argon2-cffi]
+recipe = zc.recipe.egg:custom
+egg = ${:_buildout_section_name_}
+setup-eggs = ${python-cffi:egg}
+
 [jupyter-env]
 <= numpy-env
 
@@ -46,6 +52,9 @@ eggs =
 # additional eggs for jupyterlab
   jupyterlab
   jupyterlab-launcher
+  ${:extra-eggs}
+extra-eggs =
+  ${argon2-cffi:egg}
 
 interpreter = pythonjupyter
 

component/leptonica/buildout.cfg

@@ -7,17 +7,14 @@ extends =
   ../libtiff/buildout.cfg
   ../webp/buildout.cfg
   ../giflib/buildout.cfg
-  ../patch/buildout.cfg
 
 [leptonica]
 recipe = slapos.recipe.cmmi
-url = http://www.leptonica.com/source/leptonica-1.76.0.tar.gz
-md5sum = a263a5e4f7e8f8a661fb121a265d2d20
 shared = true
+url = http://www.leptonica.org/source/leptonica-1.80.0.tar.gz
+md5sum = d640d684234442a84c9e8902f0b3ff36
 configure-options =
   --disable-static
-
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib
-  PATH=${patch:location}/bin:%(PATH)s

component/leptonica/leptonica-1.69-zlib-include.patch

-This patch is originally taken from:
-
-http://leptonica.googlecode.com/issues/attachment?aid=560001000&name=zlib-include.patch&token=m2sugSYxB4xwAuNgrKXyHTxBYNg%3A1337345966091
-
-To fix the following issue with leptonica:
-
-http://code.google.com/p/leptonica/issues/detail?id=56
-
-diff -Nurd -x'*~' leptonica-1.68.orig/src/pngio.c leptonica-1.68/src/pngio.c
---- leptonica-1.68.orig/src/pngio.c	2011-02-01 00:41:12.000000000 -0500
-+++ leptonica-1.68/src/pngio.c	2011-07-09 09:17:17.000000000 -0400
-@@ -108,6 +108,10 @@
- 
- #include "png.h"
- 
-+#ifdef HAVE_LIBZ
-+#include "zlib.h"
-+#endif
-+
- /* ----------------Set defaults for read/write options ----------------- */
-     /* strip 16 bpp --> 8 bpp on reading png; default is for stripping */
- static l_int32   var_PNG_STRIP_16_TO_8 = 1;

component/libexpat/buildout.cfg

@@ -7,8 +7,8 @@ parts =
 [libexpat]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/libexpat/libexpat/releases/download/R_2_2_9/expat-2.2.9.tar.lz
-md5sum = c356e4f2092df4f0b0ffef904f001842
+url = https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.lz
+md5sum = 074cab91a2f27dc8cd6c282effaa8ffd
 configure-options =
   --disable-static
   --without-xmlwf

component/libffi/buildout.cfg

@@ -8,13 +8,13 @@ parts =
 [libffi]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 3.2.1
-url = ftp://sourceware.org/pub/libffi/libffi-${:version}.tar.gz
-md5sum = 83b89587607e3eb65c70d361f13bab43
+version = 3.3
+url = http://sourceware.org/pub/libffi/libffi-${:version}.tar.gz
+md5sum = 6313289e32f1d38a9df4770b014a2ca7
 location = @@LOCATION@@
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/includedir.diff#e430307d16a0d215a24ec2acff23d184
+  ${:_profile_base_location_}/libdir.patch#f7274250c8ca43b10e7fc968f730b833
 configure-options =
   --disable-static
   --enable-portable-binary

component/libffi/includedir.diff

-Index: b/libffi.pc.in
-===================================================================
---- a/libffi.pc.in
-+++ b/libffi.pc.in
-@@ -2,10 +2,10 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- toolexeclibdir=@toolexeclibdir@
--includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includedir=@includedir@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces
- Version: @PACKAGE_VERSION@
--Libs: -L${toolexeclibdir} -lffi
-+Libs: -L${libdir} -lffi
- Cflags: -I${includedir}
-Index: b/include/Makefile.am
-===================================================================
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign
- DISTCLEANFILES=ffitarget.h
- EXTRA_DIST=ffi.h.in ffi_common.h
- 
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)
- nodist_includes_HEADERS = ffi.h ffitarget.h
-Index: b/include/Makefile.in
-===================================================================
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -314,7 +314,7 @@ top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign
- DISTCLEANFILES = ffitarget.h
- EXTRA_DIST = ffi.h.in ffi_common.h
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includesdir = $(includedir)
- nodist_includes_HEADERS = ffi.h ffitarget.h
- all: all-am
- 

component/libffi/libdir.patch

+--- a/libffi.pc.in
++++ b/libffi.pc.in
+@@ -7,5 +7,5 @@ prefix=@prefix@
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
+ Version: @PACKAGE_VERSION@
+-Libs: -L${toolexeclibdir} -lffi
++Libs: -L${libdir} -lffi
+ Cflags: -I${includedir}

component/liburing/buildout.cfg

+[buildout]
+parts =
+  liburing
+
+[liburing]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/axboe/liburing/archive/refs/tags/liburing-2.0.tar.gz
+md5sum = 022bb540e8ab5c9916609145f020926f

component/libxml2/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 [libxml2]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://xmlsoft.org/sources/libxml2-2.9.7.tar.gz
-md5sum = 896608641a08b465098a40ddf51cefba
+url = http://xmlsoft.org/sources/libxml2-2.9.10.tar.gz
+md5sum = 10942a1dc23137a8aa07f0639cbfece5
 configure-options =
   --disable-static
   --without-python

component/libxslt/buildout.cfg

@@ -7,12 +7,13 @@ parts =
   libxslt
 
 [libxslt]
-url = ftp://xmlsoft.org/libxslt/libxslt-1.1.32.tar.gz
-md5sum = 1fc72f98e98bf4443f1651165f3aa146
+url = ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz
+md5sum = db8765c8d076f1b6caafd9f2542a304a
 recipe = slapos.recipe.cmmi
 shared = true
+# --disable-static is temporarilly removed due to build error
+# with xml2-config that does not support '--dynamic' argument.
 configure-options =
-  --disable-static
   --with-libxml-prefix=${libxml2:location}
   --without-crypto
   --without-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/lunzip/buildout.cfg

@@ -5,7 +5,7 @@ parts =
 [lunzip]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://download.savannah.gnu.org/releases-redirect/lzip/lunzip/lunzip-1.7.tar.gz
-md5sum = cb37bd46590a78bd19a77748b3a097ee
+url = http://download.savannah.gnu.org/releases-redirect/lzip/lunzip/lunzip-1.12.tar.gz
+md5sum = 09caf2475c58aa40e94b599a4f7a2d13
 configure-options =
   --disable-static

component/lxml-python/buildout.cfg

@@ -8,7 +8,8 @@ parts =
   lxml-python
 
 [lxml-python-env]
-XSLT_CONFIG = ${libxslt:location}/bin/xslt-config
+WITH_XSLT_CONFIG = ${libxslt:location}/bin/xslt-config
+WITH_XML2_CONFIG = ${libxml2:location}/bin/xml2-config
 
 [lxml-python]
 recipe = zc.recipe.egg:custom

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.19
+md5sum = bf60c7a3feac5854745cd1ad5133f09a
 location = @@LOCATION@@
 pre-configure =
   set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
@@ -96,8 +96,8 @@ post-install =
 # as plugin-dir ( https://mariadb.com/kb/en/server-system-variables/#plugin_dir )
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://packages.groonga.org/source/mroonga/mroonga-10.05.tar.gz
-md5sum = a690811be5cc0593acc12ecf4ac9c40f
+url = https://packages.groonga.org/source/mroonga/mroonga-11.02.tar.gz
+md5sum = 0729c74efc92bfc404b88597488d07e9
 pre-configure = 
   rm -rf fake_mariadb_source
   mkdir -p fake_mariadb_source
@@ -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 because 10.4 causes crash
+### (we just override here for easier revert)
+[mariadb-10.3]
+<= mariadb-10.4
+version = 10.3.29
+md5sum = a5adad1c4fb1717d7fe6d608fd4d40de
+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 because 10.4 causes crash