Update to Samba 4.9.0

Guenther

.gitignore

@@ -137,3 +137,5 @@ samba-3.6.0pre1.tar.gz
 /samba-4.9.0rc4.tar.asc
 /samba-4.9.0rc5.tar.asc
 /samba-4.9.0rc5.tar.xz
+/samba-4.9.0.tar.xz
+/samba-4.9.0.tar.asc

samba-4.9.0rc5-parallel-builds.patch

@@ -1,55 +0,0 @@
-From 2f1c716ffef351a56aa5bd0a26c3dd1e34d3283a Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Thu, 6 Sep 2018 12:40:10 +0200
-Subject: [PATCH] wafsamba: Deal with make -j<num>
-
-Currently only make -j works for parallel builds and make -j4 results in
-no parallel jobs at all.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=13606
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Alexander Bokovoy <ab@samba.org>
----
- buildtools/wafsamba/samba_utils.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
-index 30e99432d1b..fd61b8425d8 100644
---- a/buildtools/wafsamba/samba_utils.py
-+++ b/buildtools/wafsamba/samba_utils.py
-@@ -448,6 +448,7 @@ def CHECK_MAKEFLAGS(bld):
-     if makeflags is None:
-         return
-     jobs_set = False
-+    jobs = None
-     # we need to use shlex.split to cope with the escaping of spaces
-     # in makeflags
-     for opt in shlex.split(makeflags):
-@@ -470,17 +471,21 @@ def CHECK_MAKEFLAGS(bld):
-             setattr(Options.options, opt[0:loc], opt[loc+1:])
-         elif opt[0] != '-':
-             for v in opt:
--                if v == 'j':
-+                if re.search(r'j[0-9]*$', v):
-                     jobs_set = True
-+                    jobs = opt.strip('j')
-                 elif v == 'k':
-                     Options.options.keep = True
--        elif opt == '-j':
-+        elif re.search(r'-j[0-9]*$', opt):
-             jobs_set = True
-+            jobs = opt.strip('-j')
-         elif opt == '-k':
-             Options.options.keep = True
-     if not jobs_set:
-         # default to one job
-         Options.options.jobs = 1
-+    elif jobs_set and jobs:
-+        Options.options.jobs = int(jobs)
- 
- Build.BuildContext.CHECK_MAKEFLAGS = CHECK_MAKEFLAGS
- 
--- 
-2.18.0
-

samba.spec

@@ -6,7 +6,7 @@
 # ctdb is enabled by default, you can disable it with: --without clustering
 %bcond_without clustering
 
-%define main_release 3
+%define main_release 4
 
 %define samba_version 4.9.0
 %define talloc_version 2.1.14
@@ -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 rc5
+%define pre_release %nil
 
 %if "x%{?pre_release}" != "x"
 %define samba_release 0.%{main_release}.%{pre_release}%{?dist}
@@ -122,7 +122,6 @@ Source14:       samba.pamd
 Source201:      README.downgrade
 
 Patch0:         samba-4.9.0rc5-stack-protector.patch
-Patch1:         samba-4.9.0rc5-parallel-builds.patch
 
 Requires(pre): /usr/sbin/groupadd
 Requires(post): systemd
@@ -3816,6 +3815,9 @@ fi
 %endif # with_clustering_support
 
 %changelog
+* Thu Sep 13 2018 Guenther Deschner <gdeschner@redhat.com> - 4.9.0-4
+- Update to Samba 4.9.0
+
 * Thu Sep 06 2018 Andreas Schneider <asn@redhat.com> - 4.9.0rc5-3
 - Update to Samba 4.9.0rc5
 

sources

@@ -1,2 +1,2 @@
-SHA512 (samba-4.9.0rc5.tar.asc) = c70796cd5ffdea99ce474c07695af652b21df41de0dfe9548eb178e37792eecef0acaa4610361a88dee2e8e67fd5ab1dfefb5c214ee7f31b6dc34f68400868ab
-SHA512 (samba-4.9.0rc5.tar.xz) = e6c1d49868044a3d7a33d5baf99a09869a6a3bfec6a81ee0042f381f7065215d0204f190b2a6cb679b4544e1ed31c34a0d7c0237f7ddcf72a94933cbae138d91
+SHA512 (samba-4.9.0.tar.xz) = 817a3645e5692228b77a433550053a7c1c567a9b4bef42d5588fb3a6fc5839bbb7a5253a5fefb28006c1b5254ad8f8797a595d0d2a6f1f1a93c6c9c94d232d04
+SHA512 (samba-4.9.0.tar.asc) = 9c9b8490e96142584afb104bcff35a5b5e4a8e8e4615e78f9b11b75ba786ef1c51e9c0972f9e5404339c1a0e670223148dee1741403640d2df8a10d47a13db44