Update Release Candidate

component/ZODB/buildout.cfg

@@ -127,5 +127,6 @@ ZODB3 = 3.11.0
 # eggs that are common to ZODB4 and ZODB5.
 [versions:python2]
 BTrees = 4.11.3
+# NOTE: keep persistent version in sync with test-zodb4-wc2.cfg
 persistent = 4.9.3
 zodbpickle = 2.6.0

component/ZODB/test-zodb4-wc2.cfg

@@ -8,6 +8,7 @@ extends =
     ../pygolang/buildout.cfg
     buildout.cfg
     ../ZEO/buildout.cfg
+    ../../stack/slapos-py2.cfg
 
 parts =
     ZODB
@@ -22,11 +23,6 @@ parts =
 major = 4-wc2
 [ZODB4-wc2-repository]
 revision =
-[python]
-part = python2.7
-
-[openssl]
-<= openssl-1.1
 
 # we need persistent to be a git checkout because persistent tests want to
 # discover in-tree files that are not present in persistent egg when it is
@@ -35,7 +31,7 @@ part = python2.7
 #   https://erp5.nexedi.net/test_result_module/20201123-3F859E35/7
 #   (look for "AssertionError: could not find my setup.py")
 #
-#   https://github.com/zopefoundation/persistent/blob/4.6.4-0-g7ed95cf/persistent/tests/test_docs.py#L37-L43
+#   https://github.com/zopefoundation/persistent/blob/4.9.3-0-g599bb36/src/persistent/tests/test_docs.py#L37-L43
 [persistent]
 recipe = zc.recipe.egg:develop
 setup = ${persistent-repository:location}
@@ -45,7 +41,7 @@ recipe  = slapos.recipe.build:gitclone
 location = ${buildout:parts-directory}/persistent
 repository = https://github.com/zopefoundation/persistent.git
 branch = master
-revision = 4.6.4-0-g7ed95cf
+revision = 4.9.3-0-g599bb36
 git-executable = ${git:location}/bin/git
 
 # bin/python is preinstalled with sys.path to ZODB & friends.

component/aspell/aspell-en_configure_which.patch

+# See https://github.com/GNUAspell/aspell-lang/issues/3
+
+--- a/configure
++++ b/configure
+@@ -79,9 +79,9 @@
+ datadir=`$ASPELL dump config data-dir`
+ echo $datadir
+ 
+-echo "ASPELL = `which $ASPELL`" > Makefile
++echo "ASPELL = `command -v $ASPELL`" > Makefile
+ echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile
+-echo "PREZIP = `which $PREZIP`" >> Makefile
++echo "PREZIP = `command -v $PREZIP`" >> Makefile
+ echo "DESTDIR = $DESTDIR" >> Makefile
+ echo "dictdir = $dictdir" >> Makefile
+ echo "datadir = $datadir" >> Makefile
\ No newline at end of file

component/aspell/buildout.cfg

@@ -46,3 +46,8 @@ make-options = -j1
 <= aspell-dictionary-common
 url = ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-7.1-0.tar.bz2
 md5sum = beba5e8f3afd3ed1644653bb685b2dfb
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/aspell-en_configure_which.patch#97e9fc81d5612634e9b8224b20855698
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/fluent-bit/obs.cfg

@@ -10,6 +10,10 @@ extensions =
 
 extends =
   buildout.cfg
+  ../../stack/slapos.cfg
 
 parts =
   fluent-bit
+
+[versions]
+slapos.extension.strip = 0.4

component/gnutls/buildout.cfg

@@ -44,18 +44,22 @@ configure-options-extra2 =
 
 [gnutls]
 <= gpg-common
-url = https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.2.tar.xz
-md5sum = 95c32a1af583ecfcb280648874c0fbd9
+url = https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.11.tar.xz
+md5sum = dd8c16b17f1d37fca203e756e981a957
 configure-options-extra =
   --disable-doc
   --disable-static
   --disable-libdane
   --disable-guile
   --without-tpm
+  --without-tpm2
+  --without-brotli
+  --without-zstd
   --with-included-unistring
 pkg-config-path = ${libtasn1:location}/lib/pkgconfig:${nettle:location}/lib/pkgconfig:${p11-kit:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
 environment =
   PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg-config-path}
