Update Release Candidate

component/apache/buildout.cfg

@@ -38,9 +38,9 @@ md5sum = 2202b18f269ad606d70e1864857ed93c
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
 shared = false
-version = 2.4.38
+version = 2.4.39
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 4a2b87ca55e42017d21f18724c560084
+md5sum = 930e217ba2d71e708a3f1521ecae7ec0
 pre-configure =
   cp -ar ${apr:location}/apr-${apr:version} srclib/apr/ &&
   cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util
@@ -120,80 +120,6 @@ make-targets =
 environment =
   PATH=${patch:location}/bin:%(PATH)s
 
-[apache-2.2]
-# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
-recipe = slapos.recipe.cmmi
-shared = false
-version = 2.2.34
-url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = c0bf1bdb779a3b5e6e294caf9ca20441
-patch-options = -p1
-configure-options = --disable-static
-                    --enable-authn-alias
-                    --enable-bucketeer
-                    --enable-cache
-                    --enable-case-filter
-                    --enable-case-filter-in
-                    --enable-cgid
-                    --enable-charset-lite
-                    --enable-disk-cache
-                    --enable-mem-cache
-                    --enable-echo
-                    --enable-exception-hook
-                    --enable-mods-shared=all
-                    --enable-optional-fn-export
-                    --enable-optional-fn-import
-                    --enable-optional-hook-export
-                    --enable-optional-hook-import
-                    --enable-proxy
-                    --enable-proxy-ajp
-                    --enable-proxy-balancer
-                    --enable-proxy-connect
-                    --enable-proxy-ftp
-                    --enable-proxy-http
-                    --enable-proxy-scgi
-                    --enable-dav
-                    --enable-dav-fs
-                    --enable-dav-lock
-                    --enable-so
-                    --enable-ssl
-                    --with-included-apr
-                    --with-ssl=${openssl:location}
-                    --with-z=${zlib:location}
-                    --with-expat=${libexpat:location}
-                    --with-pcre=${pcre:location}
-                    --with-sqlite3=${sqlite3:location}
-                    --with-gdbm=${gdbm:location}
-                    --without-lber
-                    --without-ldap
-                    --without-ndbm
-                    --without-berkeley-db
-                    --without-pgsql
-                    --without-mysql
-                    --without-sqlite2
-                    --without-oracle
-                    --without-freedts
-                    --without-odbc
-                    --without-iconv
-
-environment =
-  PATH=${patch:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  CPPFLAGS =-I${libuuid:location}/include
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
-
-[apache-antiloris-apache-2.2]
-# Note: Shall react on each build of apache and reinstall itself
-recipe = slapos.recipe.cmmi
-shared = false
-url = http://downloads.sourceforge.net/project/mod-antiloris/mod_antiloris-0.4.tar.bz2
-md5sum = 66862bf10e9be3a023e475604a28a0b4
-configure-command = ${apache-2.2:location}/bin/apxs
-configure-options = -c mod_antiloris.c
-make-binary = ${:configure-command}
-make-options = -i -a -n antiloris mod_antiloris.la
-make-targets =
-
 [template-apache-backend-conf]
 recipe = slapos.recipe.build:download
 shared = false

component/binutils/buildout.cfg

@@ -7,8 +7,8 @@ parts = binutils
 [mpfr]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/mpfr/mpfr-3.1.3.tar.xz
-md5sum = 6969398cd2fbc56a6af570b5273c56a9
+url = http://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz
+md5sum = 320fbc4463d4c8cb1e566929d8adc4f8
 configure-options =
   --with-gmp=${gmp:location}
   --disable-static
@@ -19,8 +19,8 @@ environment =
 [mpc]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/mpc/mpc-1.0.3.tar.gz
-md5sum = d6a1d5f8ddea3abd2cc3e98f58352d26
+url = http://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
+md5sum = 4125404e41e482ec68282a2e687f6c73
 configure-options =
   --with-gmp=${gmp:location}
   --with-mpfr=${mpfr:location}
@@ -31,8 +31,8 @@ environment =
 [isl]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.16.1.tar.bz2
-md5sum = ac1f25a0677912952718a51f5bc20f32
+url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.18.tar.bz2
+md5sum = 11436d6b205e516635b666090b94ab32
 configure-options =
   --with-gmp-prefix=${gmp:location}
   --disable-static
@@ -42,8 +42,8 @@ environment =
 [binutils]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.bz2
-md5sum = 2869c9bf3e60ee97c74ac2a6bf4e9d68
+url = http://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.bz2
+md5sum = 64f8ea283e571200f8b2b7f66fe8a0d6
 configure-options =
   --disable-bootstrap
   --with-mpc=${mpc:location}

component/caddy/buildout.cfg

 [buildout]
 extends =
   ../../component/golang/buildout.cfg
+  gowork.cfg
 
 parts =
+  gowork
   caddy
 
 [gowork]
-# Caddy 1.x+ uses go modules, for which gowork does not work yet
 golang  = ${golang1.12:location}
 install =
-
-[gowork.goinstall]
-command = :
-depends =
-  ${caddy:recipe}
+  github.com/mholt/caddy
 
 [caddy]
-# revision and repository can be used to control which caddy version is used
-revision = 0c3d90ed21a4df1b5e75ff4d5f908fd3018f902c
-repository = github.com/mholt/caddy/caddy
-
-recipe  = plone.recipe.command
-update-command = ${:command}
-stop-on-error = True
-# GO111MODULE=on enables go modules support
-# the chmod is needed as modules are fetched with u-w
-command =
-  . ${gowork:env.sh} &&
-  cd ${gowork:directory} &&
-  export GO111MODULE=on &&
-  go get ${:repository}@${:revision} &&
-  chmod -R u+w .
+recipe  = slapos.recipe.cmmi
+path    = ${go_github.com_mholt_caddy:location}
+go      = ${gowork:golang}/bin/go
+configure-command = :
+make-targets =
+make-binary = cd ${:path}/caddy  && ${:go} install -v
+environment =
+  PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s
+  GOPATH=${gowork:directory}
 output = ${gowork:bin}/caddy
 location = ${:output}

component/caddy/gowork.cfg

+# Code generated by gowork-snapshot; DO NOT EDIT.
+
+# list of go git repositories to fetch
+[gowork.goinstall]
+depends_gitfetch  =
+    ${go_github.com_mholt_caddy:recipe}
+
+
+[go_github.com_mholt_caddy]
+<= go-git-package
+go.importpath = github.com/mholt/caddy
+repository    = https://lab.nexedi.com/nexedi/caddy.git
+revision      = nxd-v0.11.5-4-g9d3151db

component/coreutils/buildout.cfg

@@ -9,8 +9,8 @@ parts =
 [coreutils]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.23.tar.xz
-md5sum = abed135279f87ad6762ce57ff6d89c41
+url = http://ftp.gnu.org/gnu/coreutils/coreutils-8.30.tar.xz
+md5sum = ab06d68949758971fe744db66b572816
 environment =
   PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
   LDFLAGS=-Wl,--as-needed -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib

component/gcc/buildout.cfg

@@ -4,6 +4,7 @@
 extends =
   ../gettext/buildout.cfg
   ../gmp/buildout.cfg
+  ../patch/buildout.cfg
   ../perl/buildout.cfg
   ../tar/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -19,6 +20,9 @@ url = http://ftp.gnu.org/gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.gz
 md5sum = 781bc0195edeb0ceaace8428f63ae63d
 # make install does not work when several core are used
 make-targets = install -j1
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/libsanitizer_Use_pre-computed_size_of_struct_ustat_for_Linux.patch#1e5f33e89f9fe1ca3e406eabcc621762
 
 [gcc]
 <= gcc-common

component/gcc/libsanitizer_Use_pre-computed_size_of_struct_ustat_for_Linux.patch

+From 15f0e921f47a9b81c4a30295c8685ad37d3ff4e0 Mon Sep 17 00:00:00 2001
+From: hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 24 May 2018 19:52:32 +0000
+Subject: [PATCH] libsanitizer: Use pre-computed size of struct ustat for Linux
+
+Cherry-pick compiler-rt revision 333213:
+
+<sys/ustat.h> has been removed from glibc 2.28 by:
+
+commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date:   Sun Mar 18 11:28:59 2018 +0800
+
+    Deprecate ustat syscall interface
+
+This patch uses pre-computed size of struct ustat for Linux.
+
+	PR sanitizer/85835
+	* sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
+	include <sys/ustat.h> for Linux.
+	(SIZEOF_STRUCT_USTAT): New.
+	(struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@260684 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ libsanitizer/ChangeLog                                    |  8 ++++++++
+ .../sanitizer_common/sanitizer_platform_limits_posix.cc   | 15 +++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+# Hunk commented-out as this does not apply on gcc 5.5 .
+#diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
+#index 2ec1a9a..286b789 100644
+#--- a/libsanitizer/ChangeLog
+#+++ b/libsanitizer/ChangeLog
+#@@ -1,3 +1,11 @@
+#+2018-05-24  H.J. Lu  <hongjiu.lu@intel.com>
+#+
+#+	PR sanitizer/85835
+#+	* sanitizer_common/sanitizer_platform_limits_posix.cc: Don't
+#+	include <sys/ustat.h> for Linux.
+#+	(SIZEOF_STRUCT_USTAT): New.
+#+	(struct_ustat_sz): Use SIZEOF_STRUCT_USTAT for Linux.
+#+
+# 2018-04-26  Hans-Peter Nilsson  <hp@axis.com>
+# 
+# 	* configure.tgt <mips*-*-linux*>: Enable build, excluding
+diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 858bb21..de18e56 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -157,7 +157,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -250,7 +249,19 @@ namespace __sanitizer {
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+-  unsigned struct_ustat_sz = sizeof(struct ustat);
++  // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++  // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++  || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++  || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++  unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+-- 
+2.9.3
+

component/golang/buildout.cfg

@@ -64,8 +64,8 @@ environment-extra =
 
 [golang1.12]
 <= golang-common
-url = https://dl.google.com/go/go1.12.3.src.tar.gz
-md5sum = 648486d1bab417e6517bc5ed9be766ce
+url = https://dl.google.com/go/go1.12.4.src.tar.gz
+md5sum = edb6bac6dc1ce0afc931d9e41ef3d2ef
 
 # go1.11 needs go1.4 to bootstrap
 environment-extra =

component/gzip/buildout.cfg

@@ -7,7 +7,7 @@ parts =
 [gzip]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.gnu.org/pub/gnu/gzip/gzip-1.8.tar.xz
-md5sum = f7caabb65cddc1a4165b398009bd05b9
+url = https://ftp.gnu.org/pub/gnu/gzip/gzip-1.10.tar.xz
+md5sum = 691b1221694c3394f1c537df4eee39d3
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s

component/logrotate/buildout.cfg

@@ -8,8 +8,8 @@ parts = logrotate
 [logrotate]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/logrotate/logrotate/releases/download/3.11.0/logrotate-3.11.0.tar.xz
-md5sum = 3a9280e4caeb837427a2d54518fbcdac
+url = https://github.com/logrotate/logrotate/releases/download/3.15.0/logrotate-3.15.0.tar.xz
+md5sum = 320046f0b9fc38337e8827d4c5a866a0
 # BBB this is only for backward-compatibility.
 post-install =
   ln -nsf . @@LOCATION@@/usr

component/mariadb/buildout.cfg

@@ -3,6 +3,7 @@
 
 [buildout]
 extends =
+  ../binutils/buildout.cfg
   ../bzip2/buildout.cfg
   ../cmake/buildout.cfg
   ../groonga/buildout.cfg
@@ -108,7 +109,7 @@ patches =
 pre-build =
   sed -i -e "s,${mariadb:location}/include,$(pwd)/fake_mariadb_source/include,g" Makefile */Makefile
 environment =
-  PATH=${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
+  PATH=${binutils:location}/bin:${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga
   LDFLAGS=-L${groonga:location}/lib
   PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig

component/perl/0002-prereq1.patch

+From b2cb17719c9233fbc9040ced04418be051c91c14 Mon Sep 17 00:00:00 2001
+From: Sawyer X <xsawyerx@cpan.org>
+Date: Fri, 27 Apr 2018 20:35:42 +0300
+Subject: Storable: fix for strawberry build failures:
+
+Provided by Graham @haarg Knop.
+
+Origin: upstream, https://perl5.git.perl.org/perl.git/commit/3f4cad1bbe7c6238adba5abb2415775a74eded4d
+Patch-Name: fixes/storable-probing/prereq1.diff
+---
+ dist/Storable/Makefile.PL | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL
+index 697750566..4f0213277 100644
+--- a/dist/Storable/Makefile.PL
++++ b/dist/Storable/Makefile.PL
+@@ -14,10 +14,12 @@ use File::Spec;
+ 
+ unlink "lib/Storable/Limit.pm";
+ 
++my $limit_pm = File::Spec->catfile('lib', 'Storable', 'Limit.pm');
++
+ my $pm = { 'Storable.pm' => '$(INST_ARCHLIB)/Storable.pm' };
+ unless ($ENV{PERL_CORE}) {
+     # the core Makefile takes care of this for core builds
+-    $pm->{"lib/Storable/Limit.pm"} = '$(INST_ARCHLIB)/Storable/Limit.pm';
++    $pm->{$limit_pm} = '$(INST_ARCHLIB)/Storable/Limit.pm';
+ }
+ 
+ WriteMakefile(
+@@ -91,7 +93,6 @@ sub depend {
+         $extra_deps = ' Storable.pm';
+     }
+     my $linktype = uc($_[0]->{LINKTYPE});
+-    my $limit_pm = File::Spec->catfile('lib', 'Storable', 'Limit.pm');
+     "
+ $limit_pm : stacksize \$(INST_$linktype)$extra_deps
+ 	\$(MKPATH) \$(INST_LIB)
+@@ -111,7 +112,7 @@ sub test {
+     my $out = $self->SUPER::test(%attr);
+ 
+     if ($ENV{PERL_CORE}) {
+-        $out =~ s!^(test(?:db)?_(?:static|dynamic)\b.*)!$1 lib/Storable/Limit.pm!gm;
++        $out =~ s!^(test(?:db)?_(?:static|dynamic)\b.*)!$1 $limit_pm!gm;
+     }
+ 
+     $out;

component/perl/0003-prereq2.patch

+From cece912f1d5e5e80dc8d64364b0ddc4bf729bd85 Mon Sep 17 00:00:00 2001
+From: Tony Cook <tony@develop-help.com>
+Date: Mon, 30 Jul 2018 21:00:52 +1000
+Subject: (perl #133411) don't try to load Storable with -Dusecrosscompile
+
+Origin: https://perl5.git.perl.org/perl.git/commit/edf639fce3e8c8852ee4179ab902b357b1deba98
+Bug: https://rt.perl.org/Public/Bug/Display.html?id=133411
+Patch-Name: fixes/storable-probing/prereq2.diff
+---
+ dist/Storable/Makefile.PL |  9 ++++++++-
+ dist/Storable/stacksize   | 10 +++++++---
+ 2 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL
+index 4f0213277..69efc8294 100644
+--- a/dist/Storable/Makefile.PL
++++ b/dist/Storable/Makefile.PL
+@@ -92,11 +92,18 @@ sub depend {
+         # blib.pm needs arch/lib
+         $extra_deps = ' Storable.pm';
+     }
++    my $whichperl;
++    if ($Config::Config{usecrosscompile}) {
++        $whichperl = '$(PERLRUN)';
++    }
++    else {
++        $whichperl = '$(FULLPERLRUNINST)';
++    }
+     my $linktype = uc($_[0]->{LINKTYPE});
+     "
+ $limit_pm : stacksize \$(INST_$linktype)$extra_deps
+ 	\$(MKPATH) \$(INST_LIB)
+-	\$(FULLPERLRUNINST) stacksize $options
++	$whichperl stacksize $options
+ 
+ release : dist
+ 	git tag \$(VERSION)
+diff --git a/dist/Storable/stacksize b/dist/Storable/stacksize
+index 7abd3a84c..14e073973 100644
+--- a/dist/Storable/stacksize
++++ b/dist/Storable/stacksize
+@@ -7,6 +7,9 @@ use Cwd;
+ use File::Spec;
+ use strict;
+ 
++-d "lib" or mkdir "lib";
++-d "lib/Storable" or mkdir "lib/Storable";
++
+ my $fn = "lib/Storable/Limit.pm";
+ my $ptrsize = $Config{ptrsize};
+ my ($bad1, $bad2) = (65001, 25000);
+@@ -29,6 +32,10 @@ sub is_miniperl {
+ }
+ 
+ if (is_miniperl()) {
++    if ($Config{usecrosscompile}) {
++        write_limits(500, 265);
++        exit;
++    }
+     die "Should not run during miniperl\n";
+ }
+ my $prefix = "";
+@@ -68,9 +75,6 @@ if ($ENV{PERL_CORE}) {
+     }
+ }
+ 
+--d "lib" or mkdir "lib";
+--d "lib/Storable" or mkdir "lib/Storable";
+-
+ if ($^O eq "MSWin32") {
+     require Win32;
+     my ($str, $major, $minor) = Win32::GetOSVersion();

component/perl/buildout.cfg

@@ -16,6 +16,9 @@ patch-options = -p1
 patches =
   ${:_profile_base_location_}/perl-keep-linker-flags-in-ldflags.patch#4e8e0c59d7176eafb0c7402dea17bef1
   ${:_profile_base_location_}/0001-Fix-missing-build-dependency-for-pods.patch#85aff81f3bea34fcd6ce9a611ee1cdb2
+  ${:_profile_base_location_}/0002-prereq1.patch#c9bf3b521a39134d044eaa2c2312174f
+  ${:_profile_base_location_}/0003-prereq2.patch#5268ff6dd06718cff34e6fb758045996
+  ${:_profile_base_location_}/0004-disable-probing.patch#e68446ccd155c2282639e495a5be612b
 configure-command =
   sh Configure -des \
     -Dprefix=${buildout:parts-directory}/${:_buildout_section_name_} \

component/wget/buildout.cfg

@@ -14,12 +14,13 @@ parts =
 [wget]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/wget/wget-1.19.5.tar.lz
-md5sum = 4ee511011a15f4207bea8b2993c343ee
+url = http://ftp.gnu.org/gnu/wget/wget-1.20.3.tar.lz
+md5sum = 3bc242eb69165247b1793dd0b794ff52
 configure-options =
   --enable-ipv6
   --enable-opie
   --disable-iri
+  --disable-pcre2
   --with-ssl=openssl
   --with-libssl-prefix=${openssl:location}
   --with-zlib-lib=${zlib:location}

software/caddy-frontend/test/test.py

@@ -1708,8 +1708,11 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
       verify=self.ca_certificate_file)
     self.assertEqual(httplib.CREATED, auth.status_code)
 
-    data = self.customdomain_ca_certificate_pem + \
-        self.customdomain_ca_key_pem + 'some garbage'
+    _, ca_key_pem, csr, _ = createCSR(
+      parameter_dict['domain'])
+    _, ca_certificate_pem = self.ca.signCSR(csr)
+
+    data = ca_certificate_pem + ca_key_pem + 'some garbage'
     upload = requests.put(
       upload_url + auth.text,
       data=data,
@@ -1718,10 +1721,16 @@ http://apachecustomhttpsaccepted.example.com:%%(http_port)s {
     self.assertEqual(httplib.CREATED, upload.status_code)
     self.runKedifaUpdater()
 
-    with self.assertRaises(requests.exceptions.SSLError):
-      self.fakeHTTPSResult(
+    result = self.fakeHTTPSResult(
         parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
 
+    self.assertEqual(
+      ca_certificate_pem,
+      der2pem(result.peercert)
+    )
+
+    self.assertEqualResultJson(result, 'Path', '/test-path')
+
     certificate_file_list = glob.glob(os.path.join(
       self.instance_path, '*', 'srv', 'autocert',
       '_ssl_ca_crt_garbage.pem'))
@@ -4666,6 +4675,10 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
       'customdomainsslcrtsslkeysslcacrt.example.com')
     _, cls.customdomain_ca_certificate_pem = cls.ca.signCSR(csr)
 
+    _, cls.sslcacrtgarbage_ca_key_pem, csr, _ = createCSR(
+      'sslcacrtgarbage.example.com')
+    _, cls.sslcacrtgarbage_ca_certificate_pem = cls.ca.signCSR(csr)
+
     _, cls.ssl_from_slave_ca_key_pem, csr, _ = createCSR(
       'sslfromslave.example.com')
     _, cls.ssl_from_slave_ca_certificate_pem = cls.ca.signCSR(csr)
@@ -4729,8 +4742,8 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
       },
       'ssl_ca_crt_garbage': {
         'url': cls.backend_url,
-        'ssl_crt': cls.customdomain_ca_certificate_pem,
-        'ssl_key': cls.customdomain_ca_key_pem,
+        'ssl_crt': cls.sslcacrtgarbage_ca_certificate_pem,
+        'ssl_key': cls.sslcacrtgarbage_ca_key_pem,
         'ssl_ca_crt': 'some garbage',
       },
       'ssl_ca_crt_does_not_match': {
@@ -4923,7 +4936,7 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
     reference = 'ssl_from_slave'
     parameter_dict = self.parseSlaveParameterDict(reference)
     self.assertLogAccessUrlWithPop(parameter_dict)
-    generate_auth, upload_url = self.assertKedifaKeysWithPop(parameter_dict)
+    self.assertKedifaKeysWithPop(parameter_dict)
 
     hostname = reference.translate(None, '_-')
     self.assertEqual(
@@ -5345,10 +5358,16 @@ class TestSlaveSlapOSMasterCertificateCompatibility(
       parameter_dict
     )
 
-    with self.assertRaises(requests.exceptions.SSLError):
-      self.fakeHTTPSResult(
+    result = self.fakeHTTPSResult(
         parameter_dict['domain'], parameter_dict['public-ipv4'], 'test-path')
 
+    self.assertEqual(
+      self.sslcacrtgarbage_ca_certificate_pem,
+      der2pem(result.peercert)
+    )
+
+    self.assertEqualResultJson(result, 'Path', '/test-path')
+
   def test_ssl_ca_crt_does_not_match(self):
     parameter_dict = self.parseSlaveParameterDict('ssl_ca_crt_does_not_match')
     self.assertLogAccessUrlWithPop(parameter_dict)

stack/cloudooo.cfg

@@ -25,7 +25,6 @@ extends =
   ../component/poppler/buildout.cfg
   ../component/python-2.7/buildout.cfg
   ../component/rdiff-backup/buildout.cfg
-  ../component/stunnel/buildout.cfg
   ../component/xorg/buildout.cfg
 
 versions = versions
@@ -36,7 +35,6 @@ parts =
 [stack-cloudooo-buildout]
 parts =
   libreoffice-bin
-  stunnel
   dcron
   install-plone-recipe-command
 

stack/erp5/buildout.cfg

@@ -41,7 +41,6 @@ extends =
   ../../component/scikit-learn/buildout.cfg
   ../../component/scikit-image/buildout.cfg
   ../../component/PyWavelets/buildout.cfg
-  ../../component/stunnel/buildout.cfg
   ../../component/subversion/buildout.cfg
   ../../component/tesseract/buildout.cfg
   ../../component/w3m/buildout.cfg
@@ -81,7 +80,6 @@ parts +=
   graphviz
   haproxy
   jsl
-  stunnel
   w3m
   poppler
   libpng
@@ -288,7 +286,6 @@ context =
     key sixtunnel_location 6tunnel:location
     key template_run_zelenium template-run-zelenium:target
     key egg_interpreter eggs:interpreter
-    key stunnel_location stunnel:location
     key template_apache_conf template-apache-backend-conf:target
     key template_balancer template-balancer:target
     key template_erp5 template-erp5:target