From: Andreas Schneider Date: Tue, 20 Jul 2021 13:55:53 +0000 (+0200) Subject: bootstrap: Install krb5-workstation on Fedora based distros X-Git-Tag: ldb-2.5.0~1061 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0fa3e359f16b26122d49ad79372e3923f5ded77;p=thirdparty%2Fsamba.git bootstrap: Install krb5-workstation on Fedora based distros Signed-off-by: Andreas Schneider Reviewed-by: Alexander Bokovoy --- diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 1aee591b068..84cb9f0ba4e 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: fa3eeb92fb5447524a057a4c377e6960dff626ce + SAMBA_CI_CONTAINER_TAG: 11d550c08430787a5b0eb8dc847977ffffe12bbe # # 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 b5d04d4e371..b02ce4cf566 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -116,7 +116,7 @@ PKGS = [ ('bind9utils', 'bind-utils'), ('dnsutils', ''), ('xsltproc', 'libxslt'), - ('krb5-user', ''), + ('krb5-user', 'krb5-workstation'), ('krb5-config', ''), ('krb5-kdc', 'krb5-server'), ('apt-utils', 'yum-utils'), diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh index 00dd22b891f..36913f40b44 100755 --- a/bootstrap/generated-dists/centos7/bootstrap.sh +++ b/bootstrap/generated-dists/centos7/bootstrap.sh @@ -45,6 +45,7 @@ yum install -y \ keyutils-libs-devel \ krb5-devel \ krb5-server \ + krb5-workstation \ lcov \ libacl-devel \ libarchive-devel \ diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml index 3f5e8331b40..4da3d61441f 100644 --- a/bootstrap/generated-dists/centos7/packages.yml +++ b/bootstrap/generated-dists/centos7/packages.yml @@ -31,6 +31,7 @@ packages: - keyutils-libs-devel - krb5-devel - krb5-server + - krb5-workstation - lcov - libacl-devel - libarchive-devel diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh index a3079982dda..60cf3937cf7 100755 --- a/bootstrap/generated-dists/centos8/bootstrap.sh +++ b/bootstrap/generated-dists/centos8/bootstrap.sh @@ -54,6 +54,7 @@ yum install -y \ keyutils-libs-devel \ krb5-devel \ krb5-server \ + krb5-workstation \ libacl-devel \ libarchive-devel \ libattr-devel \ diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml index 2994e81640a..f5d0ac5ffe6 100644 --- a/bootstrap/generated-dists/centos8/packages.yml +++ b/bootstrap/generated-dists/centos8/packages.yml @@ -34,6 +34,7 @@ packages: - keyutils-libs-devel - krb5-devel - krb5-server + - krb5-workstation - libacl-devel - libarchive-devel - libattr-devel diff --git a/bootstrap/generated-dists/fedora33/bootstrap.sh b/bootstrap/generated-dists/fedora33/bootstrap.sh index 106bd09ede8..22b968e9ae2 100755 --- a/bootstrap/generated-dists/fedora33/bootstrap.sh +++ b/bootstrap/generated-dists/fedora33/bootstrap.sh @@ -45,6 +45,7 @@ dnf install -y \ keyutils-libs-devel \ krb5-devel \ krb5-server \ + krb5-workstation \ lcov \ libacl-devel \ libarchive-devel \ diff --git a/bootstrap/generated-dists/fedora33/packages.yml b/bootstrap/generated-dists/fedora33/packages.yml index 9fa48ad4502..7c61da3c53a 100644 --- a/bootstrap/generated-dists/fedora33/packages.yml +++ b/bootstrap/generated-dists/fedora33/packages.yml @@ -34,6 +34,7 @@ packages: - keyutils-libs-devel - krb5-devel - krb5-server + - krb5-workstation - lcov - libacl-devel - libarchive-devel diff --git a/bootstrap/generated-dists/fedora34/bootstrap.sh b/bootstrap/generated-dists/fedora34/bootstrap.sh index 6686ab19250..d5fea5c008a 100755 --- a/bootstrap/generated-dists/fedora34/bootstrap.sh +++ b/bootstrap/generated-dists/fedora34/bootstrap.sh @@ -45,6 +45,7 @@ dnf install -y \ keyutils-libs-devel \ krb5-devel \ krb5-server \ + krb5-workstation \ lcov \ libacl-devel \ libarchive-devel \ diff --git a/bootstrap/generated-dists/fedora34/packages.yml b/bootstrap/generated-dists/fedora34/packages.yml index 1e488823dda..db12fdb5486 100644 --- a/bootstrap/generated-dists/fedora34/packages.yml +++ b/bootstrap/generated-dists/fedora34/packages.yml @@ -34,6 +34,7 @@ packages: - keyutils-libs-devel - krb5-devel - krb5-server + - krb5-workstation - lcov - libacl-devel - libarchive-devel diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh index 2271e2ea8b2..e4771284f4d 100755 --- a/bootstrap/generated-dists/opensuse151/bootstrap.sh +++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh @@ -40,6 +40,7 @@ zypper --non-interactive install \ hostname \ htop \ keyutils-devel \ + krb5-client \ krb5-devel \ krb5-server \ lcov \ diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml index 5710c60bd8b..d465252e26b 100644 --- a/bootstrap/generated-dists/opensuse151/packages.yml +++ b/bootstrap/generated-dists/opensuse151/packages.yml @@ -28,6 +28,7 @@ packages: - hostname - htop - keyutils-devel + - krb5-client - krb5-devel - krb5-server - lcov diff --git a/bootstrap/generated-dists/opensuse152/bootstrap.sh b/bootstrap/generated-dists/opensuse152/bootstrap.sh index ae766095a4d..bdfb121b345 100755 --- a/bootstrap/generated-dists/opensuse152/bootstrap.sh +++ b/bootstrap/generated-dists/opensuse152/bootstrap.sh @@ -40,6 +40,7 @@ zypper --non-interactive install \ hostname \ htop \ keyutils-devel \ + krb5-client \ krb5-devel \ krb5-server \ lcov \ diff --git a/bootstrap/generated-dists/opensuse152/packages.yml b/bootstrap/generated-dists/opensuse152/packages.yml index 6bc1a137ca7..75a37074791 100644 --- a/bootstrap/generated-dists/opensuse152/packages.yml +++ b/bootstrap/generated-dists/opensuse152/packages.yml @@ -28,6 +28,7 @@ packages: - hostname - htop - keyutils-devel + - krb5-client - krb5-devel - krb5-server - lcov diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index e198e6b80ae..0e70f1937b9 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -fa3eeb92fb5447524a057a4c377e6960dff626ce +11d550c08430787a5b0eb8dc847977ffffe12bbe