Update Release Candidate

component/libxml2/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 [libxml2]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://xmlsoft.org/sources/libxml2-2.9.7.tar.gz
-md5sum = 896608641a08b465098a40ddf51cefba
+url = http://xmlsoft.org/sources/libxml2-2.9.9.tar.gz
+md5sum = c04a5a0a042eaa157e8e8c9eabe76bd6
 configure-options =
   --disable-static
   --without-python

component/libxslt/buildout.cfg

@@ -7,12 +7,13 @@ parts =
   libxslt
 
 [libxslt]
-url = ftp://xmlsoft.org/libxslt/libxslt-1.1.32.tar.gz
-md5sum = 1fc72f98e98bf4443f1651165f3aa146
+url = ftp://xmlsoft.org/libxslt/libxslt-1.1.34.tar.gz
+md5sum = db8765c8d076f1b6caafd9f2542a304a
 recipe = slapos.recipe.cmmi
 shared = true
+# --disable-static is temporarilly removed due to build error
+# with xml2-config that does not support '--dynamic' argument.
 configure-options =
-  --disable-static
   --with-libxml-prefix=${libxml2:location}
   --without-crypto
   --without-python

component/openssl/buildout.cfg

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

component/qemu-kvm/buildout.cfg

 [buildout]
 extends =
   ../attr/buildout.cfg
+  ../bzip2/buildout.cfg
   ../gnutls/buildout.cfg
   ../libaio/buildout.cfg
   ../libcap/buildout.cfg
@@ -38,7 +39,7 @@ configure-options =
   --disable-werror
   --disable-xfsctl
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig
   LDFLAGS=-L${pixman:location}/lib -Wl,-rpath=${pixman:location}/lib
 

component/zbar/buildout.cfg

 [buildout]
 parts=
   zbar
+extends =
+  ../automake/buildout.cfg
+  ../bzip2/buildout.cfg
+  ../gettext/buildout.cfg
+  ../libtool/buildout.cfg
+  ../pkgconfig/buildout.cfg
+
 
 [zbar]
 recipe = slapos.recipe.cmmi
