Update to Samba 4.9.0rc4

Guenther

.gitignore

@@ -133,3 +133,5 @@ samba-3.6.0pre1.tar.gz
 /samba-4.9.0rc2.tar.asc
 /samba-4.9.0rc3.tar.xz
 /samba-4.9.0rc3.tar.asc
+/samba-4.9.0rc4.tar.xz
+/samba-4.9.0rc4.tar.asc

samba-4.8.3-vscript.local.patch

@@ -1,96 +0,0 @@
-From dd9da7bc9306b95496d502589f95be0efc097fc0 Mon Sep 17 00:00:00 2001
-From: Alexander Bokovoy <ab@samba.org>
-Date: Thu, 12 Jul 2018 10:19:41 +0300
-Subject: [PATCH] wafsamba/samba_abi: always hide ABI symbols which must be
- local
-
-binutils 2.31 is going to change how shared libraries are linked, such
-that they always provide their own local definitions of the _end, _edata
-and _bss_start symbols.  This would all be fine, except for shared
-libraries that export all symbols be default.  (Rather than just
-exporting those symbols that form part of their API).
-
-According to binutils developers, we should only export the symbols we
-explicitly want to be used. We don't use this principle for all our
-libraries and deliberately don't want to have ABI versioning control for
-all of them, so the change I introduce here is to explicitly mark those
-symbols that will always be added by default linker configuration with
-binutils 2.31 as local. Right now these are '_end', '_edata', and
-'__bss_start' symbols.
-
-Signed-off-by: Alexander Bokovoy <ab@samba.org>
----
- buildtools/wafsamba/samba_abi.py      | 10 ++++++----
- buildtools/wafsamba/tests/test_abi.py | 14 ++++++++++++++
- 2 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
-index 196b468f5b3..4603e764fea 100644
---- a/buildtools/wafsamba/samba_abi.py
-+++ b/buildtools/wafsamba/samba_abi.py
-@@ -192,10 +192,12 @@ def abi_write_vscript(f, libname, current_version, versions, symmap, abi_match):
-             f.write("\t\t%s;\n" % x)
-     else:
-         f.write("\t\t*;\n")
--    if abi_match != ["*"]:
--        f.write("\tlocal:\n")
--        for x in local_abi:
--            f.write("\t\t%s;\n" % x[1:])
-+    # Always hide symbols that must be local if exist
-+    local_abi.extend(["!_end", "!__bss_start", "!_edata"])
-+    f.write("\tlocal:\n")
-+    for x in local_abi:
-+        f.write("\t\t%s;\n" % x[1:])
-+    if global_abi != ["*"]:
-         if len(global_abi) > 0:
-             f.write("\t\t*;\n")
-     f.write("};\n")
-diff --git a/buildtools/wafsamba/tests/test_abi.py b/buildtools/wafsamba/tests/test_abi.py
-index bba78c1ba07..74892146990 100644
---- a/buildtools/wafsamba/tests/test_abi.py
-+++ b/buildtools/wafsamba/tests/test_abi.py
-@@ -66,6 +66,10 @@ class WriteVscriptTests(TestCase):
- 1.0 {
- \tglobal:
- \t\t*;
-+\tlocal:
-+\t\t_end;
-+\t\t__bss_start;
-+\t\t_edata;
- };
- """)
- 
-@@ -84,6 +88,10 @@ MYLIB_0.1 {
- 1.0 {
- \tglobal:
- \t\t*;
-+\tlocal:
-+\t\t_end;
-+\t\t__bss_start;
-+\t\t_edata;
- };
- """)
- 
-@@ -99,6 +107,9 @@ MYLIB_0.1 {
- \t\t*;
- \tlocal:
- \t\texc_*;
-+\t\t_end;
-+\t\t__bss_start;
-+\t\t_edata;
- };
- """)
- 
-@@ -115,6 +126,9 @@ MYLIB_0.1 {
- \t\tpub_*;
- \tlocal:
- \t\texc_*;
-+\t\t_end;
-+\t\t__bss_start;
-+\t\t_edata;
- \t\t*;
- };
- """)
--- 
-2.17.1
-

