Merge branch 'master+ZODB4-wc2' into y/wc2-next

* master+ZODB4-wc2: (217 commits)
  golang: Clean internal build cache after part is compiled/tested
  software/theia: Fix theia-service template
  erp5testnode: fix an md5sum
  component/replication-manager: update revision
  beremiz-ide: update Beremiz revision
  software/slapos-sr-testing: move nextcloud to python 3 only softwares
  software/nextcloud/test: update test for python 3
  software/nextcloud: define instance.trusted-proxy-list in schema
  *: version up slapos.cookbook 1.0.244
  stack/lamp: use python 3 at lamp stack level
  Release slapos.cookbook (1.0.244)
  slapos-node: fix duplicated PYTHON key
  recipe/redis: implement promise with redis-cli
  software/theia: version up ( theia 1.25.0 )
  component/fish-shell: version up 3.4.1
  beremiz-ide: write tests output to SlapOS test log directory
  bison: fix random build  failure
  fixup! astroid: Backport patch to fix `Unable to import 'six.moves.urllib.parse' (import-error)`.
  fixup! pylint: Backport `redefining-builtins-modules` options.
  software/theia: Fix python3 erp5 resiliency test
  ...

.editorconfig

 root = true
 
-[*.{cfg,in,md,json}]
+[*.{cfg,in,md,json,py}]
 end_of_line = lf
 charset = utf-8
 insert_final_newline = true
+trim_trailing_whitespace = true
 
-[**.json]
+[*.{json,py}]
 indent_style = space
 indent_size = 2
 

component/ZODB/buildout.cfg

@@ -96,7 +96,7 @@ setup-eggs = ${python-cffi:egg}
 [versions]
 BTrees = 4.5.1
 persistent = 4.6.4
-zodbpickle = 1.0.4
+zodbpickle = 2.0.0
 
 # Provide ZODB3 for those eggs that still care about ZODB3 compatibility -
 # for example wendelin.core. ZODB3 3.11 is just a dependency egg on _latest_

component/ZODB/test-zodb4-wc2.cfg

@@ -60,17 +60,16 @@ eggs +=
 
 # env.sh for ZODB's python to be on $PATH.
 [ZODB-env.sh]
-recipe   = slapos.recipe.template:jinja2
-rendered = ${buildout:directory}/${:_buildout_section_name_}
-template = inline:
+recipe   = slapos.recipe.template
+output = ${buildout:directory}/${:_buildout_section_name_}
+inline =
   export PS1="(ZODB-env) $PS1"
   export PATH=${buildout:bin-directory}:$PATH
 
 # .nxdtest to run ZODB tests
 [.nxdtest]
 <= jinja2-template