+  PYTHON=${python3:location}/bin/python3
   CPPFLAGS=-I${gmp:location}/include -I${libtasn1:location}/include
   LDFLAGS=-L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${nettle:location}/lib -Wl,-rpath=${zlib:location}/lib

component/openssl/buildout.cfg

@@ -48,8 +48,8 @@ environment =
 
 [openssl-3.0]
 <= openssl-common
-url = https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz
-md5sum = 08f458c00fff496a52ef931c481045cd
+url = https://github.com/openssl/openssl/releases/download/openssl-3.0.16/openssl-3.0.16.tar.gz
+md5sum = 7b6a9cded21b9fa51877444f5defebd4
 
 [openssl-quictls]
 <= openssl-3.0

component/statsmodels/buildout.cfg

@@ -20,10 +20,11 @@ setup-eggs =
   ${scipy:egg}
   ${cython:egg}
   setuptools-dso
-statsmodels-patches = ${:_profile_base_location_}/statsmodels-add-setup-version.patch#8bb8eac7375e13fa8104a6aa905ef35c
+  packaging
+statsmodels-patches = ${:_profile_base_location_}/statsmodels-add-setup-version.patch#226a03ae31d060583fa21d425e6a81b6
 statsmodels-patch-options = -p1
 
-[statsmodels:sys.version_info < (3,10)]
+[statsmodels:sys.version_info < (3,9)]
 statsmodels-patches =
 statsmodels-patch-options =
 

component/statsmodels/statsmodels-add-setup-version.patch

@@ -2,20 +2,20 @@ add a version to make this package compatible with buildout's easy_install
 
 Fixes this issue:
 
-    Installing statsmodels 0.13.5
+    Installing statsmodels 0.14.4
     Caused installation of a distribution:
     statsmodels 0.0.0
     with a different version.
 
 
-diff '--color=auto' -ru statsmodels-0.13.5.orig/setup.py statsmodels-0.13.5/setup.py
---- statsmodels-0.13.5.orig/setup.py	2022-11-02 01:54:20.000000000 +0900
-+++ statsmodels-0.13.5/setup.py	2023-10-26 14:12:35.157708043 +0900
-@@ -387,6 +387,7 @@
+diff -ruN statsmodels-0.14.4.orig/setup.py statsmodels-0.14.4/setup.py
+--- statsmodels-0.14.4.orig/setup.py	2025-01-24 09:27:54.995143777 +0100
++++ statsmodels-0.14.4/setup.py	2025-01-24 09:29:14.175103580 +0100
+@@ -349,6 +349,7 @@
  
  setup(
      name=DISTNAME,
-+    version='0.13.5',
++    version='0.14.4',
      maintainer=MAINTAINER,
      ext_modules=extensions,
      maintainer_email=MAINTAINER_EMAIL,

slapos/recipe/addresiliency/__init__.py

@@ -50,6 +50,6 @@ class Recipe(GenericSlapRecipe):
                 'computer_guid': slap_connection['computer-id'],
                 'partition_id': slap_connection['partition-id'],
                 'software_release': slap_connection['software-release-url'],
-                'namebase': self.parameter_dict['namebase'],
+                'namebase': self.options['namebase'],
                 'takeover_triggered_file_path': self.options['takeover-triggered-file-path'],
             })

slapos/recipe/re6stnet/re6stnet.py

@@ -114,7 +114,7 @@ def requestRemoveToken(client, token_base_path):
                             reference)
         request_file.unlink()
         status_file = request_file.with_suffix('.status')
-        status_file.unlink()
+        status_file.unlink(missing_ok=True)
         ipv6_file = request_file.with_suffix('.ipv6')
         ipv6_file.unlink(missing_ok=True)
     else:

software/erp5testnode/testsuite/kvm.cfg

 [buildout]
 extends = 
-   ../../kvm/development.cfg
+   ../../kvm/software.cfg
    testsuite.cfg
 
 parts += template-erp5testnode
@@ -16,5 +16,3 @@ md5sum = dd82c771f6f7738fb4b0fc1330ed8236
 extra-context =
   raw default_test_image_url file://${default-test-image:target}
       raw default_test_image_md5sum ${default-test-image:md5sum}
-
-  

software/grafana/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = 86e379ac6ba789d65369ca1e0d4dfa3f
 
 [instance-agent]
 filename = instance-agent.cfg.in
