bootstrap: use compat-gnutls37-devel for centos7

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index c532069af522ed2e31e1a208dff172a2b7d02ac1..dc46d4beaeb4eda021f0b67504a0dde2b2c22e99 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 791e89a43f2b287635e128c8f5aed924b757c4bd
+  SAMBA_CI_CONTAINER_TAG: 44771060ac5c91a1feb9a85a7b722893b6f8d843
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
@@ -592,7 +592,7 @@ centos7-samba-o3:
     # Git on CentOS doesn't support shallow git cloning
     GIT_DEPTH: ""
     # We need a newer GnuTLS version on CentOS7
-    PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig"
+    PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls37/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig"
 
 centos8-samba-o3:
   extends: .samba-o3-template

diff --git a/bootstrap/config.py b/bootstrap/config.py
index d9943dd515a30c59c1534ab19129bd0a50221d41..621912a7d94d5123a81f2b986dc5838feb0426da 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -454,7 +454,7 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'glusterfs-devel': '',
             'libcephfs-devel': '',
-            'gnutls-devel': 'compat-gnutls34-devel',
+            'gnutls-devel': 'compat-gnutls37-devel',
             'liburing-devel': '',   # not available
             'python3-setproctitle': 'python36-setproctitle',
             'tracker-devel': '', # do not install

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index c31137e75c2042c29fe725be572ba68b32c47ac1..43572bb532a27df2f8e51132a3e1a7faf5ae1e9b 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -24,7 +24,7 @@ yum install -y \
     bison \
     ccache \
     chrpath \
-    compat-gnutls34-devel \
+    compat-gnutls37-devel \
     cups-devel \
     curl \
     dbus-devel \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index eebeb2feaa3a0281ee62e65e1c905f2ee8589564..3998c875057144d6426114decc7efecc9003d8d6 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -10,7 +10,7 @@ packages:
   - bison
   - ccache
   - chrpath
-  - compat-gnutls34-devel
+  - compat-gnutls37-devel
   - cups-devel
   - curl
   - dbus-devel

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index a4a0de426b1f8dfa3430aa55db56d4e52cffdb3d..22c597c236182b80380a24489f3190579eed7180 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-791e89a43f2b287635e128c8f5aed924b757c4bd
+44771060ac5c91a1feb9a85a7b722893b6f8d843