Merge branch 'master' into master+ZODB4-wc2

* master: (502 commits)
  component/theia: version up 1.33.0
  component/theia: update generate_download_plugins_cfg.py
  component/theia: update plugins
  software/theia: don't include jdk/java extensions
  software/mosquitto: Added tests ...
  stack/erp5: Fix NEO URL formatting for WCFS
  golang: Switch default to Go1.18
  golang: Add go version 1.18
  stack/slapos: version up ZConfig 3.6.2
  unstable/component/kerberos/: remove
  fixup! wendelin.core: v↑ 2.0.alpha2.post2 -> 2.0.alpha3
  wendelin.core: v↑ 2.0.alpha2.post2 -> 2.0.alpha3
  golang: v↑ go1.17 (1.17.6 -> 1.17.13)
  Explicitly pin needed versions for Python2.
  stack/erp5: fix numpy and scipy versions
  slapos/ors-amarisoft: md5sum update
  stack/erp5: fix pandas version in erp5
  software/ors-amarisoft: fixup check_cpu_temperature
  component/pandas: fix versions
  Don't hardcode cycler version in software.cfg
  ...

component/ZODB/test-zodb4-wc2.cfg

@@ -23,6 +23,8 @@ parts =
 major = 4-wc2
 [ZODB4-wc2-repository]
 revision =
+[python]
+part = python2.7
 
 # 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
@@ -76,7 +78,9 @@ inline =
         from os.path import dirname
         for m in "ZODB", "persistent", "BTrees", "transaction", "ZEO":
             print(dirname(__import__(m).__file__))
-  """])
+  """],
+    universal_newlines=True,
+  )
   ZODB, persistent, BTrees, transaction, ZEO = where.split()
 
   # run tests for whole ZODB stack

component/apache/buildout.cfg

@@ -22,16 +22,16 @@ extends =
 [apr]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 1.5.2
-md5sum = 4e9769f3349fe11fc0a5e1b224c236aa
+version = 1.7.0
+md5sum = 7a14a83d664e87599ea25ff4432e48a7
 url = https://archive.apache.org/dist/apr/apr-${:version}.tar.bz2
 
 [apr-util]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 1.5.4
+version = 1.6.1
 url = https://archive.apache.org/dist/apr/apr-util-${:version}.tar.bz2
-md5sum = 2202b18f269ad606d70e1864857ed93c
+md5sum = 8ff5dc36fa39a2a3db1df196d3ed6086
 configure-options =
     --with-apr=${apr:location}
     --with-expat=${libexpat:location}
@@ -39,9 +39,9 @@ configure-options =
 [apache]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 2.4.53
+version = 2.4.54
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = f594f137137b5bdff3998dc17e3e9526
+md5sum = 861b43073ab416d689f1fc4dfa087711
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer

component/babeld/buildout.cfg

@@ -6,7 +6,7 @@ recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/babeld.git
 branch = master
 git-executable = ${git:location}/bin/git
-revision = hmac-nxd2
+revision = hmac-nxd3
 
 [babeld]
 recipe = slapos.recipe.cmmi

component/boost-lib/buildout.cfg

@@ -3,15 +3,14 @@ parts =
   boost-lib
 extends =
   ../bzip2/buildout.cfg
-  ../patch/buildout.cfg
   ../zlib/buildout.cfg
   ../xz-utils/buildout.cfg
 
 [boost-lib]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.bz2
-md5sum = ced776cb19428ab8488774e1415535ab
+url = https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2
+md5sum = db0112a3a37a3742326471d20f1a186a
 location = @@LOCATION@@
 configure-command = ./bootstrap.sh --prefix=${:location} --without-icu $${PYTHON:+--with-python=$PYTHON}
 make-binary =
@@ -25,7 +24,3 @@ environment =
   ZLIB_LIBPATH=${zlib:location}/lib
   LZMA_INCLUDE=${xz-utils:location}/include
   LZMA_LIBRARY_PATH=${xz-utils:location}/lib
-patch-options = -p1
-patches =
-  https://sources.debian.org/data/main/b/boost1.67/1.67.0-13+deb10u1/debian/patches/fix-ftbfs-python-3.3.patch#c85fb479d51354deafd1cc7af78f25d2
-patch-binary = ${patch:location}/bin/patch

component/bridge-utils/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+
+parts =
+  brctl
+
+
+[brctl]
+recipe = slapos.recipe.cmmi
+url = https://mirrors.edge.kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-1.7.1.tar.xz
+md5sum = 3e1fee4dc22cac5457c2f6ffb990a518
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s
+pre-configure =
+  aclocal &&
+  autoconf

component/ca-certificates/buildout.cfg

@@ -16,7 +16,7 @@ url = http://deb.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_2
 md5sum = c02582bf9ae338e558617291897615eb
 patch-binary = ${patch:location}/bin/patch
 patches =
-  ${:_profile_base_location_}/ca-certificates-any-python.patch#47c2509f1346bd5af8123fb1a2751c2c
+  ${:_profile_base_location_}/ca-certificates-any-python.patch#c13b44dfc3157dda13a9a2ff97a9d501
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
 patch-options = -p0
 configure-command = true

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

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

component/ceph/buildout.cfg

