diff options
Diffstat (limited to 'infrastructure')
24 files changed, 31 insertions, 0 deletions
diff --git a/infrastructure/buildenv-testmain-template.cpp b/infrastructure/buildenv-testmain-template.cpp index d946c25d..6aba82c5 100644 --- a/infrastructure/buildenv-testmain-template.cpp +++ b/infrastructure/buildenv-testmain-template.cpp @@ -44,6 +44,10 @@ #include <list> #include <string> +#ifdef HAVE_OPENSSL_CLEANUP +# include <openssl/crypto.h> +#endif + #include "box_getopt.h" #include "depot.h" #include "Logging.h" @@ -392,6 +396,14 @@ int main(int argc, char * const * argv) { Logging::GetSyslog().Shutdown(); + // On Ubuntu 18.04, initialising OpenSSL 1.1.1 leaves open file handles to + // /dev/[u]random which are not easy to close (the docs for OPENSSL_cleanup + // recommend not to call it), but we want to avoid detecting those as + // leaking file descriptors +#ifdef HAVE_OPENSSL_CLEANUP + OPENSSL_cleanup(); +#endif + bool filesleftopen = !checkfilesleftopen(); fflush(stdout); diff --git a/infrastructure/cmake/build/bin_bbackupd.vcxproj.user b/infrastructure/cmake/build/bin_bbackupd.vcxproj.user index 51928554..51928554 100755..100644 --- a/infrastructure/cmake/build/bin_bbackupd.vcxproj.user +++ b/infrastructure/cmake/build/bin_bbackupd.vcxproj.user diff --git a/infrastructure/cmake/build/bin_bbstored.vcxproj.user b/infrastructure/cmake/build/bin_bbstored.vcxproj.user index e48b8383..e48b8383 100755..100644 --- a/infrastructure/cmake/build/bin_bbstored.vcxproj.user +++ b/infrastructure/cmake/build/bin_bbstored.vcxproj.user diff --git a/infrastructure/cmake/build/test_backupstore.vcxproj.user b/infrastructure/cmake/build/test_backupstore.vcxproj.user index 79ef7571..79ef7571 100755..100644 --- a/infrastructure/cmake/build/test_backupstore.vcxproj.user +++ b/infrastructure/cmake/build/test_backupstore.vcxproj.user diff --git a/infrastructure/cmake/build/test_backupstorefix.vcxproj.user b/infrastructure/cmake/build/test_backupstorefix.vcxproj.user index c0895191..c0895191 100755..100644 --- a/infrastructure/cmake/build/test_backupstorefix.vcxproj.user +++ b/infrastructure/cmake/build/test_backupstorefix.vcxproj.user diff --git a/infrastructure/cmake/build/test_bbackupd.vcxproj.user b/infrastructure/cmake/build/test_bbackupd.vcxproj.user index 9ca2b5e9..9ca2b5e9 100755..100644 --- a/infrastructure/cmake/build/test_bbackupd.vcxproj.user +++ b/infrastructure/cmake/build/test_bbackupd.vcxproj.user diff --git a/infrastructure/cmake/build/test_common.vcxproj.user b/infrastructure/cmake/build/test_common.vcxproj.user index 7a375f10..7a375f10 100755..100644 --- a/infrastructure/cmake/build/test_common.vcxproj.user +++ b/infrastructure/cmake/build/test_common.vcxproj.user diff --git a/infrastructure/cmake/build/test_httpserver.vcxproj.user b/infrastructure/cmake/build/test_httpserver.vcxproj.user index b2da015c..b2da015c 100755..100644 --- a/infrastructure/cmake/build/test_httpserver.vcxproj.user +++ b/infrastructure/cmake/build/test_httpserver.vcxproj.user diff --git a/infrastructure/cmake/build/test_raidfile.vcxproj.user b/infrastructure/cmake/build/test_raidfile.vcxproj.user index d2c2fc34..d2c2fc34 100755..100644 --- a/infrastructure/cmake/build/test_raidfile.vcxproj.user +++ b/infrastructure/cmake/build/test_raidfile.vcxproj.user diff --git a/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user index 51928554..51928554 100755..100644 --- a/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user +++ b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user diff --git a/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user index e48b8383..e48b8383 100755..100644 --- a/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user +++ b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_backupstore.vcxproj.user b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user index 79ef7571..79ef7571 100755..100644 --- a/infrastructure/cmake/msvc/test_backupstore.vcxproj.user +++ b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user index c0895191..c0895191 100755..100644 --- a/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user +++ b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user index 9ca2b5e9..9ca2b5e9 100755..100644 --- a/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user +++ b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_common.vcxproj.user b/infrastructure/cmake/msvc/test_common.vcxproj.user index 7a375f10..7a375f10 100755..100644 --- a/infrastructure/cmake/msvc/test_common.vcxproj.user +++ b/infrastructure/cmake/msvc/test_common.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_httpserver.vcxproj.user b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user index b2da015c..b2da015c 100755..100644 --- a/infrastructure/cmake/msvc/test_httpserver.vcxproj.user +++ b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_raidfile.vcxproj.user b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user index d2c2fc34..d2c2fc34 100755..100644 --- a/infrastructure/cmake/msvc/test_raidfile.vcxproj.user +++ b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user diff --git a/infrastructure/config.guess b/infrastructure/config.guess index b79252d6..b79252d6 100755..100644 --- a/infrastructure/config.guess +++ b/infrastructure/config.guess diff --git a/infrastructure/config.sub b/infrastructure/config.sub index 8b612ab8..8b612ab8 100755..100644 --- a/infrastructure/config.sub +++ b/infrastructure/config.sub diff --git a/infrastructure/m4/boxbackup_tests.m4 b/infrastructure/m4/boxbackup_tests.m4 index 61cd34c2..15f132cb 100644 --- a/infrastructure/m4/boxbackup_tests.m4 +++ b/infrastructure/m4/boxbackup_tests.m4 @@ -145,6 +145,7 @@ Upgrade or read the documentation for alternatives]]) ]) AC_CHECK_FUNCS([SSL_CTX_set_security_level], [HAVE_SSL_CTX_SET_SECURITY_LEVEL=1]) AC_SUBST([HAVE_SSL_CTX_SET_SECURITY_LEVEL]) +AC_CHECK_FUNCS([OPENSSL_cleanup]) ### Checks for header files. diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in index 48958ba1..48958ba1 100755..100644 --- a/infrastructure/makebuildenv.pl.in +++ b/infrastructure/makebuildenv.pl.in diff --git a/infrastructure/makedistribution.pl.in b/infrastructure/makedistribution.pl.in index 0ccd92be..0ccd92be 100755..100644 --- a/infrastructure/makedistribution.pl.in +++ b/infrastructure/makedistribution.pl.in diff --git a/infrastructure/setup-debian-chroot.sh b/infrastructure/setup-debian-chroot.sh new file mode 100755 index 00000000..1e03bd75 --- /dev/null +++ b/infrastructure/setup-debian-chroot.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +set -ex + +CHROOT_BASE=/var/chroot +LSB_RELEASE=$(lsb_release -s -c) + +apt-get update +apt-get install -y debootstrap schroot + +mkdir -p ${CHROOT_BASE} +debootstrap --arch=i386 --variant=buildd "${LSB_RELEASE}" "${CHROOT_BASE}/${LSB_RELEASE}-i386" http://deb.debian.org/debian +cat > /etc/schroot/chroot.d/ci <<EOF +[${LSB_RELEASE}] +type=directory +directory=${CHROOT_BASE}/${LSB_RELEASE}-i386 +personality=linux32 +EOF diff --git a/infrastructure/setupexternal.pl b/infrastructure/setupexternal.pl index 87ec5560..87ec5560 100755..100644 --- a/infrastructure/setupexternal.pl +++ b/infrastructure/setupexternal.pl |