diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2021-09-01 20:45:03 +1200 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2021-09-08 12:32:11 +0000 |
| commit | 04cbe284f4e02bd3908b42781c997888e193d253 (patch) | |
| tree | fb8239105e1b56f3da494ea91be378344f0aa075 | |
| parent | 2c7d7307ae37b038bf191aeef0c0096f9e58e0bb (diff) | |
| download | samba-04cbe284f4e02bd3908b42781c997888e193d253.tar.gz | |
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 <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14817
(cherry picked from commit e9c8ac4adbca2f8cb45470ccb45a45039188a285)
| -rw-r--r-- | .gitlab-ci-main.yml | 2 | ||||
| -rw-r--r-- | bootstrap/config.py | 3 | ||||
| -rw-r--r-- | bootstrap/sha1sum.txt | 2 |
3 files changed, 5 insertions, 2 deletions
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 <joeg@catalyst.net.nz> """ 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 |