Merge branch 'master' into master+ZODB4-wc2

* master: (306 commits)
  stack/slapos: version up slapos.recipe.build 0.47
  slapos-master: Port latest tests for slapos into slapos-master
  Revert "stack/erp5: Use same Jinja2 as other slapos profiles"
  html5as: update with the new recipe
  v↑ tempstorage(ZODB4) 2.12.2 -> 3-nxd
  software/erp5: fix tmpdir in caucase partition
  component/tesseract: fix permissions of downloaded traineddata
  html5as: minor fix: space
  software/turnserver: switch-softwaretype
  seleniumserver: switch to switch-softwaretype
  htmlvalidatorserver: switch to switch-softwaretype
  backupserver: switch to switch-softwaretype
  v↑ tempstorage 2.12.2 -> 5.2(ZODB5) 3-nxd(ZODB4-wc2)
  html5as: change recipe
  software/slapos-sr-testing: enable restic-rest-server test
  software/restic-rest-server: new software
  slapos-master: Update md5sum (fixup)
  slapos-master: fix default bt5 list
  software/html5as: add parameter for monitor port
  kvm: Minimise restart reaction of the KVM wrapper
  ...

component/apache-php/buildout.cfg

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

component/ca-certificates/buildout.cfg

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

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

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

component/chromedriver/buildout.cfg

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

component/chromium/buildout.cfg

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

component/cloudooo/buildout.cfg

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

component/curl/buildout.cfg

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

component/cythonplus/buildout.cfg

@@ -23,7 +23,7 @@ eggs =
 [cythonplus-repository]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/cython.git
-revision = cythonplus-0.1
+revision = cythonplus-0.2
 git-executable = ${git:location}/bin/git
 
 [cythonplus_env.sh]

component/dcron/buildout.cfg

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

component/dcron/dcron-hooks.py

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

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

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

component/defaults.cfg

@@ -34,7 +34,7 @@ depends =
   ${patch:recipe}
 recipe = slapos.recipe.build
 # Latest version provided by SlapOS.
-part = gcc-8.4
+part = gcc-8.5
 # Minimum version for all components that might be required for
 # slapos.rebootstrap (see https://bugs.python.org/issue34112 about Python 3.7+).
 min_version = 5.4
@@ -49,11 +49,11 @@ init =
     current = subprocess.check_output(('gcc', '-dumpversion'),
                                       universal_newlines=True).strip()
   self.system_version = current
-  # If we're still going to use the same GCC,
-  # the conditions have no impact on the dependant parts.
+# If we're still going to use the same GCC,
+# the conditions have no impact on the dependant parts.
   min_version = options.pop('min_version', None)
   max_version = options.pop('max_version', None)
-  ###
+###
   if (parse_version(min_version or current)
       <= parse_version(current)
       <= parse_version(max_version or current)):
@@ -61,7 +61,7 @@ init =
     for path in os.getenv('PATH', '').split(os.pathsep): # PY3: shutil.which
       gcc = os.path.join(path, 'gcc')
       if os.access(gcc, os.X_OK) and not os.path.isdir(gcc):
-        options['prefix'] = os.path.dirname(path)
+        options['prefix'] = os.path.dirname(os.path.normpath(path))
         break
   else:
     options['prefix'] = self.buildout[options['part']]['location']
@@ -72,6 +72,7 @@ update =
     env = os.environ
     env['PATH'] = os.pathsep.join((
       os.path.join(options['prefix'], 'bin'),
+      os.path.join(self.buildout['binutils']['location'], 'bin'),
       env['PATH']
     ))
   else:

component/faketime/buildout.cfg

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

component/file/buildout.cfg

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

component/firefox/buildout.cfg

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

component/firewalld/buildout.cfg

@@ -19,12 +19,15 @@ md5sum = a120286a2c2bc12ece24d719ef2879b5
 python-egg = ${buildout:parts-directory}/${:_buildout_section_name_}/lib/python${python:version}/site-packages
 location = @@LOCATION@@
 sbin-dir = sbin-orig
+etc-root = ${:location}/etc
+etc-dir = ${:etc-root}/firewalld
 pre-configure =
   sed -i -E 's,(^SUBDIRS *=.*) doc(\b.*),\1\2,' Makefile.am
   aclocal -I${pkgconfig:location}/share/aclocal -I${gettext:location}/share/aclocal -I${libtool:location}/share/aclocal
   ./autogen.sh
 configure-options =
   --sbindir=${:location}/${:sbin-dir}
+  --sysconfdir=${:etc-root}
   --disable-docs
   --with-iptables=${iptables:location}/sbin/iptables-legacy
   --with-iptables-restore=${iptables:location}/sbin/iptables-legacy-restore
@@ -110,28 +113,30 @@ md5sum = 893752ba2e93a1e96334dfee19f884ad
 [firewalld-patch]
 recipe = plone.recipe.command
 python = ${buildout:bin-directory}/${firewalld-eggs:interpreter}
+stop-on-error = True
 command =
+  set -e
   sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-applet
   sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-cmd
   sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-config
   sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-offline-cmd
   sed -i 's#python2.7#${:python}#' ${firewalld:location}/${firewalld:sbin-dir}/firewalld
 
-  sed -i 's#python2.7 /usr/bin/firewall-config#${:python} ${firewalld:location}/bin/firewall-config#' ${firewalld:location}/etc/firewalld/lockdown-whitelist.xml
+  sed -i 's#python2.7 /usr/bin/firewall-config#${:python} ${firewalld:location}/bin/firewall-config#' ${firewalld:etc-dir}/lockdown-whitelist.xml
 
-  sed -i 's#DefaultZone=public#DefaultZone=trusted#' ${firewalld:location}/etc/firewalld/firewalld.conf
+  sed -i 's#DefaultZone=public#DefaultZone=trusted#' ${firewalld:etc-dir}/firewalld.conf
+  sed -i 's#FirewallBackend=nftables#FirewallBackend=iptables#' ${firewalld:etc-dir}/firewalld.conf
 
-  sed -i 's#/etc/firewalld#${firewalld:location}/etc/firewalld#'     ${firewalld:python-egg}/firewall/config/__init__.py
-  sed -i 's#/usr/lib/firewalld#${firewalld:location}/lib/firewalld#' ${firewalld:python-egg}/firewall/config/__init__.py
-  sed -i 's#/usr/share/#${firewalld:location}/share#'                ${firewalld:python-egg}/firewall/config/__init__.py
+  sed -i "s#'/etc/firewalld'#'${firewalld:etc-dir}'#"     ${firewalld:python-egg}/firewall/config/__init__.py
+  sed -i "s#'/usr/lib/firewalld'#'${firewalld:location}/lib/firewalld'#" ${firewalld:python-egg}/firewall/config/__init__.py
+  sed -i "s#'/usr/share/'#'${firewalld:location}/share'#"                ${firewalld:python-egg}/firewall/config/__init__.py
 
   sed -i "s#import sys#import sys, os\n\nos.environ['GI_TYPELIB_PATH'] = '${gobject-introspection:location}/lib/girepository-1.0/'#" ${:python}
-  sed -i 's#<syslog/>#<!-- no syslog -->#' ${dbus:location}/etc/dbus-1/system.conf
   sed -i 's#<user>messagebus</user>#<user>slapsoft</user>#' ${dbus:location}/share/dbus-1/system.conf
-  cp -f ${firewalld:location}/lib/firewalld/zones/trusted.xml ${firewalld:location}/etc/firewalld/zones/
+  cp -f ${firewalld:location}/lib/firewalld/zones/trusted.xml ${firewalld:etc-dir}/zones/
   cp -f ${firewalld:location}/share/dbus-1/system.d/FirewallD.conf ${dbus:location}/share/dbus-1/system.d/
   mkdir -p ${firewalld:location}/sbin
-  echo -n '#!/bin/sh\nLD_LIBRARY_PATH=${nftables:location}/lib ${firewalld:location}/${firewalld:sbin-dir}/firewalld "$@"' > ${firewalld:location}/sbin/firewalld
+  echo -n '#!/bin/sh\nLD_LIBRARY_PATH=${nftables:location}/lib exec ${firewalld:location}/${firewalld:sbin-dir}/firewalld "$@"' > ${firewalld:location}/sbin/firewalld
   chmod a+x ${firewalld:location}/sbin/firewalld
 
 update-command = ${:command}

component/fish-shell/buildout.cfg

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

component/fluentd/buildout.cfg

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

component/fontconfig/buildout.hash.cfg

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

component/fontconfig/fonts.conf.in

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

component/gcc/buildout.cfg

@@ -10,7 +10,7 @@ extends =
   ../binutils/buildout.cfg
 
 parts =
-  gcc-8.4
+  gcc-8.5
 
 [gcc-common]
 recipe = slapos.recipe.cmmi
@@ -33,6 +33,9 @@ configure-options =
   --with-ld=@@LOCATION@@/bin/ld
   --with-as=${binutils:location}/bin/as
   --with-internal-zlib
+  ${:extra-configure-options}
+extra-configure-options =
+
 post-install =
   cd '%(location)s/bin'
   ln -s gcc cc
@@ -54,6 +57,12 @@ environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
   PATH=${binutils:location}/bin:${gettext:location}/bin:${perl:location}/bin:${tar:location}/bin:%(PATH)s
 
+[gcc-common:os.path.isdir('/usr/lib/arm-linux-gnueabihf') and os.access('/proc/device-tree/model', os.R_OK) and 'OLinuXino-LIME2' in open('/proc/device-tree/model').read()]
+extra-configure-options =
+  --with-arch=armv7-a
+  --with-fpu=vfp
+  --with-float=hard
+
 [gcc-5.5]
 <= gcc-common
 version = 5.5.0
@@ -66,10 +75,10 @@ patches =
   ${:_profile_base_location_}/libsanitizer_Use_pre-computed_size_of_struct_ustat_for_Linux.patch#1e5f33e89f9fe1ca3e406eabcc621762
   ${:_profile_base_location_}/glibc2.30-ipc_perm.patch#563b7f5a38c2ea6bf741c328422b4c98
 
-[gcc-8.4]
+[gcc-8.5]
 <= gcc-common
-version = 8.4.0
-md5sum = bb815a8e3b7be43c4a26fa89dbbd9795
+version = 8.5.0
+md5sum = 0c1f625768840187ef3b10adebe8e3b0
 
 [gcc-10.2]
 <= gcc-common

component/gdbm/buildout.cfg

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

component/gdbm/extern_parseopt.patch

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

component/gettext/buildout.cfg

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

component/ghostscript/buildout.cfg

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

component/golang/buildout.cfg

@@ -42,28 +42,10 @@ md5sum = 6b607fc795391dc609ffd79ebf41f080
 environment-extra =
   GOROOT_BOOTSTRAP=${golang14:location}
 