-template =
-  inline:
+inline =
   # determine where ZODB & friends were installed
   from subprocess import check_output
   where = check_output(['python', '-c', """if 1:
@@ -99,12 +98,12 @@ template =
 # instance to run nxdtest.
 [instance.cfg]
 <= jinja2-template
-template = inline:
+inline =
   [buildout]
-  extends = ${nxdtest-instance.cfg:rendered}
+  extends = ${nxdtest-instance.cfg:output}
 
   [runTestSuite]
-  env.sh  = ${ZODB-env.sh:rendered}
+  env.sh  = ${ZODB-env.sh:output}
   workdir = ${buildout:directory}
 
 

component/apache/buildout.cfg

@@ -7,7 +7,7 @@ extends =
   ../nghttp2/buildout.cfg
   ../gdbm/buildout.cfg
   ../libexpat/buildout.cfg
-  ../libuuid/buildout.cfg
+  ../util-linux/buildout.cfg
   ../libxml2/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
@@ -39,9 +39,9 @@ configure-options =
 [apache]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 2.4.52
+version = 2.4.53
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = a94ae42b84309d5ef6e613ae825b92fa
+md5sum = f594f137137b5bdff3998dc17e3e9526
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer
@@ -76,7 +76,7 @@ configure-options = --disable-static
                     --with-z=${zlib:location}
                     --with-expat=${libexpat:location}
                     --with-libxml2=${libxml2:location}/include/libxml2
-                    --with-pcre=${pcre:location}
+                    --with-pcre=${pcre:location}/bin/pcre-config
                     --with-sqlite3=${sqlite3:location}
                     --with-gdbm=${gdbm:location}
                     --with-nghttp2=${nghttp2:location}

component/bazel/buildout.cfg

@@ -18,8 +18,8 @@ md5sum = e5f4b1d997e50ffe4998c68c8ec45403
 recipe = slapos.recipe.template:jinja2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = bazel_tools_cpp_CROSSTOOL
-template = ${:_profile_base_location_}/${:filename}.in
-rendered = ${:location}/${:filename}
+url = ${:_profile_base_location_}/${:filename}.in
+output = ${:location}/${:filename}
 context =
     key gcc_location gcc:prefix
     key binutils_location binutils:location
@@ -28,8 +28,8 @@ context =
 recipe = slapos.recipe.template:jinja2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 filename = bazel_src_main_cpp_BUILD
-template = ${:_profile_base_location_}/${:filename}.in
-rendered = ${:location}/${:filename}
+url = ${:_profile_base_location_}/${:filename}.in
+output = ${:location}/${:filename}
 # We previously passed an argument that we don't want anymore. Rather than
 # changing templates, we pass a dummy argument that will have no effect.
 linkopts = -DSLAPOS_DUMMY=
@@ -50,10 +50,10 @@ url = https://github.com/bazelbuild/bazel/releases/download/0.6.1/bazel-0.6.1-di
 md5sum = 8c5c827e33d3ff74c263c1299810b485
 patch-binary = ${patch:location}/bin/patch
 patch-file-path = ${:_profile_base_location_}/bazel-0.6.1.patch
-bazel-crosstool-modified-file-path = ${template-bazel-crosstool:rendered}
-bazel-src-main-cpp-build-path = ${template-bazel-src-main-cpp-build:rendered}
-bazel-src-main-tools-build-path = ${template-bazel-src-main-tools-build:rendered}
-bazel-src-tools-singlejar-build-path = ${template-bazel-src-tools-singlejar-build:rendered}
+bazel-crosstool-modified-file-path = ${template-bazel-crosstool:output}
+bazel-src-main-cpp-build-path = ${template-bazel-src-main-cpp-build:output}
+bazel-src-main-tools-build-path = ${template-bazel-src-main-tools-build:output}
+bazel-src-tools-singlejar-build-path = ${template-bazel-src-tools-singlejar-build:output}
 unzip-bin = ${unzip:location}/bin
 zip-bin = ${zip:location}/bin
 java_home = ${zulu:location}

component/bison/buildout.cfg

 [buildout]
 extends =
-  ../autoconf/buildout.cfg
-  ../automake/buildout.cfg
   ../m4/buildout.cfg
   ../patch/buildout.cfg
   ../perl/buildout.cfg
@@ -16,7 +14,15 @@ url = https://ftp.gnu.org/gnu/bison/bison-3.8.2.tar.xz
 md5sum = c28f119f405a2304ff0a7ccdcc629713
 environment =
   M4=${m4:location}/bin/m4
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/01_inhibit_example_generation#ee2df22601a56d738939fa760f9dc19b
+# Make sure that Makefile.in is not older that the other file that is modified
+# by the above patch, otherwise `make` would invoke automake, which is likely
+# to fail with an error like:
+#   This is Automake 1.16.5, but the definition used by this AM_INIT_AUTOMAKE
+#   comes from Automake 1.16.4.
+# Without such pre-configure, the 2 files usually have the same modification
+# date because machines are fast, but not always.
+pre-configure = touch Makefile.in

component/boost-lib/buildout.cfg

@@ -10,7 +10,7 @@ extends =
 [boost-lib]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://downloads.sourceforge.net/sourceforge/boost/boost_1_67_0.tar.bz2
+url = https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.tar.bz2
 md5sum = ced776cb19428ab8488774e1415535ab
 location = @@LOCATION@@
 configure-command = ./bootstrap.sh --prefix=${:location} --without-icu $${PYTHON:+--with-python=$PYTHON}
@@ -27,5 +27,5 @@ environment =
   LZMA_LIBRARY_PATH=${xz-utils:location}/lib
 patch-options = -p1
 patches =
-  https://sources.debian.org/data/main/b/boost1.67/1.67.0-17/debian/patches/fix-ftbfs-python-3.3.patch#c85fb479d51354deafd1cc7af78f25d2
+  https://sources.debian.org/data/main/b/boost1.67/1.67.0-13+deb10u1/debian/patches/fix-ftbfs-python-3.3.patch#c85fb479d51354deafd1cc7af78f25d2
 patch-binary = ${patch:location}/bin/patch

component/caddy/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 <= go-git-package
 go.importpath = github.com/caddyserver/caddy
 repository    = https://lab.nexedi.com/nexedi/caddy.git
-revision      = nxd-v1.0.3-1-g2c11cedc
+revision      = nxd-v1.0.3-1-03fba31bf
 
 [gowork]
 golang  = ${golang1.17:location}

component/cyrus-sasl/buildout.cfg

@@ -12,7 +12,7 @@ extends =
 [cyrus-sasl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
+url = https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.26/cyrus-sasl-2.1.26.tar.gz
 md5sum = a7f4e5e559a0e37b3ffc438c9456e425
 location = @@LOCATION@@
 patch-options = -p1

component/cythonplus/buildout.cfg

@@ -28,9 +28,9 @@ git-executable = ${git:location}/bin/git
 
 [cythonplus_env.sh]
 recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:directory}/${:_buildout_section_name_}
-template =
-  inline:{% set path, python = os.path.split(python) -%}
+output = ${buildout:directory}/${:_buildout_section_name_}
+inline =
+  {% set path, python = os.path.split(python) -%}
   {% if 'part' in gcc -%}
   {%   set path = path + ':' + gcc.prefix + '/bin' -%}
   {% endif -%}

component/dcron/buildout.cfg

@@ -2,7 +2,6 @@
 extends =
   ../coreutils/buildout.cfg
   ../patch/buildout.cfg
-  ../randomsleep/buildout.cfg
 
 parts = dcron-output
 
@@ -20,7 +19,6 @@ make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
 post-install =
   chmod u-s %(location)s/bin/crontab
-dummy = ${randomsleep:recipe}
 
 [dcron-output]
 # Shared binary location to ease migration

component/diffutils/buildout.cfg

+[buildout]
+extends =
+  ../xz-utils/buildout.cfg
+parts =
+  diffutils
+
+[diffutils]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://ftp.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz
+md5sum = 6a6b0fdc72acfe3f2829aab477876fbc
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
+
+
+

component/dropbear/buildout.cfg

@@ -18,7 +18,7 @@ recipe = slapos.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
 # XXX: We still use an old version of dropbear instead of the last one
 #      in order have all patches working.
-url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
+url = https://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
 
 configure-options =
   --with-zlib=${zlib:location}

component/egg-patch/Zope/PythonScript-2.13.patch

+--- Zope2-2.13.30/src/Shared/DC/Scripts/Signature.py	2022-04-25 08:05:09.312966168 +0000
++++ Zope2-2.13.30/src/Shared/DC/Scripts/Signature.py	2022-04-25 08:06:20.120743425 +0000
+@@ -35,7 +35,7 @@ def _setFuncSignature(self, defaults=None, varnames=(), argcount=-1):
+         argcount = len(varnames)
+     # Generate a change only if we have to.
+     if self.func_defaults != defaults:
+-        self.func_defaults = defaults
++        self.func_defaults = self.__defaults__ = defaults
+     code = FuncCode(varnames, argcount)
+     if self.func_code != code:
+-        self.func_code = code
++        self.func_code = self.__code__ = code

component/ffmpeg/buildout.cfg

@@ -55,6 +55,7 @@ md5sum = 3f489aa48ad2aa1f967dc5e293bbd06f
 
 [yasm]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz
 
 [libvpx]

component/firefox/buildout.cfg

@@ -31,7 +31,7 @@ part = firefox
 
 recipe = slapos.recipe.build
 location = ${buildout:bin-directory}/${:part}
-fonts-conf = ${firefox-default-fonts-conf:rendered}
+fonts-conf = ${firefox-default-fonts-conf:output}
 init =
   self.buildout[options['part']]
 install =
@@ -72,8 +72,8 @@ part = firefox-52
 
 [firefox-default-fonts-conf]
 recipe = slapos.recipe.template:jinja2
-template = ${template-fonts-conf:output}
-rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/fonts.conf
+url = ${template-fonts-conf:output}
+output = ${buildout:parts-directory}/${:_buildout_section_name_}/fonts.conf
 context =
   key cachedir :cache-dir
   key fonts :fonts
@@ -148,7 +148,7 @@ library =
   ${libpng:location}/lib
   ${libSM:location}/lib
   ${libtool:location}/lib
-  ${libuuid:location}/lib
+  ${util-linux:location}/lib
   ${libX11:location}/lib
   ${libXau:location}/lib
   ${libxcb:location}/lib

component/firewalld/buildout.cfg

@@ -60,7 +60,8 @@ environment =
   DBUS_GLIB_CFLAGS=-I${dbus-glib:location}/include/dbus-1.0
   DBUS_GLIB_LIBS=-L${dbus-glib:location}/lib -ldbus-glib-1
   CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
-  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib
+  LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
+  PYTHON=${buildout:executable}
 
 [gobject-introspection]
 recipe = slapos.recipe.cmmi
@@ -79,6 +80,7 @@ environment =
   FFI_CFLAGS=-I${libffi:location}/include
   FFI_LIBS=-L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
   GIR_DIR=${buildout:parts-directory}/${:_buildout_section_name_}/share/gir-1.0
+  PYTHON=${buildout:executable}
 
 [pygobject3]
 recipe = slapos.recipe.cmmi
@@ -101,6 +103,7 @@ environment =
   GIO_LIBS=-L${glib:location}/lib -lgio-2.0
   GI_CFLAGS=-I${gobject-introspection:location}/include/gobject-introspection-1.0
   GI_LIBS=-L${gobject-introspection:location}/lib -lgirepository-1.0
+  PYTHON=${buildout:executable}
 
 [trusted-config]
 recipe = slapos.recipe.build:download
@@ -114,13 +117,13 @@ python = ${buildout:bin-directory}/${firewalld-eggs:interpreter}
 stop-on-error = True
 command =
   set -e
-  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-applet
-  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-cmd
-  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-config
-  sed -i 's#python2.7#${:python}#' ${firewalld:location}/bin/firewall-offline-cmd
-  sed -i 's#python2.7#${:python}#' ${firewalld:location}/${firewalld:sbin-dir}/firewalld
+  sed -i 's#python3#${:python}#' ${firewalld:location}/bin/firewall-applet
+  sed -i 's#python3#${:python}#' ${firewalld:location}/bin/firewall-cmd
+  sed -i 's#python3#${:python}#' ${firewalld:location}/bin/firewall-config
+  sed -i 's#python3#${:python}#' ${firewalld:location}/bin/firewall-offline-cmd
+  sed -i 's#python3#${:python}#' ${firewalld:location}/${firewalld:sbin-dir}/firewalld
 
-  sed -i 's#python2.7 /usr/bin/firewall-config#${:python} ${firewalld:location}/bin/firewall-config#' ${firewalld:etc-dir}/lockdown-whitelist.xml
+  sed -i 's#python3 /usr/bin/firewall-config#${:python} ${firewalld:location}/bin/firewall-config#' ${firewalld:etc-dir}/lockdown-whitelist.xml
 
   sed -i 's#DefaultZone=public#DefaultZone=trusted#' ${firewalld:etc-dir}/firewalld.conf
   sed -i 's#FirewallBackend=nftables#FirewallBackend=iptables#' ${firewalld:etc-dir}/firewalld.conf

component/fish-shell/buildout.cfg

@@ -14,8 +14,8 @@ extends =
 [fish-shell]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/fish-shell/fish-shell/releases/download/3.2.2/fish-3.2.2.tar.xz
-md5sum = 606253699ce41991b03a93bcc6047d51
+url = https://github.com/fish-shell/fish-shell/releases/download/3.4.1/fish-3.4.1.tar.xz
+md5sum = 80733d30a14ffa50bf48cce96296aa7a
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}

component/fluxbox/buildout.cfg

+[buildout]
+extends =
+  ../freetype/buildout.cfg
+  ../glib/buildout.cfg
+  ../libpng/buildout.cfg
+  ../pcre/buildout.cfg
+  ../xorg/buildout.cfg
+  ../gtk-2/buildout.cfg
+parts =
+    fluxbox
+
+[fluxbox]
+recipe = slapos.recipe.cmmi
+url = https://netcologne.dl.sourceforge.net/project/fluxbox/fluxbox/1.3.7/fluxbox-1.3.7.tar.bz2
+md6sum = c4701822d8a09d426ebf26e7e97c552a
+configure-options =
+  --enable-x
+  --enable-xext
+  --enable-xrender
+  --enable-xdmcp
+  --enable-freetype2
+  --enable-xinerama
+  --enable-fribidi
+  --enable-debug
+environment =
+  PATH=${freetype:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libXext:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libXdmcp:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${libXrandr:pkg_config_depends}:${libXrandr:location}/lib/pkgconfig:${xorgproto:pkg_config_depends}:${xorgproto:location}/share/pkgconfig:${fribidi:location}/lib/pkgconfig
+  LDFLAGS=-L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -Wl,-rpath=${libXrandr:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${xextproto:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -Wl,-rpath=${freetype:location}/lib -L${libXdmcp:location}/lib -L${libXinerama:location}/lib -Wl,-rpath=${libXinerama:location}/lib -L${fribidi:location}/lib -Wl,-rpath=${fribidi:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib
+  CPPFLAGS=-I${xextproto:location}/include -I${libX11:location}/include -I${libXrandr:location}/include -I${xorgproto:location}/include -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include -I${libXdmcp:location}/include -I${libXinerama:location}/include -I${fribidi:location}/include -I${libpng:location}/include
+  X11_CFLAGS=-I${libX11:location}/include
+  X11_LIBS=-L${libX11:location}/lib -lX11
+  FREETYPE2_CFLAGS=-I${freetype:location}/include
+  FREETYPE2_LIBS=-L${freetype:location}/lib -lfreetype
+  XRENDER_LIBS=-L${libXrender:location}/lib -lXrender
+  XRENDER_CFLAGS=-I${libXrender:location}/include
+  XINERAMA_CFLAGS=-I${libXinerama:location}/include
+  XINERAMA_LIBS=-L${libXinerama:location}/lib -lXinerama
+
+[wmctrl]
+recipe = slapos.recipe.cmmi
+#url = http://tripie.sweb.cz/utils/wmctrl/dist/wmctrl-1.07.tar.gz
+# latest version wmctrl 1.07 was not maintenaned for years, it fails to list windows
+url = https://github.com/saravanabalagi/wmctrl/archive/7ecfd2adaa2726a0c974b30bd6df2a65094032dd.tar.gz
+md5sum = 6337ecc72cf7bd393f319fc822294105
+configure-options =
+  --with-x
+  --x-includes=${libX11:location}/include
+  --x-libraries=${libX11:location}/lib
+environment =
+  PATH=${glib:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${libICE:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libxmu:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
+  LDFLAGS=-Wl,-rpath=${libX11:location}/lib -Wl,-rpath=${libICE:location}/lib -L${libxmu:location}/lib -Wl,-rpath=${libxmu:location}/lib -L${libSM:location}/lib -Wl,-rpath=${libSM:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libICE:location}/lib -lglib-2.0
+  CPPFLAGS=-I${xproto:location}/include -I${libxmu:location}/include -I${libSM:location}/include -I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include

component/fonts/buildout.cfg

@@ -31,25 +31,23 @@ md5sum = 5c781723a0d9ed6188960defba8e91cf
 # http://ipafont.ipa.go.jp/
 [ipaex-fonts]
 <= fonts-base
-url = http://dl.sourceforge.jp/ipafonts/57330/IPAexfont00201.zip
+url = https://osdn.net/frs/redir.php?f=ipafonts%2F57330%2FIPAexfont00201.zip
 md5sum = 7bf84182a04a9632268dbcb03f100d05
 
 [ipa-fonts]
 <= fonts-base
-url = http://dl.sourceforge.jp/ipafonts/51868/IPAfont00303.zip
+url = https://osdn.net/frs/redir.php?f=ipafonts%2F51868%2FIPAfont00303.zip
 md5sum = 39a828acf27790adbe4944dfb4d94bb1
 
 [ocrb-fonts]
 <= fonts-base
-url = http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Ftsukurimashou%2F56948%2Focr-0.2.zip
+url = https://osdn.net/frs/redir.php?f=tsukurimashou%2F56948%2Focr-0.2.zip
 md5sum = 9f2acd83291a31dbe053912f4115db75
 
 [android-fonts]
 <= fonts-base
-url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/f/fonts-android/fonts-android_4.3.orig.tar.xz
+url = http://archive.debian.org/debian-archive/debian/pool/main/f/fonts-android/fonts-android_4.3.orig.tar.xz
 md5sum = 2d41d5342eb5f61591ddeec5b80da74d
-environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
 
 # The DejaVu fonts are a font family based upon Bitstream Vera v1.10. Its purpose is to
 # provide a wider range of characters while maintaining the original look-and-feel

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.33.1.tar.xz
-md5sum = 3462f34d9c17288eee854b7645f6a0a1
+url = https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.35.1.tar.xz
+md5sum = 3aae077280b6be861e3c1c637491853a
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/gnutls/buildout.cfg

@@ -21,8 +21,8 @@ environment-extra =
 
 [libgpg-error]
 <= gpg-common
-version = 1.42
-md5sum = 133fed221ba8f63f5842858a1ff67cb3
+version = 1.44
+md5sum = 3956969812cd4fbd133b79c5b5a2e7f7
 configure-options-extra =
   --disable-doc
   --disable-tests

component/golang/buildout.cfg

@@ -19,7 +19,11 @@ shared = true
 configure-command = :
 location = @@LOCATION@@
 make-binary =
-make-targets= cd src && unset GOBIN && ./all.bash && cp -alf .. ${:location}
+# build and test Go and its standard library
+# clean intermediate cache before installing
+# contrary to build cache in gowork, build cache, that Go uses during its own build, is not reused anywhere:
+# https://github.com/golang/go/blob/go1.18.2-0-g8ed0e51b5e/src/cmd/dist/build.go#L239-L242
+make-targets= cd src && unset GOBIN && ./all.bash && GOCACHE=`pwd`/../pkg/obj/go-build ../bin/go clean -cache && cp -alf .. ${:location}
 # some testdata files have an issue with slapos.extension.strip.
 post-install = ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
 environment =
@@ -42,6 +46,8 @@ patches =
 url = https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz
 md5sum = dbf727a4b0e365bf88d97cbfde590016
 environment-extra =
+# build Go without testing it
+# NOTE go1.4 does not have build cache
 make-targets= cd src && unset GOBIN && ./make.bash && cp -alf .. ${:location}
 
 # skip-chown-tests.patch does not apply to go1.4, but we don't run go1.4 tests.
@@ -119,10 +125,10 @@ environment-extra =
 #
 # ${go:exe} is standalone executable that runs go in activated gowork environment.
 [go]
-recipe  = slapos.recipe.template:jinja2
+recipe  = slapos.recipe.template
 exe     = ${buildout:bin-directory}/go
-rendered= ${:exe}
-template= inline:
+output= ${:exe}
+inline =
   #!/bin/sh -e
   . ${gowork:env.sh}
   exec go "$@"

component/gtk-3/buildout.cfg

@@ -13,6 +13,7 @@ extends =
 
 [at-spi2-core]
 recipe = slapos.recipe.cmmi
+shared = true
 url =http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/at-spi2-core-2.22.0.tar.xz
 md5sum = 3da5fe62a653e49dad1c47f9a46fee56
 configure-options =
@@ -25,6 +26,7 @@ environment =
 
 [at-spi2-atk]
 recipe = slapos.recipe.cmmi
+shared = true
 url =http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/at-spi2-atk-2.22.0.tar.xz
 md5sum = aa62aed21b8e03dc44ab81ae49d893ca
 environment =
@@ -33,6 +35,7 @@ environment =
 
 [gtk-3]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://ftp.gnome.org/pub/gnome/core/3.22/3.22.2/sources/gtk+-3.22.3.tar.xz
 md5sum = f0e6492896a2ca244501142319adaa95
 pkg_config_depends = ${at-spi2-atk:location}/lib/pkgconfig:${at-spi2-core:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${libepoxy:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${libXi:pkg_config_depends}:${libXi:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${libX11:location}/lib/pkgconfig:${xorgproto:location}/lib/pkgconfig:${libXext:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${renderproto:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${xcbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXinerama:location}/lib/pkgconfig:${libXrandr:pkg_config_depends}:${libXrandr:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${libXcomposite:location}/lib/pkgconfig:${xdamage:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${compositeproto:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xorg-util-macros:location}/share/pkgconfig:${xproto:location}/lib/pkgconfig:${damageproto:location}/lib/pkgconfig:${xfixes:location}/lib/pkgconfig:${fixesproto:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig

component/gzip/buildout.cfg

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

component/headless-chromium/buildout.cfg

@@ -132,11 +132,11 @@ promises =
 # as future-proof against new versions of Chromium.
 [headless-chromium-wrapper]
 recipe = slapos.recipe.template:jinja2
-template =
-  inline:#!/bin/sh
+inline =
+  #!/bin/sh
   export LD_LIBRARY_PATH="{{ nss_location }}/lib:$LD_LIBRARY_PATH"
   exec {{ chromium_binary }} "$@"
-rendered = ${buildout:bin-directory}/headless-chromium
+output = ${buildout:bin-directory}/headless-chromium
 context =
   key nss_location nss:location
   key chromium_binary headless-chromium:binary

component/helloweb/buildout.cfg

@@ -34,10 +34,10 @@ install =
 [helloweb-go]
 # we already have gowork/bin/helloweb with helloweb Go build.
 # Add bin/helloweb-go that runs go version of helloweb without any environment preset needed.
-recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-template =
-    inline:#!/bin/sh -e
+recipe = slapos.recipe.template
+output = ${buildout:bin-directory}/${:_buildout_section_name_}
+inline =
+  #!/bin/sh -e
   . ${gowork:env.sh}
   exec helloweb "$@"
 
@@ -97,9 +97,9 @@ make-targets= ${bundler:bundle} install
 
 [helloweb-ruby]
 # NOTE slapos.cookbook:wrapper also works, but currently _only_ in instance
-recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-template =
-    inline:#!/bin/sh -e
+recipe = slapos.recipe.template
+output = ${buildout:bin-directory}/${:_buildout_section_name_}
+inline =
+  #!/bin/sh -e
   export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile
   exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@"

component/icu/buildout.cfg

@@ -5,7 +5,7 @@ parts = icu4c
 recipe = slapos.recipe.cmmi
 shared = true
 location = @@LOCATION@@
-url = http://download.icu-project.org/files/icu4c/58.2/icu4c-58_2-src.tgz
+url = https://github.com/unicode-org/icu/releases/download/release-58-2/icu4c-58_2-src.tgz
 md5sum = fac212b32b7ec7ab007a12dff1f3aea1
 configure-command = source/configure
 configure-options =
@@ -20,8 +20,3 @@ patches =
 
 [icu4c-58.2]
 <= icu4c
-
-[icu4c-55.1]
-<= icu4c
-url = http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-src.tgz
-md5sum = e2d523df79d6cb7855c2fbe284f4db29

component/inkscape/buildout.cfg

@@ -23,6 +23,8 @@ extends =
   ../popt/buildout.cfg
   ../xorg/buildout.cfg
   ../zlib/buildout.cfg
+# Inkscape < 1.1 only supports python2
+  ../python-2.7/buildout.cfg
 
 [gsl]
 recipe = slapos.recipe.cmmi
@@ -39,7 +41,7 @@ environment =
 [inkscape]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://inkscape.org/gallery/item/13330/inkscape-0.92.4_A6N0YOn.tar.bz2
+url = https://media.inkscape.org/dl/resources/file/inkscape-0.92.4.tar.bz2
 md5sum = ac30f6d5747fd9c620c00dad500f414f
 pkg_config_depends = ${freetype:location}/lib/pkgconfig:${gtkmm:location}/lib/pkgconfig:${gtkmm:pkg_config_depends}:${gsl:location}/lib/pkgconfig:${popt:location}/lib/pkgconfig:${garbage-collector:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig
 configure-command = ${cmake:location}/bin/cmake
@@ -52,7 +54,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:%(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:${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/jupyter-py2/buildout.cfg

@@ -40,8 +40,8 @@ url = ${:_profile_base_location_}/${:filename}
 
 [instance-jupyter-notebook]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/${:filename}
-rendered = ${buildout:directory}/template.cfg
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/template.cfg
 context =
   key bin_directory buildout:bin-directory
   key develop_eggs_directory buildout:develop-eggs-directory

component/jupyter-py2/buildout.hash.cfg

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

component/jupyter-py2/instance.cfg.in

@@ -73,8 +73,8 @@ environment =
 
 [jupyter-notebook-config]
 recipe = slapos.recipe.template:jinja2
-template = {{ jupyter_config_location }}/{{ jupyter_config_filename }}
-rendered = ${directory:jupyter_config_dir}/jupyter_notebook_config.py
+url = {{ jupyter_config_location }}/{{ jupyter_config_filename }}
+output = ${directory:jupyter_config_dir}/jupyter_notebook_config.py
 context =
   raw config_cfg ${buildout:directory}/knowledge0.cfg
 
@@ -130,8 +130,8 @@ target-directory = ${directory:erp5_kernel_dir}
 
 [kernel-json]
 recipe = slapos.recipe.template:jinja2
-template = {{ kernel_json_location }}/{{ kernel_json_filename }}
-rendered = ${directory:erp5_kernel_dir}/kernel.json
+url = {{ kernel_json_location }}/{{ kernel_json_filename }}
+output = ${directory:erp5_kernel_dir}/kernel.json
 # Use python2.7 executable bin file for kernel config
 context =
   raw python_executable {{ python_executable }}

component/kerberos/buildout.cfg

+[buildout]
+extends =
+    ../bison/buildout.cfg
+
+parts =
+    kerberos
+
+[kerberos]
+recipe = slapos.recipe.cmmi
+shared = true
+url = http://web.mit.edu/kerberos/dist/krb5/1.19/krb5-1.19.2.tar.gz
+md5sum = eb51b7724111e1a458a8c9a261d45a31
+configure-command = src/configure
+configure-options =
+    --prefix=@@LOCATION@@
+    --with-ldap=no
+    --without-readline
+    --without-tcl
+    --without-keyutils
+environment =
+  PATH=${bison:location}/bin:%(PATH)s

component/libcap-ng/buildout.cfg

 [buildout]
-
-extends =
-  ../attr/buildout.cfg
-
 parts = libcap-ng
 
 [libcap-ng]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.8.2.tar.gz
+#url = https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${:version}.tar.gz
+# ERROR: The certificate of 'people.redhat.com' doesn't have a known issuer.
+url = http://sources.buildroot.net/libcap-ng/libcap-ng-${:version}.tar.gz
+version = 0.8.2
 md5sum = faf1ef766cf068ad1aba4008ced665f7
-location = @@LOCATION@@
 configure-options =
   --with-python=no
   --with-python3=no

component/libepoxy/buildout.cfg

@@ -7,6 +7,7 @@ extends =
 
 [libepoxy]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://github.com/anholt/libepoxy/releases/download/v1.4/libepoxy-1.4.0.tar.xz
 md5sum = d8d8cbf2beb64975d424fcc5167a2a38
 environment =

component/libjpeg/buildout.cfg

 [buildout]
+extends =
+    ../ffmpeg/buildout.cfg
+    ../cmake/buildout.cfg
+
 parts =
   libjpeg
 
@@ -9,3 +13,34 @@ url = http://www.ijg.org/files/jpegsrc.v9d.tar.gz
 md5sum = 693a4e10906e66467ca21f045547fe15
 configure-options =
   --disable-static
+
+[libjpeg-turbo2]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://freefr.dl.sourceforge.net/project/libjpeg-turbo/${:version}/libjpeg-turbo-${:version}.tar.gz
+version = 2.1.2
+md5sum = e181bd78884dd5392a869209bfa41d4a
+configure-command = cmake
+configure-options =
+  -Bbuild
+  -DCMAKE_BUILD_TYPE=Release
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DENABLE_STATIC=0
+  -G"Unix Makefiles"
+make-options = -C build
+environment =
+  PATH=${cmake:location}/bin:%(PATH)s
+
+[libjpeg-turbo]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://freefr.dl.sourceforge.net/project/libjpeg-turbo/${:version}/libjpeg-turbo-${:version}.tar.gz
+version = 1.5.2
+md5sum = 6b4923e297a7eaa255f08511017a8818
+configure-options =
+  --disable-static
+  --with-gnu-ld
+  --with-jpeg7
+  --with-jpeg8
+environment =
+  PATH=${yasm:location}/bin:%(PATH)s

component/libsecret/buildout.cfg

@@ -6,7 +6,7 @@ extends =
   ../pkgconfig/buildout.cfg
   ../glib/buildout.cfg
   ../gettext/buildout.cfg
-  ../libuuid/buildout.cfg
+  ../util-linux/buildout.cfg
   ../xz-utils/buildout.cfg
 
 

component/libsodium/buildout.cfg

@@ -5,7 +5,7 @@ parts =
 [libsodium]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://download.libsodium.org/libsodium/releases/libsodium-1.0.8.tar.gz
+url = https://download.libsodium.org/libsodium/releases/old/unsupported/libsodium-1.0.8.tar.gz
 md5sum = 0a66b86fd3aab3fe4c858edcd2772760
 configure-options =
   --disable-static

component/libtiff/buildout.cfg

@@ -11,15 +11,18 @@ parts =
 [libtiff]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://download.osgeo.org/libtiff/tiff-4.0.8.tar.gz
-md5sum = 2a7d1c1318416ddf36d5f6fa4600069b
+url = http://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz
+md5sum = 2bbf6db1ddc4a59c89d6986b368fc063
 configure-options =
   --disable-static
   --without-x
+  --disable-libdeflate
   --disable-lzma
+  --disable-zstd
+  --disable-webp
 patch-options = -p1
 patches =
-  ${:_profile_base_location_}/debian_4.0.8-2+deb9u5.patch#dc9c9cb7f4f9a00100f908e640895185
+  ${:_profile_base_location_}/debian_4.2.0-1+deb11u1.patch#2ded3a01abc353bad4aa1a1f128d6d1a
 environment =
   CPPFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
   LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/libuuid/buildout.cfg

-[buildout]
-parts =
-  libuuid
-
-extends =
-  ../perl/buildout.cfg
-
-[libuuid]
-recipe = slapos.recipe.cmmi
-shared = true
-url = http://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz
-md5sum = d659bf7cd417d93dc609872f6334b019
-configure-options =
-  --disable-static
-  --disable-all-programs
-  --enable-libuuid
-  --without-libiconv-prefix
-  --without-libintl-prefix
-  --without-ncurses
-  --without-slang
-  --without-pam
-  --without-selinux
-  --without-audit
-
-environment =
-  PATH=${perl:location}/bin:%(PATH)s

component/libvnc/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../lzo/buildout.cfg
+  ../libtirpc/buildout.cfg
+  ../kerberos/buildout.cfg
+  ../xorg/buildout.cfg
+
+parts =
+  x11vnc
+
+[libvncserver]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/LibVNC/libvncserver/archive/refs/tags/LibVNCServer-0.9.13.tar.gz
+md5sum = 503b5527b93dce77e8b6a45f273f6e39
+configure-command = cmake
+configure-options =
+  -Bbuild
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DBUILD_SHARED_LIBS=ON
+  -DWITH_SYSTEMD=OFF
+  -DWITH_SDL=OFF
+  -DWITH_GTK=OFF
+  -DWITH_WEBSOCKETS=ON
+  -DWITH_LZO=ON
+  -DWITH_GCRYPT=ON
+  -DWITH_IPv6=ON
+  -DWITH_JPEG=ON
+  -DWITH_FFMPEG=OFF
+  -DWITH_PNG=ON
+  -DWITH_GNUTLS=ON
+  -DWITH_OPENSSL=ON
+  -DZLIB_INCLUDE_DIR=${zlib:location}/include
+  -DZLIB_LIBRARY=${zlib:location}/lib/libz.so
+  -DJPEG_LIBRARY=${libjpeg-turbo2:location}/lib/libjpeg.so
+  -DJPEG_INCLUDE_DIR=${libjpeg-turbo2:location}/include
+  -DPNG_LIBRARY=${libpng:location}/lib/libpng.so
+  -DPNG_PNG_INCLUDE_DIR=${libpng:location}/include
+  -DOPENSSL_INCLUDE_DIR=${openssl:location}/include
+  -DLZO_INCLUDE_DIR=${lzo:location}/include
+  -DLZO_LIBRARIES=${lzo:location}/lib/liblzo2.a
+  -DGNUTLS_LIBRARY=${gnutls:location}/lib/libgnutls.so
+  -DGNUTLS_INCLUDE_DIR=${gnutls:location}/include
+
+make-options = -C build
+environment =
+  PATH=${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libjpeg-turbo2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+  CPPFLAGS=-I${openssl:location}/include -I${libgcrypt:location}/include -I${libjpeg-turbo2:location}/include -I${gnutls:location}/include -I${lzo:location}/include
+  LDFLAGS=-L${libgcrypt:location}/lib -Wl,-rpath=${libgcrypt:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libjpeg-turbo2:location}/lib -Wl,-rpath=${libjpeg-turbo2:location}/lib -Wl,-rpath=${libpng:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gnutls:location}/lib -Wl,-rpath=${gnutls:location}/lib -L${lzo:location}/lib -pthread -ljpeg
+
+[x11vnc]
+recipe = slapos.recipe.cmmi
+url = https://github.com/LibVNC/x11vnc/archive/0.9.16.tar.gz
+md5sum = 64172e8f896389ec963fff93415f0d93
+pre-configure =
+  autoreconf -fiv -I ${libtool:location}/share/aclocal -I ${pkgconfig:location}/share/aclocal -I ${gettext:location}/share/aclocal
+configure-options =
+  --without-crypt
+  --without-avahi
+  --without-xinerama
+  --without-xtrap
+  --without-xrecord
+  --without-v4l
+  --without-fbpm
+  --without-dpms
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig:${libX11:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${xextproto:location}/lib/pkgconfig:${libXtst:location}/lib/pkgconfig:${libvncserver:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  CPPFLAGS=-I${openssl:location}/include -I${libX11:location}/include -I${xproto:location}/include -I${xorgproto:location}/include -I${libXi:location}/include -I${libXtst:location}/include -I${libXext:location}/include -I${xextproto:location}/include -I${libvncserver:location}/include -I${zlib:location}/include -I${libXrandr:location}/include -I${xfixes:location}/include -I${xdamage:location}/include -I${libXcomposite:location}/include -I${libXrender:location}/include
+  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${xproto:location}/lib -L${xorgproto:location}/lib -L${libXi:location}/lib -L${libXtst:location}/lib -Wl,-rpath=${libXtst:location}/lib -L${libXext:location}/lib -L${xextproto:location}/lib -Wl,-rpath=${libXext:location}/lib -L${libvncserver:location}/lib -Wl,-rpath=${libvncserver:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libXrandr:location}/lib -Wl,-rpath=${libXrandr:location}/lib -L${xfixes:location}/lib -Wl,-rpath=${xfixes:location}/lib -L${xdamage:location}/lib -Wl,-rpath=${xdamage:location}/lib -L${libXcomposite:location}/lib -Wl,-rpath=${libXcomposite:location}/lib -L${libXrender:location}/lib -Wl,-rpath=${libXrender:location}/lib -Wl,-rpath=${libtirpc:location}/lib -Wl,-rpath=${kerberos:location}/lib

component/lmsensors/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [lmsensors]
 recipe = slapos.recipe.cmmi
+url = https://src.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-3.3.5.tar.bz2/da506dedceb41822e64865f6ba34828a/lm_sensors-3.3.5.tar.bz2
 md5sum = da506dedceb41822e64865f6ba34828a
-url = http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-3.3.5.tar.bz2
 configure-command = true
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}

component/lunzip/buildout.cfg

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

component/lzo/buildout.cfg

@@ -5,5 +5,6 @@ parts =
 
 [lzo]
 recipe = slapos.recipe.cmmi
-url = http://www.oberhumer.com/opensource/lzo/download/lzo-2.09.tar.gz 
-md5sum = c7ffc9a103afe2d1bba0b015e7aa887f 
+shared = true
+url = https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz
+md5sum = 39d3f3f9c55c87b1e5d6888e1420f4b5 

component/macros/virtual-env.cfg

+[buildout]
+extends =
+	../pygolang/buildout.cfg
+
+[virtual-env-base]
+recipe = slapos.recipe.build
+_name = ${:_buildout_section_name_}
+init =
+  from zc.buildout.easy_install import working_set
+  import os
+  name = options['_name']
+  eggs = options['eggs']
+  try:
+    scripts = "scripts = " + options['scripts']
+  except KeyError:
+    scripts = ""
+
+  self.buildout.parse("""
+  [.%(name)s.install-eggs]
+  recipe = zc.recipe.egg
+  eggs = %(eggs)s
+  %(scripts)s
+
+  [.%(name)s.install-interpreter]
+  <= python-interpreter
+  eggs += %(eggs)s
+  """ % locals())
+install =
+  with open(location, "w") as f:
+    f.write(options['template'] % {
+      "path" : self.buildout['buildout']['bin-directory'],
+      "name" : self.name,
+    })
+
+# Template virtual env for bash shell in posix
+[virtual-env-base:posix]
+template =
+  deactivate () {
+    set PATH PS1
+    while [ "$1" ]; do
+      eval "if [ \"\$_OLD_VENV_$1\" ]; then $1=\$_OLD_VENV_$1; else unset $1; fi; unset \$_OLD_VENV_$1"
+      shift
+    done
+    unset -f deactivate
+  }
+
+
+  VENV_PATH=%(path)s
+  _OLD_VENV_PATH=$PATH
+  _OLD_VENV_PS1=$PS1
+  PATH=$VENV_PATH:$PATH
+  PS1='(%(name)s) '$PS1

component/make/buildout.cfg

@@ -14,7 +14,7 @@ parts =
 
 [make3.81-debian]
 recipe = slapos.recipe.cmmi
-url = http://ftp.de.debian.org/debian/pool/main/m/make-dfsg/make-dfsg_3.81.orig.tar.gz
+url = http://archive.debian.org/debian-archive/debian/pool/main/m/make-dfsg/make-dfsg_3.81.orig.tar.gz
 md5sum = 7c93b1ab4680eb21c2c13f4f47741e2d
 shared = true
 patches =

component/mariadb/buildout.cfg

@@ -81,7 +81,7 @@ environment =
   PATH=${patch:location}/bin:%(PATH)s
 patch-options = -p1
 patches =
-  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.22-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
+  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.34-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
 post-install = 
   ldd=`ldd %(location)s/lib/plugin/ha_rocksdb.so`
   for x in ${lz4:location} ${snappy:location} ${zstd:location}

component/matiec/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+  ../flex/buildout.cfg
+  ../bison/buildout.cfg
+
+[matiec]
+recipe = slapos.recipe.cmmi
+url = https://github.com/beremiz/matiec/archive/${:version}.tar.gz
+md5sum = 6ee62c3d523c6154e7d781d98756444f
+version = f59f45d5219172dea171d8ff305f28606a9500ff
+pre-configure =
+  ${autoconf:location}/bin/autoreconf -i
+make-targets =
+post-install =
+  cp -r * %(location)s/
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${flex:location}/bin:${bison:location}/bin:%(PATH)s
+
+[Modbus]
+recipe = slapos.recipe.cmmi
+url = https://hg.beremiz.org/Modbus/archive/e319814f1c17.tar.bz2
+md5sum = ad43fdacf223c7861576422eb89c15aa
+configure-command = true
+make-targets =
+post-install =
+  cp -r *.h libmb.a libmb.so %(location)s/

component/matplotlib/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 [matplotlibrc]
 recipe = slapos.recipe.template:jinja2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-template = ${:_profile_base_location_}/${:filename}
-rendered = ${matplotlibrc:location}/matplotlibrc
+url = ${:_profile_base_location_}/${:filename}
+output = ${matplotlibrc:location}/matplotlibrc
 backend = agg
 context =
   key backend matplotlibrc:backend

component/nano/buildout.cfg

@@ -10,9 +10,8 @@ extends =
 [nano]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.nano-editor.org/dist/v2.8/nano-2.8.4.tar.xz
-md5sum = 02ff28870194178595b287fc16fa611b
-location = @@LOCATION@@
+url = https://www.nano-editor.org/dist/v6/nano-6.2.tar.xz
+md5sum = 12784a5c245518d7580125ebbd6b7601
 # The dummy PKG_CONFIG is in the case that both pkg-config and ncursesw
 # are installed on the system.
 environment=
@@ -21,5 +20,6 @@ environment=
   CPPFLAGS=-I${file:location}/include -I${zlib:location}/include
   LDFLAGS=-L${file:location}/lib/ -Wl,-rpath=${file:location}/lib/ -L${zlib:location}/lib/ -Wl,-rpath=${zlib:location}/lib/
 post-install =
-  cd ${:location} && mkdir etc &&
-  echo include "${:location}/share/nano/*.nanorc" > etc/nanorc
+  cd %(location)s
+  mkdir etc
+  echo 'include %(location)s/share/nano/*.nanorc' > etc/nanorc

component/nftables/buildout.cfg

@@ -49,4 +49,5 @@ configure-options =
   --enable-python
   --with-json
   --without-cli
+  --with-python-bin=${buildout:executable}
 

component/nodejs/buildout.cfg

@@ -7,6 +7,7 @@ extends =
   ../openssl/buildout.cfg
   ../zlib/buildout.cfg
   ../python-2.7/buildout.cfg
+  ../python3/buildout.cfg
 
 parts =
   nodejs
@@ -14,6 +15,17 @@ parts =
 #[nodejs]
 #<= nodejs-X.Y.Z
 
+# nodejs 16 needs gcc > 8.3
+[nodejs-16.13.2]
+<= nodejs-base
+openssl_location = ${openssl:location}
+version = v16.13.2
+md5sum = ae3a05fc273536f83c685a7425a7882d
+patches =
+  https://raw.githubusercontent.com/nxhack/openwrt-node-packages/9e3ab4cc9fd5f19c25ccd6f19be5a9b47e2c6933/node/patches/v16.x/010-execvp-arg-list-too-long.patch#17bb14ea3a1b5b4832e3680e4edfeded
+patch-options = -p1
+PATH = ${pkgconfig:location}/bin:${python3:location}/bin:${patch:location}/bin/:%(PATH)s
+
 [nodejs-14.16.0]
 <= nodejs-base
 openssl_location = ${openssl:location}
@@ -66,16 +78,3 @@ environment =
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-Wl,-rpath=${:openssl_location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LD_LIBRARY_PATH=${:openssl_location}/lib
-
-[npm]
-# Node.js Package Manager
-# Deprecated. Included in node >= 0.6.3.
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-commit = 3136abc5c6b3ed332c4700ece24450fada63639b
-origin = https://github.com/isaacs/npm.git
-git-bin = ${git:location}/bin/git
-node-bin = ${nodejs-0.4:location}/bin/node
-command = (GIT_SSL_NO_VERIFY=true ${:git-bin} clone --quiet ${:origin} ${:location} && cd ${:location} && ${:git-bin} reset --hard ${:commit} && ${:location}/configure --prefix=${:location} && GIT_SSL_NO_VERIFY=true ${:git-bin} submodule update --init --recursive && ${:node-bin} cli.js install npm@1.0.106 -g -f) || (rm -fr ${:location}; exit 1)
-update-command =

component/nxdtest/buildout.cfg

@@ -31,6 +31,6 @@ depends = ${python-prctl:egg}
 [nxdtest-repository]
 recipe  = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/nxdtest.git
-revision = 6f75fa90
+revision = 56e52da6
 location = ${buildout:parts-directory}/nxdtest
 git-executable = ${git:location}/bin/git

component/nxdtest/test.cfg

@@ -21,20 +21,20 @@ eggs +=
 
 # env.sh for interpreter to be on $PATH.
 [nxdtest-env.sh]
-recipe   = slapos.recipe.template:jinja2
-rendered = ${buildout:directory}/${:_buildout_section_name_}
-template = inline:
+recipe   = slapos.recipe.template
+output = ${buildout:directory}/${:_buildout_section_name_}
+inline =
   export PS1="(nxdtest-env) $PS1"
   export PATH=${buildout:bin-directory}:$PATH
 
 # instance to run nxdtest.
 [instance.cfg]
 <= jinja2-template
-template = inline:
+inline =
   [buildout]
-  extends = ${nxdtest-instance.cfg:rendered}
+  extends = ${nxdtest-instance.cfg:output}
 
   [runTestSuite]
-  env.sh  = ${nxdtest-env.sh:rendered}
+  env.sh  = ${nxdtest-env.sh:output}
   workdir = ${nxdtest-repository:location}
 

component/opencv/buildout.cfg

+[buildout]
+extends =
+  ../java/buildout.cfg
+  ../java-jdk/buildout.cfg
+  ../cmake/buildout.cfg
+  ../libjpeg/buildout.cfg
+parts =
+  opencv
+
+[java-re]
+<= java-re-temurin-11
+
+[ant]
+recipe = slapos.recipe.build:download-unpacked
+shared = true
+url = https://dlcdn.apache.org/ant/binaries/apache-ant-1.9.16-bin.tar.bz2
+md5sum = 2a1ef0230e673b6da876a8fc9744b9a1
+
+[opencv]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://github.com/opencv/opencv/archive/4.3.0.tar.gz
+configure-command = cmake
+configure-options =
+  -Bbuild
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DCMAKE_BUILD_TYPE=RELEASE
+  -DINSTALL_PYTHON_EXAMPLES=OFF
+  -DINSTALL_C_EXAMPLES=OFF
+  -DOPENCV_ENABLE_NONFREE=ON
+  -DPYTHON_EXECUTABLE=${python2.7:location}/bin/python
+  -DANT_EXECUTABLE=${ant:location}/bin/ant
+  -DBUILD_SHARED_LIBRARY=OFF
+  -DBUILD_TESTS=OFF
+  -DBUILD_PERF_TESTS=OFF
+  -DBUILD_EXAMPLES=OFF
+  -DBUILD_JAVA=ON
+  -DJAVA_AWT_INCLUDE_PATH=${java-jdk:location}/include
+  -DJAVA_AWT_LIBRARY=${java-jdk:location}/lib/libawt.so
+  -DJAVA_INCLUDE_PATH=${java-jdk:location}/include
+  -DJAVA_INCLUDE_PATH2=${java-jdk:location}/include/linux
+  -DJAVA_JVM_LIBRARY=${java-jdk:location}/include/jni.h
+  -DWITH_VTK=OFF
+  -DWITH_FFMPEG=OFF
+  -DWITH_GTK=OFF
+  -DPYTHON_LIBRARIES=${python:location}/lib
+  -DPYTHON_INCLUDE_DIRS=${python:location}/include/python${python:version}
+  -DZLIB_INCLUDE_DIR=${zlib:location}/include
+  -DZLIB_LIBRARY=${zlib:location}/lib/libz.so
+  -DJPEG_LIBRARY=${libjpeg-turbo2:location}/lib/libjpeg.so
+  -DJPEG_INCLUDE_DIR=${libjpeg-turbo2:location}/include
+  -DPNG_LIBRARY=${libpng:location}/lib/libpng.so
+  -DPNG_PNG_INCLUDE_DIR=${libpng:location}/include
+
+make-options = -C build
+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
+  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}
+  CPPFLAGS=-I${libjpeg-turbo2:location}/include -I${libpng:location}/include
+  LDFLAGS=-L${libjpeg-turbo2:location}/lib -Wl,-rpath=${libjpeg-turbo2:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib -Wl,-rpath=@@LOCATION@@/lib

component/openssl/buildout.cfg

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

component/pcre/buildout.cfg

@@ -7,7 +7,7 @@ parts =
 [pcre]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://ftp.pcre.org/pub/pcre/pcre-8.45.tar.bz2
+url = https://download.sourceforge.net/pcre/pcre/8.45/pcre-8.45.tar.bz2
 md5sum = 4452288e6a0eefb2ab11d36010a1eebb
 configure-options =
   --disable-static

component/percona-toolkit/buildout.cfg

@@ -11,7 +11,7 @@ shared = false
 <= perl-CPAN-package
 # XXX it's not on CPAN, so we use url
 version = 3.0.3
-url = https://www.percona.com/downloads/percona-toolkit/${:version}/source/tarball/percona-toolkit-${:version}.tar.gz
+url = https://downloads.percona.com/downloads/percona-toolkit/${:version}/source/tarball/percona-toolkit-${:version}.tar.gz
 md5sum = 8af181994fdf9aa984475637861098e9
 
 inc = ${perl-DBI:site_perl}:${perl-DBD-mariadb:site_perl}

component/perl/buildout.cfg

@@ -117,12 +117,12 @@ perl_location = ${perl:location}
 #  - inc : colon (:) separated site perl of modules to include in @INC
 # Outputs:
 #  - perl-bin : an executable perl
-recipe = slapos.recipe.template:jinja2
-template = inline: 
+recipe = slapos.recipe.template
+inline =
   #!/bin/sh
   {% set inc = "${:inc}".split(':') %} {# XXX we could remove duplicates from inc #}
   exec ${perl:location}/bin/perl \
   {% for item in inc -%}{% if item %}  -I "{{ item }}" \
   {% endif %}{% endfor %}  "$@"
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-perl-bin = ${:rendered}
+output = ${buildout:bin-directory}/${:_buildout_section_name_}
+perl-bin = ${:output}

component/poppler/buildout.cfg

@@ -14,7 +14,7 @@ extends =
 [poppler]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://poppler.freedesktop.org/poppler-0.43.0.tar.xz
+url = https://poppler.freedesktop.org/poppler-0.43.0.tar.xz
 md5sum = 1d2b001663119855cdfbc0713dbfb9c6
 configure-options =
   --disable-cairo-output

component/proxysql/buildout.cfg

@@ -25,7 +25,7 @@ parts =
 recipe = slapos.recipe.cmmi
 shared = true
 version = v2.3.2
-url = https://github.com/sysown/proxysql/archive/${:version}.tar.gz
+url = https://github.com/sysown/proxysql/archive/refs/tags/${:version}.tar.gz
 md5sum = 969129ac43c9f64641509891a116e0e1
 configure-command = true
 make-options = GIT_VERSION=${:version}

component/pygolang/buildout.cfg

@@ -88,12 +88,10 @@ init =
   # .X.pyprog is python program to start and run entry
   # it uses .X.pyexe as underlying python interpreter
   [.%(name)s.pyprog]
-  recipe  = slapos.recipe.template:jinja2
+  recipe  = slapos.recipe.template
   exe     = %(exe)s
-  rendered= $${:exe}
-  mode    = 755
-  template=
-    inline:
+  output= $${:exe}
+  inline =
     #!$${.%(name)s.pyexe:exe}
     import sys
   %(__pyinit)s
@@ -109,4 +107,4 @@ init =
 
 
 [versions]
-pygolang = 0.0.9
+pygolang = 0.1

component/pygolang/test.cfg

@@ -28,21 +28,21 @@ eggs = ${pygolang:egg}
 
 # env.sh for pygolang's python/gpython to be on $PATH.
 [pygolang-env.sh]
-recipe   = slapos.recipe.template:jinja2
-rendered = ${buildout:directory}/${:_buildout_section_name_}
-template = inline:
+recipe   = slapos.recipe.template
+output = ${buildout:directory}/${:_buildout_section_name_}
+inline =
   export PS1="(pygolang-env) $PS1"
   export PATH=${buildout:bin-directory}:$PATH
 
 # instance to run nxdtest.
 [instance.cfg]
 <= jinja2-template
-template = inline:
+inline =
   [buildout]
-  extends = ${nxdtest-instance.cfg:rendered}
+  extends = ${nxdtest-instance.cfg:output}
 
   [runTestSuite]
-  env.sh  = ${pygolang-env.sh:rendered}
+  env.sh  = ${pygolang-env.sh:output}
   workdir = ${pygolang-repository:location}
 
 

component/pylint/astroid-six_moves_import_error.patch

+commit cf5648658c87b6e3b2fa4394b5921792827246dc
+Author: Bryce Guinta <bryce.paul.guinta@gmail.com>
+Date:   Sun Jan 7 14:28:42 2018 -0700
+
+    Fix submodule import in six.moves
+
+    This commit fixes import errors when modname
+    started with, but was not equal, to six.moves
+---
+ astroid/brain/pysix_moves.py | 38 ++++++++++++++++++++++++++++++++----
+ 1 file changed, 34 insertions(+), 4 deletions(-)
+
+diff --git a/astroid/brain/pysix_moves.py b/astroid/brain/pysix_moves.py
+index 548d9761..1db6566a 100644
+--- a/astroid/brain/pysix_moves.py
++++ b/astroid/brain/pysix_moves.py
+@@ -23,7 +23,8 @@
+ 
+ from astroid import MANAGER, register_module_extender
+ from astroid.builder import AstroidBuilder
+-from astroid.exceptions import AstroidBuildingException
++from astroid.exceptions import AstroidBuildingException, NotFoundError
++from astroid import nodes
+ 
+ def _indent(text, prefix, predicate=None):
+     """Adds 'prefix' to the beginning of selected lines in 'text'.
+@@ -48,6 +49,7 @@
+     import CGIHTTPServer
+     import SimpleHTTPServer
+ 
++    import cPickle
+     from StringIO import StringIO
+     from cStringIO import StringIO as cStringIO
+     from UserDict import UserDict
+@@ -194,7 +196,7 @@
+     import html.entities as html_entities
+     import html.parser as html_parser
+     import http.client as http_client
+-    import http.server
++    import http.server as http_server
+     BaseHTTPServer = CGIHTTPServer = SimpleHTTPServer = http.server
+     import pickle as cPickle
+     import queue
+@@ -225,7 +227,8 @@
+     import tkinter.filedialog as tkinter_tkfiledialog
+     import tkinter.font as tkinter_font
+     import tkinter.messagebox as tkinter_messagebox
+-    import urllib.request
++    import urllib
++    import urllib.request as urllib_request
+     import urllib.robotparser as urllib_robotparser
+     import urllib.parse as urllib_parse
+     import urllib.error as urllib_error
+@@ -248,10 +251,38 @@
+ 
+ 
+ def _six_fail_hook(modname):
+-    if modname != 'six.moves':
++    """Fix six.moves imports due to the dynamic nature of this
++    class.
++
++    Construct a psuedo-module which contains all the nessecary imports
++    for six
++
++    :param modname: Name of failed module
++    :type modname: str
++
++    :return: An astroid module
++    :rtype: nodes.Module
++    """
++
++    attribute_of = (modname != "six.moves" and
++                    modname.startswith("six.moves"))
++    if modname != 'six.moves' and not attribute_of:
+         raise AstroidBuildingException
+     module = AstroidBuilder(MANAGER).string_build(_IMPORTS)
+     module.name = 'six.moves'
++    if attribute_of:
++        # Facilitate import of submodules in Moves
++        start_index = len(module.name)
++        attribute = modname[start_index:].lstrip(".").replace(".", "_")
++        try:
++            import_attr = module.getattr(attribute)[0]
++        except NotFoundError:
++            raise AstroidBuildingException
++        if isinstance(import_attr, nodes.Import):
++            submodule = MANAGER.ast_from_module_name(import_attr.names[0][0])
++            return submodule
++    # Let dummy submodule imports pass through
++    # This will cause an Uninferable result, which is okay
+     return module
+ 
+ 

component/pylint/buildout.cfg

 [buildout]
 parts =
   pylint
+  astroid
 extends =
   ../patch/buildout.cfg
 
+[astroid]
+recipe = zc.recipe.egg:custom
+egg = astroid
+patches =
+  ${:_profile_base_location_}/astroid-six_moves_import_error.patch#377beb0c50f52b9608bb6be7bf93096e
+patch-options = -p1
+patch-binary = ${patch:location}/bin/patch
+
 [pylint]
 recipe = zc.recipe.egg:custom
 egg = pylint
 patches =
   ${:_profile_base_location_}/pylint-super_on_old_class.patch#cb0c3f8c091bf4980be395c917edc435
+  ${:_profile_base_location_}/pylint-redefining-builtins-modules.patch#043defc6e9002ac48b40e078797d4d17
 patch-options = -p1
 patch-binary = ${patch:location}/bin/patch

component/pylint/pylint-redefining-builtins-modules.patch

+From 258eee33e9a059b704546772b42683699894b52e Mon Sep 17 00:00:00 2001
+From: Claudiu Popa <pcmanticore@gmail.com>
+Date: Fri, 25 Mar 2016 14:36:31 +0000
+Subject: [PATCH] Backport of new option, 'redefining-builtins-modules'.
+
+commit 5674ff98a6cd090578910c2c3bb02e1328f8e6d2
+Author: Claudiu Popa <pcmanticore@gmail.com>
+Date:   Wed Apr 4 20:56:59 2018 +0200
+    builtins is allowed to redefine builtins. Close #1966
+
+commit 5674ff98a6cd090578910c2c3bb02e1328f8e6d2
+Author: Claudiu Popa <pcmanticore@gmail.com>
+Date:   Wed Apr 4 20:56:59 2018 +0200
+    builtins is allowed to redefine builtins. Close #1966
+
+commit 44a2431745e61ff7d7ded7db5145da835b5877d1
+Author: Claudiu Popa <pcmanticore@gmail.com>
+Date:   Tue Dec 12 18:10:26 2017 +0100
+    past.builtins import don't trigger redefined-builtin. Close #1764
+
+commit ad7c2cd38f7213edd1ff37aaead86d5ae8390df4.
+Author: Claudiu Popa <pcmanticore@gmail.com>
+Date:   Fri Mar 25 14:36:31 2016 +0000
+    Add a new option, 'redefining-builtins-modules'.
+
+    The option can be used for controlling the modules
+    which can redefine builtins, such as six.moves and future.builtins.
+
+    Close #464.
+---
+ pylint/checkers/variables.py | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/pylint/checkers/variables.py b/pylint/checkers/variables.py
+index 8f6f9574..3223f8f0 100644
+--- a/pylint/checkers/variables.py
++++ b/pylint/checkers/variables.py
+@@ -309,7 +309,13 @@ builtins. Remember that you should avoid to define new builtins when possible.'
+                  'help' : 'List of strings which can identify a callback '
+                           'function by name. A callback name must start or '
+                           'end with one of those strings.'}
+-               )
++               ),
++               ("redefining-builtins-modules",
++                {'default': ('six.moves', 'past.builtins', 'future.builtins', 'builtins', 'io'), 'type': 'csv',
++                 'metavar': '<comma separated list>',
++                 'help': 'List of qualified module names which can have objects '
++                         'that can redefine builtins.'}
++               ),
+               )
+     def __init__(self, linter=None):
+         BaseChecker.__init__(self, linter)
+@@ -323,7 +329,8 @@ builtins. Remember that you should avoid to define new builtins when possible.'
+         self._to_consume = [(copy(node.locals), {}, 'module')]
+         for name, stmts in six.iteritems(node.locals):
+             if is_builtin(name) and not is_inside_except(stmts[0]):
+-                # do not print Redefining builtin for additional builtins
++                if self._should_ignore_redefined_builtin(stmts[0]):
++                    continue
+                 self.add_message('redefined-builtin', args=name, node=stmts[0])
+ 
+     @check_messages('unused-import', 'unused-wildcard-import',
+@@ -496,7 +503,7 @@ builtins. Remember that you should avoid to define new builtins when possible.'
+                 dummy_rgx = self.config.dummy_variables_rgx
+                 if not dummy_rgx.match(name):
+                     self.add_message('redefined-outer-name', args=(name, line), node=stmt)
+-            elif is_builtin(name):
++            elif is_builtin(name) and not self._should_ignore_redefined_builtin(stmt):
+                 # do not print Redefining builtin for additional builtins
+                 self.add_message('redefined-builtin', args=name, node=stmt)
+ 
+@@ -688,6 +695,11 @@ builtins. Remember that you should avoid to define new builtins when possible.'
+                    and not ass.statement() is node.statement():
+                 self.add_message('undefined-loop-variable', args=name, node=node)
+ 
++    def _should_ignore_redefined_builtin(self, stmt):
++        if not isinstance(stmt, astroid.From):
++            return False
++        return stmt.modname in self.config.redefining_builtins_modules
++
+     @check_messages('redefine-in-handler')
+     def visit_excepthandler(self, node):
+         for name in get_all_elements(node.name):
+-- 
+2.36.0
+

component/python-2.7/buildout.cfg

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

component/python-slip/buildout.cfg

@@ -6,27 +6,19 @@ parts =
 [python-slip]
 # BUG: This section does FS changes outside location.
 recipe = slapos.recipe.cmmi
-url = https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.1/python-slip-0.6.1.tar.bz2
-md5sum = a6d8ee96245fc21785d4c1c062c85f2f
+url = https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.5/python-slip-0.6.5.tar.bz2
+md5sum = 28ae5f93853466c44ec96706ba2a1eb4
 configure-command = true
 make-targets = 
 make-binary = 
   make all
   cp -ax . ${:slip}/
   cp -ax . ${:slip.dbus}/
-  cp -ax . ${:slip.gtk}/
   sed -i '/setup(name="slip.dbus"/,/"gtk", "pango"])/d' ${:slip}/setup.py
   sed -i '/setup(name="slip"/,/selinux"])/d' ${:slip.dbus}/setup.py
   sed -i '/if sys.version_info.major/,/"gtk", "pango"])/d' ${:slip.dbus}/setup.py
-  sed -i '/setup(name="slip"/,/xml.etree.ElementTree"])/d' ${:slip.gtk}/setup.py
 slip = ${buildout:parts-directory}/slip
 slip.dbus = ${buildout:parts-directory}/slip.dbus
-slip.gtk = ${buildout:parts-directory}/slip.gtk
-
-[slip.gtk-develop]
-recipe = zc.recipe.egg:develop
-setup = ${python-slip:slip.gtk}
-egg-name = slip.gtk
 
 [slip.dbus-develop]
 recipe = zc.recipe.egg:develop
@@ -43,5 +35,4 @@ recipe = zc.recipe.egg
 eggs =
   ${slip-develop:egg-name}
   ${slip.dbus-develop:egg-name}
-  ${slip.gtk-develop:egg-name}
   

component/qemu-kvm/buildout.cfg

@@ -8,7 +8,7 @@ extends =
   ../libcap-ng/buildout.cfg
   ../libpng/buildout.cfg
   ../liburing/buildout.cfg
-  ../libuuid/buildout.cfg
+  ../util-linux/buildout.cfg
   ../meson/buildout.cfg
   ../ncurses/buildout.cfg
   ../ninja/buildout.cfg

component/qt/buildout.cfg

@@ -10,7 +10,7 @@ parts =
 recipe = slapos.recipe.cmmi
 shared = true
 location = @@LOCATION@@
-url = http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.gz
+url = https://download.qt.io/new_archive/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.gz
 md5sum = 7aa5841b50c411e23e31e8a6cc1c6981
 configure-command = ./configure
 configure-options =
@@ -42,7 +42,7 @@ post-install =
 # qmake binary can be reached directly from ${qt:location}/bin/qmake if [qt] is fully built
 recipe = slapos.recipe.cmmi
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-url = http://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
+url = https://download.qt.io/new_archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
 md5sum = d990ee66bf7ab0c785589776f35ba6ad
 # see https://github.com/NixOS/nixpkgs/blob/3e387c3e005c87566b5403d24c86f71f4945a79b/pkgs/development/libraries/qt-4.x/4.8/default.nix#L101
 pre-configure =

component/quic_client-bin/buildout.cfg

@@ -11,7 +11,7 @@ extends =
   ../pcre/buildout.cfg
   ../libffi/buildout.cfg
   ../zlib/buildout.cfg
-  ../libuuid/buildout.cfg
+  ../util-linux/buildout.cfg
 # compilation
   ../git/buildout.cfg
 

component/r-language/buildout.cfg

@@ -12,7 +12,7 @@ parts =
 
 [r-language]
 recipe = slapos.recipe.cmmi
-url = http://cran.univ-paris1.fr/src/base/R-3/R-3.2.1.tar.gz
+url = https://cran.r-project.org/src/base/R-3/R-3.2.1.tar.gz
 md5sum = c2aac8b40f84e08e7f8c9068de9239a3
 configure-options =
   --enable-R-shlib

component/randomsleep/buildout.cfg

@@ -4,10 +4,10 @@ extends =
   ../bash/buildout.cfg
 
 [randomsleep]
-recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-template =
-  inline:#!${bash:location}/bin/bash
+recipe = slapos.recipe.template
+output = ${buildout:bin-directory}/${:_buildout_section_name_}
+inline =
+  #!${bash:location}/bin/bash
   [ $# = 1 ] || {
     echo "usage: ${:_buildout_section_name_} maxseconds"
     exit 1

component/replication-manager/buildout.cfg

@@ -30,4 +30,4 @@ go.importpath = github.com/signal18/replication-manager
 repository =  https://github.com/signal18/replication-manager
 #branch = 2.1
 branch = develop
-revision = 838ffeb205ea4477f1c1bda607940fa07d8bcf51
\ No newline at end of file
+revision = 774fde2ce67942a31b99200fea6301189344ecd9
\ No newline at end of file

component/rsyslogd/buildout.cfg

@@ -5,7 +5,7 @@ extends =
   ../curl/buildout.cfg
   ../libestr/buildout.cfg
   ../libfastjson/buildout.cfg
-  ../libuuid/buildout.cfg
+  ../util-linux/buildout.cfg
   ../zlib/buildout.cfg
 
 [rsyslogd]

component/serf/buildout.cfg

@@ -3,8 +3,9 @@ parts =
   serf
 extends =
   ../apache/buildout.cfg
-  ../libuuid/buildout.cfg
+  ../util-linux/buildout.cfg
   ../openssl/buildout.cfg
+  ../python-2.7/buildout.cfg
   ../zlib/buildout.cfg
 
 [serf]
@@ -13,7 +14,7 @@ shared = true
 url = https://archive.apache.org/dist/serf/serf-1.3.9.tar.bz2
 md5sum = 370a6340ff20366ab088012cd13f2b57
 scons-command =
-  python ${scons:location}/scons.py \
+  ${python2.7:location}/bin/python ${scons:location}/scons.py \
   APR="${apr:location}" \
   APU="${apr-util:location}" \
   OPENSSL="${openssl:location}" \

component/sikuli/buildout.cfg

+[buildout]
+extends =
+  ../java/buildout.cfg
+  ../xorg/buildout.cfg
+  ../tesseract/buildout.cfg
+parts =
+  sikuli
+
+[java]
+<= java-re-temurin-11
+
+[sikuli-download]
+recipe = slapos.recipe.build:download
+url = https://launchpad.net/sikuli/sikulix/2.0.5/+download/sikulixide-2.0.5.jar
+filename = sikulixide-2.0.5.jar
+md5sum = 0795f1e0866ee5a7a84e4c89793ea78c
+
+[sikuli]
+recipe = slapos.recipe.template
+output = ${buildout:parts-directory}/${:_buildout_section_name_}/sikulix
+inline =
+  #!/bin/sh -e
+  export JAVA_HOME=${java:location}
+  export JRE_HOME=${java:location}
+  export PATH=${java:location}/bin:$PATH
+  # Sikulix jar file hash some embeded shared libraries (libJXGrabKey.so, libopencv_java430.so)
+  export LD_LIBRARY_PATH=${tesseract:location}/lib:${libX11:location}/lib:${gcc:prefix}/lib64:${gcc:prefix}/lib:${libxcb:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib$${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+
+  exec java -jar ${sikuli-download:location}/${sikuli-download:filename} "$@"

component/slapos/build.sh

-#!/bin/sh -e
+#!/bin/sh -ex
 #
 # This simple script to buildout slapos from source using 1.0 branch on
 # /opt/slapos folder, adapt this script as you please.
 #
-# Be carefull to not run this script were the script is already installed.
+# Be carefull to not run this script where slapos-node is already installed.
 #
 # Before run this script, ensure dependencies are installed, on debian, you can
 # use the command bellow:
 #
-# apt-get install python gcc g++ make uml-utilities bridge-utils patch wget
+# apt-get install python3 gcc g++ make patch wget curl
 #
 
 # Use sudo or superuser and create slapos directory (you can pick a different directory)
-mkdir -p /opt/slapos/log/
+mkdir -p /opt/slapos
 cd /opt/slapos/
-
-# Create buildout.cfg SlapOS bootstrap file
-echo "[buildout]
-extends = https://lab.nexedi.com/nexedi/slapos/raw/1.0/component/slapos/buildout.cfg
-" > buildout.cfg
+mkdir -p eggs log download-cache/dist
 
 # Required in some distros such as Mandriva
 unset PYTHONPATH
@@ -26,17 +22,61 @@ unset PYTHONDONTWRITEBYTECODE
 unset CONFIG_SITE
 
 #
-# Bootstrap SlapOS, using forked version of buildout.
+# Bootstrap buildout.
 #
-wget https://bootstrap.pypa.io/bootstrap-buildout.py
-python -S bootstrap-buildout.py --buildout-version 2.5.2+slapos013 \
-  -f http://www.nexedi.org/static/packages/source/slapos.buildout/
+cat > buildout.cfg <<EOF
+[buildout]
+extensions =
+download-cache = download-cache
+parts =
+  zc.buildout
+
+# Add location for modified non-official slapos.buildout
+find-links +=
+  http://www.nexedi.org/static/packages/source/
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+[zc.buildout]
+recipe = zc.recipe.egg
+eggs =
+  zc.buildout
+
+[versions]
+setuptools = 44.1.1
+zc.buildout = 2.7.1+slapos019
+zc.recipe.egg = 2.0.3+slapos003
+EOF
+
+rm -f bootstrap.py
+wget https://lab.nexedi.com/nexedi/slapos.buildout/raw/master/bootstrap/bootstrap.py
+python3 -S bootstrap.py \
+  --setuptools-version 40.8.0 \
+  --setuptools-to-dir eggs
+sed -i '1s/$/ -S/' bin/buildout
+bin/buildout buildout:newest=true -v
+
+# Install slapos.libnetworkcache (outside of system libraries, see python -S)
+cat > buildout.cfg <<EOF
+[buildout]
+extends = https://lab.nexedi.com/nexedi/slapos/raw/1.0/component/slapos/buildout.cfg
+download-cache = download-cache
+parts =
+  networkcached
+
+[networkcached]
+recipe = zc.recipe.egg
+eggs =
+  slapos.libnetworkcache
+  zc.buildout
+EOF
+sed -i '1s/$/ -S/' bin/buildout
+bin/buildout buildout:newest=true -v
 
 #
-# Warning:Depending on your distribution you might need to
-# replace python by python2 in the last command. This happens when your
-# distribution considers that the standard python is the 3.x branch.
+# Finally start the big build
 #
-# Finally start to build
-
-bin/buildout -v
+echo "[buildout]
+extends = https://lab.nexedi.com/nexedi/slapos/raw/1.0/component/slapos/buildout.cfg
+download-cache = download-cache
+" > buildout.cfg
+bin/buildout buildout:newest=true -v

component/slapos/buildout.cfg

@@ -19,14 +19,17 @@ parts =
   py
   firewalld-patch
 
+[python]
+part = python3
+
 [environment]
 # Note: For now original PATH is appended to the end, as not all tools are
 #       provided by SlapOS
-PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python2.7:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:${patch:location}/bin:${socat:location}/bin:$PATH
+PATH=${bison:location}/bin:${bzip2:location}/bin:${gettext:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${libxslt:location}/bin:${m4:location}/bin:${ncurses:location}/bin:${openssl:location}/bin:${pkgconfig:location}/bin:${python:location}/bin:${readline:location}/bin:${sqlite3:location}/bin:${swig:location}/bin:${buildout:bin-directory}:${patch:location}/bin:${socat:location}/bin:$PATH
 CFLAGS=-I${bzip2:location}/include -I${gdbm:location}/include -I${gettext:location}/include -I${glib:location}/include -I${libxml2:location}/include -I${libxslt:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline:location}/include -I${sqlite3:location}/include -I${zlib:location}/include
 CPPFLAGS=${:CFLAGS}
 LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${gdbm:location}/lib -Wl,-rpath=${gdbm:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${libxslt:location}/lib -Wl,-rpath=${libxslt:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${readline:location}/lib -Wl,-rpath=${readline:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${python2.7:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig
+PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${libxslt:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${python:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig
 LD_LIBRARY_PATH=${bzip2:location}/lib:${gdbm:location}/lib:${gettext:location}/lib:${glib:location}/lib:${libxml2:location}/lib:${libxslt:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline:location}/lib:${sqlite3:location}/lib:${zlib:location}/lib
 
 [cfg-environment]

component/slapos/obs.cfg

@@ -32,7 +32,7 @@ init +=
     "Buildout MUST BE launched in destdir/rootdir (currently launched in %s but should be launched in %s)",
     buildout['directory'], buildout['destdir'] + buildout['rootdir'])
 
-[python2.7]
+[python3-common]
 configure-options +=
   --prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
 environment +=
@@ -85,9 +85,8 @@ pre-configure =
   sed -i 's#/opt/slapos/parts/dbus/lib/libdbus-1.la#${dbus:location}/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
 environment +=
   LD_LIBRARY_PATH=${dbus:location}/lib
-  PYTHON=${python:location}/bin/python${python:version}
-  PYTHON_INCLUDES=-I${python:location}/include/python${python:version}
-  PYTHON_LIBS=-L${python:location}/lib -lpython${python:version} -lpthread -ldl -lutil -lm
+  PYTHON_INCLUDES=-I${python:location}/include/python${python:version}m
+  PYTHON_LIBS=-L${python:location}/lib -lpython${python:version}m -lpthread -ldl -lutil -lm
 post-install =
   sed -i 's#${dbus:location}/lib/libdbus-1.la#/opt/slapos/parts/dbus/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
 

component/socat/buildout.cfg

@@ -8,7 +8,7 @@ parts =
 [socat]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.dest-unreach.org/socat/download/socat-${:version}.tar.gz
+url = http://www.dest-unreach.org/socat/download/Archive/socat-${:version}.tar.gz
 version = 1.7.3.2
 md5sum = aec3154f7854580cfab0c2d81e910519
 environment =

component/sqlite3/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 [sqlite3]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz
-md5sum = f5752052fc5b8e1b539af86a3671eac7
+url = https://sqlite.org/2022/sqlite-autoconf-3370200.tar.gz
+md5sum = 683cc5312ee74e71079c14d24b7a6d27
 configure-options =
   --disable-static
   --enable-readline

component/subversion/buildout.cfg

@@ -5,7 +5,7 @@
 extends =
   ../apache/buildout.cfg
   ../libexpat/buildout.cfg
-  ../libuuid/buildout.cfg
+  ../util-linux/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
   ../perl/buildout.cfg

component/theia/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../libsecret/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../patchelf/buildout.cfg
+  ../python3/buildout.cfg
   ../yarn/buildout.cfg
   download-plugins.cfg
   buildout.hash.cfg
@@ -27,7 +28,7 @@ path = ${yarn.lock:location}
 # path = ${package.json:location}
 environment =
   TMPDIR=@@LOCATION@@/tmp
-  PATH=${nodejs:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${nodejs:location}/bin:${pkgconfig:location}/bin:${python3:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libsecret:pkg-config-path}
   LDFLAGS=-Wl,-rpath=${libsecret:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${glib:location}/lib
 pre-configure =
@@ -46,19 +47,17 @@ post-install =
     keytar.node
 
 [theia-wrapper]
-recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-template =
-  inline:
+recipe = slapos.recipe.template
+output = ${buildout:bin-directory}/${:_buildout_section_name_}
+inline =
   #!/bin/sh
   cd ${theia:location}
   exec ${yarn:location}/bin/yarn theia start "$@"
 
 [theia-open]
-recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-template =
-  inline:
+recipe = slapos.recipe.template
+output = ${buildout:bin-directory}/${:_buildout_section_name_}
+inline =
   #!/bin/sh
   exec ${nodejs:location}/bin/node ${theia:location}/node_modules/.bin/theia-open "$@"
 

component/theia/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = 8157c22134200bd862a07c6521ebf799
 
 [yarn.lock]
 _update_hash_filename_ = yarn.lock
-md5sum = e0341b7a715cc757a671aef902e6767d
+md5sum = b1012625be07ad6a3daf27b9ed6004f0

component/theia/download-plugins.cfg

@@ -26,7 +26,7 @@ urls = vscode-bat https://open-vsx.org/api/vscode/bat/1.62.3/file/vscode.bat-1.6
 	vscode-jake https://open-vsx.org/api/vscode/jake/1.62.3/file/vscode.jake-1.62.3.vsix fb7d81d41eaa04d53183bd6163e83ed3
 	vscode-java https://open-vsx.org/api/vscode/java/1.62.3/file/vscode.java-1.62.3.vsix d8239ae11719762e8b8152010bca50c9
 	vscode-javascript https://open-vsx.org/api/vscode/javascript/1.62.3/file/vscode.javascript-1.62.3.vsix 6f5babbbd2f437f2e34df2feb97ce595
-	ms-vscode-js-debug https://open-vsx.org/api/ms-vscode/js-debug/1.61.0/file/ms-vscode.js-debug-1.61.0.vsix 6457840c5c8d43e5b7a39fabf72b7367
+	ms-vscode-js-debug https://open-vsx.org/api/ms-vscode/js-debug/1.66.1/file/ms-vscode.js-debug-1.66.1.vsix 67bb6b75963b92fed5152598a4f969ae
 	vscode-json https://open-vsx.org/api/vscode/json/1.62.3/file/vscode.json-1.62.3.vsix 9e0e7b25a2d4c5df88ea3a75cf60372b
 	vscode-json-language-features https://open-vsx.org/api/vscode/json-language-features/1.45.1/file/vscode.json-language-features-1.45.1.vsix b7aa9d96d67792dedf9c2558880f38c0
 	vscode-less https://open-vsx.org/api/vscode/less/1.62.3/file/vscode.less-1.62.3.vsix 9eb5e65d5d089abae8fc7cb2ebcdd53a
@@ -70,12 +70,12 @@ urls = vscode-bat https://open-vsx.org/api/vscode/bat/1.62.3/file/vscode.bat-1.6
 	vscode-yaml https://open-vsx.org/api/vscode/yaml/1.62.3/file/vscode.yaml-1.62.3.vsix f9719aaae4fd9671fd2fa15d41343e1d
 	EditorConfig-EditorConfig https://open-vsx.org/api/EditorConfig/EditorConfig/0.16.6/file/EditorConfig.EditorConfig-0.16.6.vsix e787245e6c68617178ae995ad97c3ccb
 	dbaeumer-vscode-eslint https://open-vsx.org/api/dbaeumer/vscode-eslint/2.1.20/file/dbaeumer.vscode-eslint-2.1.20.vsix 1cb024ac02ebeb5ce6b0dfed6e51cdd2
-	ms-vscode-references-view https://open-vsx.org/api/ms-vscode/references-view/0.0.82/file/ms-vscode.references-view-0.0.82.vsix d23827c6600ae821c829fca1629968c7
+	ms-vscode-references-view https://open-vsx.org/api/ms-vscode/references-view/0.0.89/file/ms-vscode.references-view-0.0.89.vsix 7ec05cb01a77ee7f6c5198a5225fa707
 	vscjava-vscode-java-debug https://open-vsx.org/api/vscjava/vscode-java-debug/0.29.0/file/vscjava.vscode-java-debug-0.29.0.vsix 1eb95110f84ff8dcabbe3c672066b86d
 	redhat-java https://open-vsx.org/api/redhat/java/0.61.0/file/redhat.java-0.61.0.vsix 72e548e2845e1ff655f28111558d6942
 	vscjava-vscode-java-test https://open-vsx.org/api/vscjava/vscode-java-test/0.26.0/file/vscjava.vscode-java-test-0.26.0.vsix fd63da5537a4bee1d3ceaae0fa6bf419
 	ms-python-python https://open-vsx.org/api/ms-python/python/2020.9.112786/file/ms-python.python-2020.9.112786.vsix c64b79fa822418e07b6d0f57b8838b44
-	perrinjerome-vscode-zc-buildout https://open-vsx.org/api/perrinjerome/vscode-zc-buildout/0.6.2/file/perrinjerome.vscode-zc-buildout-0.6.2.vsix 76c1420f238a0754a505459563220973
+	perrinjerome-vscode-zc-buildout https://open-vsx.org/api/perrinjerome/vscode-zc-buildout/0.7.1/file/perrinjerome.vscode-zc-buildout-0.7.1.vsix 2f1904f6e358c854cc98fff1b9614d0e
 	jebbs-plantuml https://open-vsx.org/api/jebbs/plantuml/2.14.0/file/jebbs.plantuml-2.14.0.vsix 13fa7cbd14a30ecca166c41a307c7a73
 	rafaelmaiolla-diff https://open-vsx.org/api/rafaelmaiolla/diff/0.0.1/file/rafaelmaiolla.diff-0.0.1.vsix 1d8f868bc19b7d703c1be2bf99c4c7f9
 	perrinjerome-git-commit-syntax https://open-vsx.org/api/perrinjerome/git-commit-syntax/0.0.1/file/perrinjerome.git-commit-syntax-0.0.1.vsix 46625f2f05e244911c2cb9cc5032c0ef

component/tig/buildout.cfg

 # Tig: text-mode interface for Git
-# http://jonas.nitro.dk/tig/
+# https://jonas.github.io/tig/
 
 [buildout]
 extends =
+  ../libiconv/buildout.cfg
   ../ncurses/buildout.cfg
 
 [tig]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://jonas.nitro.dk/tig/releases/tig-2.1.tar.gz
-md5sum = d6c237aba2c03d85897da79789fd6104
+url = https://github.com/jonas/tig/releases/download/tig-2.5.5/tig-2.5.5.tar.gz
+md5sum = 0902ba706e8efaf6c2087d8b66393375
 environment =
-  CFLAGS=-I${ncurses:location}/include
-  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+  CFLAGS=-I${ncurses:location}/include -I${libiconv:location}/include
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${libiconv:location}/lib -Wl,-rpath=${libiconv:location}/lib

component/trafficserver/buildout.cfg

@@ -40,6 +40,12 @@ configure-options =
   --disable-hwloc
   --enable-experimental-plugins
   --disable-posix-cap
+patch-options = -p1
+# https://github.com/apache/trafficserver/pull/8545 + https://github.com/apache/trafficserver/pull/8617
+# (see https://github.com/apache/trafficserver/issues/8539 for the detail)
+patches =
+  ${:_profile_base_location_}/trafficserver-9.1.1-TSHttpTxnCacheLookupStatusGet-fix.patch#d8ed3db3a48e97eb72aaaf7d7598a2d2
+  ${:_profile_base_location_}/trafficserver-9.1.1-via-string-rapid-cdn.patch#8c39243d7525222385d5964485734f99
 environment =
   PATH=${libtool:location}/bin:${make:location}/bin:${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   LDFLAGS =-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib -L${tcl:location}/lib -Wl,-rpath=${tcl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${luajit:location}/lib  -lm

component/trafficserver/trafficserver-9.1.1-TSHttpTxnCacheLookupStatusGet-fix.patch

+diff -ur trafficserver-9.1.1.orig/src/traffic_server/InkAPI.cc trafficserver-9.1.1/src/traffic_server/InkAPI.cc
+--- trafficserver-9.1.1.orig/src/traffic_server/InkAPI.cc	2021-10-29 15:38:50.000000000 +0000
++++ trafficserver-9.1.1/src/traffic_server/InkAPI.cc	2022-01-31 10:37:24.675347079 +0000
+@@ -5443,7 +5443,11 @@
+     break;
+   case HttpTransact::CACHE_LOOKUP_HIT_WARNING:
+   case HttpTransact::CACHE_LOOKUP_HIT_FRESH:
+-    *lookup_status = TS_CACHE_LOOKUP_HIT_FRESH;
++    if (HttpTransact::need_to_revalidate(&sm->t_state)) {
++      *lookup_status = TS_CACHE_LOOKUP_MISS;
++    } else {
++      *lookup_status = TS_CACHE_LOOKUP_HIT_FRESH;
++    }
+     break;
+   case HttpTransact::CACHE_LOOKUP_SKIPPED:
+     *lookup_status = TS_CACHE_LOOKUP_SKIPPED;

component/unstable/accords/buildout.cfg

@@ -5,7 +5,7 @@ extends =
   ../libtool/buildout.cfg
   ../git/buildout.cfg
   ../openssl/buildout.cfg
-  ../libuuid/buildout.cfg
+  ../util-linux/buildout.cfg
 
 parts = accords