.

component/apache-php/buildout.cfg

@@ -24,11 +24,14 @@ extends =
   ../icu/buildout.cfg
   ../openssl/buildout.cfg
   ../libnsl/buildout.cfg
+  ../sqlite3/buildout.cfg
+  ../oniguruma/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 [php-redis]
 recipe = slapos.recipe.cmmi
-url = https://github.com/phpredis/phpredis/archive/5.0.0.tar.gz
-md5sum = 4f11e0567a10c29394aae52a4fa8bb40
+url = https://github.com/phpredis/phpredis/archive/refs/tags/6.0.1.tar.gz
+md5sum = 99dd5f16bac2b0c2ec049ce21e346705
 configure-command =
   phpize && ./configure
 environment =
@@ -36,12 +39,10 @@ environment =
 
 [php-imagick]
 recipe = slapos.recipe.cmmi
-url = https://github.com/Imagick/imagick/archive/3.4.4.tar.gz
-md5sum = ef6cbadd834eb306bd91874a8f5dea03
+url = https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz
+md5sum = 4dbe07a2ef15d3c9e4c54d5685bdfbc9
 configure-command =
   phpize && ./configure
-configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
 environment =
   PKG_CONFIG_PATH=${imagemagick:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:${imagemagick:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${m4:location}/bin:${apache-php:location}/bin:%(PATH)s
@@ -49,8 +50,8 @@ environment =
 
 [php-apcu]
 recipe = slapos.recipe.cmmi
-url = https://github.com/krakjoe/apcu/archive/v5.1.17.tar.gz
-md5sum = f64b6cd5108aea63df2d5cc301c58b2b
+url = https://github.com/krakjoe/apcu/archive/refs/tags/v5.1.22.tar.gz
+md5sum = 3c4c70004d1ac0e56487fcdcbb045ff6
 configure-command =
   phpize && ./configure
 configure-options =
@@ -65,58 +66,43 @@ shared = false
 
 [apache-php]
 recipe = slapos.recipe.cmmi
-url = https://www.php.net/distributions/php-7.3.6.tar.bz2
-md5sum = bde9a912fb311182cd460dad1abbc247
+url = https://www.php.net/distributions/php-8.2.11.tar.xz
+md5sum = 8e7f61ff53fd36be68643080c5114df9
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --disable-static
+  --disable-zend-test
+  --enable-exif
+  --enable-ftp
+  --enable-gd
+  --enable-intl
+  --enable-mbstring
+  --enable-pcntl
+  --enable-session
   --with-apxs2=${apache:location}/bin/apxs
-  --with-libxml-dir=${libxml2:location}
-  --with-mysql=${mariadb:location}
-  --with-zlib-dir=${zlib:location}
   --with-bz2=${bzip2:location}
-  --with-gd
-  --with-jpeg-dir=${libjpeg:location}
-  --with-png-dir=${libpng:location}
-  --enable-gd-native-ttf
-  --with-freetype-dir=${freetype:location}
-  --with-pdo-mysql=mysqlnd
-  --with-mysqli=mysqlnd
-  --with-curl=${curl:location}
-  --with-imap=${cclient:location}
-  --with-iconv-dir=${libiconv:location}
+  --with-curl
   --with-gettext=${gettext:location}
-  --with-ldap=${openldap:location}
   --with-imap-ssl
+  --with-imap=${cclient:location}
+  --with-ldap=${openldap:location}
+  --with-mysqli=mysqlnd
   --with-openssl=${openssl:location}
-  --with-libzip=${libzip:location}
-  --with-icu-dir=${icu:location}
-  --with-password-argon2=${argon2:location}
-  --enable-apcu-bc
-  --enable-intl
-  --enable-libxml
-  --enable-json
-  --enable-mbstring
-  --enable-pcntl
-  --enable-session
-  --enable-exif
-  --enable-ftp
-  --enable-zip
-  --disable-zend-test
-  --disable-static
+  --with-pdo-mysql=mysqlnd
+  --with-zip
+  --with-zlib
 
 # 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:${libzip:location}/lib/pkgconfig
-  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${curl:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig:${oniguruma:location}/lib/pkgconfig:${argon2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${mariadb:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libiconv:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:${xz-utils: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${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib
-  TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
+  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${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib
+  TMPDIR=@@LOCATION@@
   HOME=${apache:location}
 
 [xml-rpc]
 recipe = slapos.recipe.cmmi
-url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz
+url = https://github.com/gggeek/phpxmlrpc/releases/download/2.2.2/xmlrpc-2.2.2.tar.gz
 md5sum = 59a644c636c6d98267d0c99b406ae9e8

component/busybox/buildout.cfg

-[buildout]
-extends =
-  ../patch/buildout.cfg
-
-parts = busybox
-
-[busybox]
-recipe = slapos.recipe.build
-url = http://git.busybox.net/busybox/snapshot/busybox-1_20_2.tar.gz
-md5sum = 025acebb48040ef62dd635d416d317e8
-patches =
-    ${:_profile_base_location_}/busybox-1_20_2.patch#292498db86c46e101bb14bf2c74c36f0
-install =
-    env = self.environ
-    extract_dir = self.extract(self.download(options['url'], options['md5sum']))
-    workdir = guessworkdir(extract_dir)
-    self.applyPatchList(options.get('patches'), '-p1', cwd=workdir)
-    self.logger.info("Creating default configuration")
-    call(['make', 'defconfig'], cwd=workdir, env=env)
-    self.logger.info("Building")
-    call(['make'], cwd=workdir, env=env)
-    self.logger.info("Installing")
-    call(['make', 'CONFIG_PREFIX=' + location, 'install'], cwd=workdir, env=env)
-    self.logger.info("Installation finished")
-environment =
-  PATH=${patch:location}/bin:%(PATH)s

component/busybox/busybox-1_20_2.patch

-diff --git a/include/libbb.h b/include/libbb.h
-index f12800f..e7806c2 100644
---- a/include/libbb.h
-+++ b/include/libbb.h
-@@ -40,6 +40,7 @@
- #include <sys/poll.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-+#include <sys/resource.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/time.h>

component/ca-certificates/buildout.cfg

@@ -16,7 +16,7 @@ url = https://deb.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_
 md5sum = fc1c3ec0067385f0be8ac7f6e670a0f8
 patch-binary = ${patch:location}/bin/patch
 patches =
-  ${:_profile_base_location_}/ca-certificates-any-python.patch#c13b44dfc3157dda13a9a2ff97a9d501
+  ${:_profile_base_location_}/ca-certificates-any-python.patch#56ecfeb8f23ae00726191a611d08894e
   ${:_profile_base_location_}/ca-certificates-mkdir-p.patch#02ed8a6d60c39c4b088657888af345ef
   ${:_profile_base_location_}/ca-certificates-no-cryptography.patch#14ad1308623b0d15420906ae3d9b4867
 patch-options = -p0
@@ -24,3 +24,5 @@ configure-command = true
 make-targets = install DESTDIR=@@LOCATION@@ CERTSDIR=certs SBINDIR=sbin
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
+pre-make-hook =
+  ${:_profile_base_location_}/ca-certificates-pre-make-hook.py#89d64d612e143638b7b264be4b129798:pre_make_hook

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

@@ -9,15 +9,3 @@
          in_multiline = False
          continue
      if line.startswith('CKA_CLASS'):
---- mozilla/Makefile	2015-12-20 10:49:23.000000000 +0100
-+++ mozilla/Makefile	2016-01-05 20:19:11.006874271 +0100
-@@ -3,7 +3,8 @@
- #
- 
- all:
--	python3 certdata2pem.py
-+	for x in 3 '' 2; do type python$$x && break; done >/dev/null \
-+	&& python$$x certdata2pem.py
- 
- clean:
- 	-rm -f *.crt

component/ca-certificates/ca-certificates-pre-make-hook.py

+import sys
+
+# Because ca-certificate is used very early in the bootstrap process,
+# even before python is built, we can not use the software release python
+# yet, because it would loop forever in slapos.rebootstrap.
+# By using sys.executable in a hook like this, we can use python without
+# buildout recording a dependency to python in the part options.
+def pre_make_hook(options, buildout, environ):
+  with open('mozilla/Makefile') as f:
+    makefile = f.read()
+  makefile = makefile.replace('python3 certdata2pem.py', '%s certdata2pem.py' % sys.executable)
+  with open('mozilla/Makefile', 'w') as f:
+    f.write(makefile)

component/corosync/buildout.cfg

-[buildout]
-extends =
-  nss.cfg
-parts =
-  corocosync
-
-[corosync]
-recipe = slapos.recipe.cmmi
-url = ftp://ftp:downloads@corosync.org/downloads/corosync-1.3.1/corosync-1.3.1.tar.gz
-md5sum = c58459a009a3a9d0b9c00e276a190d90
-environment =
-  CPPFLAGS=-I${nspr:location}/include/nspr -I${nss:location}/include/nss
-  PKG_CONFIG_PATH=${nss:location}/lib/pkgconfig:${nspr:location}/lib/pkgconfig
-  LDFLAGS =-L${nspr:location}/lib -Wl,-rpath=${nspr:location}/lib -L${nss:location}/lib -Wl,-rpath=${nss:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib

component/cups/buildout.cfg

@@ -10,7 +10,7 @@ extends =
 [cups]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.cups.org/software/1.7.4/cups-1.7.4-source.tar.bz2
+url = https://github.com/apple/cups/releases/download/release-1.7.4/cups-1.7.4-source.tar.bz2
 md5sum = 1a2295c2b2d2f422db2e50f40ed2fb99
 configure-options =
   --disable-static

component/curl/buildout.cfg

@@ -19,8 +19,8 @@ parts =
 [curl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://curl.se/download/curl-8.0.1.tar.xz
-md5sum = f6c2fdeb30ad30234378a56c28350845
+url = https://curl.se/download/curl-8.4.0.tar.bz2
+md5sum = 1a61fde1fe5c7db5c29c1196435188a5
 configure-options =
   --disable-static
   --disable-ech

component/embulk/buildout.cfg

-[buildout]
-parts = embulk 
-
-[embulk]
-recipe = slapos.recipe.build:download
-url = https://dl.bintray.com/embulk/maven/embulk-0.9.7.jar
-md5sum = 05f41d3750ec359fc10c1dc3e30f238e
-filename = embulk.jar

component/flex/buildout.cfg

@@ -9,8 +9,10 @@ parts =
 [flex]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://downloads.sourceforge.net/project/flex/flex-2.6.0.tar.xz
-md5sum = 3cbbfa1554d0b75fad9f8100732454de
+url = https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
+md5sum = 2882e3179748cc9f9c23ec593d6adc8d
 environment =
   M4=${m4:location}/bin/m4
   PATH=${bison:location}/bin:${xz-utils:location}/bin:%(PATH)s
+# CFLAGS to workaround https://github.com/westes/flex/issues/442
+  CFLAGS=-g -O2 -D_GNU_SOURCE

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

-From 90950c10cf6bfcba777a5b22cdcd3b54b4043d35 Mon Sep 17 00:00:00 2001
+From 2a3dd1d84cf45bb78f1b42deab5a8386932c0802 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
-Date: Tue, 20 Sep 2022 23:10:16 +0900
+Date: Sun, 15 Oct 2023 09:39:33 +0900
 Subject: [PATCH] slapos: don't try to install system startup script
 
 in slapos context we don't write to system directories when installing
 packages
 ---
- src/CMakeLists.txt | 21 ---------------------
- 1 file changed, 21 deletions(-)
+ src/CMakeLists.txt | 27 ---------------------------
+ 1 file changed, 27 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 630f875bf..388c72ab1 100644
+index b6233d9f7..9b3d395ba 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -477,27 +477,6 @@ if(FLB_BINARY)
+@@ -515,33 +515,6 @@ if(FLB_BINARY)
        DESTINATION "${FLB_INSTALL_BINDIR}")
    endif()
  
 -  # Detect init system, install upstart, systemd or init.d script
--  if(IS_DIRECTORY /lib/systemd/system)
+-
+-  # Handle issues with detection on some systems during build
+-  if(NOT SYSTEMD_UNITDIR AND IS_DIRECTORY /lib/systemd/system)
+-    set(SYSTEMD_UNITDIR  /lib/systemd/system)
+-  endif()
+-  
+-  if(SYSTEMD_UNITDIR)
 -    set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
 -    configure_file(
 -      "${PROJECT_SOURCE_DIR}/init/systemd.in"
 -      ${FLB_SYSTEMD_SCRIPT}
 -      )
--    install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION /lib/systemd/system)
+-    install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
 -    install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
 -  elseif(IS_DIRECTORY /usr/share/upstart)
 -    set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
@@ -42,4 +48,5 @@ index 630f875bf..388c72ab1 100644
      install(FILES
        "${PROJECT_SOURCE_DIR}/conf/fluent-bit-win32.conf"
 -- 
-2.37.0
+2.40.1
+

component/fluent-bit/buildout.cfg

 [buildout]
 extends =
-  ../cmake/buildout.cfg
   ../bison/buildout.cfg
+  ../cmake/buildout.cfg
   ../flex/buildout.cfg
+  ../libyaml/buildout.cfg
+  ../openssl/buildout.cfg
   ../patch/buildout.cfg
 
 [fluent-bit]
 recipe = slapos.recipe.cmmi
-url = https://github.com/fluent/fluent-bit/archive/refs/tags/v1.9.8.tar.gz
-md5sum = a0973b739f1d1f0daaa503b077760cd7
+shared = true
+url = https://github.com/fluent/fluent-bit/archive/refs/tags/v2.1.10.tar.gz
+md5sum = 1608fdb463f19d3add5e9f17e2eb1f7d
 configure-command =
   ${cmake:location}/bin/cmake
 configure-options =
-  -DFLB_CONFIG_YAML=Off .
   -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DFLB_LIBYAML_DIR=${libyaml:location}
+  -DOPENSSL_ROOT_DIR=${openssl:location}
 environment =
   PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s
+  LDFLAGS=-Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${openssl:location}/lib
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/0001-slapos-don-t-try-to-install-system-startup-script.patch#c071d1aefe0adbc6c96bbdf92d9dbb29
+  ${:_profile_base_location_}/0001-slapos-don-t-try-to-install-system-startup-script.patch#7bf6e1b53c371db918dcc3778c6b28ed
 patch-binary = ${patch:location}/bin/patch

component/glibmm/buildout.cfg

@@ -6,6 +6,7 @@ extends =
   ../meson/buildout.cfg
   ../ninja/buildout.cfg
   ../perl/buildout.cfg
+  ../python3/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
@@ -20,7 +21,7 @@ pkg_config_depends = ${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}:$
 configure-command = ${meson:location}/bin/meson builddir --libdir=lib -Dprefix=@@LOCATION@@
 make-binary = ninja -C builddir
 environment =
-  PATH=${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${glib:location}/bin:${ninja:location}/bin:%(PATH)s
+  PATH=${python3:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${glib:location}/bin:${ninja:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CPPFLAGS=-I${gettext:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${libsigc:location}/lib -Wl,-rpath=@@LOCATION@@/lib

component/gtk-2/buildout.cfg

@@ -14,6 +14,7 @@ extends =
   ../libtool/buildout.cfg
   ../m4/buildout.cfg
   ../perl/buildout.cfg
+  ../python3/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../xorg/buildout.cfg
   ../icu/buildout.cfg
@@ -81,7 +82,7 @@ configure-options =
   --disable-static
   --disable-gtk-doc-html
 environment =
-  PATH=${glib:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${glib:location}/bin:${python3:location}/bin:${freetype:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   LDFLAGS=-Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${harfbuzz:location}/lib -Wl,-rpath=${glib:location}/lib
 
@@ -94,7 +95,7 @@ configure-command = ${meson:location}/bin/meson builddir --wrap-mode=nodownload
 make-binary = ninja -C builddir
 pkg_config_depends = ${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${libpng:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${libtiff:location}/lib/pkgconfig
 environment =
-  PATH=${glib:location}/bin:${perl:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${libpng:location}/bin%(PATH)s
+  PATH=${glib:location}/bin:${perl:location}/bin:${python3:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${libpng:location}/bin%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CFLAGS=-I${gettext:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${libtiff:location}/lib -Wl,-rpath=${libjpeg:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=@@LOCATION@@/lib
@@ -107,7 +108,7 @@ md5sum = 4dcea15cbf166706c166fc4fee05e3f8
 configure-command = ${meson:location}/bin/meson builddir --wrap-mode=nodownload --libdir=lib -Dprefix=@@LOCATION@@ -Ddocs=false -Dintrospection=false
 make-binary = ninja -C builddir
 environment =
-  PATH=${glib:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${glib:location}/bin:${python3:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}
   CFLAGS=-I${gettext:location}/include
   LDFLAGS=-L${gettext:location}/lib -lintl -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${glib:location}/lib
@@ -127,7 +128,7 @@ configure-options =
   --disable-xinerama
   --disable-gtk-doc-html
 environment =
-  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${python3:location}/bin:${gdk-pixbuf:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
 # not taken from pkg-config result...
   CPPFLAGS=-I${gettext:location}/include -I${libX11:location}/include/ -I${xproto:location}/include -I${xorgproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include

component/gtk-3/buildout.cfg

@@ -11,6 +11,7 @@ extends =
   ../meson/buildout.cfg
   ../nodejs/buildout.cfg
   ../ninja/buildout.cfg
+  ../python3/buildout.cfg
   ../xorg/buildout.cfg
 
 [at-spi2-core]
@@ -21,7 +22,7 @@ md5sum = 3da5fe62a653e49dad1c47f9a46fee56
 configure-options =
   --disable-gtk-doc-html
 environment =
-  PATH=${dbus:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${perl-XML-Parser:perl-PATH}:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${dbus:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${perl-XML-Parser:perl-PATH}:${pkgconfig:location}/bin:${xz-utils:location}/bin:${python3:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${glib:pkg_config_depends}
   CPPFLAGS=-I${inputproto:location}/include -I${xorgproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${libXtst:location}/include -I${xextproto:location}/include -I${xproto:location}/include
   LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXi:location}/lib -Wl,-rpath=${libXi:location}/lib -L${libXtst:location}/lib -Wl,-rpath=${libXtst:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${glib:location}/lib
@@ -68,7 +69,7 @@ configure-options =
   --enable-xcomposite
   --enable-xdamage
 environment =
-  PATH=${gdk-pixbuf:location}/bin:${gettext:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gdk-pixbuf:location}/bin:${gettext:location}/bin:${glib:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:${python3:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
 # not taken from pkg-config result...
   CPPFLAGS=-I${cairo:location}/include -I${inputproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${xproto:location}/include -I${xorgproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include -I${libX11:location}/include  -I${libXinerama:location}/include -I${gdk-pixbuf:location}/include -I${libXrandr:location}/include -I${xfixes:location}/include -I${libXcomposite:location}/include -I${xdamage:location}/include

component/inkscape/buildout.cfg

@@ -20,10 +20,11 @@ extends =
   ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
+  ../python3/buildout.cfg
   ../popt/buildout.cfg
   ../xorg/buildout.cfg
   ../zlib/buildout.cfg
-# Inkscape < 1.1 only supports python2 and old gcc
+# Inkscape < 1.1 only supports old gcc and needs python2 (and python3)
   ../python-2.7/buildout.cfg
   ../defaults.cfg
 
@@ -58,7 +59,7 @@ configure-options =
   -DWITH_LIBVISIO=OFF
   -DWITH_LIBWPG=OFF
 environment =
-  PATH=${cmake:location}/bin:${freetype:location}/bin:${gdk-pixbuf:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${libxml2:location}/bin:${pango:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
+  PATH=${cmake:location}/bin:${freetype:location}/bin:${gdk-pixbuf:location}/bin:${gettext:location}/bin:${glib:location}/bin:${intltool:location}/bin:${libxml2:location}/bin:${pango:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${python3:location}/bin:${python2.7:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CMAKE_INCLUDE_PATH=${boost-lib:location}/include:${freetype:location}/include:${garbage-collector:location}/include:${libjpeg:location}/include:${lcms2:location}/include:${libpng:location}/include:${zlib:location}/include
   CMAKE_LIBRARY_PATH=${boost-lib:location}/lib:${freetype:location}/lib:${garbage-collector:location}/lib:${lcms2:location}/lib:${libjpeg:location}/lib:${libpng:location}/lib:${zlib:location}/lib

component/jsl/buildout.cfg

-# jsl - command line javascript lint
-# http://javascriptlint.com/
-
-[buildout]
-parts = jsl
-
-[jsl]
-recipe = slapos.recipe.build
-url = https://src.fedoraproject.org/repo/pkgs/rpms/jsl/jsl-0.3.0-src.tar.gz/${:md5sum}/jsl-0.3.0-src.tar.gz
-md5sum = 2b94ffa4fab07acabe0c5e73cd49bcdf
-init =
-  import os
-# Bypass slapos gcc if any because slapos ld can't find -lm (why?).
-  self.path = os.environ['PATH']
-install =
-  import os
-  import sys
-  url = options['url']
-  md5sum = options['md5sum']
-  extract_dir = self.extract(self.download(url, md5sum))
-  workdir = guessworkdir(extract_dir)
-  call(('make', '-f', 'Makefile.ref', '-j1', 'DIST=' + location, 'all', 'export'),
-    cwd=os.path.join(workdir, 'src'), env=dict(os.environ, PATH=self.path))

component/lynx/buildout.cfg

-[buildout]
-parts = lynx
-
-[lynx]
-recipe = slapos.recipe.cmmi
-md5sum = 124253e635f7c76bdffc47b9d036c812
-url = http://lynx.isc.org/lynx2.8.7/lynx2.8.7.tar.gz

component/ngtcp2/buildout.cfg

@@ -8,8 +8,8 @@ extends =
 [ngtcp2]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/ngtcp2/ngtcp2/archive/refs/tags/v0.13.1.tar.gz
-md5sum = 52a58aadbaf195cebff0289adda0e8db
+url = https://github.com/ngtcp2/ngtcp2/archive/refs/tags/v0.19.1.tar.gz
+md5sum = 52da88163ad1929496f7ed13943c03b4
 pre-configure =
   autoreconf -fisv -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal
   automake

component/nullmailer/buildout.cfg

-[buildout]
-parts = nullmailer
-
-[nullmailer]
-recipe = slapos.recipe.cmmi
-url = http://untroubled.org/nullmailer/nullmailer-1.05.tar.gz
-md5sum = 35124cc05f893efba1310e2ec7c876ff

component/open62541/buildout.cfg

@@ -5,6 +5,7 @@ parts = open62541
 extends =
   ../cmake/buildout.cfg
   ../patch/buildout.cfg
+  ../python3/buildout.cfg
   ../defaults.cfg
 
 [gcc]
@@ -30,4 +31,4 @@ configure-options =
 post-install =
   cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include
 environement =
-  PATH=${patch:location}/bin:%(PATH)s
+  PATH=${python3:location}/bin:${patch:location}/bin:%(PATH)s

component/opencv/buildout.cfg

@@ -4,6 +4,9 @@ extends =
   ../java-jdk/buildout.cfg
   ../cmake/buildout.cfg
   ../libjpeg/buildout.cfg
+  ../python-2.7/buildout.cfg
+  ../python3/buildout.cfg
+  ../defaults.cfg
 parts =
   opencv
 
@@ -57,7 +60,7 @@ post-install =
   cp build/lib/libopencv_java430.so @@LOCATION@@/lib
   cp build/bin/opencv-430.jar @@LOCATION@@/bin
 environment =
-  PATH=${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${python3:location}/bin/:${python2.7:location}/bin/:${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libjpeg-turbo2:location}/lib/pkgconfig
   JAVA_HOME=${java-jdk:location}
   JRE_HOME=${java-re:location}

component/perl/0001-Fix-missing-build-dependency-for-pods.patch

-From 26cf06121b03ef60fd49af6f0f56e743b332f6b0 Mon Sep 17 00:00:00 2001
-From: Dan Dedrick <ddedrick@lexmark.com>
-Date: Thu, 12 Oct 2017 21:49:39 -0400
-Subject: [PATCH] Fix missing build dependency for pods
-
-When building perl with highly parallel options (e.g. -j 32) on a machine
-with many cores (e.g. 32) ocassionaly it fails with the following type
-of error.
-
-make[1]: Entering directory '.../cpan/podlators'
-Can't locate Getopt/Long.pm in @INC (you may need to install the Getopt::Long module) (@INC contains: .../cpan/AutoLoader/lib .../dist/Carp/lib .../dist/PathTools .../dist/PathTools/lib .../cpan/ExtUtils-Install/lib .../cpan/ExtUtils-MakeMaker/lib .../cpan/ExtUtils-Manifest/lib .../cpan/File-Path/lib .../ext/re .../dist/Term-ReadLine/lib .../dist/Exporter/lib .../ext/File-Find/lib .../cpan/Text-Tabs/lib .../dist/constant/lib .../cpan/version/lib .../lib ../../lib .) at .../cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm line 109.
-Makefile:445: recipe for target 'manifypods' failed
-make[1]: *** [manifypods] Error 2
-
-The scripts pod2man, pod2text, podchecker, podselect, and pod2usage all use
-Getopt-Long and since they are all part of nonxs modules this needs to be
-added here to prevent these build races.
----
- write_buildcustomize.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/write_buildcustomize.pl b/write_buildcustomize.pl
-index 8666a6bce2..7a55405029 100644
---- a/write_buildcustomize.pl
-+++ b/write_buildcustomize.pl
-@@ -39,6 +39,7 @@ my @toolchain = qw(cpan/AutoLoader/lib
-                    cpan/Text-Tabs/lib
- 		   dist/constant/lib
- 		   cpan/version/lib
-+		   cpan/Getopt-Long/lib
- 		   );
- 
- # Text-ParseWords used only in ExtUtils::Liblist::Kid::_win32_ext()
-@@ -47,7 +48,6 @@ my @toolchain = qw(cpan/AutoLoader/lib
- push @toolchain, qw(
- 	cpan/Text-ParseWords/lib
- 	dist/ExtUtils-ParseXS/lib
--	cpan/Getopt-Long/lib
- 	cpan/parent/lib
- 	cpan/ExtUtils-Constant/lib
- ) if $^O eq 'MSWin32';
--- 
-2.13.6
-

component/perl/0002-prereq1.patch

-From b2cb17719c9233fbc9040ced04418be051c91c14 Mon Sep 17 00:00:00 2001
-From: Sawyer X <xsawyerx@cpan.org>
-Date: Fri, 27 Apr 2018 20:35:42 +0300
-Subject: Storable: fix for strawberry build failures:
-
-Provided by Graham @haarg Knop.
-
-Origin: upstream, https://perl5.git.perl.org/perl.git/commit/3f4cad1bbe7c6238adba5abb2415775a74eded4d
-Patch-Name: fixes/storable-probing/prereq1.diff
----
- dist/Storable/Makefile.PL | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL
-index 697750566..4f0213277 100644
---- a/dist/Storable/Makefile.PL
-+++ b/dist/Storable/Makefile.PL
-@@ -14,10 +14,12 @@ use File::Spec;
- 
- unlink "lib/Storable/Limit.pm";
- 
-+my $limit_pm = File::Spec->catfile('lib', 'Storable', 'Limit.pm');
-+
- my $pm = { 'Storable.pm' => '$(INST_ARCHLIB)/Storable.pm' };
- unless ($ENV{PERL_CORE}) {
-     # the core Makefile takes care of this for core builds
--    $pm->{"lib/Storable/Limit.pm"} = '$(INST_ARCHLIB)/Storable/Limit.pm';
-+    $pm->{$limit_pm} = '$(INST_ARCHLIB)/Storable/Limit.pm';
- }
- 
- WriteMakefile(
-@@ -91,7 +93,6 @@ sub depend {
-         $extra_deps = ' Storable.pm';
-     }
-     my $linktype = uc($_[0]->{LINKTYPE});
--    my $limit_pm = File::Spec->catfile('lib', 'Storable', 'Limit.pm');
-     "
- $limit_pm : stacksize \$(INST_$linktype)$extra_deps
- 	\$(MKPATH) \$(INST_LIB)
-@@ -111,7 +112,7 @@ sub test {
-     my $out = $self->SUPER::test(%attr);
- 
-     if ($ENV{PERL_CORE}) {
--        $out =~ s!^(test(?:db)?_(?:static|dynamic)\b.*)!$1 lib/Storable/Limit.pm!gm;
-+        $out =~ s!^(test(?:db)?_(?:static|dynamic)\b.*)!$1 $limit_pm!gm;
-     }
- 
-     $out;

component/perl/0003-prereq2.patch

-From cece912f1d5e5e80dc8d64364b0ddc4bf729bd85 Mon Sep 17 00:00:00 2001
-From: Tony Cook <tony@develop-help.com>
-Date: Mon, 30 Jul 2018 21:00:52 +1000
-Subject: (perl #133411) don't try to load Storable with -Dusecrosscompile
-
-Origin: https://perl5.git.perl.org/perl.git/commit/edf639fce3e8c8852ee4179ab902b357b1deba98
-Bug: https://rt.perl.org/Public/Bug/Display.html?id=133411
-Patch-Name: fixes/storable-probing/prereq2.diff
----
- dist/Storable/Makefile.PL |  9 ++++++++-
- dist/Storable/stacksize   | 10 +++++++---
- 2 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL
-index 4f0213277..69efc8294 100644
---- a/dist/Storable/Makefile.PL
-+++ b/dist/Storable/Makefile.PL
-@@ -92,11 +92,18 @@ sub depend {
-         # blib.pm needs arch/lib
-         $extra_deps = ' Storable.pm';
-     }
-+    my $whichperl;
-+    if ($Config::Config{usecrosscompile}) {
-+        $whichperl = '$(PERLRUN)';
-+    }
-+    else {
-+        $whichperl = '$(FULLPERLRUNINST)';
-+    }
-     my $linktype = uc($_[0]->{LINKTYPE});
-     "
- $limit_pm : stacksize \$(INST_$linktype)$extra_deps
- 	\$(MKPATH) \$(INST_LIB)
--	\$(FULLPERLRUNINST) stacksize $options
-+	$whichperl stacksize $options
- 
- release : dist
- 	git tag \$(VERSION)
-diff --git a/dist/Storable/stacksize b/dist/Storable/stacksize
-index 7abd3a84c..14e073973 100644
---- a/dist/Storable/stacksize
-+++ b/dist/Storable/stacksize
-@@ -7,6 +7,9 @@ use Cwd;
- use File::Spec;
- use strict;
- 
-+-d "lib" or mkdir "lib";
-+-d "lib/Storable" or mkdir "lib/Storable";
-+
- my $fn = "lib/Storable/Limit.pm";
- my $ptrsize = $Config{ptrsize};
- my ($bad1, $bad2) = (65001, 25000);
-@@ -29,6 +32,10 @@ sub is_miniperl {
- }
- 
- if (is_miniperl()) {
-+    if ($Config{usecrosscompile}) {
-+        write_limits(500, 265);
-+        exit;
-+    }
-     die "Should not run during miniperl\n";
- }
- my $prefix = "";
-@@ -68,9 +75,6 @@ if ($ENV{PERL_CORE}) {
-     }
- }
- 
---d "lib" or mkdir "lib";
---d "lib/Storable" or mkdir "lib/Storable";
--
- if ($^O eq "MSWin32") {
-     require Win32;
-     my ($str, $major, $minor) = Win32::GetOSVersion();

component/perl/buildout.cfg

 [buildout]
 extends =
   ../gdbm/buildout.cfg
-  ../patch/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
   perl
@@ -9,17 +8,10 @@ parts =
 [perl]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 5.28.1
-url = http://www.cpan.org/src/5.0/perl-${:version}.tar.xz
-md5sum = fbb590c305f2f88578f448581b8cf9c4
+version = 5.38.0
+url = https://www.cpan.org/src/5.0/perl-${:version}.tar.xz
+md5sum = e1c8aaec897dd386c741f97eef9f2e87
 siteprefix =@@LOCATION@@/site_${:_buildout_section_name_}
-patch-options = -p1
-patches =
-  ${:_profile_base_location_}/perl-keep-linker-flags-in-ldflags.patch#4e8e0c59d7176eafb0c7402dea17bef1
-  ${:_profile_base_location_}/0001-Fix-missing-build-dependency-for-pods.patch#85aff81f3bea34fcd6ce9a611ee1cdb2
-  ${:_profile_base_location_}/0002-prereq1.patch#c9bf3b521a39134d044eaa2c2312174f
-  ${:_profile_base_location_}/0003-prereq2.patch#5268ff6dd06718cff34e6fb758045996
-  ${:_profile_base_location_}/0004-disable-probing.patch#e68446ccd155c2282639e495a5be612b
 configure-command =
   sh Configure -des \
     -Dprefix=@@LOCATION@@ \
@@ -30,7 +22,7 @@ configure-command =
     -Dnoextensions=ODBM_File \
     -Dusethreads
 environment =
-  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${xz-utils:location}/bin:%(PATH)s
 post-make-hook = ${:_profile_base_location_}/perl-create-libs-symlink.py#8a2cae20c74f93c2bab2c82564aeeaca:post_make_hook
 
 

component/perl/perl-keep-linker-flags-in-ldflags.patch

---- perl-5.20.0/Configure.orig	2014-05-28 15:27:22.865060361 +0200
-+++ perl-5.20.0/Configure	2014-05-28 15:32:14.297064994 +0200
-@@ -8277,16 +8277,7 @@
- 	case "$dflt" in
- 	    none) dflt='' ;;
- 	esac
--	for thisflag in $ldflags; do
--	    case "$thisflag" in
--		-L*|-R*|-Wl,-R*)
--		    case " $dflt " in
--			*" $thisflag "*) ;;
--			*) dflt="$dflt $thisflag" ;;
--		    esac
--		    ;;
--	    esac
--	done
-+	dflt="$dflt $ldflags"
- 
- 	case "$dflt" in
- 	    ''|' ') dflt='none' ;;

component/pole/buildout.cfg

-[buildout]
-parts =
-  pole
-
-[pole]
-recipe = slapos.recipe.cmmi
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-url = https://bitbucket.org/dimin/pole/get/c15e513.tar.gz
-md5sum = 691a5d80863df868804c5a9defa0c8a6
-configure-command = true
-make-binary =
-make-options =
-make-targets = true
-post-install =
-  set -x
-  mkdir bin
-  cd pole
-  g++ -o ../bin/poledump pole.cpp poledump.cpp
-  mv ../bin '${:location}'

component/pytracemalloc/buildout.cfg

+[buildout]
+parts =
+  pytracemalloc
+
+[pytracemalloc]
+recipe = zc.recipe.egg:custom
+find-links = https://github.com/vstinner/pytracemalloc/archive/refs/tags/pytracemalloc-1.2.tar.gz
+egg = pytracemalloc

component/rpm2cpio/buildout.cfg

@@ -3,8 +3,8 @@ parts =
   rpm2cpio
 
 [rpm2cpio]
-# https://github.com/ruda/rpm2cpio
+# https://github.com/yuseitahara/rpm2cpio
 recipe = slapos.recipe.build:download
 shared = true
-url = https://raw.githubusercontent.com/ruda/rpm2cpio/5afad4b65e4661a771db6f728abefe2c1e84b9ae/rpm2cpio.py
-md5sum = 1cb52f9030304c2b7625657b2ef2379e
+url = https://raw.githubusercontent.com/yuseitahara/rpm2cpio/68501e007adefc65a147a805d214082ee09b460b/rpm2cpio.py
+md5sum = 744f200d8bd1652791638133ff91b40f

component/sheepstrike/buildout.cfg

-[buildout]
-parts = sheepstrike
-
-[sheepstrike]
-recipe = slapos.recipe.cmmi
-url = https://gitorious.org/sheepstrike/sheepstrike/archive-tarball/0.1
-md5sum = 2c5009eb7c32d7ba5d270d0b88d7e5ab
-prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
-configure-options = --prefix=${:prefix}
-configure-command =
-  ./bootstrap
-  ./configure

component/zeromq/buildout.cfg

-[buildout]
-extends =
-  ../libtool/buildout.cfg
-  ../util-linux/buildout.cfg
-
-[zeromq]
-<= zeromq3
-
-[zeromq3]
-recipe = slapos.recipe.cmmi
-url = http://download.zeromq.org/zeromq-3.2.3.tar.gz
-md5sum = 1abf8246363249baf5931a065ee38203
-configure-options = --without-documentation
-environment =
-  PATH=${libtool:location}/bin:%(PATH)s
-  LDFLAGS=-L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib
-
-[zeromq2]
-recipe = slapos.recipe.cmmi
-url = http://download.zeromq.org/zeromq-2.2.0.tar.gz
-md5sum = 1b11aae09b19d18276d0717b2ea288f6
-configure-options =
-  --without-documentation
-environment =
-  PATH=${libtool:location}/bin:%(PATH)s
-  CXXFLAGS=-I${libuuid:location}/include
-  LDFLAGS=-L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib

setup.py

@@ -91,7 +91,6 @@ setup(name=name,
           'copyfilelist = slapos.recipe.copyfilelist:Recipe',
           'cron = slapos.recipe.dcron:Recipe',
           'cron.d = slapos.recipe.dcron:Part',
-          'davstorage = slapos.recipe.davstorage:Recipe',
           'dropbear = slapos.recipe.dropbear:Recipe',
           'dropbear.add_authorized_key = slapos.recipe.dropbear:AddAuthorizedKey',
           'dropbear.client = slapos.recipe.dropbear:Client',

slapos/recipe/davstorage/__init__.py

-##############################################################################
-#
-# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-import subprocess
-from six.moves import http_client as httplib
-import base64
-import os
-import shutil
-
-from slapos.recipe.librecipe import GenericBaseRecipe
-
-class Recipe(GenericBaseRecipe):
-
-  def _options(self, options):
-    options['password'] = self.generatePassword()
-
-  def install(self):
-    path_list = []
-
-    htpasswd_file = self.options['htpasswd-file']
-    # Create or empty the file
-    open(htpasswd_file, 'w').close()
-    path_list.append(htpasswd_file)
-
-    user = self.options['user']
-    password = self.options['password']
-    subprocess.check_call([self.options['apache-htpasswd'],
-                           '-bc', htpasswd_file,
-                           user, password
-                          ])
-
-    htdocs_location = self.options['htdocs']
-    if not (os.path.exists(htdocs_location) and os.listdir(htdocs_location)):
-      try:
-        os.rmdir(htdocs_location)
-      except:
-        pass
-      shutil.copytree(self.options['source'], htdocs_location)
-
-    # Install php.ini
-    php_ini = self.createFile(os.path.join(self.options['php-ini-dir'],
-                                             'php.ini'),
-                                self.substituteTemplate(self.getTemplateFilename('php.ini.in'),
-                                dict(tmp_directory=self.options['tmp-dir']))
-                )
-    path_list.append(php_ini)
-    
-    apache_config = dict(
-      pid_file=self.options['pid-file'],
-      lock_file=self.options['lock-file'],
-      davlock_db=self.options['davdb-lock'],
-      ip=self.options['ip'],
-      port_webdav=self.options['port_webdav'],
-      port_ajax=self.options['port_ajax'],
-      error_log=self.options['error-log'],
-      access_log=self.options['access-log'],
-      document_root=self.options['htdocs'],
-      modules_dir=self.options['apache-modules-dir'],
-      mime_types=self.options['apache-mime-file'],
-      server_root=self.options['root'],
-      email_address=self.options['email-address'],
-      htpasswd_file=htpasswd_file,
-      ssl_certificate=self.options['cert-file'],
-      ssl_key=self.options['key-file'],
-      php_ini_dir=self.options['php-ini-dir']
-    )
-
-    # Create logfiles
-    for log in [self.options['error-log'], self.options['access-log']]:
-      open(log, 'a').close()
-
-    config_file = self.createFile(self.options['conf-file'],
-       self.substituteTemplate(self.getTemplateFilename('httpd.conf.in'),
-                               apache_config)
-    )
-    path_list.append(config_file)
-
-    wrapper = self.createWrapper(self.options['wrapper'],
-      (self.options['apache-binary'], '-f', config_file, '-DFOREGROUND'))
-    path_list.append(wrapper)
-
-    promise = self.createPythonScript(self.options['promise'],
-      __name__ + '.promise',
-      (self.options['ip'], int(self.options['port_webdav']),
-       self.options['user'], self.options['password']))
-    path_list.append(promise)
-
-    return path_list
-
-def promise(host, port, user, password):
-  connection = httplib.HTTPSConnection(host, port)
-  auth = base64.b64encode('%s:%s' % (user, password))
-  connection.request('OPTIONS', '/',
-                     headers=dict(
-                       Authorization='Basic %s' % auth,
-                     )
-                    )
-  connection.getresponse()
-
-  return 0

slapos/recipe/davstorage/template/httpd.conf.in

-ServerRoot "%(server_root)s"
-
-Listen [%(ip)s]:%(port_webdav)s
-Listen [%(ip)s]:%(port_ajax)s
-
-NameVirtualHost [%(ip)s]:%(port_webdav)s
-NameVirtualHost [%(ip)s]:%(port_ajax)s
-
-# Needed modules
-LoadModule unixd_module "%(modules_dir)s/mod_unixd.so"
-LoadModule access_compat_module "%(modules_dir)s/mod_access_compat.so"
-LoadModule authn_core_module "%(modules_dir)s/mod_authn_core.so"
-LoadModule authz_core_module "%(modules_dir)s/mod_authz_core.so"
-LoadModule authn_file_module "%(modules_dir)s/mod_authn_file.so"
-LoadModule authz_host_module "%(modules_dir)s/mod_authz_host.so"
-LoadModule authz_user_module "%(modules_dir)s/mod_authz_user.so"
-LoadModule auth_basic_module "%(modules_dir)s/mod_auth_basic.so"
-# Comment auth_digest since we don't use it
-#LoadModule auth_digest_module "%(modules_dir)s/mod_auth_digest.so"
-LoadModule log_config_module "%(modules_dir)s/mod_log_config.so"
-LoadModule headers_module "%(modules_dir)s/mod_headers.so"
-LoadModule setenvif_module "%(modules_dir)s/mod_setenvif.so"
-LoadModule socache_shmcb_module "%(modules_dir)s/mod_socache_shmcb.so"
-LoadModule ssl_module "%(modules_dir)s/mod_ssl.so"
-LoadModule mime_module "%(modules_dir)s/mod_mime.so"
-LoadModule dav_module "%(modules_dir)s/mod_dav.so"
-LoadModule dav_fs_module "%(modules_dir)s/mod_dav_fs.so"
-LoadModule dir_module "%(modules_dir)s/mod_dir.so"
-LoadModule php5_module "%(modules_dir)s/libphp5.so"
-
-ServerAdmin %(email_address)s
-
-# Quiet Server header (if not, Apache give its life history)
-# It's safer
-ServerTokens ProductOnly
-PidFile "%(pid_file)s"
-PHPINIDir "%(php_ini_dir)s"
-
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin
-
-<VirtualHost [%(ip)s]:%(port_ajax)s>
-  #ServerName www.example.com
-  
-  # Directory protection
-  <Directory />
-      Options FollowSymLinks
-      AllowOverride None
-      Require all denied
-  </Directory>
-  
-  <Directory %(document_root)s>
-    Options FollowSymLinks
-    AllowOverride All
-    Require all granted
-  </Directory>
- 
-  DocumentRoot "%(document_root)s"
-  DirectoryIndex index.html index.php
-
-SSLEngine on
-SSLCertificateFile "%(ssl_certificate)s"
-SSLCertificateKeyFile "%(ssl_key)s"
-
-</VirtualHost>
-
-<VirtualHost [%(ip)s]:%(port_webdav)s>
-DocumentRoot "%(document_root)s"
-DavLockDB "%(davlock_db)s"
-
-<Directory />
-    Options FollowSymLinks
-    AllowOverride None
-    Order deny,allow
-    Deny from all
-</Directory>
-
-<Directory %(document_root)s>
-    Options Indexes MultiViews
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-
-    Dav On
-    # Security Rules to avoid DDoS Attacks
-    DavDepthInfinity Off
-    LimitXMLRequestBody 0
-
-    # Cross-Origin Resources Sharing
-    Header always set Access-Control-Max-Age "0"
-    Header always set Access-Control-Allow-Origin "*"
-    Header always set Access-Control-Allow-Methods "OPTIONS, GET, HEAD, POST, PUT, DELETE, PROPFIND"
-    Header always set Access-Control-Allow-Headers "Content-Type, X-Requested-With, X-HTTP-Method-Override, Accept, Authorization, Depth"
-    SetEnvIf Origin "(.+)" ORIGIN=$1
-    Header always set Access-Control-Allow-Origin %%{ORIGIN}e
-
-    AuthType Basic
-    AuthName "WebDAV Storage"
-    AuthUserFile "%(htpasswd_file)s"
-    <LimitExcept OPTIONS>
-        Require valid-user
-    </LimitExcept>
-
-</Directory>
-
-SSLEngine on
-SSLCertificateFile "%(ssl_certificate)s"
-SSLCertificateKeyFile "%(ssl_key)s"
-
-</VirtualHost>
-
-ErrorLog "%(error_log)s"
-LogLevel warn
-
-LogFormat "%%h %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
-LogFormat "%%h %%l %%u %%t \"%%r\" %%>s %%b" common
-CustomLog "%(access_log)s" common
-
-DefaultType text/plain
-TypesConfig "%(mime_types)s"
-AddType application/x-compress .Z
-AddType application/x-gzip .gz .tgz
-AddType application/x-httpd-php .php .phtml .php5 .php4
-AddType application/x-httpd-php-source .phps

slapos/recipe/davstorage/template/php.ini.in

-[PHP]
-engine = On
-safe_mode = Off
-expose_php = Off
-error_reporting = E_ALL & ~(E_DEPRECATED|E_NOTICE|E_WARNING)
-display_errors = On
-display_startup_errors = Off
-log_errors = On
-log_errors_max_len = 1024
-ignore_repeated_errors = Off
-ignore_repeated_source = Off
-session.save_path = "%(tmp_directory)s"
-session.auto_start = 0
-date.timezone = Europe/Paris
-file_uploads = On
-upload_max_filesize = 8M
-post_max_size = 8M
-magic_quotes_gpc=Off
-output_buffering=Off

software/erp5/test/test/benchmarks.py

@@ -162,6 +162,9 @@ class TestOrderBuildPackingListSimulation(
     zope_count = len(zope_memory_info_list)
 
     # Database size
+    if self.isNEO():
+      root_fs_size = zeo_root_stats = 'N/A'
+    else:
       root_fs = pathlib.Path(
        self.getComputerPartitionPath('zodb')) / 'srv' / 'zodb' / 'root.fs'
       root_fs_size = root_fs.stat().st_size
@@ -255,6 +258,7 @@ class TestOrderBuildPackingListSimulation(
         self.take_measurements(f"iteration_{i+1:03}")
 
       # final measurements, take a "zodb analyze" snapshot
+      if not self.isNEO():
         zodb_cmd = pathlib.Path(
           self.computer_partition_root_path
         ) / 'software_release' / 'bin' / 'zodb'

software/erp5/upgrade_test/test.py

@@ -46,7 +46,7 @@ from slapos.testing.testcase import (
   makeModuleSetUpAndTestCaseClass,
 )
 
-old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.8/software/erp5/software.cfg'
+old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.9/software/erp5/software.cfg'
 new_software_release_url = os.path.abspath(
   os.path.join(os.path.dirname(__file__), '..', 'software.cfg'))
 

software/matomo/software.cfg

 [buildout]
 extends =
   buildout.hash.cfg
-# LAMP stands for Linux, Apache, MySQL, PHP
   ../../stack/lamp/buildout.cfg
-# "slapos" stack describes basic things needed for 99.9% of SlapOS Software
   ../../stack/slapos.cfg
-
   ../../component/diffutils/buildout.cfg
 
 parts =
-# Call installation of slapos.cookbook egg defined in stack/slapos.cfg (needed
-# in 99,9% of Slapos Software Releases)
   slapos-cookbook
-# to create file instance.cfg of all instances
   lamp-instance
 
-# download bas
-# inherited by modules that need to download files
 [matomo-download]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
@@ -24,12 +16,10 @@ url = ${:_profile_base_location_}/${:filename}
 # download matomo
 # The specific process of downloading and decompressing is defined in stack lamp
 [application]
-url = https://builds.matomo.org/matomo-4.7.1.zip
-md5sum = 8d592676bc2c0d51363ad7b2caf171fe
+url = https://builds.matomo.org/matomo-4.15.1.zip
+md5sum = d7d2c4f94cb77af859d0cee8e9e0dbdb
 archive-root = matomo
 
-# give the location of the instance-matomo.cfg fil
-# Without it the instance-matomo.cfg file will not be executed
 [custom-application-deployment]
 path = ${template-matomo-instance:output}
 part-list = matomo-backup.sh matomo-backup-cron

software/monitor/software.cfg

@@ -71,7 +71,7 @@ forcediphttpsadapter = 1.0.1
 miniupnpc = 2.0.2
 peewee = 3.14.4
 python-whois = 0.7.3
-future = 0.18.2
+future = 0.18.3
 
 # Build GCC with Fortran for OpenBLAS (scipy & numpy)
 [gcc]

software/neoppod/software-common.cfg

@@ -57,6 +57,7 @@ eggs = neoppod[admin, ctl, master]
   zope.testing
   coverage
   setproctitle
+  mock
 adapter-egg =
   ${python-mysqlclient:egg}
   PyMySQL

software/neoppod/software-zodb5.cfg → software/neoppod/software-zodb4.cfg

@@ -2,7 +2,4 @@
 extends = software.cfg
 
 [ZODB]
-major = 5
-
-[neoppod]
-eggs += mock
+major = 4

software/nextcloud/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template-nextcloud-install.sh]
 filename = nextcloud-install.sh.in
-md5sum = 094c26b177fdde69b41d81b89bab542b
+md5sum = 965cc84d4c8e39f06850fac361575647
 
 [template-nextcloud-config.json]
 filename = nextcloud-config.json.in
@@ -22,4 +22,4 @@ md5sum = 6f42f0a8c5e5c0c657541a65c4d9ee57
 
 [template-nextcloud-instance]
 filename = nextcloud-instance.cfg.in
-md5sum = e144dc4cdc3bd0a9be81ac0cc2cfdbd4
+md5sum = a59b081bd39f61c7361fdb6c54fc2039

software/nextcloud/nextcloud-install.sh.in

@@ -134,8 +134,10 @@ EOF
 php_cmd {{ parameter_dict['nextcloud'] }}/occ config:app:set richdocuments wopi_url --value="{{ parameter_dict.get('collabora-url', '') }}"
 php_cmd {{ parameter_dict['nextcloud'] }}/occ config:app:set spreed stun_servers --value="[\"{{ parameter_dict['stun-server'] }}\"]"
 php_cmd {{ parameter_dict['nextcloud'] }}/occ config:app:set spreed turn_servers --value="[{\"server\":\"{{ parameter_dict['turn-server'] }}\",\"secret\":\"{{ parameter_dict['turn-secret'] }}\",\"protocols\":\"udp,tcp\"}]"
-sed -i 's#useCronUpdates\s*=.*#useCronUpdates = false#g' {{ parameter_dict['data-dir'] }}/news/config/config.ini
+php_cmd {{ parameter_dict['nextcloud'] }}/occ config:app:set news useCronUpdates --value=false
 
 if [ -f "{{ parameter_dict['nextcloud'] }}/config/CAN_INSTALL" ]; then
   rm {{ parameter_dict['nextcloud'] }}/config/CAN_INSTALL
 fi
+
+date > {{ parameter_dict['nextcloud'] }}/.slapos-install-done

software/nextcloud/nextcloud-instance.cfg.in

@@ -105,6 +105,10 @@ input = inline:#!/bin/bash
     echo "Nextcloud is not installed.";
     exit 1;
   fi
+  if [ ! -f "${instance-parameter:nextcloud}/.slapos-install-done" ]; then
+    echo "Nextcloud is not configured.";
+    exit 1;
+  fi
 output = ${directory:bin}/check-nc-install
 mode = 744
 

software/nextcloud/software.cfg

@@ -9,8 +9,8 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
 
 [application]
-url = https://download.nextcloud.com/server/releases/nextcloud-16.0.3.tar.bz2
-md5sum = d81902d2dec5d547779bec6336a438be
+url = https://download.nextcloud.com/server/releases/nextcloud-27.1.2.tar.bz2
+md5sum = a23afb146993d7449b78395739f27742
 
 [template-nextcloud-install.sh]
 <= nc-download
@@ -46,37 +46,37 @@ shared = true
 
 [news-updater]
 <= nc-download-unpacked
-url = https://github.com/nextcloud/news-updater/archive/10.0.1.tar.gz
-md5sum = 37387199c0482e08d01e9294cd95eaad
+url = https://github.com/nextcloud/news-updater/archive/11.0.0.tar.gz
+md5sum = 1e75222638cab49d3f66b7c76394f104
 
 [nextcloud-app-spreed]
 <= nc-download-unpacked
-url = https://github.com/nextcloud/spreed/releases/download/v6.0.5/spreed-6.0.5.tar.gz
-md5sum = 002c09e543edc141f6ca848782573376
+url = https://github.com/nextcloud-releases/spreed/releases/download/v17.1.1/spreed-v17.1.1.tar.gz
+md5sum = 24e6be17fb232a3c18de5e9c0a03c7c3
 
 [nextcloud-app-richdocuments]
 <= nc-download-unpacked
-url = https://github.com/nextcloud/richdocuments/releases/download/v3.7.17/richdocuments.tar.gz
-md5sum = 5559cd14a4a0a93d2a39b260538839f8
+url = https://github.com/nextcloud/richdocuments/releases/download/v8.2.0/richdocuments.tar.gz
+md5sum = 1e9176b0f08670996488572aea081996
 
 [nextcloud-app-calendar]
 <= nc-download-unpacked
-url = https://github.com/nextcloud/calendar/releases/download/v1.7.3/calendar.tar.gz
-md5sum = ab398d943eb6939e3e71df5b1a1abf87
+url = https://github.com/nextcloud-releases/calendar/releases/download/v4.5.2/calendar-v4.5.2.tar.gz
+md5sum = 88adcbc34ef7e461f515ba96b82365d9
 
-[nextcloud-app-rainloop]
+[nextcloud-app-snappymail]
 <= nc-download-unpacked
-url = https://github.com/pierre-alain-b/rainloop-nextcloud/releases/download/6.1.4/rainloop.tar.gz
-md5sum = 7cefc3dd3bd52b42d381de7d7447691f
+url = https://snappymail.eu/repository/nextcloud/snappymail-2.29.1-nextcloud.tar.gz
+md5sum = b7500ea4e089d8a9e3fa381d6df3a3b0
 
 [nextcloud-app-news]
 <= nc-download-unpacked
-url = https://github.com/nextcloud/news/releases/download/14.2.2/news.tar.gz
-md5sum = f48d4b5dcbc078131bb86a4ae619da99
+url = https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz
+md5sum = 8e1a7e3e49e6dbd754bc1b9ff2f85371
 
 [nextcloud-apps]
 spreed = ${nextcloud-app-spreed:location}
 richdocuments = ${nextcloud-app-richdocuments:location}
 calendar = ${nextcloud-app-calendar:location}
-rainloop = ${nextcloud-app-rainloop:location}
+snappymail = ${nextcloud-app-snappymail:location}
 news = ${nextcloud-app-news:location}

software/nextcloud/test/test.py

@@ -279,10 +279,15 @@ class TestServices(NextCloudTestCase):
       "turn_servers"
     ])
     self.assertEqual(turn_config.strip(), b'[{"server":"","secret":"","protocols":"udp,tcp"}]')
-    news_config_file = os.path.join(self.partition_dir, 'srv/data/news/config/config.ini')
-    with open(news_config_file) as f:
-      config = f.read()
-    self.assertRegex(config, r"(useCronUpdates\s+=\s+false)")
+
+    news_config = subprocess.check_output([
+      php_bin,
+      occ,
+      "config:app:get",
+      "news",
+      "useCronUpdates"
+    ])
+    self.assertEqual(news_config.strip(), b'false')
 
 
 class TestNextCloudParameters(NextCloudTestCase):

software/osie-coupler/test/test.py

@@ -40,6 +40,5 @@ class OsieTestCase(SlapOSInstanceTestCase):
     return {"mode": 1}
 
   def test(self):
-    connexion_parameters = self.computer_partition.getConnectionParameterDict()
-    self.assertIn('opc_ua_port', connexion_parameters)
-    self.assertIn('interface', connexion_parameters)
+    parameter_dict = self.computer_partition.getConnectionParameterDict()
+    self.assertIn('url-ipv6', parameter_dict)

software/rapid-cdn/README.rst

@@ -18,10 +18,10 @@ Slaves of the root instance are sent as a parameter to requested frontends which
 
 These parameters are:
 
-  * ``-frontend-type`` : the type to deploy frontends with. (default to "default")
-  * ``-frontend-quantity`` : The quantity of frontends to request (default to "1")
+  * ``-frontend-type`` : the type to deploy frontends with. (defaults to "default")
+  * ``-frontend-quantity`` : The quantity of frontends to request (defaults to "1")
   * ``-frontend-i-state``: The state of frontend i
-  * ``-frontend-i-software-release-url``: Software release to be used for frontends, default to the current software release
+  * ``-frontend-i-software-release-url``: Software release to be used for frontends, defaults to the current software release
   * ``-frontend-config-i-foo``: Frontend i will be requested with parameter foo, supported parameters are:
     * ``ram-cache-size``
     * ``disk-cache-size``
@@ -451,8 +451,8 @@ There are two ways to achieve it:
 
 The issues during automatic bootstrap are:
 
- * rouge or hacked SlapOS Master can result with adding rouge frontend nodes to the cluster, which will be trusted, so it will be possible to fetch all certificates and keys from Kedifa or to login to backends
- * when new node is added there is short window, when rouge person is able to trick automatic signing, and have it's own node added
+ * rogue or hacked SlapOS Master can result with adding rogue frontend nodes to the cluster, which will be trusted, so it will be possible to fetch all certificates and keys from Kedifa or to login to backends
+ * when new node is added there is a short window during which rogue person is able to trick automatic signing, and have it's own node added
 
 In both cases promises will fail on node which is not able to get signed, but in case of Kedifa the damage already happened (certificates and keys are compromised). So in case if cluster administrator wants to stay on the safe side, both automatic bootstraps shall be turned off.
 

software/slapos-master/test/test/test_erp5.py

@@ -35,6 +35,7 @@ import re
 import http.server
 import multiprocessing
 import subprocess
+import unittest
 
 import psutil
 import requests
@@ -411,6 +412,7 @@ class TestDeploymentScriptInstantiation(ERP5InstanceTestCase):
     with cls.slap.instance_supervisor_rpc as instance_supervisor:
       return getattr(instance_supervisor, method)(*args, **kwargs)
 
+  @unittest.expectedFailure
   def test_ssl_auth(self):
     backend_apache_configuration_list = glob.glob(
       os.path.join(

software/slapos-sr-testing/software.cfg

@@ -274,7 +274,7 @@ setup = ${slapos.core-repository:location}
 
 [system-python-disabled]
 # An "intentionally broken" python command that should catch
-# accidental usage of things like #!/usr/bin/env python2
+# accidental usage of things like #!/usr/bin/env python
 recipe = zc.recipe.egg
 # we need an egg to generate a script, use the one from this part's recipe
 eggs = ${:recipe}
@@ -283,11 +283,12 @@ entry-points =
   python=${:eggs}:ignored
   python2=${:eggs}:ignored
   python2.7=${:eggs}:ignored
+  python3=${:eggs}:ignored
 scripts =
   python
   python2
-  python3
   python2.7
+  python3
 initialization =
   import sys
   print("Error: attempt to use system python", file=sys.stderr)

stack/erp5-zope2/buildout.cfg

@@ -48,7 +48,6 @@ extends =
   ../../component/bash/buildout.cfg
   ../../component/wget/buildout.cfg
   ../../component/aspell/buildout.cfg
-  ../../component/jsl/buildout.cfg
   ../../component/6tunnel/buildout.cfg
   ../../component/userhosts/buildout.cfg
   ../../component/postfix/buildout.cfg
@@ -258,7 +257,6 @@ link-binary =
   ${ghostscript:location}/bin/gs
   ${imagemagick:location}/bin/identify
   ${jpegoptim:location}/bin/jpegoptim
-  ${jsl:location}/bin/jsl
   ${mariadb:location}/bin/mysql
   ${mariadb:location}/bin/mysqldump
   ${openssl:location}/bin/openssl
@@ -567,7 +565,6 @@ eggs = ${neoppod:eggs}
   Jinja2
   jsonschema
   mechanize
-  mock
   oauthlib
   objgraph
   ${python-pynacl:egg}
@@ -850,9 +847,7 @@ z3c.etestbrowser = 3.0.1
 zope.testbrowser = 5.5.1
 WSGIProxy2 = 0.4.6
 WebTest = 2.0.33
-beautifulsoup4 = 4.8.2
 WebOb = 1.8.5
-soupsieve = 1.9.5
 eggtestinfo = 0.3
 
 oic = 0.15.1

stack/erp5/buildout.cfg

@@ -33,6 +33,7 @@ extends =
   ../../component/patch/buildout.cfg
   ../../component/pillow/buildout.cfg
   ../../component/pycrypto-python/buildout.cfg
+  ../../component/pytracemalloc/buildout.cfg
   ../../component/pysvn-python/buildout.cfg
   ../../component/python-ldap-python/buildout.cfg
   ../../component/scikit-learn/buildout.cfg
@@ -43,7 +44,6 @@ extends =
   ../../component/tesseract/buildout.cfg
   ../../component/w3m/buildout.cfg
   ../../component/poppler/buildout.cfg
-  ../../component/zabbix/buildout.cfg
   ../../component/sed/buildout.cfg
   ../../component/coreutils/buildout.cfg
   ../../component/grep/buildout.cfg
@@ -51,7 +51,6 @@ extends =
   ../../component/bash/buildout.cfg
   ../../component/wget/buildout.cfg
   ../../component/aspell/buildout.cfg
-  ../../component/jsl/buildout.cfg
   ../../component/6tunnel/buildout.cfg
   ../../component/userhosts/buildout.cfg
   ../../component/postfix/buildout.cfg
@@ -74,7 +73,6 @@ parts +=
   slapos-cookbook
   mroonga-mariadb
   tesseract
-  zabbix-agent
   .coveragerc
 
 # Buildoutish
@@ -261,7 +259,6 @@ link-binary =
   ${ghostscript:location}/bin/gs
   ${imagemagick:location}/bin/identify
   ${jpegoptim:location}/bin/jpegoptim
-  ${jsl:location}/bin/jsl
   ${mariadb:location}/bin/mysql
   ${mariadb:location}/bin/mysqldump
   ${openssl:location}/bin/openssl
@@ -559,7 +556,6 @@ eggs = ${neoppod:eggs}
   Jinja2
   jsonschema
   mechanize
-  mock
   oauthlib
   objgraph
   ${python-pynacl:egg}
@@ -600,7 +596,8 @@ eggs = ${neoppod:eggs}
   jedi
   yapf
   typing
-  pytracemalloc
+# Used for Python 2 only
+  ${pytracemalloc:egg}
   xlrd
   pydot
 
@@ -763,7 +760,6 @@ SOAPpy = 0.12.0nxd001
 alabaster = 0.7.12
 APacheDEX = 1.8
 Beaker = 1.11.0
-beautifulsoup4 = 4.8.2
 cloudpickle = 0.5.3
 cookies = 2.2.1
 dask = 0.18.1
@@ -842,7 +838,6 @@ rfc3987 = 1.3.8
 rsa = 3.4.2
 scikit-image = 0.14.0
 scipy = 0.19.0
-soupsieve = 1.9.5
 spyne = 2.12.14
 strict-rfc3339 = 0.7
 StructuredText = 2.11.1

stack/erp5/buildout.hash.cfg

@@ -86,7 +86,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = e6c94c2a48788683bf0d63d135a44932
+md5sum = 9e6440425167a506bd473a3697eaa9e6
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-zope.cfg.in

@@ -78,6 +78,7 @@ environment +=
   PATH=${binary-link:target-directory}:{{ parameter_dict['coreutils'] }}/bin:{{ parameter_dict['perl_dbd_mariadb_path'] }}
   TZ={{ slapparameter_dict['timezone'] }}
   MATPLOTLIBRC={{ parameter_dict['matplotlibrc'] }}
+  PYTHONUNBUFFERED=1
   INSTANCE_HOME=${:instance-home}
   CAUCASE={{ slapparameter_dict['caucase-url'] }}
   FONTCONFIG_FILE=${fontconfig-conf:output}

stack/lamp/apache.conf.in

@@ -82,4 +82,4 @@ LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule headers_module modules/mod_headers.so
 LoadModule deflate_module modules/mod_deflate.so
 LoadModule filter_module modules/mod_filter.so
-LoadModule php7_module modules/libphp7.so
+LoadModule php_module modules/libphp.so

stack/lamp/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 7854dd0edd48f2d91c16412c4a875ca4
 
 [instance-apache-php]
 filename = instance-apache-php.cfg.in
-md5sum = 9ab14922535d4d85e0db8602c47a707d
+md5sum = 1e4762a6a7631d517fb45c84f9c989fe
 
 [instance-lamp]
 filename = instance-lamp.cfg.jinja2.in
@@ -26,11 +26,11 @@ md5sum = 347ddf1516bf2ddb5f6fb23539382847
 
 [template-apache.conf]
 filename = apache.conf.in
-md5sum = 04080510698732d84122b464fdb08c6a
+md5sum = e49410f0a4bf28993a56bb28aff0a6f0
 
 [template-php.ini]
 filename = php.ini.in
-md5sum = 980f603c34fcb008ce73a9dde2dbceb3
+md5sum = bf21c6d68ef85ee7de090375424d0c5c
 
 [template-apache-httpd]
 filename = apache-httpd.conf.in

stack/lamp/instance-apache-php.cfg.in

@@ -215,7 +215,6 @@ php.post_max_size = 10240M
 php.session.cookie_secure = True
 php.max_execution_time = 1800
 php.max_input_time = 3600
-php.output_buffering = 'Off'
 php.max_file_uploads = 100
 
 [php-bin]

stack/lamp/php.ini.in

@@ -43,7 +43,7 @@ apc.ttl=7200
 apc.user_ttl=7200
 apc.gc_ttl=3600
 apc.num_files_hint=1024
-apc.enable_cli=0
+apc.enable_cli=1
 apc.max_file_size=5M
 apc.cache_by_default=1
 apc.use_request_time=1

stack/sheepdogtestbed.cfg

-[buildout]
-extends = 
-  ../component/lxml-python/buildout.cfg
-  ../component/sheepstrike/buildout.cfg
-
-parts =
-  eggs
-  sheepstrike
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  slapos.recipe.sheepdogtestbed
-  slapos.tool.nosqltester
-  slapos.tool.nosqltester_manager
-  slapos.tool.nosqltester_manager.sheepdog

stack/slapos.cfg

@@ -153,7 +153,9 @@ backports.functools-lru-cache = 1.6.1:whl
 backports.lzma = 0.0.14
 backports.shutil-get-terminal-size = 1.0.0
 bcrypt = 3.1.4
+beautifulsoup4 = 4.8.2
 bleach = 5.0.1
+blinker = 1.6.3:whl
 CacheControl = 0.12.6:whl
 cachetools = 5.3.1
 cattrs = 22.2.0
@@ -181,8 +183,9 @@ enum34 = 1.1.10
 erp5.util = 0.4.74
 et-xmlfile = 1.0.1
 exceptiongroup = 1.1.3:whl
+fastjsonschema = 2.18.1
 feedparser = 6.0.10
-Flask = 1.1.2
+Flask = 3.0.0:whl
 frozenlist = 1.4.0:whl
 funcsigs = 1.0.2
 functools32 = 3.2.3.post2
@@ -204,10 +207,10 @@ ipykernel = 5.3.4:whl
 ipython = 7.16.3
 ipython-genutils = 0.1.0
 ipywidgets = 6.0.0
-itsdangerous = 0.24
+itsdangerous = 2.1.2
 jdcal = 1.4
 jedi = 0.17.2
-Jinja2 = 2.11.3
+Jinja2 = 3.1.2:whl
 jsonschema = 4.17.3:whl
 jupyter = 1.0.0
 jupyter-client = 7.3.1
@@ -221,7 +224,7 @@ lockfile = 0.12.2:whl
 lsprotocol = 2023.0.0b1:whl
 lxml = 4.9.1
 manuel = 1.11.2
-MarkupSafe = 2.0.1
+MarkupSafe = 2.1.3
 matplotlib = 2.1.2
 meld3 = 1.0.2
 mistune = 0.8.4
@@ -231,8 +234,8 @@ mpmath = 1.0.0
 msgpack = 0.6.2
 multidict = 6.0.4
 nbclient = 0.5.1
-nbconvert = 6.0.7
-nbformat = 5.0.8
+nbconvert = 6.5.4
+nbformat = 5.9.2:whl
 nest-asyncio = 1.5.6
 netaddr = 0.7.19
 netifaces = 0.10.7
@@ -297,7 +300,7 @@ simplegeneric = 0.8.1
 singledispatch = 3.4.0.3
 six = 1.16.0
 slapos.cookbook = 1.0.329
-slapos.core = 1.10.3
+slapos.core = 1.10.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25
 slapos.rebootstrap = 4.5
@@ -308,6 +311,7 @@ slapos.toolbox = 0.139
 smmap = 5.0.0
 sniffio = 1.3.0
 sortedcontainers = 2.4.0
+soupsieve = 1.9.5
 statsmodels = 0.11.1
 stevedore = 1.21.0:whl
 subprocess32 = 3.5.4
@@ -315,8 +319,9 @@ supervisor = 4.1.0
 sympy = 1.1.1
 terminado = 0.9.1
 testpath = 0.4.4
+tinycss2 = 1.2.1:whl
 tornado = 6.1
-traitlets = 5.0.5
+traitlets = 5.11.2:whl
 trio = 0.22.0
 trio-websocket = 0.9.2
 typeguard = 3.0.2:whl
@@ -327,9 +332,9 @@ uritemplate = 3.0.0
 urllib3 = 1.26.12
 wcwidth = 0.2.5
 webencodings = 0.5.1
-websockets = 10.4
 websocket-client = 1.5.1
-Werkzeug = 2.0.2
+websockets = 10.4
+Werkzeug = 3.0.0:whl
 wheel = 0.41.2:whl
 widgetsnbextension = 2.0.0
 wsproto = 1.2.0
@@ -356,9 +361,13 @@ charset-normalizer = 2.0.12
 click = 6.7
 distro = 1.6.0
 feedparser = 5.2.1
+Flask = 1.1.2
 gitdb2 = 2.0.5
 GitPython = 2.1.11
 idna = 2.9
+importlib-metadata = 1.7.0:whl
+itsdangerous = 0.24
+Jinja2 = 2.11.3
 jsonschema = 3.0.2:whl
 packaging = 16.8
 pyparsing = 2.2.0