-[golang1.13]
-<= golang-common
-url = https://golang.org/dl/go1.13.15.src.tar.gz
-md5sum = 4f4af14d88352a62761a9dcedf863ac0
-
-# go1.13 needs go1.4 to bootstrap
-environment-extra =
-  GOROOT_BOOTSTRAP=${golang14:location}
-
-[golang1.14]
-<= golang-common
-url = https://golang.org/dl/go1.14.15.src.tar.gz
-md5sum = 1065b705a0d330136084f4e1628baf82
-
-# go1.14 needs go1.4 to bootstrap
-environment-extra =
-  GOROOT_BOOTSTRAP=${golang14:location}
-
 [golang1.15]
 <= golang-common
-url = https://golang.org/dl/go1.15.8.src.tar.gz
-md5sum = 7e4b8580bfe25ffc51501b1dc3d2d8ce
+url = https://golang.org/dl/go1.15.12.src.tar.gz
+md5sum = b3a5dafa7028fa00083ce4aeaf5bcb9a
 
 # go1.15 needs go1.4 to bootstrap
 environment-extra =
@@ -71,8 +53,8 @@ environment-extra =
 
 [golang1.16]
 <= golang-common
-url = https://golang.org/dl/go1.16.src.tar.gz
-md5sum = b767f7e81d886b4208874ea953db2ce3
+url = https://golang.org/dl/go1.16.4.src.tar.gz
+md5sum = 5884a4cb49067b9bcf6e69a1ef44259c
 
 # go1.16 needs go1.4 to bootstrap
 environment-extra =
@@ -139,7 +121,7 @@ bin	= ${gowork.dir:bin}
 depends = ${gowork.goinstall:recipe}
 
 # go version used for the workspace (possible to override in applications)
-golang  = ${golang1.15:location}
+golang  = ${golang1.16:location}
 
 # no special build flags by default
 buildflags =

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.0.tar.gz
-md5sum = 2ea277c19f21b9d45410547173ff41c2
+url = https://packages.groonga.org/source/groonga/groonga-11.0.2.tar.gz
+md5sum = 753ba6fad77598baf93615c4b9c535b1
 groonga-plugin-dir =  @@LOCATION@@/lib/groonga/plugins/
 # temporary patch to respect more tokens in natural language mode.
 patches =

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

component/headless-chromium/buildout.cfg

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

component/helloweb/buildout.cfg

@@ -30,8 +30,6 @@ revision      = a7c788ae71
 install =
     ${helloweb:location}/go:./...
 
-golang  = ${golang1.16:location}
-
 # -*- go -*-
 [helloweb-go]
 # we already have gowork/bin/helloweb with helloweb Go build.

component/jupyter-py2/buildout.cfg

@@ -16,6 +16,7 @@ parts +=
 max_version = 0
 
 [jupyter]
+extra-eggs =
 python_executable = ${buildout:bin-directory}/${:interpreter}
 
 [download-file-base]
@@ -66,7 +67,6 @@ context =
 Pygments = 2.2.0
 astor = 0.5
 backports-abc = 0.5
-backports.functools-lru-cache = 1.6.1
 backports.shutil-get-terminal-size = 1.0.0
 cycler = 0.10.0
 ipykernel = 4.5.2
@@ -122,11 +122,6 @@ pexpect = 4.2.1
 # ipython==5.3.0
 pickleshare = 0.7.4
 
-# Required by:
-# matplotlib==2.1.2
-# pandas==0.19.2
-python-dateutil = 2.6.0
-
 # Required by:
 # pathlib2==2.2.1
 scandir = 1.5

component/jupyter/buildout.cfg

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

component/leptonica/buildout.cfg

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

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

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

component/libexpat/buildout.cfg

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

component/libffi/buildout.cfg

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

component/libffi/includedir.diff

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

component/libffi/libdir.patch

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

component/liburing/buildout.cfg

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

component/libxml2/buildout.cfg

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

component/libxslt/buildout.cfg

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

component/lunzip/buildout.cfg

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

component/mariadb/buildout.cfg

@@ -30,8 +30,8 @@ parts =
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://archive.mariadb.org//mariadb-${:version}/source/mariadb-${:version}.tar.gz
-version = 10.4.18
-md5sum = 22e429d532fcfcb0e4beba64e1c296f0
+version = 10.4.19
+md5sum = bf60c7a3feac5854745cd1ad5133f09a
 location = @@LOCATION@@
 pre-configure =
   set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
@@ -96,8 +96,8 @@ post-install =
 # as plugin-dir ( https://mariadb.com/kb/en/server-system-variables/#plugin_dir )
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://packages.groonga.org/source/mroonga/mroonga-11.00.tar.gz
-md5sum = 0aefcbb3c0dc6e29c53c6ee6287114b8
+url = https://packages.groonga.org/source/mroonga/mroonga-11.02.tar.gz
+md5sum = 0729c74efc92bfc404b88597488d07e9
 pre-configure = 
   rm -rf fake_mariadb_source
   mkdir -p fake_mariadb_source
@@ -131,8 +131,8 @@ environment =
 ### (we just override here for easier revert)
 [mariadb-10.3]
 <= mariadb-10.4
-version = 10.3.27
-md5sum = 6ab2934a671191d8ca8730e9a626c5c9
+version = 10.3.29
+md5sum = a5adad1c4fb1717d7fe6d608fd4d40de
 post-install =
   ldd=`ldd ${:location}/lib/plugin/ha_rocksdb.so`
   for x in ${lz4:location} ${snappy:location} ${zstd:location}

component/mariadb/mdev20693-mixin.cfg

 # To be extended after mariadb's buildout.cfg
 
-[mariadb]
+[mariadb-10.4]
 patches +=
   ${:_profile_base_location_}/mdev20693.patch#34ca907d6b36ba81d75bed118243f637

component/mesa/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../pkgconfig/buildout.cfg
   ../xorg/buildout.cfg
   ../xz-utils/buildout.cfg
+  ../zlib/buildout.cfg
 
 parts =
   mesa
@@ -16,32 +17,33 @@ parts =
 [mesa]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.freedesktop.org/pub/mesa/11.0.3/mesa-11.0.3.tar.xz
-md5sum = bf9118bf0fbf360715cfe60baf7a1db5
+url = https://archive.mesa3d.org/mesa-18.0.0.tar.xz
+md5sum = c2a59fc5b56de3e197fa3a6023409e23
 configure-options =
-  --enable-static
   --disable-gles1
   --disable-gles2
-  --disable-dri
+  --enable-dri
   --disable-dri3
   --enable-egl
-  --disable-gbm
+  --enable-gbm
+  --enable-sysfs
   --disable-xvmc
   --disable-vdpau
   --disable-va
