Merge remote-tracking branch 'origin/zope4py2' into zope4py3

.husky/.gitignore

+_

.husky/pre-commit

+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

component/6tunnel/buildout.cfg

@@ -3,17 +3,9 @@
 
 [buildout]
 parts = 6tunnel
-extends =
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
 
 [6tunnel]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/wojtekka/6tunnel/releases/download/0.11rc2/6tunnel-0.11rc2.tar.gz
-md5sum = 74e02d4f0704b3083a01feda66033449
-pre-configure =
-  aclocal
-  autoconf
-environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s
+url = https://github.com/wojtekka/6tunnel/releases/download/0.13/6tunnel-0.13.tar.gz
+md5sum = b13ba5ad8efc5d74b2dd71c2df85ef35

component/ZEO/buildout.cfg

@@ -65,9 +65,9 @@ egg     = ZEO
 eggs    = ${:egg}
 
 egg-versions =
-  ZEO = 5.2.2
-  trollius = 2.2.post1
-  futures = 3.2.0
+  ZEO = 5.2.3
+  trollius = 2.2.1
+  futures = 3.3.0
 
 
 # ZEO4-wc2 is ZEO4 version with patches for wendelin.core 2 to work correctly.
@@ -76,5 +76,9 @@ egg-versions =
 # See https://github.com/zopefoundation/ZEO/pull/161 for the reference.
 [ZEO4-wc2]
 <= ZEO4
-revisions = bf80d23d3506
+setup   = ${ZEO4-wc2-repository:location}
+
+[ZEO4-wc2-repository]
+<= ZEO4-repository
+revision = bf80d23d3506
 location = ${buildout:parts-directory}/ZEO4-wc2

component/ZODB/test-zodb4-wc2.cfg

@@ -109,7 +109,6 @@ template = inline:
 
 
 [versions]
-mock = 3.0.5
 random2 = 1.0.1
 zope.testing = 4.7
 zope.testrunner = 5.2

component/alsa/buildout.cfg

@@ -5,6 +5,7 @@ parts =
 [alsa]
 # Contains libasound
 recipe = slapos.recipe.cmmi
+shared = true
 url = ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.3.tar.bz2
 md5sum = eefe5992567ba00d6110a540657aaf5c
 configure-options =

component/apache-php/buildout.cfg

@@ -23,6 +23,7 @@ extends =
   ../imagemagick/buildout.cfg
   ../icu/buildout.cfg
   ../openssl/buildout.cfg
+  ../libnsl/buildout.cfg
 
 [php-redis]
 recipe = slapos.recipe.cmmi
@@ -112,7 +113,7 @@ environment =
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
   CPPFLAGS=-I${libzip:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib 
   TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
   HOME=${apache:location}
 

component/apache/buildout.cfg

@@ -39,9 +39,9 @@ configure-options =
 [apache]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 2.4.46
+version = 2.4.52
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 7d661ea5e736dac5e2761d9f49fe8361
+md5sum = a94ae42b84309d5ef6e613ae825b92fa
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer
@@ -125,4 +125,3 @@ environment =
 recipe = slapos.recipe.build:download
 shared = true
 url = ${:_profile_base_location_}/${:filename}
-mode = 640

component/autoconf/autoconf-2.69-shebang_workaround.patch

-diff -ur autoconf-2.69/bin/Makefile.in autoconf-2.69/bin/Makefile.in
---- autoconf-2.69/bin/Makefile.in	2012-04-25 04:40:26.000000000 +0200
-+++ autoconf-2.69/bin/Makefile.in	2017-04-12 16:47:38.029273723 +0200
-@@ -214,7 +214,7 @@
- # apply to us.
- MY_AUTOM4TE = \
- 	autom4te_perllibdir='$(top_srcdir)'/lib					\
--	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
-+	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
- 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
- 
- 
-diff -ur autoconf-2.69/lib/autoconf/Makefile.in autoconf-2.69/lib/autoconf/Makefile.in
---- autoconf-2.69/lib/autoconf/Makefile.in	2012-04-25 04:40:26.000000000 +0200
-+++ autoconf-2.69/lib/autoconf/Makefile.in	2017-04-12 16:47:38.033273747 +0200
-@@ -230,7 +230,7 @@
- # apply to us.
- MY_AUTOM4TE = \
- 	autom4te_perllibdir='$(top_srcdir)'/lib					\
--	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
-+	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
- 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
- 
- 
-diff -ur autoconf-2.69/lib/autoscan/Makefile.in autoconf-2.69/lib/autoscan/Makefile.in
---- autoconf-2.69/lib/autoscan/Makefile.in	2012-04-25 04:40:26.000000000 +0200
-+++ autoconf-2.69/lib/autoscan/Makefile.in	2017-04-12 16:47:38.029273723 +0200
-@@ -216,7 +216,7 @@
- # apply to us.
- MY_AUTOM4TE = \
- 	autom4te_perllibdir='$(top_srcdir)'/lib					\
--	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
-+	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
- 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
- 
- 
-diff -ur autoconf-2.69/lib/autotest/Makefile.in autoconf-2.69/lib/autotest/Makefile.in
---- autoconf-2.69/lib/autotest/Makefile.in	2012-04-25 04:40:26.000000000 +0200
-+++ autoconf-2.69/lib/autotest/Makefile.in	2017-04-12 16:47:38.029273723 +0200
-@@ -223,7 +223,7 @@
- # apply to us.
- MY_AUTOM4TE = \
- 	autom4te_perllibdir='$(top_srcdir)'/lib					\
--	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
-+	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
- 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
- 
- 
-diff -ur autoconf-2.69/lib/m4sugar/Makefile.in autoconf-2.69/lib/m4sugar/Makefile.in
---- autoconf-2.69/lib/m4sugar/Makefile.in	2012-04-25 04:40:26.000000000 +0200
-+++ autoconf-2.69/lib/m4sugar/Makefile.in	2017-04-12 16:47:38.033273747 +0200
-@@ -228,7 +228,7 @@
- # apply to us.
- MY_AUTOM4TE = \
- 	autom4te_perllibdir='$(top_srcdir)'/lib					\
--	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
-+	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
- 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
- 
- 
-diff -ur autoconf-2.69/tests/Makefile.in autoconf-2.69/tests/Makefile.in
---- autoconf-2.69/tests/Makefile.in	2012-04-25 04:40:26.000000000 +0200
-+++ autoconf-2.69/tests/Makefile.in	2017-04-12 16:47:38.025273698 +0200
-@@ -201,7 +201,7 @@
- # apply to us.
- MY_AUTOM4TE = \
- 	autom4te_perllibdir='$(top_srcdir)'/lib					\
--	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_builddir)/bin/autom4te	\
-+	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'    perl $(top_builddir)/bin/autom4te	\
- 		-B '$(top_builddir)'/lib -B '$(top_srcdir)'/lib        # keep ` '
- 
- 

component/autoconf/autoconf-2.71-shebang_workaround.patch

+diff -ur autoconf-2.71.orig/lib/freeze.mk autoconf-2.71/lib/freeze.mk
+--- autoconf-2.71.orig/lib/freeze.mk	2021-01-28 21:46:48.000000000 +0100
++++ autoconf-2.71/lib/freeze.mk	2021-10-25 09:21:38.519238189 +0200
+@@ -31,7 +31,7 @@
+ # apply to us.
+ MY_AUTOM4TE =									\
+ 	autom4te_perllibdir='$(top_srcdir)'/lib					\
+-	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_build_prefix)bin/autom4te	\
++	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'        perl $(top_build_prefix)bin/autom4te	\
+ 		-B '$(top_build_prefix)'lib -B '$(top_srcdir)'/lib        # keep ` '
+ 
+ # When processing the file with diversion disabled, there must be no
+diff -ur autoconf-2.71.orig/Makefile.in autoconf-2.71/Makefile.in
+--- autoconf-2.71.orig/Makefile.in	2021-01-28 22:06:02.000000000 +0100
++++ autoconf-2.71/Makefile.in	2021-10-25 09:22:07.231239851 +0200
+@@ -577,7 +577,7 @@
+ # apply to us.
+ MY_AUTOM4TE = \
+ 	autom4te_perllibdir='$(top_srcdir)'/lib					\
+-	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         $(top_build_prefix)bin/autom4te	\
++	AUTOM4TE_CFG='$(AUTOM4TE_CFG)'         perl $(top_build_prefix)bin/autom4te	\
+ 		-B '$(top_build_prefix)'lib -B '$(top_srcdir)'/lib        # keep ` '
+ 
+ 

component/autoconf/buildout.cfg

@@ -10,12 +10,12 @@ parts =
 [autoconf]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz
-md5sum = 82d05e03b93e45f5a39b828dc9c6c29b
+url = http://ftp.gnu.org/gnu/autoconf/autoconf-2.71.tar.gz
+md5sum = f64e38d671fdec06077a41eb4d5ee476
 pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build-aux/
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/autoconf-2.69-shebang_workaround.patch#9d286e6f9c271dff361891e381be706d
+  ${:_profile_base_location_}/autoconf-2.71-shebang_workaround.patch#9b4e417d661101f737d588eb1401747d
 environment =
   M4=${m4:location}/bin/m4
   PATH=${patch:location}/bin:${perl:location}/bin:%(PATH)s

component/automake/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 [automake]
 recipe = slapos.recipe.cmmi
 shared = true
-md5sum = 53f38e7591fa57c3d2cee682be668e5b
-url = https://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.xz
+md5sum = 4017e96f89fca45ca946f1c5db6be714
+url = https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.xz
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/automake-1.16-shebang_workaround.patch#203f9199b0e629de3630b5959f8cf73e

component/bash/buildout.cfg

 [buildout]
-parts =
-  bash
-
 extends =
+  ../gettext/buildout.cfg
   ../ncurses/buildout.cfg
   ../patch/buildout.cfg
+parts =
+  bash
 
 [bash]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz
-md5sum = 81348932d5da294953e15d4814c74dd1
+url-prefix = https://ftp.gnu.org/pub/gnu/bash/bash-5.1
+url = ${:url-prefix}.tar.gz
+md5sum = bb91a17fd6c9032c26d0b2b78b50aff5
+patch-binary = ${patch:location}/bin/patch
+patch-prefix = ${:url-prefix}-patches/bash51
 patches =
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-001#1ab682b4e36afa4cf1b426aa7ac81c0d
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-002#8fc22cf50ec85da00f6af3d66f7ddc1b
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-003#a41728eca78858758e26b5dea64ae506
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-004#bf8d53d227829d67235927689a03cc7a
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-005#c0c00935c8b8ffff76e8ab77e7be7d15
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-006#6f01e364cd092faa28dd7119f47ddb5f
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-007#dcf471d222bcd83283d3094e6ceeb6f8
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-008#f7553416646dc26c266454c78a916d36
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-009#7e73d2151f4064b484a4ba2c4b09960e
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-010#a275463d21735bb6d7161f9fbd320d8f
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-011#c17103ee20420d77e46b224c8d3fceda
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-012#3e2a057a19d02b3f92a3a09eacbc03ae
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-013#fb377143a996d4ff087a2771bc8332f9
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-014#1a1aaecc99a9d0cbc310e8e247dcc8b6
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-015#4f04387458a3c1b4d460d199f49991a8
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-016#90e759709720c4f877525bebc9d5dc06
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-017#11e4046e1b86070f6adbb7ffc89641be
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-018#cd5a9b46f5bea0dc0248c93c7dfac011
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-019#cff4dc024d9d3456888aaaf8a36ca774
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-020#167839c5f147347f4a03d88ab97ff787
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-021#1d350671c48dec30b34d8b81f09cd79d
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-022#11c349af66a55481a3215ef2520bec36
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-023#b3cb0d80fd0c47728264405cbb3b23c7
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-024#b5ea5600942acceb4b6f07313d2de74e
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-025#193c06f578d38ffdbaebae9c51a7551f
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-026#922578e2be7ed03729454e92ee8d3f3a
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-027#8ff6948b16f2db5c29b1b9ae1085bbe7
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-028#dd51fa67913b5dca45a702b672b3323f
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-029#0729364c977ef4271e9f8dfafadacf67
-  http://ftp.gnu.org/pub/gnu/bash/bash-4.3-patches/bash43-030#efb709fdb1368945513de23ccbfae053
+  ${:patch-prefix}-001#57641ddbf92fca25df92a443e36f285a
+  ${:patch-prefix}-002#aed44842ed1a05fcfc3ef146991fdaef
+  ${:patch-prefix}-003#bf96455600a86420d69f5166575192dd
+  ${:patch-prefix}-004#d2c524dba0eea5dc5f00849cc84376a0
+  ${:patch-prefix}-005#5081278e6c35154e28d09f582251c529
+  ${:patch-prefix}-006#f4a8bcda4b7bd2c72b29c107027608a3
+  ${:patch-prefix}-007#bf7816d63ee0476054bf18a488d8bb1b
+  ${:patch-prefix}-008#7e5a30d864f834953b22a55c01c8690b
+  ${:patch-prefix}-009#8e35f11cbfcefe2c07c64d00601fd713
+  ${:patch-prefix}-010#d78ad19986c0355a8d67c9a0e82ad4aa
+  ${:patch-prefix}-011#2416386b5ee94e499ccbf71f6fd4aebd
+  ${:patch-prefix}-012#879b2d8a03162faebb7234c4cd57c5cd
 configure-options =
   --with-curses
 environment =
   CPPFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