+[buildout]
+extends =
+  ../boost-lib/buildout.cfg
+  ../cmake/buildout.cfg
+  ../cryptsetup/buildout.cfg
+  ../curl/buildout.cfg
+  ../keyutils/buildout.cfg
+  ../libnl/buildout.cfg
+  ../ncurses/buildout.cfg
+  ../ninja/buildout.cfg
+  ../openssl/buildout.cfg
+  ../patch/buildout.cfg
+  ../snappy/buildout.cfg
+  ../systemd/buildout.cfg
+  ../util-linux/buildout.cfg
+  ../zlib/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+[pyyaml-download]
+recipe = slapos.recipe.build:download
+shared = true
+url = https://files.pythonhosted.org/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849582fe/${:filename}
+filename = PyYAML-5.1.2.tar.gz
+md5sum = 20f87ab421b0271dbf371dc5c1cddb5c
+
+[pyaml-download]
+recipe = slapos.recipe.build:download
+shared = true
+url = https://files.pythonhosted.org/packages/b6/f0/dbb524509ce28f5cfd4e1d9e3ef955f51186cfd1b8297f6e158778c4a8ef/${:filename}
+filename = pyaml-21.10.1.tar.gz
+md5sum = a915f577f6fc62344fa4775b22db9052
+
+[librbd-python]
+recipe = slapos.recipe.build
+shared = true
+pyyaml = ${pyyaml-download:target}
+pyaml = ${pyaml-download:target}
+
+install =
+  import os, sys
+  call([sys.executable, '-m', 'venv', '--clear', location])
+  pip = os.path.join(location, 'bin', 'pip')
+  call([pip, 'install', '--no-index', options['pyyaml'], options['pyaml']])
+  call([pip, 'uninstall', '-y', 'pip', 'setuptools'])
+  # selftest
+  python = os.path.join(location, 'bin', 'python')
+  call([python, '-c', 'import yaml'])
+
+[librbd]
+# CEPH only for librbd
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://download.ceph.com/tarballs/ceph_17.1.0.orig.tar.gz
+md5sum = 1f2ed3f17f76ea71d555428f26644610
+
+# Note: SlapOSifying whole ceph, including it's managers, is an enormous effort
+#       so only "librbd" is provided with header files and this requires
+#       careful selection and ordering of ninja's targets and also manual
+#       copying of common library
+configure-command = cmake
+make-binary = ninja -C build librbd librados
+make-targets = src/librbd/install src/librados/install src/common/install src/include/install ; cp build/lib/libceph-common.so build/lib/libceph-common.so.2 %(location)s/lib ; cd %(location)s/lib
+
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/ceph-minimal.patch#a84c4d30586c8b8f87a581fed5fbf5d8
+
+CMAKE_LIBRARY_PATH="${util-linux:location}/lib;${ncurses:location}/lib;${keyutils:location}/x86_64-linux-gnu;${cryptsetup:location}/lib;${snappy:location}/lib;${systemd:location}/lib64;${zlib:location}/lib;${libnl:location}/lib;${boost-lib:location}/lib;${curl:location}/lib;${openssl:location}/lib"
+CMAKE_INCLUDE_PATH="${systemd:location}/include;${util-linux:location}/include;${boost-lib:location}/include;${ncurses:location}/include;${keyutils:location}/include;${cryptsetup:location}/include;${snappy:location}/include;${zlib:location}/include;${libnl:location}/include;${curl:location}/include;${openssl:location}/include"
+
+environment =
+  PATH=${cmake:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${librbd-python:location}/bin:%(PATH)s
+
+configure-options =
+  -DCMAKE_BUILD_TYPE=RelWithDebInfo
+  -DCMAKE_INCLUDE_PATH=${:CMAKE_INCLUDE_PATH}
+  -DCMAKE_INSTALL_PREFIX=%(location)s
+  -DCMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
+  -DCMAKE_INSTALL_RPATH=%(location)s/lib
+  -DDEBUG_GATHER=OFF
+  -DWITH_SYSTEM_ROCKSDB=OFF
+  -DWITH_BABELTRACE=OFF
+  -DWITH_BLUESTORE=OFF
+  -DWITH_CEPHFS=OFF
+  -DWITH_FUSE=OFF
+  -DWITH_FUSE=OFF
+  -DWITH_KRBD=OFF
+  -DWITH_LIBCEPHFS=OFF
+  -DWITH_LIBCEPHSQLITE=OFF
+  -DWITH_LTTNG=OFF
+  -DWITH_LZ4=OFF
+  -DWITH_MANPAGE=OFF
+  -DWITH_MGR=OFF
+  -DWITH_MGR_DASHBOARD_FRONTEND=OFF
+  -DWITH_OPENLDAP=OFF
+  -DWITH_RADOSGW=OFF
+  -DWITH_RADOSGW_AMQP_ENDPOINT=OFF
+  -DWITH_RADOSGW_BEAST_OPENSSL=OFF
+  -DWITH_RADOSGW_DBSTORE=OFF
+  -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF
+  -DWITH_RADOSGW_LUA_PACKAGES=OFF
+  -DWITH_RADOSGW_SELECT_PARQUET=OFF
+  -DWITH_RBD=ON
+  -DWITH_RDMA=OFF
+  -DWITH_SYSTEMD=OFF
+  -DWITH_SYSTEM_BOOST=ON
+  -DWITH_TESTS=OFF
+  -DWITH_XFS=OFF
+  -GNinja
+  -S . -B build

component/ceph/ceph-minimal.patch

+From 3884a23340defa68ce84590e4a3175d7ea59bbbb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
+Date: Mon, 11 Apr 2022 13:49:17 +0200
+Subject: [PATCH 1/3] cmake: Drop FindCython.cmake
+
+Cython is not required while building minimal ceph - librbd only support,
+and dropping it simplifies build process and removes a lot of additional
+dependencies.
+---
+ cmake/modules/FindCython.cmake | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/cmake/modules/FindCython.cmake b/cmake/modules/FindCython.cmake
+index 8eb9e42f402..e69de29bb2d 100644
+--- a/cmake/modules/FindCython.cmake
++++ b/cmake/modules/FindCython.cmake
+@@ -1,16 +0,0 @@
+-#
+-# Cython
+-#
+-
+-# Try to run Cython, to make sure it works:
+-execute_process(
+-  COMMAND ${Python3_EXECUTABLE} -m cython --version
+-  RESULT_VARIABLE cython_result
+-  ERROR_VARIABLE cython_output)
+-if(cython_result EQUAL 0)
+-  string(REGEX REPLACE "^Cython version ([0-9]+\\.[0-9]+).*" "\\1" CYTHON_VERSION "${cython_output}")
+-else()
+-  message(SEND_ERROR "Could not find cython${PYTHON_VERSION}: ${cython_output}")
+-endif()
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(Cython${PYTHON_VERSION} DEFAULT_MSG CYTHON_VERSION)
+-- 
+2.30.2
+
+
+From 17131b5c0619a8bf2e56e6a8d63649d3d1b2a432 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
+Date: Mon, 11 Apr 2022 13:50:33 +0200
+Subject: [PATCH 2/3] librbd: drop needless udev
+
+It's automatically added by cmake and such configuration results with linker
+not being able to find libudev in case if it lives outside of typical
+directory structure.
+---
+ src/librbd/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt
+index ad23f0975fd..5bd011bf242 100644
+--- a/src/librbd/CMakeLists.txt
++++ b/src/librbd/CMakeLists.txt
+@@ -337,10 +337,6 @@ target_link_libraries(librbd PRIVATE
+   pthread
+   ${CMAKE_DL_LIBS}
+   ${EXTRALIBS} ${GSSAPI_LIBRARIES})
+-if(HAVE_UDEV)
+-  target_link_libraries(librbd PRIVATE
+-    udev)
+-endif()
+ if(ENABLE_SHARED)
+   set_target_properties(librbd PROPERTIES
+     OUTPUT_NAME rbd
+-- 
+2.30.2
+
+
+From 7d16861edea2609e0f6b29b146ed928c63a6ee08 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
+Date: Mon, 11 Apr 2022 13:50:03 +0200
+Subject: [PATCH 3/3] common: Fix missing cmake declarations
+
+Original ceph build process can't find some dependencies in case if it's run
+on machines which do not have installed in standard /usr locations.
+---
+ src/common/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
+index 3bf28659e1c..005d08c1caa 100644
+--- a/src/common/CMakeLists.txt
++++ b/src/common/CMakeLists.txt
+@@ -184,6 +184,8 @@ add_library(common-common-objs OBJECT
+ # retrieved OpenSSL location. This is especially important when cross
+ # compiling (e.g. targeting Windows).
+ target_include_directories(common-common-objs PRIVATE ${OPENSSL_INCLUDE_DIR})
++target_include_directories(common-common-objs PRIVATE ${UDEV_INCLUDE_DIR})
++target_include_directories(common-common-objs PRIVATE ${BLKID_INCLUDE_DIR})
+ # for options.cc
+ target_compile_definitions(common-common-objs PRIVATE
+   "CMAKE_INSTALL_LIBDIR=\"${CMAKE_INSTALL_LIBDIR}\""
+@@ -241,4 +243,5 @@ if(HAVE_KEYUTILS)
+   set(parse_secret_srcs
+     secret.c)
+   add_library(parse_secret_objs OBJECT ${parse_secret_srcs})
++  target_include_directories(parse_secret_objs PRIVATE ${KEYUTILS_INCLUDE_DIR})
+ endif()
+-- 
+2.30.2
+

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 = 0b5ff71a2ede76499e81659aed392057ae910917
+revision = 78d15e091df750952998a6a23f49300a5a0faa53
 
 [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.22/cmake-3.22.1.tar.gz
-md5sum = 83802be08c114bb34729300206488321
+url = https://cmake.org/files/v3.23/cmake-3.23.2.tar.gz
+md5sum = ab3c9ed9578cdb496a252c6733989d78
 environment =
   CMAKE_INCLUDE_PATH=${ncurses:location}/include:${openssl:location}/include
   CMAKE_LIBRARY_PATH=${ncurses:location}/lib:${openssl:location}/lib

component/cryptsetup/buildout.cfg

+[buildout]
+extends =
+  ../util-linux/buildout.cfg
+  ../lvm2/buildout.cfg
+  ../popt/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../json-c/buildout.cfg
+  ../openssl/buildout.cfg
+
+[cryptsetup]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.3.tar.xz
+md5sum = 2303d57e78d4977344188a46e125095c
+configure-options =
+  --disable-external-tokens
+  --disable-ssh-token
+  --disable-luks2-reencryption
+  --disable-cryptsetup
+  --disable-veritysetup
+  --disable-cryptsetup-reencrypt
+  --disable-integritysetup
+  --disable-selinux
+  --disable-udev
+  --disable-kernel_crypto
+  --disable-blkid
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${json-c:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+  CFLAGS=-I${libuuid:location}/include -I${lvm2:location}/include -I${popt:location}/include -I${json-c:location}/include -I${openssl:location}/include
+  LDFLAGS=-L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${lvm2:location}/lib -Wl,-rpath=${lvm2:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -L${json-c:location}/lib -Wl,-rpath=${json-c:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib

component/curl/buildout.cfg

 # libcurl - the multiprotocol file transfer library
-# http://curl.haxx.se/
+# https://curl.se/
 
 [buildout]
 extends =
@@ -17,8 +17,8 @@ parts =
 [curl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://curl.haxx.se/download/curl-7.79.1.tar.xz
-md5sum = 74d3c4ca8aaa6c0619806d6e246e65fb
+url = https://curl.se/download/curl-7.86.0.tar.xz
+md5sum = 19a2165f37941a6f412afc924e750568
 configure-options =
   --disable-static
   --disable-ech

component/cython/buildout.cfg

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

component/cythonplus/buildout.cfg

@@ -9,9 +9,6 @@ parts = cythonplus_env.sh
 [gcc]
 min_version = 8.4
 
-[python]
-part = python3
-
 # Dependencies for the Cython+ test suite
 [eggs]
 recipe = zc.recipe.egg

component/defaults.cfg

@@ -12,7 +12,7 @@ python = python
 
 [python]
 recipe = slapos.recipe.build
-part = python2.7
+part = python3
 init =
   python = self.buildout[options['part']]
   for x in 'location', 'executable', 'version':

component/egg-patch/Zope/PythonScript-2.13.patch

---- Zope2-2.13.30/src/Shared/DC/Scripts/Signature.py	2022-04-25 08:05:09.312966168 +0000
-+++ Zope2-2.13.30/src/Shared/DC/Scripts/Signature.py	2022-04-25 08:06:20.120743425 +0000
-@@ -35,7 +35,7 @@ def _setFuncSignature(self, defaults=None, varnames=(), argcount=-1):
-         argcount = len(varnames)
-     # Generate a change only if we have to.
-     if self.func_defaults != defaults:
--        self.func_defaults = defaults
-+        self.func_defaults = self.__defaults__ = defaults
-     code = FuncCode(varnames, argcount)
-     if self.func_code != code:
--        self.func_code = code
-+        self.func_code = self.__code__ = code

component/ffmpeg/buildout.cfg

@@ -62,10 +62,12 @@ url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz
 recipe = slapos.recipe.cmmi
 url = https://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.5.0.tar.bz2
 md5sum = 49e59dd184caa255886683facea56fca
+location = @@LOCATION@@
 configure-options =
   --enable-shared
 environment =
   PATH=${yasm:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${:location}/lib
 
 [libx264]
 recipe = slapos.recipe.cmmi
@@ -96,6 +98,7 @@ configure-options =
 recipe = slapos.recipe.cmmi
 url = https://ffmpeg.org/releases/ffmpeg-4.1.4.tar.bz2
 md5sum = 611d171e4aee749b85e04d17e2aee71d
+location = @@LOCATION@@
 pkg_config_depends = ${libxcb:location}/lib/pkgconfig:${libxcb:pkg_config_depends}:${libtheora:location}/lib/pkgconfig:${libtheora:pkg_config_depends}:${libvpx:location}/lib/pkgconfig:${libx264:location}/lib/pkgconfig:${opencore-amr:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
 configure-options =
  --enable-gpl
@@ -119,5 +122,5 @@ configure-options =
 environment =
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libtheora:location}/include -I${opencore-amr:location}/include -I${lame:location}/include
-  LDFLAGS=-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-Wl,-rpath=${:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -Wl,-rpath=${zlib:location}/lib
   PATH=${pkgconfig:location}/bin:${yasm:location}/bin:%(PATH)s

component/fish-shell/buildout.cfg

@@ -14,8 +14,8 @@ extends =
 [fish-shell]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/fish-shell/fish-shell/releases/download/3.4.1/fish-3.4.1.tar.xz
-md5sum = 80733d30a14ffa50bf48cce96296aa7a
+url = https://github.com/fish-shell/fish-shell/releases/download/3.5.1/fish-3.5.1.tar.xz
+md5sum = 59950f8ec9bf9e2fa02ff205dc5a9c57
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}

component/fluent-bit/0001-slapos-don-t-try-to-install-system-startup-script.patch

+From 90950c10cf6bfcba777a5b22cdcd3b54b4043d35 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Tue, 20 Sep 2022 23:10:16 +0900
+Subject: [PATCH] slapos: don't try to install system startup script
+
+in slapos context we don't write to system directories when installing
+packages
+---
+ src/CMakeLists.txt | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 630f875bf..388c72ab1 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -477,27 +477,6 @@ if(FLB_BINARY)
+       DESTINATION "${FLB_INSTALL_BINDIR}")
+   endif()
+ 
+-  # Detect init system, install upstart, systemd or init.d script
+-  if(IS_DIRECTORY /lib/systemd/system)
+-    set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
+-    configure_file(
+-      "${PROJECT_SOURCE_DIR}/init/systemd.in"
+-      ${FLB_SYSTEMD_SCRIPT}
+-      )
+-    install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION /lib/systemd/system)
+-    install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
+-  elseif(IS_DIRECTORY /usr/share/upstart)
+-    set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
+-    configure_file(
+-      "${PROJECT_SOURCE_DIR}/init/upstart.in"
+-      ${FLB_UPSTART_SCRIPT}
+-      )
+-    install(FILES ${FLB_UPSTART_SCRIPT} COMPONENT binary DESTINATION /etc/init)
+-    install(DIRECTORY DESTINATION COMPONENT binary ${FLB_INSTALL_CONFDIR})
+-  else()
+-    # FIXME: should we support Sysv init script ?
+-  endif()
+-
+   if(FLB_SYSTEM_WINDOWS)
+     install(FILES
+       "${PROJECT_SOURCE_DIR}/conf/fluent-bit-win32.conf"
+-- 
+2.37.0

component/fluent-bit/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+  ../bison/buildout.cfg
+  ../flex/buildout.cfg
+  ../patch/buildout.cfg
+  
+[fluent-bit]
+recipe = slapos.recipe.cmmi
+url = https://github.com/fluent/fluent-bit/archive/refs/tags/v1.9.8.tar.gz
+md5sum = a0973b739f1d1f0daaa503b077760cd7
+configure-command = 
+  ${cmake:location}/bin/cmake
+configure-options = 
+  -DFLB_CONFIG_YAML=Off .
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+environment =
+  PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/0001-slapos-don-t-try-to-install-system-startup-script.patch#c071d1aefe0adbc6c96bbdf92d9dbb29
+patch-binary = ${patch:location}/bin/patch

component/fluent-bit/obs-nodep.cfg

+# The lightweight log processor https://fluentbit.io/
+#
+# This file is used for packaging with OBS.
+# "-nodep" means "no build dependencies", it is faster and therefore useful for development
+
+[buildout]
+# delete slapos.rebootstrap as we use python from the host
+extensions =
+  slapos.extension.strip
+  slapos.extension.shared
+
+extends =
+  buildout.cfg
+
+parts =
+  fluent-bit
+
+[python2.7]
+recipe =
+environment =
+location = /usr
+
+[python3]
+recipe =
+environment =
+location = /usr
+
+[cmake]
+recipe =
+environment =
+location = /usr

component/fluent-bit/obs.cfg

+# The lightweight log processor https://fluentbit.io/
+#
+# This file is used for packaging with OBS.
+
+[buildout]
+# delete slapos.rebootstrap as we use python from the host
+extensions =
+  slapos.extension.strip
+  slapos.extension.shared
+
+extends =
+  buildout.cfg
+
+parts =
+  fluent-bit

component/fluentbit-plugin-wendelin/buildout.cfg

+# This is part of the OCEAN project.
+# Plugin for fluent-bit to send data to Wendelin:
+# https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin
+
+[buildout]
+extends =
+  ../golang/buildout.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+
+[fluentbit-plugin-wendelin]
+recipe = slapos.recipe.cmmi
+share = true
+url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/0.2.1/fluentbit-plugin-wendelin-0.2.1.tar.gz
+md5sum = 3a4ab7f11f3d0fb8b3312b86e77c6597
+configure-command = echo "No configure command."
+environment =
+  PATH=${golang1.17:location}/bin:%(PATH)s
+  PREFIX=@@LOCATION@@

component/fluentbit-plugin-wendelin/obs-nodep.cfg

+# This is part of the OCEAN project.
+# fluentbit-plugin-wendelin is a .so plugin for fluent-bit.
+# It is compiled for fluent-bit to send data to Wendelin.
+# https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin
+# 
+# This file is used for packaging with OBS.
+
+
+[buildout]
+extends =
+  obs.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+
+[python2.7]
+recipe =
+environment =
+location = /usr
+
+[python3]
+recipe =
+environment =
+location = /usr
+
+[golang1.17]
+recipe  = plone.recipe.command
+command = ${:location}/bin/go env -w GOPATH=${buildout:directory}/go
+environment =
+environment-extra =
+stop-on-error = yes
+location = /usr
+
+[cmake]
+recipe =
+environment =
+location = /usr

component/fluentbit-plugin-wendelin/obs.cfg

+# This is part of the OCEAN project.
+# fluentbit-plugin-wendelin is a .so plugin for fluent-bit.
+# It is compiled for fluent-bit to send data to Wendelin.
+# https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin
+#
+# This file is used for packaging with OBS.
+
+[buildout]
+# delete slapos.rebootstrap as we use python from the host in the packaging process with OBS
+extensions =
+  slapos.extension.strip
+  slapos.extension.shared
+
+extends =
+  buildout.cfg
+
+parts =
+  fluentbit-plugin-wendelin
+
+[fluentbit-plugin-wendelin]
+url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/0.3.1/fluentbit-plugin-wendelin-0.3.1.tar.gz
+md5sum = 7bafdcbeb2bf9634e041fde95b63b51f
+
+[golang1.17]
+# Using "./make.bash" instead of "./all.bash" disables golang tests. Some of these tests attempt to use the network, which fails on OBS' VM.
+# A less radical way to fix the issue may be investigated in the future.
+make-targets = cd src && unset GOBIN && ./make.bash && cp -alf .. ${:location}
+post-install =
+  ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
+# This line relocates the golang cached modules directory so that the modules are sent to OBS along with the code to compile.
+  ${:location}/bin/go env -w GOPATH=${buildout:directory}/go

component/git/buildout.cfg

@@ -18,8 +18,8 @@ parts =
 [git]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.35.1.tar.xz
-md5sum = 3aae077280b6be861e3c1c637491853a
+url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.38.1.tar.xz
+md5sum = abdafbfb85d205421903a2100c734b17
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/glib/buildout.cfg

@@ -7,6 +7,7 @@ extends =
   ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
+  ../defaults.cfg
 parts =
   glib
 
@@ -25,6 +26,7 @@ configure-options =
   --disable-fam
   --disable-xattr
   --disable-man
+  --with-python=python${python:version}
 environment =
   PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
@@ -34,7 +36,3 @@ environment =
   PCRE_CFLAGS=-I${pcre:location}/include
   PCRE_LIBS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -lpcre
 post-install = rm %(location)s/bin/gtester-report
-
-[x86-cygwin-glib]
-patches =
-  ${:_profile_base_location_}/cygwin-glib-2.28.8-src.patch

component/glib/cygwin-glib-2.28.8-src.patch

---- glib/gstrfuncs.c~	2012-12-30 14:51:30.000000000 +0800
-+++ glib/gstrfuncs.c	2012-12-30 14:51:50.203125000 +0800
-@@ -1423,7 +1423,7 @@
- #ifdef HAVE_STRSIGNAL
-   const char *msg_locale;
- 
--#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
-+#if defined(G_OS_BEOS) 
- extern const char *strsignal(int);
- #else
-   /* this is declared differently (const) in string.h on BeOS */

component/golang/buildout.cfg

@@ -74,13 +74,25 @@ environment-extra =
 
 [golang1.17]
 <= golang-common
-url = https://golang.org/dl/go1.17.6.src.tar.gz
-md5sum = dc57f93f323e9f8189e5ffc1f223e346
+url = https://golang.org/dl/go1.17.13.src.tar.gz
+md5sum = 4476707f05cf6915ec1173038dc357a9
 
 # go1.17 needs go1.4 to bootstrap
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
+[golang1.18]
+<= golang-common
+url = https://golang.org/dl/go1.18.9.src.tar.gz
+md5sum = e2caa7c4de49aa77a14c694bfc9a5cd1
+
+# go1.18 needs go1.4 or go1.17 to bootstrap.
+# We use go1.4 to reduce the amount of components which
+# need to be installed. See following note for rationale:
+# https://lab.nexedi.com/nexedi/slapos/merge_requests/1305#note_174936
+environment-extra =
+  GOROOT_BOOTSTRAP=${golang14:location}
+
 # ---- infrastructure to build Go workspaces / projects ----
 
 # gowork is the top-level section that defines Go workspace.
@@ -140,7 +152,7 @@ bin	= ${gowork.dir:bin}
 depends = ${gowork.goinstall:recipe}
 
 # go version used for the workspace (possible to override in applications)
-golang  = ${golang1.17:location}
+golang  = ${golang1.18:location}
 
 # no special build flags by default
 buildflags =

component/groonga/buildout.cfg

@@ -15,12 +15,12 @@ extends =
 [groonga]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://packages.groonga.org/source/groonga/groonga-11.0.9.tar.gz
-md5sum = 9c66445d92c8b7536f1b28119ac1855b
+url = https://packages.groonga.org/source/groonga/groonga-12.0.7.tar.gz
+md5sum = 5ef412a6941994e623cb50d76a8be261
 groonga-plugin-dir =  @@LOCATION@@/lib/groonga/plugins/
 # temporary patch to respect more tokens in natural language mode.
 patches =
-  ${:_profile_base_location_}/groonga.patch#5d831331ddfdcd87e91b68949c339a1d
+  ${:_profile_base_location_}/groonga.patch#cc6a678acd478fc074e678c7b7dd09d8
 patch-options = -p1
 configure-options =
   --disable-static
@@ -48,8 +48,8 @@ environment =
 [groonga-normalizer-mysql]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.5.tar.gz
-md5sum = 842d02becc6dcc25a02fa7e789c2cba7
+url = https://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.8.tar.gz
+md5sum = a1520691da3083e14bdc65a9ec57a620
 groonga-plugin-dir =  @@LOCATION@@/lib/groonga/plugins/
 pre-configure = mkdir -p ${:groonga-plugin-dir}
 make-targets = GROONGA_PLUGINS_DIR=${:groonga-plugin-dir} install

component/groonga/groonga.patch

 --- a/lib/ii.c
 +++ b/lib/ii.c
-@@ -10387,7 +10387,9 @@
-     ? (data->optarg->similarity_threshold > GRN_HASH_SIZE(h)
+@@ -10874,7 +10874,9 @@
+     ? ((uint32_t)(data->optarg->similarity_threshold) > GRN_HASH_SIZE(h)
         ? GRN_HASH_SIZE(h)
-        : data->optarg->similarity_threshold)
+        :(uint32_t)(data->optarg->similarity_threshold))
 -    : (GRN_HASH_SIZE(h) >> 3) + 1;
 +    : (GRN_HASH_SIZE(h) < 8
 +       ? GRN_HASH_SIZE(h)
 +       : ((GRN_HASH_SIZE(h) - 8) >> 3) + 8);
    if (GRN_HASH_SIZE(h)) {
      grn_id j, id;
-     int w2, rep;
+     float w2;

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.25.tar.gz
-md5sum = 44687c901910da46711441ae1611b8ce
+url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.29.tar.gz
+md5sum = a4c4983c7ed51946bdde1d0eceedd527
 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

@@ -111,6 +111,11 @@ environment =
   AR="${:llvm-toolchain}/llvm-ar"
   NM="${:llvm-toolchain}/llvm-nm"
 
+# Fix permission for group, slapuserXX should be able to access subfolders
+# in headless-chromium location.
+post-install =
+  find ${:fake-location} -type d -exec chmod g+xr {} \;
+
 # Expose devtools frontend location.
 devtools-frontend = ${:fake-location}/gen/third_party/devtools-frontend/src/front_end
 

component/iperf3/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  iperf3
+
+[iperf3]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/esnet/iperf/archive/3.11.tar.gz
+md5sum = 28ecd352b3433e5d46b669c4289ad544
+environment =
+  PATH=${pkgconfig:location}/bin:${autoconf:location}/bin:${automake:location}/bin:%(PATH)s

component/json-c/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+
+[json-c]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/json-c/json-c/archive/refs/tags/json-c-0.15-20200726.tar.gz
+md5sum = b3841c9abdca837ea00ce6a5ada4bb2c
+configure-command = mkdir build ; cd build ; ../cmake-configure
+configure-options = --prefix=%(location)s
+make-binary = cd build ; make
+environment =
+  PATH=${cmake:location}/bin:%(PATH)s

component/jsoncpp/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
+parts =
+  jsoncpp
+
+[jsoncpp]
+recipe = slapos.recipe.cmmi
+shared = true
+pre-configure =
+  mkdir jsoncpp-build
+configure-command =
+  cd jsoncpp-build && ${cmake:location}/bin/cmake ..
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+url = https://github.com/open-source-parsers/jsoncpp/archive/refs/tags/1.9.5.tar.gz
+md5sum = d6c8c609f2162eff373db62b90a051c7
+make-binary =
+  cd jsoncpp-build && make
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s

component/jupyter-py2/buildout.cfg

@@ -65,7 +65,6 @@ 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
@@ -78,8 +77,6 @@ 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
@@ -90,9 +87,6 @@ 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
-certifi = 2020.6.20
 
 # nbconvert 4.2.0 depends on entrypoints egg that is not available as tar/zip source.
 nbconvert = 4.1.0
@@ -101,7 +95,6 @@ patsy = 0.4.1
 pexpect = 4.2.1
 pickleshare = 0.7.4
 scandir = 1.5
-scipy = 0.19.0
 singledispatch = 3.4.0.3
 wcwidth = 0.1.7
 jupyter = 1.0.0

component/keyutils/buildout.cfg

+[buildout]
+extends =
+  ../patch/buildout.cfg
+
+[keyutils]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://people.redhat.com/~dhowells/keyutils/keyutils-1.6.1.tar.bz2
+md5sum = 919af7f33576816b423d537f8a8692e8
+
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/keyutils-ln.diff#775e8e4efd35103335bff2ac951ea22e
+
+configure-command = echo
+make-options = DESTDIR=%(location)s INCLUDEDIR=/include SHAREDIR=/share/keyutils PREFIX=/ MANDIR=/share/man LDFLAGS=-Wl,-rpath=%(location)s/x86_64-linux-gnu

component/keyutils/keyutils-ln.diff

+Link relatively to the directory instead from /x86_64-linux-gnu/
+
+diff --git a/Makefile b/Makefile
+index 5f8b163..0d20499 100644
+--- a/Makefile
++++ b/Makefile
+@@ -184,7 +184,7 @@ ifeq ($(NO_SOLIB),0)
+ 	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+ 	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+ 	mkdir -p $(DESTDIR)$(USRLIBDIR)
+-	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
++	$(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
+ 	sed \
+ 	-e 's,@VERSION\@,$(VERSION),g' \
+ 	-e 's,@prefix\@,$(PREFIX),g' \

component/libcap/buildout.cfg

@@ -2,6 +2,7 @@
 
 extends =
   ../attr/buildout.cfg
+  ../gperf/buildout.cfg
 
 parts = libcap
 
@@ -19,6 +20,9 @@ make-options =
   LDFLAGS="-L${attr:location}/lib/ -Wl,-rpath=${attr:location}/lib/ -Wl,-rpath=${:location}/lib/"
   install
 
+environment =
+  PATH=${gperf:location}/bin:%(PATH)s
+
 # if lib64 exists, then create a symlink from lib to lib64
 post-install =
   cd ${:location}

component/libnl/buildout.cfg

+[buildout]
+extends =
+  ../flex/buildout.cfg
+  ../bison/buildout.cfg
+
+[libnl]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://www.infradead.org/~tgr/libnl/files/libnl-3.2.25.tar.gz
+md5sum = 03f74d0cd5037cadc8cdfa313bbd195c
+environment =
+  PATH=${flex:location}/bin:${bison:location}/bin:%(PATH)s

component/libpcap/buildout.cfg

+[buildout]
+extends =
+  ../bison/buildout.cfg
+  ../flex/buildout.cfg
+
+[libpcap]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz
+md5sum = 28e17495004036567c2cc884b51eba45
+environment =
+  PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s

component/libxml2/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 [libxml2]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://xmlsoft.org/sources/libxml2-2.9.10.tar.gz
-md5sum = 10942a1dc23137a8aa07f0639cbfece5
+url = https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.3.tar.xz
+md5sum = f9edac7fac232b3657a003fd9a5bbe42
 configure-options =
   --disable-static
   --without-python

component/libxslt/buildout.cfg

@@ -7,8 +7,8 @@ parts =
   libxslt
 
 [libxslt]
-url = ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz
-md5sum = db8765c8d076f1b6caafd9f2542a304a
+url = https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.37.tar.xz
+md5sum = 84e86fc8a1b7495674016e05e4c5da44
 recipe = slapos.recipe.cmmi
 shared = true
 # --disable-static is temporarilly removed due to build error

component/llvm/buildout.cfg

 [buildout]
 extends =
+    ../xz-utils/buildout.cfg
     ../cmake/buildout.cfg
     ../git/buildout.cfg
 
 parts = llvm
 
+[llvm-cmake]
+recipe = slapos.recipe.build:download-unpacked
+shared = true
+url = https://github.com/llvm/llvm-project/releases/download/llvmorg-${:version}/cmake-${:version}.src.tar.xz
+version = 15.0.0
+md5sum = e2e69ec36e163293f0b558e0382660cb
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
+
 [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
+version = 15.0.0
+md5sum = 7b406c97f87b94cda4224aa53968c9d5
+pre-configure =
+  cp ${llvm-cmake:location}/Modules/* ./cmake/modules/
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
     -Bbuild
     -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
     -DCMAKE_BUILD_TYPE=Release
     -DLLVM_INSTALL_UTILS=ON
+    -DLLVM_INCLUDE_BENCHMARKS=OFF
     -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
+    PATH=${xz-utils:location}/bin:${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/lunzip/buildout.cfg

@@ -7,5 +7,3 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://download-mirror.savannah.gnu.org/releases/lzip/lunzip/lunzip-1.13.tar.gz
 md5sum = 4bc15e65fef99db64e27f4cd369ae02e
-configure-options =
-  --disable-static

component/lvm2/buildout.cfg

+[buildout]
+extends =
+  ../libaio/buildout.cfg
+
+[lvm2]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.03.15.tgz
+md5sum = 0dbe745e945461419b56c7a21d7e47e2
+location = @@LOCATION@@
+configure-options =
+  --with-confdir=${:location}/etc
+environment =
+  CFLAGS=-I${libaio:location}/include
+  LDFLAGS=-L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -Wl,-rpath=${:location}/lib

component/macros/macro.pythonpath.eggs.cfg

+[buildout]
+parts =
+
+[macro.pythonpath.eggs]
+recipe = slapos.recipe.build
+_name_ = ${:_buildout_section_name_}
+init =
+  prerequisite = """
+  [.%(_name_)s.prerequisite]
+  recipe = slapos.recipe.build
+  init =
+    section = self.buildout['%(_name_)s']
+    self.eggs = [e.strip() for e in section['eggs'].splitlines() if e.strip()]
+  update =
+    from zc.buildout.easy_install import working_set
+    buildout = self.buildout['buildout']
+    eggs_directory = buildout['eggs-directory']
+    develop_eggs_directory = buildout['develop-eggs-directory']
+    dists = working_set(self.eggs, [develop_eggs_directory, eggs_directory])
+    paths = ':'.join(dist.location for dist in dists)
+    self.buildout['%(environment)s']['PYTHONPATH'] = paths
+    print("PYTHONPATH=" + paths)
+  """ % options
+  self.buildout.parse(prerequisite)

component/macros/virtual-env.cfg

@@ -2,51 +2,143 @@
 extends =
 	../pygolang/buildout.cfg
 
+parts =
+
 [virtual-env-base]
 recipe = slapos.recipe.build
-_name = ${:_buildout_section_name_}
+name = ${:_buildout_section_name_}
+default-instance = true
 init =
   from zc.buildout.easy_install import working_set
   import os
-  name = options['_name']
-  eggs = options['eggs']
-  try:
-    scripts = "scripts = " + options['scripts']
-  except KeyError:
-    scripts = ""
-
-  self.buildout.parse("""
+  name = options['name']
+  eggs = options.get('eggs')
+  self.message = options.get('message')
+  self.chain = options.get('chain')
+  environment = options.get('environment')
+  scripts = options.get('scripts')
+
+  eggs_template = """
   [.%(name)s.install-eggs]
   recipe = zc.recipe.egg
-  eggs = %(eggs)s
+  eggs =
+    %(eggs)s
   %(scripts)s
 
   [.%(name)s.install-interpreter]
   <= python-interpreter
-  eggs += %(eggs)s
-  """ % locals())
+  eggs +=
+    %(eggs)s
+  """
+
+  instance_template = """
+  [.%(name)s.instance]
+  recipe = slapos.recipe.template
+  output = ${buildout:directory}/instance.cfg
+  depends = $%(cookbook)s
+  inline =
+    [buildout]
+    parts = publish
+
+    eggs-directory = ${buildout:eggs-directory}
+    develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+    [publish]
+    recipe = slapos.cookbook:publish
+    activate-script = %(location)s
+  """
+
+  if eggs:
+    self.buildout.parse(eggs_template % {
+      "eggs": "\n  ".join(e.strip() for e in eggs.splitlines()),
+      "name": name,
+      "scripts": "scripts = " + scripts if scripts else "",
+    })
+
+  if is_true(options.get('default-instance')):
+    self.buildout.parse(instance_template % {
+      "cookbook": "{slapos-cookbook:recipe}",
+      "location": location,
+      "name": name,
+    })
+
+  env = {
+    "PATH": self.buildout['buildout']['bin-directory'] + ":\$PATH",
+    "PS1": "\"(" + self.name + ") \$PS1\"",
+  }
+
+  if environment:
+    for line in environment.splitlines():
+      key, value = line.split("=", 1)
+      env[key.strip()] = value.strip()
+
+  self.env = env
+
 install =
+  message = ""
+  if self.message:
+    message = "echo " + "\n  echo ".join(
+      "%r" % line for line in self.message.splitlines())
+    message += "\n  echo \'\'"
+
+  chain = ""
+  if self.chain:
+    chain = "source " + "\n  source ".join(
+      "%r" % line for line in self.chain.splitlines())
+
   with open(location, "w") as f:
     f.write(options['template'] % {
-      "path" : self.buildout['buildout']['bin-directory'],
-      "name" : self.name,
+      "env": " ".join("%s %s" % (k, v) for k, v in self.env.items()),
+      "message": message,
+      "chain": chain,
     })
 
 # Template virtual env for bash shell in posix
 [virtual-env-base:posix]
 template =
+  if type deactivate > /dev/null 2>&1
+  then
+    export _OLD_PARAM=( "$@")
+    set %(env)s
+    while [ "$1" ]; do
+      if ! ( echo $_LIST_OLD_VENV | grep $1 ) > /dev/null 2>&1
+      then
+        eval "export _OLD_VENV_$1=\$$1"
+        eval "export _LIST_OLD_VENV=\"$1 \$_LIST_OLD_VENV\""
+      fi
+      eval "export $1=\"$2\""
+      shift
+      shift
+    done
+    if [[ -n "$_OLD_PARAM" ]]; then
+      set "$${_OLD_PARAM[@]}"
+    fi
+    unset _OLD_PARAM
+    %(chain)s
+    %(message)s
+  else
     deactivate () {
-    set PATH PS1
+      set $_LIST_OLD_VENV
       while [ "$1" ]; do
         eval "if [ \"\$_OLD_VENV_$1\" ]; then $1=\$_OLD_VENV_$1; else unset $1; fi; unset \$_OLD_VENV_$1"
         shift
       done
       unset -f deactivate
+      unset _LIST_OLD_VENV
     }
-
-
-  VENV_PATH=%(path)s
-  _OLD_VENV_PATH=$PATH
-  _OLD_VENV_PS1=$PS1
-  PATH=$VENV_PATH:$PATH
-  PS1='(%(name)s) '$PS1
+    export _OLD_PARAM=( "$@" )
+    set %(env)s
+    while [ "$1" ]; do
+      eval "_OLD_VENV_$1=\$$1"
+      eval "export $1=\"$2\""
+      eval "export _LIST_OLD_VENV=\"$1 \$_LIST_OLD_VENV\""
+      shift
+      shift
+    done
+    if [[ -n "$_OLD_PARAM" ]]; then
+      set "$${_OLD_PARAM[@]}"
+    fi
+    unset _OLD_PARAM
+    %(chain)s
+    %(message)s
+  fi

component/macros/virtual-env.rst

+Virtual environment
+===================
+
+Introduction
+------------
+
+The virtual environment macro allows you to quickly create a development environment.
+
+Options
+-------
+
+Several options are available to customize your virtual environment :
+
+name
+~~~~
+
+The ``name`` option is the name that will be displayed when the environment is activated. For example::
+
+  name = virtual-env
+
+gives::
+
+  >> source activate
+  ( virtual-env ) >>
+
+**Note:** By default, ``name`` is the name of the Buildout section that uses the macro.
+
+location
+~~~~~~~~
+
+The ``location`` option is where the script to be sourced will be stored. For example::
+
+  location = project/activate
+
+gives::
+
+  >> source project/activate
+  ( virtual-env ) >>
+  
+**Note:** Don't forget to add the name of the script in the path.
+
+eggs
+~~~~
+
+This option should not be used to install eggs during instantiation (in an instance file).
+
+It works the same way as ``zc.recipe.eggs``, you can add to the line several eggs to download for use in the virtual environment.
+
+A custom Python with the chosen eggs will then be generated. For example::
+
+  eggs = numpy
+
+gives::
+
+  ( virtual-env ) >> python
+  python
+  >>> import numpy
+
+scripts
+~~~~~~~
+
+This option should not be used to install scripts during instantiation (in an instance file).
+
+It works in the same way as in ``zc.recipe.eggs``, you can add to the line several scripts to generate for use in the virtual environment.For example::
+
+  eggs = Django
+  scripts = django-admin
+
+gives::
+
+  ( virtual-env ) >> django-admin
+
+**Note:** By default if the option is not used, all scripts will be installed.
+
+default-instance
+~~~~~~~~~~~~~~~~
+
+The ``default-instance`` option takes the value ``true`` or ``false``.
+
+If set to ``true``, it will create a minimal instance that will publish the path of the script to be sourced.
+
+If it is set to ``false``, you will be able to create your own custom instance.
+
+**Note:** If you want to use the macro in an ``instance`` file, you should set this option to ``false``.
+
+environment
+~~~~~~~~~~~
+
+The ``environment`` option allows you to choose the value of the environment variables of the virtual environment.
+
+They are to be written on the line in the form ``VAR = value``. For example::
+
+  environment = 
+    VAR1 = value1
+    VAR2 = value2
+
+gives::
+
+  ( virtual-env ) >> echo $VAR1
+  value1
+
+**Note:** If you want to keep the other values as well, like for PATH for example, you have to do::
+
+  PATH = new_val:$PATH
+
+message
+~~~~~~~
+
+The ``message`` option allows to display a message when sourcing the virtual environment.
+
+The message will be considered as a string. For example::
+
+  message =
+    You are in a virtual environment.
+
+gives::
+
+  >> source activate
+  You are in a virtual environment.
+
+  ( virtual-env) >> 
+
+chain
+~~~~~
+
+The ``chain`` option allows you to chain several scripts created by the macro as if it were one. This can be useful if one script is generated in a ``software`` file and another in an ``instance`` file.
+
+When deactivating, the state of the environment will return to the initial state.
+
+To use this option you just have to specify the script to source by running the script. For example::
+
+  chain = project/another_activate
+
+Deactivate
+----------
+
+Once you want to exit the virtual environment, you just have to run the ``deactivate`` function. Like::
+
+  ( virtual-env ) >> deactivate
+    >> 

component/mariadb/buildout.cfg

@@ -30,8 +30,8 @@ parts =
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://archive.mariadb.org//mariadb-${:version}/source/mariadb-${:version}.tar.gz
-version = 10.4.22
-md5sum = 0d5e1b9e3694322e18819811a2bf81fa
+version = 10.4.25
+md5sum = 76e6ee973adb7deb15d7936f710eb5a4
 pre-configure =
   set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
   grep -q "$@"
@@ -99,8 +99,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-11.09.tar.gz
-md5sum = 8b1786332edc61c41a769f225e6063b2
+url = https://packages.groonga.org/source/mroonga/mroonga-12.09.tar.gz
+md5sum = 637d73b86239cc9c3758e9486746d430
 pre-configure =
   rm -rf fake_mariadb_source
   mkdir -p fake_mariadb_source
@@ -134,8 +134,8 @@ environment =
 ### (we just override here for easier revert)
 [mariadb-10.3]
 <= mariadb-10.4
-version = 10.3.32
-md5sum = 12341dc150c810c0072a40e55825ca57
+version = 10.3.35
+md5sum = b7a2e69d103eda3dd61c8bad8775c7bd
 post-install =
   ldd=`ldd %(location)s/lib/plugin/ha_rocksdb.so`
   for x in ${lz4:location} ${snappy:location} ${zstd:location}

component/matplotlib/buildout.cfg

@@ -36,3 +36,10 @@ rpath =
   ${libpng:location}/lib
   ${freetype:location}/lib
 need-matplotlibrc = ${matplotlibrc:location}
+
+[versions]
+matplotlib = 2.1.2
+cycler = 0.11.0
+
+[versions:sys.version_info < (3,8)]
+cycler = 0.10.0

component/mavsdk/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+  ../curl/buildout.cfg
+  ../git/buildout.cfg
+  ../jsoncpp/buildout.cfg
+  ../tinyxml2/buildout.cfg
+
+parts =
+  mavsdk
+
+[c-astral-headers]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/c-astral-c-library
+revision = v1.0
+git-executable = ${git:location}/bin/git
+
+[gcc]
+min_version = 7.1
+
+[mavsdk-source]
+recipe = slapos.recipe.build:gitclone
+repository = https://github.com/mavlink/MAVSDK.git
+revision = v0.39.0
+
+git-executable = ${git:location}/bin/git
+ignore-cloning-submodules = true
+
+[mavsdk]
+recipe = slapos.recipe.cmmi
+path = ${mavsdk-source:location}
+cmake = ${cmake:location}/bin/cmake
+pre-configure =
+  ${git:location}/bin/git submodule update --init --recursive
+  cp -r ${c-astral-headers:location}/* ${mavsdk-source:location}/src/third_party/mavlink/include/mavlink/v2.0/
+  sed -i 's#common/mavlink.h#CAstral/mavlink.h#' ${mavsdk-source:location}/src/core/mavlink_include.h
+configure-command =
+  ${:cmake}
+configure-options =
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
+  -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}"
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}
+  -DPKG_CONFIG_EXECUTABLE=${pkgconfig:location}/bin/pkg-config
+  -DSUPERBUILD=OFF
+  -Bbuild/default
+  -H.
+make-binary =
+  ${:cmake} --build build/default --target install
+environment =
+  CMAKE_INCLUDE_PATH=${curl:location}/include:${jsoncpp:location}/include:${tinyxml2:location}/include
+  CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
+  CMAKE_PROGRAM_PATH=${cmake:location}/bin
+  PATH=${pkgconfig:location}/bin/:%(PATH)s
+  LDFLAGS=-L${jsoncpp:location}/lib -Wl,-rpath=${jsoncpp:location}/lib
+
+CMAKE_CFLAGS=-I${tinyxml2:location}/include
+CMAKE_LIBRARY_PATH=${curl:location}/lib:${jsoncpp:location}/lib:${tinyxml2:location}/lib

component/mca/buildout.cfg

+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+
+[buildout]
+extends =
+  ../../component/defaults.cfg
+  ../../component/fmtlib/buildout.cfg
+  ../../component/openssl/buildout.cfg
+
+parts =
+  mca
+
+[mca]
+recipe = slapos.recipe.cmmi
+url = https://lab.nexedi.com/nexedi/metadata-collect-agent/-/archive/v0.3.1/metadata-collect-agent-v0.3.1.tar.gz
+md5sum = cbd6cf10f83c760cebc19bb9c1455f8e
+configure-command = :
+make-targets =
+  no-dracut
+  install-no-dracut
+environment =
+  PYTHON_PATH=${python3:location}
+  PREFIX=@@LOCATION@@
+  OPENSSL_PATH=${openssl:location}
+  FMTLIB_PATH=${fmtlib:location}

component/mca/obs-nodep.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+#
+# This file is used for packaging with OBS.
+# "-nodep" means "no build dependencies", it is faster and therefore useful for development
+
+[buildout]
+# delete slapos.rebootstrap as we use python from the host
+extensions =
+  slapos.extension.strip
+  slapos.extension.shared
+
+extends =
+  obs.cfg
+
+parts =
+  mca
+
+[python2.7]
+recipe =
+environment =
+location = /usr
+
+[python3]
+recipe =
+environment =
+location = /usr
+
+[cmake]
+recipe =
+environment =
+location = /usr

component/mca/obs-static-nodep.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+#
+# This file is used for packaging with OBS.
+# "-static" indicates that it is the statically linked version
+# "-nodep" means "no build dependencies", it is faster and therefore useful for development
+
+[buildout]
+# delete slapos.rebootstrap as we use python from the host
+extensions =
+  slapos.extension.strip
+  slapos.extension.shared
+
+extends =
+  obs-static.cfg
+
+parts =
+  mca
+
+[python2.7]
+recipe =
+environment =
+location = /usr
+
+[python3]
+recipe =
+environment =
+location = /usr
+
+[cmake]
+recipe =
+environment =
+location = /usr

component/mca/obs-static.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+#
+# This file is used for packaging with OBS.
+# "-static" indicates that it is the statically linked version
+
+[buildout]
+extends =
+  obs.cfg
+
+parts =
+  mca
+
+# ENABLE STATIC LINKING
+# note: as a general matter, one has to tweak each dependency by hand to get a static executable
+[mca]
+# static version:
+# WARNING: LINK_STATIC only has to be defined to switch to static linking (so it does so even if the value is "NO", "OFF" or "FALSE"). Just don't define it in order to deactivate the option.
+environment +=
+  ZLIB_PATH=${zlib:location}
+  LINK_STATIC=dumb_value
+
+[fmtlib]
+# static version:
+shared = false
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DFMT_TEST=OFF
+  -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE

component/mca/obs.cfg

+# This is part of the OCEAN project.
+# MCA stands for Metadata Collect Agent
+# https://lab.nexedi.com/nexedi/metadata-collect-agent
+#
+# This file is used for packaging with OBS.
+
+[buildout]
+extends =
+  buildout.cfg
+
+parts =
+  mca
+
+[golang1.17]
+# Using "./make.bash" instead of "./all.bash" disables golang tests. Some of these tests attempt to use the network, which fails on OBS' VM.
+# A less radical way to fix the issue may be investigated in the future.
+make-targets = cd src && unset GOBIN && ./make.bash && cp -alf .. ${:location}
+post-install =
+  ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
+# This line relocates the golang cached modules directory so that the modules are sent to OBS along with the code to compile.
+  ${:location}/bin/go env -w GOPATH=${buildout:directory}/go

component/meson/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://github.com/mesonbuild/meson/releases/download/${:version}/meson-${:version}.tar.gz
-version = 0.57.2
-md5sum = 4a07b6d42d7a46a6b6e9604fae7da9aa
+version = 0.62.1
+md5sum = 2f5301d0e7fd5544ab0004393ba44cbe
 configure-command = true
 make-binary = true
 post-install =

component/miniupnpd/buildout.cfg

+[buildout]
+extends =
+  ../nftables/buildout.cfg
+  ../util-linux/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../openssl/buildout.cfg
+  ../zlib/buildout.cfg
+
+
+parts =
+  miniupnpd
+
+[miniupnp-repository]
+recipe = slapos.recipe.build:gitclone
+repository = https://github.com/miniupnp/miniupnp.git
+revision = miniupnpd_2_3_0
+git-executable = ${git:location}/bin/git
+
+
+[miniupnpd]
+recipe = slapos.recipe.cmmi
+shared = true
+path = ${miniupnp-repository:location}/miniupnpd
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${iptables:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+  LDFLAGS=-L${libuuid:location}/lib -L${openssl:location}/lib -L${zlib:location}/lib
+# because these configure not support prefix syntax
+configure-command = ./configure
+configure-options =
+  --firewall=iptables
+make-options =
+  -f Makefile.linux
+make-targets =
+  install PREFIX=%(location)s

component/mosquitto/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+  ../openssl/buildout.cfg
+  ../libxslt/buildout.cfg
+
+[mosquitto]
+recipe = slapos.recipe.cmmi
+url = https://mosquitto.org/files/source/mosquitto-2.0.15.tar.gz
+md5sum = 22b7a8b05caa692cb22496b791529193
+configure-command = 
+  ${cmake:location}/bin/cmake
+configure-options = 
+  -DDOCUMENTATION=OFF
+  -DWITH_CJSON=no
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DOPENSSL_ROOT_DIR=${openssl:location}
+  -DOPENSSL_INCLUDE_DIR=${openssl:location}/include
+environment =
+  PATH=${openssl:location}/bin:${libxslt:location}/bin:%(PATH)s
+  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=@@LOCATION@@/lib

component/nettle/buildout.cfg

@@ -18,5 +18,5 @@ configure-option =
   --disable-documentation
 environment =
   PATH=${m4:location}/bin:${patch:location}/bin:%(PATH)s
-  CPPFLAGS=-I${gmp:location}/include
-  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=@@LOCATION@@/lib
+  CPPFLAGS=-I${gmp:location}/include -I${openssl:location}/include
+  LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=@@LOCATION@@/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib

component/nodejs/buildout.cfg

@@ -16,6 +16,9 @@ parts =
 #<= nodejs-X.Y.Z
 
 # nodejs 16 needs gcc > 8.3
+[gcc]
+min_version = 8.3
+
 [nodejs-16.13.2]
 <= nodejs-base
 openssl_location = ${openssl:location}

component/numpy/buildout.cfg

 [buildout]
+extends =
+  ../cython/buildout.cfg
+  ../macros/macro.pythonpath.eggs.cfg
 parts = numpy
 
+[numpy-env]
+BLAS=None
+LAPACK=None
+ATLAS=None
+
 [numpy]
 recipe = zc.recipe.egg:custom
 egg = numpy
+environment = numpy-env
+depends = ${numpy-pythonpath:recipe}
 
+[numpy-pythonpath]
+<= macro.pythonpath.eggs
+environment = numpy-env
+eggs = ${cython:egg}
 
 [versions]
-numpy = 1.16.4
+numpy = 1.22.0
+
+[numpy:sys.version_info < (3,8)]
+depends =
+
+[versions:sys.version_info < (3,8)]
+numpy = 1.16.5

component/numpy/openblas.cfg

@@ -2,6 +2,7 @@
 extends =
   buildout.cfg
   ../openblas/buildout.cfg
+parts = numpy
 
 [numpy-env]
 OPENBLAS = ${openblas:location}/lib/libopenblas.so
@@ -10,5 +11,4 @@ ATLAS = ${openblas:location}/lib/libopenblas.so
 
 [numpy]
 environment = numpy-env
-rpath =
-  ${openblas:location}/lib
+rpath = ${openblas:location}/lib

component/nxdtest/test-py3.cfg → component/nxdtest/test-py2.cfg

@@ -5,4 +5,4 @@ extends =
   test.cfg
 
 [python]
-part = python3
+part = python2.7

component/open62541/buildout.cfg

@@ -4,14 +4,26 @@
 parts = open62541
 extends =
   ../cmake/buildout.cfg
+  ../patch/buildout.cfg
 
 [open62541]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/open62541/open62541/archive/refs/tags/v1.2.2.tar.gz
-md5sum = 2883bde165bc9bc3d459ccbb47acf7f4
-configure-command = ${cmake:location}/bin/cmake
+url = https://github.com/open62541/open62541/archive/refs/heads/pack/v1.3.zip
+md5sum = c2e9938f082b027110fba538de76684c
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/ipv6_bugfix.patch#355bec02adee4ea73ff5a56ba6971ad2
+configure-command =
+  ${cmake:location}/bin/cmake
 configure-options =
-  -Bbuild
+  -DBUILD_SHARED_LIBS=ON
+  -DCMAKE_BUILD_TYPE=Release
   -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
-make-options = -C build
+  -DUA_ENABLE_PUBSUB=ON
+  -DUA_ENABLE_SUBSCRIPTIONS=ON
+  -DUA_NAMESPACE_ZERO=REDUCED
+post-install =
+  cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include
+environement =
+  PATH=${patch:location}/bin:%(PATH)s

component/open62541/ipv6_bugfix.patch

+commit ccdde2eddfd2e0937ba0b452063c60c214f5f2f5 (HEAD -> master)
+Author: Thomas Gambier <thomas.gambier@nexedi.com>
+Date:   Sat May 28 19:18:02 2022 +0200
+
+    BUGFIX: UA_PubSubChannelUDPMC_regist supports different interface in IPv6
+
+diff --git a/plugins/ua_pubsub_udp.c b/plugins/ua_pubsub_udp.c
+index 2c6ea480..f66f5860 100644
+--- a/plugins/ua_pubsub_udp.c
++++ b/plugins/ua_pubsub_udp.c
+@@ -319,6 +319,7 @@ UA_PubSubChannelUDPMC_open(const UA_PubSubConnectionConfig *connectionConfig) {
+                              "Interface configuration preparation failed.");
+                 goto cleanup;
+             }
++            memcpy(&channelDataUDPMC->intf_addr, &group.ipv6.ipv6mr_interface, sizeof(group.ipv6.ipv6mr_interface));
+         }
+ #endif
+     }
+@@ -432,6 +433,7 @@ UA_PubSubChannelUDPMC_regist(UA_PubSubChannel *channel, UA_ExtensionObject *tran
+         memcpy(&groupV6.ipv6mr_multiaddr,
+                &((const struct sockaddr_in6 *) &connectionConfig->ai_addr)->sin6_addr,
+                sizeof(struct in6_addr));
++        memcpy(&groupV6.ipv6mr_interface, &connectionConfig->intf_addr, sizeof(int));
+ 
+         if(UA_setsockopt(channel->sockfd,
+             connectionConfig->ai_family == PF_INET6 ? IPPROTO_IPV6 : IPPROTO_IP,
+

component/openssl/buildout.cfg

@@ -17,8 +17,8 @@ parts =
 [openssl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://www.openssl.org/source/openssl-1.1.1n.tar.gz
-md5sum = 2aad5635f9bb338bc2c6b7d19cbc9676
+url = https://www.openssl.org/source/openssl-1.1.1o.tar.gz
+md5sum = d05e96e200d2ff0aef20c114cb5f17bf
 location = @@LOCATION@@
 # 'prefix' option to override --openssldir/--prefix (which is useful
 # when combined with DESTDIR). Used by slapos.package.git/obs

component/pandas/buildout.cfg

 [buildout]
 extends =
+  ../cython/buildout.cfg
   ../numpy/buildout.cfg
 
 parts =
@@ -12,4 +13,16 @@ parts =
 recipe = zc.recipe.egg:custom
 egg = pandas
 environment = pandas-env
-setup-eggs = ${numpy:egg}
+setup-eggs =
+  ${numpy:egg}
+  ${cython:egg}
+
+[versions]
+pandas = 1.4.0
+
+[pandas:sys.version_info < (3,8)]
+setup-eggs =
+  ${numpy:egg}
+
+[versions:sys.version_info < (3,8)]
+pandas = 0.24.2

component/popt/buildout.cfg

@@ -9,6 +9,3 @@ url = http://ftp.rpm.org/popt/releases/popt-1.x/popt-1.18.tar.gz
 md5sum = 450f2f636e6a3aa527de803d0ae76c5a
 configure-options =
   --disable-static
-
-[x86-cygwin-popt]
-patches = ${:_profile_base_location_}/cygwin-popt-1.16-src.patch

component/postfix/buildout.cfg

@@ -14,8 +14,8 @@ extends =
 [postfix]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.5.8.tar.gz
-md5sum = c7c55ccc1db2a30d35c3867c21fe7109
+url = http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-3.7.3.tar.gz
+md5sum = bbb2168f85530fe4eaa65408a48e731b
 location = @@LOCATION@@
 patch-options = -p1
 patches =

component/postgresql/buildout.cfg

@@ -29,7 +29,8 @@ configure-options =
   --without-libxml
   --without-libxslt
 # build core PostgreSQL + pg_trgm contrib extension for GitLab
-make-targets = install && make -C contrib/pg_trgm/ install
+# unaccent contrib extension is for peertube
+make-targets = install && make -C contrib/pg_trgm/ install && make -C contrib/unaccent/ install
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${perl:location}/libs-c -Wl,-rpath=${perl:location}/libs-c

component/proxysql/buildout.cfg

@@ -36,7 +36,7 @@ post-install =
   install -Dt %(location)s/bin %(make-targets)s
 environment =
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${libgcrypt:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
-  PATH=${m4:location}/bin:${libtool:location}/bin:${libgcrypt:location}/bin:${curl:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${bzip2:location}/bin:${autoconf:location}/bin:${git:location}/bin:${automake:location}/bin:${patch:location}/bin:${cmake:location}/bin:%(PATH)s:${python2.7:location}/bin
+  PATH=${m4:location}/bin:${libtool:location}/bin:${libgcrypt:location}/bin:${curl:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${bzip2:location}/bin:${autoconf:location}/bin:${git:location}/bin:${automake:location}/bin:${patch:location}/bin:${cmake:location}/bin:${python2.7:location}/bin:%(PATH)s
   CXXFLAGS=-I${openssl:location}/include -I${gnutls:location}/include -I${zlib:location}/include
   CFLAGS=-I${gnutls:location}/include
   LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath=${curl:location}/lib -L${libtool:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${curl:location}/lib -L${pcre:location}/lib -L${jemalloc:location}/lib -L${libmicrohttpd:location}/lib
@@ -47,4 +47,4 @@ environment =
 patch-options = -p1
 patches =
 # PR #3402 (mariadb_client: backport patch to fix syntax error in cmake 3.20)
-  https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch
+  https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch#34fd6366d4a75fde821cee93d25eee10

component/pygolang/test-py3.cfg → component/pygolang/test-py2.cfg

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

component/python-pim-dm/buildout.cfg

+[buildout]
+extends =
+  ../libpcap/buildout.cfg
+  ../python-PyYAML/buildout.cfg
+
+parts =
+  eggs
+
+[python-pim-dm]
+recipe = zc.recipe.egg:custom
+egg = pim-dm
+include-dirs =
+  ${libpcap:location}/include
+library-dirs =
+  ${libpcap:location}/lib
+rpath =
+  ${libpcap:location}/lib/
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  igmp
+  ipaddress
+  netifaces
+  ${python-pim-dm:egg}
+  prettytable
+  py-mld
+  pyroute2
+  ${python-PyYAML:egg}

component/python-xmlsec/buildout.cfg

+# Python bindings for the XML Security Library.
+# https://xmlsec.readthedocs.io/
+
+[buildout]
+extends =
+  ../lxml-python/buildout.cfg
+  ../xmlsec/buildout.cfg
+
+
+[python-xmlsec]
+recipe = zc.recipe.egg:custom
+egg = xmlsec
+rpath =
+  ${libxml2:location}/lib/
+  ${libxslt:location}/lib/
+  ${openssl:location}/lib/
+  ${xmlsec:location}/lib/
+  ${zlib:location}/lib/
+setup-eggs =
+  ${lxml-python:egg}
+  pkgconfig
+  pathlib2
+  setuptools-scm
+  toml
+environment = python-xmlsec-env
+
+[python-xmlsec-env]
+PKG_CONFIG=${pkgconfig:location}/bin/pkg-config
+PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig:${xmlsec:location}/lib/pkgconfig
+
+
+[versions]
+xmlsec = 1.3.13
+setuptools-scm = 7.0.5
+toml = 0.10.2
+
+[versions:python2]
+xmlsec = 1.3.9
+setuptools-scm = 5.0.2

component/python3/buildout.cfg

@@ -9,7 +9,6 @@ extends =
   ../libpng/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
-  ../patch/buildout.cfg
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -19,7 +18,7 @@ parts =
     python3
 
 [python3]
-<= python3.7
+<= python3.8
 
 [python3-common]
 recipe = slapos.recipe.cmmi
@@ -28,9 +27,6 @@ package_version_suffix =
 
 executable = @@LOCATION@@/bin/${:_buildout_section_name_}
 
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/default_encoding.patch#4ad9664e622d5556b4c32b1d9cb587ff
 url =
   https://www.python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.xz
 configure-options =
@@ -48,20 +44,36 @@ pre-install = mkdir profile-opt
 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
 # which would otherwise load the system libmagic.so with ctypes
 environment =
-  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
 
-[python3.6]
-<= python3-common
-version = 3.6
-package_version = 3.6.10
-md5sum = 986078f11b39074be22a199e56491d98
-
 [python3.7]
 <= python3-common
 version = 3.7
-package_version = 3.7.7
-md5sum = 172c650156f7bea68ce31b2fd01fa766
-patch-options =
-patches =
+package_version = 3.7.15
+md5sum = d2ff16776b5d822efc2a7cbf42fc2915
+
+[python3.8]
+<= python3-common
+version = 3.8
+package_version = 3.8.15
+md5sum = cca78a827d2327f5c3ff2dee9f526e7e
+
+[python3.9]
+<= python3-common
+version = 3.9
+package_version = 3.9.15
+md5sum = 8adc5662c9fd10a23ae8ae9f28b65b49
+
+[python3.10]
+<= python3-common
+version = 3.10
+package_version = 3.10.8
+md5sum = e92356b012ed4d0e09675131d39b1bde
+
+[python3.11]
+<= python3-common
+version = 3.11
+package_version = 3.11.0
+md5sum = fe92acfa0db9b9f5044958edb451d463

component/python3/default_encoding.patch

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

component/qemu-kvm/buildout.cfg

 [buildout]
 extends =
+  ../defaults.cfg
   ../attr/buildout.cfg
   ../bzip2/buildout.cfg
   ../gnutls/buildout.cfg
@@ -17,20 +18,25 @@ extends =
   ../xorg/buildout.cfg
   ../zlib/buildout.cfg
   ../glib/buildout.cfg
+  ../ceph/buildout.cfg
+
+[gcc]
+min_version = 7.4
 
 [qemu]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://download.qemu.org/qemu-5.2.0.tar.xz
-md5sum = 179f86928835da857c237b42f4b2df73
+url = https://download.qemu.org/qemu-7.0.0.tar.xz
+md5sum = bfb5b09a0d1f887c8c42a6d5f26971ab
+# fix for https://bugzilla.redhat.com/show_bug.cgi?id=2079938
 patches =
-# backport (2021-03-20)
-  https://gitlab.com/qemu-project/qemu/-/commit/3eacf70bb5a83e4775ad8003cbca63a40f70c8c2.patch#c4330b02f331a827145009d85e4f6862
-patch-binary = ${patch:location}/bin/patch
+  https://gitlab.com/redhat/centos-stream/src/qemu-kvm/-/merge_requests/87.diff#ad41b138aa6f330f95811c9a83637b85
 patch-options = -p1
+patch-binary = ${patch:location}/bin/patch
 pre-configure =
   sed -i '/^libmigration\b/s/$/ dependencies: [zlib],/' meson.build
   sed -i 's/\bsnappy,/zlib, \0/' dump/meson.build
+configure-rbd = --enable-rbd
 configure-options =
   --meson=${meson:location}/bin/meson
   --ninja=${ninja:location}/bin/ninja
@@ -51,11 +57,21 @@ configure-options =
   --enable-vnc-png
   --disable-vnc-jpeg
   --disable-werror
+  ${:configure-rbd}
+CFLAGS-rbd = -I${librbd:location}/include/
+LDFLAGS-rbd = -L${librbd:location}/lib -Wl,-rpath=${librbd:location}/lib
+PKG_CONFIG_PATH-rbd = :${librbd:location}/lib/pkgconfig
 environment =
-  CFLAGS=-I${gettext:location}/include -I${libaio:location}/include -I${liburing:location}/include -I${libcap-ng:location}/include
-  LDFLAGS=-L${gettext:location}/lib -L${libaio:location}/lib -L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${gnutls:location}/lib -Wl,-rpath=${nettle:location}/lib -Wl,-rpath=${pixman:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${libaio:location}/lib -Wl,-rpath=${liburing:location}/lib -Wl,-rpath=${libcap-ng:location}/lib
+  CFLAGS=${:CFLAGS-rbd} -I${gettext:location}/include -I${libaio:location}/include -I${liburing:location}/include -I${libcap-ng:location}/include
+  LDFLAGS=${:LDFLAGS-rbd} -L${gettext:location}/lib -L${libaio:location}/lib -L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${gnutls:location}/lib -Wl,-rpath=${nettle:location}/lib -Wl,-rpath=${pixman:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${libaio:location}/lib -Wl,-rpath=${liburing:location}/lib -Wl,-rpath=${libcap-ng:location}/lib
   PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${gnutls:pkg-config-path}:${libpng:location}/lib/pkgconfig:${liburing:location}/lib/pkgconfig:${ncurses:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${gnutls:pkg-config-path}:${libpng:location}/lib/pkgconfig:${liburing:location}/lib/pkgconfig:${ncurses:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig${:PKG_CONFIG_PATH-rbd}
+
+[qemu:python2 or [int(q) for q in platform.libc_ver()[1].split(".")] < [2,25]]
+configure-rbd =
+CFLAGS-rbd =
+LDFLAGS-rbd =
+PKG_CONFIG_PATH-rbd =
 
 [qemu:sys.version_info < (3,6)]
 environment +=

component/qjs-wrapper/buildout.cfg

+[buildout]
+extends =
+  ../mavsdk/buildout.cfg
+  ../open62541/buildout.cfg
+  ../quickjs/buildout.cfg
+
+parts = qjs-wrapper
+
+[qjs-wrapper]
+recipe = slapos.recipe.cmmi
+shared = true
+configure-command = true
+url = https://lab.nexedi.com/nexedi/qjs-wrapper/-/archive/v1.0/qjs-wrapper-v1.0.tar.gz
+md5sum = 0f1393fa15d46b2b551836197af9de46
+environment =
+  C_INCLUDE_PATH=include:${open62541:location}/include:${open62541:location}/deps:${open62541:location}/src/pubsub:${quickjs:location}/include
+  CPLUS_INCLUDE_PATH=include:${mavsdk:location}/include:${mavsdk:location}/include/mavsdk
+  LDFLAGS=-L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -L${mavsdk:location}/lib -Wl,-rpath=${mavsdk:location}/lib

component/quickjs/buildout.cfg

@@ -5,8 +5,9 @@ parts = quickjs
 
 [quickjs]
 recipe = slapos.recipe.cmmi
+shared = true
 configure-command = true
-url = https://bellard.org/quickjs/quickjs-2020-09-06.tar.xz
-md5sum = 47cb6def3263d6a631b647b268b1c554
+url = https://bellard.org/quickjs/quickjs-2021-03-27.tar.xz
+md5sum = 135182a626aa0c87a49aa2bf58fd39bf
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s

component/re6stnet/buildout.cfg

@@ -5,6 +5,8 @@ extends =
   ../geoip2/buildout.cfg
   ../openvpn/buildout.cfg
   ../python-cryptography/buildout.cfg
+  ../python-PyYAML/buildout.cfg
+  ../python-pim-dm/buildout.cfg
 
 parts =
   re6stnet
@@ -18,6 +20,7 @@ eggs =
   ${maxminddb-python:egg}
   ${python-cffi:egg}
   ${python-cryptography:egg}
+  ${python-PyYAML:egg}
   pyOpenSSL
   re6stnet[geoip]
 
@@ -26,4 +29,54 @@ eggs =
 initialization =
   import os
   os.environ['GEOIP2_MMDB'] = "${geolite2-country:location}/GeoLite2-Country.mmdb"
-  os.environ['PATH'] = "${openvpn:location}/sbin:${babeld:location}/bin:${openssl:location}/bin:${python:location}/bin:" + os.environ.get('PATH', '/usr/sbin:/usr/bin:/sbin:/bin')
+  os.environ['PATH'] = "${openvpn:location}/sbin:${babeld:location}/bin:${openssl:location}/bin:${python:location}/bin:${pim-dm-buildout:location}/bin:" + os.environ.get('PATH', '/usr/sbin:/usr/bin:/sbin:/bin')
+
+[pim-dm-buildout]
+recipe = slapos.recipe.build
+base = ${:_profile_base_location_}
+python = ${python3:executable}
+install =
+  import os
+  from zc.buildout.buildout import _isurl, urljoin
+  from slapos.rebootstrap.bootstrap import setup_script
+  base = options['base']
+  if _isurl(base):
+    extends = lambda path: urljoin(base + '/', path)
+  else:
+    extends = lambda path: os.path.realpath(os.path.join(base, path))
+
+  buildout_extra = []
+  buildout_section = self.buildout['buildout']
+  for option_name in ('download-cache', 'newest', 'shared-part-list'):
+    option_value = buildout_section.get(option_name)
+    if option_value:
+      buildout_extra.append('%s = %s' % (option_name, option_value))
+  os.mkdir(location)
+  with open(os.path.join(location, 'buildout.cfg'), 'w') as buildout_conf:
+    buildout_conf.write(
+      options['template'] % {
+        'extends': '\n  '.join(map(extends, (
+          '../../stack/slapos.cfg',
+          '../python-pim-dm/buildout.cfg',
+          ))),
+        'buildout': '\n'.join(buildout_extra),
+      }
+    )
+  buildout = os.path.join(location, 'bin', 'buildout')
+  os.mkdir(os.path.dirname(buildout))
+  setup_script(buildout, options['python'])
+  call((buildout, '-U'), cwd=location)
+template =
+  [buildout]
+  extends = %(extends)s
+  extends-cache = ${buildout:extends-cache}
+  extensions -= slapos.rebootstrap
+  %(buildout)s
+  [libpcap]
+  recipe =
+  location = ${libpcap:location}
+  environment =
+  [libyaml]
+  recipe =
+  location = ${libyaml:location}
+  pre-configure =

component/readline/buildout.cfg

@@ -31,8 +31,7 @@ md5sum = e39331f32ad14009b9ff49cc10c5e751
 configure-options =
   --enable-multibyte
   --disable-static
-environment =
-  PATH=${patch:location}/bin:%(PATH)s
+patch-binary = ${patch:location}/bin/patch
 
 [readline]
 recipe = slapos.recipe.cmmi
@@ -47,3 +46,4 @@ configure-options =
 environment =
   CPPFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+patch-binary = ${patch:location}/bin/patch

component/replication-manager/buildout.cfg

@@ -30,4 +30,4 @@ go.importpath = github.com/signal18/replication-manager
 repository =  https://github.com/signal18/replication-manager
 #branch = 2.1
 branch = develop
-revision = 774fde2ce67942a31b99200fea6301189344ecd9
\ No newline at end of file
+revision = ecd7fa29cb517b292e70ca557757882cd748016e
\ No newline at end of file

component/restic/buildout.cfg

@@ -26,4 +26,4 @@ location = ${:output}
 <= go-git-package
 go.importpath = github.com/restic/restic
 repository =  https://github.com/restic/restic
-revision = v0.9.6
+revision = v0.14.0-0-g1bc87e17

component/rust/buildout.cfg

@@ -9,8 +9,8 @@ parts = rustc
 [rustc]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://static.rust-lang.org/dist/rustc-1.47.0-src.tar.gz
-md5sum = a460bed79b92f6a7833ba6e6390ee6ae
+url = https://static.rust-lang.org/dist/rustc-1.64.0-src.tar.gz
+md5sum = 948ecb62b82ed3543f03ebf598501796
 # --sysconfdir is a workaround for https://github.com/rust-lang/rust/issues/63915
 configure-options =
     --enable-extended

component/scipy/buildout.cfg

 [buildout]
+# Scipy requires BLAS/LAPACK libraries.
 extends =
   ../numpy/openblas.cfg
-
-parts =
-  scipy
+  ../pandas/buildout.cfg
+parts = scipy
 
 [scipy-env]
 <= numpy-env
@@ -14,3 +14,31 @@ egg = scipy
 environment = scipy-env
 setup-eggs = ${numpy:egg}
 rpath = ${numpy:rpath}
+depends = ${scipy-pythonpath:recipe}
+
+[scipy-pythonpath]
+<= macro.pythonpath.eggs
+environment = scipy-env
+eggs = ${scipy-setup-eggs:eggs}
+
+[scipy-setup-eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${cython:egg}
+  ${numpy:egg}
+  ${pandas:egg}
+  pythran
+  pybind11
+
+[versions]
+pybind11 = 2.9.2
+scipy = 1.8.1
+beniget = 0.4.1
+gast = 0.5.3
+pythran = 0.11.0:whl
+
+[scipy:sys.version_info < (3,8)]
+depends =
+
+[versions:sys.version_info < (3,8)]
+scipy = 1.0.1

component/slapos/obs.cfg

@@ -29,8 +29,8 @@ download-cache = download-cache
 init +=
   buildout = self.buildout['buildout']
   assert buildout['directory'] == buildout['destdir'] + buildout['rootdir'], (
-    "Buildout MUST BE launched in destdir/rootdir (currently launched in %s but should be launched in %s)",
-    buildout['directory'], buildout['destdir'] + buildout['rootdir'])
+    "Buildout MUST BE launched in destdir/rootdir (currently launched in %s but should be launched in %s)" %
+    (buildout['directory'], buildout['destdir'] + buildout['rootdir']))
 
 [python3-common]
 configure-options +=
@@ -38,6 +38,10 @@ configure-options +=
 environment +=
   DESTDIR=${buildout:destdir}
 
+# Force python3.7 for a while to be compatible with more SR
+[python3]
+<= python3.7
+
 [bison]
 configure-options +=
   --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}

component/socat/buildout.cfg

@@ -12,4 +12,5 @@ url = http://www.dest-unreach.org/socat/download/Archive/socat-${:version}.tar.g
 version = 1.7.3.2
 md5sum = aec3154f7854580cfab0c2d81e910519
 environment =
+  CPPFLAGS=-I${openssl:location}/include
   LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib

component/systemd/buildout.cfg

@@ -9,16 +9,78 @@ extends =
   ../pkgconfig/buildout.cfg
   ../util-linux/buildout.cfg
   ../xz-utils/buildout.cfg
+  ../ninja/buildout.cfg
+  ../meson/buildout.cfg
+
+[systemd-markupsafe-download]
+recipe = slapos.recipe.build:download
+shared = true
+url = https://files.pythonhosted.org/packages/bf/10/ff66fea6d1788c458663a84d88787bae15d45daa16f6b3ef33322a51fc7e/${:filename}
+filename = MarkupSafe-2.0.1.tar.gz
+md5sum = 892e0fefa3c488387e5cc0cad2daa523
+
+[systemd-markupsafe-download:sys.version_info < (3,8)]
+url = https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/${:filename}
+filename = MarkupSafe-1.0.tar.gz
+md5sum = 2fcedc9284d50e577b5192e8e3578355
+
+[systemd-jinja2-download]
+recipe = slapos.recipe.build:download
+shared = true
+url = https://files.pythonhosted.org/packages/4f/e7/65300e6b32e69768ded990494809106f87da1d436418d5f1367ed3966fd7/${:filename}
+filename = Jinja2-2.11.3.tar.gz
+md5sum = 231dc00d34afb2672c497713fa9cdaaa
+
+[systemd-python]
+recipe = slapos.recipe.build
+shared = true
+markupsafe = ${systemd-markupsafe-download:target}
+jinja2 = ${systemd-jinja2-download:target}
+
+install =
+  import os, sys
+  call([sys.executable, '-m', 'venv', '--clear', location])
+  pip = os.path.join(location, 'bin', 'pip')
+  call([pip, 'install', '--no-index', options['markupsafe'], options['jinja2']])
+  call([pip, 'uninstall', '-y', 'pip', 'setuptools'])
+  # selftest
+  python = os.path.join(location, 'bin', 'python')
+  call([python, '-c', 'import jinja2'])
 
 [systemd]
-recipe = slapos.recipe.cmmi
+recipe = slapos.recipe.build
+shared = true
 # XXX This version requires Linux kernel >= 3.7.
-url = https://www.freedesktop.org/software/systemd/systemd-221.tar.xz
-md5sum = b4d5a253841cf28a98b7ec99c45e3716
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-make-options = rootprefix=${:location} SYSTEM_SYSVINIT_PATH=${:location}/etc/init.d
+url = https://github.com/systemd/systemd-stable/archive/v249.6.tar.gz
+md5sum = eb4a1923009abdb4e25c4802f4921a18
+install =
+  env = self.environ
+  extract_dir = self.extract(self.download(options['url'], options['md5sum']))
+  workdir = guessworkdir(extract_dir)
+  call([
+    'meson', 'setup', 'build',
+    '-Dprefix=%s' % (location,),
+    '-Drootprefix=%s' % (location,),
+    '-Dsysconfdir=%s/etc' % (location,),
+    '-Dsysvinit-path=%s/etc/init.d' % (location,),
+    '-Dsysvrcnd-path=%s/etc/rc.d' % (location,),
+    '-Dlocalstatedir=%s/var' % (location,),
+    '-Dcreate-log-dirs=False',
+    '-Dhwdb=False',
+  ], cwd=workdir, env=env)
+  call(['meson', 'setup', 'build',], cwd=workdir, env=env)
+  call(['meson', 'compile', '-C', 'build/'], cwd=workdir, env=env)
+  call(['meson', 'install', '-C', 'build/'], cwd=workdir, env=env)
+  import os
+  # On some systems multiarch is detected, and then libraries go to
+  # x86_64-linux-gnu, and as there was no way to control this behaviour
+  # during meson setup build phase, simply link it to lib64, where other
+  # parts are looking for libraries
+  if os.path.exists(os.path.join(location, 'x86_64-linux-gnu')):
+    call(['ln', '-s', 'x86_64-linux-gnu', 'lib64'], cwd=location)
+
 environment =
-  PATH=${coreutils:location}/bin:${gettext:location}/bin:${gperf:location}/bin:${intltool:location}/bin:${perl-XML-Parser:perl-PATH}:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${systemd-python:location}/bin:${meson:location}/bin:${ninja:location}/bin:${coreutils:location}/bin:${gettext:location}/bin:${gperf:location}/bin:${intltool:location}/bin:${perl-XML-Parser:perl-PATH}:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${libcap:location}/include -I${util-linux:location}/include
   LDFLAGS=-L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib -L${util-linux:location}/lib -Wl,-rpath=${util-linux:location}/lib
   PKG_CONFIG_PATH=${util-linux:location}/lib/pkgconfig

component/theia/buildout.cfg

 [buildout]
 extends =
-  ../java-jdk/buildout.cfg
   ../libsecret/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../patchelf/buildout.cfg
   ../python3/buildout.cfg
+  ../tar/buildout.cfg
   ../yarn/buildout.cfg
   download-plugins.cfg
   buildout.hash.cfg
@@ -20,6 +20,13 @@ recipe = slapos.recipe.build:download
 shared = true
 url = ${:_profile_base_location_}/${:_buildout_section_name_}
 
+[vscode-uri]
+recipe = slapos.recipe.build:download
+shared = true
+revision = c45342deb98de5c7b391bd2c08431b536b869a04
+url = https://github.com/xavth/vscode-uri/archive/${:revision}.tar.gz
+md5sum = 877accd4e29d2293ce33815803d998cc
+
 [theia]
 recipe = slapos.recipe.cmmi
 shared = true
@@ -36,6 +43,19 @@ pre-configure =
   echo '${package.json:content}' > %(location)s/package.json
   # To regenerate yarn.lock, comment the line below
   cp yarn.lock %(location)s
+  # Workaround https://github.com/microsoft/vscode/issues/154048
+  # Once upstream is fixed:
+  # - remove [vscode-uri] section
+  # - remove the commands below
+  # - remove component/tar/buildout.cfg
+  # - remove the "resolution" field in package.json
+  # - regenerate yarn.lock
+  cd %(location)s
+  ${tar:location}/bin/tar -xzf ${vscode-uri:target}
+  mv vscode-uri-${vscode-uri:revision} vscode-uri
+  cd vscode-uri
+  ${yarn:location}/bin/yarn
+  ${yarn:location}/bin/yarn install
 configure-command = true
 make-binary = cd %(location)s && ${yarn:location}/bin/yarn
 make-targets = theia build
@@ -45,6 +65,10 @@ post-install =
   ${patchelf:location}/bin/patchelf --set-rpath \
     ${libsecret:location}/lib:${gettext:location}/lib:${glib:location}/lib \
     keytar.node
+  # remove some binaries using musl that are confusing check software
+  # and anyway not used once the software is installed
+  rm -f %(location)s/node_modules/@msgpackr-extract/*/*.node
+  rm -rf $HOME/.cache/yarn/
 
 [theia-wrapper]
 recipe = slapos.recipe.template
@@ -71,7 +95,17 @@ install =
     extract_dir = self.extract(self.download(url, md5sum))
     destination_dir = os.path.join(options['location'], extension_name)
     self.copyTree(guessworkdir(extract_dir), destination_dir)
+    patches = options.get(extension_name + '-patches')
+    if patches:
+      self.applyPatchList(
+        patches,
+        patch_options=options.get(extension_name + '-patch-options', '-p1'),
+        patch_binary=options['patch-binary'],
+        cwd=destination_dir,
+      )
     os.chmod(destination_dir, 0o750)
+patch-binary = ${patch:location}/bin/patch
+ms-python-python-patches = ${:_profile_base_location_}/${ms-python-disable-jedi-buildout.patch:_update_hash_filename_} ${ms-python-disable-jedi-buildout.patch:md5sum}
 
 [package.json]
 content =
@@ -106,12 +140,10 @@ content =
                           "**/.git/**": true,
                           "**/node_modules/**": true
                       },
-                      "editor.multiCursorModifier": "ctrlCmd",
                       "editor.tabSize": 2,
                       "plantuml.server": "https://plantuml.host.vifib.net/svg/",
                       "plantuml.render": "PlantUMLServer",
-                      "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }],
-                      "java.home": "${java-jdk:location}"
+                      "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }]
                   },
                   "warnOnPotentiallyInsecureHostPattern": false
               }
@@ -163,6 +195,9 @@ content =
           "@perrinjerome/theia-open": "latest",
           "@perrinjerome/theia-open-cli": "latest"
       },
+      "resolutions": {
+          "**/vscode-uri": "file:./vscode-uri"
+      },
       "devDependencies": {
           "@theia/cli": "latest"
       }

component/theia/buildout.hash.cfg

@@ -19,4 +19,8 @@ md5sum = 8157c22134200bd862a07c6521ebf799
 
 [yarn.lock]
 _update_hash_filename_ = yarn.lock
-md5sum = b1012625be07ad6a3daf27b9ed6004f0
+md5sum = ff5b37cac09580b885e6d269f62cdbad
+
+[ms-python-disable-jedi-buildout.patch]
+_update_hash_filename_ = ms-python-disable-jedi-buildout.patch
+md5sum = 0ec840ffecceaf7e91a037d439962415

component/theia/generate_download_plugins_cfg.py

 import configparser
+import logging
 import requests
 import hashlib
 
 urls = []
+session = requests.Session()
+timeout = 30
+logger = logging.getLogger()
+logging.basicConfig(level=logging.DEBUG)
 
 for plugin_and_version in '''\
     vscode/bat/latest
@@ -17,6 +22,7 @@ for plugin_and_version in '''\
     vscode/docker/latest
     vscode/emmet/latest
     vscode/fsharp/latest
+    vscode/git-base/latest
     vscode/git/latest
     vscode/go/latest
     vscode/groovy/latest
@@ -25,17 +31,17 @@ for plugin_and_version in '''\
     vscode/handlebars/latest
     vscode/hlsl/latest
     vscode/html/latest
-# latest fails to activate:
-# Activating extension 'HTML Language Features (built-in)' failed: The language client requires VS Code version ^1.52.0 but received version 1.50.0
-    vscode/html-language-features/1.52.1
+    vscode/html-language-features/latest
     vscode/ini/latest
     vscode/jake/latest
     vscode/java/latest
     vscode/javascript/latest
-    ms-vscode/js-debug/latest
+# js-debug 1.66.1 was starting OK with previous theia version, but since 1.27.0:
+# Activating extension 'JavaScript Debugger' failed: a.window.registerTerminalProfileProvider is not a function
+# (which is curious because registerTerminalProfileProvider was never supported in Theia)
+    ms-vscode/js-debug/1.51.0
     vscode/json/latest
-# latest json-language-features does offer completions with .theia/settings.json
-    vscode/json-language-features/1.45.1
+    vscode/json-language-features/latest
     vscode/less/latest
     vscode/log/latest
     vscode/lua/latest
@@ -70,9 +76,7 @@ for plugin_and_version in '''\
     vscode/theme-solarized-dark/latest
     vscode/theme-tomorrow-night-blue/latest
     vscode/typescript/latest
-# latest (1.62.3) does not activate because it uses a proposed API not in theia:
-# Activating extension 'TypeScript and JavaScript Language Features (built-in)' failed: r.languages.createLanguageStatusItem is not a function
-    vscode/typescript-language-features/1.54.3
+    vscode/typescript-language-features/latest
     vscode/vb/latest
     vscode/vscode-theme-seti/latest
     vscode/xml/latest
@@ -84,10 +88,7 @@ for plugin_and_version in '''\
     ms-vscode/references-view/latest
 # golang.Go removed because it overwrites the PATH in theia shell
 # golang/Go/0.16.2
-    vscjava/vscode-java-debug/0.29.0
-    redhat/java/0.61.0
-    vscjava/vscode-java-test/0.26.0
-    ms-python/python/2020.9.112786
+    ms-python/python/2020.10.332292344
     perrinjerome/vscode-zc-buildout/latest
     jebbs/plantuml/2.14.0
     rafaelmaiolla/diff/latest
@@ -100,8 +101,9 @@ for plugin_and_version in '''\
   publisher, extension_name, version = plugin_and_version.split('/')
 
   api_url = f'https://open-vsx.org/api/{publisher}/{extension_name}/{version}'
-  download_url = requests.get(api_url).json()['files']['download']
-  md5sum = hashlib.md5(requests.get(download_url).content).hexdigest()
+  logger.info(plugin_and_version)
+  download_url = session.get(api_url, timeout=timeout).json()['files']['download']
+  md5sum = hashlib.md5(session.get(download_url, timeout=timeout).content).hexdigest()
   urls.append(f'{publisher}-{extension_name} {download_url} {md5sum}')
 
 cfg = configparser.ConfigParser()

component/theia/ms-python-disable-jedi-buildout.patch

+jedi: Disable discover_buildout_paths
+
+This slows down jedi a lot and can make it crash on some scripts.
+
+See also https://github.com/davidhalter/jedi/issues/1325
+
+---
+ extension/pythonFiles/lib/python/jedi/inference/sys_path.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extension/pythonFiles/lib/python/jedi/inference/sys_path.py b/extension/pythonFiles/lib/python/jedi/inference/sys_path.py
+index 5b82ec1..256b19c 100644
+--- a/extension/pythonFiles/lib/python/jedi/inference/sys_path.py
++++ b/extension/pythonFiles/lib/python/jedi/inference/sys_path.py
+@@ -137,6 +137,7 @@ def check_sys_path_modifications(module_context):
+ 
+ def discover_buildout_paths(inference_state, script_path):
+     buildout_script_paths = set()
++    return buildout_script_paths
+ 
+     for buildout_script_path in _get_buildout_script_paths(script_path):
+         for path in _get_paths_from_buildout_script(inference_state, buildout_script_path):

component/tig/buildout.cfg

@@ -9,8 +9,8 @@ extends =
 [tig]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/jonas/tig/releases/download/tig-2.5.5/tig-2.5.5.tar.gz
-md5sum = 0902ba706e8efaf6c2087d8b66393375
+url = https://github.com/jonas/tig/releases/download/tig-2.5.7/tig-2.5.7.tar.gz
+md5sum = 307e966837370ba698286a1c48d31a7f
 environment =
   CFLAGS=-I${ncurses:location}/include -I${libiconv:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${libiconv:location}/lib -Wl,-rpath=${libiconv:location}/lib

component/tinyxml2/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+
+parts =
+  tinyxml2
+
+[tinyxml2]
+recipe = slapos.recipe.cmmi
+shared = true
+configure-command =
+  ${cmake:location}/bin/cmake
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -Dtinyxml2_SHARED_LIBS=ON
+url = https://github.com/leethomason/tinyxml2/archive/refs/tags/9.0.0.tar.gz
+md5sum = afecd941107a8e74d3d1b4363cf52bd7