Update Release Candidate

component/apache-php/buildout.cfg

@@ -23,6 +23,7 @@ extends =
   ../imagemagick/buildout.cfg
   ../icu/buildout.cfg
   ../openssl/buildout.cfg
+  ../libnsl/buildout.cfg
 
 [php-redis]
 recipe = slapos.recipe.cmmi
@@ -112,7 +113,7 @@ 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 -Wl,-rpath -Wl,${zstd:location}/lib
+  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 -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib 
   TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
   HOME=${apache:location}
 

component/apache/buildout.cfg

@@ -39,9 +39,9 @@ configure-options =
 [apache]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 2.4.51
+version = 2.4.52
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = d2793fc1c8cb8ba355cee877d1f2d46d
+md5sum = a94ae42b84309d5ef6e613ae825b92fa
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer

component/chromedriver/buildout.cfg

@@ -15,37 +15,29 @@ parts =
 
 [chromedriver-wrapper-91]
 <= chromedriver-wrapper
-wrapper-name = chromedriver-91
-part = ${chromedriver-91:location}
+part = chromedriver-91
 
 [chromedriver-wrapper-2.41]
 <= chromedriver-wrapper
-wrapper-name = chromedriver-2.41
-part = ${chromedriver-2.41:location}
+part = chromedriver-2.41
 
 [chromedriver-wrapper]
 # generate a wrapper named ${:wrapper-name} setting $LD_LIBRARY_PATH
 # to run chromedriver installed from ${:part}
-wrapper-name = chromedriver
-part = ${chromedriver:location}
+part = chromedriver
 
 recipe = slapos.recipe.build
-location = ${buildout:bin-directory}/${:wrapper-name}
+location = ${buildout:bin-directory}/${:part}
+init =
+  self.buildout[options['part']]
 install =
   import os
-  chromedriver = options['part']
-  part = self.buildout[os.path.basename(chromedriver)]
+  part = self.buildout[options['part']]
   with open(location, 'w') as f:
     f.write("""#!/bin/sh -e
-  cd {}
-  export LD_LIBRARY_PATH=$PWD:{}
-  export PATH={}:$PATH
-  exec ./chromedriver "$@"
-  """.format(
-    chromedriver,
-    ':'.join(part['library'].split()),
-    ':'.join(part['path'].split()),
-  ))
+  export LD_LIBRARY_PATH=%s
+  exec %s/chromedriver "$@"
+  """ % (':'.join(part['library'].split()), part['location']))
     os.fchmod(f.fileno(), 0o755)
 
 
@@ -67,18 +59,13 @@ md5sum-x86_64 = cc43ba0babbfff7f22b48165ec8e8c81
 [chromedriver-download]
 # Installs chromedriver ${version}.
 # This chromedriver is not usable directly, it needs a wrapper.
-version =
-md5sum-x86_64 =
-
-recipe = slapos.recipe.build
-x86_64-linux-gnu = https://chromedriver.storage.googleapis.com/${:version}/chromedriver_linux64.zip ${:md5sum-x86_64}
+recipe = slapos.recipe.build:download-unpacked
+url = https://chromedriver.storage.googleapis.com/${:version}/chromedriver_${:_url}.zip
 library =
   ${nss:location}/lib
   ${nspr:location}/lib
   ${libX11:location}/lib
-path =
-install =
-  import os, shutil
-  extract_dir = self.extract(self.download(*options[multiarch()].split()))
-  os.mkdir(location)
-  shutil.copy(os.path.join(extract_dir, 'chromedriver'), location)
+
+[chromedriver-download:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux64
+md5sum = ${:md5sum-x86_64}

component/chromium/buildout.cfg

@@ -11,7 +11,6 @@
 # in the system.
 extends =
   ../alsa/buildout.cfg
-  ../coreutils/buildout.cfg
   ../cups/buildout.cfg
   ../dbus/buildout.cfg
   ../findutils/buildout.cfg
@@ -37,30 +36,30 @@ parts =
 
 
 [chromium-wrapper]
-# Install a chromium wrapper named ${:wrapper-name} in buildout's bin-directory,
-# wrapping chromium installed in ${:part}
+# Install a chromium wrapper named ${:part} in buildout's bin-directory,
+# wrapping chromium installed in [${:part}]
 # This [chromium-wrapper] installs the default chromium with name `chromium` and
 # can also be used as a macro to install under a different name.
-wrapper-name = chromium
-part = ${chromium:location}
+part = chromium
 
 recipe = slapos.recipe.build
-location = ${buildout:bin-directory}/${:wrapper-name}
+location = ${buildout:bin-directory}/${:part}
+init =
+  self.buildout[options['part']]
 install =
   import os
-  chromium = options['part']
-  part = self.buildout[os.path.basename(chromium)]
+  part = self.buildout[options['part']]
   with open(location, 'w') as f:
     f.write("""#!/bin/sh -e
-  cd {}
+  d=%s
   # this also needs a $FONTCONFIG_FILE set, otherwise system fonts will be used and if
   # no system fonts are available, chrome will refuse to start with this error:
   # FATAL:platform_font_linux.cc(83)] Check failed: InitDefaultFont(). Could not find the default font
-  export LD_LIBRARY_PATH=$PWD:{}
-  export PATH={}:$PATH
-  exec ./chrome --disable-setuid-sandbox --no-sandbox --disable-gpu $@
-  """.format(
-    chromium,
+  export LD_LIBRARY_PATH=$d:%s
+  export PATH=%s:$PATH
+  exec $d/chrome --disable-setuid-sandbox --no-sandbox --disable-gpu "$@"
+  """ % (
+    part['location'],
     ':'.join(part['library'].split()),
     ':'.join(part['path'].split()),
   ))
@@ -68,13 +67,11 @@ install =
 
 [chromium-wrapper-91]
 <= chromium-wrapper
-wrapper-name = chromium-91
-part = ${chromium-91:location}
+part = chromium-91
 
 [chromium-wrapper-69]
 <= chromium-wrapper
-wrapper-name = chromium-69
-part = ${chromium-69:location}
+part = chromium-69
 
 
 [chromium]
@@ -101,24 +98,7 @@ generation-x86_64 = 1532051976706023
 [chromium-download]
 # macro to download a binary build of chromium and generate a
 # wrapper as chrome-slapos in the part directory
-
-# the full version tag
-version =
-
-# needs the following URL parts:
-# revision is from the "base position"
-revision_x86-64 =
-# generation is in the final download URL
-generation-x86_64 =
-# this is the md5sum of the downloaded archive
-md5sum-x86_64 =
-
-
-recipe = slapos.recipe.build
-
-x86_64-linux-gnu = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?generation=${:generation-x86_64}&alt=media ${:md5sum-x86_64}
-
-
+recipe = slapos.recipe.build:download-unpacked
 library =
   ${atk:location}/lib
   ${at-spi2-atk:location}/lib
@@ -166,12 +146,7 @@ library =
   ${zlib:location}/lib
 path =
   ${fontconfig:location}/bin