-  --enable-xlib-glx
-  --disable-shared-glapi
+  --disable-xlib-glx
+  --enable-shared-glapi
   --disable-driglx-direct
   --disable-gallium-llvm
   --with-gallium-drivers=
   --with-dri-drivers=
 environment =
   PATH=${autoconf:location}/bin:${bison:location}/bin:${flex:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libdrm:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   PYTHON2=${buildout:executable}
   ACLOCAL=${automake:location}/bin/aclocal -I${libtool:location}/share/aclocal -I${pkgconfig:location}/share/aclocal
   AUTOCONF=${autoconf:location}/bin/autoconf
   AUTOMAKE=${automake:location}/bin/automake
+  LDFLAGS=-Wl,-rpath=${libdrm:location}/lib -Wl,-rpath=${zlib:location}/lib
 make-options =
   -j1
   LIBTOOL=${libtool:location}/bin/libtool
@@ -57,3 +59,4 @@ configure-options =
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${damageproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${glproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${libexpat:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${mesa:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
+  LDFLAGS=-Wl,-rpath=${libdrm:location}/lib -Wl,-rpath=${zlib:location}/lib

component/meson/buildout.cfg

+[buildout]
+extends =
+  ../python3/buildout.cfg
+parts =
+  meson
+
+[meson]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/mesonbuild/meson/releases/download/${:version}/meson-${:version}.tar.gz
+version = 0.57.2
+md5sum = 4a07b6d42d7a46a6b6e9604fae7da9aa
+configure-command = true
+make-binary = true
+post-install =
+  %(python)s -m venv %(location)s
+  set %(location)s/bin/python3
+  $1 setup.py install_data install_lib
+  $1 <<EOF
+  import os, pkg_resources, sys
+  for name, ep in pkg_resources.get_entry_map(
+      'meson==%(version)s', 'console_scripts').items():
+    fd = os.open(%(location)r '/bin/' + name, os.O_WRONLY|os.O_CREAT|os.O_EXCL)
+    os.write(fd, ("""#!$1
+  import os, sys
+  from %%s import %%s
+  if __name__ == '__main__':
+    sys.exit(%%s())
+  """ %% (ep.module_name, ep.attrs[0], '.'.join(ep.attrs))).encode())
+    os.close(fd)
+  EOF
+  %(location)s/bin/pip uninstall -y pip setuptools
+python = ${python3:executable}
+
+[meson:python3]
+python = ${buildout:executable}

component/ncurses/buildout.cfg

@@ -7,13 +7,15 @@ parts =
 [ncurses]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz
-md5sum = ee13d052e1ead260d7c28071f46eefb1
+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@@
+  --enable-pc-files
+  --with-pkg-config-libdir=@@LOCATION@@/lib/pkgconfig
   --with-shared
   --without-ada
   --without-manpages
@@ -23,8 +25,14 @@ configure-options =
   --without-gpm
   --enable-rpath
 # tricky way to rerun with --enable-widec
+# we even clean before rerun otherwise some steps like the installation of pc files are skipped
 make-targets =
-  install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h @@LOCATION@@/include/$i.h; done; ln -sf libncurses.so @@LOCATION@@/lib/libcurses.so) && ./configure ${:configure-options} --enable-widec && make ${:make-options} && make ${:make-options} install
+  install clean && ./configure ${:configure-options} --enable-widec && make ${:make-options} && make ${:make-options} install
+post-install =
+  cd '%(location)s/include'
+  mv ncursesw/* .
+  rm -r ncurses ncursesw
+  ln -s . ncursesw
 # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
 environment =
   LDCONFIG=/bin/echo

component/ninja/buildout.cfg

@@ -4,9 +4,14 @@ parts =
 
 [ninja]
 recipe = slapos.recipe.cmmi
-version = v1.7.1
-url = https://github.com/ninja-build/ninja/archive/${:version}.tar.gz
+shared = true
+version = 1.10.2
+url = https://github.com/ninja-build/ninja/archive/refs/tags/v${:version}.tar.gz
+md5sum = 639f75bc2e3b19ab893eaf2c810d4eb4
 configure-command = ./configure.py
 configure-options = --bootstrap
 make-binary = true
-post-install = ls && cp -r ./* ${buildout:parts-directory}/${:_buildout_section_name_}/
+post-install =
+  set %(location)s/bin
+  mkdir -p $1
+  mv ninja $1

component/noVNC/buildout.cfg

@@ -4,7 +4,6 @@ parts =
 
 [noVNC]
 recipe = slapos.recipe.build:download-unpacked
-# version-1.0.0 release on Feb 22, 2018
-url = https://github.com/novnc/noVNC/archive/v1.0.0.tar.gz
-md5sum = d63c2944abd12fecec6ec504e82f27c8
+url = https://github.com/novnc/noVNC/archive/refs/tags/v1.2.0.tar.gz
+md5sum = 290dfabc4ecdd58d62ccb8c34a922962
 strip-top-level-dir = true

component/openssl/buildout.cfg

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

component/patch/buildout.cfg

@@ -7,7 +7,7 @@ parts =
 [patch]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.gnu.org/gnu/patch/patch-2.7.5.tar.xz
-md5sum = e3da7940431633fb65a01b91d3b7a27a
+url = http://ftp.gnu.org/gnu/patch/patch-2.7.6.tar.xz
+md5sum = 78ad9937e4caadcba1526ef1853730d5
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s

component/postfix/buildout.cfg

@@ -20,7 +20,7 @@ patch-options = -p1
 patches =
   ${:_profile_base_location_}/noroot.patch#05fc6333e05576ea8e5a49f27a6ef951
 configure-command = make
-configure-options = makefiles CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl-1.0:location}/include -I${cyrus-sasl:location}/include/sasl' AUXLIBS='-L${openssl-1.0:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -L${cyrus-sasl:location}/lib -lssl -lpcre -ldb -lcrypto -lsasl2 -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib'
+configure-options = makefiles CCARGS='-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -DUSE_TLS -DHAS_PCRE -DHAS_DB -I${libdb:location}/include -I${pcre:location}/include -I${openssl:location}/include -I${cyrus-sasl:location}/include/sasl' AUXLIBS='-L${openssl:location}/lib -L${pcre:location}/lib -L${libdb:location}/lib -L${cyrus-sasl:location}/lib -lssl -lpcre -ldb -lcrypto -lsasl2 -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${cyrus-sasl:location}/lib'
 make-targets = non-interactive-package install_root=${:location}
 environment =
   PATH=${patch:location}/bin:${m4:location}/bin:%(PATH)s

component/proftpd/buildout.cfg

@@ -12,6 +12,7 @@ extends =
   ../libtool/buildout.cfg
   ../git/buildout.cfg
   ../patch/buildout.cfg
+  ../zstd/buildout.cfg
 
 # proftpd server
 [proftpd-environment]
@@ -22,16 +23,15 @@ recipe = collective.recipe.grp
 
 [proftpd]
 recipe = slapos.recipe.cmmi
-md5sum = 4040f6a6b86173e2a03f4ccdb9b9af6e
-url = ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6b.tar.gz
+md5sum = 4a9b8877b2e9b08d70e71ad56c19e2c9
+url = ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.7a.tar.gz
 configure-options =
   --enable-openssl
   --enable-nls
   --enable-ctrls
   --enable-dso
   --disable-cap
-  --with-modules=mod_sftp:mod_ban
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --with-modules=mod_sftp:mod_ban:mod_rewrite
 environment =
   CFLAGS=-DPR_RUN_DIR=\"/proc/self/cwd/var\"
   CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
@@ -46,11 +46,8 @@ patches =
 # mod_auth_web: a proftpd module to authenticate users against an HTTP service
 [proftpd-mod_auth_web-repository]
 recipe = slapos.recipe.build:gitclone
-#repository = https://github.com/proftpd/mod_auth_web
-# XXX until https://github.com/proftpd/mod_auth_web/pull/1 gets merged, we use
-# the source repository of this PR directly
-repository = https://github.com/jwm/mod_auth_web
-revision = dec090bd0e287544a34be156ee17f715bd4286f9
+repository = https://github.com/proftpd/mod_auth_web
+revision = e36105808b7d07d843b11f428a666a8f3cec35e4
 git-executable = ${git:location}/bin/git
 
 [proftpd-mod_auth_web]
@@ -61,7 +58,7 @@ command =
   LIBTOOL=${libtool:location}/bin/libtool \
   ${proftpd-output:prxs} -c -i -d \
   -I ${curl:location}/include \
-  -L '${curl:location}/lib/ -R ${openssl:location}/lib -R ${zlib:location}/lib' \
+  -L '${curl:location}/lib/ -R ${openssl:location}/lib -R ${zlib:location}/lib -R ${zstd:location}/lib' \
   -l curl \
   ${proftpd-mod_auth_web-repository:location}/mod_auth_web.c
 location=${proftpd:location}/libexec/mod_auth_web.so

component/pypy/buildout.cfg

@@ -49,7 +49,7 @@ configure-command =
   	cp -r include/pypy_*.h include/PyPy.h pypy/module/cpyext/include/* pypy/module/cpyext/parse/* \$(PREFIX)/include
   	cd pypy/goal && cp libpypy-c.so \$(PREFIX)/bin && cp pypy-c \$(PREFIX)/bin/pypy
 environment =
-  C_INCLUDE_PATH=${bzip2:location}/include:${gdbm:location}/include:${libexpat:location}/include:${ncurses:location}/include:${ncurses:location}/include/ncursesw:${openssl:location}/include:${sqlite3:location}/include:${zlib:location}/include
+  C_INCLUDE_PATH=${bzip2:location}/include:${gdbm:location}/include:${libexpat:location}/include:${ncurses:location}/include:${ncurses:location}/include:${openssl:location}/include:${sqlite3:location}/include:${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -L${gdbm:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libffi:location}/lib/pkgconfig

component/python-2.7/buildout.cfg

@@ -71,5 +71,5 @@ post-install = cd '${:prefix}' &&
 # which would otherwise load the system libmagic.so with ctypes
 environment =
   PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib

component/python-cachecontrol/buildout.cfg

-[buildout]
-
-[python-cachecontrol]
-recipe = zc.recipe.egg:custom
-egg = cachecontrol
-setup-eggs =
-  pbr
-  lockfile

component/python-cliff/buildout.cfg

-[buildout]
-
-[python-cliff]
-recipe = zc.recipe.egg:custom
-egg = cliff
-setup-eggs =
-  pbr

component/python3/buildout.cfg

@@ -48,7 +48,7 @@ pre-install = mkdir profile-opt
 # which would otherwise load the system libmagic.so with ctypes
 environment =
   PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
   LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
 
 [python3.6]

component/qemu-kvm/buildout.cfg

 [buildout]
 extends =
   ../attr/buildout.cfg
+  ../bzip2/buildout.cfg
   ../gnutls/buildout.cfg
   ../libaio/buildout.cfg
   ../libcap/buildout.cfg
   ../libcap-ng/buildout.cfg
   ../libpng/buildout.cfg
+  ../liburing/buildout.cfg
   ../libuuid/buildout.cfg
+  ../meson/buildout.cfg
   ../ncurses/buildout.cfg
+  ../ninja/buildout.cfg
+  ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xorg/buildout.cfg
   ../zlib/buildout.cfg
-  ../pcre/buildout.cfg
   ../glib/buildout.cfg
 
 [qemu]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://download.qemu.org/qemu-4.1.1.tar.xz
-md5sum = 53879f792ef2675c6c5e6cbf5cc1ac6c
+url = https://download.qemu.org/qemu-5.2.0.tar.xz
+md5sum = 179f86928835da857c237b42f4b2df73
+patches =
+# backport (2021-03-20)
+  https://gitlab.com/qemu-project/qemu/-/commit/3eacf70bb5a83e4775ad8003cbca63a40f70c8c2.patch#c4330b02f331a827145009d85e4f6862
+patch-binary = ${patch:location}/bin/patch
+patch-options = -p1
+pre-configure =
+  sed -i '/^libmigration\b/s/$/ dependencies: [zlib],/' meson.build
+  sed -i 's/\bsnappy,/zlib, \0/' dump/meson.build
 configure-options =
+  --meson=${meson:location}/bin/meson
+  --ninja=${ninja:location}/bin/ninja
   --target-list="$(uname -m 2>/dev/null|sed 's,^i[456]86$,i386,')-softmmu"
   --enable-system
   --disable-sdl
   --disable-xen
   --disable-vnc-sasl
   --disable-curl
+  --enable-gnutls
   --enable-kvm
   --enable-linux-aio
+  --enable-linux-io-uring
   --enable-virtfs
   --disable-docs
+  --enable-curses
   --enable-vnc
   --enable-vnc-png
   --disable-vnc-jpeg
-  --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${ncurses:location}/include -I${zlib:location}/include -I${libpng:location}/include -I${libaio:location}/include -I${attr:location}/include -I${libcap:location}/include -I${libcap-ng:location}/include "
-  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libgpg-error:location}/lib -L${libgpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib -L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib"
   --disable-werror
-  --disable-xfsctl
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
-  LDFLAGS=-L${pixman:location}/lib -Wl,-rpath=${pixman:location}/lib
+  CFLAGS=-I${gettext:location}/include -I${libaio:location}/include -I${liburing:location}/include -I${libcap-ng:location}/include
+  LDFLAGS=-L${gettext:location}/lib -L${libaio:location}/lib -L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${gnutls:location}/lib -Wl,-rpath=${nettle:location}/lib -Wl,-rpath=${pixman:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${libaio:location}/lib -Wl,-rpath=${liburing:location}/lib -Wl,-rpath=${libcap-ng:location}/lib
+  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${gnutls:pkg-config-path}:${libpng:location}/lib/pkgconfig:${liburing:location}/lib/pkgconfig:${ncurses:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
+
+[qemu:sys.version_info < (3,6)]
+environment +=
+  PYTHON=${python3:executable}
 
 [debian-netinst-base]
 recipe = slapos.recipe.build:download
@@ -72,8 +91,8 @@ md5sum = 6097fdb9cbab47c96471274b9044e983
 # XXX: This is not the latest version because
 #      Debian does not provide a stable URL for it.
 <= debian-amd64-netinst-base
-version = 10.7.0
-md5sum = 7227c779619e6c8a0a1b0f55d10c6270
+version = 10.8.0
+md5sum = e221f43f4fdd409250908fc4305727d4
 
 [debian-amd64-testing-netinst.iso]
 <= debian-amd64-netinst-base

component/rdiff-backup/buildout.cfg

 [buildout]
 extends =
   ../librsync/buildout.cfg
-  ../coreutils/buildout.cfg
+  ../python-2.7/buildout.cfg
 parts =
-  rdiff-backup-output
+  rdiff-backup-1.0.5
+  rdiff-backup-1.3.4
 
-[rdiff-backup-build]
-recipe = zc.recipe.egg:custom
-egg = rdiff-backup
-patches =
-  ${:_profile_base_location_}/rdiff-backup-1.2.8-librsync-1.0.0.patch#5e54a67845edd6942fcf7359c921e003
+[rdiff-backup-common]
+recipe = slapos.recipe.cmmi
+shared = true
 patch-options = -p1
 patch-binary = ${patch:location}/bin/patch
-include-dirs =
-  ${librsync:location}/include/
-library-dirs =
-  ${librsync:location}/lib/
-rpath =
-  ${librsync:location}/lib/
-# If you need another release, override this link
-# and pin the egg in the [versions] section of the stack or SR.
-find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1.0.5.tar.gz/fa2a165fa07a94be52c52e3545bc7758/rdiff-backup-1.0.5.tar.gz
+configure-command = true
+make-binary = true
+post-install =
+  set %(location)s/lib/python2.7
+  %(python)s setup.py build_ext -I${librsync:location}/include -L${librsync:location}/lib -R${librsync:location}/lib build install --prefix=%(location)s --install-lib=$1
+  cd %(location)s/bin
+  sed -i '/^import\b.*\bsys\b/s,$,\nsys.path[0] = '\"$1\", *
+  ./rdiff-backup -V
+python = ${python2.7:executable}
+
+[rdiff-backup-common:python27]
+python = ${buildout:executable}
+
+[rdiff-backup-1.0.5]
+<= rdiff-backup-common
+url = https://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1.0.5.tar.gz/${:md5sum}/rdiff-backup-1.0.5.tar.gz
+md5sum = fa2a165fa07a94be52c52e3545bc7758
+patches =
+  ${:_profile_base_location_}/rdiff-backup-1.2.8-librsync-1.0.0.patch#5e54a67845edd6942fcf7359c921e003
 
-[rdiff-backup-build-1.3.4]
-<= rdiff-backup-build
+[rdiff-backup-1.3.4]
+<= rdiff-backup-common
 # use our own version
-find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd6.tar.gz
+url = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd6.tar.gz
+md5sum = 06b8df2099baebca6086a315b031fd53
 patches =
   ${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f
-
-[rdiff-backup]
-# Scripts only generation part for rdiff-backup
-recipe = zc.recipe.egg
-eggs =
-  ${rdiff-backup-build:egg}
-entry-points =
-  rdiff-backup=rdiff_backup.Main:Main
-arguments = sys.argv[1:]
-
-[rdiff-backup-output]
-# Shared binary location to ease migration
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = ${coreutils-output:test} -x ${:rdiff-backup}
-rdiff-backup = ${buildout:directory}/bin/rdiff-backup

component/readline/buildout.cfg

@@ -37,22 +37,13 @@ environment =
 [readline]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz
-md5sum = 33c8fb279e981274f485fd91da77e94a
+url = http://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz
+md5sum = e9557dd5b1409f5d7b37ef717c64518e
 patches =
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-001#4343f5ea9b0f42447f102fb61576b398
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-002#700295212f7e2978577feaee584afddb
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-003#af4963862f5156fbf9111c2c6fa86ed7
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-004#11f9def89803a5052db3ba72394ce14f
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-005#93721c31cd225393f80cb3aadb165544
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-006#71dc6ecce66d1489b96595f55d142a52
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-007#062a08ed60679d3c4878710b3d595b65
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-008#ee1c04072154826870848d8b218d7b04
-  ${:_profile_base_location_}/configure-ncurses.diff#c2bf0d0cb0ccd3d3c078ba124fffb7d2
+  ${:_profile_base_location_}/configure-ncurses.diff#db8187a92f19e0e9d2fe595ca7a0426f
 configure-options =
   --enable-multibyte
   --disable-static
 environment =
-  CPPFLAGS=-I${ncurses:location}/include/ncurses
+  CPPFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
-  PATH=${patch:location}/bin:%(PATH)s

component/readline/configure-ncurses.diff

-diff -ur ../readline-6.3.orig/aclocal.m4 ./aclocal.m4
---- ../readline-6.3.orig/aclocal.m4	2013-10-21 00:37:50.000000000 +0200
-+++ ./aclocal.m4	2015-05-21 11:04:20.243591527 +0200
-@@ -958,10 +958,10 @@
- fi
- AC_CACHE_VAL(bash_cv_termcap_lib,
- [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
--  [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
--    [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-+  [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
-+    [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
-+      [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-         [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
--	    [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
- 	        bash_cv_termcap_lib=gnutermcap)])])])])])
- if test "X$_bash_needmsg" = "Xyes"; then
- AC_MSG_CHECKING(which library has the termcap functions)
-Only in ./: aclocal.m4~
-Only in ./: autom4te.cache
-diff -ur ../readline-6.3.orig/configure ./configure
---- ../readline-6.3.orig/configure	2013-03-13 15:14:53.000000000 +0100
-+++ ./configure	2015-05-21 11:29:48.157514191 +0200
-@@ -5793,6 +5793,45 @@
- if test "x$ac_cv_func_tgetent" = xyes; then :
-   bash_cv_termcap_lib=libc
- else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lncurses  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char tgetent ();
-+int
-+main ()
-+{
-+return tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ncurses_tgetent=yes
-+else
-+  ac_cv_lib_ncurses_tgetent=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-+if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
-+  bash_cv_termcap_lib=libncurses
-+else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
- $as_echo_n "checking for tgetent in -ltermcap... " >&6; }
- if ${ac_cv_lib_termcap_tgetent+:} false; then :
-@@ -5910,45 +5949,6 @@
- if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
-   bash_cv_termcap_lib=libcurses
- else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
--$as_echo_n "checking for tgetent in -lncurses... " >&6; }
--if ${ac_cv_lib_ncurses_tgetent+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lncurses  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char tgetent ();
--int
--main ()
--{
--return tgetent ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_ncurses_tgetent=yes
--else
--  ac_cv_lib_ncurses_tgetent=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
--$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
--if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
--  bash_cv_termcap_lib=libncurses
--else
-   bash_cv_termcap_lib=gnutermcap
- fi
- 
-@@ -6322,10 +6322,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "cannot run test program while cross compiling
--See \`config.log' for more details" "$LINENO" 5; }
-+  bash_cv_wcwidth_broken=no
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-@@ -6409,6 +6406,7 @@
+--- configure
++++ configure
+@@ -6856,6 +6856,7 @@
  #	*curses*|*termcap*|*termlib*)	;;
  #	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
  #	esac
@@ -132,15 +8,3 @@ diff -ur ../readline-6.3.orig/configure ./configure
  
  
  
-diff -ur ../readline-6.3.orig/configure.ac ./configure.ac
---- ../readline-6.3.orig/configure.ac	2014-02-11 23:12:39.000000000 +0100
-+++ ./configure.ac	2015-05-21 11:25:26.164610769 +0200
-@@ -222,6 +222,7 @@
- #	*curses*|*termcap*|*termlib*)	;;
- #	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
- #	esac
-+        SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB"
- 	
-         AC_SUBST(SHOBJ_CC)
-         AC_SUBST(SHOBJ_CFLAGS)
-Only in ./: configure.ac~

component/ruby/buildout.cfg

@@ -20,7 +20,7 @@ configure-options =
   --with-out-ext=tk,tk/tkutil,win32,win32ole
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${openssl-1.0:location}/include -I${readline:location}/include -I${zlib:location}/include
+  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${openssl-1.0:location}/include -I${readline:location}/include -I${zlib:location}/include
   LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl-1.0:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib  -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
   PKG_CONFIG_PATH=${libyaml:location}/lib/
 

component/slapos/buildout.cfg

@@ -77,8 +77,6 @@ eggs =
   ${lxml-python:egg}
   ${python-cffi:egg}
   ${python-PyYAML:egg}
-  ${python-cachecontrol:egg}
-  ${python-cliff:egg}
   ${python-cryptography:egg}
   pyOpenSSL
   slapos.libnetworkcache

component/sqlite3/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 [sqlite3]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://sqlite.org/2020/sqlite-autoconf-3320300.tar.gz
-md5sum = 2e3911a3c15e85c2f2d040154bbe5ce3
+url = https://sqlite.org/2021/sqlite-autoconf-3350500.tar.gz
+md5sum = d1d1aba394c8e0443077dc9f1a681bb8
 configure-options =
   --disable-static
   --enable-readline

component/tempstorage/buildout.cfg

+# SlapOS component for tempstorage.
+# https://github.com/zopefoundation/tempstorage
+
+[buildout]
+extends =
+    ../ZODB/buildout.cfg
+    ../git/buildout.cfg
+
+
+# tempstorage provides tempstorage<X> depending on ZODB major version.
+#
+# - tempstorage >= 4 works only with ZODB5 because ZODB commit protocol was changed
+#   https://github.com/zopefoundation/tempstorage/commit/5cc223ea
+# - tempstorage <= 5.2 is vulnerable to data corruption in loadBefore
+#   https://github.com/zopefoundation/tempstorage/issues/8
+#   https://github.com/zopefoundation/tempstorage/pull/16
+# - tempstorage 3-nxd provides loadBefore backports to tempstorage 3.
+[tempstorage]
+recipe  = slapos.recipe.build
+depends = ${ZODB:egg}
+init =
+  # link/depend to tempstorage<ZODB.major>
+  zodb = self.buildout['ZODB']
+  zmajor = zodb['major']
+  tempstorage_x = self.buildout['tempstorage'+zmajor]
+  options['depends'] += '$${%s:egg}' % tempstorage_x.name
+  options['egg'] = tempstorage_x['egg']
+
+  # update [versions] from what is needed by tempstorage<X>
+  self.buildout.parse('[_tempstorage-versions]\n' + tempstorage_x['egg-versions'])
+  versions = self.buildout['versions']
+  versions.update(self.buildout['_tempstorage-versions'])
+  # propagate updated [versions] -> easy_install
+  # (buildout does this in Buildout constructor)
+  import zc.buildout.easy_install
+  zc.buildout.easy_install.default_versions(versions)
+
+
+# tempstorage5 is plain upstream egg
+[tempstorage5]
+recipe  = zc.recipe.egg:eggs
+egg     = tempstorage
+eggs    = ${:egg}
+
+egg-versions =
+  tempstorage = 5.2
+
+
+# tempstorage4-wc2 is tempstorage 3 + backports for loadBefore fixes
+[tempstorage4-wc2]
+recipe  = zc.recipe.egg:develop
+setup   = ${tempstorage4-wc2-repository:location}
+egg     = tempstorage
+egg-versions =
+  tempstorage =
+
+[tempstorage4-wc2-repository]
+recipe  = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/nexedi/tempstorage.git
+branch  = 3-nxd
+revision= 77b49295db78
+location = ${buildout:parts-directory}/tempstorage
+git-executable = ${git:location}/bin/git
+
+
+# tempstorage4 is the same as tempstorage4-wc2 because of loadBefore fixes.
+[tempstorage4]
+<= tempstorage4-wc2

component/tesseract/buildout.cfg

@@ -10,43 +10,34 @@ extends =
   ../fontconfig/buildout.cfg
   ../lcms/buildout.cfg
   ../pkgconfig/buildout.cfg
-
+  ./buildout.hash.cfg
 parts =
   tesseract
-  tesseract-traineddata
-  tesseract-eng-traineddata
-  tesseract-osd-traineddata
 
 [tesseract]
 recipe = slapos.recipe.cmmi
-url = https://github.com/tesseract-ocr/tesseract/archive/6b250b58121a9858d3e3019a78a6f7d421bd0fc7.tar.gz
-md5sum = fdc38148ad8eb1bd0485a217503dd6d5
+shared = true
+url = https://github.com/tesseract-ocr/tesseract/archive/refs/tags/4.1.1.tar.gz
+md5sum = 51fe2bcbff1bbce77a25d180fd247f7d
 pkg_config_depends = ${leptonica:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${lcms2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig
 pre-configure =
   autoreconf -ivf -I${pkgconfig:location}/share/aclocal -I${libtool:location}/share/aclocal -Wno-portability
 
-configure-options =
-  --disable-static
-  --datarootdir=${tesseract-traineddata:location}
-# XXX: tesseract seems not easily configurable at runtime about where to find
-# its trained data, so we set its datarootdir above to a controlled location
-
 environment =
   PATH=${pkgconfig:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${m4:location}/bin:${patch:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   LDFLAGS=-L${leptonica:location}/lib -Wl,-rpath=${leptonica:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
-[tesseract-traineddata]
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
+post-make-hook = ${tesseract-download-traineddata:post-make-hook}
+tessdata-urls = ${tesseract-download-traineddata:urls}
+tessdata-location = @@LOCATION@@/share/tessdata/
 
-[tesseract-eng-traineddata]
-recipe = slapos.recipe.build:download
-destination = ${tesseract-traineddata:location}/tessdata/eng.traineddata
-url = https://github.com/tesseract-ocr/tessdata/raw/590567f20dc044f6948a8e2c61afc714c360ad0e/eng.traineddata
-md5sum = 57e0df3d84fed9fbf8c7a8e589f8f012
 
-[tesseract-osd-traineddata]
-recipe = slapos.recipe.build:download
-destination = ${tesseract-traineddata:location}/tessdata/osd.traineddata
-url = https://github.com/tesseract-ocr/tessdata/raw/590567f20dc044f6948a8e2c61afc714c360ad0e/osd.traineddata
-md5sum = 7611737524efd1ce2dde67eff629bbcf
+[tesseract-download-traineddata]
+post-make-hook = ${:_profile_base_location_}/${download-tessdata.py:filename}#${download-tessdata.py:md5sum}:post_make_hook
+urls =
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/4.1.0/eng.traineddata#57e0df3d84fed9fbf8c7a8e589f8f012
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/4.1.0/osd.traineddata#7611737524efd1ce2dde67eff629bbcf
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/4.1.0/fra.traineddata#a73e70c872f262895d93976febeb1638
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/4.1.0/jpn.traineddata#af3a30a9bec904e106aa8521e7caaeca
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/4.1.0/chi_sim.traineddata#6965cb3213edd961cb16264e2ea45f5c

component/tesseract/buildout.hash.cfg

+[download-tessdata.py]
+filename = download-tessdata.py
+md5sum = 1f6cf2797f0daf9dec16c1d3a8c44907

component/tesseract/download-tessdata.py

+# This is a post-make hook script to download tesseract training data.
+#
+# This script uses the following buildout options:
+#   - tessdata-urls: list of URLs and their expected md5sum as URL fragments
+#   - tessdata-location: path where to install the data.
+
+import zc.buildout
+import os
+
+
+def post_make_hook(options, buildout, env):
+  if not os.path.exists(options['tessdata-location']):
+    os.makedirs(options['tessdata-location'])
+
+  download = zc.buildout.download.Download(
+      buildout['buildout'],
+      hash_name=True,
+  )
+  for url in options['tessdata-urls'].splitlines():
+    url, _, md5sum = url.partition('#')
+    if url:
+      destination = os.path.join(
+          options['tessdata-location'],
+          os.path.basename(url),
+      )
+      download(
+          url,
+          md5sum=md5sum,
+          path=destination,
+      )
+      os.chmod(destination, 0o750)

component/trafficserver/buildout.cfg

@@ -23,12 +23,12 @@ min_version = 8
 
 [trafficserver]
 recipe = slapos.recipe.cmmi
-url = http://apache.claz.org/trafficserver/trafficserver-8.1.1.tar.bz2
-md5sum = 4f4d1e7de19c77157be0c2a825b31026
+url = http://apache.claz.org/trafficserver/trafficserver-9.0.1.tar.bz2
+md5sum = 98bb2de25f332715339ade87530a9f5a
 shared = true
 patch-options = -p1
 patches =
-  https://github.com/apache/trafficserver/commit/254e9e22181ca369673407bd3fcd93e7287275ac.patch#1c324f76464d33d334a15a69490ccd55
+  https://patch-diff.githubusercontent.com/raw/apache/trafficserver/pull/7577.patch
 configure-options =
   --with-openssl=${openssl:location}
   --with-pcre=${pcre:location}

component/wendelin.core/activate-WC2-preview.cfg

+# SlapOS extension that switches Wendelin.core to Wendelin.core 2 preview.
+#
+# Should go away once wendelin.core 2 lands to nexedi/wendelin.core@master.
+# Must be extended from last, for example:
+#
+# [buildout]
+# extends =
+#   .../stack/erp5/buildout.cfg
+#   .../component/wendelin.core/activate-WC2-preview.cfg
+
+[wendelin.core-repository]
+repository = https://lab.nexedi.com/kirr/wendelin.core.git
+branch   = t
+revision =

component/wendelin.core/buildout.cfg

@@ -38,6 +38,12 @@ GO   = ${go:exe}
 # wcfs needs this:
 [gowork]
 cpkgpath += ${zlib:location}/lib/pkgconfig
+[wendelin.core-env]
+# `pkg-config --libs zlib` emits only -L, but not -Wl,-rpath
+# better set it via gowork:environment when "VAR += ..." support is there
+# environment +=
+#   CGO_LDFLAGS += -Wl,-rpath=${zlib:location}/lib
+CGO_LDFLAGS += -Wl,-rpath=${zlib:location}/lib
 
 
 [wendelin.core-repository]

component/xorg/buildout.cfg

@@ -2,20 +2,25 @@
 extends =
   ../autoconf/buildout.cfg
   ../automake/buildout.cfg
+  ../bison/buildout.cfg
   ../bzip2/buildout.cfg
   ../dash/buildout.cfg
   ../freetype/buildout.cfg
   ../gnutls/buildout.cfg
+  ../icu/buildout.cfg
   ../intltool/buildout.cfg
   ../libtool/buildout.cfg
   ../libuuid/buildout.cfg
   ../libxml2/buildout.cfg
   ../libxslt/buildout.cfg
+  ../meson/buildout.cfg
+  ../ninja/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../perl-XML-Parser/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
   ./buildout.hash.cfg
 
@@ -652,3 +657,43 @@ pkg_config_depends = ${libX11:location}/lib/pkgconfig:${xorgproto:pkg_config_dep
 environment =
   PKG_CONFIG_PATH=${:pkg_config_depends}
   PATH=${pkgconfig:location}/bin:%(PATH)s
+
+
+[libdrm]
+recipe = slapos.recipe.cmmi
+shared = true
+configure-command = ${meson:location}/bin/meson builddir --libdir=lib -Dprefix=@@LOCATION@@
+make-binary = ${ninja:location}/bin/ninja -C builddir
+url = https://dri.freedesktop.org/libdrm/libdrm-2.4.106.tar.xz
+md5sum = 4e316ae1966a1a63c31a3885313a8fb8
+pkg_config_depends = ${pciaccess:location}/lib/pkgconfig
+environment =
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:${ninja:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${pciaccess:location}/lib -Wl,-rpath=@@LOCATION@@/lib
+
+
+[libxshmfence]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://www.x.org/releases/individual/lib/libxshmfence-1.3.tar.gz
+md5sum = ab3940af0bd3d3cc91eb35ecd33a779a
+pkg_config_depends = ${xorgproto:pkg_config_depends}:${xorgproto:location}/share/pkgconfig
+environment =
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+
+
+[libxkbcommon]
+recipe = slapos.recipe.cmmi
+shared = true
+configure-command = ${meson:location}/bin/meson builddir --libdir=lib -Dprefix=@@LOCATION@@ -Denable-wayland=false -Denable-docs=false
+make-binary = ${ninja:location}/bin/ninja -C builddir
+
+url = https://xkbcommon.org/download/libxkbcommon-1.3.0.tar.xz
+md5sum = 00b5275ec1309a1d427a645de5861605
+pkg_config_depends = ${libxcb:pkg_config_depends}:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${xz-utils:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${icu4c:location}/lib/pkgconfig
+environment =
+  PKG_CONFIG_PATH=${:pkg_config_depends}
+  PATH=${xz-utils:location}/bin:${pkgconfig:location}/bin:${ninja:location}/bin:${bison:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${libxcb:location}/lib -Wl,-rpath=${libxml2:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${icu4c:location}/lib -Wl,-rpath=@@LOCATION@@/lib

component/xz-utils/buildout.cfg

@@ -5,7 +5,7 @@ parts =
 [xz-utils]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://tukaani.org/xz/xz-5.2.2.tar.bz2
-md5sum = f90c9a0c8b259aee2234c4e0d7fd70af
+url = http://tukaani.org/xz/xz-5.2.5.tar.bz2
+md5sum = 33ab3ef79aa1146b83b778210e7b0a54
 configure-options =
   --disable-static

component/zbar/buildout.cfg

 [buildout]
 parts=
   zbar
+extends =
+  ../automake/buildout.cfg
+  ../bzip2/buildout.cfg
+  ../gettext/buildout.cfg
+  ../libtool/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
 
 [zbar]
 recipe = slapos.recipe.cmmi
@@ -19,5 +26,5 @@ configure-options =
   --without-x
   --without-jpg
 environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${gettext:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${gettext:location}/bin:${libtool:location}/bin:${m4:location}/bin:${bzip2:location}/bin:%(PATH)s
   CFLAGS=

component/zstd/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://github.com/facebook/zstd/releases/download/v${:version}/zstd-${:version}.tar.gz
-version = 1.4.5
-md5sum = dd0b53631303b8f972dafa6fd34beb0c
+version = 1.4.9
+md5sum = eb718b8aae0302cabe20f968e500534d
 location = @@LOCATION@@
 configure-command = :
 environment =

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.171'
+version = '1.0.197'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 
@@ -40,6 +40,7 @@ extras_require = {
         'jsonschema',
         'mock',
         'testfixtures',
+        'requests',
     ),
 }
 

slapos/recipe/postgres.py

@@ -151,10 +151,10 @@ class Recipe(GenericBaseRecipe):
                     max_connections = 100
                     datestyle = 'iso, mdy'
 
-                    lc_messages = 'en_US.UTF-8'
-                    lc_monetary = 'en_US.UTF-8'
-                    lc_numeric = 'en_US.UTF-8'
-                    lc_time = 'en_US.UTF-8'
+                    lc_messages = 'C.UTF-8'
+                    lc_monetary = 'C.UTF-8'
+                    lc_numeric = 'C.UTF-8'
+                    lc_time = 'C.UTF-8'
                     default_text_search_config = 'pg_catalog.english'
 
                     unix_socket_directories = '%s'

slapos/recipe/re6stnet/__init__.py

@@ -49,9 +49,8 @@ class Recipe(GenericBaseRecipe):
     self.software_release_url = slap_connection['software-release-url']
     self.key_file = slap_connection.get('key-file')
     self.cert_file = slap_connection.get('cert-file')
-    self.slave_list = json.loads(options['slave-instance-list'])
+    self.slave_list = options['slave-instance-list']
 
-    options['slave-amount'] = '%s' % len(self.slave_list)
     return GenericBaseRecipe.__init__(self, buildout, name, options)
 
   def getSerialFromIpv6(self, ipv6):

slapos/recipe/simplehttpserver/__init__.py

@@ -35,7 +35,7 @@ class Recipe(GenericBaseRecipe):
 
     base_path = options['base-path']
     if options.get('use-hash-url', 'True') in ['true', 'True']:
-      pool = string.letters + string.digits
+      pool = string.ascii_letters + string.digits
       hash_string = ''.join(random.choice(pool) for i in range(64))
       path = os.path.join(base_path, hash_string)
   

slapos/recipe/simplehttpserver/simplehttpserver.py

@@ -43,20 +43,23 @@ class ServerHandler(SimpleHTTPRequestHandler):
     form = cgi.FieldStorage(
       fp=self.rfile,
       headers=self.headers,
-      environ={'REQUEST_METHOD':'POST',
-                'CONTENT_TYPE':self.headers['Content-Type']}
+      environ={'REQUEST_METHOD': 'POST',
+               'CONTENT_TYPE': self.headers['Content-Type']}
     )
-    name = form['path'].value
+    name = form['path'].value.decode('utf-8')
     content = form['content'].value
-    method = 'a'
+    method = 'ab'
     if 'clear' in form and form['clear'].value == '1':
-      method = 'w'
+      method = 'wb'
     self.writeFile(name, content, method)
     self.respond(200, type=self.headers['Content-Type'])
     self.wfile.write(b"Content written to %s" % str2bytes(name))
 
-  def writeFile(self, filename, content, method='a'):
-    file_path = os.path.join(self.document_path, filename)
+  def writeFile(self, filename, content, method='ab'):
+    file_path = os.path.abspath(os.path.join(self.document_path, filename))
+    if not file_path.startswith(self.document_path):
+      self.respond(403, 'text/plain')
+      self.wfile.write(b"Forbidden")
 
     try:
       os.makedirs(os.path.dirname(file_path))

slapos/recipe/switch_softwaretype.py

@@ -25,9 +25,8 @@
 #
 ##############################################################################
 
-
-from zc.buildout.buildout import Buildout
-
+from zc.buildout.buildout import Buildout, MissingOption, MissingSection
+from zc.buildout import UserError
 
 class SubBuildout(Buildout):
   """Run buildout in buildout, partially copied from infrae.buildout
@@ -71,8 +70,21 @@ class Recipe:
     self.buildout = buildout
     self.options = options
     self.name = name
-    self.software_type = buildout["slap-configuration"]["slap-software-type"]
-    section, key = self.options[self.software_type].split(":")
+    try:
+      self.software_type = buildout["slap-configuration"]["slap-software-type"]
+    except (MissingSection, MissingOption):
+      raise UserError("The section to retrieve slap partition parameters "
+                      "(with slapos.cookbook:slapconfiguration recipe or a derived one) "
+                      "must be named [slap-configuration].")
+    try:
+      section, key = self.options[self.software_type].split(":")
+    except MissingOption:
+      raise MissingOption("This software type (%s) isn't mapped. RootSoftwareInstance "
+                      "is the default software type." % self.software_type)
+    except ValueError:
+      raise UserError("The software types in the section [%s] must be separated "
+                      "by a colon such as: 'section:key', where key is usually 'rendered'. "
+                      "Don't use: ${section:key}" % self.name)
     self.base = self.buildout[section][key]
 
   def install(self):

slapos/test/recipe/test_re6stnet.py

@@ -38,7 +38,7 @@ class Re6stnetTest(unittest.TestCase):
                 'drop-service-wrapper': os.path.join(self.base_dir, 'drop_wrapper'),
                 'check-service-wrapper': os.path.join(self.base_dir, 'check_wrapper'),
                 'revoke-service-wrapper': os.path.join(self.base_dir, 'revoke_wrapper'),
-                'slave-instance-list': '{}'
+                'slave-instance-list': [],
                 }
     
   def tearDown(self):
@@ -119,11 +119,10 @@ class Re6stnetTest(unittest.TestCase):
   def test_install(self):
     self.options.update({
         'ipv6-prefix': '2001:db8:24::/48',
-        'slave-instance-list': '''[
+        'slave-instance-list': [
             {"slave_reference":"SOFTINST-58770"},
             {"slave_reference":"SOFTINST-58778"}
             ]
-            '''
         })
 
     recipe = self.new_recipe()
@@ -161,7 +160,7 @@ class Re6stnetTest(unittest.TestCase):
     
     # Remove one element
     self.options.update({
-        "slave-instance-list": """[{"slave_reference":"SOFTINST-58770"}]"""
+        "slave-instance-list": [{"slave_reference":"SOFTINST-58770"}]
         })
     recipe = self.new_recipe()
     recipe.generateCertificate = self.fake_generateCertificates

slapos/test/recipe/test_simplehttpserver.py

+import os
+import shutil
+import tempfile
+import unittest
+import subprocess
+import time
+
+from six.moves.urllib import parse as urlparse
+import requests
+
+from slapos.recipe import simplehttpserver
+from slapos.test.utils import makeRecipe
+
+
+class SimpleHTTPServerTest(unittest.TestCase):
+  process = None
+
+  def setUp(self):
+    self.base_path = tempfile.mkdtemp()
+    self.addCleanup(shutil.rmtree, self.base_path)
+    self.install_dir = tempfile.mkdtemp()
+    self.addCleanup(shutil.rmtree, self.install_dir)
+    self.wrapper = os.path.join(self.install_dir, 'server')
+    host, port = os.environ['SLAPOS_TEST_IPV4'], 9999
+    self.server_url = 'http://{host}:{port}'.format(host=host, port=port)
+    self.recipe = makeRecipe(
+        simplehttpserver.Recipe,
+        options={
+            'base-path': self.base_path,
+            'host': host,
+            'port': port,
+            'log-file': os.path.join(self.install_dir, 'simplehttpserver.log'),
+            'wrapper': self.wrapper,
+        },
+        name='simplehttpserver',
+    )
+
+  def tearDown(self):
+    if self.process:
+      self.process.terminate()
+      self.process.wait()
+
+  def test_options(self):
+    self.assertNotEqual(self.recipe.options['path'], '')
+    self.assertEqual(
+        self.recipe.options['root-dir'],
+        os.path.join(
+            self.base_path,
+            self.recipe.options['path'],
+        ))
+
+  def test_install(self):
+    self.assertEqual(self.recipe.install(), self.wrapper)
+    self.process = subprocess.Popen(
+        self.wrapper,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+    )
+    server_base_url = urlparse.urljoin(
+        self.server_url,
+        self.recipe.options['path'],
+    )
+    for i in range(16):
+      try:
+        resp = requests.get(server_base_url)
+        break
+      except requests.exceptions.ConnectionError:
+        time.sleep(i * .1)
+    else:
+      self.fail(
+          'server did not start.\nout: %s error: %s' % self.process.communicate())
+    self.assertIn('Directory listing for /', resp.text)
+
+    resp = requests.post(
+        server_base_url,
+        files={
+            'path': 'hello.txt',
+            'content': b'hello',
+        },
+    )
+    self.assertEqual(resp.status_code, requests.codes.ok)
+    with open(
+        os.path.join(self.base_path, self.recipe.options['path'],
+                     'hello.txt')) as f:
+      self.assertEqual(f.read(), 'hello')
+
+    self.assertIn('hello.txt', requests.get(server_base_url).text)
+    self.assertEqual(
+        requests.get(server_base_url + '/hello.txt').text, 'hello')
+
+    # incorrect paths are refused
+    for path in '/hello.txt', '../hello.txt':
+      resp = requests.post(
+          server_base_url,
+          files={
+              'path': path,
+              'content': b'hello',
+          },
+      )
+      self.assertEqual(resp.status_code, requests.codes.forbidden)

slapos/test/utils.py

 """Test helpers
 """
+import os
 import sys
-import os.path
-from zc.buildout.configparser import parse
 
-import logging
 
 def makeRecipe(recipe_class, options, name='test', slap_connection=None):
   """Instanciate a recipe of `recipe_class` with `options` with a buildout
   mapping containing a python and an empty `slapos-connection` mapping, unless
   provided as `slap_connection`.
 
-  If running tests in a buildout folder, the test recipe will reuse the
-  `eggs-directory` and `develop-eggs-directory` from this buildout so that the
+  This function expects the test suite to have set SLAPOS_TEST_EGGS_DIRECTORY
+  and SLAPOS_TEST_DEVELOP_EGGS_DIRECTORY environment variables, so that the
   test recipe does not need to install eggs again when using working set.
-  To prevent test accidentally writing to the buildout's eggs repositories, we
-  set `newest` to false and `offline` to true in this case.
   """
   buildout = {
     'buildout': {
@@ -39,39 +35,12 @@ def makeRecipe(recipe_class, options, name='test', slap_connection=None):
   if slap_connection is not None:
     buildout['slap-connection'] = slap_connection
 
-  # are we in buildout folder ?
-  # in SLAPOS-EGG-TEST the usual layout is
-  # ${buildout:directory}/parts/slapos-repository/slapos/test/utils.py in instance buildout, so try
-  # to find a buildout.cfg relative to this file.
-  # What can also happens is that this repository is used from software folder, this is the case in
-  # SLAPOS-SR-TEST. In this case, ${buildout:eggs} is not set in buildout.cfg and we can only assume
-  # it will be the standards eggs and develop-eggs folders.
+  buildout['buildout']['eggs-directory'] = os.environ['SLAPOS_TEST_EGGS_DIRECTORY']
+  buildout['buildout']['develop-eggs-directory'] = os.environ['SLAPOS_TEST_DEVELOP_EGGS_DIRECTORY']
 
-  # {BASE_DIRECTORY}/parts/slapos-repository/slapos/test/utils.py
-  base_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))
-  buildout_cfg = os.path.join(base_directory, 'buildout.cfg')
+  # Prevent test from accidentally writing to the buildout's eggs
+  buildout['buildout']['newest'] = False
+  buildout['buildout']['offline'] = True
 
-  if os.path.exists(buildout_cfg):
-    with open(buildout_cfg) as f:
-      parsed_cfg = parse(f, buildout_cfg)
-
-    # When buildout_cfg is an instance buildout (like in SLAPOS-EGG-TEST),
-    # there's a ${buildout:eggs-directory} we can use.
-    # When buildout_cfg is a software buildout, we can only guess the
-    # standard eggs directories.
-    eggs_directory = parsed_cfg['buildout'].get(
-      'eggs-directory', os.path.join(base_directory, 'eggs'))
-    develop_eggs_directory = parsed_cfg['buildout'].get(
-      'develop-eggs-directory', os.path.join(base_directory, 'develop-eggs'))
-
-    logging.getLogger(__name__).info(
-        'Using eggs-directory (%s) and develop-eggs-directory (%s) from buildout at %s',
-        eggs_directory,
-        develop_eggs_directory,
-        buildout_cfg)
-    buildout['buildout']['eggs-directory'] = eggs_directory
-    buildout['buildout']['develop-eggs-directory'] = develop_eggs_directory
-    buildout['buildout']['newest'] = False
-    buildout['buildout']['offline'] = True
   return recipe_class(buildout=buildout, name=name, options=options)
 

software/backupserver/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 851262d7174da868805cb7c8e1ced7c0
 
 [template-backup-script]
 filename = template-backup-script.sh.in
-md5sum = 4c75f8462eaef2d8fcf24627e5f3575a
+md5sum = 3f3286347a7e271e7bfa66e1a840989b
 
 [template-crontab-line]
 filename = template-crontab-line.in
@@ -46,8 +46,8 @@ md5sum = ae4a0043414336a521b524d9c95f1c68
 
 [template-pullrdiffbackup]
 filename = instance-pullrdiffbackup.cfg.in
-md5sum = c1f00c251298c2ab7fd095e7c4571d3b
+md5sum = f2e6f30a0e8228cbfb93eaaae10fe884
 
 [template]
 filename = instance.cfg.in
-md5sum = 42021b325159dff29e4bd4e33b8ff2f3
+md5sum = 3df515def97f1e8a9f181514ae6ef03f

software/backupserver/instance-pullrdiffbackup.cfg.in

@@ -194,9 +194,9 @@ virtual-depends =
 
 [nginx-listen-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = nginx_listen.py
-config-hostname = $${nginx-configuration:ip}
+config-host = $${nginx-configuration:ip}
 config-port = $${nginx-configuration:port}
 
 [nginx-configuration]
@@ -206,7 +206,7 @@ output = $${directory:etc}/nginx.cfg
 mode = 0600
 access_log = $${directory:log}/nginx-access.log
 error_log = $${directory:log}/nginx-error.log
-ip = $${slap-network-information:global-ipv6}
+ip = {{ partition_ipv6 }}
 port = 9443
 ssl_key = $${directory:ssl}/nginx.key
 ssl_csr = $${directory:ssl}/nginx.csr

software/backupserver/instance.cfg.in

@@ -13,32 +13,21 @@ rendered = $${buildout:parts-directory}/$${:_buildout_section_name_}/$${:filenam
 filename = instance-pullrdiffbackup.cfg
 extensions = jinja2.ext.do
 context =
-    key slave_instance_list instance-parameter:slave-instance-list
+    key slave_instance_list slap-configuration:slave-instance-list
+# partition_ipv6 is the random ipv6 allocated to the local partition
+    key partition_ipv6 slap-configuration:ipv6-random
 
 [switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = $${:pullrdiffbackup}
-# pullrdiffbackup = ${template-pullrdiffbackup:output}
-pullrdiffbackup = $${dynamic-template-pullrdiffbackup:rendered}
+recipe = slapos.cookbook:switch-softwaretype
+RootSoftwareInstance = $${:pullrdiffbackup}
+pullrdiffbackup = dynamic-template-pullrdiffbackup:rendered
 
-[slap-connection]
-# part to migrate to new - separated words
-computer-id = $${slap_connection:computer_id}
-partition-id = $${slap_connection:partition_id}
-server-url = $${slap_connection:server_url}
-software-release-url = $${slap_connection:software_release_url}
-key-file = $${slap_connection:key_file}
-cert-file = $${slap_connection:cert_file}
-
-# [slap-parameter]
-# slave-instance-list = []
-
-[instance-parameter]
+[slap-configuration]
 # Fetches parameters defined in SlapOS Master for this instance.
 # Always the same.
 recipe = slapos.cookbook:slapconfiguration.serialised
-computer = $${slap_connection:computer_id}
-partition = $${slap_connection:partition_id}
-url = $${slap_connection:server_url}
-key = $${slap_connection:key_file}
-cert = $${slap_connection:cert_file}
+computer = $${slap-connection:computer-id}
+partition = $${slap-connection:partition-id}
+url = $${slap-connection:server-url}
+key = $${slap-connection:key-file}
+cert = $${slap-connection:cert-file}

software/backupserver/software.cfg

@@ -16,7 +16,6 @@ extends =
   ../../stack/monitor/buildout.cfg
 
 parts =
-  rdiff-backup
   dcron
   logrotate
   nginx
@@ -102,7 +101,4 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [versions]
-rdiff-backup = 1.0.5+SlapOSPatched001
 gunicorn = 19.1.1
-plone.recipe.command = 1.1
-PyRSS2Gen = 1.1

software/backupserver/template-backup-script.sh.in

@@ -13,7 +13,7 @@ ${coreutils-output:echo} "Available only if backup succeed." > $${:statistic_log
 # set -e
 cd $${:datadirectory}
 ${util-linux:location}/bin/flock $${:status_log}.lock \
-  ${rdiff-backup-output:rdiff-backup} \
+  ${rdiff-backup-1.0.5:location}/bin/rdiff-backup \
   $${:exclude_string} \
   --include='$${:include}' \
   --exclude='**' \
@@ -26,7 +26,7 @@ RESULT=$?
 if [ $RESULT -eq 0 ]
 then
   ${coreutils-output:echo} "`${coreutils-output:date} --iso-8601=seconds -u`, $${:statistic_log}, $${:hostname}, backup success" >> $${:status_log}
-  ${findutils-output:find} rdiff-backup-data/ -maxdepth 1 -name "session_statistic*" | ${coreutils-output:sort} | ${coreutils-output:tail} -n 1 | ${findutils-output:xargs} ${rdiff-backup-output:rdiff-backup} --calculate-average > $${:statistic_log}
+  ${findutils-output:find} rdiff-backup-data/ -maxdepth 1 -name "session_statistic*" | ${coreutils-output:sort} | ${coreutils-output:tail} -n 1 | ${findutils-output:xargs} ${rdiff-backup-1.0.5:location}/bin/rdiff-backup --calculate-average > $${:statistic_log}
 else
   ${coreutils-output:echo} "`${coreutils-output:date} --iso-8601=seconds -u`, $${:statistic_log}, $${:hostname}, backup failed" >> $${:status_log}
 fi

software/caddy-frontend/buildout.hash.cfg

@@ -22,15 +22,15 @@ md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [profile-caddy-frontend]
 filename = instance-apache-frontend.cfg.in
-md5sum = a6a626fd1579fd1d4b80ea67433ca16a
+md5sum = 8507a2ace2f789b92c522cc62ca5aace
 
 [profile-caddy-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 1248911409cbeea980a838b04ee451d2
+md5sum = 8beb438d06bbb0f917d13e182fb12d17
 
 [profile-slave-list]
 _update_hash_filename_ = templates/apache-custom-slave-list.cfg.in
-md5sum = 8ce1d5bf09662d941f940be7e6493918
+md5sum = 613f777a08373088cbaf7f51fd18ea70
 
 [profile-replicate-publish-slave-information]
 _update_hash_filename_ = templates/replicate-publish-slave-information.cfg.in
@@ -38,7 +38,7 @@ md5sum = df304a8aee87b6f2425241016a48f7a5
 
 [profile-caddy-frontend-configuration]
 _update_hash_filename_ = templates/Caddyfile.in
-md5sum = 8cdc462956b6b492c14a53f987c0df5c
+md5sum = fdf46b1dee6ea6b91b9aa9e322a0530d
 
 [template-not-found-html]
 _update_hash_filename_ = templates/notfound.html
@@ -46,11 +46,11 @@ md5sum = 88af61e7abbf30dc99a1a2526161128d
 
 [template-default-slave-virtualhost]
 _update_hash_filename_ = templates/default-virtualhost.conf.in
-md5sum = a0ae858a3db8825c22d33d323392f588
+md5sum = 13cd08d630cc51666a9f7e469fb6ea52
 
 [template-backend-haproxy-configuration]
 _update_hash_filename_ = templates/backend-haproxy.cfg.in
-md5sum = 17f9582671327d8e4321a7fd1cdcb0fe
+md5sum = 5e126be0f74d8ae390a5594e1e912a59
 
 [template-empty]
 _update_hash_filename_ = templates/empty.in
@@ -62,7 +62,7 @@ md5sum = 975177dedf677d24e14cede5d13187ce
 
 [template-trafficserver-records-config]
 _update_hash_filename_ = templates/trafficserver/records.config.jinja2
-md5sum = b99403e02d1aff471a7d5ebd0afbdb6c
+md5sum = 88a2db868720009f6092843784b06611
 
 [template-trafficserver-storage-config]
 _update_hash_filename_ = templates/trafficserver/storage.config.jinja2
@@ -70,7 +70,7 @@ md5sum = d022455a8610bac2dd51101edb035987
 
 [template-trafficserver-logging-yaml]
 _update_hash_filename_ = templates/trafficserver/logging.yaml.jinja2
-md5sum = 45f379e887de07d2b86de2f43937f856
+md5sum = 368b271215a92594ca9e2fa3102d484f
 
 [template-nginx-eventsource-slave-virtualhost]
 _update_hash_filename_ = templates/nginx-eventsource-slave.conf.in
@@ -106,11 +106,11 @@ md5sum = 38792c2dceae38ab411592ec36fff6a8
 
 [profile-kedifa]
 filename = instance-kedifa.cfg.in
-md5sum = 3daebc4b37088fa01183a853920d4143
+md5sum = 16901e9eeb0d4f87e708ad91e7756f12
 
 [template-backend-haproxy-rsyslogd-conf]
 _update_hash_filename_ = templates/backend-haproxy-rsyslogd.conf.in
-md5sum = 3ec9e088817f6a0e3b3b71919590e6b3
+md5sum = 3336d554661b138dcef97b1d1866803c
 
 [template-slave-introspection-httpd-nginx]
 _update_hash_filename_ = templates/slave-introspection-httpd-nginx.conf.in

software/caddy-frontend/instance-apache-frontend.cfg.in

@@ -466,7 +466,9 @@ target = ${trafficserver-directory:configuration}
 recipe = slapos.cookbook:wrapper
 command-line = {{ software_parameter_dict['trafficserver'] }}/bin/traffic_manager
 wrapper-path = ${trafficserver-variable:wrapper-path}
-environment = TS_ROOT=${buildout:directory}
+environment =
+  TS_ROOT=${buildout:directory}
+  PROXY_CONFIG_CONFIG_DIR=${trafficserver-directory:configuration}
 hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [trafficserver-reload]
@@ -508,7 +510,7 @@ filename = logging.yaml
 {%- raw %}
 template = inline:
   map /HTTPS/ http://{{ ipv4 }}:{{ https_port }}
-  map / http://{{ ipv4 }}:{{ http_port }}
+  map /HTTP/ http://{{ ipv4 }}:{{ http_port }}
 {%- endraw %}
 extra-context =
   raw ipv4 {{ instance_parameter_dict['ipv4-random'] }}
@@ -533,9 +535,9 @@ context =
 
 [trafficserver-promise-listen-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = trafficserver-port-listening.py
-config-hostname = ${trafficserver-variable:local-ip}
+config-host = ${trafficserver-variable:local-ip}
 config-port = ${trafficserver-variable:input-port}
 
 [trafficserver-ctl]
@@ -653,44 +655,44 @@ config-verification-script = ${promise-helper-last-configuration-state:rendered}
 
 [promise-caddy-frontend-v4-https]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = caddy_frontend_ipv4_https.py
-config-hostname = {{ instance_parameter_dict['ipv4-random'] }}
+config-host = {{ instance_parameter_dict['ipv4-random'] }}
 config-port = ${configuration:port}
 
 [promise-caddy-frontend-v4-http]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = caddy_frontend_ipv4_http.py
-config-hostname = {{ instance_parameter_dict['ipv4-random'] }}
+config-host = {{ instance_parameter_dict['ipv4-random'] }}
 config-port = ${configuration:plain_http_port}
 
 [promise-caddy-frontend-v6-https]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = caddy_frontend_ipv6_https.py
-config-hostname = {{ instance_parameter_dict['ipv6-random'] }}
+config-host = {{ instance_parameter_dict['ipv6-random'] }}
 config-port = ${configuration:port}
 
 [promise-caddy-frontend-v6-http]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = caddy_frontend_ipv6_http.py
-config-hostname = {{ instance_parameter_dict['ipv6-random'] }}
+config-host = {{ instance_parameter_dict['ipv6-random'] }}
 config-port = ${configuration:plain_http_port}
 
 [promise-backend-haproxy-http]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = backend_haproxy_http.py
-config-hostname = {{ instance_parameter_dict['ipv4-random'] }}
+config-host = {{ instance_parameter_dict['ipv4-random'] }}
 config-port = ${backend-haproxy-configuration:http-port}
 
 [promise-backend-haproxy-https]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = backend_haproxy_https.py
-config-hostname = {{ instance_parameter_dict['ipv4-random'] }}
+config-host = {{ instance_parameter_dict['ipv4-random'] }}
 config-port = ${backend-haproxy-configuration:https-port}
 
 [backend-haproxy-configuration]
@@ -979,9 +981,9 @@ context =
 
 [promise-slave-introspection-https]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = slave_introspection_https.py
-config-hostname = {{ instance_parameter_dict['ipv6-random'] }}
+config-host = {{ instance_parameter_dict['ipv6-random'] }}
 config-port = ${frontend-configuration:slave-introspection-https-port}
 
 [logrotate-entry-slave-introspection]

software/caddy-frontend/instance-apache-replicate.cfg.in

@@ -474,6 +474,7 @@ kedifa = ${request-kedifa:connection-monitor-base-url}
 recipe = slapos.cookbook:mkdirectory
 bin = ${buildout:directory}/bin/
 srv = ${buildout:directory}/srv/
+tmp = ${buildout:directory}/tmp/
 backup = ${:srv}/backup
 # CAUCASE directories
 caucased = ${:srv}/caucased
@@ -864,14 +865,14 @@ rendered = ${directory:etc}/nginx-rejected-slave.conf
 
 [promise-rejected-slave-publish-ip-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = rejected-slave-publish-ip-port-listening.py
-config-hostname = ${rejected-slave-publish-configuration:ip}
+config-host = ${rejected-slave-publish-configuration:ip}
 config-port = ${rejected-slave-publish-configuration:port}
 
 [rejected-slave-promise]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 module = check_file_state
 name = rejected-slave.py
 config-filename = ${rejected-slave-json:rendered}
@@ -887,9 +888,10 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
       backup_dir='${directory:backup-caucased}',
       data_dir='${directory:caucased}',
       netloc=caucase_netloc,
+      tmp='${directory:tmp}',
       service_auto_approve_count=0,
       user_auto_approve_count=1,
-      key_len=2048,
+      key_len=2048
 )}}
 
 [buildout]

software/caddy-frontend/instance-kedifa.cfg.in

@@ -41,9 +41,10 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
       backup_dir='${directory:backup-caucased}',
       data_dir='${directory:caucased}',
       netloc=caucase_netloc,
+      tmp='${directory:tmp}',
       service_auto_approve_count=0,
       user_auto_approve_count=1,
-      key_len=2048,
+      key_len=2048
 )}}
 
 # Create all needed directories
@@ -192,9 +193,9 @@ template = inline:
 
 [promise-expose-csr_id-ip-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = expose-csr_id-ip-port-listening.py
-config-hostname = ${expose-csr_id-configuration:ip}
+config-host = ${expose-csr_id-configuration:ip}
 config-port = ${expose-csr_id-configuration:port}
 
 [expose-csr_id]

software/caddy-frontend/software.cfg

@@ -6,7 +6,6 @@ extends =
   ../../component/caddy/buildout.cfg
   ../../component/gzip/buildout.cfg
   ../../component/logrotate/buildout.cfg
-  ../../component/rdiff-backup/buildout.cfg
   ../../component/trafficserver/buildout.cfg
   ../../component/6tunnel/buildout.cfg
   ../../component/xz-utils/buildout.cfg
@@ -20,7 +19,6 @@ extends =
 parts +=
   caucase-eggs
   template
-  rdiff-backup
   caddyprofiledeps
   kedifa-develop
   kedifa
@@ -234,7 +232,6 @@ ecdsa = 0.13
 gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
-rdiff-backup = 1.0.5+SlapOSPatched001
 smmap = 0.9.0
 
 websockify = 0.8.0

software/caddy-frontend/templates/Caddyfile.in

@@ -7,10 +7,10 @@ import {{ slave_configuration_directory }}/*.conf
   bind {{ local_ipv4 }}
   status 404 /
   log / {{ access_log }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {
-    rotate_size 0
+    rotate_size 10000000
   }
   errors {{ error_log }} {
-    rotate_size 0
+    rotate_size 10000000
     * {{ not_found_file }}
   }
 }
@@ -19,10 +19,10 @@ import {{ slave_configuration_directory }}/*.conf
   bind {{ local_ipv4 }}
   status 404 /
   log / {{ access_log }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {
-    rotate_size 0
+    rotate_size 10000000
   }
   errors {{ error_log }} {
-    rotate_size 0
+    rotate_size 10000000
     * {{ not_found_file }}
   }
 }
@@ -38,10 +38,10 @@ https://[{{ global_ipv6 }}]:{{ https_port }}/server-status, https://{{ local_ipv
   expvar
   pprof
   log / {{ access_log }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {
-    rotate_size 0
+    rotate_size 10000000
   }
   errors {{ error_log }} {
-    rotate_size 0
+    rotate_size 10000000
     * {{ not_found_file }}
   }
 }

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -5,7 +5,7 @@
 {%- set frontend_slave_list = [] %}
 {%- set part_list = [] %}
 {%- set cache_port = caddy_configuration.get('cache-port') %}
-{%- set cache_access = "http://%s:%s" % (instance_parameter_dict['ipv4-random'], cache_port) %}
+{%- set cache_access = "http://%s:%s/HTTP" % (instance_parameter_dict['ipv4-random'], cache_port) %}
 {%- set ssl_cache_access = "http://%s:%s/HTTPS" % (instance_parameter_dict['ipv4-random'], cache_port) %}
 {%- set backend_haproxy_http_url = 'http://%s:%s' % (instance_parameter_dict['ipv4-random'], backend_haproxy_configuration['http-port']) %}
 {%- set backend_haproxy_https_url = 'http://%s:%s' % (instance_parameter_dict['ipv4-random'], backend_haproxy_configuration['https-port']) %}
@@ -633,9 +633,9 @@ template = inline:
 
 [promise-expose-csr_id-ip-port]
 <= monitor-promise-base
-module = check_port_listening
+module = check_socket_listening
 name = expose-csr_id-ip-port-listening.py
-config-hostname = ${expose-csr_id-configuration:ip}
+config-host = ${expose-csr_id-configuration:ip}
 config-port = ${expose-csr_id-configuration:port}
 
 [expose-csr_id]

software/caddy-frontend/templates/backend-haproxy-rsyslogd.conf.in

@@ -16,7 +16,7 @@ $Umask 0022
 $WorkDirectory {{ configuration['spool-directory'] }}
 
 # Setup logging per slave, by extracting the slave name from the log stream
-{%- set regex = ".*-backend (.*)-http.{0,1}/" %}
+{%- set regex = ".*-backend (.*)-http.{0,1}(|-failover)/" %}
 template(name="extract_slave_name" type="string" string="%msg:R,ERE,1,FIELD:{{ regex }}--end%")
 set $!slave_name = exec_template("extract_slave_name");
 template(name="slave_output" type="string" string="{{ configuration['caddy-log-directory'] }}/%$!slave_name%_backend_log")

software/caddy-frontend/templates/backend-haproxy.cfg.in

@@ -120,7 +120,7 @@ backend {{ slave_instance['slave_reference'] }}-{{ scheme }}
 {%-           endif %}
 {%-           do active_check_option_list.append('timeout check %ss' % (slave_instance['health-check-timeout'])) %}
 {%-         endif %}
-  server {{ slave_instance['slave_reference'] }}-backend {{ hostname }}:{{ port }} {{ ' '.join(ssl_list) }} {{ ' ' + ' '.join(active_check_list)}}
+  server {{ slave_instance['slave_reference'] }}-backend-{{ scheme }} {{ hostname }}:{{ port }} {{ ' '.join(ssl_list) }} {{ ' ' + ' '.join(active_check_list)}}
 {%-         for active_check_option in active_check_option_list %}
   {{ active_check_option }}
 {%-         endfor %}
@@ -162,7 +162,7 @@ backend {{ slave_instance['slave_reference'] }}-{{ scheme }}-failover
   timeout server {{ slave_instance['request-timeout'] }}s
   timeout connect {{ slave_instance['backend-connect-timeout'] }}s
   retries {{ slave_instance['backend-connect-retries'] }}
-  server {{ slave_instance['slave_reference'] }}-backend {{ hostname }}:{{ port }} {{ ' '.join(ssl_list) }}
+  server {{ slave_instance['slave_reference'] }}-backend-{{ scheme }} {{ hostname }}:{{ port }} {{ ' '.join(ssl_list) }}
 {%-         if path %}
   http-request set-path {{ path }}%[path]
 {%-         endif %}

software/caddy-frontend/templates/default-virtualhost.conf.in

@@ -59,11 +59,11 @@
   } {# tls #}
 {%- endif %} {#- if tls #}
   log / {{ slave_parameter['access_log'] }} "{remote} - {>REMOTE_USER} [{when}] \"{method} {uri} {proto}\" {status} {size} \"{>Referer}\" \"{>User-Agent}\" {latency_ms}" {
-    rotate_size 0
+    rotate_size 10000000
   }
 
   errors {{ slave_parameter['error_log'] }} {
-    rotate_size 0
+    rotate_size 10000000
   }
 
 {%- if not (slave_parameter['type'] == 'zope' and backend_url) %}