diff --git a/.gitignore b/.gitignore index 8cb14d0..518c755 100644 --- a/.gitignore +++ b/.gitignore @@ -279,3 +279,5 @@ samba-3.6.0pre1.tar.gz /samba-4.15.4.tar.asc /samba-4.15.5.tar.xz /samba-4.15.5.tar.asc +/samba-4.15.6.tar.xz +/samba-4.15.6.tar.asc diff --git a/samba-glibc-dns.patch b/samba-glibc-dns.patch deleted file mode 100644 index c01d481..0000000 --- a/samba-glibc-dns.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e556b4067e0c4036e20fc26523e3b4d6d5c6be42 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 7 Oct 2021 15:55:37 +0200 -Subject: [PATCH] waf: Fix resolv_wrapper with glibc 2.34 - -With glibc 2.34 we are not able to talk to the DNS server via socket_wrapper -anymore. The res_* symbols have been moved from libresolv to libc. We are not -able to intercept any traffic inside of libc. - -Signed-off-by: Andreas Schneider -Reviewed-by: Andreas Schneider -Reviewed-by: Alexander Bokovoy ---- - selftest/wscript | 2 +- - third_party/resolv_wrapper/wscript | 13 +++++++++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/selftest/wscript b/selftest/wscript -index a6be06c2ae9..85d9338489a 100644 ---- a/selftest/wscript -+++ b/selftest/wscript -@@ -252,7 +252,7 @@ def cmd_testonly(opt): - if os.environ.get('USE_NAMESPACES') is None: - env.OPTIONS += " --socket_wrapper_so_path=" + CONFIG_GET(opt, 'LIBSOCKET_WRAPPER_SO_PATH') - -- if Utils.unversioned_sys_platform() in ('netbsd', 'openbsd', 'sunos'): -+ if not CONFIG_SET(opt, 'HAVE_RESOLV_CONF_SUPPORT'): - env.OPTIONS += " --use-dns-faking" - - if CONFIG_GET(opt, 'USING_SYSTEM_KRB5') and CONFIG_GET(opt, 'MIT_KDC_PATH'): -diff --git a/third_party/resolv_wrapper/wscript b/third_party/resolv_wrapper/wscript -index a7f18389b0f..7e369bd90b5 100644 ---- a/third_party/resolv_wrapper/wscript -+++ b/third_party/resolv_wrapper/wscript -@@ -1,6 +1,7 @@ - #!/usr/bin/env python - - import os -+from waflib import Logs - - VERSION="1.1.7" - -@@ -49,6 +50,18 @@ def configure(conf): - if conf.CONFIG_SET('HAVE_RES_NCLOSE'): - conf.DEFINE('HAVE_RES_NCLOSE_IN_LIBRESOLV', 1) - -+ # If we find res_nquery in libc, we can't do resolv.conf redirect -+ conf.CHECK_FUNCS('res_nquery __res_nquery') -+ if (conf.CONFIG_SET('HAVE_RES_NQUERY') -+ or conf.CONFIG_SET('HAVE___RES_NQUERY')): -+ Logs.warn("Detection for resolv_wrapper: " -+ "Only dns faking will be available") -+ else: -+ if conf.CHECK_FUNCS('res_nquery', lib='resolv'): -+ conf.DEFINE('HAVE_RESOLV_CONF_SUPPORT', 1) -+ if conf.CHECK_FUNCS('__res_nquery', lib='resolv'): -+ conf.DEFINE('HAVE_RESOLV_CONF_SUPPORT', 1) -+ - conf.CHECK_FUNCS_IN('res_init __res_init', 'resolv', checklibc=True) - conf.CHECK_FUNCS_IN('res_ninit __res_ninit', 'resolv', checklibc=True) - conf.CHECK_FUNCS_IN('res_close __res_close', 'resolv', checklibc=True) --- -2.33.1 - diff --git a/samba.spec b/samba.spec index 38bcc1c..23632c7 100644 --- a/samba.spec +++ b/samba.spec @@ -129,13 +129,13 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global baserelease 1 +%global baserelease 0 -%global samba_version 4.15.5 +%global samba_version 4.15.6 %global talloc_version 2.3.3 %global tdb_version 1.4.4 %global tevent_version 0.11.0 -%global ldb_version 2.4.1 +%global ldb_version 2.4.2 # This should be rc1 or nil %global pre_release %nil @@ -200,7 +200,6 @@ Source201: README.downgrade Patch0: samba-s4u.patch Patch1: samba-ctdb-etcd-reclock.patch -Patch2: samba-glibc-dns.patch Requires(pre): /usr/sbin/groupadd Requires(post): systemd @@ -4101,6 +4100,9 @@ fi %endif %changelog +* Wed Mar 16 2022 Pavel Filipenský - 4.15.6-0 +- Update to Samba 4.15.6 + * Wed Feb 23 2022 Andreas Schneider - 4.15.5-1 - resolves: rhbz#2036443 - Fix samba-tool on builds with samba-dc diff --git a/sources b/sources index 2e9aecc..eb4e013 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.15.5.tar.xz) = 8a77254ed40907abeb1c8c5d6234c10499c7bde9c95014383f8b53a29a9a1dd9a578611ef08eb139ac75317ad441a90fed502a30d4571d44abbce1ab02998caf -SHA512 (samba-4.15.5.tar.asc) = 10ae7ad4c628e438d0e433cea0665df7a0e167ca74b9e29e86e6e7350136dcdd9403e29568dc3228feb90a5307f29a5c12993ac85e70378c820fe9480f767585 +SHA512 (samba-4.15.6.tar.xz) = 472cbca58819550b0b48672754e3167137ed8aac29238bb822524acb51c2f96c76130a2a023a5895d3fffa8aeda3ed93c4c393776b0395a1e3508940b2d4f24f +SHA512 (samba-4.15.6.tar.asc) = c283372251b4de89b9464c74d507e047b1de46b0f59f94fba40988716aa1ed1eb939e0f0844826f06c48847744acf134135bbf79817d966e77e5516d23543fdb