bootstrap: Fix the spelling of README.md (again) and get a new GnuTLS

We re-run ./bootstrap/template.py --render to get a new GnuTLS on Fedora 32

This was missed with 7dc535995bbdb42b1b053c22acff5978cb5da516
and so caused e0e51632cf77be439ebcbcba025a42e8558fa824 to
break the sha1sum and so require 7077be01a3cc860ce1fcfafd9e5028829f0c1887
to fix it.

The sha1sum changes because we fixed the bug about the spelling of
README.md, which is helpful because otherwise we would not get a
new image.

This provides a GnuTLS 3.6.15 so that we still test using GnuTLS's
gnutls_aead_cipher_encryptv2() for the SMB encryption codepath.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14399

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 569120f6f4482669d1e09b38e903e3f8f7bb2810..c9bc00c4ddf977a539953b6e393b74110dba6a10 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 0ff8e6d23f6f418ee5af48921754f4073300c1a5
+  SAMBA_CI_CONTAINER_TAG: 86279163d150fb95742f4b34fce0dfc1a639f5de
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index fb3adc00797c295a26f4e911fb7b31d20e6cade0..7d4891b02e7ebda307ea0a394aed244b145e8ca3 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-0ff8e6d23f6f418ee5af48921754f4073300c1a5
+86279163d150fb95742f4b34fce0dfc1a639f5de

diff --git a/bootstrap/template.py b/bootstrap/template.py
index e12e2e0dc828dacb6cb0927aa4759963ba975abb..0acfaa21e08d7ba724fa1f582bd7c61b65ea0941 100755 (executable)
--- a/bootstrap/template.py
+++ b/bootstrap/template.py
@@ -32,7 +32,7 @@ from config import DISTS, VAGRANTFILE, OUT
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 SHA1SUM_FILE_PATH = os.path.join(HERE, 'sha1sum.txt')
-README_FILE_PATH = os.path.join(HERE, 'READMD.md')
+README_FILE_PATH = os.path.join(HERE, 'README.md')
 
 logging.basicConfig(level='INFO')
 log = logging.getLogger(__file__)