Merge remote-tracking branch 'upstream/master' into zope4py3

component/kerberos/buildout.cfg

@@ -10,14 +10,13 @@ parts =
 [kerberos]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://web.mit.edu/kerberos/dist/krb5/1.19/krb5-1.19.2.tar.gz
-md5sum = eb51b7724111e1a458a8c9a261d45a31
+url = https://web.mit.edu/kerberos/dist/krb5/1.20/krb5-1.20.2.tar.gz
+md5sum = 7ac456e97c4959ebe5c836dc2f5aab2c
 configure-command = src/configure
 configure-options =
     --prefix=@@LOCATION@@
     --with-ldap=no
     --without-readline
-    --without-tcl
     --without-keyutils
 environment =
   PATH=${m4:location}/bin:${bison:location}/bin:%(PATH)s

component/mariadb/buildout.cfg

@@ -103,6 +103,10 @@ patch-options = -p1
 patches =
   https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.34-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
 
+[mariadb-10.4:python3]
+patches +=
+  ${:_profile_base_location_}/mariadb-10.4.32-openssl-3.0.patch#ec3e2b57eae5421e052ab89224b29b7e
+
 [mariadb-10.5]
 <= mariadb-common
 version = 10.5.23

component/nodejs/buildout.cfg

@@ -64,11 +64,13 @@ md5sum = c5ab3e98977dfd639d830625d79eff52
 <= nodejs-base
 version = v14.16.0
 md5sum = 7dc3666f407bf4e12a01ce1be2883d31
+openssl-location = ${openssl-1.1:location}
 
 [nodejs-12.18.3]
 <= nodejs-base
 version = v12.18.3
 md5sum = 28bf6a4d98b238403fa58a0805f4a979
+openssl-location = ${openssl-1.1:location}
 PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
 configure-command = ./configure
 

component/open62541/buildout.cfg

@@ -17,8 +17,9 @@ max_version = 11
 [open62541]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/open62541/open62541/archive/refs/heads/pack/v1.3.zip
-md5sum = c2e9938f082b027110fba538de76684c
+tag = v1.3.4
+url = https://github.com/open62541/open62541/archive/refs/heads/pack/${:tag}.zip
+md5sum = b9c1d3ae9d7593941108f46036f29ccc
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/ipv6_bugfix.patch#355bec02adee4ea73ff5a56ba6971ad2

component/openssl/buildout.cfg

@@ -14,11 +14,9 @@ extends =
 parts =
   openssl-output
 
-[openssl]
+[openssl-common]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://www.openssl.org/source/openssl-1.1.1w.tar.gz
-md5sum = 3f76825f195e52d4b10c70040681a275
 location = @@LOCATION@@
 # 'prefix' option to override --openssldir/--prefix (which is useful
 # when combined with DESTDIR). Used by slapos.package.git/obs
@@ -46,12 +44,26 @@ make-targets =
 environment =
   PERL=${perl:location}/bin/perl
 
+[openssl-3.0]
+<= openssl-common
+url = https://www.openssl.org/source/openssl-3.0.13.tar.gz
+md5sum = c15e53a62711002901d3515ac8b30b86
+
 [openssl-quictls]
-<= openssl
-# XXX tag missing for 1.1.1w
-# url = https://github.com/quictls/openssl/archive/refs/tags/OpenSSL_1_1_1w-quic1.tar.gz
-url = https://github.com/quictls/openssl/archive/612d8e44d687e4b71c4724319d7aa27a733bcbca.tar.gz
-md5sum =4a06f8b195e817c8a0d94ebdbc7c7bb7
+<= openssl-3.0
+url = https://github.com/quictls/openssl/archive/refs/tags/openssl-3.0.13-quic1.tar.gz
+md5sum = ff6a1f5fc5e7ea03aba9c97e7f26d97d
+
+[openssl-1.1]
+<= openssl-common
+url = https://www.openssl.org/source/openssl-1.1.1w.tar.gz
+md5sum = 3f76825f195e52d4b10c70040681a275
+
+[openssl]
+<= openssl-3.0
+
+[openssl:python2]
+<= openssl-1.1
 
 [openssl-output]
 # Shared binary location to ease migration

component/openvpn/buildout.cfg

 [buildout]
 extends =
+  ../libcap-ng/buildout.cfg
   ../lzo/buildout.cfg
   ../openssl/buildout.cfg
   ../flex/buildout.cfg
@@ -10,10 +11,11 @@ parts =
 
 [openvpn]
 recipe = slapos.recipe.cmmi
