From 5440789625bb8ca8e25d0eaaeafde0be1c7ca9e6b6c7ecadd946d1f2156cedeb Mon Sep 17 00:00:00 2001
From: James McDonough <jmcdonough@suse.com>
Date: Fri, 12 Oct 2018 17:15:14 +0000
Subject: [PATCH] Accepting request 641729 from
 home:dmulder:branches:network:samba:STABLE

- Backport latest gpo code from master
  + Read policy from local gpt cache
  + Offline policy application
  + Make group policy extensible via register/unregister gpext
  + gpext's run via a process_group_policy method
- Enable profiling data collection
- Change samba-kdc package name to samba-ad-dc
- Move samba-ad-dc.service to the samba-ad-dc package

OBS-URL: https://build.opensuse.org/request/show/641729
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=604
---
 samba-4.9.1+git.46.ff87d06bace.tar.bz2 |  3 ---
 samba-4.9.1+git.92.d4295681555.tar.bz2 |  3 +++
 samba.changes                          | 20 ++++++++++++++++++++
 samba.spec                             | 23 ++++++++++++-----------
 4 files changed, 35 insertions(+), 14 deletions(-)
 delete mode 100644 samba-4.9.1+git.46.ff87d06bace.tar.bz2
 create mode 100644 samba-4.9.1+git.92.d4295681555.tar.bz2

diff --git a/samba-4.9.1+git.46.ff87d06bace.tar.bz2 b/samba-4.9.1+git.46.ff87d06bace.tar.bz2
deleted file mode 100644
index 34eb978..0000000
--- a/samba-4.9.1+git.46.ff87d06bace.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb8a7730943aaba9e30d3a483b1142c01136ffac3a95c55c0b256d7f4e1abf0b
-size 24608604
diff --git a/samba-4.9.1+git.92.d4295681555.tar.bz2 b/samba-4.9.1+git.92.d4295681555.tar.bz2
new file mode 100644
index 0000000..f2a2b9c
--- /dev/null
+++ b/samba-4.9.1+git.92.d4295681555.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9283c80c0b723f02fcb2e4f7b0b0a0dca02368ed7bed5704e8208eb2f15cde8
+size 24629045
diff --git a/samba.changes b/samba.changes
index 183bbb6..999a593 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Oct 12 14:58:08 UTC 2018 - dmulder@suse.com
+
+- Backport latest gpo code from master
+  + Read policy from local gpt cache
+  + Offline policy application
+  + Make group policy extensible via register/unregister gpext
+  + gpext's run via a process_group_policy method
+
+-------------------------------------------------------------------
+Wed Sep 26 22:45:40 UTC 2018 - jmcdonough@suse.com
+
+- Enable profiling data collection
+
+-------------------------------------------------------------------
+Tue Sep 25 20:26:47 UTC 2018 - dmulder@suse.com
+
+- Change samba-kdc package name to samba-ad-dc
+- Move samba-ad-dc.service to the samba-ad-dc package
+
 -------------------------------------------------------------------
 Mon Sep 24 09:43:08 UTC 2018 - Samuel Cabrero <scabrero@suse.de>
 
diff --git a/samba.spec b/samba.spec
index 114cba9..b84583c 100644
--- a/samba.spec
+++ b/samba.spec
@@ -168,7 +168,7 @@ BuildRequires:  krb5-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        4.9.1+git.46.ff87d06bace
+Version:        4.9.1+git.92.d4295681555
 Release:        0
 Url:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -929,8 +929,8 @@ The Ceph VFS module for Samba allows shares to be backed by the Ceph
 distributed file system. A Ceph CTDB lock helper binary is included so
 that RADOS locks can be used for CTDB split-brain avoidance.
 
-%package kdc
-Summary:        Samba MIT KDC
+%package ad-dc
+Summary:        Samba MIT ADDC
 License:        GPL-3.0-or-later
 Group:          Productivity/Networking/Samba
 Requires:       samba = %{version}
@@ -939,9 +939,11 @@ Recommends:     krb5-server >= 1.15.1
 Requires:       samba-python = %{version}
 Recommends:     samba-winbind = %{version}
 Recommends:     tdb-tools >= %{tdb_version}
+Provides:       samba-kdc = %{version}
+Obsoletes:      samba-kdc < %{version}
 
-%description kdc
-This package contains the KDC
+%description ad-dc
+This package contains the Active Directory Domain Controller
 
 %package dsdb-modules
 Summary:        Samba LDB modules
@@ -1020,6 +1022,7 @@ CONFIGURE_OPTIONS="\
 	--disable-rpath \
 	--disable-rpath-install \
 	--enable-debug \
+	--with-profiling-data \
 %if 0%{?build_ctdb_pmda}
 	--enable-pmda \
 %endif
@@ -1527,8 +1530,8 @@ fi
 %postun test -p /sbin/ldconfig
 
 %if %{with_dc}
-%post kdc -p /sbin/ldconfig
-%postun kdc -p /sbin/ldconfig
+%post ad-dc -p /sbin/ldconfig
+%postun ad-dc -p /sbin/ldconfig
 
 %post dsdb-modules
 ln -sf %{_libdir}/samba/ldb %{_libdir}/ldb/samba
@@ -1654,9 +1657,6 @@ exit 0
 %else
 %{_unitdir}/nmb.service
 %{_unitdir}/smb.service
-%if %{with_dc}
-%{_unitdir}/samba-ad-dc.service
-%endif
 %endif
 %if 0%{?suse_version} < 1111
 %attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbpasswd
@@ -2491,7 +2491,8 @@ exit 0
 %endif
 
 %if %{with_dc}
-%files kdc
+%files ad-dc
+%{_unitdir}/samba-ad-dc.service
 %{_bindir}/samba-tool
 %{_sbindir}/samba
 %{_sbindir}/samba_dnsupdate