Merge remote-tracking branch 'origin/master' into oi-sensor-sr

component/apache/buildout.cfg

@@ -44,9 +44,9 @@ environment =
 [apache]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 2.4.59
+version = 2.4.62
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 9f77eb01b2fddfb4b32d469af90fb01b
+md5sum = cded7afa23c13c4854008d95a69ce016
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer

component/aspell/buildout.cfg

@@ -31,8 +31,8 @@ post-make-hook = ${:_profile_base_location_}/${aspell-create-wrapper:filename}#$
 [aspell]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://ftp.gnu.org/gnu/aspell/aspell-0.60.7.tar.gz
-md5sum = 8ef2252609c511cd2bb26f3a3932ef28
+url = https://ftp.gnu.org/gnu/aspell/aspell-0.60.8.1.tar.gz
+md5sum = 187bd142f522ada555c7aa6b9cbf56e6
 configure-options =
   --enable-curses="-lncursesw -ltinfow"
 environment =

component/git/buildout.cfg

@@ -18,8 +18,8 @@ parts =
 [git]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.42.0.tar.xz
-md5sum = e61c187f6863d5e977e60cdedf213ec0
+url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.45.2.tar.xz
+md5sum = a6af98f948a1f07cfeac57e91a0f2abe
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/haproxy/buildout.cfg

@@ -13,8 +13,8 @@ parts = haproxy
 [haproxy]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://www.haproxy.org/download/2.6/src/haproxy-2.6.16.tar.gz
-md5sum = b01e605cdaf2742fcedf214a61e187b4
+url = https://www.haproxy.org/download/2.6/src/haproxy-2.6.18.tar.gz
+md5sum = 9cb80d59919ebf108d58ecf4618f9acf
 configure-command = true
 # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
 # otherwise use "generic".

component/inkscape/buildout.cfg

@@ -19,7 +19,6 @@ extends =
   ../libsigc/buildout.cfg
   ../libxml2/buildout.cfg
   ../libxslt/buildout.cfg
-  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../potrace/buildout.cfg
@@ -31,6 +30,7 @@ extends =
   ../defaults.cfg
 
 [gcc]
+min_version = 10.5
 max_version = 11
 
 [gsl]

component/java/buildout.cfg

@@ -55,17 +55,9 @@ command = ${coreutils-output:test} -x ${:keytool}
 keytool = ${java-re-8:location}/bin/keytool
 
 
-[java-re-temurin-11]
-recipe = slapos.recipe.build
-update =
-  from zc.buildout import UserError
-  raise UserError("unsupported platform")
-
-[java-re-temurin-11:linux and platform.machine() == 'x86_64']
+[java-re-temurin-linux-x64-base]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz
-md5sum = 1b06100bcd0923d3f3279c2f09773af0
 configure-command = :
 make-binary = :
 post-install =
@@ -75,3 +67,26 @@ post-install =
     ${patchelf:location}/bin/patchelf --set-rpath %(rpath)s $file
   done
 rpath = ${alsa:location}/lib:${freetype:location}/lib:${fontconfig:location}/lib:${libpng:location}/lib:${libXrender:location}/lib:${libXtst:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXext:location}/lib:${libXdmcp:location}/lib:${libXi:location}/lib:${libxcb:location}/lib:${zlib:location}/lib:@@LOCATION@@/lib:@@LOCATION@@/lib/server:@@LOCATION@@/lib/jli
+
+[java-re-temurin-unsupported-base]
+recipe = slapos.recipe.build
+update =
+  from zc.buildout import UserError
+  raise UserError("unsupported platform")
+
+[java-re-temurin-11]
+<= java-re-temurin-unsupported-base
+
+[java-re-temurin-11:linux and platform.machine() == 'x86_64']
+<= java-re-temurin-linux-x64-base
+url = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz
+md5sum = 1b06100bcd0923d3f3279c2f09773af0
+
+
+[java-re-temurin-21]
+<= java-re-temurin-unsupported-base
+
+[java-re-temurin-21:linux and platform.machine() == 'x86_64']
+<= java-re-temurin-linux-x64-base
+url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz
+md5sum = a028c69d40663040a4438d501b21b11a

