From: Andrew Bartlett Date: Wed, 1 Sep 2021 08:45:03 +0000 (+1200) Subject: bootstrap: Update to get newer krb5 on Fedora 34 X-Git-Tag: ldb-2.5.0~810 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9c8ac4adbca2f8cb45470ccb45a45039188a285;p=thirdparty%2Fsamba.git bootstrap: Update to get newer krb5 on Fedora 34 We need the update FEDORA-2021-20b495cb94 (krb5) to get a fix for CVE-2021-37750 (explicit NULL deref on KDC) so our CI will pass as we have a test for this. Signed-off-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index ce80561ba0f..4b2f17938c8 100644 --- 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: b5333a93306e20ba549f5fac3c6c74e0b103c1d6 + SAMBA_CI_CONTAINER_TAG: 733f8fa83c921e5a7ec8f5470b2ca7d52548f4b0 # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. diff --git a/bootstrap/config.py b/bootstrap/config.py index 821ce3d5cc2..ba4304bb9f8 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -20,6 +20,9 @@ Manage dependencies and bootstrap environments for Samba. Config file for packages and templates. +Update the lists in this file to require new packages in the +container images used in GitLab CI + Author: Joe Guo """ import os diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index e7de92cc504..e433f698b68 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -b5333a93306e20ba549f5fac3c6c74e0b103c1d6 +733f8fa83c921e5a7ec8f5470b2ca7d52548f4b0