Merge remote-tracking branch 'upstream/master' into beremiz-python3

component/ZODB/buildout.cfg

@@ -58,7 +58,7 @@ egg-versions =
 [ZODB5]
 <= _ZODB
 egg-versions =
-  ZODB = 5.8.0
+  ZODB = 5.8.1
   transaction = 3.0.1
 
 

component/curl/buildout.cfg

@@ -20,8 +20,8 @@ parts =
 [curl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://curl.se/download/curl-8.4.0.tar.bz2
-md5sum = 1a61fde1fe5c7db5c29c1196435188a5
+url = https://curl.se/download/curl-8.6.0.tar.xz
+md5sum = 8f28f7e08c91cc679a45fccf66184fbc
 configure-options =
   --disable-static
   --disable-ech
@@ -57,6 +57,7 @@ configure-options =
   --with-nghttp2=${nghttp2:location}
   --without-ngtcp2
   --without-nghttp3
+  --without-openssl-quic
   --without-quiche
   --without-zsh-functions-dir
   --without-fish-functions-dir

component/egg-patch/RestrictedPython/0001-compile-implicitly-enable-__future__.print_function-.patch

+From 4c132f622f33575aca8da1d0450caa3a33b8c0a0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Thu, 4 Jan 2024 00:13:08 +0900
+Subject: [PATCH] compile: implicitly enable __future__.print_function when
+ compiling functions
+
+---
+ src/RestrictedPython/compile.py           | 5 +++--
+ tests/test_compile_restricted_function.py | 2 +-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/RestrictedPython/compile.py b/src/RestrictedPython/compile.py
+index 3fc2881..98f3026 100644
+--- a/src/RestrictedPython/compile.py
++++ b/src/RestrictedPython/compile.py
+@@ -3,6 +3,7 @@ from RestrictedPython._compat import IS_CPYTHON
+ from RestrictedPython._compat import IS_PY2
+ from RestrictedPython.transformer import RestrictingNodeTransformer
+ 
++import __future__
+ import ast
+ import warnings
+ 
+@@ -134,7 +135,7 @@ def compile_restricted_function(
+         name,
+         filename='<string>',
+         globalize=None,  # List of globals (e.g. ['here', 'context', ...])
+-        flags=0,
++        flags=__future__.print_function.compiler_flag,
+         dont_inherit=False,
+         policy=RestrictingNodeTransformer):
+     """Compile a restricted code object for a function.
+@@ -144,7 +145,7 @@ def compile_restricted_function(
+     """
+     # Parse the parameters and body, then combine them.
+     try:
+-        body_ast = ast.parse(body, '<func code>', 'exec')
++        body_ast = compile(body, '<func code>', 'exec', ast.PyCF_ONLY_AST | flags, dont_inherit)
+     except SyntaxError as v:
+         error = syntax_error_template.format(
+             lineno=v.lineno,
+diff --git a/tests/test_compile_restricted_function.py b/tests/test_compile_restricted_function.py
+index 5c81f86..a49e475 100644
+--- a/tests/test_compile_restricted_function.py
++++ b/tests/test_compile_restricted_function.py
+@@ -9,7 +9,7 @@ from types import FunctionType
+ def test_compile_restricted_function():
+     p = ''
+     body = """
+-print("Hello World!")
++print("Hello", "World!")
+ return printed
+ """
+     name = "hello_world"
+-- 
+2.42.0
+

component/egg-patch/Zope/0001-Fix-redirections-to-URLS-with-host-given-as-IP-litte.patch

+From 8e7c9a6a86104e306aee2224ff5e517ee201b28f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Tue, 9 Jan 2024 17:15:11 +0900
+Subject: [PATCH] Fix redirections to URLS with host given as IP-litteral
+ (#1192)
+
+When redirecting to an URL with an IPv6 host with surrounding brackets,
+we should not escape the surrounding brackets.
+
+The patch updates referenced RFC from 2396 to 3986, which obsoletes it
+and change the safe characters for the netloc part to allow [ and ].
+The RFC specifies that [ and ] are only allowed when they are the first
+and last characters, but we don't need to be more specific here, because
+using [ or ] in other places of the host is rejected by urlparse above.
+
+Fixes #1191
+---
+ src/ZPublisher/HTTPResponse.py           | 14 +++++++-------
+ src/ZPublisher/tests/testHTTPResponse.py |  8 ++++++--
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/src/ZPublisher/HTTPResponse.py b/src/ZPublisher/HTTPResponse.py
+index b0b4ca2b1..b1a824151 100644
+--- a/src/ZPublisher/HTTPResponse.py
++++ b/src/ZPublisher/HTTPResponse.py
+@@ -230,24 +230,24 @@ class HTTPBaseResponse(BaseResponse):
+         # To be entirely correct, we must make sure that all non-ASCII
+         # characters are quoted correctly.
+         parsed = list(urlparse(location))
+-        rfc2396_unreserved = "-_.!~*'()"  # RFC 2396 section 2.3
++        rfc3986_unreserved = "-_.!~*'()"  # RFC 3986 section 2.3
+         for idx, idx_safe in (
+                 # authority
+-                (1, ";:@?/&=+$,"),  # RFC 2396 section 3.2, 3.2.1, 3.2.3
++                (1, "[];:@?/&=+$,"),  # RFC 3986 section 3.2, 3.2.1, 3.2.3
+                 # path
+-                (2, "/;:@&=+$,"),  # RFC 2396 section 3.3
++                (2, "/;:@&=+$,"),  # RFC 3986 section 3.3
+                 # params - actually part of path; empty in Python 3
+-                (3, "/;:@&=+$,"),  # RFC 2396 section 3.3
++                (3, "/;:@&=+$,"),  # RFC 3986 section 3.3
+                 # query
+-                (4, ";/?:@&=+,$"),  # RFC 2396 section 3.4
++                (4, ";/?:@&=+,$"),  # RFC 3986 section 3.4
+                 # fragment
+-                (5, ";/?:@&=+$,"),  # RFC 2396 section 4
++                (5, ";/?:@&=+$,"),  # RFC 3986 section 4
+         ):
+             # Make a hacky guess whether the component is already
+             # URL-encoded by checking for %. If it is, we don't touch it.
+             if '%' not in parsed[idx]:
+                 parsed[idx] = quote(parsed[idx],
+-                                    safe=rfc2396_unreserved + idx_safe)
++                                    safe=rfc3986_unreserved + idx_safe)
+         location = urlunparse(parsed)
+ 
+         self.setStatus(status, lock=lock)
+diff --git a/src/ZPublisher/tests/testHTTPResponse.py b/src/ZPublisher/tests/testHTTPResponse.py
+index a7f816c04..08a1674ba 100644
+--- a/src/ZPublisher/tests/testHTTPResponse.py
++++ b/src/ZPublisher/tests/testHTTPResponse.py
+@@ -767,15 +767,19 @@ class HTTPResponseTests(unittest.TestCase):
+         self._redirectURLCheck(ENC_URL)
+ 
+     def test_redirect_unreserved_chars(self):
+-        # RFC 2396 section 2.3, characters that should not be encoded
++        # RFC 3986 section 2.3, characters that should not be encoded
+         url = "http://example.com/-_.!~*'()"
+         self._redirectURLCheck(url)
+ 
+     def test_redirect_reserved_chars(self):
+-        # RFC 2396 section 3.3, characters with reserved meaning in a path
++        # RFC 3986 section 3.3, characters with reserved meaning in a path
+         url = 'http://example.com/+/$/;/,/=/?/&/@@index.html'
+         self._redirectURLCheck(url)
+ 
++    def test_redirect_ipv6(self):
++        url = "http://[fe80::1ff:fe23:4567:890a]:1234"
++        self._redirectURLCheck(url)
++
+     def test__encode_unicode_no_content_type_uses_default_encoding(self):
+         UNICODE = u'<h1>Tr\u0039s Bien</h1>'
+         response = self._makeOne()
+-- 
+2.42.0
+

component/gdbm/buildout.cfg

 [buildout]
+extends =
+  ../gnu-config/buildout.cfg
 parts =
   gdbm
 
@@ -8,6 +10,7 @@ shared = true
 version = 1.23
 url = http://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
 md5sum = 8551961e36bf8c70b7500d255d3658ec
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build-aux/
 configure-options =
   --disable-static
   --enable-libgdbm-compat

component/golang/buildout.cfg

@@ -19,11 +19,18 @@ shared = true
 configure-command = :
 location = @@LOCATION@@
 make-binary =
+make-targets =
+  cd src &&
+  unset GOBIN &&
 # build and test Go and its standard library
+  ./all.bash &&
 # clean intermediate cache before installing
 # contrary to build cache in gowork, build cache, that Go uses during its own build, is not reused anywhere:
 # https://github.com/golang/go/blob/go1.18.2-0-g8ed0e51b5e/src/cmd/dist/build.go#L239-L242
-make-targets= cd src && unset GOBIN && ./all.bash && GOCACHE=`pwd`/../pkg/obj/go-build ../bin/go clean -cache && cp -alf .. ${:location}
+  GOCACHE=`pwd`/../pkg/obj/go-build ../bin/go clean -cache &&
+# also clean the global cache, which is used during the tests.
+  ../bin/go clean -cache &&
+  cp -alf .. ${:location}
 # some testdata files have an issue with slapos.extension.strip.
 post-install = ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
 environment =

component/gwsocket/buildout.cfg

+# simple, standalone, language-agnostic, RFC6455 compliant WebSocket Server, written in C. https://gwsocket.io
+
+[buildout]
+parts = gwsocket
+
+[gwsocket]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://tar.gwsocket.io/gwsocket-0.4.tar.gz
+md5sum = 1367e77c47cb6379025e64deb85fb066

component/jupyter-py2/buildout.cfg

@@ -79,7 +79,6 @@ tornado = 4.4.2
 nbconvert = 4.1.0
 pathlib2 = 2.2.1
 patsy = 0.4.1
-pexpect = 4.2.1
 scandir = 1.5
 wcwidth = 0.1.7
 jupyter-console = 5.1.0

component/libexpat/buildout.cfg

@@ -7,8 +7,8 @@ parts =
 [libexpat]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.lz
-md5sum = 4add8675872d4b923d9b7871dc0f24d3
+url = https://github.com/libexpat/libexpat/releases/download/R_2_6_2/expat-2.6.2.tar.lz
+md5sum = 16ad24a204d5aee5fe8fb19e1a9b4700
 configure-options =
   --disable-static
   --without-xmlwf

component/mariadb/buildout.cfg

@@ -35,9 +35,10 @@ shared = true
 url = https://archive.mariadb.org//mariadb-${:version}/source/mariadb-${:version}.tar.gz
 pcre-location = ${pcre2:location}
 pre-configure =
-  set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
-  grep -q "$@"
-  sed -i "/$1/d" "$2"
+  d() { grep -q "$@"; sed -i "/$1/d" "$2"; }
+  d '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
+  d 'ADD_SUBDIRECTORY(\(mysql-test\|tests\)\b' CMakeLists.txt
+  d '\bINSTALL_MYSQL_TEST\b' cmake/plugin.cmake
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=@@LOCATION@@

component/mavsdk/buildout.cfg

@@ -4,37 +4,56 @@ extends =
   ../curl/buildout.cfg
   ../git/buildout.cfg
   ../jsoncpp/buildout.cfg
+  ../lxml-python/buildout.cfg
+  ../macros/macro.pythonpath.eggs.cfg
   ../tinyxml2/buildout.cfg
   ../zlib/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
 
+[c-astral-xml-definition]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/c-astral-c-library.git
+revision = v2.1
+git-executable = ${git:location}/bin/git
+
 [mavsdk-source]
 recipe = slapos.recipe.build:gitclone
 repository = https://github.com/mavlink/MAVSDK.git
-revision = v0.39.0
-
+revision = v1.4.13
 git-executable = ${git:location}/bin/git
 ignore-cloning-submodules = true
 
+[future]
+recipe = zc.recipe.egg:custom
+egg = future
+
+[mavsdk-env]
+CMAKE_INCLUDE_PATH=${curl:location}/include:${jsoncpp:location}/include:${tinyxml2:location}/include
+CMAKE_LIBRARY_PATH=${curl:location}/lib:${jsoncpp:location}/lib:${tinyxml2:location}/lib:${zlib:location}/lib
+CMAKE_PROGRAM_PATH=${cmake:location}/bin
+PATH=${pkgconfig:location}/bin/:${git:location}/bin/:%(PATH)s
+LDFLAGS=-L${curl:location}/lib -Wl,-rpath=${curl:location}/lib -L${jsoncpp:location}/lib -Wl,-rpath=${jsoncpp:location}/lib -L${tinyxml2:location}/lib -Wl,-rpath=${tinyxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=@@LOCATION@@/lib
+
+[mavsdk-pythonpath]
+<= macro.pythonpath.eggs
+environment = mavsdk-env
+eggs =
+  ${future:egg}
+  ${lxml-python:egg}
+
 [mavsdk]
 recipe = slapos.recipe.cmmi
 path = ${mavsdk-source:location}
 cmake = ${cmake:location}/bin/cmake
+depends = ${mavsdk-pythonpath:recipe}
 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
+  sed -i 's#message_definitions/v1.0#${c-astral-xml-definition:location}#' ${mavsdk-source:location}/third_party/mavlink/CMakeLists.txt
 configure-command =
   ${:cmake}
 configure-options =
@@ -42,19 +61,23 @@ configure-options =
   -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
   -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}"
   -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
-  -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}:@@LOCATION@@/lib
+  -DCMAKE_INSTALL_RPATH=${mavsdk-env:CMAKE_LIBRARY_PATH}:@@LOCATION@@/lib
   -DPKG_CONFIG_EXECUTABLE=${pkgconfig:location}/bin/pkg-config
   -DSUPERBUILD=OFF
   -Bbuild/default
   -H.
+  -Wno-dev
 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${curl:location}/lib -Wl,-rpath=${curl:location}/lib -L${jsoncpp:location}/lib -Wl,-rpath=${jsoncpp:location}/lib -L${tinyxml2:location}/lib -Wl,-rpath=${tinyxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=@@LOCATION@@/lib
+environment = mavsdk-env
 
 CMAKE_CFLAGS=-I${tinyxml2:location}/include
-CMAKE_LIBRARY_PATH=${curl:location}/lib:${jsoncpp:location}/lib:${tinyxml2:location}/lib:${zlib:location}/lib
+
+[c-astral-wrapper]
+recipe = slapos.recipe.cmmi
+configure-command = true
+url = https://lab.nexedi.com/nexedi/c-astral-wrapper/-/archive/v2.0/c-astral-wrapper-v2.0.tar.gz
+md5sum = ee2d05d225a57d17318282ff595fd498
+environment =
+  CPLUS_INCLUDE_PATH=${qjs-wrapper-source:location}/include:${mavsdk:location}/include:${mavsdk:location}/include/mavsdk
+  LDFLAGS=-L${mavsdk:location}/lib -Wl,-rpath=${mavsdk:location}/lib

component/open62541/buildout.cfg

 # Implementation of OPC UA (OPC Unified Architecture). https://open62541.org/
 
 [buildout]
-parts = open62541
+parts =
+  open62541
+  gcc-10.2
 extends =
   ../cmake/buildout.cfg
   ../patch/buildout.cfg
   ../python3/buildout.cfg
+  ../gcc/buildout.cfg
   ../defaults.cfg
 
 [gcc]
@@ -35,4 +38,4 @@ configure-options =
 post-install =
   cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include
 environment =
-  PATH=${python3:location}/bin:${patch:location}/bin:%(PATH)s
+  PATH=${gcc-10.2:location}/bin:${python3:location}/bin:${patch:location}/bin:%(PATH)s

component/openssh/buildout.cfg

@@ -16,9 +16,9 @@ parts =
 [openssh]
 recipe = slapos.recipe.cmmi
 shared = true
-md5sum = 3d29a7394816deeb57186899d7f7662c
+md5sum = 1100f170ca1bc669038ca3743e074094
 location = @@LOCATION@@
-url = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.5p1.tar.gz
+url = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.7p1.tar.gz
 patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =

component/pygolang/test.cfg

@@ -52,10 +52,7 @@ inline =
 ipython = 5.10.0
 ipython-genutils = 0.2.0
 
-simplegeneric = 0.8.1
 Pygments = 2.5.2
 prompt-toolkit = 1.0.18
 pickleshare = 0.7.5
-pexpect = 4.8.0
-backports.shutil-get-terminal-size = 1.0.0
 ptyprocess = 0.6.0

component/python-pim-dm/buildout.cfg

 [buildout]
 extends =
+  ../cython/buildout.cfg
   ../libpcap/buildout.cfg
+  ../macros/macro.pythonpath.eggs.cfg
   ../python-PyYAML/buildout.cfg
 
 parts =
   eggs
 
+# this section is used to pass info from macro pythonpath.eggs to the python-pim-dm section
+[pimdm-env]
+
+[pimdm-pythonpath]
+<= macro.pythonpath.eggs
+environment = pimdm-env
+eggs = ${cython:egg}
+
 [python-pim-dm]
 recipe = zc.recipe.egg:custom
 egg = pim-dm
@@ -15,6 +25,8 @@ library-dirs =
   ${libpcap:location}/lib
 rpath =
   ${libpcap:location}/lib/
+environment = pimdm-env
+depends = ${pimdm-pythonpath:recipe}
 
 [eggs]
 recipe = zc.recipe.egg

component/python3/buildout.cfg

@@ -78,5 +78,5 @@ md5sum = 8847dc6458d1431d0ae0f55942deeb89
 [python3.11]
 <= python3-common
 version = 3.11
-package_version = 3.11.5
-md5sum = 393856f1b7713aa8bba4b642ab9985d3
+package_version = 3.11.8
+md5sum = b353b8433e560e1af2b130f56dfbd973

component/qjs-wrapper/buildout.cfg

 [buildout]
 extends =
+  ../git/buildout.cfg
   ../mavsdk/buildout.cfg
   ../open62541/buildout.cfg
   ../quickjs/buildout.cfg
 
 parts = qjs-wrapper
 
+[qjs-wrapper-source]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/qjs-wrapper.git
+revision = v2.0
+git-executable = ${git:location}/bin/git
+
 [qjs-wrapper]
 recipe = slapos.recipe.cmmi
 configure-command = true
-url = https://lab.nexedi.com/nexedi/qjs-wrapper/-/archive/v1.3/qjs-wrapper-v1.3.tar.gz
-md5sum = 5f63356c6a10bf227e2641ea4f78c7a2
+path = ${qjs-wrapper-source:location}
 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
+  LDFLAGS=-L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -L${c-astral-wrapper:location}/lib -Wl,-rpath=${c-astral-wrapper:location}/lib

component/slapos/build.sh

@@ -43,7 +43,7 @@ eggs =
 
 [versions]
 setuptools = 44.1.1
-zc.buildout = 2.7.1+slapos019
+zc.buildout = 2.7.1+slapos020
 zc.recipe.egg = 2.0.3+slapos003
 EOF
 

component/tar/buildout.cfg

@@ -7,8 +7,8 @@ parts = tar
 [tar]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/tar/tar-1.29.tar.xz
-md5sum = a1802fec550baaeecff6c381629653ef
+url = http://ftp.gnu.org/gnu/tar/tar-1.35.tar.xz
+md5sum = a2d8042658cfd8ea939e6d911eaf4152
 environment =
   FORCE_UNSAFE_CONFIGURE=1
   PATH=${xz-utils:location}/bin:%(PATH)s

component/zodbtools/buildout.cfg

@@ -30,4 +30,4 @@ eggs    = ${zodbtools:eggs}
 
 
 [versions]
-zodbtools = 0.0.0.dev8
+zodbtools = 0.0.0.dev9

slapos/recipe/certificate_authority/certificate_authority.py

@@ -45,10 +45,11 @@ class CertificateAuthority:
         os.unlink(f)
     try:
       # no CA, let us create new one
-      popenCommunicate([self.openssl_binary, 'req', '-nodes', '-config',
-          self.openssl_configuration, '-new', '-x509', '-extensions',
-          'v3_ca', '-keyout', self.key, '-out', self.certificate,
-          '-days', '10950'], 'Certificate Authority %s\n' % uuid.uuid1())
+      popenCommunicate([self.openssl_binary, 'req', '-utf8', '-nodes',
+          '-config', self.openssl_configuration, '-new', '-x509',
+          '-extensions', 'v3_ca', '-keyout', self.key, '-out',
+          self.certificate, '-days', '10950'],
+          'Certificate Authority %s\n' % uuid.uuid1())
     except:
       try:
         for f in file_list:

slapos/test/test_json_schema.py

@@ -45,6 +45,10 @@ def createInstanceParameterSchemaValidatorTest(path):
     "http://json-schema.org/draft-04/schema#": jsonschema.Draft4Validator,
     "http://json-schema.org/draft-06/schema#": jsonschema.Draft6Validator,
     "http://json-schema.org/draft-07/schema#": jsonschema.Draft7Validator,
+    "http://json-schema.org/draft/2019-09/schema": jsonschema.Draft201909Validator,
+    "http://json-schema.org/draft/2019-09/schema#": jsonschema.Draft201909Validator,
+    "http://json-schema.org/draft/2020-12/schema": jsonschema.Draft202012Validator,
+    "http://json-schema.org/draft/2020-12/schema#": jsonschema.Draft202012Validator,
   }
   def run(self, *args, **kwargs):
     with open(path, "r") as json_file:
@@ -55,7 +59,6 @@ def createInstanceParameterSchemaValidatorTest(path):
       validator.check_schema(json_dict)
   return run
 
-
 def createSoftwareCfgValidatorTest(path, software_cfg_schema):
   # Test that software json follows the schema for softwares json,
   # which is defined in schema.json in this directory
@@ -64,13 +67,20 @@ def createSoftwareCfgValidatorTest(path, software_cfg_schema):
       schema = json.load(json_file)
       jsonschema.validate(schema, software_cfg_schema)
 
+      _viewed_software_type = []
       # also make sure request and response schemas can be resolved
       schema.setdefault('$id', 'file://' + path)
       resolver = jsonschema.RefResolver.from_schema(schema)
-      for software_type_definition in six.itervalues(schema['software-type']):
+      for key, software_type_definition in six.iteritems(schema['software-type']):
         resolver.resolve(software_type_definition['request'])
         resolver.resolve(software_type_definition['response'])
-
+        # Ensure there inst a duplicated entry.
+        _software_type_tuple = (
+          software_type_definition.get("software-type", key),
+          software_type_definition.get("shared", False))
+        assert _software_type_tuple not in _viewed_software_type, \
+                "Duplicated software release on %s, shared: %s" % _software_type_tuple
+        _viewed_software_type.append(_software_type_tuple)
   return run
 
 

software/beremiz-runtime/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = 17004b2adb98b545b16c6be60e8165e8
+md5sum = 4b7e36bbb077f91cdde5a4a05502cf71

software/beremiz-runtime/instance.cfg.in

@@ -53,9 +53,8 @@ recipe = slapos.cookbook:wrapper
 # needed libraries and tools inside SlapOS context
 environment =
   BEREMIZPYTHONPATH = {{ buildout['bin-directory'] }}/pythonwitheggs
-  PATH=$PATH:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin
-  LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/x86_64-linux-gnu:/usr/lib:/lib/x86_64-linux-gnu/:/lib:/usr/lib/x86_64-linux-gnu/
-  COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/
+  PATH={{ gcc_location }}/bin
+  LIBRARY_PATH={{ openssl_location }}/lib
 
 command-line =
  {{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['directory'] }}/parts/beremiz-source/Beremiz_cli.py -k --project-home ${directory:home}/parts/download-plc/ build transfer run

software/beremiz-runtime/software.cfg

@@ -6,6 +6,8 @@ extends =
   ../../component/open62541/buildout.cfg
   ../../component/numpy/buildout.cfg
   ../../component/lxml-python/buildout.cfg
+  ../../component/python-sslpsk/buildout.cfg
+  ../../component/gcc/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
 
@@ -16,10 +18,14 @@ parts =
   python-interpreter
   matiec
   open62541
+  gcc-10.2
 
 [python]
 part = python2.7
 
+[gcc]
+part = gcc-10.2
+
 [open62541]
 configure-options =
   -DBUILD_SHARED_LIBS=OFF
@@ -78,7 +84,7 @@ eggs = click
        opcua
        ${beremiz:egg}
        ${Twisted:egg}
-       sslpsk
+       ${python-sslpsk:egg}
 
 [instance-profile]
 recipe = slapos.recipe.template:jinja2
@@ -88,8 +94,8 @@ extensions = jinja2.ext.do
 context =
   section buildout  buildout
   raw template_monitor ${monitor2-template:output}
-# md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by
-# calling update-hash
+  key openssl_location openssl:location
+  key gcc_location gcc-10.2:location
 
 [versions]
 Twisted = 20.3.0

software/dufs/software.cfg

@@ -13,8 +13,8 @@ parts =
 [dufs]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/sigoden/dufs/archive/refs/tags/v0.39.0.tar.gz
-md5sum = e0fca35530c043c5dff7fcbe415ed35d
+url = https://github.com/sigoden/dufs/archive/refs/tags/v0.40.0.tar.gz
+md5sum = 3b71b3d07af69d6ba92c054625dc0dd2
 configure-command = :
 make-binary = cargo install --root=%(location)s --path . --locked
 make-targets =

software/end-to-end-testing/tests/test_lopcomm.py

+import json