The branch, master has been updated
via fb485544f8a gitlab-ci: add ubuntu2404
via 7f37538d3c8 gitlab-ci: add a reference for samba-fuzz regarding
oss-fuzz with ubuntu 20.04
via 7811dca2603 script/autobuild.py: don't specify _FORTIFY_SOURCE
together with -O3 on ubuntu
from 481b961be99 async_sock: try recvmsg(MSG_DONTWAIT) without fd event
handler first
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fb485544f8a9e240a695d4cd933af0713639f18b
Author: Stefan Metzmacher <[email protected]>
Date: Wed Apr 30 10:37:04 2025 +0200
gitlab-ci: add ubuntu2404
For now we don't use it as default as the autobuild server would need to
be upgraded as well, but that will happen soon.
We also can't remove ubuntu2004 yet, because it's needed for
samba-fuzz.
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Mon May 12 20:27:24 UTC 2025 on atb-devel-224
commit 7f37538d3c827c751b057014953d55431f3ea4ad
Author: Stefan Metzmacher <[email protected]>
Date: Wed Apr 30 10:28:05 2025 +0200
gitlab-ci: add a reference for samba-fuzz regarding oss-fuzz with ubuntu
20.04
When https://github.com/google/oss-fuzz/pull/13018 is merged we can
likely switch to ubuntu 24.04 for oss-fuzz
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 7811dca2603c3fcec36a58ff4dacfaccf059260c
Author: Stefan Metzmacher <[email protected]>
Date: Wed Apr 30 18:18:28 2025 +0000
script/autobuild.py: don't specify _FORTIFY_SOURCE together with -O3 on
ubuntu
Passing _FORTIFY_SOURCE=2 while -O3 might imply _FORTIFY_SOURCE=3
causes an redefined error.
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 10 +++++++++-
bootstrap/.gitlab-ci.yml | 3 +++
bootstrap/config.py | 23 ++++++++++++++++++++--
bootstrap/generated-dists/Vagrantfile | 7 +++++++
.../generated-dists/debian12-32bit/bootstrap.sh | 1 +
.../generated-dists/debian12-32bit/packages.yml | 1 +
bootstrap/generated-dists/debian12/bootstrap.sh | 1 +
bootstrap/generated-dists/debian12/packages.yml | 1 +
bootstrap/generated-dists/ubuntu2004/bootstrap.sh | 1 +
bootstrap/generated-dists/ubuntu2004/packages.yml | 1 +
bootstrap/generated-dists/ubuntu2204/bootstrap.sh | 2 ++
bootstrap/generated-dists/ubuntu2204/packages.yml | 2 ++
.../{debian11 => ubuntu2404}/Dockerfile | 2 +-
.../{ubuntu2204 => ubuntu2404}/bootstrap.sh | 2 ++
.../{centos9s => ubuntu2404}/locale.sh | 0
.../{ubuntu2204 => ubuntu2404}/packages.yml | 2 ++
bootstrap/sha1sum.txt | 2 +-
script/autobuild.py | 18 ++++++++++++++++-
18 files changed, 73 insertions(+), 6 deletions(-)
copy bootstrap/generated-dists/{debian11 => ubuntu2404}/Dockerfile (92%)
copy bootstrap/generated-dists/{ubuntu2204 => ubuntu2404}/bootstrap.sh (97%)
copy bootstrap/generated-dists/{centos9s => ubuntu2404}/locale.sh (100%)
copy bootstrap/generated-dists/{ubuntu2204 => ubuntu2404}/packages.yml (97%)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 3b8649a9888..a9eb27ea6ec 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: cc3865d5074e9898e4a7ffab6fa056ab63ee46ee
+ SAMBA_CI_CONTAINER_TAG: 3dc161f073e0f8ab1c8d5d59fef9e5e33630b51e
#
# We use the ubuntu2204 image as default as
# it matches what we have on atb-devel-224
@@ -60,6 +60,7 @@ variables:
#
SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004
SAMBA_CI_CONTAINER_IMAGE_ubuntu2204: ubuntu2204
+ SAMBA_CI_CONTAINER_IMAGE_ubuntu2404: ubuntu2404
SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
SAMBA_CI_CONTAINER_IMAGE_debian11_32bit: debian11-32bit
SAMBA_CI_CONTAINER_IMAGE_debian12: debian12
@@ -366,6 +367,8 @@ samba-fuzz:
extends: .shared_template
variables:
# We match what Google is running over at oss-fuzz
+ # See https://github.com/google/oss-fuzz/pull/13018 for
+ # an upgrade to ubuntu 24.04
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004}
ctdb:
@@ -647,6 +650,11 @@ ubuntu2004-samba-o3:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2004}
+ubuntu2404-samba-o3:
+ extends: .samba-o3-template
+ variables:
+ SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu2404}
+
debian11-samba-o3:
extends: .samba-o3-template
variables:
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 48ea3b887a0..11b973d9112 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -93,6 +93,9 @@ ubuntu2004:
ubuntu2204:
extends: .build_image_template
+ubuntu2404:
+ extends: .build_image_template
+
debian11:
extends: .build_image_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 69978313645..08c12dd1793 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -53,6 +53,7 @@ COMMON = [
'jq',
'lcov',
'make',
+ 'mold',
'patch',
'perl',
'psmisc', # for pstree in test
@@ -77,6 +78,7 @@ PKGS = [
('lmdb-utils', 'lmdb'),
('mingw-w64', 'mingw64-gcc'),
('zlib1g-dev', 'zlib-devel'),
+ ('landscape-common', ''), # for landscape/lib/os_release.py
('libbsd-dev', 'libbsd-devel'),
('liburing-dev', 'liburing-devel'),
('libarchive-dev', 'libarchive-devel'),
@@ -140,7 +142,6 @@ PKGS = [
('', 'libtirpc-devel'), # for <rpc/rpc.h> header on fedora
('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
('mawk', 'gawk'),
- ('', 'mold'),
('shellcheck', 'ShellCheck'),
('', 'crypto-policies-scripts'),
@@ -458,6 +459,8 @@ DEB_DISTS = {
'language-pack-en': '', # included in locales
'shfmt': '',
'cargo': '', # included cargo is broken
+ 'landscape-common': '',
+ 'mold': '',
}
},
'debian11-32bit': {
@@ -467,6 +470,8 @@ DEB_DISTS = {
'language-pack-en': '', # included in locales
'shfmt': '',
'cargo': '', # included cargo is broken
+ 'landscape-common': '',
+ 'mold': '',
}
},
'debian12': {
@@ -476,6 +481,7 @@ DEB_DISTS = {
'language-pack-en': '', # included in locales
'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
'cargo': '', # included cargo is broken
+ 'landscape-common': '',
}
},
'debian12-32bit': {
@@ -485,6 +491,7 @@ DEB_DISTS = {
'language-pack-en': '', # included in locales
'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
'cargo': '', # included cargo is broken
+ 'landscape-common': '',
}
},
'ubuntu1804': {
@@ -493,6 +500,8 @@ DEB_DISTS = {
'replace': {
'liburing-dev': '', # not available
'shfmt': '',
+ 'landscape-common': '',
+ 'mold': '',
}
},
'ubuntu1804-32bit': {
@@ -501,6 +510,8 @@ DEB_DISTS = {
'replace': {
'liburing-dev': '', # not available
'shfmt': '',
+ 'landscape-common': '',
+ 'mold': '',
}
},
'ubuntu2004': {
@@ -509,6 +520,7 @@ DEB_DISTS = {
'replace': {
'liburing-dev': '', # not available
'shfmt': '',
+ 'mold': '',
}
},
'ubuntu2204': {
@@ -517,7 +529,14 @@ DEB_DISTS = {
'replace': {
'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
},
- }
+ },
+ 'ubuntu2404': {
+ 'docker_image': 'ubuntu:24.04',
+ 'vagrant_box': 'ubuntu/noble64',
+ 'replace': {
+ 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
+ },
+ },
}
diff --git a/bootstrap/generated-dists/Vagrantfile
b/bootstrap/generated-dists/Vagrantfile
index d901a3770cf..74993c9c58a 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -94,5 +94,12 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "ubuntu2204/locale.sh"
end
+ config.vm.define "ubuntu2404" do |v|
+ v.vm.box = "ubuntu/noble64"
+ v.vm.hostname = "ubuntu2404"
+ v.vm.provision :shell, path: "ubuntu2404/bootstrap.sh"
+ v.vm.provision :shell, path: "ubuntu2404/locale.sh"
+ end
+
end
diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
index ba78ddddc12..6d1d7f61088 100755
--- a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
@@ -83,6 +83,7 @@ apt-get -y install \
make \
mawk \
mingw-w64 \
+ mold \
patch \
perl \
perl-modules \
diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml
b/bootstrap/generated-dists/debian12-32bit/packages.yml
index 61058195154..56264828e9a 100644
--- a/bootstrap/generated-dists/debian12-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian12-32bit/packages.yml
@@ -72,6 +72,7 @@ packages:
- make
- mawk
- mingw-w64
+ - mold
- patch
- perl
- perl-modules
diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh
b/bootstrap/generated-dists/debian12/bootstrap.sh
index ba78ddddc12..6d1d7f61088 100755
--- a/bootstrap/generated-dists/debian12/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12/bootstrap.sh
@@ -83,6 +83,7 @@ apt-get -y install \
make \
mawk \
mingw-w64 \
+ mold \
patch \
perl \
perl-modules \
diff --git a/bootstrap/generated-dists/debian12/packages.yml
b/bootstrap/generated-dists/debian12/packages.yml
index 61058195154..56264828e9a 100644
--- a/bootstrap/generated-dists/debian12/packages.yml
+++ b/bootstrap/generated-dists/debian12/packages.yml
@@ -72,6 +72,7 @@ packages:
- make
- mawk
- mingw-w64
+ - mold
- patch
- perl
- perl-modules
diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index ac716b38593..fc2ad508b70 100755
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -42,6 +42,7 @@ apt-get -y install \
krb5-config \
krb5-kdc \
krb5-user \
+ landscape-common \
language-pack-en \
lcov \
libacl1-dev \
diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml
b/bootstrap/generated-dists/ubuntu2004/packages.yml
index eb8e7ad4053..2bdcbfa89ff 100644
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -31,6 +31,7 @@ packages:
- krb5-config
- krb5-kdc
- krb5-user
+ - landscape-common
- language-pack-en
- lcov
- libacl1-dev
diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
index 669d53ea747..17831dfaefe 100755
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
@@ -42,6 +42,7 @@ apt-get -y install \
krb5-config \
krb5-kdc \
krb5-user \
+ landscape-common \
language-pack-en \
lcov \
libacl1-dev \
@@ -85,6 +86,7 @@ apt-get -y install \
make \
mawk \
mingw-w64 \
+ mold \
patch \
perl \
perl-modules \
diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml
b/bootstrap/generated-dists/ubuntu2204/packages.yml
index 0343ebe0915..8d5d400a2ea 100644
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2204/packages.yml
@@ -31,6 +31,7 @@ packages:
- krb5-config
- krb5-kdc
- krb5-user
+ - landscape-common
- language-pack-en
- lcov
- libacl1-dev
@@ -74,6 +75,7 @@ packages:
- make
- mawk
- mingw-w64
+ - mold
- patch
- perl
- perl-modules
diff --git a/bootstrap/generated-dists/debian11/Dockerfile
b/bootstrap/generated-dists/ubuntu2404/Dockerfile
similarity index 92%
copy from bootstrap/generated-dists/debian11/Dockerfile
copy to bootstrap/generated-dists/ubuntu2404/Dockerfile
index 90a961f5345..a430d29d52b 100644
--- a/bootstrap/generated-dists/debian11/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu2404/Dockerfile
@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
-FROM debian:11
+FROM ubuntu:24.04
# pass in with --build-arg while build
ARG SHA1SUM
diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
b/bootstrap/generated-dists/ubuntu2404/bootstrap.sh
similarity index 97%
copy from bootstrap/generated-dists/ubuntu2204/bootstrap.sh
copy to bootstrap/generated-dists/ubuntu2404/bootstrap.sh
index 669d53ea747..17831dfaefe 100755
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2404/bootstrap.sh
@@ -42,6 +42,7 @@ apt-get -y install \
krb5-config \
krb5-kdc \
krb5-user \
+ landscape-common \
language-pack-en \
lcov \
libacl1-dev \
@@ -85,6 +86,7 @@ apt-get -y install \
make \
mawk \
mingw-w64 \
+ mold \
patch \
perl \
perl-modules \
diff --git a/bootstrap/generated-dists/centos9s/locale.sh
b/bootstrap/generated-dists/ubuntu2404/locale.sh
similarity index 100%
copy from bootstrap/generated-dists/centos9s/locale.sh
copy to bootstrap/generated-dists/ubuntu2404/locale.sh
diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml
b/bootstrap/generated-dists/ubuntu2404/packages.yml
similarity index 97%
copy from bootstrap/generated-dists/ubuntu2204/packages.yml
copy to bootstrap/generated-dists/ubuntu2404/packages.yml
index 0343ebe0915..8d5d400a2ea 100644
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2404/packages.yml
@@ -31,6 +31,7 @@ packages:
- krb5-config
- krb5-kdc
- krb5-user
+ - landscape-common
- language-pack-en
- lcov
- libacl1-dev
@@ -74,6 +75,7 @@ packages:
- make
- mawk
- mingw-w64
+ - mold
- patch
- perl
- perl-modules
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 43732b284ca..7a8d58b5aae 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-cc3865d5074e9898e4a7ffab6fa056ab63ee46ee
+3dc161f073e0f8ab1c8d5d59fef9e5e33630b51e
diff --git a/script/autobuild.py b/script/autobuild.py
index 85f2d324659..30ad08ca04d 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -197,6 +197,22 @@ samba_libs_configure_libs = samba_libs_configure_base + "
--bundled-libraries=cm
samba_libs_configure_bundled_libs = "
--bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!tevent,!pytevent,!popt"
samba_libs_configure_samba = samba_libs_configure_base +
samba_libs_configure_bundled_libs
+is_ubuntu = False
+try:
+ from landscape.lib.os_release import parse_os_release
+ v = parse_os_release()
+ if v["distributor-id"] == "Ubuntu":
+ is_ubuntu = True
+except ImportError:
+ pass
+
+# on ubuntu gcc implies _FORTIFY_SOURCE
+# before 24.04 it was _FORTIFY_SOURCE=2
+# and 24.04 has _FORTIFY_SOURCE=3
+# so we do not specify it explicitly.
+samba_o3_cflags = "-O3"
+if not is_ubuntu:
+ samba_o3_cflags += " -Wp,-D_FORTIFY_SOURCE=2"
def format_option(name, value=None):
"""Format option as str list."""
@@ -838,7 +854,7 @@ tasks = {
"samba-o3": {
"sequence": [
("random-sleep", random_sleep(300, 900)),
- ("configure", "ADDITIONAL_CFLAGS='-O3 -Wp,-D_FORTIFY_SOURCE=2'
./configure.developer --abi-check-disable" + himmelblau_configure_params +
samba_configure_params),
+ ("configure", "ADDITIONAL_CFLAGS='" + samba_o3_cflags + "'
./configure.developer --abi-check-disable" + himmelblau_configure_params +
samba_configure_params),
("make", "make -j"),
("test", make_test(cmd='make test',
TESTS="--exclude=selftest/slow-none", include_envs=["none"])),
("quicktest", make_test(cmd='make quicktest',
include_envs=["ad_dc", "ad_dc_smb1", "ad_dc_smb1_done"])),
--
Samba Shared Repository
