Update Release Candidate

component/mariadb/buildout.cfg

@@ -29,8 +29,8 @@ parts =
 [mariadb]
 recipe = slapos.recipe.cmmi
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
-version = 10.3.19
-md5sum = de8eb9a7d45d21e2d96e46cdc7c6e036
+version = 10.3.20
+md5sum = a87a9532568c0ed50d25ce7e7c60d67d
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 pre-configure =
   set -e '\bSET(PLUGIN_AUTH_PAM YES)' cmake/build_configurations/mysql_release.cmake

component/perl-XML-Parser/buildout.cfg

@@ -9,8 +9,8 @@ parts =
 [perl-XML-Parser]
 <= perl-CPAN-package
 module = XML/XML-Parser
-version = 2.41
-md5sum = c320d2ffa459e6cdc6f9f59c1185855e
+version = 2.46
+md5sum = 80bb18a8e6240fcf7ec2f7b57601c170  
 
 inc = ${perl-libwww-perl:site_perl}
 install-inc = blib/lib

software/caddy-frontend/common.cfg

@@ -11,7 +11,6 @@ extends =
   ../../component/6tunnel/buildout.cfg
   ../../component/xz-utils/buildout.cfg
 
-  ../../stack/nodejs.cfg
   ../../stack/caucase/buildout.cfg
 # Monitoring stack (keep on bottom)
   ../../stack/monitor/buildout.cfg
@@ -24,9 +23,6 @@ parts +=
 
   logrotate
   rdiff-backup
-  npm-modules
-  proxy-by-url
-  http-proxy
   caddyprofiledeps
 
   kedifa-develop
@@ -260,33 +256,3 @@ filename = validate-script.sh.in
 [template-configuration-state-script]
 <=download-template
 filename = configuration-state-script.sh.in
-
-# Migrated from KVM recipe
-[http-proxy]
-# https://github.com/nodejitsu/node-http-proxy
-recipe = slapos.recipe.build:download-unpacked
-# use upstream when merged
-url = https://lab.nexedi.com/nexedi/node-http-proxy/repository/archive.zip?ref=a5d3aff428ee8d840068b439f6ce121077f1144f
-md5sum = 65602466066444c718215de41f546585
-
-[proxy-by-url]
-# https://github.com/dominictarr/proxy-by-url
-recipe = slapos.recipe.build:download-unpacked
-# use upstream when merged
-url = https://lab.nexedi.com/nexedi/proxy-by-url/repository/archive.zip?ref=59fcb11a3e00c45b4b0362e76f29653abb313072
-md5sum = c383e0c5ff31b56f7987466e8304c941
-
-[npm-modules]
-recipe = plone.recipe.command
-destination = ${buildout:parts-directory}/${:_buildout_section_name_}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command =
-  export HOME=${:location};
-  rm -fr ${:destination} &&
-  mkdir -p ${:destination} &&
-  cd ${:destination} &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install colors@0.6.0-1 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io@0.8.7 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install socket.io-client@0.8.7 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install optimist@0.3.1 &&
-  ${nodejs:location}/bin/node ${nodejs:location}/bin/npm install pkginfo@0.2.3

software/erp5testnode/testsuite/instance-resilient-test.cfg.jinja2

@@ -54,6 +54,7 @@ config-cpu-usage-ratio = 1
 # This is a way to preserve the latest software release build speeding up
 # the tests.)
 config-software-root = ${buildout:directory}/../../soft
+config-buildout-shared-folder = ${buildout:directory}/../../shared
 config-no-ipv4-frontend = true
 # XXX hardcoded
 #config-frontend-domain = google.com

software/erp5testnode/testsuite/slaprunner.cfg

@@ -7,7 +7,7 @@ parts += template-erp5testnode
 
 [template-resilient-test]
 filename = instance-resilient-test.cfg.jinja2 
-md5sum = b366f23bbac55d9686485dd2d9531a8b
+md5sum = cf34be404bdd93a72df9c593f8762cb2
 
 [exporter-default-configuration]
 # Define shorter interaction to speed up tests

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 19475112d4dccee1263798c67fd2351b
+md5sum = bacb2d1a38d3a512025e861debdc75b2
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -150,7 +150,7 @@ project = $${:home}/project
 public = $${:home}/public
 software-root = {{ slapparameter_dict.get('software-root', '$${:home}/software') }}
 instance-root = $${:home}/instance
