From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 May 2022 01:29:05 +0000 (+1200)
Subject: bootstrap: chown the whole cloned repo, not just the subfolders
X-Git-Tag: talloc-2.3.4~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c771d197eeebf2b01d46451cc51b698a99502935;p=thirdparty%2Fsamba.git

bootstrap: chown the whole cloned repo, not just the subfolders

Modern git versions have started to notice the possible security issue.

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

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 1a01435a925..bd73e82b906 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: 70150480b61ebdec7ec9b4c1214461c88d6de6d6
+  SAMBA_CI_CONTAINER_TAG: 24f32ce7e4d6be357394ec3cf7b9e15b48a20cf1
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 0d2ec182576..57979463aa1 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -47,7 +47,7 @@ services:
     diff -u bootstrap/sha1sum.txt /tmp/sha1sum-template.txt
     # run smoke test with samba-o3 or samba-fuzz
     docker run --volume $(pwd):${samba_repo_root} --workdir ${samba_repo_root} ${ci_image_name} \
-        /bin/bash -c "sudo chown -R samba:samba ./** && export PKG_CONFIG_PATH=/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig && script/autobuild.py ${SAMBA_CI_TEST_JOB} --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
+        /bin/bash -c "sudo chown -R samba:samba ${samba_repo_root} && export PKG_CONFIG_PATH=/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig && script/autobuild.py ${SAMBA_CI_TEST_JOB} --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
     docker tag ${ci_image_name} ${ci_image_path}:${SAMBA_CI_CONTAINER_TAG}
     docker tag ${ci_image_name} ${ci_image_path}:${timestamp_tag}
     # We build all images, but only upload is it's not marked as broken
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index e6b93ec32be..b2f8ce45aee 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-70150480b61ebdec7ec9b4c1214461c88d6de6d6
+24f32ce7e4d6be357394ec3cf7b9e15b48a20cf1