-install =
-  url, md5sum = self.options[multiarch()].split()
-  extract_dir = self.extract(self.download(url, md5sum))
-  self.copyTree(guessworkdir(extract_dir), location)
-  # XXX adjust some permissions
-  import os
-  os.system("'${findutils:location}/bin/find' '%s' -type d -exec '${coreutils:location}/bin/chmod' a+rx {} \\;" % location)
-  os.system("'${findutils:location}/bin/find' '%s' -type f -executable -exec '${coreutils:location}/bin/chmod' a+rx {} \\;" % location)
-  os.system("'${findutils:location}/bin/find' '%s' -type f -exec '${coreutils:location}/bin/chmod' a+r {} \\;" % location)
+
+[chromium-download:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+url = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?generation=${:generation-x86_64}&alt=media
+md5sum = ${:md5sum-x86_64}

component/cmake/buildout.cfg

@@ -9,8 +9,8 @@ parts =
 [cmake]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://cmake.org/files/v3.21/cmake-3.21.3.tar.gz
-md5sum = c0feb5855604f68b09bdb3acb623619e
+url = https://cmake.org/files/v3.22/cmake-3.22.1.tar.gz
+md5sum = 83802be08c114bb34729300206488321
 environment =
   CMAKE_INCLUDE_PATH=${ncurses:location}/include:${openssl:location}/include
   CMAKE_LIBRARY_PATH=${ncurses:location}/lib:${openssl:location}/lib

component/consul/buildout.cfg

@@ -4,7 +4,14 @@ parts =
 
 [consul]
 recipe = slapos.recipe.build:download-unpacked
+shared = true
 version = 0.8.3
-base = https://releases.hashicorp.com/consul/${:version}/consul_${:version}
-i386-linux-gnu   = ${:base}_linux_386.zip    dfdc0eedd79baab7e6bc56c1582fd02e
-x86_64-linux-gnu = ${:base}_linux_amd64.zip  d6bc0898ea37ae2198370a9e1978d1bb
+url = https://releases.hashicorp.com/consul/${:version}/consul_${:version}_${:_url}.zip
+
+[consul:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url = linux_386
+md5sum = dfdc0eedd79baab7e6bc56c1582fd02e
+
+[consul:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux_amd64
+md5sum = d6bc0898ea37ae2198370a9e1978d1bb

component/coturn/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../sqlite3/buildout.cfg
   ../openssl/buildout.cfg
   ../libevent/buildout.cfg
+  ../libnsl/buildout.cfg
 parts = coturn
 
 [coturn]
@@ -13,4 +14,4 @@ environment =
   PATH=${sqlite3:location}/bin:%(PATH)s
   CPPFLAGS=-I${openssl:location}/include -I${sqlite3:location}/include -I${libevent2:location}/include
   CFLAGS=-I${libevent2:location}/include
-  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${libevent2:location}/lib -Wl,-rpath -Wl,${libevent2:location}/lib
+  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -L${libevent2:location}/lib -Wl,-rpath -Wl,${libevent2:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib

component/cpio/963304-remove-superfluous-declaration-of-program_name

+author	Sergey Poznyakoff <gray@gnu.org>
+
+https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=641d3f489cf6238bb916368d4ba0d9325a235afb
+
+* src/global.c: Remove superfluous declaration of program_name
+
+diff --git a/src/global.c b/src/global.c
+index fb3abe9..acf92bc 100644
+--- a/src/global.c
++++ b/src/global.c
+@@ -184,9 +184,6 @@ unsigned int warn_option = 0;
+ /* Extract to standard output? */
+ bool to_stdout_option = false;
+ 
+-/* The name this program was run with.  */
+-char *program_name;
+-
+ /* A pointer to either lstat or stat, depending on whether
+    dereferencing of symlinks is done for input files.  */
+ int (*xstat) ();

component/cpio/buildout.cfg

 # GNU cpio copies files into or out of a cpio or tar archive. The archive can be another file on the disk, a magnetic tape, or a pipe.
 [buildout]
+extends =
+  ../patch/buildout.cfg
 parts = cpio
 
 [cpio]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/cpio/cpio-2.12.tar.bz2
-md5sum = 93eea9f07c0058c097891c73e4955456
+url = https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.bz2
+md5sum = f3438e672e3fa273a7dc26339dd1eed6
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/963304-remove-superfluous-declaration-of-program_name#1aadb39448eedaf49d03cf45f9d78ea4
+environment =
+  PATH=${patch:location}/bin:%(PATH)s

component/firefox/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../alsa/buildout.cfg
   ../dbus/buildout.cfg
   ../fontconfig/buildout.cfg
+  ../fonts/buildout.cfg
   ../gtk-2/buildout.cfg
   ../gtk-3/buildout.cfg
   ../libffi/buildout.cfg
@@ -22,54 +23,52 @@ parts =
 
 
 [firefox-wrapper]
-# Install a firefox wrapper names ${:wrapper-name} in buildout's bin-directory,
-# wrapping firefox installed in ${:part}
+# Install a firefox wrapper named ${:part} in buildout's bin-directory,
+# wrapping firefox installed in [${:part}]
 # This [firefox-wrapper] installs the default firefox with name `firefox` and
 # can also be used as a macro to install under a different name.
-wrapper-name = firefox
-part = ${firefox:location}
+part = firefox
 
 recipe = slapos.recipe.build
-location = ${buildout:bin-directory}/${:wrapper-name}
+location = ${buildout:bin-directory}/${:part}
+fonts-conf = ${firefox-default-fonts-conf:rendered}
+init =
+  self.buildout[options['part']]
 install =
   import os
-  firefox = options['part']
-  part = self.buildout[os.path.basename(firefox)]
+  part = self.buildout[options['part']]
   with open(location, 'w') as f:
     f.write("""#!/bin/sh -e
-  cd {}
-  export LD_LIBRARY_PATH=$PWD:{}
-  export PATH={}:$PATH
+  d=%s
+  export LD_LIBRARY_PATH=$d:%s
+  export PATH=%s:$PATH
   # BBB use a default fonts.conf for compatibility, but it's software instance
   # responsability to build a fonts.conf with the fonts they want.
-  [ -z $FONTCONFIG_FILE ] && export FONTCONFIG_FILE=${firefox-default-fonts-conf:rendered}
-  exec ./firefox "$@"
-  """.format(
-    firefox,
+  [ "$FONTCONFIG_FILE" ] || export FONTCONFIG_FILE=%s
+  exec $d/firefox "$@"
+  """ % (
+    part['location'],
     ':'.join(part['library'].split()),
     ':'.join(part['path'].split()),
+    options['fonts-conf'],
   ))
     os.fchmod(f.fileno(), 0o755)
 
 [firefox-wrapper-78]
 <= firefox-wrapper
-wrapper-name = firefox-78
-part = ${firefox-78:location}
+part = firefox-78
 
 [firefox-wrapper-68]
 <= firefox-wrapper
-wrapper-name = firefox-68
-part = ${firefox-68:location}
+part = firefox-68
 
 [firefox-wrapper-60]
 <= firefox-wrapper
-wrapper-name = firefox-60
-part = ${firefox-60:location}
+part = firefox-60
 
 [firefox-wrapper-52]
 <= firefox-wrapper
-wrapper-name = firefox-52
-part = ${firefox-52:location}
+part = firefox-52
 
 [firefox-default-fonts-conf]
 recipe = slapos.recipe.template:jinja2
@@ -124,8 +123,7 @@ recipe = slapos.recipe.build
 slapos_promise =
   file:firefox
 
-i386-linux-gnu = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-i686/en-US/firefox-${:version}.tar.bz2 ${:i686-md5sum}
-x86_64-linux-gnu = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/linux-x86_64/en-US/firefox-${:version}.tar.bz2 ${:x86_64-md5sum}
+url = https://download-installer.cdn.mozilla.net/pub/firefox/releases/${:version}/${:_url}/en-US/firefox-${:version}.tar.bz2
 
 library =
   ${alsa:location}/lib
@@ -173,12 +171,19 @@ path =
   ${fontconfig:location}/bin
 
 install =
-  url, md5sum = options[multiarch()].split()
-  extract_dir = self.extract(self.download(url, md5sum))
-  self.copyTree(guessworkdir(extract_dir), location)
+  self.copyTree(guessworkdir(self.extract(self.download())), location)
   ${:post-install}
 post-install =
 
+[firefox-download:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url = linux-i686
+md5sum = ${:i686-md5sum}
+
+[firefox-download:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux-x86_64
+md5sum = ${:x86_64-md5sum}
+
+
 [geckodriver]
 # Current geckodriver installed as ${buildout:bin-directory}/geckodriver
 <= geckodriver-0.24.0
@@ -201,17 +206,20 @@ version = 0.16.1
 i686-md5sum = not not on github
 x86_64-md5sum = 57dfd55d4759d9878eb75b4c0123d00c
 
-
 [geckodriver-base]
 # Installs geckodriver ${version}
 recipe = slapos.recipe.build
+url = https://github.com/mozilla/geckodriver/releases/download/v${:version}/geckodriver-v${:version}-${:_url}.tar.gz
 location = ${buildout:bin-directory}/${:_buildout_section_name_}
+install =
+  import os, shutil
+  extract_dir = self.extract(self.download(options['url'], options['md5sum']))
+  shutil.copy(os.path.join(extract_dir, 'geckodriver'), location)
 
-i386-linux-gnu = https://github.com/mozilla/geckodriver/releases/download/v${:version}/geckodriver-v${:version}-linux32.tar.gz ${:i686-md5sum}
-x86_64-linux-gnu = https://github.com/mozilla/geckodriver/releases/download/v${:version}/geckodriver-v${:version}-linux64.tar.gz ${:x86_64-md5sum}
+[geckodriver-base:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url = linux32
+md5sum = ${:i686-md5sum}
 
-install =
-  import shutil
-  url, md5sum = options[multiarch()].split()
-  extract_dir = self.extract(self.download(url, md5sum))
-  shutil.copy(extract_dir + '/geckodriver', location)
+[geckodriver-base:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux64
+md5sum = ${:x86_64-md5sum}

component/golang/buildout.cfg

@@ -59,8 +59,8 @@ environment-extra =
 
 [golang1.16]
 <= golang-common
-url = https://golang.org/dl/go1.16.10.src.tar.gz
-md5sum = 49f0a54f0bdcba297bac194d8dafe431
+url = https://golang.org/dl/go1.16.13.src.tar.gz
+md5sum = 1c076f952d9af57590a36fa7d36f695a
 
 # go1.16 needs go1.4 to bootstrap
 environment-extra =
@@ -68,8 +68,8 @@ environment-extra =
 
 [golang1.17]
 <= golang-common
-url = https://golang.org/dl/go1.17.3.src.tar.gz
-md5sum = 3ea82e5966275f405f0db4f52511bb6e
+url = https://golang.org/dl/go1.17.6.src.tar.gz
+md5sum = dc57f93f323e9f8189e5ffc1f223e346
 
 # go1.17 needs go1.4 to bootstrap
 environment-extra =

component/libreoffice-bin/buildout.cfg

@@ -8,26 +8,15 @@ parts =
 
 [libreoffice-bin]
 recipe = slapos.recipe.build
-# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
 version = 5.2.4.2
-url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/%s/LibreOffice_${:version}_Linux_%s_rpm.tar.gz
-# supported architectures md5sums
-md5sum_x86 = 7a0b33a2d18f06143258c428c32de213
-md5sum_x86-64 = cbea6cd17063b5bcbe0cb32f7819f0cf
+url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/${:_url1}/LibreOffice_${:version}_${:_url2}_rpm.tar.gz
 
 # where office code can be found?
 officedir = libreoffice5.2
 install =
   import os
   import sys
-  arch = {
-    'i386-linux-gnu': ('x86', 'x86'),
-    'x86_64-linux-gnu': ('x86_64', 'x86-64'),
-  }[multiarch()]
-  url = options['url'] % arch
-  md5sum = options['md5sum_' + arch[1]]
-  extract_dir = self.extract(self.download(url, md5sum))
-  workdir = guessworkdir(extract_dir)
+  workdir = guessworkdir(self.extract(self.download()))
   storagedir = os.path.join(workdir, 'storage')
   os.mkdir(storagedir)
   rpmsdir = os.path.join(workdir, 'RPMS')
@@ -48,3 +37,13 @@ install =
 # helper binaries
 cpio = ${cpio:location}/bin/cpio
 rpm2cpio = ${rpm2cpio:target}
+
+[libreoffice-bin:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url1 = x86
+_url2 = Linux_x86
+md5sum = 7a0b33a2d18f06143258c428c32de213
+
+[libreoffice-bin:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url1 = x86_64
+_url2 = Linux_x86-64
+md5sum = cbea6cd17063b5bcbe0cb32f7819f0cf

component/ninja/buildout.cfg

 [buildout]
-extends =
-  ../defaults.cfg
 parts =
   ninja
 
@@ -10,7 +8,7 @@ shared = true
 version = 1.10.2
 url = https://github.com/ninja-build/ninja/archive/refs/tags/v${:version}.tar.gz
 md5sum = 639f75bc2e3b19ab893eaf2c810d4eb4
-configure-command = ${python:executable} configure.py
+configure-command = ${buildout:executable} configure.py
 configure-options = --bootstrap --verbose
 make-binary = true
 post-install =

component/packer/buildout.cfg

@@ -4,7 +4,14 @@ parts =
 
 [packer]
 recipe = slapos.recipe.build:download-unpacked
+shared = true
 version = 0.7.5
-base = https://releases.hashicorp.com/packer/${:version}/packer_${:version}
-i386-linux-gnu   = ${:base}_linux_386.zip    a545108a0ccfde7c1e74de6c4e6fdded
-x86_64-linux-gnu = ${:base}_linux_amd64.zip  f343d709b84db494e8d6ec38259aa4a6
+url = https://releases.hashicorp.com/packer/${:version}/packer_${:version}_${:_url}.zip
+
+[packer:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url = linux_386
+md5sum = a545108a0ccfde7c1e74de6c4e6fdded
+
+[packer:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux_amd64
+md5sum = f343d709b84db494e8d6ec38259aa4a6

component/phantomjs/buildout.cfg

@@ -7,23 +7,36 @@ parts =
 
 [phantomjs]
 recipe = slapos.recipe.build
+shared = true
 slapos_promise =
   file:phantomjs-slapos
 
-base = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux
-i386-linux-gnu   = ${:base}-i686.tar.bz2   9c1426eef5b04679d65198b1bdd6ef88
-x86_64-linux-gnu = ${:base}-x86_64.tar.bz2 f278996c3edd0e8d8ec4893807f27d71
-
+url = https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-${:_url}.tar.bz2
 install =
   import os
-  extract_dir = self.extract(self.download(*options[multiarch()].split()))
-  workdir = guessworkdir(extract_dir)
-  self.copyTree(workdir, location)
+  self.copyTree(guessworkdir(self.extract(self.download())), location)
   with open(os.path.join(location, "phantomjs-slapos"), 'w') as wrapper:
     wrapper.write("""#!/bin/sh -e
-  cd %(location)s
-  export LD_LIBRARY_PATH=%(location)s:${freetype:location}/lib/:${fontconfig:location}/lib/:${libexpat:location}/lib
-  export PATH=${fontconfig:location}/bin:$PATH
-  exec %(location)s/bin/phantomjs "$@"
-  """ % options)
+  export LD_LIBRARY_PATH=%s
+  export PATH=%s:$PATH
+  exec %s/bin/phantomjs "$@"
+  """ % (
+    ':'.join(options['library'].split()),
+    ':'.join(options['path'].split()),
+    location,
+  ))
     os.fchmod(wrapper.fileno(), 0o755)
+library =
+  ${freetype:location}/lib
+  ${fontconfig:location}/lib
+  ${libexpat:location}/lib
+path =
+  ${fontconfig:location}/bin
+
+[phantomjs:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url = linux-i686
+md5sum = 9c1426eef5b04679d65198b1bdd6ef88
+
+[phantomjs:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux-x86_64
+md5sum = f278996c3edd0e8d8ec4893807f27d71

component/theia/buildout.hash.cfg

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

component/theia/download-plugins.cfg

 # This file is automatically generated from generate_download_plugins_cfg.py
 # Do not edit directly.
 [theia-download-plugins]
-urls = vscode-bat https://open-vsx.org/api/vscode/bat/1.54.3/file/vscode.bat-1.54.3.vsix 77de5b930e0b9baa90059abb1711bd22
-	vscode-clojure https://open-vsx.org/api/vscode/clojure/1.54.3/file/vscode.clojure-1.54.3.vsix f89e90ad2e808e58bc1b4d24fbbf680f
-	vscode-coffeescript https://open-vsx.org/api/vscode/coffeescript/1.54.3/file/vscode.coffeescript-1.54.3.vsix 0800e4a04e9a0cfa4810c0461f26ab00
-	vscode-configuration-editing https://open-vsx.org/api/vscode/configuration-editing/1.54.3/file/vscode.configuration-editing-1.54.3.vsix 44c5f0439733f93813482138656001a0
-	vscode-cpp https://open-vsx.org/api/vscode/cpp/1.54.3/file/vscode.cpp-1.54.3.vsix 851461a32d8a69b817d85f82bf9b4035
-	vscode-csharp https://open-vsx.org/api/vscode/csharp/1.54.3/file/vscode.csharp-1.54.3.vsix e9f69d28870a3ba1fa8cf30d6ceaabcf
-	vscode-css https://open-vsx.org/api/vscode/css/1.54.3/file/vscode.css-1.54.3.vsix 8539c80c26897a95e8a55d1640c205dc
-	vscode-css-language-features https://open-vsx.org/api/vscode/css-language-features/1.54.3/file/vscode.css-language-features-1.54.3.vsix 530806dfef61b6936bce7dccd79a9383
-	vscode-debug-auto-launch https://open-vsx.org/api/vscode/debug-auto-launch/1.54.3/file/vscode.debug-auto-launch-1.54.3.vsix 5840891614f42fd22a7adcb812a2a26b
-	vscode-docker https://open-vsx.org/api/vscode/docker/1.54.3/file/vscode.docker-1.54.3.vsix a4e3cdd03833fe6bf3f5045fc5be4433
-	vscode-emmet https://open-vsx.org/api/vscode/emmet/1.54.3/file/vscode.emmet-1.54.3.vsix 5786c95921794ed3188083a7f804fa29
-	vscode-fsharp https://open-vsx.org/api/vscode/fsharp/1.54.3/file/vscode.fsharp-1.54.3.vsix 028f4ec9593533ce38603032b3f2821e
-	vscode-git https://open-vsx.org/api/vscode/git/1.54.3/file/vscode.git-1.54.3.vsix da2f2c0626b4a254a660ae20b0c97611
-	vscode-go https://open-vsx.org/api/vscode/go/1.54.3/file/vscode.go-1.54.3.vsix 9f095a75e4137079351150722d091256
-	vscode-groovy https://open-vsx.org/api/vscode/groovy/1.54.3/file/vscode.groovy-1.54.3.vsix 7ae14c40786311fda29059178f30c310
-	vscode-grunt https://open-vsx.org/api/vscode/grunt/1.54.3/file/vscode.grunt-1.54.3.vsix f7894259f1fa60e939ff2d9b49138a02
-	vscode-gulp https://open-vsx.org/api/vscode/gulp/1.54.3/file/vscode.gulp-1.54.3.vsix cc5c570dda3b69ba3e1e1ffbe6f3a0c8
-	vscode-handlebars https://open-vsx.org/api/vscode/handlebars/1.54.3/file/vscode.handlebars-1.54.3.vsix ea433237fb8940ba2ff075253f58b9a6
-	vscode-hlsl https://open-vsx.org/api/vscode/hlsl/1.54.3/file/vscode.hlsl-1.54.3.vsix d111abc12ad0e9f6d15e3b3c522e3072
-	vscode-html https://open-vsx.org/api/vscode/html/1.54.3/file/vscode.html-1.54.3.vsix f8fa8f2e54ca8f3d3d64c60cb617bfde
+urls = vscode-bat https://open-vsx.org/api/vscode/bat/1.62.3/file/vscode.bat-1.62.3.vsix 61e32be47fbd5a88907bf7b2e8498621
+	vscode-clojure https://open-vsx.org/api/vscode/clojure/1.62.3/file/vscode.clojure-1.62.3.vsix 9b44f96739dcac6d5117859fd72fbdba
+	vscode-coffeescript https://open-vsx.org/api/vscode/coffeescript/1.62.3/file/vscode.coffeescript-1.62.3.vsix 54fa3459253d7817535c4151f704c84c
+	vscode-configuration-editing https://open-vsx.org/api/vscode/configuration-editing/1.62.3/file/vscode.configuration-editing-1.62.3.vsix 941b13b5f15a4b4de122f68987b79e0c
+	vscode-cpp https://open-vsx.org/api/vscode/cpp/1.62.3/file/vscode.cpp-1.62.3.vsix aefd964c2bddc59c87f14e76aee959fa
+	vscode-csharp https://open-vsx.org/api/vscode/csharp/1.62.3/file/vscode.csharp-1.62.3.vsix 38cde5827cf2f88c8a2988f559a5a02f
+	vscode-css https://open-vsx.org/api/vscode/css/1.62.3/file/vscode.css-1.62.3.vsix 56ba10d5d7d63140b7b68c47be090c72
+	vscode-css-language-features https://open-vsx.org/api/vscode/css-language-features/1.62.3/file/vscode.css-language-features-1.62.3.vsix 9bc4e515a491a9e4749084aa1753ddac
+	vscode-debug-auto-launch https://open-vsx.org/api/vscode/debug-auto-launch/1.62.3/file/vscode.debug-auto-launch-1.62.3.vsix 9236132f864d689e839b51bb52d28def
+	vscode-docker https://open-vsx.org/api/vscode/docker/1.62.3/file/vscode.docker-1.62.3.vsix f27713e5ca6d1d08cb4b58668d59db66
+	vscode-emmet https://open-vsx.org/api/vscode/emmet/1.62.3/file/vscode.emmet-1.62.3.vsix 5ad6c366cd49cb8786eec28908fabf1c
+	vscode-fsharp https://open-vsx.org/api/vscode/fsharp/1.62.3/file/vscode.fsharp-1.62.3.vsix 9450d03e78d9dc671b8068c9a73e5570
+	vscode-git https://open-vsx.org/api/vscode/git/1.62.3/file/vscode.git-1.62.3.vsix 76390cc667080a62bdebc7302134be08
+	vscode-go https://open-vsx.org/api/vscode/go/1.62.3/file/vscode.go-1.62.3.vsix d7b620cd630dfd126100a1c7366a665b
+	vscode-groovy https://open-vsx.org/api/vscode/groovy/1.62.3/file/vscode.groovy-1.62.3.vsix ed8b4d51bc41d68cfbe2ac72f6884d2d
+	vscode-grunt https://open-vsx.org/api/vscode/grunt/1.62.3/file/vscode.grunt-1.62.3.vsix 96800d71f8a3842d0413684550bc5e0f
+	vscode-gulp https://open-vsx.org/api/vscode/gulp/1.62.3/file/vscode.gulp-1.62.3.vsix e50eb3f086fa2053249c0d817a208f57
+	vscode-handlebars https://open-vsx.org/api/vscode/handlebars/1.62.3/file/vscode.handlebars-1.62.3.vsix b762f43fff8bd5629dd9dc6454c3045b
+	vscode-hlsl https://open-vsx.org/api/vscode/hlsl/1.62.3/file/vscode.hlsl-1.62.3.vsix 899e646896216df4ed2d46e8f17812c9
+	vscode-html https://open-vsx.org/api/vscode/html/1.62.3/file/vscode.html-1.62.3.vsix a3448adf65e4158a250b37d470ce396c
 	vscode-html-language-features https://open-vsx.org/api/vscode/html-language-features/1.52.1/file/vscode.html-language-features-1.52.1.vsix a83619f2924ec58713691e76f17c7fb6
-	vscode-ini https://open-vsx.org/api/vscode/ini/1.54.3/file/vscode.ini-1.54.3.vsix 3f758e07aad99c4ba15fbc59c0807e2d
-	vscode-jake https://open-vsx.org/api/vscode/jake/1.54.3/file/vscode.jake-1.54.3.vsix 60b90d9620e0b85d8effe0a5265079f0
-	vscode-java https://open-vsx.org/api/vscode/java/1.54.3/file/vscode.java-1.54.3.vsix 9b933657f3e5eedfe0247006a268ac92
-	vscode-javascript https://open-vsx.org/api/vscode/javascript/1.54.3/file/vscode.javascript-1.54.3.vsix 32860b0b1bea5b2fc15b4d7eb5eaf630
-	ms-vscode-js-debug https://open-vsx.org/api/ms-vscode/js-debug/1.52.2/file/ms-vscode.js-debug-1.52.2.vsix f0f0c11c9c1855b6d3c87b230790c949
-	vscode-json https://open-vsx.org/api/vscode/json/1.54.3/file/vscode.json-1.54.3.vsix 7dda28a6cdcf703d0af938ffd2a60a56
+	vscode-ini https://open-vsx.org/api/vscode/ini/1.62.3/file/vscode.ini-1.62.3.vsix ee71130f95861b61d92d644c3cd8ded7
+	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
+	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.54.3/file/vscode.less-1.54.3.vsix 1edc8fca796c520d7e1aa89c069070a4
-	vscode-log https://open-vsx.org/api/vscode/log/1.54.3/file/vscode.log-1.54.3.vsix 9552f796a8f2ca38950d0f25df21f9cb
-	vscode-lua https://open-vsx.org/api/vscode/lua/1.54.3/file/vscode.lua-1.54.3.vsix ed6a4a09c8505e0f1437d2530c69bfe5
-	vscode-make https://open-vsx.org/api/vscode/make/1.54.3/file/vscode.make-1.54.3.vsix 996b8d1a2292318d177ae4951b67c990
-	vscode-markdown https://open-vsx.org/api/vscode/markdown/1.54.3/file/vscode.markdown-1.54.3.vsix 4188ca7c2bda0037e88f24cc443a24f8
-	vscode-markdown-language-features https://open-vsx.org/api/vscode/markdown-language-features/1.39.2/file/vscode.markdown-language-features-1.39.2.vsix 9ab6e372796b3bacede80fcbcfd35640
-	vscode-merge-conflict https://open-vsx.org/api/vscode/merge-conflict/1.54.3/file/vscode.merge-conflict-1.54.3.vsix 554eeb664788a7b5b80ce1da4795f0b1
-	vscode-npm https://open-vsx.org/api/vscode/npm/1.54.3/file/vscode.npm-1.54.3.vsix e6eeeedebf3b6986f1d7043c94807d01
-	ms-vscode-node-debug https://open-vsx.org/api/ms-vscode/node-debug/1.44.8/file/ms-vscode.node-debug-1.44.8.vsix 367bac016859084e63acf792ed4a1aeb
-	ms-vscode-node-debug2 https://open-vsx.org/api/ms-vscode/node-debug2/1.42.5/file/ms-vscode.node-debug2-1.42.5.vsix 7882d7d90d18820be17aa5f3e12e71e1
-	vscode-objective-c https://open-vsx.org/api/vscode/objective-c/1.54.3/file/vscode.objective-c-1.54.3.vsix 6b3e02fc4ef1ddefa7e3eabef5bf5906
-	vscode-perl https://open-vsx.org/api/vscode/perl/1.54.3/file/vscode.perl-1.54.3.vsix 6f3bc3e5b42e34e23fa287db2548b7c8
-	vscode-powershell https://open-vsx.org/api/vscode/powershell/1.54.3/file/vscode.powershell-1.54.3.vsix da887b8a031620f77676f529a7403580
-	vscode-pug https://open-vsx.org/api/vscode/pug/1.54.3/file/vscode.pug-1.54.3.vsix 8144700e4a33e99fa9b669d1254f8836
-	vscode-python https://open-vsx.org/api/vscode/python/1.54.3/file/vscode.python-1.54.3.vsix cea58111aad00d216f3643d9a180e1e5
-	vscode-r https://open-vsx.org/api/vscode/r/1.54.3/file/vscode.r-1.54.3.vsix fa4452b7777db74cb80a037b84a594a4
-	vscode-razor https://open-vsx.org/api/vscode/razor/1.54.3/file/vscode.razor-1.54.3.vsix da9e67b2f3530658778ac3180725e483
-	vscode-ruby https://open-vsx.org/api/vscode/ruby/1.54.3/file/vscode.ruby-1.54.3.vsix 9784e2d9ee737ea31192f60c97659832
-	vscode-rust https://open-vsx.org/api/vscode/rust/1.54.3/file/vscode.rust-1.54.3.vsix 8763f9e271841772e096a9fbbe4e342d
-	vscode-scss https://open-vsx.org/api/vscode/scss/1.54.3/file/vscode.scss-1.54.3.vsix 89d19984246b7c708738534648bb9fd0
-	vscode-shaderlab https://open-vsx.org/api/vscode/shaderlab/1.54.3/file/vscode.shaderlab-1.54.3.vsix 6cda4de8ff8c5d84b53dd8a234ae4d4f
-	vscode-shellscript https://open-vsx.org/api/vscode/shellscript/1.54.3/file/vscode.shellscript-1.54.3.vsix 32ec524b436a5c8a9d9be7c452112552
-	vscode-sql https://open-vsx.org/api/vscode/sql/1.54.3/file/vscode.sql-1.54.3.vsix bd448cac364ea09b4593db7efca625d3
-	vscode-swift https://open-vsx.org/api/vscode/swift/1.54.3/file/vscode.swift-1.54.3.vsix 32b12e0e1b284c273e5c120c394a75bf
-	vscode-theme-abyss https://open-vsx.org/api/vscode/theme-abyss/1.54.3/file/vscode.theme-abyss-1.54.3.vsix 9c580498861d19e4aff9ab2bf46020e0
-	vscode-theme-defaults https://open-vsx.org/api/vscode/theme-defaults/1.54.3/file/vscode.theme-defaults-1.54.3.vsix 80ff64379434c5773be739e89a8f2f34
-	vscode-theme-kimbie-dark https://open-vsx.org/api/vscode/theme-kimbie-dark/1.54.3/file/vscode.theme-kimbie-dark-1.54.3.vsix 52aa8d28f1f1299400d72d9023e65a01
-	vscode-theme-monokai https://open-vsx.org/api/vscode/theme-monokai/1.54.3/file/vscode.theme-monokai-1.54.3.vsix 6d65eb1998a7a7eb06ac56e555659999
-	vscode-theme-monokai-dimmed https://open-vsx.org/api/vscode/theme-monokai-dimmed/1.54.3/file/vscode.theme-monokai-dimmed-1.54.3.vsix f7ccf3d56fbb811db36e075b604cbe25
-	vscode-theme-quietlight https://open-vsx.org/api/vscode/theme-quietlight/1.54.3/file/vscode.theme-quietlight-1.54.3.vsix d66199d4c0104df14a0365933b3afe60
-	vscode-theme-red https://open-vsx.org/api/vscode/theme-red/1.54.3/file/vscode.theme-red-1.54.3.vsix 2d996393ab212a781682e0a8ee641713
-	vscode-theme-solarized-dark https://open-vsx.org/api/vscode/theme-solarized-dark/1.54.3/file/vscode.theme-solarized-dark-1.54.3.vsix e63d031121dd1c19bca3e88df5745851
-	vscode-theme-tomorrow-night-blue https://open-vsx.org/api/vscode/theme-tomorrow-night-blue/1.54.3/file/vscode.theme-tomorrow-night-blue-1.54.3.vsix 955cb9ac6f759e424182152552927d52
-	vscode-typescript https://open-vsx.org/api/vscode/typescript/1.54.3/file/vscode.typescript-1.54.3.vsix c2488834b57ba3413e7d43db2af0ed77
+	vscode-less https://open-vsx.org/api/vscode/less/1.62.3/file/vscode.less-1.62.3.vsix 9eb5e65d5d089abae8fc7cb2ebcdd53a
+	vscode-log https://open-vsx.org/api/vscode/log/1.62.3/file/vscode.log-1.62.3.vsix 454bea32383e2f93a035c8c8c9d680f1
+	vscode-lua https://open-vsx.org/api/vscode/lua/1.62.3/file/vscode.lua-1.62.3.vsix 89bf9895c9562b15ed5ae11c035df577
+	vscode-make https://open-vsx.org/api/vscode/make/1.62.3/file/vscode.make-1.62.3.vsix 19189fe2785ff3c0386a8877c9f9e132
+	vscode-markdown https://open-vsx.org/api/vscode/markdown/1.62.3/file/vscode.markdown-1.62.3.vsix b84496cb28d9032fe1dbf5738139c315
+	vscode-markdown-language-features https://open-vsx.org/api/vscode/markdown-language-features/1.62.3/file/vscode.markdown-language-features-1.62.3.vsix 4acc850aef4282c9adf773489eecedc5
+	vscode-merge-conflict https://open-vsx.org/api/vscode/merge-conflict/1.62.3/file/vscode.merge-conflict-1.62.3.vsix db6c52dafd6eeb65837262c7740c2b7a
+	vscode-npm https://open-vsx.org/api/vscode/npm/1.62.3/file/vscode.npm-1.62.3.vsix 16b3da4eac4e66ac3db90d3bb3e24479
+	ms-vscode-node-debug https://open-vsx.org/api/ms-vscode/node-debug/1.45.0/file/ms-vscode.node-debug-1.45.0.vsix 676769e9901f5f51ed6a21d7c6a831fb
+	ms-vscode-node-debug2 https://open-vsx.org/api/ms-vscode/node-debug2/1.43.0/file/ms-vscode.node-debug2-1.43.0.vsix 4c78ac1f3c4d753d005d72a68c13f7c7
+	vscode-objective-c https://open-vsx.org/api/vscode/objective-c/1.62.3/file/vscode.objective-c-1.62.3.vsix ea4419075d1a17cb57f984ec3ea783d0
+	vscode-perl https://open-vsx.org/api/vscode/perl/1.62.3/file/vscode.perl-1.62.3.vsix e1f9ebd43c5b3d4092418806bd066783
+	vscode-powershell https://open-vsx.org/api/vscode/powershell/1.62.3/file/vscode.powershell-1.62.3.vsix baf348ed743d3ba4a5b0b0702f6fa1c4
+	vscode-pug https://open-vsx.org/api/vscode/pug/1.62.3/file/vscode.pug-1.62.3.vsix 0d6fa06e57f2f9dbc5841e6996ba45d8
+	vscode-python https://open-vsx.org/api/vscode/python/1.62.3/file/vscode.python-1.62.3.vsix 98799c0d59f986378bc26d3a5809a76d
+	vscode-r https://open-vsx.org/api/vscode/r/1.62.3/file/vscode.r-1.62.3.vsix 9240efffdd93d5bcfa9e3833937df156
+	vscode-razor https://open-vsx.org/api/vscode/razor/1.62.3/file/vscode.razor-1.62.3.vsix 209d13c511ef5a6bdb8c23324a5df022
+	vscode-ruby https://open-vsx.org/api/vscode/ruby/1.62.3/file/vscode.ruby-1.62.3.vsix 52befb51090436c73273696b4e54baa4
+	vscode-rust https://open-vsx.org/api/vscode/rust/1.62.3/file/vscode.rust-1.62.3.vsix 0b6c07f593b7a06aa1acc21201b14b44
+	vscode-scss https://open-vsx.org/api/vscode/scss/1.62.3/file/vscode.scss-1.62.3.vsix e3ee9c810fb8c871f5df5dade2cc7479
+	vscode-shaderlab https://open-vsx.org/api/vscode/shaderlab/1.62.3/file/vscode.shaderlab-1.62.3.vsix d5f55aeedf313b3fe14d3c326ada2f2b
+	vscode-shellscript https://open-vsx.org/api/vscode/shellscript/1.62.3/file/vscode.shellscript-1.62.3.vsix 4abb4cad91156b25efd15cd029e02737
+	vscode-sql https://open-vsx.org/api/vscode/sql/1.62.3/file/vscode.sql-1.62.3.vsix 77392ebc2f3a1869823733099ca9ed87
+	vscode-swift https://open-vsx.org/api/vscode/swift/1.62.3/file/vscode.swift-1.62.3.vsix 29a1ea0de4f36baebee5f117336a92cc
+	vscode-theme-abyss https://open-vsx.org/api/vscode/theme-abyss/1.62.3/file/vscode.theme-abyss-1.62.3.vsix 04a5dcd017e04daa4269b7785d99def0
+	vscode-theme-defaults https://open-vsx.org/api/vscode/theme-defaults/1.62.3/file/vscode.theme-defaults-1.62.3.vsix 7fa0789b9ee1cb55a49698b018ac59ad
+	vscode-theme-kimbie-dark https://open-vsx.org/api/vscode/theme-kimbie-dark/1.62.3/file/vscode.theme-kimbie-dark-1.62.3.vsix ae60051044aab7708f33c13678f03f0b
+	vscode-theme-monokai https://open-vsx.org/api/vscode/theme-monokai/1.62.3/file/vscode.theme-monokai-1.62.3.vsix b2235d3b2fcb07858fbd2e9e3b9b9c77
+	vscode-theme-monokai-dimmed https://open-vsx.org/api/vscode/theme-monokai-dimmed/1.62.3/file/vscode.theme-monokai-dimmed-1.62.3.vsix 78aae18c5946da43bd756755a6df069a
+	vscode-theme-quietlight https://open-vsx.org/api/vscode/theme-quietlight/1.62.3/file/vscode.theme-quietlight-1.62.3.vsix 740e79e24fb7edeb277b6349a930c190
+	vscode-theme-red https://open-vsx.org/api/vscode/theme-red/1.62.3/file/vscode.theme-red-1.62.3.vsix d6ed6650920a1253a9c522300442f6f6
+	vscode-theme-solarized-dark https://open-vsx.org/api/vscode/theme-solarized-dark/1.62.3/file/vscode.theme-solarized-dark-1.62.3.vsix 6216c9d67d5d9443ca27e3afdb816e46
+	vscode-theme-tomorrow-night-blue https://open-vsx.org/api/vscode/theme-tomorrow-night-blue/1.62.3/file/vscode.theme-tomorrow-night-blue-1.62.3.vsix 04ca5f2984a9b5fed4102e040e4e4fda
+	vscode-typescript https://open-vsx.org/api/vscode/typescript/1.62.3/file/vscode.typescript-1.62.3.vsix 4f4b4b40506dacce128306facf3ed092
 	vscode-typescript-language-features https://open-vsx.org/api/vscode/typescript-language-features/1.54.3/file/vscode.typescript-language-features-1.54.3.vsix 968364ffa226c88d685f55cb21359954
-	vscode-vb https://open-vsx.org/api/vscode/vb/1.54.3/file/vscode.vb-1.54.3.vsix ac0b74fb681eaa2c51c6698623c3d43f
-	vscode-vscode-theme-seti https://open-vsx.org/api/vscode/vscode-theme-seti/1.54.3/file/vscode.vscode-theme-seti-1.54.3.vsix 4d0c2e66b8aef747221900367adba946
-	vscode-xml https://open-vsx.org/api/vscode/xml/1.54.3/file/vscode.xml-1.54.3.vsix f7aca865a3403a6e1b9e11e8019928b1
-	vscode-yaml https://open-vsx.org/api/vscode/yaml/1.54.3/file/vscode.yaml-1.54.3.vsix 0b2f74133505286388c043a52494168d
-	EditorConfig-EditorConfig https://open-vsx.org/api/EditorConfig/EditorConfig/0.16.4/file/EditorConfig.EditorConfig-0.16.4.vsix 0f8e4278d7a3638b9f9df84a07a56021
-	dbaeumer-vscode-eslint https://open-vsx.org/api/dbaeumer/vscode-eslint/2.1.8/file/dbaeumer.vscode-eslint-2.1.8.vsix d3668785b2744386867631d79537552a
-	ms-vscode-references-view https://open-vsx.org/api/ms-vscode/references-view/0.0.77/file/ms-vscode.references-view-0.0.77.vsix 0d0be6e6fd0ccfdd2a230b077ff8b4d7
+	vscode-vb https://open-vsx.org/api/vscode/vb/1.62.3/file/vscode.vb-1.62.3.vsix cd17e947324bb9cd05e799546d7d4638
+	vscode-vscode-theme-seti https://open-vsx.org/api/vscode/vscode-theme-seti/1.62.3/file/vscode.vscode-theme-seti-1.62.3.vsix b27e54ecb1c38f270f8c671a6574dcbc
+	vscode-xml https://open-vsx.org/api/vscode/xml/1.62.3/file/vscode.xml-1.62.3.vsix e3ba682c8ecb22516a1fd02abcdff841
+	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
 	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.5.0/file/perrinjerome.vscode-zc-buildout-0.5.0.vsix 739889de7ccaf8232fb6c6fe8571a1fa
+	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
 	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/theia/generate_download_plugins_cfg.py

@@ -41,8 +41,7 @@ for plugin_and_version in '''\
     vscode/lua/latest
     vscode/make/latest
     vscode/markdown/latest
-# https://github.com/eclipse-theia/theia/issues/7780
-    vscode/markdown-language-features/1.39.2
+    vscode/markdown-language-features/latest
     vscode/merge-conflict/latest
     vscode/npm/latest
     ms-vscode/node-debug/latest
@@ -71,13 +70,17 @@ for plugin_and_version in '''\
     vscode/theme-solarized-dark/latest
     vscode/theme-tomorrow-night-blue/latest
     vscode/typescript/latest
-    vscode/typescript-language-features/latest
+# latest (1.62.3) does not activate because it uses a proposed API not in theia:
+# Activating extension 'TypeScript and JavaScript Language Features (built-in)' failed: r.languages.createLanguageStatusItem is not a function
+    vscode/typescript-language-features/1.54.3
     vscode/vb/latest
     vscode/vscode-theme-seti/latest
     vscode/xml/latest
     vscode/yaml/latest
     EditorConfig/EditorConfig/latest
-    dbaeumer/vscode-eslint/latest
+# latest (2.2.2) does not activate:
+# Activating extension 'ESLint' failed: Class extends value undefined is not a constructor or null
+    dbaeumer/vscode-eslint/2.1.20
     ms-vscode/references-view/latest
 # golang.Go removed because it overwrites the PATH in theia shell
 # golang/Go/0.16.2

component/trafficserver/buildout.cfg

@@ -24,8 +24,8 @@ min_version = 8
 
 [trafficserver]
 recipe = slapos.recipe.cmmi
-url = http://apache.claz.org/trafficserver/trafficserver-9.1.0.tar.bz2
-md5sum = 994b0aa879cbd95054048f34bf8ed954
+url = https://dlcdn.apache.org/trafficserver/trafficserver-9.1.1.tar.bz2
+md5sum = 666945652942cce8c3ff0ae2757cc3c6
 shared = true
 patch-options = -p1
 configure-options =

component/userhosts/buildout.cfg

 [userhosts]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://lab.nexedi.com/nexedi/userhosts/repository/${:revision}/archive.tar.gz
-revision = a05fe5a3a5cb7005351ef4ec41460089f3ce4d0a
-md5sum = 5a80b4d962d975f290a60cf790c3334d
+url = https://github.com/figiel/hosts/archive/${:revision}.tar.gz
+revision = fdb45fe219593d63453f4be55cfc2a1199c18f59
+md5sum = 9ff5407132a2a67200ef1036a02f0ee2
 configure-command = true
 make-options = PREFIX=@@LOCATION@@
-make-targets = check install
+make-targets = test install

component/wkhtmltopdf/buildout.cfg

@@ -4,7 +4,6 @@ extends =
   ../freetype/buildout.cfg
   ../fontconfig/buildout.cfg
   ../libpng/buildout.cfg
-  ../tar/buildout.cfg
   ../xorg/buildout.cfg
   ../xz-utils/buildout.cfg
   ../zlib/buildout.cfg
@@ -14,27 +13,39 @@ parts =
 
 [wkhtmltopdf]
 recipe = slapos.recipe.build
-
-# here, two %s are used, first one is for directory name (eg. x86_64), and second one is for filename (eg. x86-64).
-base = http://download.gna.org/wkhtmltopdf/0.12/0.12.4/wkhtmltox-0.12.4_linux-generic
-i386-linux-gnu   = ${:base}-i386.tar.xz  ce1a2c0b2cf786ccc5d5828c42c99ddd
-x86_64-linux-gnu = ${:base}-amd64.tar.xz 96b7306cebb9e65355f69f7ab63df68b
-
+url = http://download.gna.org/wkhtmltopdf/0.12/0.12.4/wkhtmltox-0.12.4_${:_url}.tar.xz
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
 install =
-  import os,shutil, sys, tempfile
-  path = self.download(*options[multiarch()].split())
-  extract_dir = tempfile.mkdtemp(self.name)
-  self.cleanup_dir_list.append(extract_dir)
-  self.logger.debug('Created working directory %s', extract_dir)
-  env = os.environ.copy()
-  env["PATH"] = "${tar:location}/bin:${xz-utils:location}/bin" + (":" + env["PATH"] if env.get("PATH") else "")
-  env["LD_LIBRARY_PATH"] = "${xz-utils:location}/lib" + (":" + env["LD_LIBRARY_PATH"] if env.get("LD_LIBRARY_PATH") else "")
-  call(["tar", "xJf", path, "-C", extract_dir], env=env)
-  shutil.move(os.path.join(extract_dir, "wkhtmltox"), location)
+  import os
+  self.copyTree(guessworkdir(self.extract(self.download())), location)
   with open(os.path.join(location, "wkhtmltopdf"), 'w') as wrapper:
-    wrapper.write("""#!/bin/sh
-  export LD_LIBRARY_PATH=%(location)s/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libX11:location}/lib:${libXext:location}/lib:${libXrender:location}/lib:${libpng12:location}/lib:${zlib:location}/lib
-  export PATH=${fontconfig:location}/bin:$PATH
-  exec %(location)s/bin/wkhtmltopdf "$@"
-  """ % options)
+    wrapper.write("""#!/bin/sh -e
+  d=%s
+  export LD_LIBRARY_PATH=$d/lib:%s
+  export PATH=%s:$PATH
+  exec $d/bin/wkhtmltopdf "$@"
+  """ % (
+    location,
+    ':'.join(options['library'].split()),
+    ':'.join(options['path'].split()),
+  ))
     os.fchmod(wrapper.fileno(), 0o755)
+library =
+  ${fontconfig:location}/lib
+  ${freetype:location}/lib
+  ${libX11:location}/lib
+  ${libXext:location}/lib
+  ${libXrender:location}/lib
+  ${libpng12:location}/lib
+  ${zlib:location}/lib
+path =
+  ${fontconfig:location}/bin
+
+[wkhtmltopdf:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
+_url = linux-generic-i386
+md5sum = ce1a2c0b2cf786ccc5d5828c42c99ddd
+
+[wkhtmltopdf:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
+_url = linux-generic-amd64
+md5sum = 96b7306cebb9e65355f69f7ab63df68b

software/erp5/test/test/test_erp5.py

@@ -585,10 +585,12 @@ class ZopeTestMixin(CrontabMixin):
     )
 
   def setUp(self):
+    super(ZopeTestMixin, self).setUp()
     # run logrotate a first time so that it create state files
     self._executeCrontabAtDate('logrotate', '2000-01-01')
 
   def tearDown(self):
+    super(ZopeTestMixin, self).tearDown()
     # reset logrotate status
     logrotate_status = os.path.join(
         self.getComputerPartitionPath('zope-default'),
@@ -800,29 +802,39 @@ class ZopeTestMixin(CrontabMixin):
     self.assertIn('Thread ', dump_response.text)
 
   def test_activity_processing(self):
-    requests.get(
-        self.zope_verify_activity_processing_url,
-        params={
-            'mode': 'activate'
-        },
-        verify=False,
-    ).raise_for_status()
-
-    for retry in range(60):
+    def wait_for_activities(max_retries):
+      for retry in range(max_retries):
         time.sleep(10)
-      count = requests.get(
+        resp = requests.get(
             self.zope_verify_activity_processing_url,
             params={
                 'mode': 'count',
                 'retry': retry,
             },
             verify=False,
-      ).json()['count']
+        )
+        if not resp.ok:
+          # XXX we start by flushing existing activities from site creation
+          # and inital upgrader run. During this time it may happen that
+          # ERP5 replies with site errors, we tolerate these errors and only
+          # check the final state.
+          continue
+        count = resp.json()['count']
         if not count:
           break
       else:
         self.assertEqual(count, 0)
 
+    wait_for_activities(60)
+    requests.get(
+        self.zope_verify_activity_processing_url,
+        params={
+            'mode': 'activate'
+        },
+        verify=False,
+    ).raise_for_status()
+    wait_for_activities(10)
+
 
 class TestZopeMedusa(ZopeTestMixin, ERP5InstanceTestCase):
   wsgi = False

software/erp5/upgrade_test/test.py

@@ -39,13 +39,15 @@ 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.4/software/erp5/software.cfg'
+old_software_release_url = 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.5/software/erp5/software.cfg'
 new_software_release_url = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', 'software.cfg'))
 
 _, SlapOSInstanceTestCase = makeModuleSetUpAndTestCaseClass(
-    old_software_release_url, software_id="upgrade_erp5")
-
+    old_software_release_url,
+    software_id="upgrade_erp5",
+    skip_software_check=True,
+)
 
 def setUpModule():
   installSoftwareUrlList(

software/kvm/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 087f226ba90928dcc5a722d7008c867a
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = b260fce887535fc69a259d1fd31af1b2
+md5sum = d949e6100fd4e01819cc2867a65c6e65
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in

software/kvm/instance-kvm.cfg.jinja2

@@ -1029,15 +1029,12 @@ config-command = ${ansible-vm-bin:rendered}
 
 {% if bootstrap_script_url -%}
 [download-bootstrap-script]
-recipe = slapos.recipe.build
-location = ${directory:public}/vm-bootstrap
-install =
-  from zc.buildout.download import check_md5sum, urlretrieve, ChecksumError
-  url, md5sum = {{ repr(bootstrap_script_url) }}.split('#')
-  urlretrieve(url, location)
-  if not check_md5sum(location, md5sum):
-    os.remove(location)
-    raise ChecksumError
+recipe = slapos.recipe.build:download
+offline = false
+destination = ${directory:public}/vm-bootstrap
+{% set bootstrap_script_url = bootstrap_script_url.split('#') -%}
+url = {{ bootstrap_script_url[0] }}
+md5sum = {{ bootstrap_script_url[1] }}
 {% endif -%}
 
 [logrotate-vm-bootstrap]

software/repman/buildout.hash.cfg

@@ -18,15 +18,15 @@ md5sum = af2fc4a7a0f782fed2cb1112ef3cb397
 
 [instance-repman.cfg]
 _update_hash_filename_ = instance-repman.cfg.jinja2.in
-md5sum = c6e41783b8e3e844b6319953a8d665ec
+md5sum = 7782adde357c9444fed51f2dcc230a52
 
 [config-toml.in]
 _update_hash_filename_ = templates/config.toml.in
-md5sum = dc9fdcf6c3c775da6b0b72f83c4a4105
+md5sum = 0a4ce036ea524373a85fac10e81edb96
 
 [config-cluster-toml.in]
 _update_hash_filename_ = templates/cluster-config.toml.in
-md5sum = ff44b81dc1177e32019ddbf4f1c6b616
+md5sum = 8cdeb63a2acc294801266f24599f6d32
 
 [nginx.conf.in]
 _update_hash_filename_ = templates/nginx.conf.in

software/repman/instance-repman-input-schema.json

@@ -89,34 +89,6 @@
       "type": "string",
       "default": ""
     },
-    "tags": {
-      "title": "Provisioning db tag list",
-      "description": "Provisioning db tags. Set one tag per line.",
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "default": [
-        "gtidstrict",
-        "bind",
-        "pkg",
-        "innodb",
-        "noquerycache",
-        "slow",
-        "pfs",
-        "linux",
-        "readonly",
-        "diskmonitor",
-        "sqlerror",
-        "compressbinlog",
-        "bm4ci",
-        "mroonga",
-        "utctime",
-        "readcommitted",
-        "nohandshake",
-        "ssl"
-      ]
-    },
     "http-session-lifetime": {
       "title": "Web Session life time in s",
       "description": "Web interface Session life time in seconds. Default 86400",
@@ -129,18 +101,6 @@
       "type": "integer",
       "default": 4
     },
-    "autorejoin": {
-      "title": "Automatic rejoin a failed master",
-      "description": "Automatic rejoin a failed master (default true)",
-      "type": "boolean",
-      "default": true
-    },
-    "autoseed": {
-      "title": "Automatic join a standalone node",
-      "description": "Automatic join a standalone node",
-      "type": "boolean",
-      "default": true
-    },
     "require-ssl": {
       "title": "Enable REQUIRE SSL for repman database users",
       "description": "Enable secure connection between repman and mariadb databases. This option is an initial value, used only when creating database users.",
@@ -196,6 +156,34 @@
               "type": "string",
               "default": ""
             },
+            "tags": {
+              "title": "Provisioning db tag list",
+              "description": "Provisioning db tags. Set one tag per line.",
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "default": [
+                "gtidstrict",
+                "bind",
+                "pkg",
+                "innodb",
+                "noquerycache",
+                "slow",
+                "pfs",
+                "linux",
+                "readonly",
+                "diskmonitor",
+                "sqlerror",
+                "compressbinlog",
+                "bm4ci",
+                "mroonga",
+                "utctime",
+                "readcommitted",
+                "nohandshake",
+                "ssl"
+              ]
+            },
             "proxysql-user": {
               "title": "Proxysql username",
               "description": "Proxysql external user, default is 'external'.",
@@ -310,6 +298,18 @@
               "type": "boolean",
               "default": true
             },
+            "autorejoin": {
+              "title": "Automatic rejoin a failed master db",
+              "description": "Automatic rejoin a failed master (default: true).",
+              "type": "boolean",
+              "default": true
+            },
+            "autoseed": {
+              "title": "Automatic join a standalone node",
+              "description": "Automatic join a standalone mariadb node to the cluster.",
+              "type": "boolean",
+              "default": true
+            },
             "failover-mode": {
               "title": "Failover mode",
               "description": "Failover is manual or automatic (default \"manual\").",

software/repman/instance-repman.cfg.jinja2.in

@@ -191,6 +191,8 @@ db-user = repman
 db-password = ${publish-early:db-root-password}
 db-list = {{ mariadb_server_list | join(',') }}
 
+autorejoin = {{ parameter_dict.get("autorejoin", True) }}
+autoseed = {{ parameter_dict.get("autoseed", True) }}
 heartbeat-user = ${repman-parameter:heartbeat-user}
 heartbeat-password = ${publish-early:db-root-password}
 partition-list = {{ mariadb_path_list | join(',') }}
@@ -205,7 +207,7 @@ proxysql-servers-ipv6 = [{{ ip }}]
 password = ${repman-parameter:password}
 proxysql-partition = ${buildout:directory}
 receiver-port-list = {{ receiver_port_list | join(',') }}
-enabled-tags = {{ slapparameter_dict.get("tag-list", tag_list) | join(',') }}
+enabled-tags = {{ parameter_dict.get("tag-list", tag_list) | join(',') }}
 proxy-tags = {{ parameter_dict.get("proxy-tags", ["pkg", "masterslave", "linux", "noreadwritesplit", "ssl"]) | join(',') }}
 logical-backup-cron = {{ parameter_dict.get("logical-backup-cron", "0 22 * * *") }}
 physical-backup-cron = {{ parameter_dict.get("physical-backup-cron", "0 0 * * *") }}
@@ -486,8 +488,6 @@ username = admin
 heartbeat-user = heartbeat
 password = ${publish-early:repman-password}
 cluster-d = ${repman:clusters}
-autorejoin = {{ slapparameter_dict.get("autorejoin", True) }}
-autoseed = {{ slapparameter_dict.get("autoseed", True) }}
 mysql-bin-dir = {{ mariadb_location }}/bin
 mysqlbinlog-path = {{ mariadb_location }}/bin/mysqlbinlog
 mysqlclient-path = {{ mariadb_location }}/bin/mysql

software/repman/templates/cluster-config.toml.in

@@ -12,6 +12,11 @@ monitoring-write-heartbeat-credential="{{ parameter_dict['heartbeat-user'] }}:{{
 db-servers-connect-timeout = 1
 slapos-db-partitions = "{{ parameter_dict['partition-list'] }}"
 slapos-proxysql-partitions = "{{ parameter_dict['proxysql-partition'] }}"
+autorejoin = {{ setbool(parameter_dict['autorejoin']) }}
+autoseed = {{ setbool(parameter_dict['autoseed']) }}
+{% if parameter_dict['autoseed'] in ['true', 'True'] -%}
+autorejoin-logical-backup = true
+{% endif -%}
 
 proxysql = true
 proxysql-port = {{ parameter_dict['proxy-port'] }}

software/repman/templates/config.toml.in

-{% macro setbool(value) -%}
-{% if value in ['true', 'True'] %} true {% else %} false {% endif -%}
-{% endmacro -%}
 [Default]
 api-bind = "{{ parameter_dict['ipv4'] }}"
 http-bind-address = "{{ parameter_dict['ipv4'] }}"
@@ -11,11 +8,6 @@ monitoring-save-config = false
 api-https-bind = true
 api-credentials = "{{ parameter_dict['username'] }}:{{ parameter_dict['password'] }}"
 include = "{{ parameter_dict['cluster-d'] }}"
-autorejoin = {{ setbool(parameter_dict['autorejoin']) }}
-autoseed = {{ setbool(parameter_dict['autoseed']) }}
-{% if parameter_dict['autoseed'] in ['true', 'True'] -%}
-autorejoin-logical-backup = true
-{% endif -%}
 db-servers-binary-path = "{{ parameter_dict['mysql-bin-dir'] }}"
 # Database list of hosts to ignore in election
 #db-servers-ignored-hosts =

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 597c29546519aabe7259e416d0b92095
+md5sum = ba6c572678687081ce111d3805be3cee

software/slapos-testing/instance.cfg

@@ -35,10 +35,10 @@ repository = ${caucase-repository:location}
 [caucase-test-runner]
 recipe = slapos.recipe.template:jinja2
 template = inline:#!/bin/sh
-  export HOSTS="$(mktemp)"
-  trap 'rm "$HOSTS"' EXIT
-  printf '%s testhost\n%s testhost\n' "$SLAPOS_TEST_IPV4" "$SLAPOS_TEST_IPV6" > "$HOSTS"
-  export CAUCASE_NETLOC=testhost:8000 LD_PRELOAD=${userhosts:location}/lib/userhosts.so:$LD_PRELOAD
+  export HOSTS_FILE="$(mktemp)"
+  trap 'rm "$HOSTS_FILE"' EXIT
+  printf '%s testhost\n%s testhost\n' "$SLAPOS_TEST_IPV4" "$SLAPOS_TEST_IPV6" > "$HOSTS_FILE"
+  export CAUCASE_NETLOC=testhost:8000 LD_PRELOAD=${userhosts:location}/lib/libuserhosts.so:$LD_PRELOAD
   exec python -m unittest discover -v
 rendered = $${caucase:location}/host_setting.sh
 

software/theia/buildout.hash.cfg

@@ -47,7 +47,7 @@ md5sum = 1a668d6203d42b4d46d56e24c7606cb2
 
 [python-language-server-requirements.txt]
 _update_hash_filename_ = python-language-server-requirements.txt
-md5sum = 9f478fd1b03b7738f3de549cb899bf54
+md5sum = e16f1414f2657fa5ffc949839207f41b
 
 [slapos.css.in]
 _update_hash_filename_ = slapos.css.in

software/theia/python-language-server-requirements.txt

 appdirs==1.4.4
-astroid==2.5.2
-attrs==20.3.0
+astroid==2.6.2
+attrs==21.2.0
 black==20.8b1
-certifi==2020.12.5
+cachetools==4.2.4
+certifi==2021.5.30
 chardet==4.0.0
 click==7.1.2
 future==0.18.2
 idna==2.10
 importlib-metadata==3.10.0
-isort==5.8.0
+iniconfig==1.1.1
+isort==5.9.1
 jedi==0.18.0
-lazy-object-proxy==1.4.3
+lazy-object-proxy==1.6.0
 mccabe==0.6.1
-mypy==0.812
 mypy-extensions==0.4.3
+mypy==0.930
+packaging==21.0
 parso==0.8.2
 pathspec==0.8.1
 pluggy==0.13.1
-pydantic==1.8.1
+pydantic==1.8.2
 pydocstyle==6.0.0
 pyflags==0.1
 pyflakes==2.1.0
-pygls==0.10.2
-pylint==2.7.4
+pygls==0.11.1
+pylint==2.9.3
+pyparsing==2.4.7
 regex==2021.4.4
 requests==2.25.1
 rope==0.11.0
-six==1.12.0
+six==1.16.0
 snowballstemmer==1.2.1
-toml==0.10.2
+tomli==1.2.3
 typed-ast==1.4.1
-typeguard==2.12.0
-typing-extensions==3.7.4.3
-urllib3==1.26.4
-wrapt==1.11.2
-yapf==0.29.0
+typeguard==2.12.1
+typing-extensions==4.0.1
+urllib3==1.26.6
+wrapt==1.12.1
+yapf==0.31.0
+zc.buildout.languageserver==0.6.2
 zc.buildout==2.13.4
-zc.buildout.languageserver==0.5.0
 zipp==3.4.1
\ No newline at end of file

stack/erp5/buildout.hash.cfg

@@ -70,7 +70,7 @@ md5sum = 7a14019abf48ca100eb94d9add20f5ae
 
 [template]
 filename = instance.cfg.in
-md5sum = bbef65b4edeb342f08309604ca3717d5
+md5sum = 0444d646607f8643e987bb62d1cbbc1d
 
 [template-erp5]
 filename = instance-erp5.cfg.in
@@ -86,11 +86,11 @@ md5sum = bc821f9f9696953b10a03ad7b59a1936
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = f3121380ab4d31ba5f4984aec74d0a2f
+md5sum = 09895deebca3206425fada3caf1d92cf
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = d6166515fda7b09df754672536b131be
+md5sum = cbcbe2daf3a51dfab50446a18c0be76e
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -189,7 +189,7 @@ cert = ${haproxy-conf-ssl:certificate}
 ca-cert = ${haproxy-conf-ssl:ca-cert}
 crl = ${haproxy-conf-ssl:crl}
 {% endif %}
-stats-socket = ${directory:run}/haproxy.sock
+stats-socket = ${directory:run}/ha.sock
 path-routing-list = {{ dumps(slapparameter_dict['path-routing-list']) }}
 family-path-routing-dict = {{ dumps(slapparameter_dict['family-path-routing-dict']) }}
 pidfile = ${directory:run}/haproxy.pid

stack/erp5/instance-zope.cfg.in

@@ -185,7 +185,7 @@ context = key host_dict hosts-parameter:host-dict
 recipe = slapos.recipe.template:jinja2
 mode = 755
 template = inline:#!{{ parameter_dict['dash'] }}/bin/dash
-  export HOSTS=${hosts:rendered}
+  export HOSTS_FILE=${hosts:rendered}
   export LD_PRELOAD={{ parameter_dict['userhosts'] }}:$LD_PRELOAD
   exec "$@"
 rendered = ${directory:bin}/userhosts

stack/erp5/instance.cfg.in

@@ -110,7 +110,7 @@ link-binary = {{ dumps(zope_link_binary) }}
 fonts = {{ dumps(zope_fonts) }}
 fontconfig-includes = {{ dumps(zope_fontconfig_includes) }}
 template-fonts-conf = {{ dumps(template_fonts_conf) }}
-userhosts = {{ userhosts_location }}/lib/userhosts.so
+userhosts = {{ userhosts_location }}/lib/libuserhosts.so
 site-zcml = {{ site_zcml }}
 extra-path-list = {{ dumps(extra_path_list) }}
 matplotlibrc = {{ matplotlibrc_location }}

stack/slapos.cfg

@@ -132,7 +132,7 @@ eggs =
 [versions]
 setuptools = 44.1.1
 # Use SlapOS patched zc.buildout
-zc.buildout = 2.7.1+slapos014
+zc.buildout = 2.7.1+slapos015
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
 zc.recipe.egg = 2.0.3+slapos003
 
@@ -167,7 +167,7 @@ importlib-metadata = 1.7.0:whl
 inotify-simple = 1.1.1
 itsdangerous = 0.24
 lock-file = 2.0
-lxml = 4.6.3
+lxml = 4.6.5
 meld3 = 1.0.2
 mock = 3.0.5
 more-itertools = 5.0.0
@@ -195,8 +195,8 @@ slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.22
 slapos.rebootstrap = 4.5
-slapos.recipe.build = 0.52
-slapos.recipe.cmmi = 0.18
+slapos.recipe.build = 0.53
+slapos.recipe.cmmi = 0.19
 slapos.recipe.template = 4.6
 slapos.toolbox = 0.126
 stevedore = 1.21.0:whl