_service

@@ -2,7 +2,7 @@
         <service name="tar_scm" mode="manual">
                 <param name="url">https://gitlab.suse.de/samba/suse-samba.git/</param>
                 <param name="scm">git</param>
-                <param name="revision">factory-4-21-stable</param>
+                <param name="revision">factory-4-20-stable</param>
                 <param name="versionformat">@PARENT_TAG@+git.@TAG_OFFSET@.%h</param>
                 <param name="versionrewrite-pattern">samba-(.*)</param>
                 <param name="versionrewrite-replacement">\1</param>

baselibs.conf

@@ -1,3 +1,4 @@
+libsamba-policy0-python3
 samba-winbind-libs
   requires "samba-client-libs-<targettype> = <version>"
   provides "samba-winbind-<targettype> = <version>"
@@ -53,7 +54,6 @@ samba-client-libs
   obsoletes "libsmbconf0-<targettype> < <version>"
   provides "libdcerpc0-<targettype> = <version>"
   obsoletes "libdcerpc0-<targettype> < <version>"
-  obsoletes "libsamba-policy0-python3-<targettype> < <version>"
 samba-ad-dc-libs
   requires "samba-client-libs-<targettype> = <version>"
   provides "samba-ad-dc-<targettype> = <version>"
@@ -67,9 +67,3 @@ samba-devel
   requires "samba-winbind-libs-<targettype> = <version>"
   provides "libnetapi-devel-<targettype> = <version>"
   obsoletes "libnetapi-devel-<targettype> < <version>"
-  provides "libsamba-policy-devel-<targettype> = <version>"
-  obsoletes "libsamba-policy-devel-<targettype> < <version>"
-  obsoletes "libsamba-policy-python3-devel-<targettype> < <version>"
-libldb2
-  obsoletes "libldb1-<targettype> < <version>"
-python3-ldb

samba-4.20.4+git.356.d4a5fa2a818.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b0123d3003e00ba69ffee9882044f5970632dea3d382c74c66c5e0fe7fdb400
+size 44922677

samba-4.21.4+git.390.43d401e5b77.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d21b5120c6c78752e688c8a5eb12609fe6ab0cd235c207212b7bf91de918e907
-size 45104877

samba.changes