component/kerberos/buildout.cfg

@@ -10,8 +10,8 @@ parts =
 [kerberos]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://web.mit.edu/kerberos/dist/krb5/1.20/krb5-1.20.2.tar.gz
-md5sum = 7ac456e97c4959ebe5c836dc2f5aab2c
+url = https://web.mit.edu/kerberos/dist/krb5/1.21/krb5-1.21.3.tar.gz
+md5sum = beb34d1dfc72ba0571ce72bed03e06eb
 configure-command = src/configure
 configure-options =
     --prefix=@@LOCATION@@

component/librsync/buildout.cfg

@@ -18,6 +18,7 @@ configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}
   -DCMAKE_INSTALL_RPATH=${:location}/lib:${bzip2:location}/lib:${popt:location}/lib:${zlib:location}/lib
+  -DCMAKE_INSTALL_LIBDIR=lib
 make-options =
   VERBOSE=1
 environment =

component/libzmq/buildout.cfg

 [buildout]
 extends =
   ../libsodium/buildout.cfg
+  ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
 
 parts =
@@ -9,10 +10,13 @@ parts =
 [libzmq]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/zeromq/zeromq4-1/releases/download/v4.1.6/zeromq-4.1.6.tar.gz
-md5sum = c89db4dbc0b90c34c9f4983cbff6d321
+url = https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz
+md5sum = ae933b1e98411fd7cb8309f9502d2737
 configure-options =
   --without-documentation
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libsodium:location}/lib/pkgconfig
+patches =
+  ${:_profile_base_location_}/disable-stringop-overflow-gcc-10.5.patch#4705ba5b86e48e2fd2eaea1d1f891cfe
+patch-options = -p1

component/libzmq/disable-stringop-overflow-gcc-10.5.patch

+Disable a stringop-overflow warning failing build on gcc 10.5
+
+This is an original slapos patch probably no longer necessary once we update gcc
+
+--- zeromq-4.3.5.orig/src/xpub.cpp	2023-06-18 23:40:34.000000000 +0900
++++ zeromq-4.3.5/src/xpub.cpp	2024-07-11 20:07:19.620329232 +0900
+@@ -384,7 +384,10 @@
+         //  Place the unsubscription to the queue of pending (un)subscriptions
+         //  to be retrieved by the user later on.
+         blob_t unsub (size_ + 1);
++
++#pragma GCC diagnostic ignored "-Wstringop-overflow="
+         *unsub.data () = 0;
++#pragma GCC diagnostic pop
+         if (size_ > 0)
+             memcpy (unsub.data () + 1, data_, size_);
+         self_->_pending_data.ZMQ_PUSH_OR_EMPLACE_BACK (ZMQ_MOVE (unsub));

component/macros/macro.pythonpath.eggs.cfg

 [buildout]
 parts =
 
-[macro.pythonpath.eggs]
+[macro.variable.eggs]
 recipe = slapos.recipe.build
 init =
   self.eggs = [e.strip() for e in options['eggs'].splitlines() if e.strip()]
 update =
+  import os
   from zc.buildout.easy_install import working_set
   buildout = self.buildout['buildout']
   eggs_directory = buildout['eggs-directory']
   develop_eggs_directory = buildout['develop-eggs-directory']
   dists = working_set(self.eggs, [develop_eggs_directory, eggs_directory])
-  paths = ':'.join(dist.location for dist in dists)
-  self.buildout[options['environment']]['PYTHONPATH'] = paths
-  print("PYTHONPATH=" + paths)
+  subpaths = dict(l.split() for l in options['subpaths'].splitlines())
+  def make_path(dist):
+    subpath = subpaths.get(dist.key)
+    return os.path.join(dist.location, subpath) if subpath else dist.location
+  paths = ':'.join(make_path(dist) for dist in dists)
+  environment = self.buildout[options['environment']]
+  variable = options['variable']
+  value = environment.get(variable)
+  if value:
+    paths = '%s:%s' % (paths, value)
+  environment[variable] = paths
+  print("%s=%s" %(variable, paths))
+variable = PYTHONPATH
+subpaths =
+
+[macro.pythonpath.eggs]
+<= macro.variable.eggs

