Update Release Candidate

80498495 · Thomas Gambier · 3e711f15 · 37cf8a50 · 80498495 · 80498495
Commit 80498495 authored Apr 16, 2021 by Thomas Gambier 🚴🏼
52 changed files
--- a/component/apache-php/buildout.cfg
+++ b/component/apache-php/buildout.cfg
@@ -23,6 +23,7 @@ extends =
  ../imagemagick/buildout.cfg
  ../icu/buildout.cfg
  ../openssl/buildout.cfg
+  ../zstd/buildout.cfg
 [php-redis]
 recipe = slapos.recipe.cmmi
@@ -112,9 +113,10 @@ environment =
  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
  CPPFLAGS=-I${libzip:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib
  TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
  HOME=${apache:location}
+  LD_LIBRARY_PATH=${zstd:location}/lib

--- a/component/chromedriver/buildout.cfg
+++ b/component/chromedriver/buildout.cfg
@@ -7,6 +7,7 @@ extends =
  ../chromium/buildout.cfg
  ../nss/buildout.cfg
  ../nspr/buildout.cfg
+  ../xorg/buildout.cfg
 parts =
  chromedriver-wrapper
@@ -65,6 +66,7 @@ x86-64 = https://chromedriver.storage.googleapis.com/${:version}/chromedriver_li
 library =
  ${nss:location}/lib
  ${nspr:location}/lib
+  ${libX11:location}/lib
 path =
 install =
  import os, shutil

--- a/component/file/buildout.cfg
+++ b/component/file/buildout.cfg
@@ -4,6 +4,8 @@
 [buildout]
 parts = file
 extends =
+  ../bzip2/buildout.cfg
+  ../xz-utils/buildout.cfg
  ../zlib/buildout.cfg
 [file]
@@ -13,6 +15,10 @@ url = http://ftp.icm.edu.pl/packages/file/file-5.39.tar.gz
 md5sum = 1c450306053622803a25647d88f80f25
 configure-options =
  --disable-static
+  --disable-libseccomp
+  --enable-zlib
+  --enable-bzlib
+  --enable-xzlib
 environment =
-  CPPFLAGS=-I${zlib:location}/include
+  CPPFLAGS=-I${bzip2:location}/include -I${xz-utils:location}/include -I${zlib:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
--- a/component/fontconfig/buildout.hash.cfg
+++ b/component/fontconfig/buildout.hash.cfg
 [template-fonts-conf]
 filename = fonts.conf.in
-md5sum = 6967e553630d107fc0a59b14de8b0251
+md5sum = a31030785c7b54bfd33320c87f6b5699
--- a/component/fontconfig/fonts.conf.in
+++ b/component/fontconfig/fonts.conf.in
@@ -14,10 +14,14 @@
 #}
 <fontconfig>
  <cachedir>{{ cachedir | escape}}</cachedir>
-  {% for font in fonts.splitlines() -%}
+  {%- for font in fonts.splitlines() -%}
-    <dir>{{ font | escape}}</dir>
+    {% if font.strip() %}
-  {% endfor %}
+    <dir>{{ font.strip() | escape}}</dir>
-  {% for include in includes.splitlines() -%}
+    {%- endif %}
-    <include>{{ include | escape}}</include>
+  {%- endfor %}
-  {% endfor %}
+  {%- for include in includes.splitlines() -%}
-</fontconfig>
+    {% if include.strip() %}
\ No newline at end of file
+    <include>{{ include.strip() | escape}}</include>
+    {%- endif %}
+  {%- endfor %}
+</fontconfig>
--- a/component/ncurses/buildout.cfg
+++ b/component/ncurses/buildout.cfg
@@ -7,8 +7,8 @@ parts =
 [ncurses]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz
+url = http://ftp.gnu.org/gnu/ncurses/ncurses-6.2.tar.gz
-md5sum = ee13d052e1ead260d7c28071f46eefb1
+md5sum = e812da327b1c2214ac1aed440ea3ae8d
 patch-options = -p1
 patches =
  ${:_profile_base_location_}/ncurses-5.9-gcc-5.patch#57f4cd0cc0c0a42a5ddb2167f9546d72
@@ -24,7 +24,12 @@ configure-options =
  --enable-rpath
 # tricky way to rerun with --enable-widec
 make-targets =
-  install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h @@LOCATION@@/include/$i.h; done; ln -sf libncurses.so @@LOCATION@@/lib/libcurses.so) && ./configure ${:configure-options} --enable-widec && make ${:make-options} && make ${:make-options} install
+  install && ./configure ${:configure-options} --enable-widec && make ${:make-options} && make ${:make-options} install
+post-install =
+  cd '%(location)s/include'
+  mv ncursesw/* .
+  rm -r ncurses ncursesw
+  ln -s . ncursesw
 # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
 environment =
  LDCONFIG=/bin/echo

--- a/component/proftpd/buildout.cfg
+++ b/component/proftpd/buildout.cfg
@@ -12,6 +12,7 @@ extends =
  ../libtool/buildout.cfg
  ../git/buildout.cfg
  ../patch/buildout.cfg
+  ../zstd/buildout.cfg
 # proftpd server
 [proftpd-environment]
@@ -61,7 +62,7 @@ command =
  LIBTOOL=${libtool:location}/bin/libtool \
  ${proftpd-output:prxs} -c -i -d \
  -I ${curl:location}/include \
-  -L '${curl:location}/lib/ -R ${openssl:location}/lib -R ${zlib:location}/lib' \
+  -L '${curl:location}/lib/ -R ${openssl:location}/lib -R ${zlib:location}/lib -R ${zstd:location}/lib' \
  -l curl \
  ${proftpd-mod_auth_web-repository:location}/mod_auth_web.c
 location=${proftpd:location}/libexec/mod_auth_web.so

--- a/component/pypy/buildout.cfg
+++ b/component/pypy/buildout.cfg
@@ -49,7 +49,7 @@ configure-command =
  	cp -r include/pypy_*.h include/PyPy.h pypy/module/cpyext/include/* pypy/module/cpyext/parse/* \$(PREFIX)/include
  	cd pypy/goal && cp libpypy-c.so \$(PREFIX)/bin && cp pypy-c \$(PREFIX)/bin/pypy
 environment =
-  C_INCLUDE_PATH=${bzip2:location}/include:${gdbm:location}/include:${libexpat:location}/include:${ncurses:location}/include:${ncurses:location}/include/ncursesw:${openssl:location}/include:${sqlite3:location}/include:${zlib:location}/include
+  C_INCLUDE_PATH=${bzip2:location}/include:${gdbm:location}/include:${libexpat:location}/include:${ncurses:location}/include:${ncurses:location}/include:${openssl:location}/include:${sqlite3:location}/include:${zlib:location}/include
  LDFLAGS=-L${bzip2:location}/lib -L${gdbm:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -L${zlib:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib
  PATH=${pkgconfig:location}/bin:%(PATH)s
  PKG_CONFIG_PATH=${libffi:location}/lib/pkgconfig
--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
@@ -71,5 +71,5 @@ post-install = cd '${:prefix}' &&
 # which would otherwise load the system libmagic.so with ctypes
 environment =
  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
--- a/component/python3/buildout.cfg
+++ b/component/python3/buildout.cfg
@@ -48,7 +48,7 @@ pre-install = mkdir profile-opt
 # which would otherwise load the system libmagic.so with ctypes
 environment =
  PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  CPPFLAGS=-I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
  LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
 [python3.6]

--- a/component/qemu-kvm/buildout.cfg
+++ b/component/qemu-kvm/buildout.cfg
@@ -18,8 +18,8 @@ extends =
 [qemu]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://download.qemu.org/qemu-4.1.1.tar.xz
+url = https://download.qemu.org/qemu-4.2.1.tar.xz
-md5sum = 53879f792ef2675c6c5e6cbf5cc1ac6c
+md5sum = dac9c31eb3ef1d0cfe30251f238c49c4
 configure-options =
  --target-list="$(uname -m 2>/dev/null|sed 's,^i[456]86$,i386,')-softmmu"
  --enable-system
@@ -31,6 +31,7 @@ configure-options =
  --enable-linux-aio
  --enable-virtfs
  --disable-docs
+  --enable-curses
  --enable-vnc
  --enable-vnc-png
  --disable-vnc-jpeg

--- a/component/rdiff-backup/buildout.cfg
+++ b/component/rdiff-backup/buildout.cfg
 [buildout]
 extends =
  ../librsync/buildout.cfg
-  ../coreutils/buildout.cfg
+  ../python-2.7/buildout.cfg
 parts =
-  rdiff-backup-output
+  rdiff-backup-1.0.5
+  rdiff-backup-1.3.4
-[rdiff-backup-build]
+[rdiff-backup-common]
-recipe = zc.recipe.egg:custom
+recipe = slapos.recipe.cmmi
-egg = rdiff-backup
+shared = true
-patches =
-  ${:_profile_base_location_}/rdiff-backup-1.2.8-librsync-1.0.0.patch#5e54a67845edd6942fcf7359c921e003
 patch-options = -p1
 patch-binary = ${patch:location}/bin/patch
-include-dirs =
+configure-command = true
-  ${librsync:location}/include/
+make-binary = true
-library-dirs =
+post-install =
-  ${librsync:location}/lib/
+  set %(location)s/lib/python2.7
-rpath =
+  %(python)s setup.py build_ext -I${librsync:location}/include -L${librsync:location}/lib -R${librsync:location}/lib build install --prefix=%(location)s --install-lib=$1
-  ${librsync:location}/lib/
+  cd %(location)s/bin
-# If you need another release, override this link
+  sed -i '/^import\b.*\bsys\b/s,$,\nsys.path[0] = '\"$1\", *
-# and pin the egg in the [versions] section of the stack or SR.
+  ./rdiff-backup -V
-find-links = http://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1.0.5.tar.gz/fa2a165fa07a94be52c52e3545bc7758/rdiff-backup-1.0.5.tar.gz
+python = ${python2.7:executable}
+[rdiff-backup-common:python27]
+python = ${buildout:executable}
+[rdiff-backup-1.0.5]
+<= rdiff-backup-common
+url = https://pkgs.fedoraproject.org/repo/pkgs/rdiff-backup/rdiff-backup-1.0.5.tar.gz/${:md5sum}/rdiff-backup-1.0.5.tar.gz
+md5sum = fa2a165fa07a94be52c52e3545bc7758
+patches =
+  ${:_profile_base_location_}/rdiff-backup-1.2.8-librsync-1.0.0.patch#5e54a67845edd6942fcf7359c921e003
-[rdiff-backup-build-1.3.4]
+[rdiff-backup-1.3.4]
-<= rdiff-backup-build
+<= rdiff-backup-common
 # use our own version
-find-links = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd6.tar.gz
+url = http://www.nexedi.org/static/packages/source/rdiff-backup-1.3.4nxd6.tar.gz
+md5sum = 06b8df2099baebca6086a315b031fd53
 patches =
  ${:_profile_base_location_}/rdiff-backup-1.3.4-librsync-1.0.0.patch#31fafc8bc4a00f002f52008a9f3b671f
-[rdiff-backup]
-# Scripts only generation part for rdiff-backup
-recipe = zc.recipe.egg
-eggs =
-  ${rdiff-backup-build:egg}
-entry-points =
-  rdiff-backup=rdiff_backup.Main:Main
-arguments = sys.argv[1:]
-[rdiff-backup-output]
-# Shared binary location to ease migration
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = ${coreutils-output:test} -x ${:rdiff-backup}
-rdiff-backup = ${buildout:directory}/bin/rdiff-backup
--- a/component/readline/buildout.cfg
+++ b/component/readline/buildout.cfg
@@ -37,22 +37,13 @@ environment =
 [readline]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz
+url = http://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz
-md5sum = 33c8fb279e981274f485fd91da77e94a
+md5sum = e9557dd5b1409f5d7b37ef717c64518e
 patches =
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-001#4343f5ea9b0f42447f102fb61576b398
+  ${:_profile_base_location_}/configure-ncurses.diff#db8187a92f19e0e9d2fe595ca7a0426f
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-002#700295212f7e2978577feaee584afddb
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-003#af4963862f5156fbf9111c2c6fa86ed7
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-004#11f9def89803a5052db3ba72394ce14f
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-005#93721c31cd225393f80cb3aadb165544
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-006#71dc6ecce66d1489b96595f55d142a52
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-007#062a08ed60679d3c4878710b3d595b65
-  http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-008#ee1c04072154826870848d8b218d7b04
-  ${:_profile_base_location_}/configure-ncurses.diff#c2bf0d0cb0ccd3d3c078ba124fffb7d2
 configure-options =
  --enable-multibyte
  --disable-static
 environment =
-  CPPFLAGS=-I${ncurses:location}/include/ncurses
+  CPPFLAGS=-I${ncurses:location}/include
  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
-  PATH=${patch:location}/bin:%(PATH)s
--- a/component/readline/configure-ncurses.diff
+++ b/component/readline/configure-ncurses.diff
-diff -ur ../readline-6.3.orig/aclocal.m4 ./aclocal.m4
+--- configure
--- ../readline-6.3.orig/aclocal.m4	2013-10-21 00:37:50.000000000 +0200
+++ configure
-+++ ./aclocal.m4	2015-05-21 11:04:20.243591527 +0200
+@@ -6856,6 +6856,7 @@
-@@ -958,10 +958,10 @@
- fi
- AC_CACHE_VAL(bash_cv_termcap_lib,
- [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
-  [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
-    [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-+  [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
-+    [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
-+      [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
-         [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses,
-	    [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
- 	        bash_cv_termcap_lib=gnutermcap)])])])])])
- if test "X$_bash_needmsg" = "Xyes"; then
- AC_MSG_CHECKING(which library has the termcap functions)
-Only in ./: aclocal.m4~
-Only in ./: autom4te.cache
-diff -ur ../readline-6.3.orig/configure ./configure
--- ../readline-6.3.orig/configure	2013-03-13 15:14:53.000000000 +0100
-+++ ./configure	2015-05-21 11:29:48.157514191 +0200
-@@ -5793,6 +5793,45 @@
- if test "x$ac_cv_func_tgetent" = xyes; then :
-   bash_cv_termcap_lib=libc
- else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lncurses  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char tgetent ();
-+int
-+main ()
-+{
-+return tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ncurses_tgetent=yes
-+else
-+  ac_cv_lib_ncurses_tgetent=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-+if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
-+  bash_cv_termcap_lib=libncurses
-+else
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
- $as_echo_n "checking for tgetent in -ltermcap... " >&6; }
- if ${ac_cv_lib_termcap_tgetent+:} false; then :
-@@ -5910,45 +5949,6 @@
- if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
-   bash_cv_termcap_lib=libcurses
- else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-$as_echo_n "checking for tgetent in -lncurses... " >&6; }
-if ${ac_cv_lib_ncurses_tgetent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char tgetent ();
-int
-main ()
-{
-return tgetent ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ncurses_tgetent=yes
-else
-  ac_cv_lib_ncurses_tgetent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
-  bash_cv_termcap_lib=libncurses
-else
-   bash_cv_termcap_lib=gnutermcap
- fi
-@@ -6322,10 +6322,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-+  bash_cv_wcwidth_broken=no
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-@@ -6409,6 +6406,7 @@
 #	*curses*|*termcap*|*termlib*)	;;
 #	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
 #	esac
@@ -132,15 +8,3 @@ diff -ur ../readline-6.3.orig/configure ./configure
-diff -ur ../readline-6.3.orig/configure.ac ./configure.ac
--- ../readline-6.3.orig/configure.ac	2014-02-11 23:12:39.000000000 +0100
-+++ ./configure.ac	2015-05-21 11:25:26.164610769 +0200
-@@ -222,6 +222,7 @@
- #	*curses*|*termcap*|*termlib*)	;;
- #	*)			SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
- #	esac
-+        SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB"
-         AC_SUBST(SHOBJ_CC)
-         AC_SUBST(SHOBJ_CFLAGS)
-Only in ./: configure.ac~
--- a/component/ruby/buildout.cfg
+++ b/component/ruby/buildout.cfg
@@ -20,7 +20,7 @@ configure-options =
  --with-out-ext=tk,tk/tkutil,win32,win32ole
 environment =
  PATH=${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${openssl-1.0:location}/include -I${readline:location}/include -I${zlib:location}/include
+  CPPFLAGS=-I${gdbm:location}/include -I${libffi:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include -I${openssl-1.0:location}/include -I${readline:location}/include -I${zlib:location}/include
  LDFLAGS=-L${gdbm:location}/lib -L${libffi:location}/lib -L${libyaml:location}/lib -L${ncurses:location}/lib -L${openssl-1.0:location}/lib -L${readline:location}/lib -L${zlib:location}/lib -Wl,-rpath=${gdbm:location}/lib  -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${zlib:location}/lib
  PKG_CONFIG_PATH=${libyaml:location}/lib/

--- a/software/backupserver/buildout.hash.cfg
+++ b/software/backupserver/buildout.hash.cfg
@@ -26,7 +26,7 @@ md5sum = 851262d7174da868805cb7c8e1ced7c0
 [template-backup-script]
 filename = template-backup-script.sh.in
-md5sum = 4c75f8462eaef2d8fcf24627e5f3575a
+md5sum = 3f3286347a7e271e7bfa66e1a840989b
 [template-crontab-line]
 filename = template-crontab-line.in

--- a/software/backupserver/software.cfg
+++ b/software/backupserver/software.cfg
@@ -16,7 +16,6 @@ extends =
  ../../stack/monitor/buildout.cfg
 parts =
-  rdiff-backup
  dcron
  logrotate
  nginx
@@ -102,7 +101,6 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 [versions]
-rdiff-backup = 1.0.5+SlapOSPatched001
 gunicorn = 19.1.1
 plone.recipe.command = 1.1
 PyRSS2Gen = 1.1
--- a/software/backupserver/template-backup-script.sh.in
+++ b/software/backupserver/template-backup-script.sh.in
@@ -13,7 +13,7 @@ ${coreutils-output:echo} "Available only if backup succeed." > $${:statistic_log
 # set -e
 cd $${:datadirectory}
 ${util-linux:location}/bin/flock $${:status_log}.lock \
-  ${rdiff-backup-output:rdiff-backup} \
+  ${rdiff-backup-1.0.5:location}/bin/rdiff-backup \
  $${:exclude_string} \
  --include='$${:include}' \
  --exclude='**' \
@@ -26,7 +26,7 @@ RESULT=$?
 if [ $RESULT -eq 0 ]
 then
  ${coreutils-output:echo} "`${coreutils-output:date} --iso-8601=seconds -u`, $${:statistic_log}, $${:hostname}, backup success" >> $${:status_log}
-  ${findutils-output:find} rdiff-backup-data/ -maxdepth 1 -name "session_statistic*" | ${coreutils-output:sort} | ${coreutils-output:tail} -n 1 | ${findutils-output:xargs} ${rdiff-backup-output:rdiff-backup} --calculate-average > $${:statistic_log}
+  ${findutils-output:find} rdiff-backup-data/ -maxdepth 1 -name "session_statistic*" | ${coreutils-output:sort} | ${coreutils-output:tail} -n 1 | ${findutils-output:xargs} ${rdiff-backup-1.0.5:location}/bin/rdiff-backup --calculate-average > $${:statistic_log}
 else
  ${coreutils-output:echo} "`${coreutils-output:date} --iso-8601=seconds -u`, $${:statistic_log}, $${:hostname}, backup failed" >> $${:status_log}
 fi
--- a/software/caddy-frontend/software.cfg
+++ b/software/caddy-frontend/software.cfg
@@ -6,7 +6,6 @@ extends =
  ../../component/caddy/buildout.cfg
  ../../component/gzip/buildout.cfg
  ../../component/logrotate/buildout.cfg
-  ../../component/rdiff-backup/buildout.cfg
  ../../component/trafficserver/buildout.cfg
  ../../component/6tunnel/buildout.cfg
  ../../component/xz-utils/buildout.cfg
@@ -20,7 +19,6 @@ extends =
 parts +=
  caucase-eggs
  template
-  rdiff-backup
  caddyprofiledeps
  kedifa-develop
  kedifa
@@ -234,7 +232,6 @@ ecdsa = 0.13
 gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
-rdiff-backup = 1.0.5+SlapOSPatched001
 smmap = 0.9.0
 websockify = 0.8.0

--- a/software/cloudooo/buildout.hash.cfg
+++ b/software/cloudooo/buildout.hash.cfg
@@ -18,4 +18,4 @@ md5sum = e986de01a57161b32425f1cd3ccac924
 [template-cloudooo-instance]
 filename = instance-cloudooo.cfg.in
-md5sum = e49ee3e309a19f9a3a9590789690c611
+md5sum = 9e1a66cf18d7c30c14afeb66c20afb46
--- a/software/cloudooo/instance-cloudooo.cfg.in
+++ b/software/cloudooo/instance-cloudooo.cfg.in
@@ -76,10 +76,6 @@ parts =
  xvfb-instance
  wkhtmltopdf-on-xvfb
-eggs-directory = {{ eggs_directory }}
-develop-eggs-directory = {{ develop_eggs_directory }}
-offline = true
 [apache]
 recipe = slapos.cookbook:wrapper
@@ -151,7 +147,7 @@ context =
    key includes :includes
 fonts =
 {% for font in parameter_dict['fonts'].splitlines() %}
-   {{ font }}
+    {{ font }}
 {% endfor%}
    ${directory:font}
 includes =

--- a/software/erp5/upgrade_test/test.py
+++ b/software/erp5/upgrade_test/test.py
@@ -39,7 +39,7 @@ from slapos.testing.testcase import installSoftwareUrlList
 from slapos.testing.testcase import SlapOSNodeCommandError
 from slapos.grid.utils import md5digest
-old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.2/software/erp5/software.cfg'
+old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.3/software/erp5/software.cfg'
 new_software_release_url = os.path.abspath(
    os.path.join(os.path.dirname(__file__), '..', 'software.cfg'))

--- a/software/grafana/software.cfg
+++ b/software/grafana/software.cfg
@@ -41,7 +41,7 @@ revision      = v7.5.2-0-gca413c612f
 <= go-git-package
 go.importpath = github.com/grafana/loki
 repository    = https://github.com/grafana/loki
-revision      = v2.2.0-0-ga27c7991
+revision      = v2.2.1-0-gbabea82e
 [go_github.com_influxdata_influxdb]
 <= go-git-package

--- a/software/html5as/buildout.hash.cfg
+++ b/software/html5as/buildout.hash.cfg
@@ -17,7 +17,7 @@
 [template-cfg]
 filename = instance.cfg.in
-md5sum = 8a1383f7508a911c0c2d81445b5d4250
+md5sum = 0a7aceffa5222e88125b72da42ddedd7
 [instance_html5as]
 _update_hash_filename_ = instance_html5as.cfg.in
@@ -42,3 +42,7 @@ md5sum = d57cb01df5941e139b02a2f7bdabcdc8
 [template_graceful]
 _update_hash_filename_ = templates/graceful.in
 md5sum = 1c0ee16966e1fcdb3fd11c09f12ee2b2
+[template_instance_replicate]
+_update_hash_filename_ = instance_replicate.cfg.in
+md5sum = 1b3efe4ddd2419ad1858be33d1248a17
--- a/software/html5as/instance.cfg.in
+++ b/software/html5as/instance.cfg.in
@@ -23,10 +23,30 @@ recipe = slapos.recipe.template:jinja2
 template = {{ template_instance_html5as_target }}
 rendered = ${buildout:directory}/${:filename}
 filename = instance-html5as.cfg
-context = 
+context =
  section buildout buildout
  section parameter_list profile-common
+[instance-replicate]
+recipe = slapos.recipe.template:jinja2
+template = {{ template_instance_replicate }}
+rendered = ${buildout:directory}/${:filename}
+filename = instance-replicate-html5as.cfg
+context =
+  section buildout buildout
+  section parameter_list profile-common
+  key slapparameter_dict slap-parameters:configuration
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
 default = ${instance-html5as:rendered}
+replicate = ${instance-replicate:rendered}
+# Section  needed to be added manually here to retrieve parameters
+[slap-parameters]
+recipe = slapos.cookbook:slapconfiguration
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
--- a/software/html5as/instance_replicate.cfg.in
+++ b/software/html5as/instance_replicate.cfg.in
+{% set replicate_quantity = slapparameter_dict.pop('replicate-quantity', '1') | int %}
+[buildout]
+parts =
+    publish-connection-information
+eggs-directory = {{ buildout['eggs-directory'] }}
+develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
+offline = true
+[instance-request-base]
+<= slap-connection
+recipe = slapos.cookbook:request
+# It is the same software as the current one
+software-url = ${slap-connection:software-release-url}
+# We want the default behaviour
+software-type = default
+# What parameter are neede to be retrieved
+return = server_url server-cdn-url monitor-setup-url
+# Provided parameters
+config-title = ${slap-parameter:title}
+config-download_url = ${slap-parameter:download_url}
+{% for i in range(1, replicate_quantity + 1) %}
+# Request a normal html5as instance
+[instance-{{ i }}]
+<= instance-request-base
+# Name of the instance
+name = instance-html5as-{{ i }}
+config-port = ${slap-parameter:port-{{ i }}}
+config-title = ${slap-parameter:title-{{ i }}}
+{% endfor %}
+[slap-parameter]
+download_url =
+{% for i in range(1, replicate_quantity + 1) %}
+title-{{ i }} =
+port-{{ i }} = 808{{ i }}
+{% endfor %}
+[publish-connection-information]
+recipe = slapos.cookbook:publish
+{% for i in range(1, replicate_quantity + 1) %}
+instance-{{ i }}-server_url = ${instance-{{ i }}:connection-server_url}
+instance-{{ i }}-server-cdn-url = ${instance-{{ i }}:connection-server-cdn-url}
+instance-{{ i }}-server-monitor-setup-url = ${instance-{{ i }}:connection-monitor-setup-url}
+{% endfor %}
--- a/software/html5as/software.cfg
+++ b/software/html5as/software.cfg
@@ -44,6 +44,7 @@ context =
  key template_instance_html5as_target instance_html5as:target
  key template_index_html_target template_index_html:target
  key template_graceful_target template_graceful:target
+  key template_instance_replicate template_instance_replicate:target
 # Monitor stack also provides a template for the instance
  key template_monitor monitor2-template:rendered
@@ -76,6 +77,9 @@ mode = 0644
 [template_graceful]
 <= download-base
+[template_instance_replicate]
+<= download-base
 # Pin versions of eggs used that are not already pinned by stack/slapos.cfg
 [versions]
 slapos.recipe.template = 4.4
--- a/software/kvm/buildout.hash.cfg
+++ b/software/kvm/buildout.hash.cfg
@@ -15,11 +15,11 @@
 [template]
 filename = instance.cfg.in
-md5sum = 399b398a8eabfa6126d2a521dc779f9b
+md5sum = 0d34ff81779115bf899f7bc752877b70
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 704b6ac6bf42837bcd8f4582c5a746c0
+md5sum = 4c5d8c723b6adb96fcac9690c0c900f7
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
@@ -73,10 +73,6 @@ md5sum = 752c91a4a6b72f5cf8226d6b940015f8
 filename = template/qemu-is-ready.in
 md5sum = fb330a796fadb6cd5c85217f80a42af3
-[file-download-script]
-filename = template/download_file.in
-md5sum = 599dbbbd438fe7801e3f8642ae9e9a78
 [template-httpd]
 filename = instance-kvm-http.cfg.in
 md5sum = d657884d02105deffddee0edae4b50a6

--- a/software/kvm/instance-kvm.cfg.jinja2
+++ b/software/kvm/instance-kvm.cfg.jinja2
@@ -19,19 +19,12 @@
 {% set whitelist_domains = slapparameter_dict.get('whitelist-domains', '') -%}
 {% set boot_image_url_list_enabled = 'boot-image-url-list' in slapparameter_dict %}
 {% set boot_image_url_select_enabled = 'boot-image-url-select' in slapparameter_dict %}
+{% set bootstrap_script_url = slapparameter_dict.get('bootstrap-script-url') -%}
 {% set cpu_max_count = dumps(slapparameter_dict.get('cpu-max-count', int(slapparameter_dict.get('cpu-count', 1)) + 1)) %}
 {% set ram_max_size = dumps(slapparameter_dict.get('ram-max-size', int(slapparameter_dict.get('ram-size', 1024)) + 512)) %}
 {% set extends_list = [] -%}
 {% set part_list = [] -%}
-{% set bootstrap_url = '' -%}
-{% set bootstrap_url_md5sum = '' -%}
-{% if slapparameter_dict.get('bootstrap-script-url', '') -%}
-{% set url_info_list = slapparameter_dict['bootstrap-script-url'].split('#') -%}
-{% set bootstrap_url = url_info_list[0] -%}
-{% set bootstrap_url_md5sum = url_info_list[1] -%}
-{% endif -%}
 {% if instance_type == 'cluster' -%}
 {% set nat_rule_list = slapparameter_dict.get('nat-rules', '') %}
 {% endif -%}
@@ -897,12 +890,18 @@ module = check_command_execute
 name = ansible_{{ name }}.py
 config-command = ${ansible-vm-bin:rendered}
+{% if bootstrap_script_url -%}
 [download-bootstrap-script]
-recipe = plone.recipe.command
+recipe = slapos.recipe.build
-file-location = ${directory:public}/vm-bootstrap
+location = ${directory:public}/vm-bootstrap
-command = {{ python_executable }} {{ file_download_script }} {{ bootstrap_url }} {{ bootstrap_url_md5sum }} ${:file-location}
+install =
-update-command =
+  from zc.buildout.download import check_md5sum, urlretrieve, ChecksumError
-stop-on-error = true
+  url, md5sum = {{ repr(bootstrap_script_url) }}.split('#')
+  urlretrieve(url, location)
+  if not check_md5sum(location, md5sum):
+    os.remove(location)
+    raise ChecksumError
+{% endif -%}
 [logrotate-vm-bootstrap]
 < = logrotate-entry-base
@@ -1002,7 +1001,7 @@ keyboard-layout-language = fr
 {% if slapparameter_dict.get('authorized-key', '') and slapparameter_dict.get('type', '') == 'cluster' %}
 {%   do part_list.append('get-authorized-key') -%}
 {% endif -%}
-{% if slapparameter_dict.get('bootstrap-script-url', '') -%}
+{% if bootstrap_script_url -%}
 {%   do part_list.append('download-bootstrap-script') -%}
 {% endif -%}
 {% if slapparameter_dict.get('document-port', '') -%}

--- a/software/kvm/instance.cfg.in
+++ b/software/kvm/instance.cfg.in
@@ -83,7 +83,6 @@ extra-context =
  raw dnsresolver_executable ${buildout:bin-directory}/dnsresolver
  raw dcron_executable_location ${dcron:location}/sbin/crond
  raw debian_amd64_netinst_location ${debian-amd64-netinst.iso:location}/${debian-amd64-netinst.iso:filename}
-  raw file_download_script ${file-download-script:location}/${file-download-script:filename}
  raw whitelist_domains_default ${whitelist-domains-default:location}/${whitelist-domains-default:filename}
  raw whitelist_firewall_download_controller ${whitelist-firewall-download-controller:target}
  raw image_download_controller ${image-download-controller:target}

--- a/software/kvm/software-py3.cfg
+++ b/software/kvm/software-py3.cfg
@@ -2,9 +2,5 @@
 extends =
  software.cfg
-# Ignore these for now
-common-parts -=
-  rdiff-backup
 [python]
 part = python3
--- a/software/kvm/software.cfg
+++ b/software/kvm/software.cfg
@@ -23,7 +23,6 @@ common-parts =
  template
 # XXX: we have to manually add this for resilience
-  rdiff-backup
  pbs-recipe-egg
@@ -176,12 +175,6 @@ on-update = true
 filename = qemu-is-ready.in
 on-update = true
-[file-download-script]
-<= download-template-base
-path = download_file.in
-filename = download_file
-on-update = true
 [whitelist-domains-default]
 <= download-template-base
 filename = whitelist-domains-default

--- a/software/kvm/template/download_file.in
+++ b/software/kvm/template/download_file.in
-#!/usr/bin/env python
-import os
-import urllib
-import hashlib
-import sys
-def md5Checksum(file_path):
-  with open(file_path, 'rb') as fh:
-    m = hashlib.md5()
-    while True:
-      data = fh.read(8192)
-      if not data:
-          break
-      m.update(data)
-    return m.hexdigest()
-if __name__ == "__main__":
-  url, md5sum, destination_path = sys.argv[1:]
-  urllib.urlretrieve (url, destination_path)
-  computed_md5sum = md5Checksum(destination_path)
-  if computed_md5sum != md5sum:
-    os.remove(destination_path)
-    raise Exception('MD5 mismatch. MD5 of downloaded file is %s, Specified MD5 is %s.' % (
-        computed_md5sum, md5sum))
--- a/software/kvm/test/test.py
+++ b/software/kvm/test/test.py
@@ -38,8 +38,8 @@ from six.moves.urllib.parse import parse_qs, urlparse
 import unittest
 import subprocess
 import tempfile
-import SocketServer
+import six.moves.socketserver as SocketServer
-import SimpleHTTPServer
+from six.moves import SimpleHTTPServer
 import multiprocessing
 import time
 import shutil
@@ -51,8 +51,6 @@ from slapos.testing.utils import findFreeTCPPort
 has_kvm = os.access('/dev/kvm', os.R_OK | os.W_OK)
 skipUnlessKvm = unittest.skipUnless(has_kvm, 'kvm not loaded or not allowed')
-skipIfPython3 = unittest.skipIf(
-  six.PY3, 'rdiff-backup is not compatible with Python 3 yet')
 if has_kvm:
  setUpModule, InstanceTestCase = makeModuleSetUpAndTestCaseClass(
@@ -385,7 +383,6 @@ class TestAccessKvmClusterAdditional(MonitorAccessMixin, InstanceTestCase):
    self.assertIn('<title>noVNC</title>', result.text)
-@skipIfPython3
 @skipUnlessKvm
 class TestAccessKvmClusterBootstrap(MonitorAccessMixin, InstanceTestCase):
  __partition_reference__ = 'akcb'
@@ -432,7 +429,6 @@ class TestAccessKvmClusterBootstrap(MonitorAccessMixin, InstanceTestCase):
    self.assertIn('<title>noVNC</title>', result.text)
-@skipIfPython3
 @skipUnlessKvm
 class TestInstanceResilient(InstanceTestCase, KvmMixin):
  __partition_reference__ = 'ir'
@@ -515,7 +511,6 @@ ir3:sshd-on-watch RUNNING""",
    )
-@skipIfPython3
 @skipUnlessKvm
 class TestAccessResilientAdditional(InstanceTestCase):
  __partition_reference__ = 'ara'
@@ -604,13 +599,13 @@ class FakeImageServerMixin(object):
      (self._ipv4_address, findFreeTCPPort(self._ipv4_address)),
      FakeImageHandler)
-    fake_image_content = 'fake_image_content'
+    fake_image_content = b'fake_image_content'
    self.fake_image_md5sum = hashlib.md5(fake_image_content).hexdigest()
    with open(os.path.join(
      self.image_source_directory, self.fake_image_md5sum), 'wb') as fh:
      fh.write(fake_image_content)
-    fake_image2_content = 'fake_image2_content'
+    fake_image2_content = b'fake_image2_content'
    self.fake_image2_md5sum = hashlib.md5(fake_image2_content).hexdigest()
    with open(os.path.join(
      self.image_source_directory, self.fake_image2_md5sum), 'wb') as fh:
@@ -849,7 +844,6 @@ class TestBootImageUrlList(InstanceTestCase, FakeImageServerMixin):
    self.assertPromiseFails(self.config_state_promise)
-@skipIfPython3
 @skipUnlessKvm
 class TestBootImageUrlListResilient(TestBootImageUrlList):
  kvm_instance_partition_reference = 'biul2'
@@ -993,7 +987,6 @@ class TestBootImageUrlSelect(TestBootImageUrlList):
    )
-@skipIfPython3
 @skipUnlessKvm
 class TestBootImageUrlSelectResilient(TestBootImageUrlSelect):
  kvm_instance_partition_reference = 'bius2'
@@ -1187,17 +1180,16 @@ class TestWhitelistFirewall(InstanceTestCase):
      '.slapos-whitelist-firewall')
    self.assertTrue(os.path.exists(slapos_whitelist_firewall))
    with open(slapos_whitelist_firewall, 'rb') as fh:
-      content = fh.read().encode('utf-8')
+      content = fh.read()
    try:
      self.content_json = json.loads(content)
    except ValueError:
-      self.fail('Failed to parse json of %s' % (content,))
+      self.fail('Failed to parse json of %r' % (content,))
    self.assertTrue(isinstance(self.content_json, list))
    # check /etc/resolv.conf
-    with open('/etc/resolv.conf', 'rb') as fh:
+    with open('/etc/resolv.conf', 'r') as f:
      resolv_conf_ip_list = []
-      for line in fh.readlines():
+      for line in f.readlines():
-        line = line.encode('utf-8')
        if line.startswith('nameserver'):
          resolv_conf_ip_list.append(line.split()[1])
    resolv_conf_ip_list = list(set(resolv_conf_ip_list))

--- a/software/seleniumserver/buildout.hash.cfg
+++ b/software/seleniumserver/buildout.hash.cfg
@@ -19,4 +19,4 @@ md5sum = c4ac5de141ae6a64848309af03e51d88
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = fc2e8176929063903a69b0e80007ca63
+md5sum = eea51d25c292c7ea305229184e380814
--- a/software/seleniumserver/instance-selenium.cfg.in
+++ b/software/seleniumserver/instance-selenium.cfg.in
@@ -66,6 +66,7 @@ port = 4444
 base-url = http://$${:hostname}:$${:port}
 url = $${:base-url}/wd/hub
 register-url = $${:base-url}/grid/register/
+api-url = $${:base-url}/grid/api/hub
 [selenium-server-node-instance]
@@ -259,6 +260,7 @@ instance-promises =
  $${sshd-listen-promise:name}
  $${selenium-server-frontend-listen-promise:name}
  $${selenium-server-hub-listen-promise:name}
+  $${selenium-server-hub-nodes-registered-promise:name}
  $${selenium-server-node-firefox-52-listen-promise:name}
  $${selenium-server-node-firefox-60-listen-promise:name}
  $${selenium-server-node-firefox-68-listen-promise:name}
@@ -285,6 +287,30 @@ config-port = $${selenium-server-frontend-instance:port}
 config-hostname = $${selenium-server-hub-instance:hostname}
 config-port = $${selenium-server-hub-instance:port}
+# Promise waiting for all nodes to be registered
+[selenium-server-hub-nodes-registered-promise]
+<= monitor-promise-base
+module = check_command_execute
+name = $${:_buildout_section_name_}.py
+config-command =
+  $${selenium-server-check-nodes-registered:rendered} $${selenium-server-hub-instance:api-url} $${:expected-node-count}
+# We have 4 nodes with 3 slots each
+expected-node-count = 12
+[selenium-server-check-nodes-registered]
+recipe = slapos.recipe.template:jinja2
+rendered = $${directory:bin}/$${:_buildout_section_name_}
+mode = 0755
+template =
+  inline:
+  #!${buildout:executable}
+  import json, urllib, sys
+  api_url = sys.argv[1]
+  expected_node_count = int(sys.argv[2])
+  actual_node_count = json.load(urllib.urlopen(api_url))['slotCounts']['total']
+  sys.exit(0 if expected_node_count == actual_node_count else 1)
 [selenium-server-node-firefox-52-listen-promise]
 <= check-port-listening-promise
 config-hostname = $${selenium-server-node-instance-firefox-52:hostname}

--- a/software/slaprunner/software-py3.cfg
+++ b/software/slaprunner/software-py3.cfg
@@ -2,10 +2,6 @@
 extends =
  software.cfg
-# Ignore these for now
-common-parts -=
-  rdiff-backup
 [python]
 part = python3

--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -45,7 +45,6 @@ common-parts =
  template-slapformat-definition.cfg
  template-slapuser-script
 # XXX: we have to manually add this for resilience
-  rdiff-backup
  pbs-recipe-egg
 parts =

--- a/software/theia/buildout.hash.cfg
+++ b/software/theia/buildout.hash.cfg
@@ -15,15 +15,15 @@
 [instance]
 filename = instance.cfg.in
-md5sum = 7cdff4ef4e8a7d1ac5f529865a7d8c6a
+md5sum = f3aac995aa1129ca58f9a92851ad7091
 [yarn.lock]
 filename = yarn.lock
-md5sum = e9c0f6cc380b53425f521a167c2fdf66
+md5sum = fb9f7bba4893ba701b9d5339d283533d
 [python-language-server-requirements.txt]
 filename = python-language-server-requirements.txt
-md5sum = 0883a40ebcb33d8d7c520490b21bd16c
+md5sum = 9f478fd1b03b7738f3de549cb899bf54
 [preloadTemplate.html]
 filename = preloadTemplate.html

--- a/software/theia/download-plugins.cfg
+++ b/software/theia/download-plugins.cfg
@@ -74,7 +74,7 @@ urls = vscode-bat https://open-vsx.org/api/vscode/bat/1.54.3/file/vscode.bat-1.5
 	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.4.0/file/perrinjerome.vscode-zc-buildout-0.4.0.vsix 028d2f77bd101d6388ded1839a60feaa
+	perrinjerome-vscode-zc-buildout https://open-vsx.org/api/perrinjerome/vscode-zc-buildout/0.5.0/file/perrinjerome.vscode-zc-buildout-0.5.0.vsix 739889de7ccaf8232fb6c6fe8571a1fa
 	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

--- a/software/theia/instance.cfg.in
+++ b/software/theia/instance.cfg.in
@@ -283,7 +283,7 @@ filename = $${:_buildout_section_name_}
 [common-environment]
 recipe = slapos.recipe.template:jinja2
 rendered = $${directory:bin}/$${:_buildout_section_name_}
-mode = 0777
+mode = 0700
 template =
  inline:
  #!/bin/sh
@@ -319,7 +319,7 @@ template =
  export TEMP=$TMP
  export LC_ALL=C.UTF-8
  export TERMINFO=${ncurses:location}/lib/terminfo/
-  export EDITOR="${python-language-server:location}/bin/python -m theia_open --wait"
+  export EDITOR="${theia-open:rendered} --wait"
  export THEIA_DEFAULT_PLUGINS="local-dir:${theia-plugins:location}"
  . $${common-environment:rendered}
  exec ${theia-wrapper:rendered} "$@"

--- a/software/theia/python-language-server-requirements.txt
+++ b/software/theia/python-language-server-requirements.txt
-appdirs==1.4.3
+appdirs==1.4.4
-astroid==2.3.3
+astroid==2.5.2
-attrs==18.2.0
+attrs==20.3.0
-black==18.9b0
+black==20.8b1
-Click==7.0
+certifi==2020.12.5
-future==0.17.1
+chardet==4.0.0
-isort==4.3.21
+click==7.1.2
-jedi==0.13.2
+future==0.18.2
+idna==2.10
+importlib-metadata==3.10.0
+isort==5.8.0
+jedi==0.18.0
 lazy-object-proxy==1.4.3
 mccabe==0.6.1
-mypy==0.770
+mypy==0.812
 mypy-extensions==0.4.3
-parso==0.3.2
+parso==0.8.2
-pluggy==0.8.1
+pathspec==0.8.1
-pydocstyle==3.0.0
+pluggy==0.13.1
+pydantic==1.8.1
+pydocstyle==6.0.0
+pyflags==0.1
 pyflakes==2.1.0
-pygls==0.9.1
+pygls==0.10.2
-pylint==2.4.4
+pylint==2.7.4
-python-jsonrpc-server==0.1.2
+regex==2021.4.4
-e git+https://github.com/palantir/python-language-server@50d03d5931d564e9908292ccfa21dd629ee817ba#egg=python_language_server
+requests==2.25.1
 rope==0.11.0
 six==1.12.0
 snowballstemmer==1.2.1
-toml==0.10.0
+toml==0.10.2
 typed-ast==1.4.1
-typing-extensions==3.7.4.2
+typeguard==2.12.0
+typing-extensions==3.7.4.3
+urllib3==1.26.4
 wrapt==1.11.2
 yapf==0.29.0
-zc.buildout.languageserver==0.4.0
+zc.buildout==2.13.4
-theia-open==0.3.0
+zc.buildout.languageserver==0.5.0
+zipp==3.4.1
--- a/software/theia/software.cfg
+++ b/software/theia/software.cfg
@@ -283,7 +283,8 @@ template =
          "@theia/variable-resolver": "latest",
          "@theia/vsx-registry": "latest",
          "@theia/workspace": "latest",
-          "@perrinjerome/theia-open": "0.1.2"
+          "@perrinjerome/theia-open": "latest",
+          "@perrinjerome/theia-open-cli": "latest"
      },
      "devDependencies": {
          "@theia/cli": "latest"
@@ -305,13 +306,21 @@ PATH = ${nodejs:location}/bin:${bash:location}/bin:${fish-shell:location}/bin:${
 [theia-wrapper]
 recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-mode = 0777
+mode = 0755
 template =
  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_}
+mode = 0755
+template =
+  inline:
+  #!/bin/sh
+  exec ${nodejs:location}/bin/node ${theia:location}/node_modules/.bin/theia-open "$@"
 [instance]
 <= template-base

--- a/software/theia/yarn.lock
+++ b/software/theia/yarn.lock
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
@@ -24,7 +24,6 @@ extends =
  ../component/mesa/buildout.cfg
  ../component/onlyoffice-core/buildout.cfg
  ../component/poppler/buildout.cfg
-  ../component/rdiff-backup/buildout.cfg
  ../component/xorg/buildout.cfg
 versions = versions
@@ -60,7 +59,6 @@ parts =
  file
  poppler
-  rdiff-backup
  apache
  haproxy
  cloudooo-develop
@@ -77,7 +75,6 @@ PasteScript = 3.2.0
 WSGIUtils = 0.7.2
 WSGIserver = 1.3
 python-magic = 0.4.18
-rdiff-backup = 1.0.5+SlapOSPatched001
 # Required by:
 # PasteScript== 3.2.0

--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -32,7 +32,6 @@ extends =
  ../../component/pycrypto-python/buildout.cfg
  ../../component/pysvn-python/buildout.cfg
  ../../component/python-ldap-python/buildout.cfg
-  ../../component/rdiff-backup/buildout.cfg
  ../../component/scikit-learn/buildout.cfg
  ../../component/scikit-image/buildout.cfg
  ../../component/PyWavelets/buildout.cfg
@@ -64,7 +63,6 @@ extends =
 parts +=
  erp5-util-develop
  slapos-cookbook
-  rdiff-backup
  mroonga-mariadb
  tesseract
  tesseract-eng-traineddata
@@ -624,9 +622,6 @@ zope.dottedname = 4.1.0
 # test_UserManagerInterfaces in testERP5Security fails with 1.10.0.
 Products.PluggableAuthService = 1.9.0
-# we are still using this old stable version.
-rdiff-backup = 1.0.5+SlapOSPatched001
 # modified version that works fine for buildout installation
 SOAPpy = 0.12.0nxd001

--- a/stack/erp5/buildout.hash.cfg
+++ b/stack/erp5/buildout.hash.cfg
@@ -94,4 +94,4 @@ md5sum = 3f4f7e49c504cbf610fc5dc462713dfc
 [template-rsyslogd-cfg]
 filename = rsyslogd.cfg.in
-md5sum = c34a9ee48b875148ea3f0d82cf853810
+md5sum = 5cf0316fdd17a940031e4083bbededd8
--- a/stack/erp5/rsyslogd.cfg.in
+++ b/stack/erp5/rsyslogd.cfg.in
@@ -8,7 +8,7 @@ module(
 # internal and end up cutting on 8k, as it's default of $MaxMessageSize
 template(name="rawoutput" type="string" string="%msg:2:8192%\n")
-$FileCreateMode 0600
+$FileCreateMode 0644
 $DirCreateMode 0700
 $Umask 0022

--- a/stack/resilient/buildout.cfg
+++ b/stack/resilient/buildout.cfg
@@ -20,7 +20,6 @@ parts =
  # needed tools for resiliency
  gzip
-  rdiff-backup
  dash
 [pbs-recipe-egg]
@@ -124,12 +123,3 @@ mode = 0644
 [exporter-default-configuration]
 # Time in minutes to wait for the backup to finish
 backup_wait_time = 10
-[rdiff-backup]
-eggs =
-  ${rdiff-backup-build-1.3.4:egg}
-[versions]
-# 1.3.4nxdX is invalid version string, thus pached version string is not '1.3.4nxdX+SlapOSPatched001'
-# but '1.3.4nxdX-SlapOSPatched001'.
-rdiff-backup = 1.3.4nxd6-SlapOSPatched001
--- a/stack/resilient/buildout.hash.cfg
+++ b/stack/resilient/buildout.hash.cfg
@@ -14,7 +14,7 @@
 # not need these here).
 [pbsready]
 filename = pbsready.cfg.in
-md5sum = 4b0f914a54c9be5bff2b86f3416f4584
+md5sum = afb54d1aafd5854116028bc63501409b
 [pbsready-import]
 filename = pbsready-import.cfg.in
@@ -26,7 +26,7 @@ md5sum = 2b0c71b085cfe8017f28098c160b1f49
 [template-pull-backup]
 filename = instance-pull-backup.cfg.in
-md5sum = 382d9b57faac92da3c723760f2210c13
+md5sum = e64e13854332bcc2595df187fcae1203
 [template-replicated]
 filename = template-replicated.cfg.in

--- a/stack/resilient/instance-pull-backup.cfg.in
+++ b/stack/resilient/instance-pull-backup.cfg.in
@@ -113,7 +113,7 @@ feeds = $${directory:notifier-feeds}
 callbacks-directory = $${directory:notifier-callbacks}
 equeue-socket = $${equeue:socket}
 notifier-binary = ${buildout:bin-directory}/pubsubnotifier
-rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
+rdiffbackup-binary = ${rdiff-backup-1.3.4:location}/bin/rdiff-backup
 sshclient-binary = $${openssh-client:wrapper-path}
 known-hosts = $${directory:dot-ssh}/known_hosts
 promises-directory = $${basedirectory:promises}
@@ -133,7 +133,7 @@ status-item-directory = $${directory:notifier-status-items}
 [pbs-resilient-status-feed]
 recipe = slapos.cookbook:wrapper
-command-line = ${buildout:directory}/bin/generatefeed --output $${:feed-path} --status-item-path $${pbs:status-item-directory} --title "Status feed for $${monitor-instance-parameter:root-instance-title}-PBS" --link $${pbs:log-url}
+command-line = ${buildout:bin-directory}/generatefeed --output $${:feed-path} --status-item-path $${pbs:status-item-directory} --title "Status feed for $${monitor-instance-parameter:root-instance-title}-PBS" --link $${pbs:log-url}
 feed-path = $${directory:monitor-resilient}/pbs-status-rss
 wrapper-path = $${rootdirectory:bin}/resilient-genstatusrss.py
@@ -197,7 +197,7 @@ wrapper-path = $${rootdirectory:bin}/ssh
 [resilient-genstatrss-wrapper]
 recipe = slapos.cookbook:wrapper
 # XXX - hard-coded Urls
-command-line = ${buildout:directory}/bin/rdiffbackup.genstatrss --output '$${monitor-directory:public}/resilient-feed' --rdiff_backup_data_folder '$${pbs:rdiff-backup-data-folder}' --feed_url '$${monitor-conf-parameters:base-url}/public/resilient-feed'
+command-line = ${buildout:bin-directory}/rdiffbackup.genstatrss --output '$${monitor-directory:public}/resilient-feed' --rdiff_backup_data_folder '$${pbs:rdiff-backup-data-folder}' --feed_url '$${monitor-conf-parameters:base-url}/public/resilient-feed'
 wrapper-path = $${directory:bin}/resilient-genstatrss.py
 [pbs-push-history-log]

--- a/stack/resilient/pbsready.cfg.in
+++ b/stack/resilient/pbsready.cfg.in
@@ -103,7 +103,7 @@ recipe = slapos.cookbook:pbs
 client = false
 path = $${directory:backup}
 wrapper = $${rootdirectory:bin}/rdiffbackup-server
-rdiffbackup-binary = ${buildout:bin-directory}/rdiff-backup
+rdiffbackup-binary = ${rdiff-backup-1.3.4:location}/bin/rdiff-backup
 #----------------
@@ -141,7 +141,7 @@ context =
 [notifier-resilient-status-feed]
 recipe = slapos.cookbook:wrapper
-command-line = ${buildout:directory}/bin/generatefeed --output $${:feed-path} --status-item-path $${notifier:status-item-directory} --title "Status feed for $${notifier:instance-root-name}" --link $${notifier:log-url}
+command-line = ${buildout:bin-directory}/generatefeed --output $${:feed-path} --status-item-path $${notifier:status-item-directory} --title "Status feed for $${notifier:instance-root-name}" --link $${notifier:log-url}
 feed-path = $${directory:monitor-resilient}/notifier-status-rss
 wrapper-path = $${rootdirectory:bin}/resilient-genstatusrss.py