From: Michal Nowak <mnowak@isc.org>
Date: Tue, 13 Sep 2022 17:44:37 +0000 (+0200)
Subject: Let Debian sid image leverage PKCS#11 with OpenSSL 3
X-Git-Tag: v9.19.6~41^2~4
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3dec2deebc8f5712a871de3aee6a2ffbe4cb1618;p=thirdparty%2Fbind9.git

Let Debian sid image leverage PKCS#11 with OpenSSL 3
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c14c941b16..b72e88b14b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -790,12 +790,19 @@ gcc:sid:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O3"
-    EXTRA_CONFIGURE: "--with-libidn2 --without-lmdb ${WITH_READLINE}"
+    # For the jemalloc ./configure option, see https://gitlab.isc.org/isc-projects/bind9/-/issues/3444
+    EXTRA_CONFIGURE: "--with-libidn2 --without-lmdb --without-jemalloc ${WITH_READLINE}"
     RUN_MAKE_INSTALL: 1
   <<: *debian_sid_amd64_image
   <<: *build_job
 
 system:gcc:sid:amd64:
+  # Set up environment variables that allow the "keyfromlabel" system test to be run
+  variables:
+    DEFAULT_OPENSSL_CONF: "/etc/ssl/openssl.cnf"
+    OPENSSL_CONF: "/var/tmp/etc/openssl.cnf"
+    SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf"
+    SOFTHSM2_MODULE: "/usr/lib/softhsm/libsofthsm2.so"
   <<: *debian_sid_amd64_image
   <<: *system_test_job
   needs: