Update Release Candidate

component/coreutils/buildout.cfg

@@ -11,6 +11,9 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://ftp.gnu.org/gnu/coreutils/coreutils-8.31.tar.xz
 md5sum = 0009a224d8e288e8ec406ef0161f9293
+configure-options = 
+  --disable-libcap
+  --prefix=@@LOCATION@@
 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/libzip/buildout.cfg

@@ -26,4 +26,4 @@ environment =
   PATH=${cmake:location}/bin:%(PATH)s
   CMAKE_INCLUDE_PATH=${zlib:location}/include:${bzip2:location}/include
   CMAKE_LIBRARY_PATH=${zlib:location}/lib:${bzip2:location}/lib
-  LDFLAGS=-L${:location}/lib -Wl,-rpath=${:location}/lib
+  LDFLAGS=-L${:location}/lib -Wl,-rpath=${:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/proftpd/buildout.cfg

@@ -22,11 +22,8 @@ recipe = collective.recipe.grp
 
 [proftpd]
 recipe = slapos.recipe.cmmi
-md5sum = 13270911c42aac842435f18205546a1b
-url = ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6.tar.gz
-# 1.3.6 is not compatible with openssl 1.1.x
-# https://github.com/proftpd/proftpd/issues/674
-# (fix is in master, we are waiting for next release)
+md5sum = 4040f6a6b86173e2a03f4ccdb9b9af6e
+url = ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6b.tar.gz
 configure-options =
   --enable-openssl
   --enable-nls
@@ -39,8 +36,8 @@ environment =
   LDFLAGS=${:ldflags}
   install_user=${proftpd-environment:USER}
   install_group=${proftpd-grp:GROUP}
-cppflags=-I${zlib:location}/include -I${openssl-1.0:location}/include
-ldflags=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib
+cppflags=-I${zlib:location}/include -I${openssl:location}/include
+ldflags=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
 patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =

component/zstd/buildout.cfg

 [buildout]
+extends = ../zlib/buildout.cfg
 parts =
   zstd
 
@@ -10,4 +11,7 @@ md5sum = 487f7ee1562dee7c1c8adf85e2a63df9
 shared = true
 location = @@LOCATION@@
 configure-command = :
-make-options = PREFIX=${:location}
+environment =
+  PREFIX=${:location}
+  LD_FLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
+  CFLAGS=-I${zlib:location}/include

software/caddy-frontend/test/test.py

@@ -534,7 +534,7 @@ class SlaveHttpFrontendTestCase(SlapOSInstanceTestCase):
       cls.startServerProcess()
     except BaseException:
       cls.logger.exception("Error during setUpClass")
-      cls._cleanup('setUpClass')
+      cls._cleanup("{}.{}.setUpClass".format(cls.__module__, cls.__name__))
       cls.setUp = lambda self: self.fail('Setup Class failed.')
       raise
 
@@ -559,7 +559,9 @@ class SlaveHttpFrontendTestCase(SlapOSInstanceTestCase):
       cls.waitForCaddy()
     except BaseException:
       cls.logger.exception("Error during setUpClass")
-      cls._cleanup('setUpClass')
+      # "{}.{}.setUpClass".format(cls.__module__, cls.__name__) is already used by SlapOSInstanceTestCase.setUpClass
+      # so we use another name for snapshot, to make sure we don't store another snapshot in same directory.
+      cls._cleanup("{}.SlaveHttpFrontendTestCase.{}.setUpClass".format(cls.__module__, cls.__name__))
       cls.setUp = lambda self: self.fail('Setup Class failed.')
       raise
 

software/re6stnet/software.cfg

@@ -88,7 +88,7 @@ context =
 < = download-base
 
 [versions]
-re6stnet = 0.533
+re6stnet = 0.551
 slapos.recipe.template = 4.3
 
 # Required by: