Merge remote-tracking branch 'upstream/master' into zope4py2

component/haproxy/buildout.cfg

@@ -13,8 +13,8 @@ parts = haproxy
 [haproxy]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.25.tar.gz
-md5sum = 44687c901910da46711441ae1611b8ce
+url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.29.tar.gz
+md5sum = a4c4983c7ed51946bdde1d0eceedd527
 configure-command = true
 # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
 # otherwise use "generic".

stack/erp5/buildout.cfg

@@ -180,7 +180,6 @@ context =
     key socat_location socat:location
     key rsyslogd_location rsyslogd:location
     key instance_common_cfg instance-common:output
-    key jsl_location jsl:location
     key jupyter_enable_default erp5-defaults:jupyter-enable-default
     key wcfs_enable_default erp5-defaults:wcfs-enable-default
     key kumo_location kumo:location
@@ -372,7 +371,6 @@ initialization =
   sys.path[:0] = sum((
     glob.glob(os.path.join(x, 'Products', '*', 'tests'))
     for x in os.getenv('INSERT_PRODUCTS_PATH', '').split(os.pathsep)), [])
-  os.environ['PATH'] = '${jsl:location}/bin:%s' % os.environ['PATH']
 
 [test-suite-runner]
 # XXX: Workaround for fact ERP5Type is not an distribution and does not

stack/erp5/buildout.hash.cfg

@@ -70,7 +70,7 @@ md5sum = b95084ae9eed95a68eada45e28ef0c04
 
 [template]
 filename = instance.cfg.in
-md5sum = 2cf8721b82767c2461b5c847d281ae7b
+md5sum = a75e8cf8fd664de164a88a680ddd2c9e
 
 [template-erp5]
 filename = instance-erp5.cfg.in

stack/erp5/instance.cfg.in

@@ -104,7 +104,6 @@ coreutils = {{ coreutils_location }}
 sqlbench_path = {{ mariadb_location }}/sql-bench
 perl_dbd_mariadb_path = {{ perl_dbd_mariadb_path }}
 dash = {{ dash_location }}
-jsl = {{ jsl_location }}
 link-binary = {{ dumps(zope_link_binary) }}
 fonts = {{ dumps(zope_fonts) }}
 fontconfig-includes = {{ dumps(zope_fontconfig_includes) }}