-  PATH=${patch:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:%(PATH)s

component/bazel/buildout.cfg

@@ -9,16 +9,14 @@ parts =
 do-not-strip-path = ${buildout:parts-directory}/bazel/bin/bazel
 
 [zulu]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download-unpacked
+shared = true
 url = http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-linux_x64.tar.gz
 md5sum = e5f4b1d997e50ffe4998c68c8ec45403
-strip-top-level-dir = true
 
 [template-bazel-crosstool]
 recipe = slapos.recipe.template:jinja2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 640
 filename = bazel_tools_cpp_CROSSTOOL
 template = ${:_profile_base_location_}/${:filename}.in
 rendered = ${:location}/${:filename}
@@ -29,7 +27,6 @@ context =
 [template-bazel-src-main-cpp-build]
 recipe = slapos.recipe.template:jinja2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 640
 filename = bazel_src_main_cpp_BUILD
 template = ${:_profile_base_location_}/${:filename}.in
 rendered = ${:location}/${:filename}

component/bison/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 [bison]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/bison/bison-3.3.2.tar.xz
-md5sum = c9b552dee234b2f6b66e56b27e5234c9
+url = https://ftp.gnu.org/gnu/bison/bison-3.8.2.tar.xz
+md5sum = c28f119f405a2304ff0a7ccdcc629713
 environment =
   M4=${m4:location}/bin/m4
   PATH=${autoconf:location}/bin:${automake:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s

component/boa/buildout.cfg

-[buildout]
-extends =
-  ../patch/buildout.cfg
-
-parts = boa
-
-[boa-patch-ENOSYS]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-servers/boa/files/boa-0.94.14_rc21-ENOSYS.patch?revision=1.1
-filename = boa-0.94.14_rc21-ENOSYS.patch
-md5sum = 7206b342195961501ed1eae38486e5db
-download-only = true
-
-
-[boa]
-recipe = slapos.recipe.build
-url = http://www.boa.org/boa-0.94.14rc21.tar.gz
-md5sum = e24b570bd767a124fcfb40a34d148ba9
-patches =
-    ${boa-patch-ENOSYS:location}/${boa-patch-ENOSYS:filename}
-install =
-    import shutil
-    import os
-    url = self.download(self.options['url'], self.options['md5sum'])
-    extract_dir = self.extract(url)
-    workdir = guessworkdir(extract_dir)
-    self.applyPatchList(self.options.get('patches'), '-p1', cwd=workdir)
-    call(['./configure'], cwd=workdir)
-    call(['make'], cwd=workdir)
-    # Installation of boa. Manually, no make install
-    bindir = os.path.join(location, 'bin')
-    os.makedirs(bindir)
-    for name in 'boa', 'boa_indexer':
-      path = os.path.join(bindir, name)
-      shutil.copyfile(os.path.join(workdir, 'src', name), path)
-      os.chmod(path, 0755)
-environment =
-  PATH=${patch:location}/bin:%(PATH)s

component/caddy/buildout.cfg

@@ -13,7 +13,7 @@ repository    = https://lab.nexedi.com/nexedi/caddy.git
 revision      = nxd-v1.0.3-1-g2c11cedc
 
 [gowork]
-golang  = ${golang1.16:location}
+golang  = ${golang1.17:location}
 install =
   ${caddy-get:location}:./...
 

component/cclient/buildout.cfg

@@ -10,7 +10,9 @@ parts =
 
 [cclient]
 recipe = slapos.recipe.cmmi
-url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
+#url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
+url = https://src.fedoraproject.org/lookaside/pkgs/uw-imap/${:filename}/${:md5sum}/${:filename}
+filename = imap-2007f.tar.gz
 md5sum = 2126fd125ea26b73b20f01fcd5940369
 configure-command = true
 # cclient does not support parallel compilation
@@ -23,11 +25,11 @@ make-options =
   SSLLIB=${openssl:location}/lib
   EXTRACFLAGS=-fPIC
   EXTRALDFLAGS="-Wl,-rpath -Wl,${openssl:location}/lib"
-  CCLIENT=${buildout:parts-directory}
+  PREFIX=%(location)s
   -j1
 
 patches =
-  ${:_profile_base_location_}/imap-2007f.patch#42c77fdd5d7a976fc302b93aadb3da98
+  ${:_profile_base_location_}/imap-2007f.patch#5d1f2f95472f6be465ef7e152a011100
   ${:_profile_base_location_}/imap-2007f-openssl-1.1.patch#c726354e888f2f3b3954e334903cef80
 
 patch-options = -p1

component/cclient/imap-2007f.patch

---- old/Makefile	2011-09-22 13:19:53.000000000 +0100
-+++ new/Makefile	2011-11-09 15:02:54.038306922 +0100
-@@ -280,7 +280,11 @@
+diff -u old/Makefile new/Makefile
+--- old/Makefile
++++ new/Makefile
+@@ -280,6 +280,7 @@
  SYSTEM=unix
  TOOLS=tools
  TOUCH=touch
--
-+IMAPDIR=$(CCLIENT)/cclient
-+COMPILEDIR = $(CCLIENT)/cclient__compile__/imap-2007f
-+CP=cp -r
 +INSTALL=install
-+FOR=for
  
- # Primary build command
  
-@@ -580,7 +584,6 @@
+ # Primary build command
+@@ -580,7 +581,6 @@
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  	@echo
  	@echo Do you want to continue this build anyway?  Type y or n please:
@@ -21,36 +17,26 @@
  
  nounenc:
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -639,7 +642,7 @@
+@@ -639,7 +639,6 @@
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  	@echo
  	@echo Do you want to build with IPv6 anyway?  Type y or n please:
 -	@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make noip6;exit 1);; esac'
-+	#@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make noip6;exit 1);; esac'
  	@echo OK, I will remember that you really want to build with IPv6.
  	@echo You will not see this message again.
  	@$(TOUCH) ip6
-@@ -731,6 +734,24 @@
+@@ -731,6 +730,15 @@
  	$(SH) -c '$(RM) an ua OSTYPE SPECIALS c-client mtest imapd ipopd mailutil mlock dmail tmail || true'
  	$(CD) tools;$(MAKE) clean
  
 +install:
-+	$(INSTALL) -v -d $(IMAPDIR)/include
-+	$(INSTALL) -v -d $(IMAPDIR)/lib
-+	$(INSTALL) -v -m 644 $(COMPILEDIR)/c-client/*.h $(IMAPDIR)/include
-+	$(INSTALL) -v -m 644 $(COMPILEDIR)/c-client/c-client.a $(IMAPDIR)/lib
-+	$(CP) $(COMPILEDIR)/ipopd $(COMPILEDIR)/mailutil $(COMPILEDIR)/imapd \
-+	$(COMPILEDIR)/dmail $(COMPILEDIR)/mlock $(COMPILEDIR)/mtest $(COMPILEDIR)/tmail $(IMAPDIR)
-+	$(RM) $(IMAPDIR)/ipopd/*.h $(IMAPDIR)/ipopd/*.c $(IMAPDIR)/ipopd/Makefile;
-+	$(RM) $(IMAPDIR)/mailutil/*.h $(IMAPDIR)/mailutil/*.c $(IMAPDIR)/mailutil/Makefile;
-+	$(RM) $(IMAPDIR)/imapd/*.h $(IMAPDIR)/imapd/*.c $(IMAPDIR)/imapd/Makefile;
-+	$(RM) $(IMAPDIR)/tmail/*.h $(IMAPDIR)/tmail/*.c $(IMAPDIR)/tmail/Makefile;
-+	$(RM) $(IMAPDIR)/mlock/*.h $(IMAPDIR)/mlock/*.c $(IMAPDIR)/mlock/Makefile;
-+	$(RM) $(IMAPDIR)/mtest/*.h $(IMAPDIR)/mtest/*.c $(IMAPDIR)/mtest/Makefile;
-+	$(RM) $(IMAPDIR)/dmail/*.h $(IMAPDIR)/dmail/*.c $(IMAPDIR)/dmail/Makefile;
-+	$(INSTALL) -v -m 644 $(COMPILEDIR)/ip6 $(IMAPDIR)
-+	$(INSTALL) -v -m 644 $(COMPILEDIR)/OSTYPE $(IMAPDIR)
-+	$(INSTALL) -v -m 644 $(COMPILEDIR)/SPECIALS $(IMAPDIR)
++	$(INSTALL) -v -d $(PREFIX)/bin $(PREFIX)/include $(PREFIX)/lib
++	$(INSTALL) -v c-client/*.h $(PREFIX)/include
++	$(INSTALL) -v c-client/c-client.a $(PREFIX)/lib
++	for x in ipopd mailutil imapd dmail mlock mtest tmail; \
++	do for x in $$x/*; do [ ! -x $$x ] || echo $$x; done; \
++	done |xargs $(INSTALL) -v -t $(PREFIX)/bin
++	$(INSTALL) -v -t $(PREFIX) ip6 OSTYPE SPECIALS
 +
  
  # A monument to a hack of long ago and far away...

component/chromedriver/buildout.cfg

@@ -15,37 +15,29 @@ parts =
 
 [chromedriver-wrapper-91]
 <= chromedriver-wrapper
-wrapper-name = chromedriver-91
-part = ${chromedriver-91:location}
+part = chromedriver-91
 
 [chromedriver-wrapper-2.41]
 <= chromedriver-wrapper
-wrapper-name = chromedriver-2.41
-part = ${chromedriver-2.41:location}
+part = chromedriver-2.41
 
 [chromedriver-wrapper]
 # generate a wrapper named ${:wrapper-name} setting $LD_LIBRARY_PATH
 # to run chromedriver installed from ${:part}
-wrapper-name = chromedriver
-part = ${chromedriver:location}
+part = chromedriver
 
 recipe = slapos.recipe.build
-location = ${buildout:bin-directory}/${:wrapper-name}
+location = ${buildout:bin-directory}/${:part}
+init =
+  self.buildout[options['part']]
 install =
   import os
-  chromedriver = options['part']
-  part = self.buildout[os.path.basename(chromedriver)]
+  part = self.buildout[options['part']]
   with open(location, 'w') as f:
     f.write("""#!/bin/sh -e
-  cd {}
-  export LD_LIBRARY_PATH=$PWD:{}
-  export PATH={}:$PATH
-  exec ./chromedriver "$@"
-  """.format(
-    chromedriver,
-    ':'.join(part['library'].split()),
-    ':'.join(part['path'].split()),
-  ))
+  export LD_LIBRARY_PATH=%s
+  exec %s/chromedriver "$@"
+  """ % (':'.join(part['library'].split()), part['location']))
     os.fchmod(f.fileno(), 0o755)
 
 
@@ -67,18 +59,13 @@ md5sum-x86_64 = cc43ba0babbfff7f22b48165ec8e8c81
 [chromedriver-download]
 # Installs chromedriver ${version}.
 # This chromedriver is not usable directly, it needs a wrapper.
-version =
-md5sum-x86_64 =
-
-recipe = slapos.recipe.build
-x86-64 = https://chromedriver.storage.googleapis.com/${:version}/chromedriver_linux64.zip ${:md5sum-x86_64}
+recipe = slapos.recipe.build:download-unpacked
+url = https://chromedriver.storage.googleapis.com/${:version}/chromedriver_${:_url}.zip
 library =
   ${nss:location}/lib
   ${nspr:location}/lib
   ${libX11:location}/lib
-path =
-install =
-  import os, shutil
-  extract_dir = self.extract(self.download(*options[guessPlatform()].split()))
-  os.mkdir(location)
-  shutil.copy(os.path.join(extract_dir, 'chromedriver'), location)
+
+[chromedriver-download:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux64
+md5sum = ${:md5sum-x86_64}

component/chromium/buildout.cfg

@@ -11,7 +11,6 @@
 # in the system.
 extends =
   ../alsa/buildout.cfg
-  ../coreutils/buildout.cfg
   ../cups/buildout.cfg
   ../dbus/buildout.cfg
   ../findutils/buildout.cfg
@@ -37,30 +36,30 @@ parts =
 
 
 [chromium-wrapper]
-# Install a chromium wrapper named ${:wrapper-name} in buildout's bin-directory,
-# wrapping chromium installed in ${:part}
+# Install a chromium wrapper named ${:part} in buildout's bin-directory,
+# wrapping chromium installed in [${:part}]
 # This [chromium-wrapper] installs the default chromium with name `chromium` and
 # can also be used as a macro to install under a different name.
-wrapper-name = chromium
-part = ${chromium:location}
+part = chromium
 
 recipe = slapos.recipe.build
-location = ${buildout:bin-directory}/${:wrapper-name}
+location = ${buildout:bin-directory}/${:part}
+init =
+  self.buildout[options['part']]
 install =
   import os
-  chromium = options['part']
-  part = self.buildout[os.path.basename(chromium)]
+  part = self.buildout[options['part']]
   with open(location, 'w') as f:
     f.write("""#!/bin/sh -e
-  cd {}
+  d=%s
   # this also needs a $FONTCONFIG_FILE set, otherwise system fonts will be used and if
   # no system fonts are available, chrome will refuse to start with this error:
   # FATAL:platform_font_linux.cc(83)] Check failed: InitDefaultFont(). Could not find the default font
-  export LD_LIBRARY_PATH=$PWD:{}
-  export PATH={}:$PATH
-  exec ./chrome --disable-setuid-sandbox --no-sandbox --disable-gpu $@
-  """.format(
-    chromium,
+  export LD_LIBRARY_PATH=$d:%s
+  export PATH=%s:$PATH
+  exec $d/chrome --disable-setuid-sandbox --no-sandbox --disable-gpu "$@"
+  """ % (
+    part['location'],
     ':'.join(part['library'].split()),
     ':'.join(part['path'].split()),
   ))
@@ -68,13 +67,11 @@ install =
 
 [chromium-wrapper-91]
 <= chromium-wrapper
-wrapper-name = chromium-91
-part = ${chromium-91:location}
+part = chromium-91
 
 [chromium-wrapper-69]
 <= chromium-wrapper
-wrapper-name = chromium-69
-part = ${chromium-69:location}
+part = chromium-69
 
 
 [chromium]
@@ -101,24 +98,7 @@ generation-x86_64 = 1532051976706023
 [chromium-download]
 # macro to download a binary build of chromium and generate a
 # wrapper as chrome-slapos in the part directory
-
-# the full version tag
-version =
-
-# needs the following URL parts:
-# revision is from the "base position"
-revision_x86-64 =
-# generation is in the final download URL
-generation-x86_64 =
-# this is the md5sum of the downloaded archive
-md5sum-x86_64 =
-
-
-recipe = slapos.recipe.build
-
-x86-64 = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?generation=${:generation-x86_64}&alt=media ${:md5sum-x86_64}
-
-
+recipe = slapos.recipe.build:download-unpacked
 library =
   ${atk:location}/lib
   ${at-spi2-atk:location}/lib
@@ -166,12 +146,7 @@ library =
   ${zlib:location}/lib
 path =
   ${fontconfig:location}/bin
-install =
-  url, md5sum = self.options[guessPlatform()].split()
-  extract_dir = self.extract(self.download(url, md5sum))
-  self.copyTree(guessworkdir(extract_dir), location)
-  # XXX adjust some permissions
-  import os
-  os.system("'${findutils:location}/bin/find' '%s' -type d -exec '${coreutils:location}/bin/chmod' a+rx {} \\;" % location)
-  os.system("'${findutils:location}/bin/find' '%s' -type f -executable -exec '${coreutils:location}/bin/chmod' a+rx {} \\;" % location)
-  os.system("'${findutils:location}/bin/find' '%s' -type f -exec '${coreutils:location}/bin/chmod' a+r {} \\;" % location)
+
+[chromium-download:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+url = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?generation=${:generation-x86_64}&alt=media
+md5sum = ${:md5sum-x86_64}

component/cmake/buildout.cfg

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

component/consul/buildout.cfg

 [buildout]
-
-
 parts =
   consul
 
 [consul]
-recipe = slapos.recipe.build
-
-# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-url_x86-64 = https://releases.hashicorp.com/consul/0.8.3/consul_0.8.3_linux_amd64.zip
-url_x86 = https://releases.hashicorp.com/consul/0.8.3/consul_0.8.3_linux_386.zip
+recipe = slapos.recipe.build:download-unpacked
+shared = true
+version = 0.8.3
+url = https://releases.hashicorp.com/consul/${:version}/consul_${:version}_${:_url}.zip
 
-# supported architectures md5sums
-md5sum_x86 = dfdc0eedd79baab7e6bc56c1582fd02e
-md5sum_x86-64 = d6bc0898ea37ae2198370a9e1978d1bb
+[consul:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url = linux_386
+md5sum = dfdc0eedd79baab7e6bc56c1582fd02e
 
-install =
-  import shutil
-  platform = guessPlatform()
-  url = options['url_' + platform]
-  md5sum = options['md5sum_' + platform]
-  extract_dir = self.extract(self.download(url, md5sum))
-  shutil.move(extract_dir, location)
+[consul:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux_amd64
+md5sum = d6bc0898ea37ae2198370a9e1978d1bb

component/coreutils/buildout.cfg

@@ -9,8 +9,8 @@ parts =
 [coreutils]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://ftp.gnu.org/gnu/coreutils/coreutils-8.31.tar.xz
-md5sum = 0009a224d8e288e8ec406ef0161f9293
+url = https://ftp.gnu.org/gnu/coreutils/coreutils-9.0.tar.xz
+md5sum = 0d79ae8a6124546e3b94171375e5e5d0
 configure-options = 
   --disable-libcap
   --prefix=@@LOCATION@@

component/coturn/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../sqlite3/buildout.cfg
   ../openssl/buildout.cfg
   ../libevent/buildout.cfg
+  ../libnsl/buildout.cfg
 parts = coturn
 
 [coturn]
@@ -13,4 +14,4 @@ environment =
   PATH=${sqlite3:location}/bin:%(PATH)s
   CPPFLAGS=-I${openssl:location}/include -I${sqlite3:location}/include -I${libevent2:location}/include
   CFLAGS=-I${libevent2:location}/include
-  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${libevent2:location}/lib -Wl,-rpath -Wl,${libevent2:location}/lib
+  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${libevent2:location}/lib -Wl,-rpath -Wl,${libevent2:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib

component/cpio/963304-remove-superfluous-declaration-of-program_name

+author	Sergey Poznyakoff <gray@gnu.org>
+
+https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=641d3f489cf6238bb916368d4ba0d9325a235afb
+
+* src/global.c: Remove superfluous declaration of program_name
+
+diff --git a/src/global.c b/src/global.c
+index fb3abe9..acf92bc 100644
+--- a/src/global.c
++++ b/src/global.c
+@@ -184,9 +184,6 @@ unsigned int warn_option = 0;
+ /* Extract to standard output? */
+ bool to_stdout_option = false;
+ 
+-/* The name this program was run with.  */
+-char *program_name;
+-
+ /* A pointer to either lstat or stat, depending on whether
+    dereferencing of symlinks is done for input files.  */
+ int (*xstat) ();

component/cpio/buildout.cfg

 # GNU cpio copies files into or out of a cpio or tar archive. The archive can be another file on the disk, a magnetic tape, or a pipe.
 [buildout]
+extends =
+  ../patch/buildout.cfg
 parts = cpio
 
 [cpio]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.bz2
-md5sum = 93eea9f07c0058c097891c73e4955456
+url = https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.bz2
+md5sum = f3438e672e3fa273a7dc26339dd1eed6
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/963304-remove-superfluous-declaration-of-program_name#1aadb39448eedaf49d03cf45f9d78ea4
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/curl/buildout.cfg

@@ -10,14 +10,15 @@ extends =
   ../zstd/buildout.cfg
   ../zlib/buildout.cfg
   ../nghttp2/buildout.cfg
+  ../ca-certificates/buildout.cfg
 parts =
   curl
 
 [curl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://curl.haxx.se/download/curl-7.76.0.tar.xz
-md5sum = 41178ceea57c863f883b6fe2c3ac276f
+url = http://curl.haxx.se/download/curl-7.79.1.tar.xz
+md5sum = 74d3c4ca8aaa6c0619806d6e246e65fb
 configure-options =
   --disable-static
   --disable-ech
@@ -38,6 +39,7 @@ configure-options =
   --disable-alt-svc
   --with-zlib=${zlib:location}
   --with-ssl=${openssl:location}
+  --with-ca-path=${openssl:location}/etc/ssl/certs
   --without-gnutls
   --without-polarssl
   --without-mbedtls
@@ -45,7 +47,6 @@ configure-options =
   --without-nss
   --without-libpsl
   --without-libgsasl
-  --without-libmetalink
   --without-libssh2
   --without-libssh
   --without-librtmp

component/dash/buildout.cfg

@@ -7,8 +7,8 @@ parts = dash-output
 [dash]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.8.tar.gz
-md5sum = 5c152209680dab3c319e8923f6c51378
+url = http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.11.tar.gz
+md5sum = 027236e48b9202607b1418fee42c473e
 configure-options =
   --disable-static
   --disable-fnmatch

component/depot_tools/buildout.cfg

 [buildout]
+extends =
+  ../git/buildout.cfg
 parts =
   depot_tools
 
 [depot_tools]
 recipe = slapos.recipe.build:gitclone
 repository = https://chromium.googlesource.com/chromium/tools/depot_tools.git
-branch = master
+revsion = e023d4482012d89690f6a483e877eceb47c4501e
 git-executable = ${git:location}/bin/git

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

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

component/file/buildout.cfg

@@ -11,8 +11,8 @@ extends =
 [file]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.icm.edu.pl/packages/file/file-5.39.tar.gz
-md5sum = 1c450306053622803a25647d88f80f25
+url = http://ftp.icm.edu.pl/packages/file/file-5.41.tar.gz
+md5sum = 18233bb0a0089dfdc7dfbc93b96f231b
 configure-options =
   --disable-static
   --disable-libseccomp

component/findutils/buildout.cfg

@@ -7,8 +7,8 @@ parts =
 [findutils]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.debian.org/debian/pool/main/f/findutils/findutils_4.6.0+git+20190510.orig.tar.xz
-md5sum = 9ae8d2b323b0b12a484abcbff1d2c486
+url = http://ftp.debian.org/debian/pool/main/f/findutils/findutils_4.8.0.orig.tar.xz
+md5sum = eeefe2e6380931a77dfa6d9350b43186
 
 [findutils-output]
 # Shared binary location to ease migration

component/firefox/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../alsa/buildout.cfg
   ../dbus/buildout.cfg
   ../fontconfig/buildout.cfg
+  ../fonts/buildout.cfg
   ../gtk-2/buildout.cfg
   ../gtk-3/buildout.cfg
   ../libffi/buildout.cfg
@@ -22,59 +23,52 @@ parts =
 
 
 [firefox-wrapper]
-# Install a firefox wrapper names ${:wrapper-name} in buildout's bin-directory,
-# wrapping firefox installed in ${:part}
+# Install a firefox wrapper named ${:part} in buildout's bin-directory,
+# wrapping firefox installed in [${:part}]
 # This [firefox-wrapper] installs the default firefox with name `firefox` and
 # can also be used as a macro to install under a different name.
-wrapper-name = firefox
-part = ${firefox:location}
+part = firefox
 
 recipe = slapos.recipe.build
-location = ${buildout:bin-directory}/${:wrapper-name}
+location = ${buildout:bin-directory}/${:part}
+fonts-conf = ${firefox-default-fonts-conf:rendered}
+init =
+  self.buildout[options['part']]
 install =
   import os
-  firefox = options['part']
-  part = self.buildout[os.path.basename(firefox)]
+  part = self.buildout[options['part']]
   with open(location, 'w') as f:
     f.write("""#!/bin/sh -e
-  cd {}
-  export LD_LIBRARY_PATH=$PWD:{}
-  export PATH={}:$PATH
+  d=%s
+  export LD_LIBRARY_PATH=$d:%s
+  export PATH=%s:$PATH
   # BBB use a default fonts.conf for compatibility, but it's software instance
   # responsability to build a fonts.conf with the fonts they want.
-  [ -z $FONTCONFIG_FILE ] && export FONTCONFIG_FILE=${firefox-default-fonts-conf:rendered}
-  exec ./firefox "$@"
-  """.format(
-    firefox,
+  [ "$FONTCONFIG_FILE" ] || export FONTCONFIG_FILE=%s
+  exec $d/firefox "$@"
+  """ % (
+    part['location'],
     ':'.join(part['library'].split()),
     ':'.join(part['path'].split()),
+    options['fonts-conf'],
   ))
     os.fchmod(f.fileno(), 0o755)
 
 [firefox-wrapper-78]
 <= firefox-wrapper
-wrapper-name = firefox-78
-part = ${firefox-78:location}
+part = firefox-78
 
 [firefox-wrapper-68]
 <= firefox-wrapper
-wrapper-name = firefox-68
-part = ${firefox-68:location}
+part = firefox-68
 
 [firefox-wrapper-60]
 <= firefox-wrapper
-wrapper-name = firefox-60
-part = ${firefox-60:location}
+part = firefox-60
 
 [firefox-wrapper-52]
 <= firefox-wrapper
-wrapper-name = firefox-52
-part = ${firefox-52:location}
-
-[firefox-wrapper-51]
-<= firefox-wrapper
-wrapper-name = firefox-51
-part = ${firefox-51:location}
+part = firefox-52
 
 [firefox-default-fonts-conf]
 recipe = slapos.recipe.template:jinja2
@@ -124,20 +118,12 @@ version = 52.9.0esr
 i686-md5sum = 9aa18888b7812670208490609d75c9bc
 x86_64-md5sum = 9336d70f45070c743d08e5473b783a7a
 
-[firefox-51]
-<= firefox-download
-version = 51.0.1
-i686-md5sum = 9a5b67e9d759a1e4df004294a24b2b43
-x86_64-md5sum = bd93f2652d1d90d59ae462439a93c85f
-
-
 [firefox-download]
 recipe = slapos.recipe.build
 slapos_promise =
   file:firefox
 
-x86 = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 ${:i686-md5sum}
-x86-64 = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ${:x86_64-md5sum}
+url = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/${:_url}/en-US/firefox-${:version}.tar.bz2
 
 library =
   ${alsa:location}/lib
@@ -185,12 +171,19 @@ path =
   ${fontconfig:location}/bin
 
 install =
-  url, md5sum = options[guessPlatform()].split()
-  extract_dir = self.extract(self.download(url, md5sum))
-  self.copyTree(guessworkdir(extract_dir), location)
+  self.copyTree(guessworkdir(self.extract(self.download())), location)
   ${:post-install}
 post-install =
 
+[firefox-download:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url = linux-i686
+md5sum = ${:i686-md5sum}
+
+[firefox-download:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux-x86_64
+md5sum = ${:x86_64-md5sum}
+
+
 [geckodriver]
 # Current geckodriver installed as ${buildout:bin-directory}/geckodriver
 <= geckodriver-0.24.0
@@ -207,47 +200,26 @@ version = 0.22.0
 i686-md5sum = 6de7544753fda56fbaa8382dcac99aaa
 x86_64-md5sum = 81746200ce5841e00cabf3b8ea7db542
 
-[geckodriver-0.21.0]
-<= geckodriver-base
-version = 0.21.0
-i686-md5sum = 9fc1657dd1b94272d0cdb3b29ca80f79
-x86_64-md5sum = 6bc36d4fd4975e296cdb3fa3c5e26a41
-
-[geckodriver-0.19.0]
-<= geckodriver-base
-version = 0.19.0
-i686-md5sum = 07cd383c8aef8ea5ef194a506141afd6
-x86_64-md5sum = ca6935a72fd0527d15a78a17a35e56e8
-
-[geckodriver-0.17.0]
-<= geckodriver-base
-version = 0.17.0
-i686-md5sum = 79b1a158f96d29942a111c0905f1c807
-x86_64-md5sum = be18faeea6e7db9db6990d8667e2298f
-
 [geckodriver-0.16.1]
 <= geckodriver-base
 version = 0.16.1
 i686-md5sum = not not on github
 x86_64-md5sum = 57dfd55d4759d9878eb75b4c0123d00c
 
-[geckodriver-0.14.0]
-<= geckodriver-base
-version = 0.14.0
-i686-md5sum = b5836f5a944fe9f3ed1a67c7b342c6a7
-x86_64-md5sum = 4a185d3179862a35104603b9274452e7
-
-
 [geckodriver-base]
 # Installs geckodriver ${version}
 recipe = slapos.recipe.build
+url = https://github.com/mozilla/geckodriver/releases/download/v${:version}/geckodriver-v${:version}-${:_url}.tar.gz
 location = ${buildout:bin-directory}/${:_buildout_section_name_}
+install =
+  import os, shutil
+  extract_dir = self.extract(self.download(options['url'], options['md5sum']))
+  shutil.copy(os.path.join(extract_dir, 'geckodriver'), location)
 
-x86 = https://github.com/mozilla/geckodriver/releases/download/v${:version}/geckodriver-v${:version}-linux32.tar.gz ${:i686-md5sum}
-x86-64 = https://github.com/mozilla/geckodriver/releases/download/v${:version}/geckodriver-v${:version}-linux64.tar.gz ${:x86_64-md5sum}
+[geckodriver-base:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url = linux32
+md5sum = ${:i686-md5sum}
 
-install =
-  import shutil
-  url, md5sum = options[guessPlatform()].split()
-  extract_dir = self.extract(self.download(url, md5sum))
-  shutil.copy(extract_dir + '/geckodriver', location)
+[geckodriver-base:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux64
+md5sum = ${:x86_64-md5sum}

component/firewalld/buildout.cfg

@@ -73,7 +73,7 @@ environment =
   PATH=${pkgconfig:location}/bin:${gettext:location}/bin:${glib:location}/bin:${xz-utils:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
   CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
-  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
+  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi -L${zlib:location}/lib/ -Wl,-rpath=${zlib:location}/lib/
   GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
   GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lintl -lgobject-2.0
   FFI_CFLAGS=-I${libffi:location}/include
@@ -103,10 +103,8 @@ environment =
   GI_LIBS=-L${gobject-introspection:location}/lib -lgirepository-1.0
 
 [trusted-config]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = https://raw.githubusercontent.com/t-woerner/firewalld/v0.3.14/config/zones/trusted.xml
-download-only = true
+recipe = slapos.recipe.build:download
+url = https://raw.githubusercontent.com/t-woerner/firewalld/v0.3.14/config/zones/${:filename}
 filename = trusted.xml
 md5sum = 893752ba2e93a1e96334dfee19f884ad
 

component/fluentd/buildout.cfg

@@ -11,20 +11,21 @@ url = https://rubygems.org/rubygems/rubygems-2.4.8.zip
 ruby-executable = ${ruby:location}/bin/ruby
 gems =
   msgpack==1.3.3
-  cool.io==1.4.6
+  concurrent-ruby==1.1.9
+  cool.io==1.7.1
+  dig_rb==1.0.1
   http_parser.rb==0.6.0
   sigdump==0.2.4
-  serverengine==2.2.3
-  strptime==0.1.9
+  serverengine==2.2.4
+  strptime==0.2.5
   thread_safe==0.3.6
-  tzinfo==1.2.9
+  tzinfo==2.0.4
   tzinfo-data==1.2021.1
   yajl-ruby==1.4.1
-  fluentd==0.14.14
+  fluentd==1.8.1
   httpclient==2.8.3
-  json==2.5.1
-  td-client==0.8.85
-  fluent-plugin-td==0.10.29
+  td-client==1.0.8
+  fluent-plugin-td==1.1.0
 gem-options =
   --with-icu-lib=${icu:location}/lib/
   --with-icu-dir=${icu:location}/

component/fontconfig/buildout.cfg

@@ -33,4 +33,3 @@ environment =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 640

component/fonts/buildout.cfg

@@ -10,19 +10,13 @@ parts =
   ipaex-fonts
   liberation-fonts
   ocrb-fonts
+  source-code-pro-fonts
+  jetbrains-mono-fonts
 
 
 [fonts-base]
-# XXX download and unpack, with shared parts support
-# we could make slapos.recipe.build:download-unpacked really support shared
-# parts and use it here. Current version of slapos.recipe.build ( 0.44 ) looks
-# for buildout:shared-parts , but this is not what shared parts are using.
-recipe = slapos.recipe.cmmi
+recipe = slapos.recipe.build:download-unpacked
 shared = true
-configure-command = :
-make-binary = :
-post-install = cp -ra . ${:location}
-location = @@LOCATION@@
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
 
@@ -77,27 +71,19 @@ md5sum = 62f02985bfef43a27dbdd17641fec210
 # Microsoft's TrueType core fonts
 # non-free so not enabled by default
 [msttcore-fonts]
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 recipe = slapos.recipe.build
+shared = true
+p7z = ${p7zip:location}/bin/7z
 install =
   import os, subprocess
-  from zc.buildout.download import Download
-  d = location
-  fonts = []
-  download = lambda x, dl=Download(self.buildout['buildout']): (
-    dl("http://downloads.sf.net/corefonts/%s32.exe" % name, md5sum=md5sum)
-    for md5sum, name in (x.split() for x in x.splitlines() if x))
-  extract = lambda x, d=d, p7z="${p7zip:location}/bin/7z": any(
-    subprocess.check_call((p7z, "x", "-ssc-", path, "*.ttf"), cwd=d)
-    for path, is_temp in x)
-  try:
-    fonts += download(options['fonts'])
-    os.makedirs(d)
-    extract(fonts)
-  finally:
-    for path, is_temp in fonts:
-      if is_temp:
-        os.remove(path)
+  os.makedirs(location)
+  cmd = [options['p7z'], "x", "-ssc-", None, "*.ttf"]
+  for x in options['fonts'].splitlines():
+    md5sum, name = x.split()
+    cmd[3] = self.download(
+      "http://downloads.sf.net/corefonts/%s32.exe" % name,
+      md5sum)
+    subprocess.check_call(cmd, cwd=location)
 slapos_promise =
 slapos_update_promise = ${:slapos_promise}
 fonts =

component/gdbm/buildout.cfg

@@ -5,9 +5,9 @@ parts =
 [gdbm]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 1.19
+version = 1.22
 url = http://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
-md5sum = aeb29c6a90350a4c959cd1df38cd0a7e
+md5sum = 0bbd38f12656e4728e2f7c4708aec014
 configure-options =
   --disable-static
   --enable-libgdbm-compat

component/geoip2/buildout.cfg

@@ -16,6 +16,7 @@ rpath = ${:library-dirs}
 
 [geolite2-country]
 recipe = slapos.recipe.build:download-unpacked
+shared = true
 url = http://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz#${:md5sum}
 md5sum = dc6224c648350d90f344a0c5c3ca5474
 strip-top-level-dir = true

component/ghostscript/buildout.cfg

@@ -14,8 +14,8 @@ parts = ghostscript
 [ghostscript]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9540/ghostscript-9.54.0.tar.gz
-md5sum = 5d571792a8eb826c9f618fb69918d9fc
+url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9550/ghostscript-9.55.0.tar.xz
+md5sum = 92aa46e75c4f32eb11d9c975053d876c
 pkg_config_depends = ${libtiff:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
 # XXX --with-tessdata work arounds a slaprunner bug of having softwares installed in a path containing //
 configure-options =

component/git/buildout.cfg

@@ -18,8 +18,8 @@ parts =
 [git]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://www.kernel.org/pub/software/scm/git/git-2.25.1.tar.xz 
-md5sum = 92bf65673b4fc08b64108d807f36f4d9
+url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.33.1.tar.xz
+md5sum = 3462f34d9c17288eee854b7645f6a0a1
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/gnutls/buildout.cfg

@@ -21,8 +21,8 @@ environment-extra =
 
 [libgpg-error]
 <= gpg-common
-version = 1.27
-md5sum = 5217ef3e76a7275a2a3b569a12ddc989
+version = 1.42
+md5sum = 133fed221ba8f63f5842858a1ff67cb3
 configure-options-extra =
   --disable-doc
   --disable-tests
@@ -37,15 +37,15 @@ environment-extra =
 
 [libgcrypt]
 <= with-gpg-error
-version = 1.8.1
-md5sum = b21817f9d850064d2177285f1073ec55
+version = 1.9.4
+md5sum = edc7becfe09c75d8f95ff7623e40c52e
 configure-options-extra2 =
   --disable-doc
 
 [gnutls]
 <= gpg-common
-url = http://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.15.tar.xz
-md5sum = bcdcbc65c50a7499617ad9f4d0058de9
+url = https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz
+md5sum = 95c32a1af583ecfcb280648874c0fbd9
 configure-options-extra =
   --disable-doc
   --disable-static

component/golang/buildout.cfg

@@ -5,6 +5,8 @@ extends =
   ../gcc/buildout.cfg
   ../git/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../swig/buildout.cfg
+  ../patch/buildout.cfg
   ./buildout.hash.cfg
 
 parts = gowork go
@@ -21,9 +23,19 @@ make-targets= cd src && unset GOBIN && ./all.bash && cp -alf .. ${:location}
 # some testdata files have an issue with slapos.extension.strip.
 post-install = ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
 environment =
+  PATH=${swig:location}/bin:${patch:location}/bin:%(PATH)s
   GOROOT_FINAL=${:location}
   ${:environment-extra}
 
+# TestChown and TestSCMCredentials currently fail in a user-namespace
+# https://github.com/golang/go/issues/42525
+# the patches apply to go >= 1.12
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/skip-chown-tests.patch#d4e3c8ef83788fb2a5d80dd75034786f
+  ${:_profile_base_location_}/fix-TestSCMCredentials.patch#1d8dbc97cd579e03fafd8627d48f1c59
+
+
 [golang14]
 <= golang-common
 # https://golang.org/doc/install/source#bootstrapFromSource
@@ -32,6 +44,9 @@ md5sum = dbf727a4b0e365bf88d97cbfde590016
 environment-extra =
 make-targets= cd src && unset GOBIN && ./make.bash && cp -alf .. ${:location}
 
+# skip-chown-tests.patch does not apply to go1.4, but we don't run go1.4 tests.
+patches =
+
 
 [golang1.12]
 <= golang-common
@@ -42,25 +57,24 @@ md5sum = 6b607fc795391dc609ffd79ebf41f080
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
-[golang1.15]
+[golang1.16]
 <= golang-common
-url = https://golang.org/dl/go1.15.12.src.tar.gz
-md5sum = b3a5dafa7028fa00083ce4aeaf5bcb9a
+url = https://golang.org/dl/go1.16.13.src.tar.gz
+md5sum = 1c076f952d9af57590a36fa7d36f695a
 
-# go1.15 needs go1.4 to bootstrap
+# go1.16 needs go1.4 to bootstrap
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
-[golang1.16]
+[golang1.17]
 <= golang-common
-url = https://golang.org/dl/go1.16.4.src.tar.gz
-md5sum = 5884a4cb49067b9bcf6e69a1ef44259c
+url = https://golang.org/dl/go1.17.6.src.tar.gz
+md5sum = dc57f93f323e9f8189e5ffc1f223e346
 
-# go1.16 needs go1.4 to bootstrap
+# go1.17 needs go1.4 to bootstrap
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
-
 # ---- infrastructure to build Go workspaces / projects ----
 
 # gowork is the top-level section that defines Go workspace.
@@ -108,7 +122,6 @@ environment-extra =
 recipe  = slapos.recipe.template:jinja2
 exe     = ${buildout:bin-directory}/go
 rendered= ${:exe}
-mode    = 755
 template= inline:
   #!/bin/sh -e
   . ${gowork:env.sh}
@@ -121,7 +134,7 @@ bin	= ${gowork.dir:bin}
 depends = ${gowork.goinstall:recipe}
 
 # go version used for the workspace (possible to override in applications)
-golang  = ${golang1.16:location}
+golang  = ${golang1.17:location}
 
 # no special build flags by default
 buildflags =

component/golang/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [gowork-env.sh]
 filename = goenv.sh.in
-md5sum = f6d0fc24e3f08f27bc2bd85003ca5ec2
+md5sum = 67a211c786a2351867c3c38f675370f7

component/golang/fix-TestSCMCredentials.patch

+From 385ca858ac89efccffd557eccc1113281306bd88 Mon Sep 17 00:00:00 2001
+From: Kirill Smelkov <kirr@nexedi.com>
+Date: Mon, 6 Dec 2021 22:50:27 +0300
+Subject: [PATCH] syscall: tests: Fix TestSCMCredentials for `unshare -Umc`
+
+---
+ src/syscall/creds_test.go | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/syscall/creds_test.go b/src/syscall/creds_test.go
+index c1a8b516e8..ed6e80c0c3 100644
+--- a/src/syscall/creds_test.go
++++ b/src/syscall/creds_test.go
+@@ -78,8 +78,10 @@ func TestSCMCredentials(t *testing.T) {
+ 			if sys, ok := err.(*os.SyscallError); ok {
+ 				err = sys.Err
+ 			}
+-			if err != syscall.EPERM {
+-				t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
++			// can get EINVAL instead of EPERM under `unshare -Umc` because uid0 is not mapped and maps to -1
++			// see also https://github.com/golang/go/issues/42525
++			if !(err == syscall.EPERM || err == syscall.EINVAL) {
++				t.Fatalf("WriteMsgUnix failed with %v, want EPERM/EINVAL", err)
+ 			}
+ 		}
+ 
+-- 
+2.30.2
+

component/golang/goenv.sh.in

@@ -14,7 +14,7 @@ done <<-EOF
 EOF
 
 # PATH so that go & friends work out of the box
-export PATH=${gowork:golang}/bin:${git:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:${gcc:prefix}/bin:$PATH
+export PATH=${gowork:golang}/bin:${git:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:${gcc:prefix}/bin:${swig:location}/bin:$PATH
 X=${gowork:directory}
 
 export PKG_CONFIG_PATH=$(echo -n "${gowork:cpkgpath}" |tr '\n' ':'):$PKG_CONFIG_PATH

component/golang/skip-chown-tests.patch

+From: regnat <rg@regnat.ovh>
+Date: Wed, 3 Nov 2021 10:17:28 +0100
+Subject: [PATCH] Disable the chown tests
+
+See https://github.com/golang/go/issues/42525 and
+https://github.com/NixOS/nix/issues/3245
+---
+ os/os_unix_test.go | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/os/os_unix_test.go b/os/os_unix_test.go
+index 51693fd..0936542 100644
+--- a/src/os/os_unix_test.go
++++ b/src/os/os_unix_test.go
+@@ -40,6 +40,7 @@ func checkUidGid(t *testing.T, path string, uid, gid int) {
+ }
+ 
+ func TestChown(t *testing.T) {
++	t.Skipf("https://github.com/golang/go/issues/42525")
+ 	// Use TempDir() to make sure we're on a local file system,
+ 	// so that the group ids returned by Getgroups will be allowed
+ 	// on the file. On NFS, the Getgroups groups are
+@@ -83,6 +84,7 @@ func TestChown(t *testing.T) {
+ }
+ 
+ func TestFileChown(t *testing.T) {
++	t.Skipf("https://github.com/golang/go/issues/42525")
+ 	// Use TempDir() to make sure we're on a local file system,
+ 	// so that the group ids returned by Getgroups will be allowed
+ 	// on the file. On NFS, the Getgroups groups are
+@@ -126,6 +128,7 @@ func TestFileChown(t *testing.T) {
+ }
+ 
+ func TestLchown(t *testing.T) {
++	t.Skipf("https://github.com/golang/go/issues/42525")
+ 	// Use TempDir() to make sure we're on a local file system,
+ 	// so that the group ids returned by Getgroups will be allowed
+ 	// on the file. On NFS, the Getgroups groups are
+-- 
+2.31.1

component/groonga/buildout.cfg

@@ -15,8 +15,8 @@ extends =
 [groonga]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://packages.groonga.org/source/groonga/groonga-11.0.2.tar.gz
-md5sum = 753ba6fad77598baf93615c4b9c535b1
+url = https://packages.groonga.org/source/groonga/groonga-11.0.9.tar.gz
+md5sum = 9c66445d92c8b7536f1b28119ac1855b
 groonga-plugin-dir =  @@LOCATION@@/lib/groonga/plugins/
 # temporary patch to respect more tokens in natural language mode.
 patches =
@@ -48,9 +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.4.tar.gz
-md5sum = effa67fb271d49810850a3b275d040f6
-
+url = https://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.5.tar.gz
+md5sum = 842d02becc6dcc25a02fa7e789c2cba7
 groonga-plugin-dir =  @@LOCATION@@/lib/groonga/plugins/
 pre-configure = mkdir -p ${:groonga-plugin-dir}
 make-targets = GROONGA_PLUGINS_DIR=${:groonga-plugin-dir} install

component/gzip/buildout.cfg

@@ -7,7 +7,7 @@ parts =
 [gzip]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://ftp.gnu.org/pub/gnu/gzip/gzip-1.10.tar.xz
-md5sum = 691b1221694c3394f1c537df4eee39d3
+url = https://ftp.gnu.org/pub/gnu/gzip/gzip-1.11.tar.xz
+md5sum = d1e93996dba00cab0caa7903cd01d454
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s

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.22.tar.gz
-md5sum = 4d6d5debca0d1bcf51293fb58914f1a3
+url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.25.tar.gz
+md5sum = 44687c901910da46711441ae1611b8ce
 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

 [buildout]
 extends =
-  ../binutils/buildout.cfg
-  ../bison/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../gperf/buildout.cfg
-  ../ninja/buildout.cfg
-  ../freetype/buildout.cfg
-  ../cmake/buildout.cfg
-  ../git/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../cups/buildout.cfg
+# Build dependencies:
   ../coreutils/buildout.cfg
+  ../curl/buildout.cfg
   ../depot_tools/buildout.cfg
-  ../findutils/buildout.cfg
-  ../fontconfig/buildout.cfg
-  ../gettext/buildout.cfg
-  ../glib/buildout.cfg
-  ../gtk-2/buildout.cfg
-  ../libexpat/buildout.cfg
-  ../libffi/buildout.cfg
-  ../libpng/buildout.cfg
-  ../libxml2/buildout.cfg
-  ../mesa/buildout.cfg
+  ../git/buildout.cfg
+  ../gperf/buildout.cfg
+  ../pkgconfig/buildout.cfg
+# Runtime dependencies:
   ../nspr/buildout.cfg
   ../nss/buildout.cfg
-  ../pcre/buildout.cfg
-  ../sqlite3/buildout.cfg
-  ../xorg/buildout.cfg
-  ../zlib/buildout.cfg
 
 parts =
-  chromium
+  headless-chromium-wrapper
 
-[gconf]
-recipe = slapos.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
-md5sum = 2b16996d0e4b112856ee5c59130e822c
-configure-options = --disable-orbit --disable-static
-environment =
-  PATH=${pkgconfig:location}/bin:${intltool:location}/bin:${gettext:location}/bin:${glib:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${dbus-glib:location}/lib/pkgconfig:$PKG_CONFIG_PATH
-
-[chromedriver]
-recipe = hexagonit.recipe.download
-url = https://chromedriver.storage.googleapis.com/2.28/chromedriver_linux64.zip
-md5sum = a72088c0a6b018ded2c0fff616da8f65
-
-[chromium-download]
+# The Chromium project recommends using their own `fetch' tool rather
+# than doing a `git clone', but this is a little more flexible and works
+# fine.
+#
+# Setting depth=1000 is a middle ground between cloning no history
+# (causes some scripts to break) and cloning the full history (takes a
+# really long time).
+#
+# Note: we should add a `depth' option to slapos.recipe.build:gitclone
+# and then migrate this part to use that recipe at some point.
+[chromium-source]
 recipe = plone.recipe.command
-# This revision is 56.0.2924.122. Because the chromedriver only support some certain
-# version. Which version 56 is in the middle of 55-57.
-revision = faf03429d9c3dbd483700dd42316b20776cbbd3c
-path = ${buildout:parts-directory}/${:_buildout_section_name_}
 command =
-  set -e
-  PATH=${depot_tools:location}:${git:location}/bin:$PATH
-  [ -d ${:path} ] && rm -r ${:path}
-  mkdir -p ${:path}
-  cd ${:path}
-  # Do never use `fetch` with the `--no-history` option unless you find an
-  # option to fetch directly at the wanted revision. `--no-history` could
-  # reduce the download size significantly but even if it retrieves enough
-  # commits at the time you test this section, development continues upstream
-  # and at some point the next command (gclient) would break.
-  # ...
-  # This command only could work in an empty dir.
-  fetch --nohooks chromium
-  gclient sync --revision ${:revision} --with_branch_heads
+  export PATH=$PATH:${git:location}/bin
+  git clone ${:repository} ${:location} \
+    --branch ${:version} \
+    --depth 1000
+repository = https://chromium.googlesource.com/chromium/src.git
 stop-on-error = true
 
-[chromium]
+# We should place the .gclient file in the parent directory of the
+# checkout/repository itself.
+location = ${:gclient-location}/${:name}
+gclient-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+
+# Theoretically the checkout can be put anywhere as long as you specify
+# "name" appropriately in the .gclient file, but in practice it seems
+# that some automated tools break. It's safest to put it in a directory
+# called "src".
+name = src
+
+# 96.0.4664.129 version is the latest stable version in December 2021.
+# Note that we need a version compiling without python2
+version = 96.0.4664.129
+
+
+[headless-chromium]
 recipe = slapos.recipe.cmmi
-path = ${chromium-download:path}/src
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-command =
-  gclient runhooks
-  mkdir -p ${:location}
-  echo 'use_udev = true
+path = ${chromium-source:location}
+# XXX
+fake-location = ${:path}/out/headless
+
+# Configuration file for GN, the tool to build the actual compilation
+# configuration file.
+default-gclient-config =
+  solutions = [
+    {
+      "name": "${chromium-source:name}",
+      "url": "${chromium-source:repository}",
+      "managed": False,
+      "custom_deps": {},
+      "custom_vars": {},
+    },
+  ]
+
+# Configuration for a headless build.
+build-config-options =
+  import("//build/args/headless.gn")
   is_debug = false
-  enable_nacl = false' > ${:location}/args.gn
-  gn gen ${:location}
+  symbol_level = 0
+  blink_symbol_level = 0
+
+  # We need to unbundle the build toolchain in order to set our own
+  # LDFLAGS.
+  custom_toolchain = "//build/toolchain/linux/unbundle:default"
+  host_toolchain = "//build/toolchain/linux/unbundle:default"
+  current_os = "linux"
+  current_cpu = "x64"
+
+# Chromium bundles its own LLVM toolchain, so we might as well use it.
+llvm-toolchain = ${:path}/third_party/llvm-build/Release+Asserts/bin
 
-# Note you can run Chromium manually by: ${:location}/chrome --headless --no-sandbox --disable-gpu
-make-binary = ninja -C ${:location} chrome
+configure-command =
+# Sync build dependencies---this is a little finnicky.
+  echo '${:default-gclient-config}' \
+    > ${chromium-source:gclient-location}/.gclient
+  gclient sync --no-history
+# Generate build configuration files.
+  mkdir -p ${:fake-location}
+  echo '${:build-config-options}' > ${:fake-location}/args.gn
+  gn gen ${:fake-location}
+
+# You can run the headless Chromium shell using
+# ${:binary} --remote-debugging-port=1234
+make-binary =
+  autoninja -C ${:fake-location} headless_shell
+# By building our own version of Chromedriver, we can ensure version
+# compatibility. The build is quite cheap compared to Chromium, anyway.
+  autoninja -C ${:fake-location} chromedriver
 environment =
-  PKG_CONFIG_PATH=${freetype:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${randrproto:location}/lib/pkgconfig:$PKG_CONFIG_PATH
-  PATH=${chromedriver:location}:${dbus:location}/bin:${depot_tools:location}:${pkgconfig:location}/bin:${ninja:location}/bin:${bison:location}/bin:${gperf:location}/bin:${xserver:location}/bin:%(PATH)s
-  CPATH=${dbus:location}/include/dbus-1.0:${dbus:location}/lib/dbus-1.0/include/:${freetype:location}/include/freetype2:${libffi:location}/include:${mpfr:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline:location}/include:${sqlite3:location}/include:${zlib:location}/include:${bzip2:location}/include:$CPATH
-  LD_LIBRARY_PATH=${alsa:location}/lib:${gconf:location}/lib:${libXScrnSaver:location}/lib:${glib:location}/lib:${atk:location}/lib:${cairo:location}/lib:${cups:location}/lib:${dbus:location}/lib:${dbus-glib:location}/lib:${fontconfig:location}/lib/:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${glib:location}/lib:${gtk-2:location}/lib:${harfbuzz:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXcomposite:location}/lib:${libXcursor:location}/lib:${libXext:location}/lib:${libXi:location}/lib:${libXrender:location}/lib/:${libXtst:location}/lib:${libexpat:location}/lib:${libffi:location}/lib:${libpng:location}/lib:${libpng12:location}/lib:${libxcb:location}/lib:${libxml2:location}/lib:${mesa:location}/lib:${nspr:location}/lib:${nss:location}/lib:${pango:location}/lib:${pcre:location}/lib:${pixman:location}/lib:${sqlite3:location}/lib:${xdamage:location}/lib:${xfixes:location}/lib:${zlib:location}/lib:$LD_LIBRARY_PATH
+  PATH=${depot_tools:location}:${gperf:location}/bin:${pkgconfig:location}/bin:${coreutils:location}/bin:${git:location}/bin:${curl:location}/bin:%(PATH)s
+  LDFLAGS="-Wl,-rpath=${nss:location}/lib,-rpath=${nspr:location}/lib"
+  CC="${:llvm-toolchain}/clang"
+  CXX="${:llvm-toolchain}/clang++"
+  AR="${:llvm-toolchain}/llvm-ar"
+  NM="${:llvm-toolchain}/llvm-nm"
+
+# Expose devtools frontend location.
+devtools-frontend = ${:fake-location}/gen/third_party/devtools-frontend/src/front_end
+
+binary = ${:fake-location}/headless_shell
+chromedriver = ${:fake-location}/chromedriver
+promises =
+  ${:binary}
+  ${:chromedriver}
+
+
+# At runtime, Chromium tries to dynamically load the NSS certificate
+# database from "libnssckbi.so". But Chromium does this through NSPR,
+# which doesn't know where SlapOS installed NSS. Since we don't want to
+# modify the NSPR component from the Chromium component, we just set
+# LD_LIBRARY_PATH in a wrapper script so that NSPR knows where NSS is.
+#
+# Alternatively, we could patch crypto/nss_util.cc in the Chromium
+# source code to use an absolute path for libnssckbi.so, but this is not
+# as future-proof against new versions of Chromium.
+[headless-chromium-wrapper]
+recipe = slapos.recipe.template:jinja2
+template =
+  inline:#!/bin/sh
+  export LD_LIBRARY_PATH="{{ nss_location }}/lib:$LD_LIBRARY_PATH"
+  exec {{ chromium_binary }} "$@"
+rendered = ${buildout:bin-directory}/headless-chromium
+context =
+  key nss_location nss:location
+  key chromium_binary headless-chromium:binary

component/helloweb/buildout.cfg

@@ -34,11 +34,10 @@ install =
 [helloweb-go]
 # we already have gowork/bin/helloweb with helloweb Go build.
 # Add bin/helloweb-go that runs go version of helloweb without any environment preset needed.
-recipe  = collective.recipe.template
-output  = ${buildout:bin-directory}/${:_buildout_section_name_}
-mode    = 0755
-input   = inline:
-    #!/bin/sh
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
+template =
+    inline:#!/bin/sh -e
     . ${gowork:env.sh}
     exec helloweb "$@"
 
@@ -71,7 +70,7 @@ scripts = helloweb=helloweb-python
 # rubygemsrecipe with fixed url and this way pinned rubygems version
 recipe  = rubygemsrecipe
 url     = https://rubygems.org/rubygems/rubygems-2.5.2.zip
-ruby-location = ${ruby2.1:location}
+ruby-location = ${ruby:location}
 ruby-executable = ${:ruby-location}/bin/ruby
 gems    = bundler==1.11.2
 
@@ -93,15 +92,14 @@ path    = ${helloweb:location}/ruby/
 
 configure-command = :
 make-binary =
-make-targets= cd ${:path} && ${bundler:bundle} install
+make-targets= ${bundler:bundle} install
 
 
 [helloweb-ruby]
 # NOTE slapos.cookbook:wrapper also works, but currently _only_ in instance
-recipe  = collective.recipe.template
-output  = ${buildout:bin-directory}/${:_buildout_section_name_}
-mode    = 0755
-input   = inline:
-    #!/bin/sh
+recipe = slapos.recipe.template:jinja2
+rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
+template =
+    inline:#!/bin/sh -e
     export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile
     exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@"

component/hugo/buildout.cfg

+[buildout]
+extends =
+  ../golang/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  slapos-cookbook
+  gowork
+
+[hugo-get]
+<= go-git-package
+go.importpath = github.com/gohugoio/hugo
+repository    = https://github.com/gohugoio/hugo.git
+revision      = f6821b88abbc1237af0e28cefbc624e6cda3305a
+
+[gowork]
+install =
+  ${hugo-get:location}:./...
+environment =
+  CGO_ENABLED = 1
+buildflags = --tags extended
+
+[gowork.goinstall]
+depends_gitfetch  =
+    ${hugo-get:recipe}
+
+command = set -e
+  . ${gowork:env.sh}
+  cd ${hugo-get:location}
+  go build ${gowork:buildflags} -o ${gowork:bin}/hugo
+
+[hugo]
+<= gowork.goinstall

component/java-jdk/buildout.cfg

 [buildout]
-
 extends = 
   ../patchelf/buildout.cfg
   ../zlib/buildout.cfg
-
+  ../alsa/buildout.cfg
+  ../libpng/buildout.cfg
+  ../freetype/buildout.cfg
+  ../xorg/buildout.cfg
 parts = 
   java-jdk
 
 
 [java-jdk]
-recipe = plone.recipe.command
-command = echo "Error: unsupported platform" && false
-stop-on-error = true
-location =
+recipe = slapos.recipe.build
+update =
+  from zc.buildout import UserError
+  raise UserError("unsupported platform")
 
 
-[java-jdk:linux and bits64]
+[java-jdk:linux and platform.machine() == 'x86_64']
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
 md5sum = f5da6f4dec81bdd2a096184ec1d69216
 configure-command = :
 make-binary = :
-pre-install =
-  mkdir -p @@LOCATION@@
-  cp -r * @@LOCATION@@
 post-install =
-  for file in @@LOCATION@@/bin/* ; do
-    echo appending rpath to $file
-	  ${patchelf:location}/bin/patchelf --set-rpath ${:rpath} $file
-  done
-rpath = ${zlib:location}/lib:@@LOCATION@@/lib
-location = @@LOCATION@@
+  mv * %(location)s
+  cd %(location)s
+  set -x
+  ${patchelf:location}/bin/patchelf --set-rpath %(rpath)s bin/* lib/*.so
+rpath = ${zlib:location}/lib:${alsa:location}/lib:${freetype:location}/lib:${libpng:location}/lib:${libXrender:location}/lib:${libXtst:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXext:location}/lib:${libXdmcp:location}/lib:${libXi:location}/lib:${libxcb:location}/lib:@@LOCATION@@/lib:@@LOCATION@@/lib/server

component/java/buildout.cfg

 [buildout]
-
+extends =
+  ../coreutils/buildout.cfg
+  ../patchelf/buildout.cfg
+  ../alsa/buildout.cfg
+  ../libpng/buildout.cfg
+  ../freetype/buildout.cfg
+  ../fontconfig/buildout.cfg
+  ../xorg/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
   java
 
@@ -9,42 +17,34 @@ parts =
 [java-re]
 <= java-re-7
 
+[java-sun-common]
+recipe = slapos.recipe.build:download-unpacked
+url = https://javadl.sun.com/webapps/download/AutoDL?BundleId=${:bundle-id}
+
 [java-re-7]
-recipe = slapos.recipe.build
-slapos_promisee =
-  directory:bin
-  directory:lib
-  directory:man
-  directory:plugin
-  file:lib/rt.jar
-  file:bin/java
+<= java-sun-common
 # http://java.com/en/download/manual_java7.jsp
-x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=97798 90a6b9e2a32d06c18a3f16b485f0d1ea
-x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=97800 7605134662f6c87131eca5745895fe84
-install =
-  url, md5sum = options[guessPlatform()].split()
-  extract_dir = self.extract(self.download(url, md5sum))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir, location)
+
+[java-re-7:linux and platform.machine() == 'i686']
+bundle-id = 97798
+md5sum = 90a6b9e2a32d06c18a3f16b485f0d1ea
+
+[java-re-7:linux and platform.machine() == 'x86_64']
+bundle-id = 97800
+md5sum = 7605134662f6c87131eca5745895fe84
 
 [java-re-8]
-recipe = slapos.recipe.build
-slapos_promisee =
-  directory:bin
-  directory:lib
-  directory:man
-  directory:plugin
-  file:lib/rt.jar
-  file:bin/java
+<= java-sun-common
 # https://www.java.com/en/download/manual.jsp
 # Update 161
-x86 = http://javadl.oracle.com/webapps/download/AutoDL?BundleId=230530_2f38c3b165be4555a1fa6e98c45e0808 32db95dd417fd7949922206b2a61aa19
-x86-64 = http://javadl.oracle.com/webapps/download/AutoDL?BundleId=230532_2f38c3b165be4555a1fa6e98c45e0808 4385bc121b085862be623f4a31e7e0b4
-install =
-  url, md5sum = options[guessPlatform()].split()
-  extract_dir = self.extract(self.download(url, md5sum))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir, location)
+
+[java-re-8:linux and platform.machine() == 'i686']
+bundle-id = 230530_2f38c3b165be4555a1fa6e98c45e0808
+md5sum = 90a6b9e2a32d06c18a3f16b485f0d1ea
+
+[java-re-8:linux and platform.machine() == 'x86_64']
+bundle-id = 230532_2f38c3b165be4555a1fa6e98c45e0808
+md5sum = 4385bc121b085862be623f4a31e7e0b4
 
 [java-re-8-output]
 # Shared binary location to ease migration
@@ -53,3 +53,25 @@ stop-on-error = true
 update-command = ${:command}
 command = ${coreutils-output:test} -x ${:keytool}
 keytool = ${java-re-8:location}/bin/keytool
+
+
+[java-re-temurin-11]
+recipe = slapos.recipe.build
+update =
+  from zc.buildout import UserError
+  raise UserError("unsupported platform")
+
+[java-re-temurin-11:linux and platform.machine() == 'x86_64']
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz
+md5sum = 1b06100bcd0923d3f3279c2f09773af0
+configure-command = :
+make-binary = :
+post-install =
+  mv * %(location)s
+  for file in %(location)s/bin/* %(location)s/lib/*.so %(location)s/lib/*/*.so ; do
+    echo appending rpath to $file
+    ${patchelf:location}/bin/patchelf --set-rpath %(rpath)s $file
+  done
+rpath = ${alsa:location}/lib:${freetype:location}/lib:${fontconfig:location}/lib:${libpng:location}/lib:${libXrender:location}/lib:${libXtst:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXext:location}/lib:${libXdmcp:location}/lib:${libXi:location}/lib:${libxcb:location}/lib:${zlib:location}/lib:@@LOCATION@@/lib:@@LOCATION@@/lib/server:@@LOCATION@@/lib/jli

component/java/jdk-6u27-no-user-interaction.patch

---- jdk-6u27-linux-x64.bin.orig	2011-09-27 11:02:14.000000000 +0200
-+++ jdk-6u27-linux-x64.bin	2011-09-27 10:38:01.000000000 +0200
-@@ -81,7 +81,7 @@
- trap 'rm -f $outname; exit 1' HUP INT QUIT TERM
- echo "Unpacking..."
- tail ${tail_args} +189 "$0" > $outname
--if [ -x /usr/bin/sum ]; then
-+if [ -x /usr/bin/null ]; then
-     echo "Checksumming..."
- 
-     sum=`/usr/bin/sum $outname`
-@@ -169,7 +169,7 @@
-     fi
- 
-     # Service Tag support and JDK product registration
--    register_JDK "$javahome" "${BINARY_NAME}" "$1"
-+    # register_JDK "$javahome" "${BINARY_NAME}" "$1"
- 
- else
-     if [ "$1" = "-x" ]; then

component/json-c/0001-Remove-unused-variable-size.patch

-From 3859e99f50abe11a8dade28efa9ea3d99dfaac11 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petar=20Koreti=C4=87?= <petar.koretic@gmail.com>
-Date: Fri, 11 Apr 2014 10:03:40 +0200
-Subject: [RFC 1/2] Remove unused variable 'size'
-
----
- json_tokener.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/json_tokener.c b/json_tokener.c
-index 19de8ef..9a76293 100644
---- a/json_tokener.c
-+++ b/json_tokener.c
-@@ -352,12 +352,10 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
- 
-     case json_tokener_state_inf: /* aka starts with 'i' */
-       {
--	int size;
- 	int size_inf;
- 	int is_negative = 0;
- 
- 	printbuf_memappend_fast(tok->pb, &c, 1);
--	size = json_min(tok->st_pos+1, json_null_str_len);
- 	size_inf = json_min(tok->st_pos+1, json_inf_str_len);
- 	char *infbuf = tok->pb->buf;
- 	if (*infbuf == '-')
--- 
-2.5.0
-

component/json-c/0002-Fix-uninitialised-variable-compile-warning-and-also-.patch

-From 89ae583a8624fad6be4a7d1da084b0c410e4fc63 Mon Sep 17 00:00:00 2001
-From: Stuart Walsh <stu@ipng.org.uk>
-Date: Tue, 31 Mar 2015 12:23:03 +0100
-Subject: [RFC 2/2] Fix uninitialised variable compile warning, and also fix
- unused-when-used warning
-
----
- json_object.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/json_object.h b/json_object.h
-index 200ac40..e6c6a4f 100644
---- a/json_object.h
-+++ b/json_object.h
-@@ -339,8 +339,8 @@ extern void json_object_object_del(struct json_object* obj, const char *key);
- #if defined(__GNUC__) && !defined(__STRICT_ANSI__) && __STDC_VERSION__ >= 199901L
- 
- # define json_object_object_foreach(obj,key,val) \
--	char *key; \
--	struct json_object *val __attribute__((__unused__)); \
-+	char *key = NULL; \
-+	struct json_object *val = NULL; \
- 	for(struct lh_entry *entry ## key = json_object_get_object(obj)->head, *entry_next ## key = NULL; \
- 		({ if(entry ## key) { \
- 			key = (char*)entry ## key->k; \
--- 
-2.5.0
-

component/json-c/buildout.cfg

-[buildout]
-extends =
-  ../patch/buildout.cfg
-
-parts =
-  json-c
-
-[json-c-patch-base]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-
-[json-c-patch-3859e99f50abe11a8dade28efa9ea3d99dfaac11]
-< = json-c-patch-base
-filename = 0001-Remove-unused-variable-size.patch
-md5sum = e8ebc602fbab128d22f1216cb15c4626
-
-[json-c-patch-89ae583a8624fad6be4a7d1da084b0c410e4fc63]
-< = json-c-patch-base
-filename = 0002-Fix-uninitialised-variable-compile-warning-and-also-.patch
-md5sum = 5525ab9ee78157ce6d6100e374ac7767
-
-[json-c]
-recipe = slapos.recipe.cmmi
-url = https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12.tar.gz
-md5sum = 3ca4bbb881dfc4017e8021b5e0a8c491
-patch-options = -p1
-patches =
-  ${json-c-patch-3859e99f50abe11a8dade28efa9ea3d99dfaac11:location}/${json-c-patch-3859e99f50abe11a8dade28efa9ea3d99dfaac11:filename}
-  ${json-c-patch-89ae583a8624fad6be4a7d1da084b0c410e4fc63:location}/${json-c-patch-89ae583a8624fad6be4a7d1da084b0c410e4fc63:filename}
-environment =
-  PATH=${patch:location}/bin:%(PATH)s

component/jupyter-py2/buildout.cfg

@@ -22,8 +22,6 @@ python_executable = ${buildout:bin-directory}/${:interpreter}
 [download-file-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-download-only = true
-mode = 0644
 
 [jupyter-notebook-config]
 <= download-file-base
@@ -44,7 +42,6 @@ mode = 0644
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:filename}
 rendered = ${buildout:directory}/template.cfg
-mode = 0644
 context =
   key bin_directory buildout:bin-directory
   key develop_eggs_directory buildout:develop-eggs-directory
@@ -95,63 +92,25 @@ tornado = 4.4.2
 widgetsnbextension = 2.0.0
 # numpy >= 1.13.1 is required for numpy.core.multiarray
 numpy = 1.13.1
-
-
-# Required by:
-# tornado==4.4.2
 certifi = 2020.6.20
 
-# Required by:
-# notebook==4.3.2
 # nbconvert 4.2.0 depends on entrypoints egg that is not available as tar/zip source.
 nbconvert = 4.1.0
-
-# Required by:
-# ipython==5.3.0
 pathlib2 = 2.2.1
-
-# Required by:
-# statsmodels==0.8.0
 patsy = 0.4.1
-
-# Required by:
-# ipython==5.3.0
 pexpect = 4.2.1
-
-# Required by:
-# ipython==5.3.0
 pickleshare = 0.7.4
-
-# Required by:
-# pathlib2==2.2.1
 scandir = 1.5
-
-# Required by:
-# statsmodels==0.8.0
 scipy = 0.19.0
-
-# Required by:
-# tornado==4.4.2
 singledispatch = 3.4.0.3
-
-# Required by:
-# prompt-toolkit==1.0.13
 wcwidth = 0.1.7
-
 jupyter = 1.0.0
 jupyter-console = 5.1.0
-
-# Required by:
-# jupyter==1.0.0
 qtconsole = 4.3.0
-
 et-xmlfile = 1.0.1
 h5py = 2.7.1
 mpmath = 1.0.0
 openpyxl = 2.5.2
 sympy = 1.1.1
 xlrd = 1.1.0
-
-# Required by:
-# openpyxl==2.5.2
 jdcal = 1.4

component/jupyter-py2/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-jupyter-notebook]
 filename = instance.cfg.in
-md5sum = 1d5fe6cc4e48672ae7be1c223794a932
+md5sum = 357f28614a13cdbf00a29a83cbfd2642
 
 [jupyter-notebook-config]
 filename = jupyter_notebook_config.py.jinja

component/jupyter-py2/instance.cfg.in

@@ -37,10 +37,6 @@ key_file = ${generate-certificate:key_file}
 logfile = ${directory:log}/jupyter_notebook.log
 notebook_dir = ${directory:notebook_dir}
 
-[dynamic-jinja2-template-base]
-recipe = slapos.recipe.template:jinja2
-mode = 0644
-
 [generate-certificate]
 ; TODO: there is a slapos recipe to generate certificates. Use it instead
 recipe = plone.recipe.command
@@ -76,10 +72,9 @@ environment =
   LANG=C.UTF-8
 
 [jupyter-notebook-config]
-<= dynamic-jinja2-template-base
+recipe = slapos.recipe.template:jinja2
 template = {{ jupyter_config_location }}/{{ jupyter_config_filename }}
 rendered = ${directory:jupyter_config_dir}/jupyter_notebook_config.py
-mode = 0744
 context =
   raw config_cfg ${buildout:directory}/knowledge0.cfg
 
@@ -134,7 +129,7 @@ link-binary = {{ erp5_kernel_location }}/{{ erp5_kernel_filename }}
 target-directory = ${directory:erp5_kernel_dir}
 
 [kernel-json]
-<= dynamic-jinja2-template-base
+recipe = slapos.recipe.template:jinja2
 template = {{ kernel_json_location }}/{{ kernel_json_filename }}
 rendered = ${directory:erp5_kernel_dir}/kernel.json
 # Use python2.7 executable bin file for kernel config

component/libcap-ng/buildout.cfg

@@ -8,8 +8,8 @@ parts = libcap-ng
 [libcap-ng]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.10.tar.gz
-md5sum = 57dc267e2949cdecb651a929f9206572
+url = https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.8.2.tar.gz
+md5sum = faf1ef766cf068ad1aba4008ced665f7
 location = @@LOCATION@@
 configure-options =
   --with-python=no

component/libfastjson/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 
 [libfastjson]
 recipe = slapos.recipe.cmmi
-url = https://github.com/rsyslog/libfastjson/archive/v0.99.8.tar.gz
-md5sum = 730713ad1d851def7ac8898f751bbfdd
+url = https://github.com/rsyslog/libfastjson/archive/v0.99.9.tar.gz
+md5sum = 3c45e6efc838cd364588d6d1822c4ea8
 shared = true
 pre-configure =
   autoreconf -fvi -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal -I ${automake:location}/share/aclocal

component/libiconv/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 parts =
   libiconv
 
-[libiconv.gets.patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 8a20d8afe0617fce56f77537d2b84621
-download-only = true
-filename = libiconv.gets.patch
-
 [libiconv]
-virtual-depends =
-  ${libiconv.gets.patch:md5sum}
+patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =
-  ${libiconv.gets.patch:location}/${libiconv.gets.patch:filename}
+  ${:_profile_base_location_}/libiconv.gets.patch#8a20d8afe0617fce56f77537d2b84621
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
 md5sum = e34509b1623cec449dfeb73d7ce9c6c6

component/libmicrohttpd/buildout.cfg

@@ -10,6 +10,7 @@ parts =
 
 [libmicrohttpd]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.70.tar.gz
 md5sum = dcd6045ecb4ea18c120afedccbd1da74
 configure-options =

component/libnsl/buildout.cfg

+[buildout]
+extends =
+  ../xz-utils/buildout.cfg
+  ../libtirpc/buildout.cfg
+
+[libnsl]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/thkukuk/libnsl/releases/download/v1.3.0/libnsl-1.3.0.tar.xz
+md5sum = 9214f674bd0c2bcfdd6c1da0cadb061f
+make-options = 
+  CFLAGS=-I${libtirpc:location}/include/tirpc
+  LDFLAGS='-L${libtirpc:location}/lib -Wl,-rpath=${libtirpc:location}/lib -ltirpc'
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/libreoffice-bin/buildout.cfg

@@ -8,24 +8,15 @@ parts =
 
 [libreoffice-bin]
 recipe = slapos.recipe.build
-# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
 version = 5.2.4.2
-url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
-# supported architectures md5sums
-md5sum_x86 = 7a0b33a2d18f06143258c428c32de213
-md5sum_x86-64 = cbea6cd17063b5bcbe0cb32f7819f0cf
+url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/${:_url1}/LibreOffice_${:version}_${:_url2}_rpm.tar.gz
 
 # where office code can be found?
 officedir = libreoffice5.2
 install =
   import os
   import sys
-  ARCH_DIR_MAP = { 'x86': 'x86', 'x86-64': 'x86_64' }
-  platform = guessPlatform()
-  url = options['url'] % (ARCH_DIR_MAP[platform], platform)
-  md5sum = options['md5sum_' + platform]
-  extract_dir = self.extract(self.download(url, md5sum))
-  workdir = guessworkdir(extract_dir)
+  workdir = guessworkdir(self.extract(self.download()))
   storagedir = os.path.join(workdir, 'storage')
   os.mkdir(storagedir)
   rpmsdir = os.path.join(workdir, 'RPMS')
@@ -46,3 +37,13 @@ install =
 # helper binaries
 cpio = ${cpio:location}/bin/cpio
 rpm2cpio = ${rpm2cpio:target}
+
+[libreoffice-bin:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url1 = x86
+_url2 = Linux_x86
+md5sum = 7a0b33a2d18f06143258c428c32de213
+
+[libreoffice-bin:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url1 = x86_64
+_url2 = Linux_x86-64
+md5sum = cbea6cd17063b5bcbe0cb32f7819f0cf

component/librsync/buildout.cfg

@@ -2,7 +2,6 @@
 extends =
   ../bzip2/buildout.cfg
   ../cmake/buildout.cfg
-  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../popt/buildout.cfg
   ../zlib/buildout.cfg
@@ -12,12 +11,9 @@ parts =
 [librsync]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/librsync/librsync/archive/v2.0.0.tar.gz
-md5sum = cbda9c3eba21bcf2d56a4080ba7a5dc4
+url = https://github.com/librsync/librsync/archive/v2.3.2.tar.gz
+md5sum = 74ba5b50de5ba3d595828e9109fa5fce
 location = @@LOCATION@@
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/librsync-2.0.0-issue50.patch#5bac5363646a2c2ec6d2c4b26ca4cd7f
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}

component/librsync/librsync-2.0.0-issue50.patch

---- librsync-2.0.0/src/search.c	2017-02-20 13:39:48.012922600 +0100
-+++ librsync-2.0.0/src/search.c	2017-02-20 13:41:43.661880014 +0100
-@@ -218,7 +218,7 @@
- 	    r = m;
-     }
- 
--    if (l == r) {
-+    if ((l == r) && (l <= bucket->r)) {
- 	int i = sig->targets[l].i;
- 	rs_block_sig_t *b = &(sig->block_sigs[i]);
- 	if (weak_sum != b->weak_sum)

component/libsecret/buildout.cfg

+[buildout]
+parts = libsecret
+extends =
+  ../gnutls/buildout.cfg
+  ../libxslt/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../glib/buildout.cfg
+  ../gettext/buildout.cfg
+  ../libuuid/buildout.cfg
+  ../xz-utils/buildout.cfg
+
+
+[libsecret]
+recipe = slapos.recipe.cmmi
+url = https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.tar.xz
+md5sum = bf92f48afab2891f644f311e0f37683f
+shared = true
+configure-options = 
+  --with-libgcrypt-prefix=${libgcrypt:location}
+  --with-libintl-prefix=${gettext:location}
+  --disable-gtk-doc-html
+  --disable-manpages
+  --disable-vala
+
+environment = 
+  PATH=${xz-utils:location}/bin/:${pkgconfig:location}/bin:${libxslt:location}/bin:${glib:location}/bin:${libgcrypt:location}/bin/:%(PATH)s
+  PKG_CONFIG_PATH=${:pkg-config-path-depends}
+  LDFLAGS=-Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libgcrypt:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libuuid:location}/lib
+pkg-config-path-depends = ${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${libgcrypt:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig
+pkg-config-path = @@LOCATION@@/lib/pkgconfig:${:pkg-config-path-depends}

component/libtasn1/buildout.cfg

@@ -5,8 +5,8 @@ parts =
 [libtasn1]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.12.tar.gz
-md5sum = 5c724bd1f73aaf4a311833e1cd297b21
+url = https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.17.0.tar.gz
+md5sum = c46f6eb3bd1287031ae5d36465094402
 configure-options =
   --disable-static
   --disable-gtk-doc-html

component/libtirpc/buildout.cfg

+[buildout]
+parts = libtirpc
+
+[libtirpc]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://downloads.sourceforge.net/libtirpc/libtirpc-1.3.2.tar.bz2
+md5sum = cf4ca51f3fc401bea61c702c69171ab0
+configure-options = --disable-gssapi

component/libuuid/buildout.cfg

@@ -8,30 +8,12 @@ extends =
 [libuuid]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
-md5sum = 2f5f71e6af969d041d73ab778c141a77
+url = http://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz
+md5sum = d659bf7cd417d93dc609872f6334b019
 configure-options =
   --disable-static
+  --disable-all-programs
   --enable-libuuid
-  --disable-agetty
-  --disable-cramfs
-  --disable-fallocate
-  --disable-fsck
-  --disable-libblkid
-  --disable-libmount
-  --disable-makeinstall-chown
-  --disable-makeinstall-setuid
-  --disable-mount
-  --disable-nls
-  --disable-pivot_root
-  --disable-rename
-  --disable-require-password
-  --disable-schedutils
-  --disable-switch_root
-  --disable-tls
-  --disable-unshare
-  --disable-uuidd
-  --disable-wall
   --without-libiconv-prefix
   --without-libintl-prefix
   --without-ncurses
@@ -40,7 +22,5 @@ configure-options =
   --without-selinux
   --without-audit
 
-make-options =
-  -C shlibs/uuid
 environment =
   PATH=${perl:location}/bin:%(PATH)s

component/libyaml/buildout.cfg

@@ -7,6 +7,6 @@ parts =
 [libyaml]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz
-md5sum = 5fe00cda18ca5daeb43762b80c38e06e
+url = http://pyyaml.org/download/libyaml/yaml-0.2.5.tar.gz
+md5sum = bb15429d8fb787e7d3f1c83ae129a999
 pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess config/

component/linuxptp/buildout.cfg

+# Implementation of the Precision Time Protocol (PTP) for linux http://linuxptp.sourceforge.net/
+
+[linuxptp]
+recipe = slapos.recipe.cmmi
+configure-command = true
+url = https://sourceforge.net/projects/linuxptp/files/v3.1/linuxptp-3.1.1.tgz
+md5sum = 3b79ab5e77c5b5cf06bc1c8350d405bb

component/logrotate/buildout.cfg

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

component/lua/buildout.cfg

@@ -8,12 +8,23 @@ parts =
 [lua]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.lua.org/ftp/lua-5.3.1.tar.gz
-md5sum = 797adacada8d85761c079390ff1d9961
+url = http://www.lua.org/ftp/lua-5.4.3.tar.gz
+md5sum = ef63ed2ecfb713646a7fcc583cf5f352
 configure-command = true
 make-options =
   "$(uname -sr 2>/dev/null|grep -Eq '^Linux' && echo linux || echo posix)"
-  MYCFLAGS="-I${readline:location}/include"
+  MYCFLAGS="-I${readline:location}/include -fPIC"
   MYLDFLAGS="-L${readline:location}/lib -Wl,-rpath=${readline:location}/lib"
-make-targets =
-  install INSTALL_TOP=@@LOCATION@@
+  INSTALL_TOP=@@LOCATION@@
+post-install =
+  mkdir -p %(location)s/lib/pkgconfig
+  {
+    make pc INSTALL_TOP=%(location)s
+    echo '%(pc)s'
+  } > %(location)s/lib/pkgconfig/lua.pc
+pc =
+  Name: Lua
+  Description: Lua language engine
+  Version: $${version}
+  Libs: -L$${libdir} -llua
+  Cflags: -I$${includedir}

component/luajit/buildout.cfg

+# LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming language.
+# https://luajit.org/luajit.html
+
+[buildout]
+parts = luajit
+
+[luajit]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://luajit.org/download/LuaJIT-2.0.5.tar.gz
+md5sum = 48353202cbcacab84ee41a5a70ea0a2c
+configure-command = true
+# pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
+make-options =
+  DPREFIX=@@LOCATION@@
+  LDCONFIG=/bin/echo

component/m4/01-fix-ftbfs-with-glibc-2.28.patch

-From: Santiago Vila <sanvila@debian.org>
-Subject: Fix FTBFS with glibc 2.28
-Bug-Debian: https://bugs.debian.org/915152
-X-Debian-version: 1.4.18-2
-
-Based on this gnulib commit by Paul Eggert:
-
-https://lists.gnu.org/r/bug-gnulib/2018-03/msg00002.html
-
---- a/lib/fflush.c
-+++ b/lib/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
- 
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
- static void
-@@ -72,7 +72,7 @@
- 
- #endif
- 
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
- 
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
-@@ -148,7 +148,7 @@
-   if (stream == NULL || ! freading (stream))
-     return fflush (stream);
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
-   clear_ungetc_buffer_preserving_position (stream);
- 
---- a/lib/fpending.c
-+++ b/lib/fpending.c
-@@ -32,7 +32,7 @@
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   return fp->_IO_write_ptr - fp->_IO_write_base;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
---- a/lib/fpurge.c
-+++ b/lib/fpurge.c
-@@ -62,7 +62,7 @@
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   fp->_IO_read_end = fp->_IO_read_ptr;
-   fp->_IO_write_ptr = fp->_IO_write_base;
-   /* Avoid memory leak when there is an active ungetc buffer.  */
---- a/lib/freadahead.c
-+++ b/lib/freadahead.c
-@@ -25,7 +25,7 @@
- size_t
- freadahead (FILE *fp)
- {
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_write_ptr > fp->_IO_write_base)
-     return 0;
-   return (fp->_IO_read_end - fp->_IO_read_ptr)
---- a/lib/freading.c
-+++ b/lib/freading.c
-@@ -31,7 +31,7 @@
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   return ((fp->_flags & _IO_NO_WRITES) != 0
-           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
-               && fp->_IO_read_base != NULL));
---- a/lib/fseeko.c
-+++ b/lib/fseeko.c
-@@ -47,7 +47,7 @@
- #endif
- 
-   /* These tests are based on fpurge.c.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_read_end == fp->_IO_read_ptr
-       && fp->_IO_write_ptr == fp->_IO_write_base
-       && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@
-           return -1;
-         }
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
---- a/lib/stdio-impl.h
-+++ b/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
-    the same implementation of stdio extension API, except that some fields
-    have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
- 

component/m4/buildout.cfg

 [buildout]
 extends =
   ../xz-utils/buildout.cfg
-  ../patch/buildout.cfg
 parts =
   m4
 
 [m4]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz
-md5sum = 730bb15d96fffe47e148d1e09235af82
+url = http://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz
+md5sum = 0d90823e1426f1da2fd872df0311298d
 environment =
-  PATH=${xz-utils:location}/bin:${patch:location}/bin:%(PATH)s
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/01-fix-ftbfs-with-glibc-2.28.patch#058a786425e507f911649205b61ffcac
+  PATH=${xz-utils:location}/bin:%(PATH)s

component/mariadb/buildout.cfg

@@ -30,16 +30,15 @@ parts =
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://archive.mariadb.org//mariadb-${:version}/source/mariadb-${:version}.tar.gz
-version = 10.4.19
-md5sum = bf60c7a3feac5854745cd1ad5133f09a
-location = @@LOCATION@@
+version = 10.4.22
+md5sum = 0d5e1b9e3694322e18819811a2bf81fa
 pre-configure =
   set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
   grep -q "$@"
   sed -i "/$1/d" "$2"
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
-  -DCMAKE_INSTALL_PREFIX=${:location}
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
   -DBUILD_CONFIG=mysql_release
   -DDEFAULT_CHARSET=utf8
   -DDEFAULT_COLLATION=utf8_unicode_ci
@@ -68,6 +67,10 @@ configure-options =
   -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}
   -DCMAKE_INCLUDE_PATH=${unixodbc:location}/include
   -DCMAKE_LIBRARY_PATH=${unixodbc:location}/lib
+# for RocksDB - see
+#  https://lore.kernel.org/linux-btrfs/ed3642c2-682e-08a1-f18d-2d63409b7631@nexedi.com/T/
+  -DWITH_FALLOCATE=NO
+##
 CMAKE_CFLAGS = -I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
 CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib
 environment =
@@ -80,13 +83,13 @@ patch-options = -p1
 patches =
   https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.22-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
 post-install = 
-  ldd=`ldd ${:location}/lib/plugin/ha_rocksdb.so`
+  ldd=`ldd %(location)s/lib/plugin/ha_rocksdb.so`
   for x in ${lz4:location} ${snappy:location} ${zstd:location}
   do echo "$ldd" |grep -qF " $x/lib/"
   done
   set -- wsrep-lib/wsrep-API/*/wsrep_api.h
-  install -DpT $1 ${:location}/$1
-  cp -a wsrep-lib/include ${:location}/wsrep-lib
+  install -DpT $1 %(location)s/$1
+  cp -a wsrep-lib/include %(location)s/wsrep-lib
 
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
@@ -96,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.02.tar.gz
-md5sum = 0729c74efc92bfc404b88597488d07e9
+url = https://packages.groonga.org/source/mroonga/mroonga-11.09.tar.gz
+md5sum = 8b1786332edc61c41a769f225e6063b2
 pre-configure = 
   rm -rf fake_mariadb_source
   mkdir -p fake_mariadb_source
@@ -131,15 +134,15 @@ environment =
 ### (we just override here for easier revert)
 [mariadb-10.3]
 <= mariadb-10.4
-version = 10.3.29
-md5sum = a5adad1c4fb1717d7fe6d608fd4d40de
+version = 10.3.32
+md5sum = 12341dc150c810c0072a40e55825ca57
 post-install =
-  ldd=`ldd ${:location}/lib/plugin/ha_rocksdb.so`
+  ldd=`ldd %(location)s/lib/plugin/ha_rocksdb.so`
   for x in ${lz4:location} ${snappy:location} ${zstd:location}
   do echo "$ldd" |grep -qF " $x/lib/"
   done
-  mkdir -p ${:location}/include/wsrep &&
-  cp -p wsrep/wsrep_api.h ${:location}/include/wsrep
+  mkdir -p %(location)s/include/wsrep &&
+  cp -p wsrep/wsrep_api.h %(location)s/include/wsrep
 
 [mariadb]
 location = ${mariadb-10.3:location}

component/matplotlib/buildout.cfg

@@ -14,7 +14,6 @@ recipe = slapos.recipe.template:jinja2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 template = ${:_profile_base_location_}/${:filename}
 rendered = ${matplotlibrc:location}/matplotlibrc
-mode = 0644
 backend = agg
 context =
   key backend matplotlibrc:backend

component/memcached/buildout.cfg

-[buildout]
-parts = memcached
-extends =
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
-  ../libevent/buildout.cfg
-
-[memcached-fix-array-subscript-is-above-array-bounds]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-filename = memcached-1.4-fix-array-subscript-is-above-array-bounds.patch
-download-only = true
-md5sum = 472508b9a4b6c0b9f5d6f2abce3444e3
-
-[memcached-gcc-4.4.patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-filename = memcached-gcc-4.4.patch
-download-only = true
-md5sum = fd98d0cbfc4d3a25ac9808472fbe62f8
-
-[memcached]
-recipe = slapos.recipe.cmmi
-url = http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
-md5sum = b7104e269511621c2777367d6d6315fe
-patches =
-  ${memcached-fix-array-subscript-is-above-array-bounds:location}/${memcached-fix-array-subscript-is-above-array-bounds:filename} ${memcached-gcc-4.4.patch:location}/${memcached-gcc-4.4.patch:filename}
-patch-options = -p1
-configure-command =
-  aclocal
-  autoheader
-  automake --foreign
-  autoconf
-  ./configure
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --with-libevent=${libevent:location}
-  --disable-docs
-environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s
-  LDFLAGS =-Wl,-rpath=${libevent:location}/lib

component/memcached/memcached-1.4-fix-array-subscript-is-above-array-bounds.patch

-Took originally from OpenSuse spec. Needed on opensuse to avoid "error: array subscript is above array bounds"
---- memcached-orig/memcached.c
-+++ memcached-new/memcached.c	2010/05/06 11:40:56
-@@ -2335,15 +2335,18 @@
- inline static void process_stats_detail(conn *c, const char *command) {
-     assert(c != NULL);
- 
--    if (strcmp(command, "on") == 0) {
-+    char on[] = "on";
-+    char off[] = "off";
-+    char dump[] = "dump";
-+    if (strcmp(command, on) == 0) {
-         settings.detail_enabled = 1;
-         out_string(c, "OK");
-     }
--    else if (strcmp(command, "off") == 0) {
-+    else if (strcmp(command, off) == 0) {
-         settings.detail_enabled = 0;
-         out_string(c, "OK");
-     }
--    else if (strcmp(command, "dump") == 0) {
-+    else if (strcmp(command, dump) == 0) {
-         int len;
-         char *stats = stats_prefix_dump(&len);
-         write_and_free(c, stats, len);

component/memcached/memcached-gcc-4.4.patch

-# In OpenSuse 11.2, 'gcc -dumpversion' returns '4.4', not '4.4.*'.
---- memcached-1.4.8/configure.ac.orig
-+++ memcached-1.4.8/configure.ac
-@@ -502,7 +502,7 @@
-   GCC_VERSION=`$CC -dumpversion`
-   CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
-   case $GCC_VERSION in
--    4.4.*)
-+    4.4 | 4.4.*)
-     CFLAGS="$CFLAGS -fno-strict-aliasing"
-     ;;
-   esac

component/ncurses/buildout.cfg

 [buildout]
-extends =
-  ../patch/buildout.cfg
 parts =
   ncurses
 
@@ -9,13 +7,10 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://ftp.gnu.org/gnu/ncurses/ncurses-6.2.tar.gz
 md5sum = e812da327b1c2214ac1aed440ea3ae8d
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/ncurses-5.9-gcc-5.patch#57f4cd0cc0c0a42a5ddb2167f9546d72
 configure-options =
-  --prefix=@@LOCATION@@
+  --prefix=%(location)s
   --enable-pc-files
-  --with-pkg-config-libdir=@@LOCATION@@/lib/pkgconfig
+  --with-pkg-config-libdir=%(location)s/lib/pkgconfig
   --with-shared
   --without-ada
   --without-manpages
@@ -36,6 +31,5 @@ post-install =
 # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
 environment =
   LDCONFIG=/bin/echo
-  PATH=${patch:location}/bin:%(PATH)s
 make-options =
   -j1

component/ncurses/ncurses-5.9-gcc-5.patch

-https://bugs.gentoo.org/545114
-
-extracted from the upstream change (which had many unrelated commits in one)
-
-From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
-From: "Thomas E. Dickey" <dickey@invisible-island.net>
-Date: Sun, 7 Dec 2014 03:10:09 +0000
-Subject: [PATCH] ncurses 5.9 - patch 20141206
-
-+ modify MKlib_gen.sh to work around change in development version of
-  gcc introduced here:
-	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
-  (reports by Marcus Shawcroft, Maohui Lei).
-
-diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
-index d8cc3c9..b91398c 100755
---- a/ncurses/base/MKlib_gen.sh
-+++ b/ncurses/base/MKlib_gen.sh
-@@ -474,11 +474,22 @@ sed -n -f $ED1 \
- 	-e 's/gen_$//' \
- 	-e 's/  / /g' >>$TMP
- 
-+cat >$ED1 <<EOF
-+s/  / /g
-+s/^ //
-+s/ $//
-+s/P_NCURSES_BOOL/NCURSES_BOOL/g
-+EOF
-+
-+# A patch discussed here:
-+#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-+# introduces spurious #line markers.  Work around that by ignoring the system's
-+# attempt to define "bool" and using our own symbol here.
-+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
-+cat $ED2 >$TMP
-+
- $preprocessor $TMP 2>/dev/null \
--| sed \
--	-e 's/  / /g' \
--	-e 's/^ //' \
--	-e 's/_Bool/NCURSES_BOOL/g' \
-+| sed -f $ED1 \
- | $AWK -f $AW2 \
- | sed -f $ED3 \
- | sed \

component/neon/buildout.cfg

-[buildout]
-parts =
-  neon
-extends =
-  ../libxml2/buildout.cfg
-  ../openssl/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../zlib/buildout.cfg
-
-[neon]
-recipe = slapos.recipe.cmmi
-shared = true
-url = http://www.webdav.org/neon/neon-0.29.5.tar.gz
-md5sum = ff369e69ef0f0143beb5626164e87ae2
-configure-options =
-  --disable-static
-  --enable-shared
-  --with-ssl=openssl
-  --without-expat
-  --without-gssapi
-  --with-libxml2
-  --enable-threadsafe-ssl=posix
-  --disable-nls
-
-environment =
-  PATH=${libxml2:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig
-  CPPFLAGS=-I${openssl:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libxml2:location}/lib

component/nettle/buildout.cfg

@@ -7,8 +7,8 @@ extends =
 [nettle]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/nettle/nettle-3.3.tar.gz
-md5sum = 10f969f78a463704ae73529978148dbe
+url = https://ftp.gnu.org/gnu/nettle/nettle-3.7.3.tar.gz
+md5sum = a60273d0fab9c808646fcf5e9edc2e8f
 patches =
   ${:_profile_base_location_}/nettle-lib-location.patch#3c5f5b285ffd5bc30436ee0f4c662084
 configure-option =

component/nginx/buildout.cfg

 [buildout]
 extends =
   ../coreutils/buildout.cfg
-  ../git/buildout.cfg
   ../libexpat/buildout.cfg
   ../openssl/buildout.cfg
-  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../zlib/buildout.cfg
 
@@ -12,18 +10,18 @@ parts = nginx-output
 
 [nginx-common]
 recipe = slapos.recipe.cmmi
-shared = false
-url = https://nginx.org/download/nginx-1.19.2.tar.gz
-md5sum = 3dc55f6451ed6f819f1c796f4e5e9617
+shared = true
+url = https://nginx.org/download/nginx-1.20.1.tar.gz
+md5sum = 8ca6edd5076bdfad30a69c9c9b41cc68
 
 [nginx]
 <= nginx-common
-shared = true
 configure-options=
   --with-http_ssl_module
   --with-http_v2_module
   --with-http_gzip_static_module
   --with-http_realip_module
+  --with-http_sub_module
   --with-mail
   --with-mail_ssl_module
   --with-ld-opt="-L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"
@@ -31,10 +29,10 @@ configure-options=
 
 [nginx-dav-ext-module]
 recipe = slapos.recipe.build:download-unpacked
+shared = true
 url = https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz
 strip-top-level-dir = true
 md5sum = 2cb502dbda335be4ebd5fed0b3182bae
-mode = 0644
 
 [nginx-webdav]
 <= nginx-common
@@ -60,32 +58,14 @@ command = ${coreutils-output:test} -x ${:nginx} -a -f ${:mime}
 nginx = ${nginx:location}/sbin/nginx
 mime = ${nginx:location}/conf/mime.types
 
-[hexaglobe-nginx-module]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = http://easicloud-p.cdn.hexaglobe.net/nginx-easicloud.tar.gz
-md5sum = 57fe2ceb09740f22b5b1023f29889e0e
-strip-top-level-dir = true
-
-[nginx-enable-sub]
-# Used by Hexaglobe for watermarking
-<= nginx
-configure-options=
-  --with-ipv6
-  --with-http_ssl_module
-  --with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib  -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
-  --with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
-  --add-module=${hexaglobe-nginx-module:location}/sub_module
-# --add-module=${hexaglobe-nginx-module:location}/nginx-upstream-fair
-
 [nginx-push-stream-module]
-recipe = slapos.recipe.build:gitclone
-repository = https://github.com/wandenberg/nginx-push-stream-module.git
-revision = 3d3a204177d3a7ab8a2858e04e792a6d11bf133f
-git-executable = ${git:location}/bin/git
+recipe = slapos.recipe.build:download-unpacked
+shared = true
+url = https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.5.tar.gz
+md5sum = 9bb5237a93c957130aaf7033ed3c0989
 
 [nginx-push-stream]
-<= nginx
+<= nginx-common
 configure-options=
   --with-ipv6
   --with-http_ssl_module

component/noVNC/buildout.cfg

@@ -4,6 +4,7 @@ parts =
 
 [noVNC]
 recipe = slapos.recipe.build:download-unpacked
-url = https://github.com/novnc/noVNC/archive/refs/tags/v1.2.0.tar.gz
-md5sum = 290dfabc4ecdd58d62ccb8c34a922962
+shared = true
+url = https://github.com/novnc/noVNC/archive/refs/tags/v1.3.0.tar.gz
+md5sum = 22847b4f6e9caa916aa5eceb046f27aa
 strip-top-level-dir = true

component/nodejs/buildout.cfg

@@ -11,8 +11,8 @@ extends =
 parts =
   nodejs
 
-[nodejs]
-<= nodejs-8.9.4
+#[nodejs]
+#<= nodejs-X.Y.Z
 
 [nodejs-14.16.0]
 <= nodejs-base
@@ -25,33 +25,25 @@ md5sum = 7dc3666f407bf4e12a01ce1be2883d31
 openssl_location = ${openssl:location}
 version = v12.18.3
 md5sum = 28bf6a4d98b238403fa58a0805f4a979
-
-[nodejs-10.19.0]
-<= nodejs-base
-openssl_location = ${openssl:location}
-version = v10.19.0
-md5sum = 9e433c753d839d2d2a6341861501674f
-
-[nodejs-10.6.0]
-<= nodejs-base
-openssl_location = ${openssl:location}
-version = v10.6.0
-md5sum = 9df233b86244ebda1ded1f91694fbe86
+PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
 
 [nodejs-8.9.4]
 <= nodejs-base
 version = v8.9.4
 md5sum = 4ddc1daff327d7e6f63da57fdfc24f55
+PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
 
 [nodejs-8.6.0]
 <= nodejs-base
 version = v8.6.0
 md5sum = 0c95e08220667d8a18b97ecec8218ac6
+PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
 
 [nodejs-8.12.0]
 <= nodejs-base
 version = v8.12.0
 md5sum = 5690333b77964edf81945fc724f6ea85
+PATH = ${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
 
 [nodejs-base]
 # Server-side Javascript.
@@ -66,85 +58,15 @@ configure-options =
   --shared-openssl
   --shared-openssl-includes=${:openssl_location}/include
   --shared-openssl-libpath=${:openssl_location}/lib
+PATH = ${pkgconfig:location}/bin:%(PATH)s
 environment =
   HOME=@@LOCATION@@
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${:PATH}
   PKG_CONFIG_PATH=${:openssl_location}/lib/pkgconfig/
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${:openssl_location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LD_LIBRARY_PATH=${:openssl_location}/lib
 
-[nodejs-8.6.0-output]
-# Shared binary location to ease migration
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = ${coreutils-output:test} -x ${:node} -a -x ${:npm}
-node = ${nodejs-8.6.0:location}/bin/node
-npm = ${nodejs-8.6.0:location}/bin/npm
-
-[nodejs-5]
-# Server-side Javascript.
-recipe = slapos.recipe.cmmi
-version = v5.9.1
-url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
-md5sum = 346c9325912271dc7614fe955c75c3a6
-configure-options =
-  --shared-openssl
-  --shared-openssl-includes=${openssl:location}/include
-  --shared-openssl-libpath=${openssl:location}/lib
-environment =
-  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[nodejs-4]
-# Server-side Javascript.
-recipe = slapos.recipe.cmmi
-version = v4.4.1
-url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
-md5sum = ef756c3e773f08bccada08eb37ee699c
-configure-options =
-  --shared-openssl
-  --shared-openssl-includes=${openssl:location}/include
-  --shared-openssl-libpath=${openssl:location}/lib
-environment =
-  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[nodejs-0.6]
-# Server-side Javascript.
-recipe = slapos.recipe.cmmi
-url = http://nodejs.org/dist/v0.6.21/node-v0.6.21.tar.gz
-md5sum = 0da985a0bf820400af92363b9f453fe4
-configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
-environment =
-  HOME=${buildout:parts-directory}/${:_buildout_section_name_}
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
-[nodejs-0.4]
-recipe = slapos.recipe.cmmi
-url = http://nodejs.org/dist/node-v0.4.12.tar.gz
-md5sum = a6375eaa43db5356bf443e25b828ae16
-configure-options =
-  --openssl-includes=${openssl:location}/include
-  --openssl-libpath=${openssl:location}/lib
-environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
-  CPPFLAGS=-I${zlib:location}/include
-  LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-
 [npm]
 # Node.js Package Manager
 # Deprecated. Included in node >= 0.6.3.

component/nxdtest/buildout.cfg

 [buildout]
 extends =
   ../pygolang/buildout.cfg
+  ../util-linux/buildout.cfg
+  ../python-prctl/buildout.cfg
   ../git/buildout.cfg
 
 
+# nxdtest is bin/ program to run nxdtest.
+# use ${nxdtest:exe} to run it.
 [nxdtest]
-recipe  = zc.recipe.egg:scripts
-eggs    = ${pygolang:egg}
-          ${nxdtest-egg:egg}
-scripts = nxdtest
-# convenience for nxdtest users
+<= pyprog
 exe     = ${buildout:bin-directory}/nxdtest
+entry   = nxdtest:main
+eggs    = ${nxdtest-egg:egg}
+initialization =
+  # $PATH for unshare and mount
+  import os
+  path = os.environ.get('PATH', '')
+  if path != '':
+    path = ':' + path
+    os.environ['PATH'] = '${util-linux:location}/bin' + path
+
 
 [nxdtest-egg]
 recipe  = zc.recipe.egg:develop
 setup   = ${nxdtest-repository:location}
 egg     = nxdtest
+depends = ${python-prctl:egg}
 
 [nxdtest-repository]
 recipe  = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/nxdtest.git
-revision = b5a74214
+revision = 56e52da6
 location = ${buildout:parts-directory}/nxdtest
 git-executable = ${git:location}/bin/git

component/nxdtest/test.cfg

@@ -17,7 +17,7 @@ egg = nxdtest[test]
 [python-interpreter]
 eggs +=
   ${pytest:eggs}
-  ${nxdtest:eggs}
+  ${nxdtest-egg:egg}
 
 # env.sh for interpreter to be on $PATH.
 [nxdtest-env.sh]

component/ocropus/buildout.cfg

-[buildout]
-extends =
-  ../patch/buildout.cfg
-
-parts = ocropus
-
-[ocropus-patch-scons]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-download-only = true
-filename = ocropus.SConstruct-local-installation.patch
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 08710ec022f3ce13e5c0b584dfee2c1c
-
-[ocropus]
-recipe = slapos.recipe.cmmi
-url = http://www.nexedi.org/static/packages/source/ocropus/ocropus-0.4.4.tar.gz
-md5sum = 1485dbe9aab27574bfe3c8b4395cf3ce
-configure-options =
-  ${iulib:location}
-patches = ${ocropus-patch-scons:location}/${ocropus-patch-scons:filename}
-patch-options = -p1
-environment =
-  PATH=${patch:destination_directory}:${scons-bin:destination_directory}:%(PATH)s
-
-[scons-local]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = http://prdownloads.sourceforge.net/scons/scons-local-2.0.1.tar.gz
-
-[scons-bin]
-recipe = plone.recipe.command
-destination_directory = ${scons-local:location}
-command =
-  ln -sf ${scons-local:location}/scons.py ${:destination_directory}/scons
-
-[iulib-patch-scons]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-download-only = true
-filename = iulib.SConstruct-libtiff-detection.patch
-url = ${:_profile_base_location_}/${:filename}
-md5sum = dbbdf909814fb84ffe47e2ff59980db7
-
-[iulib]
-recipe = slapos.recipe.cmmi
-url = http://www.nexedi.org/static/packages/source/ocropus/iulib-0.4.4.tar.gz
-md5sum = 3d9754dbd64c56029ce1cd7c2f61894c
-# workaround http://code.google.com/p/iulib/issues/detail?id=27
-patches = ${iulib-patch-scons:location}/${iulib-patch-scons:filename}
-patch-options = -p1
-environment =
-  PATH=${patch:destination_directory}:${scons-bin:destination_directory}:%(PATH)s

component/ocropy/buildout.cfg

@@ -13,14 +13,14 @@ extends =
 parts = ocropy
 
 [ocropy-eng-traineddata]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download
+shared = true
 filename = en-default.pyrnn.gz
 md5sum = cedd140c7d7650e910f0550ad0f04727
-download-only = true
-url = https://raw.githubusercontent.com/zuphilip/ocropy-models/master/en-default.pyrnn.gz
+url = https://raw.githubusercontent.com/zuphilip/ocropy-models/master/${:filename}
 
 [ocropy-env]
-OCROPY_MODEL_PATH = ${ocropy-eng-traineddata:location}/${ocropy-eng-traineddata:filename}
+OCROPY_MODEL_PATH = ${ocropy-eng-traineddata:target}
 HOME = ${ocropy:egg}
 
 [ocropy]

component/oood/buildout.cfg

-# OpenOffice.org daemon software buildout
-[buildout]
-extends = ../openoffice-bin/buildout.cfg
-parts +=
-  oood
-
-[oood]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = http://www.nexedi.org/static/tarballs/oood/oood-r36294.tar.gz
-md5sum = 9e71251eea4b310fd6bd4ebf8abf890e
-strip-top-level-dir = true

component/open62541/buildout.cfg

+# Implementation of OPC UA (OPC Unified Architecture). https://open62541.org/
+
+[buildout]
+parts = open62541
+extends =
+  ../cmake/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
+configure-options =
+  -Bbuild
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+make-options = -C build