The branch, master has been updated
via 82a21581c63 build: Without getrandom() require gnutls 3.7.2
via d0aa04e8c16 bootstrap: use compat-gnutls37-devel for centos7
from f60780c8b63 libcli/dns: Fix TCP fallback
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 82a21581c63fc4e453fd4f5cd44e77a95c84f50c
Author: Volker Lendecke <v...@samba.org>
Date: Mon Jan 17 10:49:13 2022 +0100
build: Without getrandom() require gnutls 3.7.2
gnutls before 3.7.2 and without getrandom() will open /dev/urandom at
library
initialization time before main() is run. We use closefrom(3) in samba-bgqd
and
samba-dcerpd, which closes /dev/urandom, which then breaks gnutls. On system
with getrandom(), no file descriptor is opened and gnutls 3.7.2+ will open
and
close /dev/urandom whenever it needs to access it.
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Fri Jan 21 21:42:08 UTC 2022 on sn-devel-184
commit d0aa04e8c16192babfbafc7e9869e7ff98a731c9
Author: Stefan Metzmacher <me...@samba.org>
Date: Thu Jan 20 12:05:35 2022 +0100
bootstrap: use compat-gnutls37-devel for centos7
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 4 ++--
bootstrap/config.py | 2 +-
bootstrap/generated-dists/centos7/bootstrap.sh | 2 +-
bootstrap/generated-dists/centos7/packages.yml | 2 +-
bootstrap/sha1sum.txt | 2 +-
wscript_configure_system_gnutls | 4 ++++
6 files changed, 10 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index c532069af52..dc46d4beaeb 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: 791e89a43f2b287635e128c8f5aed924b757c4bd
+ SAMBA_CI_CONTAINER_TAG: 44771060ac5c91a1feb9a85a7b722893b6f8d843
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -592,7 +592,7 @@ centos7-samba-o3:
# 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-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig"
+ PKG_CONFIG_PATH:
"/usr/lib64/compat-gnutls37/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig"
centos8-samba-o3:
extends: .samba-o3-template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index d9943dd515a..621912a7d94 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -454,7 +454,7 @@ RPM_DISTS = {
'glusterfs-api-devel': '',
'glusterfs-devel': '',
'libcephfs-devel': '',
- 'gnutls-devel': 'compat-gnutls34-devel',
+ 'gnutls-devel': 'compat-gnutls37-devel',
'liburing-devel': '', # not available
'python3-setproctitle': 'python36-setproctitle',
'tracker-devel': '', # do not install
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh
b/bootstrap/generated-dists/centos7/bootstrap.sh
index c31137e75c2..43572bb532a 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -24,7 +24,7 @@ yum install -y \
bison \
ccache \
chrpath \
- compat-gnutls34-devel \
+ compat-gnutls37-devel \
cups-devel \
curl \
dbus-devel \
diff --git a/bootstrap/generated-dists/centos7/packages.yml
b/bootstrap/generated-dists/centos7/packages.yml
index eebeb2feaa3..3998c875057 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -10,7 +10,7 @@ packages:
- bison
- ccache
- chrpath
- - compat-gnutls34-devel
+ - compat-gnutls37-devel
- cups-devel
- curl
- dbus-devel
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index a4a0de426b1..22c597c2361 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-791e89a43f2b287635e128c8f5aed924b757c4bd
+44771060ac5c91a1feb9a85a7b722893b6f8d843
diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls
index 9864235d17e..62fe3d5ddda 100644
--- a/wscript_configure_system_gnutls
+++ b/wscript_configure_system_gnutls
@@ -6,6 +6,10 @@ def parse_version(v):
gnutls_min_required_version = "3.4.7"
+conf.CHECK_FUNCS('getrandom', headers='sys/random.h')
+if not conf.CONFIG_SET('HAVE_GETRANDOM'):
+ gnutls_min_required_version = "3.7.2"
+
gnutls_required_version = gnutls_min_required_version
conf.CHECK_CFG(package='gnutls',
--
Samba Shared Repository
