The branch, master has been updated
via c0f5af21acb lib/replace: Do not typedef int bool
via 1bde388ba85 gitlab-ci: Drop Debian 10
via 0b10962d63e gitlab-ci: Update to openSUSE 15.3
via 4993faea2d6 gitlab-ci: Drop Fedora 34
via 0e81b7965e5 gitlab-ci: Use Ubuntu 20.04 for Coverity
via c886d58b806 gitlab-ci: Remove unused variable for ubuntu1604
from 80503b46e72 s3: smbd: Don't allow setting the delete on close bit
on a directory if it contains non-visible files and "delete veto files = no".
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c0f5af21acb8018a5e53d25f1560d2a96b79a7c0
Author: Andrew Bartlett <abart...@samba.org>
Date: Tue Mar 22 16:12:00 2022 +1300
lib/replace: Do not typedef int bool
We need a genuine boolean type, as otherwise expressions like
bool foo = (4 & 4);
if (foo == true) {
exit(1);
} else {
exit(2);
}
could evaluate differently on non-modern platforms, and
that would be a real pain to debug.
_Bool and bool are in C99
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15028
Signed-off-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Wed Mar 23 12:31:47 UTC 2022 on sn-devel-184
commit 1bde388ba854e320a390126155c7aeb60ecfbb90
Author: Andreas Schneider <a...@samba.org>
Date: Fri Mar 18 16:31:54 2022 +0100
gitlab-ci: Drop Debian 10
It should be enough to build on the latest Debian version. We have older
Ubuntu versions already.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 0b10962d63ef6af042541703ff6edfcfee5a3970
Author: Andreas Schneider <a...@samba.org>
Date: Fri Mar 18 16:29:43 2022 +0100
gitlab-ci: Update to openSUSE 15.3
This drops openSUSE 15.1 and 15.2 to save some CI resources.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 4993faea2d6fd06f8806970645a155560cdda93f
Author: Andreas Schneider <a...@samba.org>
Date: Fri Mar 18 16:24:01 2022 +0100
gitlab-ci: Drop Fedora 34
It should be enough to run on the latest Fedora version. This should save us
some CI minutes. We have CentOS runners and I would prefer to add CentOS9
Stream.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit 0e81b7965e5bcb3d3cc3cdfdd7c4309276d547de
Author: Andreas Schneider <a...@samba.org>
Date: Fri Mar 18 16:22:39 2022 +0100
gitlab-ci: Use Ubuntu 20.04 for Coverity
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
commit c886d58b806673012e812dbaa557fff8f44bc02a
Author: Andreas Schneider <a...@samba.org>
Date: Fri Mar 18 16:33:00 2022 +0100
gitlab-ci: Remove unused variable for ubuntu1604
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Stefan Metzmacher <me...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 30 +-----
bootstrap/.gitlab-ci.yml | 11 +-
bootstrap/config.py | 58 +---------
bootstrap/generated-dists/Vagrantfile | 31 +-----
bootstrap/generated-dists/debian10/bootstrap.sh | 111 -------------------
bootstrap/generated-dists/debian10/packages.yml | 96 -----------------
bootstrap/generated-dists/fedora34/Dockerfile | 29 -----
bootstrap/generated-dists/fedora34/bootstrap.sh | 117 ---------------------
bootstrap/generated-dists/fedora34/locale.sh | 55 ----------
bootstrap/generated-dists/fedora34/packages.yml | 104 ------------------
bootstrap/generated-dists/opensuse151/Dockerfile | 29 -----
bootstrap/generated-dists/opensuse151/bootstrap.sh | 113 --------------------
bootstrap/generated-dists/opensuse151/locale.sh | 55 ----------
bootstrap/generated-dists/opensuse151/packages.yml | 95 -----------------
bootstrap/generated-dists/opensuse152/Dockerfile | 29 -----
bootstrap/generated-dists/opensuse152/locale.sh | 55 ----------
.../{debian10 => opensuse153}/Dockerfile | 2 +-
.../{opensuse152 => opensuse153}/bootstrap.sh | 0
.../{debian10 => opensuse153}/locale.sh | 0
.../{opensuse152 => opensuse153}/packages.yml | 0
bootstrap/sha1sum.txt | 2 +-
examples/perfcounter/perf.h | 2 +-
lib/replace/replace.h | 2 +-
lib/replace/wscript | 5 +-
24 files changed, 21 insertions(+), 1010 deletions(-)
delete mode 100755 bootstrap/generated-dists/debian10/bootstrap.sh
delete mode 100644 bootstrap/generated-dists/debian10/packages.yml
delete mode 100644 bootstrap/generated-dists/fedora34/Dockerfile
delete mode 100755 bootstrap/generated-dists/fedora34/bootstrap.sh
delete mode 100755 bootstrap/generated-dists/fedora34/locale.sh
delete mode 100644 bootstrap/generated-dists/fedora34/packages.yml
delete mode 100644 bootstrap/generated-dists/opensuse151/Dockerfile
delete mode 100755 bootstrap/generated-dists/opensuse151/bootstrap.sh
delete mode 100755 bootstrap/generated-dists/opensuse151/locale.sh
delete mode 100644 bootstrap/generated-dists/opensuse151/packages.yml
delete mode 100644 bootstrap/generated-dists/opensuse152/Dockerfile
delete mode 100755 bootstrap/generated-dists/opensuse152/locale.sh
rename bootstrap/generated-dists/{debian10 => opensuse153}/Dockerfile (93%)
rename bootstrap/generated-dists/{opensuse152 => opensuse153}/bootstrap.sh
(100%)
rename bootstrap/generated-dists/{debian10 => opensuse153}/locale.sh (100%)
rename bootstrap/generated-dists/{opensuse152 => opensuse153}/packages.yml
(100%)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 8b2b6e8c4de..fa73fbd05e5 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: 24c7cabf5c7c515ffac905cddc533a26d70abd09
+ SAMBA_CI_CONTAINER_TAG: 70150480b61ebdec7ec9b4c1214461c88d6de6d6
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -53,15 +53,10 @@ variables:
# Please see the samba-o3 sections at the end of this file!
# We should run that for each available image
#
- SAMBA_CI_CONTAINER_IMAGE_ubuntu1604: ubuntu1604
SAMBA_CI_CONTAINER_IMAGE_ubuntu1804: ubuntu1804
SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004
- SAMBA_CI_CONTAINER_IMAGE_debian9: debian9
- SAMBA_CI_CONTAINER_IMAGE_debian10: debian10
SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
- SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151
- SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152
- SAMBA_CI_CONTAINER_IMAGE_fedora34: fedora34
+ SAMBA_CI_CONTAINER_IMAGE_opensuse153: opensuse153
SAMBA_CI_CONTAINER_IMAGE_fedora35: fedora35
SAMBA_CI_CONTAINER_IMAGE_f35mit120: f35mit120
SAMBA_CI_CONTAINER_IMAGE_centos7: centos7
@@ -518,7 +513,7 @@ pages:
coverity:
extends: .shared_runner_build_image
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004}
stage: build
script:
- wget https://scan.coverity.com/download/linux64 --post-data
"token=$COVERITY_SCAN_TOKEN&project=$COVERITY_SCAN_PROJECT_NAME" -O
/tmp/coverity_tool.tgz
@@ -595,25 +590,15 @@ ubuntu2004-samba-o3:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004}
-debian10-samba-o3:
- extends: .samba-o3-template
- variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian10}
-
debian11-samba-o3:
extends: .samba-o3-template
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian11}
-opensuse151-samba-o3:
- extends: .samba-o3-template
- variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse151}
-
-opensuse152-samba-o3:
+opensuse153-samba-o3:
extends: .samba-o3-template
variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse152}
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse153}
centos7-samba-o3:
extends: .samba-o3-template
@@ -629,11 +614,6 @@ centos8s-samba-o3:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s}
-fedora34-samba-o3:
- extends: .samba-o3-template
- variables:
- SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora34}
-
fedora35-samba-o3:
extends: .samba-o3-template
variables:
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 8e221a2b8ef..0d2ec182576 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -94,15 +94,9 @@ ubuntu1804:
ubuntu2004:
extends: .build_image_template
-debian10:
- extends: .build_image_template
-
debian11:
extends: .build_image_template
-fedora34:
- extends: .build_image_template
-
fedora35:
extends: .build_image_template
@@ -120,8 +114,5 @@ centos7:
# We install a compat-gnutls34 package for GnuTLS >= 3.4.7
PKG_CONFIG_PATH:
/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig
-opensuse151:
- extends: .build_image_template
-
-opensuse152:
+opensuse153:
extends: .build_image_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index c853c4f0434..8bf3cadcc4b 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -410,14 +410,6 @@ end
DEB_DISTS = {
- 'debian10': {
- 'docker_image': 'debian:10',
- 'vagrant_box': 'debian/buster64',
- 'replace': {
- 'language-pack-en': '', # included in locales
- 'liburing-dev': '', # not available
- }
- },
'debian11': {
'docker_image': 'debian:11',
'vagrant_box': 'debian/bullseye64',
@@ -495,18 +487,6 @@ RPM_DISTS = {
'mold': '',
}
},
- 'fedora34': {
- 'docker_image': 'fedora:34',
- 'vagrant_box': 'fedora/34-cloud-base',
- 'bootstrap': DNF_BOOTSTRAP,
- 'replace': {
- 'lsb-release': 'redhat-lsb',
- 'perl-FindBin': '',
- 'python3-iso8601': 'python3-dateutil',
- 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
- 'mold': '',
- }
- },
'fedora35': {
'docker_image': 'fedora:35',
'vagrant_box': 'fedora/35-cloud-base',
@@ -529,41 +509,9 @@ RPM_DISTS = {
'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
}
},
- 'opensuse151': {
- 'docker_image': 'opensuse/leap:15.1',
- 'vagrant_box': 'opensuse/openSUSE-15.1-x86_64',
- 'bootstrap': ZYPPER_BOOTSTRAP,
- 'replace': {
- '@development-tools': '',
- 'dbus-devel': 'dbus-1-devel',
- 'docbook-style-xsl': 'docbook-xsl-stylesheets',
- 'glibc-common': 'glibc-locale',
- 'glibc-locale-source': 'glibc-i18ndata',
- 'glibc-langpack-en': '',
- 'jansson-devel': 'libjansson-devel',
- 'keyutils-libs-devel': 'keyutils-devel',
- 'krb5-workstation': 'krb5-client',
- 'python3-libsemanage': 'python2-semanage',
- 'openldap-devel': 'openldap2-devel',
- 'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
- 'perl-JSON-Parse': 'perl-JSON-XS',
- 'perl-generators': '',
- 'perl-interpreter': '',
- 'perl-FindBin': '',
- 'procps-ng': 'procps',
- 'python3-dns': 'python3-dnspython',
- 'python3-markdown': 'python3-Markdown',
- 'quota-devel': '',
- 'glusterfs-api-devel': '',
- 'libtasn1-tools': '', # asn1Parser is part of libtasn1
- 'mingw64-gcc': '', # doesn't exist
- 'liburing-devel': '', # not available
- 'mold': '',
- }
- },
- 'opensuse152': {
- 'docker_image': 'opensuse/leap:15.2',
- 'vagrant_box': 'opensuse/openSUSE-15.2-x86_64',
+ 'opensuse153': {
+ 'docker_image': 'opensuse/leap:15.3',
+ 'vagrant_box': 'opensuse/openSUSE-15.3-x86_64',
'bootstrap': ZYPPER_BOOTSTRAP,
'replace': {
'@development-tools': '',
diff --git a/bootstrap/generated-dists/Vagrantfile
b/bootstrap/generated-dists/Vagrantfile
index 518535f3a61..88afbaafb01 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -24,13 +24,6 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "centos8s/locale.sh"
end
- config.vm.define "debian10" do |v|
- v.vm.box = "debian/buster64"
- v.vm.hostname = "debian10"
- v.vm.provision :shell, path: "debian10/bootstrap.sh"
- v.vm.provision :shell, path: "debian10/locale.sh"
- end
-
config.vm.define "debian11" do |v|
v.vm.box = "debian/bullseye64"
v.vm.hostname = "debian11"
@@ -45,13 +38,6 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "f35mit120/locale.sh"
end
- config.vm.define "fedora34" do |v|
- v.vm.box = "fedora/34-cloud-base"
- v.vm.hostname = "fedora34"
- v.vm.provision :shell, path: "fedora34/bootstrap.sh"
- v.vm.provision :shell, path: "fedora34/locale.sh"
- end
-
config.vm.define "fedora35" do |v|
v.vm.box = "fedora/35-cloud-base"
v.vm.hostname = "fedora35"
@@ -59,18 +45,11 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "fedora35/locale.sh"
end
- config.vm.define "opensuse151" do |v|
- v.vm.box = "opensuse/openSUSE-15.1-x86_64"
- v.vm.hostname = "opensuse151"
- v.vm.provision :shell, path: "opensuse151/bootstrap.sh"
- v.vm.provision :shell, path: "opensuse151/locale.sh"
- end
-
- config.vm.define "opensuse152" do |v|
- v.vm.box = "opensuse/openSUSE-15.2-x86_64"
- v.vm.hostname = "opensuse152"
- v.vm.provision :shell, path: "opensuse152/bootstrap.sh"
- v.vm.provision :shell, path: "opensuse152/locale.sh"
+ config.vm.define "opensuse153" do |v|
+ v.vm.box = "opensuse/openSUSE-15.3-x86_64"
+ v.vm.hostname = "opensuse153"
+ v.vm.provision :shell, path: "opensuse153/bootstrap.sh"
+ v.vm.provision :shell, path: "opensuse153/locale.sh"
end
config.vm.define "ubuntu1804" do |v|
diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh
b/bootstrap/generated-dists/debian10/bootstrap.sh
deleted file mode 100755
index 84f5f6855b7..00000000000
--- a/bootstrap/generated-dists/debian10/bootstrap.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-set -xueo pipefail
-
-export DEBIAN_FRONTEND=noninteractive
-apt-get -y update
-
-apt-get -y install \
- acl \
- apt-utils \
- attr \
- autoconf \
- bind9utils \
- binutils \
- bison \
- build-essential \
- ccache \
- chrpath \
- curl \
- debhelper \
- dnsutils \
- docbook-xml \
- docbook-xsl \
- flex \
- gcc \
- gdb \
- git \
- glusterfs-common \
- gzip \
- heimdal-multidev \
- hostname \
- htop \
- krb5-config \
- krb5-kdc \
- krb5-user \
- lcov \
- libacl1-dev \
- libarchive-dev \
- libattr1-dev \
- libavahi-common-dev \
- libblkid-dev \
- libbsd-dev \
- libcap-dev \
- libcephfs-dev \
- libcups2-dev \
- libdbus-1-dev \
- libglib2.0-dev \
- libgnutls28-dev \
- libgpgme11-dev \
- libicu-dev \
- libjansson-dev \
- libjs-jquery \
- libjson-perl \
- libkrb5-dev \
- libldap2-dev \
- liblmdb-dev \
- libncurses5-dev \
- libpam0g-dev \
- libparse-yapp-perl \
- libpcap-dev \
- libpopt-dev \
- libreadline-dev \
- libsystemd-dev \
- libtasn1-bin \
- libtasn1-dev \
- libtracker-sparql-2.0-dev \
- libunwind-dev \
- lmdb-utils \
- locales \
- lsb-release \
- make \
- mawk \
- mingw-w64 \
- patch \
- perl \
- perl-modules \
- pkg-config \
- procps \
- psmisc \
- python3 \
- python3-cryptography \
- python3-dbg \
- python3-dev \
- python3-dnspython \
- python3-gpg \
- python3-iso8601 \
- python3-markdown \
- python3-matplotlib \
- python3-pexpect \
- python3-pyasn1 \
- python3-setproctitle \
- rng-tools \
- rsync \
- sed \
- sudo \
- tar \
- tree \
- uuid-dev \
- wget \
- xfslibs-dev \
- xsltproc \
- zlib1g-dev
-
-apt-get -y autoremove
-apt-get -y autoclean
-apt-get -y clean
\ No newline at end of file
diff --git a/bootstrap/generated-dists/debian10/packages.yml
b/bootstrap/generated-dists/debian10/packages.yml
deleted file mode 100644
index 32f37eeb013..00000000000
--- a/bootstrap/generated-dists/debian10/packages.yml
+++ /dev/null
@@ -1,96 +0,0 @@
----
-packages:
- - acl
- - apt-utils
- - attr
- - autoconf
- - bind9utils
- - binutils
- - bison
- - build-essential
- - ccache
- - chrpath
- - curl
- - debhelper
- - dnsutils
- - docbook-xml
- - docbook-xsl
- - flex
- - gcc
- - gdb
- - git
- - glusterfs-common
- - gzip
- - heimdal-multidev
- - hostname
- - htop
- - krb5-config
- - krb5-kdc
- - krb5-user
- - lcov
- - libacl1-dev
- - libarchive-dev
- - libattr1-dev
- - libavahi-common-dev
- - libblkid-dev
- - libbsd-dev
- - libcap-dev
- - libcephfs-dev
- - libcups2-dev
- - libdbus-1-dev
- - libglib2.0-dev
- - libgnutls28-dev
- - libgpgme11-dev
- - libicu-dev
- - libjansson-dev
- - libjs-jquery
- - libjson-perl
- - libkrb5-dev
- - libldap2-dev
- - liblmdb-dev
- - libncurses5-dev
- - libpam0g-dev
- - libparse-yapp-perl
- - libpcap-dev
- - libpopt-dev
- - libreadline-dev
- - libsystemd-dev
- - libtasn1-bin
- - libtasn1-dev
- - libtracker-sparql-2.0-dev
- - libunwind-dev
- - lmdb-utils
- - locales
- - lsb-release
- - make
- - mawk
- - mingw-w64
- - patch
- - perl
- - perl-modules
- - pkg-config
- - procps
- - psmisc
- - python3
- - python3-cryptography
- - python3-dbg
- - python3-dev
- - python3-dnspython
- - python3-gpg
- - python3-iso8601
- - python3-markdown
- - python3-matplotlib
- - python3-pexpect
- - python3-pyasn1
- - python3-setproctitle
- - rng-tools
- - rsync
- - sed
- - sudo
- - tar
- - tree
- - uuid-dev
- - wget
- - xfslibs-dev
- - xsltproc
- - zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/fedora34/Dockerfile
b/bootstrap/generated-dists/fedora34/Dockerfile
deleted file mode 100644
index 6e28a7440bd..00000000000
--- a/bootstrap/generated-dists/fedora34/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM fedora:34
-
-# pass in with --build-arg while build
-ARG SHA1SUM
-RUN [ -n $SHA1SUM ] && echo $SHA1SUM > /sha1sum.txt
-
-ADD *.sh /tmp/
-# need root permission, do it before USER samba
-RUN /tmp/bootstrap.sh && /tmp/locale.sh
-
-# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln
-sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
-# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
-RUN set -x; LD=$(which ld); LD_MOLD=$(which ld.mold); test -x $LD_MOLD && ln
-sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"
-
-# make test can not work with root, so we have to create a new user
-RUN useradd -m -U -s /bin/bash samba && \
- mkdir -p /etc/sudoers.d && \
- echo "samba ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/samba
-
--
Samba Shared Repository