-url = https://swupdate.openvpn.org/community/releases/openvpn-${:version}.tar.xz
-version = 2.4.7
-md5sum = 4ad8a008e1e7f261b3aa0024e79e7fb7
+url = https://build.openvpn.net/downloads/releases/openvpn-${:version}.tar.gz
+version = 2.6.8
+md5sum = 427fe070a4ab9fd78dc64195458dc361
 configure-options =
+  --disable-lz4
   --disable-dependency-tracking
   --disable-plugin-auth-pam
   --enable-iproute2
@@ -21,6 +23,8 @@ environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
   LZO_LIBS=-L${lzo:location}/lib -llzo2
   LZO_CFLAGS=-I${lzo:location}/include
+  LIBCAPNG_LIBS=-L${libcap-ng:location}/lib -lcap-ng
+  LIBCAPNG_CFLAGS=-I${libcap-ng:location}/include
   OPENSSL_LIBS=-L${openssl:location}/lib -lcrypto -lssl
   OPENSSL_CFLAGS=-I${openssl:location}/include
   LDFLAGS =-Wl,-rpath=${lzo:location}/lib -Wl,-rpath=${flex:location}/lib -Wl,-rpath=${openssl:location}/lib

component/proxysql/buildout.cfg

@@ -12,11 +12,11 @@ extends =
   ../libtool/buildout.cfg
   ../m4/buildout.cfg
   ../openssl/buildout.cfg
-  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../perl/buildout.cfg
 # https://github.com/libinjection/libinjection/issues/4
   ../python-2.7/buildout.cfg
+  ../util-linux/buildout.cfg
   ../defaults.cfg
 
 parts =
@@ -28,9 +28,9 @@ max_version = 11
 [proxysql]
 recipe = slapos.recipe.cmmi
 shared = true
-version = v2.3.2
+version = v2.4.8
 url = https://github.com/sysown/proxysql/archive/refs/tags/${:version}.tar.gz
-md5sum = 969129ac43c9f64641509891a116e0e1
+md5sum = 17f31d5764b0e529a3b94f7db82794e4
 configure-command = true
 make-options = GIT_VERSION=${:version}
 # The install target does not honor DESTDIR:
