Update Release Candidate

.editorconfig

+root = true
+
+[*.{cfg,in,md,json}]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+
+[**.json]
+indent_style = space
+indent_size = 2
+
+# business templates metadata
+[**/bt/**]
+insert_final_newline = false

component/apache/buildout.cfg

@@ -39,9 +39,9 @@ configure-options =
 [apache]
 recipe = slapos.recipe.cmmi
 shared = true
-version = 2.4.43
+version = 2.4.46
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 791c986b1e70fe61eb44060aacc89a64
+md5sum = 7d661ea5e736dac5e2761d9f49fe8361
 configure-options = --disable-static
                     --enable-authn-alias
                     --enable-bucketeer

component/apache/buildout.hash.cfg

@@ -14,5 +14,4 @@
 # not need these here).
 [template-apache-backend-conf]
 filename = apache-backend.conf.in
-md5sum = ace264843228af84d025797f520ce70f
-
+md5sum = 6f51eaa9930e7a7ef959de7c510c7c2f

component/bison/buildout.cfg

@@ -3,6 +3,7 @@ extends =
   ../autoconf/buildout.cfg
   ../automake/buildout.cfg
   ../m4/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
 parts =
@@ -15,7 +16,7 @@ url = http://ftp.gnu.org/gnu/bison/bison-3.3.2.tar.xz
 md5sum = c9b552dee234b2f6b66e56b27e5234c9
 environment =
   M4=${m4:location}/bin/m4
-  PATH=${autoconf:location}/bin:${automake:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${autoconf:location}/bin:${automake:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/01_inhibit_example_generation#ee2df22601a56d738939fa760f9dc19b

component/chromedriver/buildout.cfg

@@ -71,4 +71,3 @@ install =
   extract_dir = self.extract(self.download(*options[guessPlatform()].split()))
   os.mkdir(location)
   shutil.copy(os.path.join(extract_dir, 'chromedriver'), location)
-

component/cloudooo/buildout.eggversion.cfg

@@ -28,5 +28,3 @@ entry-points =
 scripts =
   paster=cloudooo_paster
   runCloudoooUnitTest
-
-

component/fontconfig/buildout.hash.cfg

 [template-fonts-conf]
 filename = fonts.conf.in
 md5sum = 6967e553630d107fc0a59b14de8b0251
-

component/gateone/buildout.cfg

@@ -32,4 +32,3 @@ eggs =
   futures
   PIL
   gateone
-

component/geoip2/buildout.cfg

@@ -22,3 +22,4 @@ strip-top-level-dir = true
 
 [versions]
 geoip2 = 2.9.0
+maxminddb = 1.5.4

component/glib/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../gettext/buildout.cfg
   ../libffi/buildout.cfg
+  ../patch/buildout.cfg
   ../pcre/buildout.cfg
   ../perl/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -25,13 +26,14 @@ configure-options =
   --disable-xattr
   --disable-man
 environment =
-  PATH=${gettext:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
   LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LIBFFI_CFLAGS=-I${libffi:location}/include
   LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
   PCRE_CFLAGS=-I${pcre:location}/include
   PCRE_LIBS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -lpcre
+post-install = rm %(location)s/bin/gtester-report
 
 [x86-cygwin-glib]
 patches =

component/groonga/buildout.cfg

@@ -15,8 +15,8 @@ extends =
 [groonga]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://packages.groonga.org/source/groonga/groonga-9.1.2.tar.gz
-md5sum = 5266c49b758dde744854cb8cfe025812
+url = https://packages.groonga.org/source/groonga/groonga-10.0.5.tar.gz
+md5sum = 12f5c7b522afd72d0be2caa1e5f254da
 groonga-plugin-dir =  @@LOCATION@@/lib/groonga/plugins/
 # temporary patch to respect more tokens in natural language mode.
 patches =

component/gtk-3/buildout.cfg

@@ -55,4 +55,3 @@ environment =
 # not taken from pkg-config result...
   CPPFLAGS=-I${cairo:location}/include -I${inputproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include -I${libX11:location}/include  -I${libXinerama:location}/include -I${gdk-pixbuf:location}/include -I${libXrandr:location}/include -I${xfixes:location}/include -I${libXcomposite:location}/include -I${xdamage:location}/include -I${fixesproto:location}/include
   LDFLAGS=-L${libX11:location}/lib -L${libXi:location}/lib -L${libXext:location}/lib -L${libXrender:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXinerama:location}/lib -Wl,-rpath=${libXinerama:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${libXrandr:location}/lib -Wl,-rpath=${libXrandr:location}/lib -L${xfixes:location}/lib -Wl,-rpath=${xfixes:location}/lib -L${libXcomposite:location}/lib -Wl,-rpath=${libXcomposite:location}/lib -L${xdamage:location}/lib -Wl,-rpath=${xdamage:location}/lib
-

component/h2o/buildout.cfg

+[buildout]
+extends =
+  ../cmake/buildout.cfg
+  ../openssl/buildout.cfg
+  ../zlib/buildout.cfg
+  ../bison/buildout.cfg
+  ../ruby/buildout.cfg
+
+parts =
+  h2o
+
+[h2o]
+recipe = slapos.recipe.cmmi
+shared = True
+url = https://github.com/h2o/h2o/archive/v2.2.6.tar.gz
+md5sum = 075283f92347fcb7b2f87dcc5251b922
+configure-command = ${cmake:location}/bin/cmake .
+configure-options =
+  -DCMAKE_INSTALL_PREFIX=@@LOCATION@@
+  -DWITH_MRUBY=on
+  -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
+  -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}"
+  -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}
+CMAKE_CFLAGS=-I${openssl:location}/include -I${zlib:location}/include
+CMAKE_LIBRARY_PATH=${openssl:location}/lib:${zlib:location}/lib
+environment =
+  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig ${zlib:location}/lib/pkgconfig ${ruby:location}/lib/pkgconfig ${bison:location}/lib/pkgconfig
+  CMAKE_INCLUDE_PATH=${openssl:location}/include:${zlib:location}/include
+  CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
+  LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  PATH=${ruby:location}/bin:${bison:location}/bin:%(PATH)s

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.15.tar.gz
-md5sum = 59f892991476f08e2d16ac460c502f61
+url = http://www.haproxy.org/download/2.0/src/haproxy-2.0.17.tar.gz
+md5sum = 786a967c73cc1455c938d42fbe333bfe
 configure-command = true
 # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
 # otherwise use "generic".

component/helloweb/buildout.cfg

@@ -102,5 +102,3 @@ input   = inline:
     #!/bin/sh
     export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile
     exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@"
-
-

component/libcap-ng/buildout.cfg

+[buildout]
+
+extends =
+  ../attr/buildout.cfg
+
+parts = libcap-ng
+
+[libcap-ng]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.10.tar.gz
+md5sum = 57dc267e2949cdecb651a929f9206572
+location = @@LOCATION@@
+configure-options =
+  --with-python=no
+  --with-python3=no
+# we set -lpthread to workaround https://github.com/stevegrubb/libcap-ng/issues/9
+environment =
+  LDFLAGS=-lpthread

component/libconfig/buildout.cfg

@@ -6,4 +6,3 @@ parts =
 recipe = slapos.recipe.cmmi
 url = https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.2.tar.gz 
 md5sum = 6bd98ee3a6e6b9126c82c916d7a9e690
-

component/libmemcached/buildout.cfg

@@ -26,5 +26,3 @@ configure-options =
   --without-libinnodb-prefix
   --without-libsasl-prefix
   --without-libsasl2-prefix
-
-

component/lksctp-tools/buildout.cfg

@@ -6,4 +6,3 @@ parts =
 recipe = slapos.recipe.cmmi
 url = https://freefr.dl.sourceforge.net/project/lksctp/lksctp-tools/lksctp-tools-1.0.17.tar.gz
 md5sum = 68e9b8fa4d4e331029b247b72d46d7a5 
-

component/lmsensors/buildout.cfg

@@ -20,4 +20,3 @@ make-options =
 
 environment = 
   PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s
-

component/m4/buildout.cfg

 [buildout]
 extends =
   ../xz-utils/buildout.cfg
+  ../patch/buildout.cfg
 parts =
   m4
 
@@ -10,7 +11,7 @@ shared = true
 url = http://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.xz
 md5sum = 730bb15d96fffe47e148d1e09235af82
 environment =
-  PATH=${xz-utils:location}/bin:%(PATH)s
+  PATH=${xz-utils:location}/bin:${patch:location}/bin:%(PATH)s
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/01-fix-ftbfs-with-glibc-2.28.patch#058a786425e507f911649205b61ffcac

component/mariadb/buildout.cfg

@@ -30,14 +30,13 @@ parts =
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
-version = 10.4.13
-md5sum = 89e832d6d89dc9bd4c98657a954e0f2c
+version = 10.4.14
+md5sum = 9801120ae8acb33904ab4a3366a7714f
 location = @@LOCATION@@
 pre-configure =
-  set '\bSET(PLUGIN_AUTH_PAM YES)' cmake/build_configurations/mysql_release.cmake
+  set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
   grep -q "$@"
   sed -i "/$1/d" "$2"
-  mv cmake/Findzstd.cmake cmake/FindZSTD.cmake
 configure-command = ${cmake:location}/bin/cmake
 configure-options =
   -DCMAKE_INSTALL_PREFIX=${:location}
@@ -97,8 +96,8 @@ post-install =
 # as plugin-dir ( https://mariadb.com/kb/en/server-system-variables/#plugin_dir )
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://packages.groonga.org/source/mroonga/mroonga-9.12.tar.gz
-md5sum = d0af673f1bad3b9ccf33870bb2344a25
+url = https://packages.groonga.org/source/mroonga/mroonga-10.05.tar.gz
+md5sum = a690811be5cc0593acc12ecf4ac9c40f
 pre-configure = 
   rm -rf fake_mariadb_source
   mkdir -p fake_mariadb_source

component/matplotlib/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../pkgconfig/buildout.cfg
   ../libpng/buildout.cfg
   ../freetype/buildout.cfg
+  ./buildout.hash.cfg
 
 parts =
   matplotlib
@@ -11,10 +12,9 @@ parts =
 [matplotlibrc]
 recipe = slapos.recipe.template:jinja2
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
-template = ${:_profile_base_location_}/matplotlibrc.in
+template = ${:_profile_base_location_}/${:filename}
 rendered = ${matplotlibrc:location}/matplotlibrc
 mode = 0644
-md5sum = 849f48f08bea21dd10d3825867cb1561
 backend = agg
 context =
   key backend matplotlibrc:backend

component/matplotlib/buildout.hash.cfg

+[matplotlibrc]
+filename = matplotlibrc.in
+md5sum = 47a737b8f4db0b329e2b3fd70e5a325c

component/membase/buildout.cfg

@@ -136,4 +136,3 @@ component = vbucketmigrator
 component-configure-options =
   --without-sasl
   --with-isasl
-

component/perl-Image-ExifTool/buildout.cfg

+[buildout]
+extends =
+  ../perl/buildout.cfg
+parts =
+  perl-Image-ExifTool
+
+[perl-Image-ExifTool]
+<= perl-CPAN-package
+module = Image/Image-ExifTool
+version = 12.00
+md5sum = 8c3f99a9a8d110ba340ee3f7063c940e

component/perl/buildout.cfg

@@ -127,4 +127,3 @@ template = inline:
 mode = 0755
 rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
 perl-bin = ${:rendered}
-

component/qemu-kvm/buildout.cfg

@@ -4,6 +4,7 @@ extends =
   ../gnutls/buildout.cfg
   ../libaio/buildout.cfg
   ../libcap/buildout.cfg
+  ../libcap-ng/buildout.cfg
   ../libpng/buildout.cfg
   ../libuuid/buildout.cfg
   ../ncurses/buildout.cfg
@@ -32,8 +33,8 @@ configure-options =
   --enable-vnc
   --enable-vnc-png
   --disable-vnc-jpeg
-  --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${ncurses:location}/include -I${zlib:location}/include -I${libpng:location}/include -I${libaio:location}/include -I${attr:location}/include -I${libcap:location}/include"
-  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libgpg-error:location}/lib -L${libgpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib"
+  --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${ncurses:location}/include -I${zlib:location}/include -I${libpng:location}/include -I${libaio:location}/include -I${attr:location}/include -I${libcap:location}/include -I${libcap-ng:location}/include "
+  --extra-ldflags="-Wl,-rpath -Wl,${glib:location}/lib -L${glib:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libgpg-error:location}/lib -L${libgpg-error:location}/lib -L${gettext:location}/lib -Wl,-rpath -Wl,${gettext:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${libaio:location}/lib -Wl,-rpath=${libaio:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls -L${attr:location}/lib -Wl,-rpath=${attr:location}/lib -L${libcap:location}/lib -Wl,-rpath=${libcap:location}/lib -L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib"
   --disable-werror
   --disable-xfsctl
 environment =
@@ -63,16 +64,16 @@ md5sum = df0ce86d0b1d81e232ad08eef58754ed
 
 [debian-amd64-stretch-netinst.iso]
 <= debian-amd64-netinst-base
-version = 9.12.0
-md5sum = 50e7919f4276787f3a4631544edceae3
+version = 9.13.0
+md5sum = 6097fdb9cbab47c96471274b9044e983
 
 [debian-amd64-netinst.iso]
 # Download the installer of Debian 10 (Buster)
 # XXX: This is not the latest version because
 #      Debian does not provide a stable URL for it.
 <= debian-amd64-netinst-base
-version = 10.3.0
-md5sum = 5956434be4b81e6376151b64ef9b1596
+version = 10.4.0
+md5sum = e2ddc8268e4c164c32b4ba25be52c9af
 
 [debian-amd64-testing-netinst.iso]
 <= debian-amd64-netinst-base

component/r-language/software.cfg

@@ -14,4 +14,3 @@ recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   slapos.cookbook
-

component/slapos/obs.cfg

@@ -13,10 +13,6 @@ extensions =
 extends-cache = extends-cache
 download-cache = download-cache
 
-[gcc]
-# force usage of gcc from slapos
-max_version = 0
-
 # Uguu, upstream buildout.cfg must be patched as it works the other way
 # around from a packager point of view at least, thus at the end static
 # path, such as Python HOME directory, are wrong...

component/sqlite3/buildout.cfg

@@ -8,8 +8,8 @@ parts =
 [sqlite3]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://sqlite.org/2019/sqlite-autoconf-3300100.tar.gz
-md5sum = 51252dc6bc9094ba11ab151ba650ff3c
+url = https://sqlite.org/2020/sqlite-autoconf-3320300.tar.gz
+md5sum = 2e3911a3c15e85c2f2d040154bbe5ce3
 configure-options =
   --disable-static
   --enable-readline

component/srslte/buildout.cfg

@@ -42,5 +42,3 @@ environment =
   CPPFLAGS=${:CMAKE_CFLAGS}
   LDFLAGS=-L${bzip2:location}/lib -L${mbedtls:location}/lib -L${lksctp-tools:location}/lib -L${libconfig:location}/lib -L${boost-lib:location}/lib -L${fftw3:location}/lib
   PATH=${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-
-

component/tesseract/buildout.cfg

@@ -50,4 +50,3 @@ recipe = slapos.recipe.build:download
 destination = ${tesseract-traineddata:location}/tessdata/osd.traineddata
 url = https://github.com/tesseract-ocr/tessdata/raw/590567f20dc044f6948a8e2c61afc714c360ad0e/osd.traineddata
 md5sum = 7611737524efd1ce2dde67eff629bbcf
-

component/util-linux/buildout.cfg

 [buildout]
 extends =
   ../perl/buildout.cfg
+  ../libcap-ng/buildout.cfg
   ../xz-utils/buildout.cfg
 
 [util-linux]
 recipe = slapos.recipe.cmmi
+shared = true
 url = https://www.kernel.org/pub/linux/utils/util-linux/v2.31/util-linux-2.31.1.tar.xz
 md5sum = 7733b583dcb51518944d42aa62ef19ea
 configure-options =
@@ -31,7 +33,7 @@ configure-options =
   --disable-setterm
   --enable-libsmartcols
   --disable-switch_root
-  --disable-tinfo
+  --without-tinfo
   --disable-tls
   --disable-ul
   --disable-unshare
@@ -43,5 +45,8 @@ configure-options =
   --without-slang
   --without-selinux
   --without-audit
+  --with-cap-ng=${libcap-ng:location}
 environment =
   PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib
+  CFLAGS=-I${libcap-ng:location}/include

package.json

@@ -8,7 +8,7 @@
       "python2 ./format-json",
       "git add"
     ],
-    "{components,software,stack}/**": [
+    "{component,software,stack}/**": [
       "python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"python2\", \"./update-hash\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'",
       "python -c 'import sys, os.path, subprocess; [subprocess.check_call((\"git\", \"add\", buildout_hash)) for buildout_hash in { os.path.join(os.path.dirname(staged), \"buildout.hash.cfg\") for staged in sys.argv[1:]} if os.path.exists(buildout_hash)]'"
     ]

slapos/recipe/check_parameter/template/check_parameter.py.in

@@ -15,4 +15,3 @@ if expected != "" and value != expected:
 if not_expected != "" and value == not_expected: 
   print "FAIL: %%s == %%s" %% (value, not_expected)
   sys.exit(127)
-

slapos/recipe/libcloud/template/cloudmgr.cnf.in

+

slapos/recipe/zeo/template/zeo-filestorage-snippet.conf.in

@@ -2,4 +2,3 @@
   path %(path)s
   # pack-gc false
 </filestorage>
-

software/agent/software.cfg

@@ -50,4 +50,3 @@ pycurl = 7.43.0
 slapos.recipe.download = 1.0
 slapos.recipe.template = 4.4
 smmap = 0.9.0
-

software/ajaxplorer/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance]
 filename = instance.cfg
-md5sum = 4c7936accb3658871b635158198b7905
+md5sum = 1fbb72e4305ded9614ee80c0ee17b672
 
 [instance-apache]
 filename = instance-apachephp.cfg
@@ -30,4 +30,4 @@ md5sum = c5695762361b801c284ee23a150cd1f1
 
 [template-httpd-conf-hash]
 filename = templates/apache.conf.in
-md5sum = 6788381fadd8ca96f892d33df3163da0
+md5sum = 4fc3f853abf702aeb6653942d4fb85d8

software/apache-frontend/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = f686f765e55d1dce2e55a400f0714b3e
+md5sum = 4adae801babadd9aed6112c1ff209076
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
@@ -34,7 +34,7 @@ md5sum = b3d5a3573fa381fec954ad5cbf1575a0
 
 [template-replicate-publish-slave-information]
 filename = templates/replicate-publish-slave-information.cfg.in
-md5sum = 665e83d660c9b779249b2179d7ce4b4e
+md5sum = 7c0025a35dc62eb3cbfd07a6b04d659e
 
 [template-apache-frontend-configuration]
 filename = templates/apache.conf.in
@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
 
 [template-default-virtualhost]
 filename = templates/000.conf.in
-md5sum = d98a01182f38868612948c87d5231428
+md5sum = 5fcc11ea7f3eae38b0135b94dfc42dd5
 
 [template-default-slave-virtualhost]
 filename = templates/default-virtualhost.conf.in
@@ -58,7 +58,7 @@ md5sum = 7890469ecc5e7f46be5b2c3074a09b52
 
 [template-cached-slave-virtualhost]
 filename = templates/cached-virtualhost.conf.in
-md5sum = 1a1a53d9ac4a1591c017d86850a94796
+md5sum = f97dfcfae80527e242f285c9ebf11b27
 
 [template-log-access]
 filename = templates/template-log-access.conf.in
@@ -66,11 +66,11 @@ md5sum = a20683faba37b5b9c035783e811dd88d
 
 [template-empty]
 filename = templates/empty.in
-md5sum = c2314c3a9c3412a38d14b312d3df83c1
+md5sum = 7155b18edfe128825b8d1f48071454a6
 
 [template-wrapper]
 filename = templates/wrapper.in
-md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
+md5sum = 975177dedf677d24e14cede5d13187ce
 
 [template-trafficserver-records-config]
 filename = templates/trafficserver/records.config.jinja2
@@ -94,7 +94,7 @@ md5sum = 82d74a7f2aceb2b4a7acc6259291b7f2
 
 [template-apache-lazy-script-call]
 filename = templates/apache-lazy-script-call.sh.in
-md5sum = ebe5d3d19923eb812a40019cb11276d8
+md5sum = 44e235d0451932f1232f9d9e0ecc59f9
 
 [template-apache-graceful-script]
 filename = templates/apache-graceful-script.sh.in

software/apache-frontend/instance.cfg

@@ -47,4 +47,3 @@ extra-context =
 # Must match the key id in [switch-softwaretype] which uses this section.
     raw software_type RootSoftwareInstance-default-custom-personal-replicate
     raw template_monitor ${monitor2-template:rendered}
-

software/apache-frontend/software.cfg

@@ -14,4 +14,3 @@ smmap = 0.9.0
 numpy = 1.16.4
 
 websockify = 0.8.0
-

software/apache-frontend/templates/apache-lazy-script-call.sh.in

@@ -19,4 +19,3 @@ else
     {{ lazy_command }}
   fi
 fi
-

software/apache-frontend/templates/cached-virtualhost.conf.in

@@ -48,4 +48,3 @@
 
   RewriteRule ^/(.*)$ {{ slave_parameter.get('https_backend_url', '') }}/$1 [L,P]
 </VirtualHost>
-

software/backupserver/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 5c94d952305552dcbeaeaeb27dd28f3b
 
 [template-nginx-configuration]
 filename = template-nginx.cfg.in
-md5sum = a7012aac9b47ddd4e3aa3197aee1ffac
+md5sum = fc4f258e3ae56e0c9596484d736ccfed
 
 [template-dcron-service]
 filename = template-dcron-service.sh.in
@@ -34,7 +34,7 @@ md5sum = 5cbd64f04da0601ba4286516a6161f5e
 
 [template-crontab]
 filename = template-crontab.in
-md5sum = 072be0fd04896880c931d44d8eabde37
+md5sum = f1f82101258de19068262b7213fc478b
 
 [status2rss]
 filename = status2rss.py

software/backupserver/template-crontab.in

 # min(0-59)  hours(0-23) day(1-31) month(1-12) dow(0-7)   command
 MAILTO=admins@erp5.org
-

software/backupserver/template-nginx.cfg.in

@@ -81,4 +81,3 @@ server {
 }
 
 }
-

software/caddy-frontend/CHANGES.caddy_frontend.rst

@@ -3,6 +3,11 @@ Changes
 
 Here are listed the most important changes, which might affect upgrades.
 
+1.0.160 (2020-08-25)
+--------------------
+
+ * haproxy updated from 2.0.15 to 2.0.17 in order to fix issue while accessing inaccessible backends
+
 1.0.159 (2020-07-30)
 --------------------
 

software/caddy-frontend/README.caddy_frontend.rst

@@ -129,9 +129,9 @@ Example sessions is::
   curl -g -X GET --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" master-key-generate-auth-url
   > authtoken
 
-  cat certificate.pem key.pem ca-bundle.pem > master.pem
+  cat certificate.pem ca.pem key.pem > bundle.pem
 
-  curl -g -X PUT --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" --data-binary @master.pem master-key-upload-url+authtoken
+  curl -g -X PUT --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" --data-binary @bundle.pem master-key-upload-url+authtoken
 
 This replaces old request parameters:
 
@@ -157,9 +157,9 @@ Example sessions is::
   curl -g -X GET --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" key-generate-auth-url
   > authtoken
 
-  cat certificate.pem key.pem ca-bundle.pem > master.pem
+  cat certificate.pem ca.pem key.pem > bundle.pem
 
-  curl -g -X PUT --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" --data-binary @master.pem key-upload-url+authtoken
+  curl -g -X PUT --cacert "${frontend_name}.ca.crt" --crlfile "${frontend_name}.crl" --data-binary @bundle.pem key-upload-url+authtoken
 
 This replaces old request parameters:
 

software/caddy-frontend/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = dae3bf6daf851b5610a1a6bd83057b29
 
 [template-common]
 filename = instance-common.cfg.in
-md5sum = c801b7f9f11f0965677c22e6bbe9281b
+md5sum = 5784bea3bd608913769ff9a8afcccb68
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg.in
@@ -62,11 +62,11 @@ md5sum = f8068179333ce19e95df561c70073857
 
 [template-empty]
 _update_hash_filename_ = templates/empty.in
-md5sum = c2314c3a9c3412a38d14b312d3df83c1
+md5sum = 7155b18edfe128825b8d1f48071454a6
 
 [template-wrapper]
 _update_hash_filename_ = templates/wrapper.in
-md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
+md5sum = 975177dedf677d24e14cede5d13187ce
 
 [template-trafficserver-records-config]
 _update_hash_filename_ = templates/trafficserver/records.config.jinja2
@@ -86,7 +86,7 @@ md5sum = 217a6c801b8330b0b825f7b8b4c77184
 
 [template-caddy-lazy-script-call]
 _update_hash_filename_ = templates/apache-lazy-script-call.sh.in
-md5sum = b9f73f6323f9fceea054c46c854d2862
+md5sum = 77d60840591de67b64ab3572e46273a0
 
 [template-graceful-script]
 _update_hash_filename_ = templates/graceful-script.sh.in

software/caddy-frontend/templates/apache-lazy-script-call.sh.in

@@ -21,4 +21,3 @@ else
     rm -f $PIDFILE
   fi
 fi
-

software/davstorage/buildout.hash.cfg

+[template]
+filename = instance.cfg
+md5sum = bed788dee6daf05349c4577e7a7f1299
+
+[instance-davstorage]
+filename = instance-davstorage.cfg
+md5sum = 081f97f9e575af7a4b7f9afc7c80dd4a

software/davstorage/common.cfg

@@ -9,6 +9,7 @@ extends =
   ../../component/logrotate/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/gzip/buildout.cfg
+  ./buildout.hash.cfg
 
 parts =
   apache-php
@@ -35,14 +36,12 @@ strip-top-level-dir = true
 [template]
 # Default template for the instance.
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-md5sum = bed788dee6daf05349c4577e7a7f1299
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [instance-davstorage]
 recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-davstorage.cfg
-md5sum = b83b0351a0f46aac35d52e681270ff03
+url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template-davstorage.cfg
 mode = 0644

software/dream/buildout.hash.cfg

 [instance]
 filename = instance.cfg
-md5sum = 94e1cd21bbdf7cabb5834223859407e0
+md5sum = 646e50cfa93681e8bd85767621c7a39d
\ No newline at end of file

software/dream/instance.cfg

@@ -75,4 +75,3 @@ log = $${:var}/log
 [publish-connection-parameter]
 recipe = slapos.cookbook:publishurl
 url = $${dream_platform_parameter:url}
-

software/erp5/software.cfg

 [buildout]
 extends =
   ../../stack/erp5/buildout.cfg
-

software/erp5/test/setup.py

@@ -48,6 +48,8 @@ setup(name=name,
         'psutil',
         'requests',
         'mysqlclient',
+        'cryptography',
+        'pyOpenSSL',
         ],
       zip_safe=True,
       test_suite='test',

software/erp5/test/test/test_balancer.py

@@ -116,7 +116,7 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase):
         pass
       time.sleep(1)
     else:
-      raise RuntimeError, 'caucased failed to start.'
+      raise RuntimeError('caucased failed to start.')
 
     cau_args = [
       caucase_path,
@@ -145,7 +145,6 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase):
       stderr=subprocess.STDOUT,
     )
     result = caucase_process.communicate()
-    print result
     csr_id = result[0].split()[0]
 
     subprocess.check_call(
@@ -196,7 +195,7 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase):
       else:
         time.sleep(1)
     else:
-      raise RuntimeError, 'getting service certificate failed.'
+      raise RuntimeError('getting service certificate failed.')
 
     # start a caucased and server certificate.
     cls.backend_caucase_dir = tempfile.mkdtemp()
@@ -223,7 +222,7 @@ class TestFrontendXForwardedFor(ERP5InstanceTestCase):
         pass
       time.sleep(1)
     else:
-      raise RuntimeError, 'caucased failed to start.'
+      raise RuntimeError('caucased failed to start.')
 
     super(TestFrontendXForwardedFor, cls).setUpClass()
 

software/etherpad-lite/buildout.hash.cfg

+[template]
+_update_hash_filename_ = instance.cfg
+md5sum = 7ab2a242df988bf5c10bf8002acac3bd
+
+[instance-etherpad-lite]
+_update_hash_filename_ = instance-etherpad-lite.cfg
+md5sum = 7ead62829a85f5922bb9ed0fc8dfb0df
+
+[template-conf]
+_update_hash_filename_ = templates/settings.json.in
+md5sum = 19ab39e6b3256c82fd54ce074488b136
+
+[template-run-script]
+_update_hash_filename_ = templates/run.sh.in
+md5sum = eac870b5f30e735e109a48913af2fae3
+
+[template-deps-script]
+_update_hash_filename_ = templates/installDeps.sh.in
+md5sum = 53d0d53d419bd9ee592d3e1a1c84c758