bootstrap: make sure we have gnutls-cli from gnutls-bin/gnutls-utils

We'll use it in some upcoming tests...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index d5390c8821da91f88608ade0dafca7a0e1c72128..798192f9b04fdde5fa6212f95747de5a8ceb8821 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 0b8b0640b6475650c8db301236c03c9ad732f52e
+  SAMBA_CI_CONTAINER_TAG: cf0a5476a4f13d449a7542d01d225dc2aef2a333
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224

diff --git a/bootstrap/config.py b/bootstrap/config.py
index f61e52a7aea241abd907d2e29866657bad1fa200..17c608ca3931438459d134c6ba8ff3c40ab40fd9 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -97,6 +97,7 @@ PKGS = [
     ('libgpgme11-dev', 'gpgme-devel'),
     # NOTE: Debian 8+ and Ubuntu 14.04+
     ('libgnutls28-dev', 'gnutls-devel'),
+    ('gnutls-bin', 'gnutls-utils'),
     ('libtasn1-bin', 'libtasn1-tools'),
     ('libtasn1-dev', 'libtasn1-devel'),
     ('', 'quota-devel'),
@@ -486,6 +487,7 @@ RPM_DISTS = {
             'glusterfs-devel': '',
             'libcephfs-devel': '',
             'gnutls-devel': 'compat-gnutls37-devel',
+            'gnutls-utils': 'compat-gnutls37-utils',
             'liburing-devel': '',   # not available
             'python3-setproctitle': 'python36-setproctitle',
             'tracker-devel': '', # do not install
@@ -549,6 +551,7 @@ RPM_DISTS = {
             'python3-markdown': 'python3-Markdown',
             'quota-devel': '',
             'glusterfs-api-devel': '',
+            'gnutls-utils': 'gnutls',
             'libtasn1-tools': '', # asn1Parser is part of libtasn1
             'mold': '',
             'shfmt': '',

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index c8bbd9d62f10a73b235796196fc132e129d7f26d..aa0638e976583e0ba4eb45733d4e01ec8d629a1a 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -25,6 +25,7 @@ yum install -y \
     ccache \
     chrpath \
     compat-gnutls37-devel \
+    compat-gnutls37-utils \
     crypto-policies-scripts \
     cups-devel \
     curl \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 9b0f5285f19900cf6074b21207504262caa1853b..edcc34791ec00e7a7e5d455a6a85897c9dede230 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -11,6 +11,7 @@ packages:
   - ccache
   - chrpath
   - compat-gnutls37-devel
+  - compat-gnutls37-utils
   - crypto-policies-scripts
   - cups-devel
   - curl

diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh
index 6a1df119535db5dae002a2f9af9d042fb103bf63..6a76d40d70e2f5b0e698f8dd76ccb32afdcf1d29 100755 (executable)
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -45,6 +45,7 @@ yum install -y \
     glusterfs-api-devel \
     glusterfs-devel \
     gnutls-devel \
+    gnutls-utils \
     gpgme-devel \
     gzip \
     hostname \

diff --git a/bootstrap/generated-dists/centos8s/packages.yml b/bootstrap/generated-dists/centos8s/packages.yml
index 0bae860437b188cc63133083587db717da9fb537..49455ff3be21ed4253193b69f1ff5ee96484fd40 100644 (file)
--- a/bootstrap/generated-dists/centos8s/packages.yml
+++ b/bootstrap/generated-dists/centos8s/packages.yml
@@ -27,6 +27,7 @@ packages:
   - glusterfs-api-devel
   - glusterfs-devel
   - gnutls-devel
+  - gnutls-utils
   - gpgme-devel
   - gzip
   - hostname

diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index 1aac852e83ea10c49c447ce6f08a15660b639b00..bee0897803e148f0add19907c98229f39bdf6dfe 100755 (executable)
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -31,6 +31,7 @@ apt-get -y install \
     gdb \
     git \
     glusterfs-common \
+    gnutls-bin \
     gzip \
     heimdal-multidev \
     hostname \

diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index 1ff63e4b2722492f032909a25d144e83db6f4fc1..07f120478146c85c6596261c0d4764bc5c27854d 100644 (file)
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -20,6 +20,7 @@ packages:
   - gdb
   - git
   - glusterfs-common
+  - gnutls-bin
   - gzip
   - heimdal-multidev
   - hostname

diff --git a/bootstrap/generated-dists/fedora38/bootstrap.sh b/bootstrap/generated-dists/fedora38/bootstrap.sh
index 1e76edbb982125af710ff71d0e44df400e97412e..2b43dfc4e047efc58b631377471f30598ac00dd0 100755 (executable)
--- a/bootstrap/generated-dists/fedora38/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora38/bootstrap.sh
@@ -39,6 +39,7 @@ dnf install -y \
     glusterfs-api-devel \
     glusterfs-devel \
     gnutls-devel \
+    gnutls-utils \
     gpgme-devel \
     gzip \
     hostname \

diff --git a/bootstrap/generated-dists/fedora38/packages.yml b/bootstrap/generated-dists/fedora38/packages.yml
index 3b4d6fb3628e0153cd523c8fa16e537b58edd4e5..c5f9bc5057452b9d85e0788b3e513e3b70d0feb9 100644 (file)
--- a/bootstrap/generated-dists/fedora38/packages.yml
+++ b/bootstrap/generated-dists/fedora38/packages.yml
@@ -28,6 +28,7 @@ packages:
   - glusterfs-api-devel
   - glusterfs-devel
   - gnutls-devel
+  - gnutls-utils
   - gpgme-devel
   - gzip
   - hostname

diff --git a/bootstrap/generated-dists/opensuse154/bootstrap.sh b/bootstrap/generated-dists/opensuse154/bootstrap.sh
index 721f7a67a76923804152885eee88094ddb49f011..b82d1b615775e8ffcf1d137ebcdea42af9716c95 100755 (executable)
--- a/bootstrap/generated-dists/opensuse154/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse154/bootstrap.sh
@@ -36,6 +36,7 @@ zypper --non-interactive install \
     glib2-devel \
     glibc-locale \
     glusterfs-devel \
+    gnutls \
     gnutls-devel \
     gpgme-devel \
     gzip \

diff --git a/bootstrap/generated-dists/opensuse154/packages.yml b/bootstrap/generated-dists/opensuse154/packages.yml
index 18921cf07518442ee2f781e7d8662ba819399eb1..93de86726a482f0c877c160621ae23ad63fc8958 100644 (file)
--- a/bootstrap/generated-dists/opensuse154/packages.yml
+++ b/bootstrap/generated-dists/opensuse154/packages.yml
@@ -24,6 +24,7 @@ packages:
   - glib2-devel
   - glibc-locale
   - glusterfs-devel
+  - gnutls
   - gnutls-devel
   - gpgme-devel
   - gzip

diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
index 702f51533822c859fb55058f949379ce49ac13ce..78de9565b88430467250b39ab32d4411c7c5123b 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
@@ -31,6 +31,7 @@ apt-get -y install \
     gdb \
     git \
     glusterfs-common \
+    gnutls-bin \
     gzip \
     heimdal-multidev \
     hostname \

diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
index 78a73aec01f944bbcc19629e9107bf8892601eba..bef96d0280fce924e3c88c5808e4adef5a0d9ff1 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
@@ -20,6 +20,7 @@ packages:
   - gdb
   - git
   - glusterfs-common
+  - gnutls-bin
   - gzip
   - heimdal-multidev
   - hostname

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 702f51533822c859fb55058f949379ce49ac13ce..78de9565b88430467250b39ab32d4411c7c5123b 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -31,6 +31,7 @@ apt-get -y install \
     gdb \
     git \
     glusterfs-common \
+    gnutls-bin \
     gzip \
     heimdal-multidev \
     hostname \

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 78a73aec01f944bbcc19629e9107bf8892601eba..bef96d0280fce924e3c88c5808e4adef5a0d9ff1 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -20,6 +20,7 @@ packages:
   - gdb
   - git
   - glusterfs-common
+  - gnutls-bin
   - gzip
   - heimdal-multidev
   - hostname

diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 702f51533822c859fb55058f949379ce49ac13ce..78de9565b88430467250b39ab32d4411c7c5123b 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -31,6 +31,7 @@ apt-get -y install \
     gdb \
     git \
     glusterfs-common \
+    gnutls-bin \
     gzip \
     heimdal-multidev \
     hostname \

diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index 78a73aec01f944bbcc19629e9107bf8892601eba..bef96d0280fce924e3c88c5808e4adef5a0d9ff1 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -20,6 +20,7 @@ packages:
   - gdb
   - git
   - glusterfs-common
+  - gnutls-bin
   - gzip
   - heimdal-multidev
   - hostname

diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
index 83012cda98348ee09c01a0a36b43b71294f9d4c7..5375052a438609e010e5ba28b092f3eadcc41ed6 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
@@ -31,6 +31,7 @@ apt-get -y install \
     gdb \
     git \
     glusterfs-common \
+    gnutls-bin \
     gzip \
     heimdal-multidev \
     hostname \

diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml b/bootstrap/generated-dists/ubuntu2204/packages.yml
index 7d9f66e7f1fc0e5762b81cb8b451370e10664068..eee8d9cdfd4ba01d7a5569ea34d98f2cc748c10a 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2204/packages.yml
@@ -20,6 +20,7 @@ packages:
   - gdb
   - git
   - glusterfs-common
+  - gnutls-bin
   - gzip
   - heimdal-multidev
   - hostname

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index bbeda07611d472c432d4fd3c16a091628099b440..d5aa793801613634a94e25b06c6fc21045a52e29 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-0b8b0640b6475650c8db301236c03c9ad732f52e
+cf0a5476a4f13d449a7542d01d225dc2aef2a333