-shared-root = $${:home}/shared
+shared-root = $${slap-parameter:buildout-shared-folder}
 project-test = $${:test}/project
 software-test = $${:test}/software
 instance-test = $${:test}/instance
@@ -702,6 +702,7 @@ instance-name =
 monitor-cors-domains =
 monitor-interface-url =
 monitor-httpd-port = 8386
+buildout-shared-folder = $${runnerdirectory:home}/shared
 
 [slapos-cfg]
 recipe = slapos.recipe.template:jinja2
@@ -711,7 +712,7 @@ mode = 700
 context =
   section slaprunner slaprunner
   import codecs codecs
-  raw buildout_shared_part_list_dump ${template-buildout-shared-part-list:output}
+  raw buildout_shared_part_list_dump $${slaprunner:buildout-shared-part-list-dump}
 
 [slapos-test-cfg]
 recipe = slapos.recipe.template:jinja2

stack/resilient/buildout.hash.cfg

@@ -30,7 +30,7 @@ md5sum = 57b9b421d233402e6d5177c69cf9567e
 
 [template-replicated]
 filename = template-replicated.cfg.in
-md5sum = dba869ed13e001f2188c466673df4bbf
+md5sum = 7392935be29d89f8224bccac78e3ecd0
 
 [template-parts]
 filename = template-parts.cfg.in

stack/resilient/rdiff-backup-1.3.4-librsync-1.0.0.patch

-Patch by Roman Tereshonkov and Kari Hautio for rdiff-backup <= 1.2.8 to avoid a build failure with
-librsync >= 1.0.0 (which is a security bugfix release). The discussion and solution finding can be
-found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity).
-
---- rdiff-backup-1.3.4/rdiff_backup/_librsyncmodule.c			2009-03-16 15:36:21.000000000 +0100
-+++ rdiff-backup-1.3.4/rdiff_backup/_librsyncmodule.c.librsync-1.0.0		2015-03-02 00:54:24.000000000 +0100
-@@ -59,8 +59,13 @@
-   if (sm == NULL) return NULL;
-   sm->x_attr = NULL;
- 
-+#ifdef RS_DEFAULT_STRONG_LEN
-   sm->sig_job = rs_sig_begin((size_t)blocklen,
- 							 (size_t)RS_DEFAULT_STRONG_LEN);
-+#else
-+  sm->sig_job = rs_sig_begin((size_t)blocklen,
-+							 (size_t)8, RS_MD4_SIG_MAGIC);
-+#endif
-   return (PyObject*)sm;
- }
- 

stack/resilient/template-replicated.cfg.in

@@ -91,9 +91,11 @@ return = ssh-public-key resilient-ssh-url notification-url ip takeover-url takeo
 
 pbs-notification-id = ${slap-connection:computer-id}-${slap-connection:partition-id}-{{namebase}}-{{id}}-push
 
-{% if slapparameter_dict.get("software-root") %}
-config-software-root = {{ slapparameter_dict.get("software-root") }}
+{% for extra_parameter_for_pseudo_replicating_instance in ["software-root", "buildout-shared-folder"] %}
+{% if slapparameter_dict.get(extra_parameter_for_pseudo_replicating_instance) %}
+config-{{ extra_parameter_for_pseudo_replicating_instance }} = {{ slapparameter_dict.get(extra_parameter_for_pseudo_replicating_instance) }}
 {% endif %}
+{% endfor %}
 
 config-number = {{id}}
 config-name = {{namebase}}{{id}}

stack/slapos.cfg

@@ -137,7 +137,7 @@ pytz = 2016.10
 requests = 2.13.0
 six = 1.12.0
 slapos.cookbook = 1.0.123
-slapos.core = 1.5.1
+slapos.core = 1.5.2
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.19
@@ -195,7 +195,7 @@ enum34 = 1.1.6
 
 # Required by:
 # slapos.toolbox==0.94
-erp5.util = 0.4.64
+erp5.util = 0.4.65
 
 # Required by:
 # slapos.toolbox==0.94