samba-4.9.0rc3-fix-python37.patch

@@ -1,26 +0,0 @@
-From 8bc323356f1f1fe689d423a2c836aebac459b9f4 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Fri, 17 Aug 2018 12:06:38 +0200
-Subject: [PATCH] python: Fix print in dns_invalid.py
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
----
- python/samba/tests/dns_invalid.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python/samba/tests/dns_invalid.py b/python/samba/tests/dns_invalid.py
-index 9f87cd56084..46611eb57a0 100644
---- a/python/samba/tests/dns_invalid.py
-+++ b/python/samba/tests/dns_invalid.py
-@@ -76,7 +76,7 @@ class TestBrokenQueries(DNSTest):
- 
-         name = "\x10\x11\x05\xa8.%s" % self.get_dns_domain()
-         q = self.make_name_question(name, dns.DNS_QTYPE_A, dns.DNS_QCLASS_IN)
--        print "asking for ", q.name
-+        print("asking for %s" % (q.name))
-         questions.append(q)
- 
-         self.finish_name_packet(p, questions)
--- 
-2.17.1
-

samba.spec

@@ -14,7 +14,7 @@
 %define tevent_version 0.9.37
 %define ldb_version 1.4.2
 # This should be rc1 or nil
-%define pre_release rc3
+%define pre_release rc4
 
 %if "x%{?pre_release}" != "x"
 %define samba_release 0.%{main_release}.%{pre_release}%{?dist}
@@ -121,9 +121,6 @@ Source14:       samba.pamd
 
 Source201:      README.downgrade
 
-Patch0:         samba-4.8.3-vscript.local.patch
-Patch1:         samba-4.9.0rc3-fix-python37.patch
-
 Requires(pre): /usr/sbin/groupadd
 Requires(post): systemd
 Requires(preun): systemd
@@ -3126,6 +3123,7 @@ fi
 %{_datadir}/ctdb/tests/cunit/config_test_004.sh
 %{_datadir}/ctdb/tests/cunit/config_test_005.sh
 %{_datadir}/ctdb/tests/cunit/config_test_006.sh
+%{_datadir}/ctdb/tests/cunit/config_test_007.sh
 %{_datadir}/ctdb/tests/cunit/db_hash_test_001.sh
 %{_datadir}/ctdb/tests/cunit/event_protocol_test_001.sh
 %{_datadir}/ctdb/tests/cunit/event_script_test_001.sh
@@ -3815,6 +3813,9 @@ fi
 %endif # with_clustering_support
 
 %changelog
+* Wed Aug 29 2018 Guenther Deschner <gdeschner@redhat.com> - 4.9.0rc4-3
+- Update to Samba 4.9.0rc4
+
 * Thu Aug 16 2018 Andreas Schneider <asn@redhat.com> - 4.9.0rc3-3
 - Fix python3 packaging
 

sources

@@ -1,2 +1,2 @@
-SHA512 (samba-4.9.0rc3.tar.xz) = 42164fda5f7d75754893a0d66f2909608ca006c968e6031d4f68797ab9a07502330e96977f553c452f24737f4deddb9cc8cb836ab70d4909d1eb102bd14457fb
+SHA512 (samba-4.9.0rc4.tar.xz) = a3d2efa41c99ce378e570d909b5cfe8507f0cf14ad8303da6d115272de0239633e249a91fee754e8b6fa0ce13ea7354f2dbe26abe97d3eda091333681c3cc2ce
-SHA512 (samba-4.9.0rc3.tar.asc) = 0b405e77d7e3a824916880f5f32716e69e94158dd519b6dac66fd2109f5e70e32a55ee827274d31f500b6ddf0aafd00efa54b58b6dfdc6a26ab46d3acb04a286
+SHA512 (samba-4.9.0rc4.tar.asc) = 3cb8448c25e84d4895fd17057ea9c089d98edeb9eb3168e35cd3b6cf3df101408afa8897376b8b21b97e4a5e9ac74ecb1b7d5f582f935e0341109fc54c5fcd04