The branch, master has been updated
via 10a4a977baf gitlab-ci: run samba-codecheck on ubuntu22.04
via 9a3c558aa44 bootstrap: install codespell, shfmt and shellcheck also
on debian/ubuntu
via d60af10e6af .codespellignore: adjust in order to pass on ubuntu
22.04
via 94462dfabf0 s4:torture/smb2: fix typo in acls.c
from 6071220fcb1 libcli: Make debug_unix_user_token() use just one DEBUG
statement
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 10a4a977bafaf2ca9578d0aeae9760bf5b65b5ff
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Oct 11 10:15:42 2023 +0000
gitlab-ci: run samba-codecheck on ubuntu22.04
There's no reason to run it on fedora38
and it makes sure autobuild and gitlab-ci use the same.
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
Autobuild-User(master): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(master): Wed Oct 11 12:52:57 UTC 2023 on atb-devel-224
commit 9a3c558aa442aef10d8edcfe811cc23afb9b2b4c
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Oct 11 10:15:42 2023 +0000
bootstrap: install codespell, shfmt and shellcheck also on debian/ubuntu
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
commit d60af10e6af97d0a4a69b3282dbfeeb001e669c9
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Oct 11 09:47:09 2023 +0000
.codespellignore: adjust in order to pass on ubuntu 22.04
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
commit 94462dfabf0c14586c00a8161f125b2bd4d18ee1
Author: Ralph Boehme <s...@samba.org>
Date: Wed Oct 11 11:17:07 2023 +0200
s4:torture/smb2: fix typo in acls.c
This fixes the failing samba-codecheck CI job and is not part of the
functional
security fix.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15439
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
.codespellignore | 6 ++++++
.gitlab-ci-main.yml | 4 +---
bootstrap/config.py | 11 ++++++++---
bootstrap/generated-dists/debian11-32bit/bootstrap.sh | 2 ++
bootstrap/generated-dists/debian11-32bit/packages.yml | 2 ++
bootstrap/generated-dists/debian11/bootstrap.sh | 2 ++
bootstrap/generated-dists/debian11/packages.yml | 2 ++
bootstrap/generated-dists/debian12-32bit/bootstrap.sh | 3 +++
bootstrap/generated-dists/debian12-32bit/packages.yml | 3 +++
bootstrap/generated-dists/debian12/bootstrap.sh | 3 +++
bootstrap/generated-dists/debian12/packages.yml | 3 +++
bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh | 2 ++
bootstrap/generated-dists/ubuntu1804-32bit/packages.yml | 2 ++
bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 2 ++
bootstrap/generated-dists/ubuntu1804/packages.yml | 2 ++
bootstrap/generated-dists/ubuntu2004/bootstrap.sh | 2 ++
bootstrap/generated-dists/ubuntu2004/packages.yml | 2 ++
bootstrap/generated-dists/ubuntu2204/bootstrap.sh | 3 +++
bootstrap/generated-dists/ubuntu2204/packages.yml | 3 +++
bootstrap/sha1sum.txt | 2 +-
source4/torture/smb2/acls.c | 2 +-
21 files changed, 55 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.codespellignore b/.codespellignore
index ee56c0af3ec..c2f4c37feab 100644
--- a/.codespellignore
+++ b/.codespellignore
@@ -1,11 +1,15 @@
aas
afile
ags
+alloced
ans
+ba
blong
browseable
+bre
bu
clen
+creat
daa
ect
fo
@@ -16,6 +20,7 @@ inout
ist
keypair
mis
+msdos
nd
ois
ommit
@@ -43,6 +48,7 @@ ue
unsecure
unx
uptodateness
+wan
ypes
som
vas
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 9c1ddc69fd5..6614ef74e64 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: 21a93787675107f010836bbfa5e8542c272bc4b0
+ SAMBA_CI_CONTAINER_TAG: 07a822597b5bce4af9e8e2987856b27eb20bd1b7
#
# We use the ubuntu2204 image as default as
# it matches what we have on atb-devel-224
@@ -391,8 +391,6 @@ samba-fips:
samba-codecheck:
extends: .shared_template
needs:
- variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38}
stage: build_first
.private_test_only:
diff --git a/bootstrap/config.py b/bootstrap/config.py
index d531dfc0e63..cfee5e049ce 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -42,6 +42,7 @@ COMMON = [
'ccache',
'curl',
'chrpath',
+ 'codespell',
'flex',
'gcc',
'gdb',
@@ -58,6 +59,7 @@ COMMON = [
'rng-tools',
'rsync',
'sed',
+ 'shfmt',
'sudo', # docker images has no sudo by default
'tar',
'tree',
@@ -134,10 +136,8 @@ PKGS = [
('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
('mawk', 'gawk'),
('', 'mold'),
- ('', 'ShellCheck'),
- ('', 'shfmt'),
+ ('shellcheck', 'ShellCheck'),
('', 'crypto-policies-scripts'),
- ('', 'codespell'),
('python3', 'python3'),
('python3-cryptography', 'python3-cryptography'), # for krb5 tests
@@ -420,6 +420,7 @@ DEB_DISTS = {
'vagrant_box': 'debian/bullseye64',
'replace': {
'language-pack-en': '', # included in locales
+ 'shfmt': '',
}
},
'debian11-32bit': {
@@ -427,6 +428,7 @@ DEB_DISTS = {
'vagrant_box': 'debian/bullseye32',
'replace': {
'language-pack-en': '', # included in locales
+ 'shfmt': '',
}
},
'debian12': {
@@ -450,6 +452,7 @@ DEB_DISTS = {
'vagrant_box': 'ubuntu/bionic64',
'replace': {
'liburing-dev': '', # not available
+ 'shfmt': '',
}
},
'ubuntu1804-32bit': {
@@ -457,6 +460,7 @@ DEB_DISTS = {
'vagrant_box': 'ubuntu/bionic32',
'replace': {
'liburing-dev': '', # not available
+ 'shfmt': '',
}
},
'ubuntu2004': {
@@ -464,6 +468,7 @@ DEB_DISTS = {
'vagrant_box': 'ubuntu/focal64',
'replace': {
'liburing-dev': '', # not available
+ 'shfmt': '',
}
},
'ubuntu2204': {
diff --git a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
index 6d9fd592fd9..82d2705c092 100755
--- a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
build-essential \
ccache \
chrpath \
+ codespell \
curl \
debhelper \
dnsutils \
@@ -100,6 +101,7 @@ apt-get -y install \
rng-tools \
rsync \
sed \
+ shellcheck \
sudo \
tar \
tree \
diff --git a/bootstrap/generated-dists/debian11-32bit/packages.yml
b/bootstrap/generated-dists/debian11-32bit/packages.yml
index 97e92fea247..dab6a93e10c 100644
--- a/bootstrap/generated-dists/debian11-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian11-32bit/packages.yml
@@ -10,6 +10,7 @@ packages:
- build-essential
- ccache
- chrpath
+ - codespell
- curl
- debhelper
- dnsutils
@@ -89,6 +90,7 @@ packages:
- rng-tools
- rsync
- sed
+ - shellcheck
- sudo
- tar
- tree
diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh
b/bootstrap/generated-dists/debian11/bootstrap.sh
index 6d9fd592fd9..82d2705c092 100755
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
build-essential \
ccache \
chrpath \
+ codespell \
curl \
debhelper \
dnsutils \
@@ -100,6 +101,7 @@ apt-get -y install \
rng-tools \
rsync \
sed \
+ shellcheck \
sudo \
tar \
tree \
diff --git a/bootstrap/generated-dists/debian11/packages.yml
b/bootstrap/generated-dists/debian11/packages.yml
index 97e92fea247..dab6a93e10c 100644
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -10,6 +10,7 @@ packages:
- build-essential
- ccache
- chrpath
+ - codespell
- curl
- debhelper
- dnsutils
@@ -89,6 +90,7 @@ packages:
- rng-tools
- rsync
- sed
+ - shellcheck
- sudo
- tar
- tree
diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
index d6f53c29f8e..033061ad7e6 100755
--- a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
build-essential \
ccache \
chrpath \
+ codespell \
curl \
debhelper \
dnsutils \
@@ -99,6 +100,8 @@ apt-get -y install \
rng-tools \
rsync \
sed \
+ shellcheck \
+ shfmt \
sudo \
tar \
tree \
diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml
b/bootstrap/generated-dists/debian12-32bit/packages.yml
index a9547d57380..bd9a558ffbb 100644
--- a/bootstrap/generated-dists/debian12-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian12-32bit/packages.yml
@@ -10,6 +10,7 @@ packages:
- build-essential
- ccache
- chrpath
+ - codespell
- curl
- debhelper
- dnsutils
@@ -88,6 +89,8 @@ packages:
- rng-tools
- rsync
- sed
+ - shellcheck
+ - shfmt
- sudo
- tar
- tree
diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh
b/bootstrap/generated-dists/debian12/bootstrap.sh
index d6f53c29f8e..033061ad7e6 100755
--- a/bootstrap/generated-dists/debian12/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
build-essential \
ccache \
chrpath \
+ codespell \
curl \
debhelper \
dnsutils \
@@ -99,6 +100,8 @@ apt-get -y install \
rng-tools \
rsync \
sed \
+ shellcheck \
+ shfmt \
sudo \
tar \
tree \
diff --git a/bootstrap/generated-dists/debian12/packages.yml
b/bootstrap/generated-dists/debian12/packages.yml
index a9547d57380..bd9a558ffbb 100644
--- a/bootstrap/generated-dists/debian12/packages.yml
+++ b/bootstrap/generated-dists/debian12/packages.yml
@@ -10,6 +10,7 @@ packages:
- build-essential
- ccache
- chrpath
+ - codespell
- curl
- debhelper
- dnsutils
@@ -88,6 +89,8 @@ packages:
- rng-tools
- rsync
- sed
+ - shellcheck
+ - shfmt
- sudo
- tar
- tree
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
index 10276208d68..da249a8724c 100755
--- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
build-essential \
ccache \
chrpath \
+ codespell \
curl \
debhelper \
dnsutils \
@@ -100,6 +101,7 @@ apt-get -y install \
rng-tools \
rsync \
sed \
+ shellcheck \
sudo \
tar \
tree \
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
index 2544f9cf8f5..94957fc07b2 100644
--- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
@@ -10,6 +10,7 @@ packages:
- build-essential
- ccache
- chrpath
+ - codespell
- curl
- debhelper
- dnsutils
@@ -89,6 +90,7 @@ packages:
- rng-tools
- rsync
- sed
+ - shellcheck
- sudo
- tar
- tree
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 10276208d68..da249a8724c 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
build-essential \
ccache \
chrpath \
+ codespell \
curl \
debhelper \
dnsutils \
@@ -100,6 +101,7 @@ apt-get -y install \
rng-tools \
rsync \
sed \
+ shellcheck \
sudo \
tar \
tree \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml
b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 2544f9cf8f5..94957fc07b2 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -10,6 +10,7 @@ packages:
- build-essential
- ccache
- chrpath
+ - codespell
- curl
- debhelper
- dnsutils
@@ -89,6 +90,7 @@ packages:
- rng-tools
- rsync
- sed
+ - shellcheck
- sudo
- tar
- tree
diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 10276208d68..da249a8724c 100755
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
build-essential \
ccache \
chrpath \
+ codespell \
curl \
debhelper \
dnsutils \
@@ -100,6 +101,7 @@ apt-get -y install \
rng-tools \
rsync \
sed \
+ shellcheck \
sudo \
tar \
tree \
diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml
b/bootstrap/generated-dists/ubuntu2004/packages.yml
index 2544f9cf8f5..94957fc07b2 100644
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -10,6 +10,7 @@ packages:
- build-essential
- ccache
- chrpath
+ - codespell
- curl
- debhelper
- dnsutils
@@ -89,6 +90,7 @@ packages:
- rng-tools
- rsync
- sed
+ - shellcheck
- sudo
- tar
- tree
diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
index d8a7a72178f..1a3c3b14efb 100755
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
build-essential \
ccache \
chrpath \
+ codespell \
curl \
debhelper \
dnsutils \
@@ -100,6 +101,8 @@ apt-get -y install \
rng-tools \
rsync \
sed \
+ shellcheck \
+ shfmt \
sudo \
tar \
tree \
diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml
b/bootstrap/generated-dists/ubuntu2204/packages.yml
index a22a4100fc6..c3b741fbc69 100644
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2204/packages.yml
@@ -10,6 +10,7 @@ packages:
- build-essential
- ccache
- chrpath
+ - codespell
- curl
- debhelper
- dnsutils
@@ -89,6 +90,8 @@ packages:
- rng-tools
- rsync
- sed
+ - shellcheck
+ - shfmt
- sudo
- tar
- tree
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 786d4e7ebb5..9d2acc49de9 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-21a93787675107f010836bbfa5e8542c272bc4b0
+07a822597b5bce4af9e8e2987856b27eb20bd1b7
diff --git a/source4/torture/smb2/acls.c b/source4/torture/smb2/acls.c
index 53f482c5541..019886ebcd2 100644
--- a/source4/torture/smb2/acls.c
+++ b/source4/torture/smb2/acls.c
@@ -3076,7 +3076,7 @@ static bool test_overwrite_read_only_file(struct
torture_context *tctx,
ZERO_STRUCT(handle);
for (i = 0; i < ARRAY_SIZE(tcases); i++) {
- torture_comment(tctx, "Verify open with %s dispostion\n",
+ torture_comment(tctx, "Verify open with %s disposition\n",
tcases[i].disposition_string);
c = (struct smb2_create) {
--
Samba Shared Repository