component/matplotlib/buildout.cfg

@@ -36,11 +36,3 @@ rpath =
   ${libpng:location}/lib
   ${freetype:location}/lib
 need-matplotlibrc = ${matplotlibrc:location}
-
-[versions]
-matplotlib = 2.1.2
-cycler = 0.11.0
-matplotlib-inline = 0.1.6:whl
-
-[versions:sys.version_info < (3,8)]
-cycler = 0.10.0

component/miniupnpd/buildout.cfg

@@ -13,18 +13,17 @@ parts =
 [miniupnp-repository]
 recipe = slapos.recipe.build:gitclone
 repository = https://github.com/miniupnp/miniupnp.git
-revision = miniupnpd_2_3_0
+revision = miniupnpd_2_3_7
 git-executable = ${git:location}/bin/git
 
 
 [miniupnpd]
 recipe = slapos.recipe.cmmi
-shared = true
 path = ${miniupnp-repository:location}/miniupnpd
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${iptables:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
-  LDFLAGS=-L${libuuid:location}/lib -L${openssl:location}/lib -L${zlib:location}/lib
+  LDFLAGS=-L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${iptables:location}/lib
 # because these configure not support prefix syntax
 configure-command = ./configure
 configure-options =

component/openssh/buildout.cfg

@@ -16,9 +16,9 @@ parts =
 [openssh]
 recipe = slapos.recipe.cmmi
 shared = true
-md5sum = 1100f170ca1bc669038ca3743e074094
+md5sum = bc04ff77796758c0b37bd0bc9314cd3f
 location = @@LOCATION@@
-url = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.7p1.tar.gz
+url = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.8p1.tar.gz
 patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =

component/openssl/buildout.cfg

@@ -46,13 +46,13 @@ environment =
 
 [openssl-3.0]
 <= openssl-common
-url = https://www.openssl.org/source/openssl-3.0.13.tar.gz
-md5sum = c15e53a62711002901d3515ac8b30b86
+url = https://www.openssl.org/source/openssl-3.0.14.tar.gz
+md5sum = e6fe71fb59a502db54a25cd0f34ea67e
 
 [openssl-quictls]
 <= openssl-3.0
-url = https://github.com/quictls/openssl/archive/refs/tags/openssl-3.0.13-quic1.tar.gz
-md5sum = ff6a1f5fc5e7ea03aba9c97e7f26d97d
+url = https://github.com/quictls/openssl/archive/refs/tags/openssl-3.0.14-quic1.tar.gz
+md5sum = fa0ae39667afa8be6dbeadb3cc838e89
 
 [openssl-1.1]
 <= openssl-common

component/perl/buildout.cfg

@@ -8,9 +8,9 @@ parts =
 [perl]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 5.38.0
+version = 5.40.0
 url = https://www.cpan.org/src/5.0/perl-${:version}.tar.xz
-md5sum = e1c8aaec897dd386c741f97eef9f2e87
+md5sum = cfe14ef0709b9687f9c514042e8e1e82
 siteprefix =@@LOCATION@@/site_${:_buildout_section_name_}
 configure-command =
   sh Configure -des \

component/scipy/buildout.cfg

 [buildout]
 # Scipy requires BLAS/LAPACK libraries.
 extends =
+  ../meson/buildout.cfg
+  ../ninja/buildout.cfg
   ../numpy/openblas.cfg
   ../pandas/buildout.cfg
+  ../pkgconfig/buildout.cfg
 parts = scipy
 
 [scipy-env]
 <= numpy-env
+PATH=${meson:location}/bin:${ninja:location}/bin:${pkgconfig:location}/bin:${buildout:bin-directory}:%(PATH)s
+PKG_CONFIG_PATH = ${openblas:location}/lib/pkgconfig
 
 [scipy]
 recipe = zc.recipe.egg:custom
@@ -14,30 +19,51 @@ egg = scipy
 environment = scipy-env
 setup-eggs = ${numpy:egg}
 rpath = ${numpy:rpath}
-depends = ${scipy-pythonpath:recipe}
+depends =
+  ${scipy-pythonpath:recipe}
+  ${scipy-pkgconfig:recipe}
 
 [scipy-pythonpath]
 <= macro.pythonpath.eggs
 environment = scipy-env
 eggs = ${scipy-setup-eggs:eggs}
 
+[scipy-pkgconfig]
+<= macro.variable.eggs
+variable = PKG_CONFIG_PATH
+environment = scipy-env
+eggs = pybind11
+subpaths =
+  pybind11 pybind11/share/pkgconfig/
+depends = ${scipy-setup-eggs:recipe}
+
 [scipy-setup-eggs]
 recipe = zc.recipe.egg
 scripts =
+  cython
+  pythran
 eggs =
   ${cython:egg}
   ${numpy:egg}
   ${pandas:egg}
+  meson-python
   pythran
   pybind11
 
 [versions]
-pybind11 = 2.9.2
-scipy = 1.8.1
+pybind11 = 2.11.1
+scipy = 1.12.0
+meson-python = 0.13.2:whl
+pyproject-metadata = 0.8.0:whl
+meson = 1.4.1
 beniget = 0.4.1
 gast = 0.5.3
 pythran = 0.11.0:whl
 
+[versions:sys.version_info < (3,11)]
+tomli = 2.0.1:whl
+
+
 [scipy:sys.version_info < (3,8)]
 depends =
 

component/slapos/obs.cfg

@@ -44,23 +44,23 @@ configure-options +=
 make-options +=
   DESTDIR=${buildout:destdir}
 environment +=
-  PERL5LIB=${perl:location}/lib/5.38.0/
+  PERL5LIB=${perl:location}/lib/${perl:version}/
 
 [intltool]
 environment +=
-  PERL5LIB=${perl:location}/lib/5.38.0/
+  PERL5LIB=${perl:location}/lib/${perl:version}/
 
 [autoconf]
 environment +=
-  PERL5LIB=${perl:location}/lib/5.38.0/
+  PERL5LIB=${perl:location}/lib/${perl:version}/
 
 [automake]
 environment +=
-  PERL5LIB=${perl:location}/lib/5.38.0/
+  PERL5LIB=${perl:location}/lib/${perl:version}/
 
 [firewalld]
 environment +=
-  PERL5LIB=${perl:location}/lib/5.38.0/
+  PERL5LIB=${perl:location}/lib/${perl:version}/
 
 
 [dbus]
@@ -97,7 +97,7 @@ make-options +=
   INSTALL_PREFIX=${buildout:destdir}
   DESTDIR=${buildout:destdir}
 environment +=
-  PERL5LIB=${perl:location}/lib/5.38.0/
+  PERL5LIB=${perl:location}/lib/${perl:version}/
 
 [gobject-introspection]
 pre-configure +=
@@ -105,7 +105,7 @@ pre-configure +=
 configure-options +=
   --enable-shared
 environment +=
-  PERL5LIB=${perl:location}/lib/5.38.0/
+  PERL5LIB=${perl:location}/lib/${perl:version}/
 post-install =
   sed -i 's#!${python:location}/bin/python${python:version}#!/opt/slapos/parts/python${python:version}/bin/python${python:version}#' ${python:location}/bin/python${python:version}-config
 
@@ -121,14 +121,14 @@ environment +=
 
 
 [perl-CPAN-package]
-perl-PERL5LIB=${perl:location}/lib/5.38.0/
+perl-PERL5LIB=${perl:location}/lib/${perl:version}/
 
 pre-configure =
-  sed -i "s#'/opt/slapos/parts/perl#'${perl:location}#" ${perl:location}/lib/5.38.0/*-linux-thread-multi/Config.pm
-  sed -i "s#'/opt/slapos/parts/site_perl#'${buildout:destdir}/parts/site_perl#" ${perl:location}/lib/5.38.0/*-linux-thread-multi/Config.pm
+  sed -i "s#'/opt/slapos/parts/perl#'${perl:location}#" ${perl:location}/lib/${perl:version}/*-linux-thread-multi/Config.pm
+  sed -i "s#'/opt/slapos/parts/site_perl#'${buildout:destdir}/parts/site_perl#" ${perl:location}/lib/${perl:version}/*-linux-thread-multi/Config.pm
 post-install =
-  sed -i "s#'${perl:location}#'/opt/slapos/parts/perl#" ${perl:location}/lib/5.38.0/*-linux-thread-multi/Config.pm
-  sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.38.0/*-linux-thread-multi/Config.pm
+  sed -i "s#'${perl:location}#'/opt/slapos/parts/perl#" ${perl:location}/lib/${perl:version}/*-linux-thread-multi/Config.pm
+  sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/${perl:version}/*-linux-thread-multi/Config.pm
 
 [perl]
 configure-command =

component/subversion/buildout.cfg

@@ -20,8 +20,8 @@ parts =
 [subversion]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://downloads.apache.org/subversion/subversion-1.14.2.tar.bz2
-md5sum = 9927b167d1c67d663ca63125907f6f69
+url = https://archive.apache.org/dist/subversion/subversion-1.14.3.tar.bz2
+md5sum = 19756a5ceb32a022698a66e48616ef6b
 configure-options =
   --disable-static
   --with-apr=${apr:location}

component/trafficserver/buildout.cfg

@@ -24,8 +24,8 @@ min_version = 8
 
 [trafficserver]
 recipe = slapos.recipe.cmmi
-url = https://dlcdn.apache.org/trafficserver/trafficserver-9.2.4.tar.bz2
-md5sum = 5a889ba1be6f325e4b523df85616f30b
+url = https://archive.apache.org/dist/trafficserver/trafficserver-9.2.5.tar.bz2
+md5sum = 73f9c41eeafdb5d20f0287796e9fcef2
 shared = true
 patch-options = -p1
 configure-options =

component/util-linux/buildout.cfg

@@ -6,14 +6,11 @@ extends =
   ../pkgconfig/buildout.cfg
   ../xz-utils/buildout.cfg
 
-[gcc]
-min_version = 8
-
 [util-linux]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.2.tar.xz
-md5sum = 2feb3e7c306f336a3d22a182dfffc942
+url = https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.2.tar.xz
+md5sum = 88faefc8fefced097e58142077a3d14e
 configure-options =
   --disable-static
   --enable-libuuid
@@ -21,16 +18,19 @@ configure-options =
   --disable-bash-completion
   --disable-cal
   --disable-cramfs
+  --disable-exch
   --disable-fallocate
   --disable-fsck
   --enable-libblkid
   --disable-libfdisk
+  --disable-liblastlog2
   --enable-libmount
   --disable-makeinstall-chown
   --disable-makeinstall-setuid
   --disable-more
   --enable-mount
   --disable-nls
+  --disable-pam-lastlog2
   --disable-pivot_root
   --disable-pylibmount
   --disable-rename
@@ -74,3 +74,7 @@ environment =
   PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
   CFLAGS=-I${ncurses:location}/include
+
+# disable year 2038 problem ONLY for 32 bit architectures
+[libuuid:bits32]
+configure-options += --disable-year2038

component/wendelin.core/buildout.cfg

@@ -50,7 +50,7 @@ CGO_LDFLAGS += -Wl,-rpath=${zlib:location}/lib
 recipe  = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/wendelin.core.git
 branch   = master
-revision = wendelin.core-2.0.alpha3-9-gda765ef
+revision = wendelin.core-2.0.alpha3-22-g07087ec8
 # dir is pretty name as top-level recipe
 location = ${buildout:parts-directory}/wendelin.core
 git-executable = ${git:location}/bin/git

component/wget/buildout.cfg

-[buildout]
-extends =
-  ../gettext/buildout.cfg
-  ../lunzip/buildout.cfg
-  ../openssl/buildout.cfg
-  ../patch/buildout.cfg
-  ../pcre/buildout.cfg
-  ../perl/buildout.cfg
-  ../pkgconfig/buildout.cfg
-  ../zlib/buildout.cfg
-parts =
-  wget
-
-[wget]
-recipe = slapos.recipe.cmmi
-shared = true
-url = http://ftp.gnu.org/gnu/wget/wget-1.20.3.tar.lz
-md5sum = 3bc242eb69165247b1793dd0b794ff52
-configure-options =
-  --enable-ipv6
-  --enable-opie
-  --disable-iri
-  --disable-pcre2
-  --with-ssl=openssl
-  --with-libssl-prefix=${openssl:location}
-  --with-zlib-lib=${zlib:location}
-
-environment =
-# Python 3 is used for things we don't need. This is an optional dependency,
-# unless PYTHON is set (previously set by [python]): wget complains (rightly)
-# if it points to Python 2.7 (which we may still use).
-  PYTHON=
-  PATH=${gettext:location}/bin:${lunzip:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${openssl:location}/lib
-  CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include -I${pcre:location}/include

component/zbar/buildout.cfg

@@ -12,17 +12,17 @@ extends =
 [zbar]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/mchehab/zbar/archive/0.23.90.tar.gz
-md5sum = cb1667e20c1d7acf1b9911414adaeb84
+url = https://github.com/mchehab/zbar/archive/refs/tags/0.23.93.tar.gz
+md5sum = 3f69d17f6495de023b59b3539ce5e605
 pre-configure =
   autoreconf -vfi -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal
-configure-options = 
+configure-options =
   --disable-video
   --without-imagemagick
   --without-gtk
   --without-xv
   --without-qt
-  --without-python 
+  --without-python
   --without-x
   --without-jpg
   --without-dbus

component/zlib/buildout.cfg

@@ -5,7 +5,5 @@ parts =
 [zlib]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://zlib.net/fossils/zlib-1.3.tar.gz
-md5sum = 60373b133d630f74f4a1f94c1185a53f
-environment =
-  CFLAGS=-fPIC
+url = https://zlib.net/fossils/zlib-1.3.1.tar.gz
+md5sum = 9855b6d802d7fe5b7bd5b196a2271655

format-json

@@ -25,7 +25,7 @@ def main():
         obj = json.load(infile, object_pairs_hook=collections.OrderedDict)
       except ValueError as e:
         exit_code = 1
-        print(e, file=sys.stderr)
+        print(f'{f}:{e.lineno}', e, file=sys.stderr)
       else:
         with open(f, 'w') as outfile:
           json.dump(obj, outfile, ensure_ascii=False, sort_keys=False, indent=2, separators=(',', ': '))

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.360'
+version = '1.0.365'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read()
 
@@ -163,7 +163,6 @@ setup(name=name,
           'urlparse = slapos.recipe._urlparse:Recipe',
           'uuid = slapos.recipe._uuid:Recipe',
           'userinfo = slapos.recipe.userinfo:Recipe',
-          'webchecker = slapos.recipe.web_checker:Recipe',
           'wrapper = slapos.recipe.wrapper:Recipe',
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
           'zeo = slapos.recipe.zeo:Recipe',

slapos/recipe/generic_cloudooo/__init__.py

@@ -96,6 +96,7 @@ class Recipe(GenericBaseRecipe):
       ip=self.options['ip'],
       port=int(self.options['port']),
       openoffice_port=int(self.options['openoffice-port']),
+      ooo_enable_scripting=self.options.get('ooo_enable_scripting', 'false'),
     )
     environment_variable_list = []
     for env_line in self.options['environment'].splitlines():

slapos/recipe/generic_cloudooo/template/cloudooo.cfg.in

@@ -12,6 +12,8 @@ working_path = %(working_path)s
 uno_path = %(uno_path)s
 # Folder where soffice.bin is installed
 office_binary_path = %(office_binary_path)s
+# Whether running scripts on the loaded document is allowed
+ooo_enable_scripting = %(ooo_enable_scripting)s
 #
 ## Monitor Settings
 #

slapos/recipe/web_checker/template/web_checker.cfg.in

-[web_checker]
-url = %(frontend_url)s
-working_directory = %(web_checker_working_directory)s
-varnishlog_binary_path = %(varnishlog_binary_path)s
-wget_binary_path = %(wget_binary_path)s
-email_address = %(web_checker_mail_address)s
-smtp_host = %(web_checker_smtp_host)s
-debug_level = debug
-file_log_path = %(web_checker_log)s
-
-[header_list]
-Expires = True
-Vary = Accept-Language, Cookie, Accept-Encoding
-  Accept-Language, Cookie
-  Accept-Language,Cookie,Accept-Encoding
-  Accept-Language,Cookie
-  Accept-Encoding
-Cache-Control = max-age=300
-  max-age=3600
-  public,max-age=300
-  public,max-age=3600
-
-[header url=(.*_form)]
-Vary = Accept-Encoding
-
-[header url=.*/favicon.ico]
-Last-Modified = True
-
-[header content-type=(text/css|.*/javascript)]
-Last-Modified = True
-Cache-Control = public,max-age=300
-  public,max-age=3600
-  public
-
-[no_header content-type=(image/.*|application/font)]
-Vary = None
-
-[erp5_extension_list]
-prohibited_folder_name_list = web_page_module
-  document_module
-prohibited_file_name_list = WebSection_viewAsWeb
-  Base_viewHistory
-  list

