The branch, master has been updated via 9242f1e0ddb gitlab-ci: Update image to Fedora 40 via 276db59eff2 gitlab-ci: Add CentOS 9 Stream via 11d1c4704a8 gitlab-ci: Remove CentOS7 which is EOL via efa2d0bf82a selftest: Set NSS_WRAPPER_HOSTS for smbclient via 0b19bb12a4c selftest: Create the cmd outside of the loop via 4a48148a7d8 s4:torture: Add missing NULL checks in spoolss.c via 8d5b40296f8 lib:util: Fix size of tmp array via 6aaab84533c lib:util: Remove tailing spaces in util.c from 8ae180e1678 third_party: Update socket_wrapper to version 1.4.3
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 9242f1e0ddbe3653f2612c704c0dba455f843ec3 Author: Andreas Schneider <a...@samba.org> Date: Tue Apr 30 11:30:48 2024 +0200 gitlab-ci: Update image to Fedora 40 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Thu Jun 13 13:29:48 UTC 2024 on atb-devel-224 commit 276db59eff2b4f959172c1ce66f21e2bfd79d8fe Author: Andreas Schneider <a...@samba.org> Date: Fri Jun 7 14:16:28 2024 +0200 gitlab-ci: Add CentOS 9 Stream Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 11d1c4704a851e9275551c39d88f1c1cf1bdb96a Author: Andreas Schneider <a...@samba.org> Date: Fri Jun 7 14:09:43 2024 +0200 gitlab-ci: Remove CentOS7 which is EOL See https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/ Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit efa2d0bf82ae2d57e30d83e43116cb678a1004fc Author: Andreas Schneider <a...@samba.org> Date: Thu Jun 6 11:51:53 2024 +0200 selftest: Set NSS_WRAPPER_HOSTS for smbclient This is calling getaddrinfo() Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 0b19bb12a4c6a86cee6fdda1319a173b02934e0a Author: Andreas Schneider <a...@samba.org> Date: Thu Jun 6 11:51:24 2024 +0200 selftest: Create the cmd outside of the loop Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 4a48148a7d830fb0ec6884f39b2ab1e5d41f2181 Author: Andreas Schneider <a...@samba.org> Date: Tue Apr 30 17:31:00 2024 +0200 s4:torture: Add missing NULL checks in spoolss.c source4/torture/rpc/spoolss.c: In function ‘check_printer_driver_file.isra’: source4/torture/rpc/spoolss.c:10850:58: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 10850 | const char *remote_name = talloc_asprintf(tctx, "%s\\%d\\%s", | ^~ Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 8d5b40296f89aee6c9a364017b0cb750cf0b7966 Author: Andreas Schneider <a...@samba.org> Date: Tue Apr 30 13:01:20 2024 +0200 lib:util: Fix size of tmp array lib/util/util.c: In function ‘dump_data_block16’: lib/util/util.c:503:40: error: ‘%04zX’ directive output may be truncated writing between 4 and 16 bytes into a region of size 15 [-Werror=format-truncation=] 503 | snprintf(tmp, sizeof(tmp), "%s[%04zX]", prefix, idx); | ^~~~~ Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> commit 6aaab84533c5691fefa0108da40a41e74f53c89f Author: Andreas Schneider <a...@samba.org> Date: Tue Apr 30 12:54:48 2024 +0200 lib:util: Remove tailing spaces in util.c Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Stefan Metzmacher <me...@samba.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci-main.yml | 30 ++++---- bootstrap/.gitlab-ci.yml | 9 +-- bootstrap/config.py | 80 +++++++++++----------- bootstrap/generated-dists/Vagrantfile | 24 +++---- .../{centos7 => centos9s}/Dockerfile | 2 +- .../{centos7 => centos9s}/bootstrap.sh | 61 +++++++++-------- .../{centos7 => centos9s}/locale.sh | 0 .../{centos7 => centos9s}/packages.yml | 38 +++++----- bootstrap/generated-dists/fedora39/Dockerfile | 29 -------- .../{centos7 => fedora40}/Dockerfile | 2 +- .../{fedora39 => fedora40}/bootstrap.sh | 0 .../{fedora39 => fedora40}/locale.sh | 0 .../{fedora39 => fedora40}/packages.yml | 0 bootstrap/sha1sum.txt | 2 +- lib/util/util.c | 28 ++++---- selftest/target/Samba3.pm | 12 ++-- source4/torture/rpc/spoolss.c | 17 +++-- 17 files changed, 158 insertions(+), 176 deletions(-) copy bootstrap/generated-dists/{centos7 => centos9s}/Dockerfile (90%) rename bootstrap/generated-dists/{centos7 => centos9s}/bootstrap.sh (68%) rename bootstrap/generated-dists/{centos7 => centos9s}/locale.sh (100%) rename bootstrap/generated-dists/{centos7 => centos9s}/packages.yml (74%) delete mode 100644 bootstrap/generated-dists/fedora39/Dockerfile rename bootstrap/generated-dists/{centos7 => fedora40}/Dockerfile (91%) rename bootstrap/generated-dists/{fedora39 => fedora40}/bootstrap.sh (100%) rename bootstrap/generated-dists/{fedora39 => fedora40}/locale.sh (100%) rename bootstrap/generated-dists/{fedora39 => fedora40}/packages.yml (100%) Changeset truncated at 500 lines: diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index c56c84c89d4..ac7e403cd03 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: b078783e082ead539940faaa644567bf4ed67f67 + SAMBA_CI_CONTAINER_TAG: d7e721bceae90834dfe04e8a9ba864a55d1c49e1 # # We use the ubuntu2204 image as default as # it matches what we have on atb-devel-224 @@ -64,9 +64,9 @@ variables: SAMBA_CI_CONTAINER_IMAGE_debian11_32bit: debian11-32bit SAMBA_CI_CONTAINER_IMAGE_debian12: debian12 SAMBA_CI_CONTAINER_IMAGE_opensuse155: opensuse155 - SAMBA_CI_CONTAINER_IMAGE_fedora39: fedora39 - SAMBA_CI_CONTAINER_IMAGE_centos7: centos7 SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s + SAMBA_CI_CONTAINER_IMAGE_centos9s: centos9s + SAMBA_CI_CONTAINER_IMAGE_fedora40: fedora40 include: # The image creation details are specified in a separate file @@ -268,13 +268,13 @@ samba-def-build: samba-mit-build: extends: .shared_template_build_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40} stage: build_first .needs_samba-mit-build: extends: .shared_template_test_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40} needs: - job: samba-mit-build artifacts: true @@ -322,7 +322,7 @@ samba: samba-mitkrb5: extends: .shared_template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40} samba-minimal-smbd: extends: .shared_template @@ -392,7 +392,7 @@ samba-addc-mit-4b: samba-fips: extends: .shared_template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40} samba-codecheck: extends: .shared_template @@ -663,24 +663,20 @@ opensuse155-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_opensuse155} -centos7-samba-o3: +centos8s-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos7} - # Git on CentOS doesn't support shallow git cloning - GIT_DEPTH: "" - # We need a newer GnuTLS version on CentOS7 - PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls37/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig" + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s} -centos8s-samba-o3: +centos9s-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos9s} -fedora39-samba-o3: +fedora40-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora39} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora40} # # Keep the samba-o3 sections at the end ... diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index 77b4e4fe290..1f94532e757 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -98,7 +98,7 @@ debian11: debian12: extends: .build_image_template -fedora39: +fedora40: extends: .build_image_template debian11-32bit: @@ -109,13 +109,8 @@ debian11-32bit: centos8s: extends: .build_image_template -centos7: +centos9s: extends: .build_image_template - variables: - # Shallow copies are not supported by git on CentOS7 - GIT_DEPTH: "" - # We install a compat-gnutls34 package for GnuTLS >= 3.4.7 - PKG_CONFIG_PATH: /usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig opensuse155: extends: .build_image_template diff --git a/bootstrap/config.py b/bootstrap/config.py index a5a7366c7fa..178c9029098 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -260,6 +260,28 @@ yum install -y \ yum clean all """ +CENTOS9S_DNF_BOOTSTRAP = r""" +#!/bin/bash +{GENERATED_MARKER} +set -xueo pipefail + +dnf update -y +dnf install -y dnf-plugins-core +dnf install -y epel-release +dnf install -y centos-release-gluster9 + +dnf -v repolist all +dnf config-manager --set-enabled crb -y + +dnf update -y + +dnf install -y \ + --setopt=install_weak_deps=False \ + {pkgs} + +dnf clean all +""" + DNF_BOOTSTRAP = r""" #!/bin/bash {GENERATED_MARKER} @@ -485,68 +507,46 @@ DEB_DISTS = { RPM_DISTS = { - 'centos7': { - 'docker_image': 'centos:7', - 'vagrant_box': 'centos/7', - 'bootstrap': YUM_BOOTSTRAP, + 'centos8s': { + 'docker_image': 'quay.io/centos/centos:stream8', + 'vagrant_box': 'centos/stream8', + 'bootstrap': CENTOS8S_YUM_BOOTSTRAP, 'replace': { 'lsb-release': 'redhat-lsb', - 'python3': 'python36', - 'python3-cryptography': 'python36-cryptography', - 'python3-devel': 'python36-devel', - 'python3-dns': 'python36-dns', - 'python3-pyasn1': 'python36-pyasn1', - 'python3-gpg': 'python36-gpg', - 'python3-iso8601' : 'python36-iso8601', - 'python3-markdown': 'python36-markdown', - 'python3-requests': 'python36-requests', - # although python36-devel is available - # after epel-release installed - # however, all other python3 pkgs are still python36-ish - 'python2-gpg': 'pygpgme', '@development-tools': '"@Development Tools"', # add quotes - 'glibc-langpack-en': '', # included in glibc-common - 'glibc-locale-source': '', # included in glibc-common - # update perl core modules on centos - # fix: Can't locate Archive/Tar.pm in @INC - 'perl': 'perl-core', + 'lcov': '', # does not exist + 'perl-JSON-Parse': '', # does not exist? + 'perl-Test-Base': 'perl-Test-Simple', 'perl-FindBin': '', - 'rpcsvc-proto-devel': '', - 'glusterfs-api-devel': '', - 'glusterfs-devel': '', - 'libcephfs-devel': '', - 'gnutls-devel': 'compat-gnutls37-devel', - 'gnutls-utils': 'compat-gnutls37-utils', - 'liburing-devel': '', # not available - 'python3-setproctitle': 'python36-setproctitle', - 'tracker-devel': '', # do not install + 'liburing-devel': '', # not available yet, Add me back, once available! 'mold': '', 'ShellCheck': '', 'shfmt': '', 'codespell': '', } }, - 'centos8s': { - 'docker_image': 'quay.io/centos/centos:stream8', - 'vagrant_box': 'centos/stream8', - 'bootstrap': CENTOS8S_YUM_BOOTSTRAP, + 'centos9s': { + 'docker_image': 'quay.io/centos/centos:stream9', + 'vagrant_box': 'centos/stream9', + 'bootstrap': CENTOS9S_DNF_BOOTSTRAP, 'replace': { - 'lsb-release': 'redhat-lsb', + 'lsb-release': 'lsb_release', '@development-tools': '"@Development Tools"', # add quotes 'lcov': '', # does not exist 'perl-JSON-Parse': '', # does not exist? 'perl-Test-Base': 'perl-Test-Simple', 'perl-FindBin': '', - 'liburing-devel': '', # not available yet, Add me back, once available! 'mold': '', 'ShellCheck': '', 'shfmt': '', 'codespell': '', + 'libcephfs-devel': '', # not available anymore + 'curl': '', # Use installed curl-minimal } }, - 'fedora39': { - 'docker_image': 'quay.io/fedora/fedora:39', - 'vagrant_box': 'fedora/39-cloud-base', + 'fedora40': { + 'docker_image': 'quay.io/fedora/fedora:40', + 'vagrant_box': 'fedora/40-cloud-base', 'bootstrap': DNF_BOOTSTRAP, 'replace': { 'lsb-release': 'redhat-lsb', diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index 2c6468d768b..79ccea780be 100644 --- a/bootstrap/generated-dists/Vagrantfile +++ b/bootstrap/generated-dists/Vagrantfile @@ -10,13 +10,6 @@ Vagrant.configure("2") do |config| config.ssh.insert_key = false - config.vm.define "centos7" do |v| - v.vm.box = "centos/7" - v.vm.hostname = "centos7" - v.vm.provision :shell, path: "centos7/bootstrap.sh" - v.vm.provision :shell, path: "centos7/locale.sh" - end - config.vm.define "centos8s" do |v| v.vm.box = "centos/stream8" v.vm.hostname = "centos8s" @@ -24,6 +17,13 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "centos8s/locale.sh" end + config.vm.define "centos9s" do |v| + v.vm.box = "centos/stream9" + v.vm.hostname = "centos9s" + v.vm.provision :shell, path: "centos9s/bootstrap.sh" + v.vm.provision :shell, path: "centos9s/locale.sh" + end + config.vm.define "debian11" do |v| v.vm.box = "debian/bullseye64" v.vm.hostname = "debian11" @@ -52,11 +52,11 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "debian12-32bit/locale.sh" end - config.vm.define "fedora39" do |v| - v.vm.box = "fedora/39-cloud-base" - v.vm.hostname = "fedora39" - v.vm.provision :shell, path: "fedora39/bootstrap.sh" - v.vm.provision :shell, path: "fedora39/locale.sh" + config.vm.define "fedora40" do |v| + v.vm.box = "fedora/40-cloud-base" + v.vm.hostname = "fedora40" + v.vm.provision :shell, path: "fedora40/bootstrap.sh" + v.vm.provision :shell, path: "fedora40/locale.sh" end config.vm.define "opensuse155" do |v| diff --git a/bootstrap/generated-dists/centos7/Dockerfile b/bootstrap/generated-dists/centos9s/Dockerfile similarity index 90% copy from bootstrap/generated-dists/centos7/Dockerfile copy to bootstrap/generated-dists/centos9s/Dockerfile index a11c4dbf169..42324ad5a74 100644 --- a/bootstrap/generated-dists/centos7/Dockerfile +++ b/bootstrap/generated-dists/centos9s/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM centos:7 +FROM quay.io/centos/centos:stream9 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos9s/bootstrap.sh similarity index 68% rename from bootstrap/generated-dists/centos7/bootstrap.sh rename to bootstrap/generated-dists/centos9s/bootstrap.sh index fd867616a46..40894b3f3ac 100755 --- a/bootstrap/generated-dists/centos7/bootstrap.sh +++ b/bootstrap/generated-dists/centos9s/bootstrap.sh @@ -7,13 +7,18 @@ set -xueo pipefail -yum update -y -yum install -y epel-release -yum install -y yum-plugin-copr -yum copr enable -y sergiomb/SambaAD -yum update -y +dnf update -y +dnf install -y dnf-plugins-core +dnf install -y epel-release +dnf install -y centos-release-gluster9 -yum install -y \ +dnf -v repolist all +dnf config-manager --set-enabled crb -y + +dnf update -y + +dnf install -y \ + --setopt=install_weak_deps=False \ "@Development Tools" \ acl \ attr \ @@ -24,11 +29,8 @@ yum install -y \ bison \ ccache \ chrpath \ - compat-gnutls37-devel \ - compat-gnutls37-utils \ crypto-policies-scripts \ cups-devel \ - curl \ dbus-devel \ docbook-dtds \ docbook-style-xsl \ @@ -39,6 +41,11 @@ yum install -y \ git \ glib2-devel \ glibc-common \ + glibc-langpack-en \ + glusterfs-api-devel \ + glusterfs-devel \ + gnutls-devel \ + gnutls-utils \ gpgme-devel \ gzip \ hostname \ @@ -49,7 +56,6 @@ yum install -y \ krb5-devel \ krb5-server \ krb5-workstation \ - lcov \ libacl-devel \ libarchive-devel \ libattr-devel \ @@ -62,49 +68,52 @@ yum install -y \ libtasn1-tools \ libtirpc-devel \ libunwind-devel \ + liburing-devel \ libuuid-devel \ libxslt \ lmdb \ lmdb-devel \ + lsb_release \ make \ mingw64-gcc \ ncurses-devel \ openldap-devel \ pam-devel \ patch \ + perl \ perl-Archive-Tar \ perl-ExtUtils-MakeMaker \ perl-Parse-Yapp \ - perl-Test-Base \ - perl-core \ + perl-Test-Simple \ perl-generators \ perl-interpreter \ pkgconfig \ popt-devel \ procps-ng \ psmisc \ + python3 \ + python3-cryptography \ + python3-devel \ + python3-dns \ + python3-gpg \ + python3-iso8601 \ python3-libsemanage \ + python3-markdown \ python3-policycoreutils \ - python36 \ - python36-cryptography \ - python36-devel \ - python36-dns \ - python36-gpg \ - python36-iso8601 \ - python36-markdown \ - python36-pyasn1 \ - python36-requests \ - python36-setproctitle \ + python3-pyasn1 \ + python3-requests \ + python3-setproctitle \ quota-devel \ readline-devel \ - redhat-lsb \ rng-tools \ rpcgen \ + rpcsvc-proto-devel \ rsync \ sed \ sudo \ systemd-devel \ tar \ + tracker-devel \ tree \ wget \ which \ @@ -113,8 +122,4 @@ yum install -y \ yum-utils \ zlib-devel -yum clean all - -if [ ! -f /usr/bin/python3 ]; then - ln -sf /usr/bin/python3.6 /usr/bin/python3 -fi \ No newline at end of file +dnf clean all \ No newline at end of file diff --git a/bootstrap/generated-dists/centos7/locale.sh b/bootstrap/generated-dists/centos9s/locale.sh similarity index 100% rename from bootstrap/generated-dists/centos7/locale.sh rename to bootstrap/generated-dists/centos9s/locale.sh diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos9s/packages.yml similarity index 74% rename from bootstrap/generated-dists/centos7/packages.yml rename to bootstrap/generated-dists/centos9s/packages.yml index 2234bafc21b..19b480e67e1 100644 --- a/bootstrap/generated-dists/centos7/packages.yml +++ b/bootstrap/generated-dists/centos9s/packages.yml @@ -10,11 +10,8 @@ packages: - bison - ccache - chrpath - - compat-gnutls37-devel - - compat-gnutls37-utils - crypto-policies-scripts - cups-devel - - curl - dbus-devel - docbook-dtds - docbook-style-xsl @@ -25,6 +22,11 @@ packages: - git - glib2-devel - glibc-common + - glibc-langpack-en + - glusterfs-api-devel + - glusterfs-devel + - gnutls-devel + - gnutls-utils - gpgme-devel - gzip - hostname @@ -35,7 +37,6 @@ packages: - krb5-devel - krb5-server - krb5-workstation - - lcov - libacl-devel - libarchive-devel - libattr-devel @@ -48,49 +49,52 @@ packages: - libtasn1-tools - libtirpc-devel - libunwind-devel + - liburing-devel - libuuid-devel - libxslt - lmdb - lmdb-devel + - lsb_release - make - mingw64-gcc -- Samba Shared Repository