-md5sum = eeb529b2b6a8e762a9072c520691c66c
+md5sum = 11cd081c2196f73441cd677b0d74b16a
 
 
 [influxdb-config-file]

software/grafana/instance-agent.cfg.in

@@ -568,8 +568,8 @@ init =
                 "stages": [
                   {
                     "multiline": {
-                      # TODO this does not seem to work well
                       "firstline": "^------",
+                      "max_lines": 1024,
                       "max_wait_time": "5s"
                     }
                   },
@@ -628,6 +628,7 @@ init =
                     {
                       "multiline": {
                         "firstline": "^\\d{4}-\\d{2}-\\d{2}\\s\\d{1,2}\\:\\d{2}\\:\\d{2}\\,\\d{3}",
+                        "max_lines": 1024,
                         "max_wait_time": "5s"
                       }
                     },
@@ -658,18 +659,24 @@ init =
           "job_name": job_name,
           "pipeline_stages": [
             {
-              "match": {
-                "selector": get_job_selector(partition, job_name, application['name']),
-                "stages": [
-                  {
-                    "multiline": {
               # between each slow query, slow query log has a first line like:
               #   # Time: 231008 16:29:01
               # and then a second like:
               #   # User@Host: user[user] @  [10.0.71.207]
               # but the first line is not repeated for subsequent queries that happens
-                      # at the same second
-                      "firstline": r"(^# Time: \d{2}.*\n^# User@Host:.*|^# User@Host:.*)",
+              # at the same second. Drop this "Time:" line
+              "drop": {
+                "expression": r"^# Time: \d+.*",
+              }
+            },
+            {
+              "match": {
+                "selector": get_job_selector(partition, job_name, application['name']),
+                "stages": [
+                  {
+                    "multiline": {
+                      "firstline": "^# User@Host:.*",
+                      "max_lines": 1024,
                       "max_wait_time": "5s"
                     }
                   },

software/kvm/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 2ef12d7fc16d74e0887a8cb16a848445
+md5sum = 7f357b3ec6763d6a5e084fc460223e4c
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 957f3a3c8e5f9a905026cc01a25b326e
+md5sum = 8414431b20715cb9383b5577de9afdaf
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
@@ -31,19 +31,19 @@ md5sum = 12d46a7d45f00e091d18e6d4552d0973
 
 [template-kvm-import]
 filename = instance-kvm-import.cfg.jinja2.in
-md5sum = 0829d08337a09b8ef017e71fbb9384fb
+md5sum = 022438f445e9ae5b1930a586e7914024
 
 [template-kvm-import-script]
 filename = template/kvm-import.sh.jinja2
-md5sum = a6e6abb3b17fae37b84233d63014b885
+md5sum = 21a620fafd8b76d4e915e359c69ae553
 
 [template-kvm-export]
 filename = instance-kvm-export.cfg.jinja2
-md5sum = a02f0694dcb944c18d99f7f79afa2384
+md5sum = 72f1f334e3b9f8de0f65373b4cd6e6d6
 
 [template-kvm-export-script]
 filename = template/kvm-export.sh.jinja2
-md5sum = 667e4668cfdf396d18785d8cfa096396
+md5sum = e07fb8561c9aed4919c656c2d192e02b
 
 [template-nginx]
 filename = template/nginx_conf.in
@@ -100,3 +100,7 @@ md5sum = d53afe719e2cbfc2480277af340f8429
 [check-backup-directory.sh]
 filename = template/check-backup-directory.sh
 md5sum = e569494a941e1d585c2e0bbf070cf1c9
+
+[disk-image-corruption.sh]
+filename = template/disk-image-corruption.sh
+md5sum = 714e9d6e2fdb0ef4ef7844a3148a5a4b

software/kvm/development.cfg

-# Development profile of kvm.
-# Exactly the same as software.cfg, but fetch the slapos.cookbook and
-# slapos.toolbox from git repository instead of fetching stable version,
-# allowing to play with bleeding edge environment.
-
-[buildout]
-extends = software.cfg
-  ../../stack/slapos-dev.cfg
-
-parts +=
-# Development eggs
-  ${:common-parts}

software/kvm/instance-kvm-export.cfg.jinja2

@@ -43,6 +43,7 @@ context =
     key socket_path kvm-instance:socket-path
     section disk disk
     raw qmpbackup {{ qmpbackup }}
+    raw backup_signature {{ backup_signature }}
 
 # Extends publish section with resilient parameters
 [publish-connection-information]

software/kvm/instance-kvm-import.cfg.jinja2.in

@@ -67,21 +67,19 @@ wrapper = ${:output}
 context =
     section directory directory
     raw qmprestore {{ qmprestore }}
+    raw backup_signature {{ backup_signature }}
 
 [kvm-disk-image-corruption-bin]
-recipe = collective.recipe.template
-input = inline:#!/bin/sh
-  QEMU_IMAGE="${directory:srv}/virtual.qcow2"
-  if [ ! -s "$QEMU_IMAGE" ]; then
-    exit 0
-  fi
-  {{ qemu_location }}/bin/qemu-img check $QEMU_IMAGE
-  RETURN_CODE=$?
-  if [ $RETURN_CODE -eq 0 ] || [ $RETURN_CODE -eq 3 ]; then
-    exit 0
-  else
-    exit 1
-  fi
+recipe = slapos.recipe.template:jinja2
+url = {{ disk_image_corruption }}
+qemu_img_path = {{ qemu_location }}/bin/qemu-img
+disk_path = ${directory:srv}/virtual.qcow2
+# force empty disk device
+disk_device_path =
+context =
+  key disk_device_path :disk_device_path
+  key qemu_img_path :qemu_img_path
+  key disk_path :disk_path
 output = ${directory:bin}/kvm-disk-image-corruption
 mode = 700
 

software/kvm/instance-kvm.cfg.jinja2

@@ -566,22 +566,12 @@ config-host = ${kvm-parameter-dict:vnc-ip}
 config-port = ${kvm-parameter-dict:vnc-websocket-port}
 
 [kvm-disk-image-corruption-bin]
-recipe = collective.recipe.template
-input = inline:#!/bin/sh
-  # Return code 0 is "OK"
-  # Return code 3 is "found leaks, but image is OK"
-  # http://git.qemu.org/?p=qemu.git;a=blob;f=qemu-img.c;h=4e9a7f5741c9cb863d978225829e68fefcae3947;hb=HEAD#l702
-  if [ "${slap-parameter:disk-device-path}" != "" ]; then
-    # disk device option is used, skip qemu img check
-    exit 0
-  fi
-  ${kvm-parameter-dict:qemu-img-path} check -U ${kvm-parameter-dict:disk-path} > /dev/null 2>&1
-  RETURN_CODE=$?
-  if [ $RETURN_CODE -eq 0 ] || [ $RETURN_CODE -eq 3 ]; then
-    exit 0
-  else
-    exit 1
-  fi
+recipe = slapos.recipe.template:jinja2
+url = {{ disk_image_corruption }}
+context =
+  key disk_device_path slap-parameter:disk-device-path
+  key qemu_img_path kvm-parameter-dict:qemu-img-path
+  key disk_path kvm-parameter-dict:disk-path
 output = ${directory:bin}/kvm-disk-image-corruption
 mode = 700
 

software/kvm/instance.cfg.in

@@ -101,6 +101,7 @@ extra-context =
   raw template_nginx ${template-nginx:target}
   raw websockify_executable_location ${buildout:directory}/bin/websockify
   raw wipe_disk_wrapper ${buildout:directory}/bin/securedelete
+  raw disk_image_corruption ${disk-image-corruption.sh:target}
 template-parts-destination = ${template-parts:target}
 template-replicated-destination = ${template-replicated:target}
 import-list = file parts :template-parts-destination
@@ -146,6 +147,7 @@ context =
     key slapparameter_dict slap-configuration:configuration
     key qmpbackup qmpbackup-binary:wrapper-path
     raw check_backup_directory ${check-backup-directory.sh:output}
+    raw backup_signature ${buildout:bin-directory}/backup-signature
 
 [qmprestore-binary]
 recipe = slapos.cookbook:wrapper
@@ -170,3 +172,5 @@ context =
     key pbsready_import_template template-pbsready-import:output
     key slapparameter_dict slap-configuration:configuration
     key qmprestore qmprestore-binary:wrapper-path
+    raw backup_signature ${buildout:bin-directory}/backup-signature
+    raw disk_image_corruption ${disk-image-corruption.sh:target}