@@ -1,178 +1,3 @@
--------------------------------------------------------------------
-Tue Feb 19 10:42:17 UTC 2025 - Samuel Cabrero <scabrero@suse.de>
-
-- Remove nscd build dependency and usage in RPM scriptlets;
-  (bsc#1237296);
-
--------------------------------------------------------------------
-Wed Feb 19 10:08:34 UTC 2025 - Noel Power <nopower@suse.com>
-
-- Update to 4.21.4
-  * Increasing slowness of sharesec performance with high number
-    of registry shares; (bso#15780).
-  * winbindd shows memleak in kerberos_decode_pac; (bso#15782).
-  * Creation of GPOs applicable to more than one group is
-    impossible with Samba 4.20.0 and later; (bso#15738).
-  * Replace `crypt` module in
-    python/samba/netcmd/user/readpasswords/common.py;
-    (bso#15756).
-  * vfs_gpfs silently garbles timestamps > year 2106;
-    (bso#15151).
-  * Spotlight search results don't show file size and creation
-    date; (bso#15796).
-  * General improvements for vfs_ceph_new module; (bso#15703).
-  * net offlinejoin not working correctly; (bso#15777).
-  * net ads create/join/winbind producing unix dysfunctional
-    keytabs; (bso#15759).
-  * Windows Explorer crashes on S-1-22-* Unix-SIDs when accessing
-    security tab; (bso#14213).
-  * The values from hresult_errstr_const and hresult_errstr are
-    reversed in 4.20 and 4.21; (bso#15769).
-  * Kerberos referral tickets are generated for principals in our
-    domain if we have a trust to a top level domain; (bso#15778).
-  * NETLOGON_NTLMV2_ENABLED is missing in the SamLogon*
-    user_flags field; (bso#15783).
-  * Regression: stack-use-after-return in crypt_as_best_we_can();
-    (bso#15784).
-  * libreplace:readline: gcc 15 complains about incompatible
-    pointer types; (bso#15788).
-
--------------------------------------------------------------------
-Tue Jan  7 10:22:16 UTC 2025 - Noel Power <nopower@suse.com>
-
-- Update to 4.21.3
-  * More possible replication loops against Azure AD;
-    (bso#15701).
-  * Compound rename from Mac clients can fail with
-    NT_STATUS_INTERNAL_ERROR if the file has a lease;
-    (bso#15697).
-  * vfs crossrename seems not work correctly; (bso#15724).
-  * After 'machine password timeout' /etc/krb5.keytab is not
-    updated; (bso#6750).
-  * Memory leak wbcCtxLookupSid; (bso#15771).
-  * Fix heap-user-after-free with association groups;
-    (bso#15765).
-  * Segfault in vfs_btrfs; (bso#15758).
-  * Avoid event failure race when disabling an event script;
-    (bso#15755).
-
--------------------------------------------------------------------
-Fri Dec  6 09:09:04 UTC 2024 - Noel Power <nopower@suse.com>
-
-- Update shipped /etc/samba/smb.conf to point to smb.conf
-  man page;(bsc#1233880).
-
--------------------------------------------------------------------
-Mon Nov 25 17:35:43 UTC 2024 - Noel Power <nopower@suse.com>
-
-- Update to 4.21.2
-  * smbd fails to correctly check sharemode against OVERWRITE
-    dispositions; (bso#15732).
-  * Panic in close_directory; (bso#15754).
-  * winexe no longer works with samba 4.21; (bso#15752).
-  * protocol error - Unclear debug message "pad length mismatch"
-    for invalid bind packet; (bso#14356).
-  * NetrGetLogonCapabilities QueryLevel 2 needs to be
-    implemented; (bso#15425).
-  * gss_accept_sec_context() from Heimdal does not imply
-    GSS_C_MUTUAL_FLAG with GSS_C_DCE_STYLE; (bso#15740).
-  * winbindd should call process_set_title() for locator child;
-    (bso#15749).
-  * Update CTDB to track all TCP connections to public IP
-    addresses; (bso#15320).
-
--------------------------------------------------------------------
-Thu Oct 31 13:20:25 UTC 2024 - Noel Power <nopower@suse.com>
-
-- Add placeholder changelog for sle15-sp7; (jsc#PED-11210).
-
--------------------------------------------------------------------
-Wed Oct  16 13:52:25 UTC 2024 - Noel Power <nopower@suse.com>
-
--  Adjust spec to split out rpcd_* binaries into a separate
-   sub package; (bsc#1231414).
-
--------------------------------------------------------------------
-Tue Oct 15 13:23:26 UTC 2024 - Noel Power <nopower@suse.com>
-
-- Update to 4.21.1
-  * DH reconnect error handling can lead to stale sharemode
-    entries; (bso#15624).
-  * "inherit permissions = yes" triggers assert() in vfs_default
-    when creating a stream; (bso#15695).
-  * Samba 4.21.0 broke FreeIPA domain member integration;
-    (bso#15715).
-  * Missing conversion for msDS-UserTGTLifetime, msDS-
-    ComputerTGTLifetime and msDS-ServiceTGTLifetime on "samba-
-    tool domain auth policy modify"; (bso#15692).
-  * irpc_destructor may crash during shutdown; (bso#15280).
-  * Durable handle is not granted when a previous OPEN exists
-    with NoOplock; (bso#15649).
-  * Durable handle is granted but reconnect fails; (bso#15651).
-  * Disconnected durable handles with RH lease should not be
-    purged by a new non conflicting open; (bso#15708).
-  * net ads testjoin and other commands use the wrong secrets.tdb
-    in a cluster; (bso#15714).
-  * 4.21 using --with-system-mitkrb5 requires MIT krb5 1.16 as
-    rfc 8009 etypes are used; (bso#15726).
-  * VFS_OPEN_HOW_WITH_BACKUP_INTENT breaks shadow_copy2;
-    (bso#15730).
-  * Samba 4.20.0 DLZ module crashes BIND on startup; (bso#15643).
-  * Cannot build libldb lmdb backend on a build without AD DC;
-    (bso#15721).
-  * Consistent log level for sighup handler; (bso#15706).
-
--------------------------------------------------------------------
-Wed Sep 25 14:52:10 UTC 2024 - Noel Power <nopower@suse.com>
-
-- Support needed packaging changes required update to samba-4.21.0
-  Update samba.spec, baselibs.conf to deliver libldb packages.
-
--------------------------------------------------------------------
-Thu Sep  5 07:29:17 UTC 2024 - David Disseldorp <ddiss@suse.com>
-
-- Package ceph_new VFS module.
-
--------------------------------------------------------------------
-Thu Sep  5 07:13:01 UTC 2024 - David Disseldorp <ddiss@suse.com>
-
-- Incorrect FSCTL_QUERY_ALLOCATED_RANGES response when truncated;
-  (bso#15699); (bsc#1229684).
-
--------------------------------------------------------------------
-Wed Aug 28 17:31:35 UTC 2024 - Noel Power <nopower@suse.com>
-
--  Bad variable definition for ParseTuple causing test failure for
-   Smb3UnixTests.test_create_context_reparse; (bso#15702).
-
--------------------------------------------------------------------
-Wed Aug 28 09:01:29 UTC 2024 - Noel Power <nopower@suse.com>
-
-- Update to 4.21.0
-  * Incorrect FSCTL_QUERY_ALLOCATED_RANGES response when
-    truncated; (bso#15699).
-  * Bad variable definition for ParseTuple causing test failure
-    for Smb3UnixTests.test_create_context_reparse; (bso#15702).
-  * Add new vfs_ceph module (based on low level API);
-    (bso#15686).
-  * samba-tool can not load the default configuration file;
-    (bso#15698).
-  * Crash when readlinkat fails; (bso#15700).
-  * Can't add/delete special keys to keytab for nfs, cifs, http
-    etc; (bso#15689).
-  * Compound SMB2 requests don't return
-    NT_STATUS_NETWORK_SESSION_EXPIRED for all requests, confuses
-    MacOSX clients; (bso#15696).
-  * --version-* options are still not ergonomic, and they reject
-    tilde characters; (bso#15673).
-  * ldb_version.h is missing from ldb public library;
-    (bso#15690).
-  * Can not add/delete special keys to keytab for nfs, cifs, http
-    etc; (bso#15689).
-  * undefined reference to winbind_lookup_name_ex; (bso#15687).
-  * per user veto and hide file syntax is to complex;
-    (bso#15688).
-
 -------------------------------------------------------------------
 Wed Aug  7 09:47:14 UTC 2024 - Noel Power <nopower@suse.com>
 

samba.spec

@@ -40,7 +40,8 @@
 
 %define talloc_version 2.4.2
 %define tevent_version 0.16.1
-%define tdb_version    1.4.12
+%define tdb_version    1.4.10
+%define ldb_version    2.9.1
 
 # This table represents the possible combinations of build macros.
 # They are defined only if not already defined in the build service
@@ -66,15 +67,6 @@
 %{!?with_dc: %define with_dc 0}
 %endif
 
-%global with_lmdb 0
-# LMDB only available on 64bit archs
-%ifarch x86_64 ppc64le aarch64
-# lmdb is only built when ad_dc is configured
-%if %{with_dc}
-%global with_lmdb 1
-%endif
-%endif
-
 # Define whether smbd is built with SMB1 disabled
 %{!?without_smb1_server: %define without_smb1_server 1}
 
@@ -90,13 +82,13 @@ BuildRequires:  perl-Parse-Yapp
 BuildRequires:  libarchive-devel
 BuildRequires:  libacl-devel
 BuildRequires:  libattr-devel
-BuildRequires:  libcmocka-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  cracklib-devel
 BuildRequires:  gdbm-devel
 BuildRequires:  keyutils-devel
 BuildRequires:  flex
 BuildRequires:  bison
+BuildRequires:  libnscd-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libtirpc-devel
@@ -114,9 +106,11 @@ BuildRequires:  rpcgen
 BuildRequires:  fdupes
 %define pkgconfig_req pkg-config
 BuildRequires:  %{pkgconfig_req}
+BuildRequires:  libldb-devel >= %{ldb_version}
 BuildRequires:  libtalloc-devel >= %{talloc_version}
 BuildRequires:  libtdb-devel >= %{tdb_version}
 BuildRequires:  libtevent-devel >= %{tevent_version}
+BuildRequires:  python3-ldb-devel >= %{ldb_version}
 BuildRequires:  python3-talloc-devel
 BuildRequires:  python3-tdb
 BuildRequires:  python3-tevent
@@ -141,8 +135,6 @@ BuildRequires:  libgnutls-devel >= 3.4.7
 BuildRequires:  gpgme-devel
 BuildRequires:  libjansson-devel
 BuildRequires:  python3-gpg
-BuildRequires:  lmdb-devel >= 0.9.16
-BuildRequires:  lmdb
 %if %{with_mit_dc}
 BuildRequires:  krb5-devel >= 1.15.1
 BuildRequires:  krb5-server >= 1.15.1
@@ -168,7 +160,7 @@ BuildRequires:  liburing-devel
 %endif
 BuildRequires:  sysuser-tools
 
-Version:        4.21.4+git.390.43d401e5b77
+Version:        4.20.4+git.356.d4a5fa2a818
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -186,7 +178,6 @@ Requires:       coreutils
 Requires:       system-user-nobody
 Requires:       %{fillup_prereq}
 Requires:       samba-client >= %{version}
-Requires:       samba-dcerpc = %{version}
 Requires:       sysuser-shadow
 Provides:       group(ntadmin)
 
@@ -307,9 +298,6 @@ Provides:       libnetapi-devel = %{version}
 Obsoletes:      libnetapi-devel < %{version}
 Provides:       libwbclient-devel = %{version}
 Obsoletes:      libwbclient-devel < %{version}
-Provides:       libsamba-policy-devel = %{version}
-Obsoletes:      libsamba-policy-devel < %{version}
-Obsoletes:      libsamba-policy-python3-devel < %{version}
 
 %description devel
 This package contains the libraries and header files needed to
@@ -373,7 +361,6 @@ Provides:       libsmbconf0 = %{version}
 Obsoletes:      libsmbconf0 < %{version}
 Provides:       libdcerpc0 = %{version}
 Obsoletes:      libdcerpc0 < %{version}
-Obsoletes:      libsamba-policy0-python3 < %{version}
 
 %description client-libs
 The samba-libs package contains the libraries needed by samba client
@@ -406,6 +393,7 @@ Summary:        Samba Python3 libraries
 License:        GPL-3.0-or-later
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
+Requires:       libsamba-policy0-python3 = %{version}
 Requires:       python3-ldb
 Requires:       python3-talloc
 Requires:       python3-tdb
@@ -457,12 +445,12 @@ Obsoletes:      samba-gplv3-winbind < %{version}
 Provides:       samba-client:/usr/sbin/winbindd
 Provides:       group(winbind)
 Requires:       pam-config
+Recommends:     /usr/sbin/nscd
 Recommends:     cron
 Recommends:     logrotate
 Requires:       coreutils
 Requires:       samba-client = %{version}
 Requires:       samba-winbind-libs = %{version}
-Requires:       samba-dcerpc = %{version}
 Recommends:     samba-gpupdate = %{version}
 Requires:       sysuser-shadow
 
@@ -484,14 +472,6 @@ Requires(postun):/sbin/ldconfig
 %description winbind-libs
 This package contains the libraries required by the Winbind daemon.
 
-%package dcerpc
-Summary:	Samba dcerpc service binaries
-License:        GPL-3.0-or-later
-Group:          System/Daemons
-
-%description dcerpc
-This packages contains the binaries for the DCE/RPC endpoint servers.
-
 %package -n ctdb
 Summary:        Clustered TDB
 License:        GPL-3.0-or-later
@@ -522,6 +502,34 @@ The CTDB Performance Co-Pilot (PCP) monitoring agent allows remote PCP
 clients to view and capture detailed real-time performance metrics for
 one or more cluster nodes.
 
+%package -n libsamba-policy0-python3
+Summary:        Active Directory Group Policy library
+License:        GPL-3.0-or-later
+Group:          System/Libraries
+
+%description -n libsamba-policy0-python3
+This subpackage contains the python3 library for policy management.
+
+%package -n libsamba-policy-devel
+Summary:        Development files for the Samba AD Group Policy library
+License:        GPL-3.0-or-later
+Group:          Development/Libraries/C and C++
+Requires:       libsamba-policy-python3-devel = %{version}
+
+%description -n libsamba-policy-devel
+This subpackage contains libraries and header files for developing
+applications that want to make use of libsamba-policy.
+
+%package -n libsamba-policy-python3-devel
+Summary:        Development files for the Samba AD Group Policy library
+License:        GPL-3.0-or-later
+Group:          Development/Libraries/C and C++
+Requires:       libsamba-policy0-python3 = %{version}
+
+%description -n libsamba-policy-python3-devel
+This subpackage contains libraries and header files for developing
+applications that want to make use of libsamba-policy.
+
 %package ceph
 Summary:        Ceph specific add-ons for Samba
 License:        GPL-3.0-or-later
@@ -583,14 +591,12 @@ Summary:        Samba LDB modules
 License:        GPL-3.0-or-later
 Group:          Productivity/Networking/Samba
 # The ldb modules provided by this package check their own version matches
-# the libldb2 version. If the version do not match (e.g. libldb2 version
+# the libldb2 version. It the version do not match (e.g. libldb2 version
 # is updated and samba-dsdb-modules is not rebuilt against it) programs using
 # libldb2 won't start. The requires_eq macro will require the libldb2 version
 # available at build time without having to manually maintain the global
 # ldb_version variable in this spec file (bsc#1118508, bsc#1199362)
-# NOTE 4.21 update. If ldb is built from this spec, this problem goes away and
+%requires_eq libldb2
-# it is enough with requiring libldb2 = %{version}
-Requires:       libldb2 = %{version}
 Requires:       samba-ldb-ldap = %{version}
 Requires(post): /sbin/ldconfig
 Requires(postun):/sbin/ldconfig
@@ -599,44 +605,6 @@ Requires(postun):/sbin/ldconfig
 This package contains plugins which add Active Directory features to the
 LDB library.
 
-
-%package -n libldb2
-Summary:        An LDAP-like embedded database
-License:        LGPL-3.0-or-later
-Obsoletes:      libldb1 < %{version}
-
-%description -n libldb2
-LDB is an LDAP-like embedded database.
-
-%package -n libldb-devel
-Summary:        Libraries and Header Files to Develop Programs with ldb2 Support
-Group:          Development/Libraries/C and C++
-Requires:       libldb2 = %{version}
-Requires:       pkg-config
-
-%description -n libldb-devel
-LDB is an LDAP-like embedded database.
-
-Libraries and Header Files to Develop Programs with ldb2 Support.
-
-%package -n ldb-tools
-Summary:        Tools to manipulate LDB files
-Group:          Development/Libraries/C and C++
-
-%description -n ldb-tools
-Tools to manipulate LDB files.
-
-%package -n python3-ldb
-Summary:        Python3 bindings for the LDB library
-Group:          Development/Libraries/Python
-Requires:       libldb2 = %{version}
-Obsoletes:      python-ldb < %{version}
-Obsoletes:      python3-ldb-devel < %{version}
-
-%description -n python3-ldb
-This package contains the python3 bindings for the LDB library.
-
-
 %prep
 %setup -n samba-%{version} -q
 # Create and add vendor suffix
@@ -678,14 +646,9 @@ fi
 
 export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS -I/usr/include/tirpc"
 export LDFLAGS="-ltirpc"
-
-bundled_libraries="NONE"
 %if ! 0%{?with_mscat}
-bundled_libraries+=",libtasn1"
+bundled_libraries_extra+=",libtasn1"
 %endif
-
-private_libraries="!ldb"
-
 CONFIGURE_OPTIONS="\
 	--prefix=%{_prefix} \
 	--localstatedir=%{_localstatedir} \
@@ -700,10 +663,6 @@ CONFIGURE_OPTIONS="\
 	--disable-rpath-install \
 	--enable-debug \
 	--with-profiling-data \
-	--private-libraries=${private_libraries} \
-%if !%{with_lmdb}
-	--without-ldb-lmdb \
-%endif
 %if 0%{?build_ctdb_pmda}
 	--enable-pmda \
 %endif
@@ -734,7 +693,7 @@ CONFIGURE_OPTIONS="\
 	--with-experimental-mit-ad-dc \
 %endif
 %endif
-	--bundled-libraries=NONE,${bundled_libraries} \
+	--bundled-libraries=NONE,socket_wrapper,cmocka,${bundled_libraries_extra} \
 	--without-fam \
 %if 0%{?suse_version} > 1500
 %if %{without_smb1_server}
@@ -812,6 +771,8 @@ for file in README COPYING doc/examples doc/*.html doc/readonlyrecords.txt ; do
 	cp -a ctdb/${file} %{buildroot}/%{_defaultdocdir}/ctdb
 done
 touch %{buildroot}/%{_sysconfdir}/ctdb/nodes
+# sudo can be used by statd-callout, but is not needed
+rm %{buildroot}/%{_sysconfdir}/sudoers.d/ctdb
 # install the config_migrate.sh script to move to new 4.9+ ctdb configuration
 install -m 0744 ctdb/doc/examples/config_migrate.sh %{buildroot}/%{_sysconfdir}/ctdb/config_migrate.sh
 
@@ -823,8 +784,9 @@ for i in $scripts; do
 done
 # configuration files
 pushd packaging/SuSE/
-echo "# smb.conf is the main Samba configuration file. see man smb.conf " >config/smb.conf
+echo "# smb.conf is the main Samba configuration file. You find a full commented" >config/smb.conf
-echo "# for full details." >>config/smb.conf
+echo "# version at %{DOCDIR}/examples/smb.conf.%{VENDOR} if the" >>config/smb.conf
+echo "# samba-doc package is installed." >>config/smb.conf
 grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf
 install -p -m 0644 config/smb.conf.vendor ../../examples/smb.conf.%{VENDOR}
 for file in smb.conf lmhosts smbusers smbpasswd smbusers; do
@@ -928,7 +890,6 @@ for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do
 	# if built we don't want ceph VFS modules in the base package
 	case "${file#%{buildroot}}" in
 		%{_libdir}/samba/vfs/ceph.so) continue ;;
-		%{_libdir}/samba/vfs/ceph_new.so) continue ;;
 		%{_libdir}/samba/vfs/ceph_snapshots.so) continue ;;
 	esac
 	echo "${file#%{buildroot}}" >>%{_builddir}/samba-%{version}/filelist-samba
@@ -939,12 +900,6 @@ for file in %{buildroot}%{_mandir}/man8/vfs_*; do
 		%{_mandir}/man8/vfs_ceph.8)
 %if 0%{?build_ceph} == 0
 			rm ${file}
-%endif
-			continue
-			;;
-		%{_mandir}/man8/vfs_ceph_new.8)
-%if 0%{?build_ceph} == 0
-			rm ${file}
 %endif
 			continue
 			;;
@@ -1052,6 +1007,8 @@ fi
 %postun client
 /sbin/ldconfig
 
+%post   -n libsamba-policy0-python3 -p /sbin/ldconfig
+%postun -n libsamba-policy0-python3 -p /sbin/ldconfig
 %post client-libs -p /sbin/ldconfig
 %postun client-libs -p /sbin/ldconfig
 %post libs -p /sbin/ldconfig
@@ -1076,6 +1033,7 @@ fi
 
 %post dsdb-modules
 rm -f %{_libdir}/ldb/samba
+ln -sf %{_libdir}/samba/ldb %{_libdir}/ldb2/modules/ldb/samba
 /sbin/ldconfig
 
 %postun dsdb-modules -p /sbin/ldconfig
@@ -1110,6 +1068,10 @@ done
 /sbin/ldconfig
 if [ $1 -eq 0 ]; then
 %{_sbindir}/pam-config --delete --winbind
+if [ -x %{_sbindir}/nscd ]; then
+	%{_sbindir}/nscd -i passwd
+	%{_sbindir}/nscd -i group
+fi
 fi
 %service_del_postun winbind.service
 
@@ -1157,12 +1119,6 @@ exit 0
 %service_del_postun ctdb.service
 exit 0
 
-%post -n libldb2 -p /sbin/ldconfig
-%postun -n libldb2 -p /sbin/ldconfig
-
-%post -n python3-ldb -p /sbin/ldconfig
-%postun -n python3-ldb -p /sbin/ldconfig
-
 %files -f filelist-samba
 %defattr(-,root,root)
 %{_unitdir}/nmb.service
@@ -1190,8 +1146,16 @@ exit 0
 %{_sbindir}/rcnmb
 %{_sbindir}/rcsmb
 %{_sbindir}/smbd
-
+%{_libdir}/samba/rpcd_classic
+%{_libdir}/samba/rpcd_epmapper
+%{_libdir}/samba/rpcd_fsrvp
+%{_libdir}/samba/rpcd_lsad
+%{_libdir}/samba/rpcd_mdssvc
+%{_libdir}/samba/rpcd_spoolss
+%{_libdir}/samba/rpcd_winreg
+%{_libdir}/samba/rpcd_witness
 %{_libdir}/samba/samba-bgqd
+%{_libdir}/samba/samba-dcerpcd
 %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/nmb.xml
 %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml
 %dir %{_datadir}/samba
@@ -1202,6 +1166,7 @@ exit 0
 %{_mandir}/man8/nmbd.8.*
 %{_mandir}/man8/smbd.8.*
 %{_mandir}/man8/samba-bgqd.8.*
+%{_mandir}/man8/samba-dcerpcd.8.*
 %{_fillupdir}/sysconfig.samba
 %{_sysusersdir}/samba.conf
 
@@ -1324,7 +1289,6 @@ exit 0
 %_includedir/samba-4.0/passdb.h
 %_includedir/samba-4.0/netapi.h
 %_includedir/samba-4.0/libsmbclient.h
-%_includedir/samba-4.0/policy.h
 %dir %_includedir/samba-4.0/core/
 %_includedir/samba-4.0/core/doserr.h
 %_includedir/samba-4.0/core/error.h
@@ -1428,8 +1392,6 @@ exit 0
 %{_libdir}/pkgconfig/netapi.pc
 %{_libdir}/libsmbclient.so
 %{_libdir}/pkgconfig/smbclient.pc
-%{_libdir}/libsamba-policy.so
-%{_libdir}/pkgconfig/samba-policy.pc
 %{_mandir}/man7/libsmbclient.7.*
 %if %{with_dc}
 %{_includedir}/samba-4.0/dcerpc_server.h
@@ -1463,7 +1425,6 @@ exit 0
 %{_libdir}/samba/libads-private-samba.so
 %{_libdir}/samba/libasn1util-private-samba.so
 %{_libdir}/samba/libauth-private-samba.so
-%{_libdir}/samba/libutil-crypt-private-samba.so
 %if %{with_dc}
 %{_libdir}/samba/libauthn-policy-util-private-samba.so
 %endif
@@ -1532,6 +1493,7 @@ exit 0
 %{_libdir}/samba/libtalloc-report-printf-private-samba.so
 %{_libdir}/samba/libtdb-wrap-private-samba.so
 %{_libdir}/samba/libtime-basic-private-samba.so
+%{_libdir}/samba/libtrusts-util-private-samba.so
 %{_libdir}/samba/libutil-reg-private-samba.so
 %{_libdir}/samba/libutil-setid-private-samba.so
 %{_libdir}/samba/libutil-tdb-private-samba.so
@@ -1562,12 +1524,11 @@ exit 0
 %{_libdir}/samba/libtalloc-report-private-samba.so
 %{_libdir}/samba/libtorture-private-samba.so
 %{_libdir}/samba/libxattr-tdb-private-samba.so
+%{_libdir}/samba/libcmocka-private-samba.so
 %{_libdir}/samba/libREG-FULL-private-samba.so
 %{_libdir}/samba/libRPC-SERVER-LOOP-private-samba.so
 %{_libdir}/samba/libRPC-WORKER-private-samba.so
 %{_libdir}/samba/libdsdb-module-private-samba.so
-%{_libdir}/samba/libsamba-net-private-samba.so
-%{_libdir}/libsamba-policy.so.*
 %if ! %{with_mitkrb5}
 %{_libdir}/samba/libasn1-private-samba.so
 %{_libdir}/samba/libcom-err-private-samba.so
@@ -1585,13 +1546,12 @@ exit 0
 %endif
 
 %files libs-python3
-%{_libdir}/samba/libsamba-net-join.%{py3_soflags_dash}-private-samba.so
+%{_libdir}/samba/libsamba-net.%{py3_soflags_dash}-private-samba.so
 %{_libdir}/samba/libsamba-python.%{py3_soflags_dash}-private-samba.so
 
 %files python3
 %defattr(-,root,root)
-%dir %{python3_sitearch}/samba
+%{python3_sitearch}/*
-%{python3_sitearch}/samba/*
 
 %files gpupdate
 %defattr(-,root,root)
@@ -1656,19 +1616,6 @@ exit 0
 %{_mandir}/man8/winbind_krb5_localauth.8.*
 %endif
 
-%files dcerpc
-%defattr(-,root,root)
-%{_libdir}/samba/rpcd_classic
-%{_libdir}/samba/rpcd_epmapper
-%{_libdir}/samba/rpcd_fsrvp
-%{_libdir}/samba/rpcd_lsad
-%{_libdir}/samba/rpcd_mdssvc
-%{_libdir}/samba/rpcd_spoolss
-%{_libdir}/samba/rpcd_winreg
-%{_libdir}/samba/rpcd_witness
-%{_libdir}/samba/samba-dcerpcd
-%{_mandir}/man8/samba-dcerpcd.8.*
-
 %files winbind -f filelist-samba-winbind
 %defattr(-,root,root)
 %config(noreplace) %_pam_secconfdir/pam_winbind.conf
@@ -1711,8 +1658,6 @@ exit 0
 %dir %{_datadir}/ctdb/events
 %dir %{_datadir}/ctdb/events/legacy
 %{_datadir}/ctdb/events/legacy/*
-%dir %{_datadir}/ctdb/scripts
-%{_datadir}/ctdb/scripts/winbind_ctdb_updatekeytab.sh
 %dir %{_sysconfdir}/ctdb/events
 %dir %{_sysconfdir}/ctdb/events/notification
 %{_sysconfdir}/ctdb/events/notification/README
@@ -1746,8 +1691,6 @@ exit 0
 %{_libdir}/ctdb/ctdb_lvs
 %{_libdir}/ctdb/ctdb_mutex_fcntl_helper
 %{_libdir}/ctdb/tdb_mutex_check
-%{_libdir}/ctdb/statd_callout
-%{_libdir}/ctdb/statd_callout_helper
 %dir %{_localstatedir}/lib/ctdb
 %dir %{_localstatedir}/lib/ctdb/persistent
 %dir %{_localstatedir}/log/ctdb
@@ -1781,13 +1724,26 @@ exit 0
 %{_localstatedir}/lib/pcp/pmdas/ctdb/pmdactdb
 %{_localstatedir}/lib/pcp/pmdas/ctdb/pmns
 %endif
+
+%files -n libsamba-policy0-python3
+%defattr(-,root,root)
+%_libdir/libsamba-policy.%{py3_soflags_dash}.so.0*
+
+%files -n libsamba-policy-devel
+%defattr(-,root,root)
+%dir %_includedir/samba-4.0/
+%_includedir/samba-4.0/policy.h
+
+%files -n libsamba-policy-python3-devel
+%defattr(-,root,root)
+%_libdir/libsamba-policy.%{py3_soflags_dash}.so
+%_libdir/pkgconfig/samba-policy.%{py3_soflags}.pc
+
 %if 0%{?build_ceph}
 %files ceph
 %defattr(-,root,root)
 %{_mandir}/man8/vfs_ceph.8.*
 %{_libdir}/samba/vfs/ceph.so
-%{_mandir}/man8/vfs_ceph_new.8.*
-%{_libdir}/samba/vfs/ceph_new.so
 %{_mandir}/man8/vfs_ceph_snapshots.8.*
 %{_libdir}/samba/vfs/ceph_snapshots.so
 %{_mandir}/man7/ctdb_mutex_ceph_rados_helper.7.*
@@ -1912,7 +1868,6 @@ exit 0
 
 %files ldb-ldap
 %defattr(-,root,root)
-%{_libdir}/samba/ldb/ldap.so
 %{_libdir}/samba/ldb/ildap.so
 %{_libdir}/samba/ldb/ldbsamba_extensions.so
 
@@ -2010,58 +1965,4 @@ exit 0
 %{_libdir}/samba/ldb/count_attrs.so
 %endif
 
-%files -n libldb2
-%{_libdir}/libldb.so.*
-%{_libdir}/samba/libldb-key-value-private-samba.so
-%{_libdir}/samba/libldb-tdb-err-map-private-samba.so
-%{_libdir}/samba/libldb-tdb-int-private-samba.so
-%dir %{_libdir}/samba/ldb
-%{_libdir}/samba/ldb/asq.so
-%{_libdir}/samba/ldb/paged_searches.so
-%{_libdir}/samba/ldb/rdn_name.so
-%{_libdir}/samba/ldb/sample.so
-%{_libdir}/samba/ldb/server_sort.so
-%{_libdir}/samba/ldb/skel.so
-%{_libdir}/samba/ldb/tdb.so
-%{_libdir}/samba/ldb/ldb.so
-%if %{with_lmdb}
-%{_libdir}/samba/libldb-mdb-int-private-samba.so
-%{_libdir}/samba/ldb/mdb.so
-%endif
-
-%files -n libldb-devel
-%{_includedir}/samba-4.0/ldb.h
-%{_includedir}/samba-4.0/ldb_errors.h
-%{_includedir}/samba-4.0/ldb_handlers.h
-%{_includedir}/samba-4.0/ldb_module.h
-%{_includedir}/samba-4.0/ldb_version.h
-%{_libdir}/libldb.so
-%{_libdir}/pkgconfig/ldb.pc
-%{_mandir}/man3/ldb*.3.*
-
-%files -n ldb-tools
-%defattr(-,root,root)
-%{_bindir}/ldbadd
-%{_bindir}/ldbdel
-%{_bindir}/ldbedit
-%{_bindir}/ldbmodify
-%{_bindir}/ldbrename
-%{_bindir}/ldbsearch
-%{_libdir}/samba/libldb-cmdline-private-samba.so
-%{_mandir}/man1/ldbadd.1.*
-%{_mandir}/man1/ldbdel.1.*
-%{_mandir}/man1/ldbedit.1.*
-%{_mandir}/man1/ldbmodify.1.*
-%{_mandir}/man1/ldbrename.1.*
-%{_mandir}/man1/ldbsearch.1.*
-
-%files -n python3-ldb
-%defattr(-,root,root)
-%{_libdir}/samba/libpyldb-util.%{py3_soflags_dash}-private-samba.so
-%{python3_sitearch}/_ldb_text.py
-%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?rhel_version} > 599
-%{python3_sitearch}/__pycache__/_ldb_text.cpython-*.py[co]
-%endif
-%{python3_sitearch}/ldb.%{py3_soflags}.so
-
 %changelog