slapos/test/test_json_schema.py

@@ -45,17 +45,17 @@ def createInstanceParameterSchemaValidatorTest(path):
     "http://json-schema.org/draft-04/schema#": jsonschema.Draft4Validator,
     "http://json-schema.org/draft-06/schema#": jsonschema.Draft6Validator,
     "http://json-schema.org/draft-07/schema#": jsonschema.Draft7Validator,
-    "http://json-schema.org/draft/2019-09/schema": jsonschema.Draft201909Validator,
-    "http://json-schema.org/draft/2019-09/schema#": jsonschema.Draft201909Validator,
-    "http://json-schema.org/draft/2020-12/schema": jsonschema.Draft202012Validator,
-    "http://json-schema.org/draft/2020-12/schema#": jsonschema.Draft202012Validator,
+    "https://json-schema.org/draft/2019-09/schema": jsonschema.Draft201909Validator,
+    "https://json-schema.org/draft/2019-09/schema#": jsonschema.Draft201909Validator,
+    "https://json-schema.org/draft/2020-12/schema": jsonschema.Draft202012Validator,
+    "https://json-schema.org/draft/2020-12/schema#": jsonschema.Draft202012Validator,
   }
   def run(self, *args, **kwargs):
     with open(path, "r") as json_file:
       json_dict = json.load(json_file)
-      validator = validator_dict.get(
-        json_dict.get('$schema'),
-        jsonschema.Draft7Validator)
+      validator = validator_dict.get(json_dict.get('$schema'))
+      if validator is None:
+        raise ValueError("%s has an invalid $schema %s" % (path, json_dict.get('$schema')))
       validator.check_schema(json_dict)
   return run
 

slapos/test/utils.py

@@ -13,13 +13,15 @@ def makeRecipe(recipe_class, options, name='test', buildout=None):
   and SLAPOS_TEST_DEVELOP_EGGS_DIRECTORY environment variables, so that the
   test recipe does not need to install eggs again when using working set.
   """
-  _buildout = {
+  _buildout = six.moves.UserDict({
     'buildout': {
       'bin-directory': '',
       'find-links': '',
       'allow-hosts': '',
+      'allow-unknown-extras': False,