@@ -40,15 +40,11 @@ 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:${python2.7:location}/bin:%(PATH)s
-  CXXFLAGS=-I${openssl:location}/include -I${gnutls:location}/include -I${zlib:location}/include
+  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:${cmake:location}/bin:${python2.7:location}/bin:%(PATH)s
+  CXXFLAGS=-I${openssl:location}/include -I${gnutls:location}/include -I${libuuid: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
+  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath=${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libuuid: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
   CMAKE_INCLUDE_PATH=${openssl:location}/include:${gnutls:location}/include:${curl:location}/include:${pcre:location}/include:${jemalloc:location}/include:${libmicrohttpd:location}/include:${zlib:location}/include
   CMAKE_LIBRARY_PATH=${openssl:location}/lib:${gnutls:location}/lib:${curl:location}/lib:${pcre:location}/lib:${jemalloc:location}/lib:${libmicrohttpd:location}/lib:${zlib:location}/lib
   LIBTOOL=libtool
   ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal
-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#34fd6366d4a75fde821cee93d25eee10

component/python-cryptography/buildout.cfg

@@ -12,6 +12,8 @@ recipe = zc.recipe.egg:custom
 egg = cryptography
 environment = python-cryptography-env
 setup-eggs = ${python-cffi:egg}
+cryptography-patches = ${:_profile_base_location_}/cryptography-3.3.2-openssl-3.0.patch#aa055c3cfab6110fd616f2de049e1388
+cryptography-patch-options = -p0
 library-dirs =
   ${openssl:location}/lib/
 rpath =

component/qjs-wrapper/buildout.cfg

@@ -19,4 +19,4 @@ path = ${qjs-wrapper-source:location}
 autopilot-wrapper =
 environment =
   C_INCLUDE_PATH=include:${open62541:location}/include:${open62541:location}/deps:${open62541:location}/src/pubsub:${quickjs:location}/include
-  LDFLAGS=-L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -L${:autopilot-wrapper}/lib -Wl,-rpath=${:autopilot-wrapper}/lib
+  LDFLAGS=-L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -L${:autopilot-wrapper}/lib -Wl,-rpath=${:autopilot-wrapper}/lib -fPIC

software/fluentd/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance-profile]
 filename = instance.cfg
-md5sum = 82c476f22e6b55b674640abef959c3c2
+md5sum = 1fe38a024766347454ad7a3d9fb52d01
 
 [template-fluentd]
 filename = instance-fluentd.cfg

software/fluentd/instance-input-schema.json

@@ -4,10 +4,11 @@
   "description": "Parameters to instantiate Fluentd",
   "additionalProperties": false,
   "properties": {
-    "conf_text": {
-      "description": "Fluentd configuration. You can write it entirely by yourself. See fluentd-agent.conf.jinja2.in",
-      "default": "",
-      "type": "string"
+    "conf-text": {
+      "title": "Configuration",
+      "description": "Fluentd configuration. See: https://docs.fluentd.org/configuration",
+      "type": "string",
+      "textarea": true
     }
   }
 }

software/fluentd/instance.cfg

@@ -42,7 +42,7 @@ recipe = slapos.recipe.build
 slapparameter-dict = $${slap-configuration:configuration}
 init =
   import re
-  options['text'] = options['slapparameter-dict'].get('conf_text') or ' '
+  options['text'] = options['slapparameter-dict'].get('conf-text') or ' '
   options['port-list'] = re.findall(r'<source>.*port (\d+).*<\/source>', options['text'], re.DOTALL)
 
 [fluentd-agent-conf]

software/fluentd/software.cfg.json

+{
+  "name": "Fluentd",
+  "description": "Fluentd",
+  "serialisation": "xml",
+  "software-type": {
+    "default": {
+      "title": "Default",
+      "description": "Fluentd",
+      "request": "instance-input-schema.json",
+      "index": 0
+    }
+  }
+}

software/fluentd/test/test.py

@@ -88,7 +88,7 @@ class WendelinTutorialTestCase(FluentdTestCase):
 
   @classmethod
   def getInstanceParameterDict(cls):
-    return {'conf_text': cls._conf,}
+    return {'conf-text': cls._conf,}
 
   @classmethod
   def measureDict(cls):

software/js-drone/software-c-astral.cfg

@@ -21,7 +21,7 @@ url = https://lab.nexedi.com/nexedi/c-astral-wrapper/-/archive/v2.1/c-astral-wra
 md5sum = cca66724e1b7a61c1b9559fde95c420b
 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
+  LDFLAGS=-L${mavsdk:location}/lib -Wl,-rpath=${mavsdk:location}/lib -fPIC
 
 [qjs-wrapper]
 autopilot-wrapper = ${c-astral-wrapper:location}

software/osie-coupler/software.cfg

@@ -17,15 +17,9 @@ extends =
 # we want this SR to use a fixed gcc (so that we have the same gcc as open62541 component)
 max_version = 0
 
-# we need open62541's sources even after compiling and linking in [open62541]
-# section. Reasons is that coupler's C application depends on it.
-[open62541-source]
-recipe = slapos.recipe.build:download-unpacked
-shared = true
-url = ${open62541:url}
-md5sum = ${open62541:md5sum}
-
 [open62541]
+pre-configure +=
+  ${git:location}/bin/git clone -b v1.1.6 https://github.com/LiamBindle/MQTT-C.git deps/mqtt-c
 configure-options =
   -DBUILD_SHARED_LIBS=ON
   -DCMAKE_BUILD_TYPE=Release
@@ -44,6 +38,10 @@ configure-options =
   -DUA_ENABLE_PUBSUB_MQTT=ON
 environment +=
   LDFLAGS=-L${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib
+# we need open62541's sources even after compiling and linking in [open62541]
+# section. Reasons is that coupler's C application depends on it.
+keep-compile-dir = true
+source-location = @@LOCATION@@/.build/open62541-pack-${open62541:tag}
 
 [osie-repository]
 recipe  = slapos.recipe.build:gitclone
@@ -58,8 +56,8 @@ bin_dir = ${:path}/bin/
 environment =
   PATH=${gcc:prefix}/bin:/usr/bin
   OPEN62541_HOME = ${open62541:location}
-  OPEN62541_SOURCE_HOME = ${open62541-source:location}
-  C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib -l:libopen62541.so -L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -I${open62541:location}/include -I${open62541-source:location}/src/pubsub/ -I${open62541-source:location}/deps
+  OPEN62541_SOURCE_HOME = ${open62541:source-location}
+  C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib -l:libopen62541.so -L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -I${open62541:location}/include -I${open62541:source-location}/src/pubsub/ -I${open62541:source-location}/deps
 configure-command = true
 
 [instance-profile]

stack/slapos.cfg

@@ -182,7 +182,7 @@ comm = 0.2.1:whl
 configparser = 4.0.2:whl
 contextlib2 = 0.6.0.post1
 croniter = 0.3.25
-cryptography = 3.3.2
+cryptography = 3.3.2+SlapOSPatched001
 dataclasses = 0.8
 dateparser = 0.7.6
 debugpy = 1.8.1