@@ -19,5 +26,5 @@ configure-options =
   --without-x
   --without-jpg
 environment =
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${gettext:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${gettext:location}/bin:${libtool:location}/bin:${m4:location}/bin:${bzip2:location}/bin:%(PATH)s
   CFLAGS=

slapos/recipe/postgres.py

@@ -151,10 +151,10 @@ class Recipe(GenericBaseRecipe):
                     max_connections = 100
                     datestyle = 'iso, mdy'
 
-                    lc_messages = 'en_US.UTF-8'
-                    lc_monetary = 'en_US.UTF-8'
-                    lc_numeric = 'en_US.UTF-8'
-                    lc_time = 'en_US.UTF-8'
+                    lc_messages = 'C.UTF-8'
+                    lc_monetary = 'C.UTF-8'
+                    lc_numeric = 'C.UTF-8'
+                    lc_time = 'C.UTF-8'
                     default_text_search_config = 'pg_catalog.english'
 
                     unix_socket_directories = '%s'

slapos/test/utils.py

 """Test helpers
 """
+import os
 import sys
-import os.path
-from zc.buildout.configparser import parse
 
-import logging
 
 def makeRecipe(recipe_class, options, name='test', slap_connection=None):
   """Instanciate a recipe of `recipe_class` with `options` with a buildout
   mapping containing a python and an empty `slapos-connection` mapping, unless
   provided as `slap_connection`.
 
-  If running tests in a buildout folder, the test recipe will reuse the
-  `eggs-directory` and `develop-eggs-directory` from this buildout so that the
+  This function expects the test suite to have set SLAPOS_TEST_EGGS_DIRECTORY
+  and SLAPOS_TEST_DEVELOP_EGGS_DIRECTORY environment variables, so that the
   test recipe does not need to install eggs again when using working set.
-  To prevent test accidentally writing to the buildout's eggs repositories, we
-  set `newest` to false and `offline` to true in this case.
   """
   buildout = {
     'buildout': {
@@ -39,39 +35,12 @@ def makeRecipe(recipe_class, options, name='test', slap_connection=None):
   if slap_connection is not None:
     buildout['slap-connection'] = slap_connection
 
-  # are we in buildout folder ?
-  # in SLAPOS-EGG-TEST the usual layout is
-  # ${buildout:directory}/parts/slapos-repository/slapos/test/utils.py in instance buildout, so try
-  # to find a buildout.cfg relative to this file.
-  # What can also happens is that this repository is used from software folder, this is the case in
-  # SLAPOS-SR-TEST. In this case, ${buildout:eggs} is not set in buildout.cfg and we can only assume
-  # it will be the standards eggs and develop-eggs folders.
+  buildout['buildout']['eggs-directory'] = os.environ['SLAPOS_TEST_EGGS_DIRECTORY']
+  buildout['buildout']['develop-eggs-directory'] = os.environ['SLAPOS_TEST_DEVELOP_EGGS_DIRECTORY']
 
-  # {BASE_DIRECTORY}/parts/slapos-repository/slapos/test/utils.py
-  base_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))
-  buildout_cfg = os.path.join(base_directory, 'buildout.cfg')
-
-  if os.path.exists(buildout_cfg):
-    with open(buildout_cfg) as f:
-      parsed_cfg = parse(f, buildout_cfg)
-
-    # When buildout_cfg is an instance buildout (like in SLAPOS-EGG-TEST),
-    # there's a ${buildout:eggs-directory} we can use.
-    # When buildout_cfg is a software buildout, we can only guess the
-    # standard eggs directories.
-    eggs_directory = parsed_cfg['buildout'].get(
-      'eggs-directory', os.path.join(base_directory, 'eggs'))
-    develop_eggs_directory = parsed_cfg['buildout'].get(
-      'develop-eggs-directory', os.path.join(base_directory, 'develop-eggs'))
-
-    logging.getLogger(__name__).info(
-        'Using eggs-directory (%s) and develop-eggs-directory (%s) from buildout at %s',
-        eggs_directory,
-        develop_eggs_directory,
-        buildout_cfg)
-    buildout['buildout']['eggs-directory'] = eggs_directory
-    buildout['buildout']['develop-eggs-directory'] = develop_eggs_directory
+  # Prevent test from accidentally writing to the buildout's eggs
   buildout['buildout']['newest'] = False
   buildout['buildout']['offline'] = True
+
   return recipe_class(buildout=buildout, name=name, options=options)
 

software/erp5testnode/testsuite/deploy-test/software.cfg

 [buildout]
 extends =
   buildout.hash.cfg
-  https://lab.nexedi.com/nexedi/slapos/raw/1.0.134/software/kvm/software.cfg
+  https://lab.nexedi.com/nexedi/slapos/raw/1.0.182/software/kvm/software.cfg
 
 parts =
   eggs

software/jstestnode/software.cfg

@@ -2,6 +2,7 @@
 extends =
   ../../stack/slapos.cfg
   ../../stack/nodejs.cfg
+  ../../component/bzip2/buildout.cfg
   ../../component/coreutils/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/xorg/buildout.cfg
@@ -53,7 +54,7 @@ develop = true
 [renderjs-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${renderjs-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs-output:npm} install . && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ./node_modules/grunt-cli/bin/grunt
+command = cd ${renderjs-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:${bzip2:location}/bin/:$PATH ${nodejs-output:npm} install . && PATH=${git:location}/bin/:${nodejs:location}/bin/:${bzip2:location}/bin/:$PATH ./node_modules/grunt-cli/bin/grunt
 update-command = ${:command}
 
 [jio-repository.git]

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = a6091981a78cb2b10a97e431adc7615c
+md5sum = 2a82b7d5163d042e85b14a645707a093

software/slapos-testing/instance.cfg

@@ -80,6 +80,8 @@ template = inline:
   export PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:${rsync:location}/bin/:${buildout:bin-directory}:$PATH
   export SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
   export SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
+  export SLAPOS_TEST_EGGS_DIRECTORY=$${buildout:eggs-directory}
+  export SLAPOS_TEST_DEVELOP_EGGS_DIRECTORY=$${buildout:develop-eggs-directory}
 
 
 [slapos-test-runner-dot-nxdtest]

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = a82e4fdc4efd60df699ee072399e6973
+md5sum = ec1d3d947222354d73a94eb974f46d66
 
 [yarn.lock]
 filename = yarn.lock

software/theia/instance.cfg.in

@@ -168,7 +168,8 @@ location =
 [frontend-instance-config]
 recipe = slapos.recipe.template:jinja2
 rendered = $${directory:etc}/$${:_buildout_section_name_}
-template = inline:
+template =
+  inline:
   :$${:port} {
     bind $${:ip}
     tls $${frontend-instance-certificate:cert-file} $${frontend-instance-certificate:key-file}
@@ -284,7 +285,7 @@ filename = $${:_buildout_section_name_}
 
 [common-environment]
 recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
+rendered = $${directory:bin}/$${:_buildout_section_name_}
 mode = 0777
 template =
   inline:
@@ -345,8 +346,8 @@ base-url = $${theia-service:base-url}
 recipe = slapos.recipe.template:jinja2
 rendered = $${directory:bin}/$${:_buildout_section_name_}
 mode = 0700
-template = inline:
-  #!{{ bash }}
+template =
+  inline:#!{{ bash }}
   SHELL=$BASH
   # when running interactively, activate slapos configuration and reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
   if [ $# = 0 ]; then

stack/slapos.cfg

@@ -181,7 +181,7 @@ importlib-metadata = 1.7.0
 inotify-simple = 1.1.1
 itsdangerous = 0.24
 lock-file = 2.0
-lxml = 4.6.2
+lxml = 4.6.3
 meld3 = 1.0.2
 more-itertools = 5.0.0
 netaddr = 0.7.19