Update Release Candidate

/reviewed-on nexedi/slapos!270

component/gcc/buildout.cfg

@@ -2,6 +2,7 @@
 # Mostly required to support languages different than C or C++
 [buildout]
 extends =
+  ../gettext/buildout.cfg
   ../gmp/buildout.cfg
   ../perl/buildout.cfg
   ../tar/buildout.cfg
@@ -32,7 +33,7 @@ configure-options =
   --with-as=${binutils:location}/bin/as
 environment =
   LDFLAGS=-Wl,-rpath=${gmp:location}/lib -Wl,-rpath=${isl:location}/lib -Wl,-rpath=${mpc:location}/lib -Wl,-rpath=${mpfr:location}/lib
-  PATH=${binutils:location}/bin:${perl:location}/bin:${tar:location}/bin:%(PATH)s
+  PATH=${binutils:location}/bin:${gettext:location}/bin:${perl:location}/bin:${tar:location}/bin:%(PATH)s
 
 [gcc-minimal]
 <= gcc-common

component/golang/gowork-snapshot

@@ -25,9 +25,16 @@ gogit_list() {
 # git_upstream_url <repo>   - show current branch upstream URL
 git_upstream_url() {
     repo=$1
-    head="`git -C $repo symbolic-ref --short HEAD`"             # current branch - e.g. "t"
-    remote="`git -C $repo config --get branch.$head.remote`"    # upstream name, e.g. "kirr"
+    head="`git -C $repo symbolic-ref -q --short HEAD`"            # current branch - e.g. "master"
+    if [ -z $head ] ; then
+        remote="origin" # If we are in detached HEAD, assume the upstream name is origin
+    else
+        remote="`git -C $repo config --get branch.$head.remote`"  # upstream name, e.g. "origin"
+    fi
     url="`git -C $repo config --get remote.$remote.url`"          # upstream URL
+    if [ -z $url ] ; then
+        echo "ERROR: Failed to guess upstream url from $repo" 1>&2
+    fi
     echo "$url"
 }
 

component/h5py/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../hdf5/buildout.cfg
   ../cython/buildout.cfg
+  ../numpy/buildout.cfg
 parts =
   h5py
 
@@ -12,7 +13,9 @@ CPPFLAGS = -I${hdf5:location}/include
 [h5py]
 recipe = zc.recipe.egg:custom
 egg = h5py
-setup-eggs = ${cython:egg}
+setup-eggs = 
+  ${cython:egg}
+  ${numpy:egg}
 include-dirs =
   ${hdf5:location}/include
 library-dirs =

component/libxml2/buildout.cfg

@@ -11,8 +11,8 @@ parts =
 
 [libxml2]
 recipe = slapos.recipe.cmmi
-url = http://xmlsoft.org/sources/libxml2-2.9.5.tar.gz
-md5sum = 5ce0da9bdaa267b40c4ca36d35363b8b
+url = http://xmlsoft.org/sources/libxml2-2.9.7.tar.gz
+md5sum = 896608641a08b465098a40ddf51cefba
 configure-options =
   --disable-static
   --without-python

component/libxslt/buildout.cfg

@@ -7,8 +7,8 @@ parts =
   libxslt
 
 [libxslt]
-url = ftp://xmlsoft.org/libxslt/libxslt-1.1.30.tar.gz
-md5sum = 70becbbcb1dad55f14de0b84171b91d5
+url = ftp://xmlsoft.org/libxslt/libxslt-1.1.32.tar.gz
+md5sum = 1fc72f98e98bf4443f1651165f3aa146
 recipe = slapos.recipe.cmmi
 configure-options =
   --disable-static
@@ -20,5 +20,3 @@ configure-options =
 environment =
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
-  LIBXML_CFLAGS=-I${libxml2:location}/include
-  LIBXML_LIBS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib

component/mariadb/mariarocks.cfg

 # Do not extend any file that touch buildout:parts.
 
 [mariadb]
-version = 10.2.12
-md5sum = c5bce588e3c53ebc417e37ecb0967aee
+version = 10.2.11
+md5sum = 954088299fe5f11b4fda3b540558adbd
 stable-patches =
 configure-options +=
+# force build of TokuDB due to a regression in 10.2.11
+  -DTOKUDB_OK=1
   -DCMAKE_C_COMPILER=${gcc:location}/bin/gcc
   -DCMAKE_CXX_COMPILER=${gcc:location}/bin/g++
 extra_cflags = -I${zstd:location}/include

component/rsync/buildout.cfg

@@ -7,8 +7,8 @@ parts =
 
 [rsync]
 recipe = slapos.recipe.cmmi
-url = http://rsync.samba.org/ftp/rsync/src/rsync-3.1.1.tar.gz
-md5sum = 43bd6676f0b404326eee2d63be3cdcfe
+url = https://download.samba.org/pub/rsync/rsync-3.1.2.tar.gz
+md5sum = 0f758d7e000c0f7f7d3792610fad70cb
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
 environment =

slapos/recipe/librecipe/generic.py

@@ -61,7 +61,13 @@ class GenericBaseRecipe(object):
     self._options(options) # Options Hook
     self.options = options.copy() # Updated options dict
 
-    self._ws = self.getWorkingSet()
+  @property
+  def _ws(self):
+    # getWorkingSet() is slow and it is not always needed.
+    # So _ws should be a lazy attribute.
+    if getattr(self, '__ws', None) is None:
+      self.__ws = self.getWorkingSet()
+    return self.__ws
 
   def update(self):
     """By default update method does the same thing than install"""

software/cloudooo/buildout.hash.cfg

+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     But avoid directories, they are not portable.
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+[template-cloudooo]
+filename = instance.cfg.in 
+md5sum = 6e4431cf4b0a0d034402604b1e2844c0
+
+[template-cloudooo-instance]
+filename = instance-cloudooo.cfg.in
+md5sum = afbfed1d762e5cdf7c6fd1292e7b28e7

software/cloudooo/instance-cloudooo.cfg.in

@@ -10,6 +10,7 @@
 {%   set next_port = slapparameter_dict.get(instance_parameter_dict['port-parameter-name'], next_port) | int -%}
 {% endif -%}
 {% do assert(next_port > 0) -%}
+{% set next_port = itertools.count(next_port).next -%}
 
 {% set backend_count = instance_parameter_dict['backend-count'] | int -%}
 {% if instance_parameter_dict.get('backend-count-parameter-name') -%}
@@ -33,9 +34,8 @@
 {%   set mimetype_entry_addition = mimetype_entry_addition ~ "\n" ~ slapparameter_dict.get(instance_parameter_dict['mimetype-entry-addition-parameter-name'], '') -%}
 {% endif -%}
 
-{% set apache_port = next_port -%}
-{% set haproxy_port = next_port + 1 -%}
-{% set next_port = next_port + 2 -%}
+{% set apache_port = next_port() -%}
+{% set haproxy_port = next_port() -%}
 
 {% set apache_ip_list = [ipv4] -%}
 {% if ipv6_set -%}
@@ -184,13 +184,12 @@ ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
 {%   set name = 'cloudooo-' ~ index -%}
 [{{ cloudooo(name) }}]
 < = cloudooo-base
-port = {{ next_port }}
-openoffice-port = {{ next_port + 1 }}
+port = {{ next_port() }}
+openoffice-port = {{ next_port() }}
 configuration-file = ${directory:etc}/{{ name }}.cfg
 data-directory = ${directory:srv}/{{ name }}
 wrapper = ${directory:services}/{{ name }}
 
-{%   set next_port = next_port + 2 -%}
 {% endfor -%}
 
 [haproxy]

software/cloudooo/instance.cfg.in

@@ -39,6 +39,7 @@ extensions = jinja2.ext.do
 extra-context =
     section parameter_dict cloudooo-dynamic-template-parameter-dict
     key ipv4_set slap-parameters:ipv4
+    import itertools itertools
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype

software/cloudooo/software-common.cfg

 [buildout]
 extends =
+  buildout.hash.cfg
   ../../stack/cloudooo.cfg
   ../../stack/logrotate/buildout.cfg
 parts =
@@ -25,8 +26,7 @@ cert = ${slap-connection:cert-file}
 recipe = slapos.recipe.template:jinja2
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 rendered = ${buildout:directory}/template.cfg
-template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 4543e62c41726ef074454252c4951ac8
+template = ${:_profile_base_location_}/${:filename}
 mode = 640
 
 [template-cloudooo-base]
@@ -81,6 +81,5 @@ template-logrotate-base = ${template-logrotate-base:rendered}
 
 [template-cloudooo-instance]
 recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/instance-cloudooo.cfg.in
-md5sum = 045830db85e1200f765788aa8b62289e
+url = ${:_profile_base_location_}/${:filename}
 mode = 640

software/powerdns/instance-powerdns-replicate.cfg.jinja2

@@ -81,7 +81,7 @@ username = admin
 [monitor-instance-parameter]
 monitor-httpd-port = 8099
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
-username = ${monitor-instance-parameter:username}
+username = admin
 password = ${monitor-htpasswd:passwd}
 
 [monitor-conf-parameters]
@@ -109,7 +109,7 @@ config-{{parameter}} = {{ value }}
 {% endfor -%}
 config-{{ slave_list_name }} = {{ json_module.dumps(slave_instance_list) }}
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.node.vifib.com') }}
-config-monitor-username = ${monitor-instance-parameter:username}
+config-monitor-username = admin
 config-monitor-password = ${monitor-htpasswd:passwd}
 
 [publish-information]

software/powerdns/software.cfg

@@ -38,7 +38,7 @@ mode = 640
 [template-dns-replicate]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-powerdns-replicate.cfg.jinja2
-md5sum = 3699d0751632e0c11b466342789e27a3
+md5sum = 46acd4ed071df8d7139dcd0434be42eb 
 mode = 0644
 
 [iso-list]