Accepting request 433727 from network:samba:STABLE

Fix segfault in libnss_wins; (bso#12277); (bso#12269); (bsc#995730). OBS-URL: https://build.opensuse.org/request/show/433727 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=205
2016-11-03 10:10:59 +00:00
parent 0c45e6ed6b a0add68146
commit 813119cd02
8 changed files with 185 additions and 119 deletions
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f0a35855853aad21e788bd416b9727fa3f0ef0bde188c277c094a50012d57b0
-size 41711
+oid sha256:e3ddab53613da0d8e042bd61d1cd2f0631646827ec10264e5aaa90857aa39af0
+size 43478
--- a/samba-4.4.5.tar.asc
+++ b/samba-4.4.5.tar.asc
@@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iD8DBQBXe2QbbzORW2Vot+oRAkG4AKC1my5Id4fRSeG5lXivxdKDrbIeXACggaF/
-Av57apwb3KAn5tdPJMse0MU=
-=foIb
-----END PGP SIGNATURE-----
--- a/samba-4.4.5.tar.gz
+++ b/samba-4.4.5.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b876ef2e63f66265490e80a122e66ef2d7616112b839df68f56ac2e1ce17a7bd
-size 20715838
--- a/samba-4.5.0.tar.asc
+++ b/samba-4.5.0.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iD8DBQBX0CsibzORW2Vot+oRAuywAJwI2T4CkeTGUL/2ZBmqIYwJeTGlfQCeO1CQ
+imC1dU+VLVvoMv9CtqY8d1Y=
+=k4tw
+-----END PGP SIGNATURE-----
--- a/samba-4.5.0.tar.gz
+++ b/samba-4.5.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3a9a439b746ddd2c5f119f60c72ef8a026bcee1efb1199bf19e44f114f6b586
+size 20937551
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,52 @@
+-------------------------------------------------------------------
+Mon Sep 26 17:55:13 UTC 2016 - nopower@suse.com
+
+- Include vfstest in samba-test; (bsc#1001203).
+
+-------------------------------------------------------------------
+Wed Sep 21 08:55:37 UTC 2016 - nopower@suse.com
+
+- s3/winbindd: using default domain with user@domain.com format
+  fails; (bsc#997833).
+
+-------------------------------------------------------------------
+Tue Sep 20 18:25:21 UTC 2016 - jmcdonough@suse.com
+
+- Fix segfault in libnss_wins; (bso#12277); (bso#12269); (bsc#995730).
+
+-------------------------------------------------------------------
+Wed Sep 14 09:03:18 UTC 2016 - jmcdonough@suse.com
+
+- Update to 4.5.0
+  + NTLM1 Authentication disabled by default
+  + SMB2.1 leases enabled by default
+  + Support for OFD locks
+  + ctdb tool rewritten
+  + Added shadow copy snapshot prefix parameter
+
+-------------------------------------------------------------------
+Tue Aug 30 09:47:01 UTC 2016 - nopower@suse.com
+
+- Fix illegal memory access after memory has been deleted;
+  (bso#11836); (bsc#975299).
+
+-------------------------------------------------------------------
+Mon Aug 15 14:54:14 UTC 2016 - ddiss@suse.com
+
+- Don't package man pages for VFS modules that aren't built;
+  (boo#993707).
+
+-------------------------------------------------------------------
+Sat Aug 13 14:41:26 UTC 2016 - jmcdonough@suse.com
+
+- Fix population of ctdb sysconfig after source merge; (bsc#981566).
+
+-------------------------------------------------------------------
+Fri Aug 12 16:22:33 UTC 2016 - ddiss@suse.com
+
+- Enable vfs_ceph builds for Factory (x86-64)
+  + Package as samba-ceph to avoid Ceph dependency in base package.
+
 -------------------------------------------------------------------
 Thu Jul  7 15:20:14 UTC 2016 - jmcdonough@suse.com

--- a/samba.spec
+++ b/samba.spec
@@ -21,6 +21,11 @@
 %if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315
 %define         build_ctdb_pmda 1
 %endif
+%if 0%{?suse_version} > 1320
+%ifarch x86_64
+%define         build_vfs_ceph 1
+%endif
+%endif

 Name:           samba
 BuildRequires:  cups-devel
@@ -120,7 +125,10 @@ BuildRequires:  systemd-devel
 %if 0%{?build_ctdb_pmda}
 BuildRequires:  libpcp-devel
 %endif
-%define	samba_ver 4.4.5
+%if 0%{?build_vfs_ceph}
+BuildRequires:  libcephfs-devel
+%endif
+%define	samba_ver 4.5.0
 %define	samba_ver_suffix %nil
 %if "%{samba_ver_suffix}" == ""
 %define samba_source_location https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -142,11 +150,11 @@ BuildRequires:  libpcp-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3678
+%define SOURCE_TIMESTAMP 3712
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
-Version:        4.4.5
+Version:        4.5.0
 Release:        0
 Url:            https://www.samba.org/
 Obsoletes:      samba-gplv3 < %{version}
@@ -165,14 +173,14 @@ Source1:        vendor-files.tar.bz2
 Source2:        patches.tar.bz2
 Source4:        baselibs.conf
 Source100:      samba-client-rpmlintrc
-PreReq:         /usr/bin/getent
-PreReq:         /usr/sbin/groupadd
-PreReq:         coreutils
-PreReq:         grep
+Requires:       /usr/bin/getent
+Requires:       /usr/sbin/groupadd
+Requires:       coreutils
+Requires:       grep
 %if 0%{?suse_version} > 1220
-PreReq:         %{fillup_prereq}
+Requires:       %{fillup_prereq}
 %endif
-PreReq:         samba-client >= %{version}
+Requires:       samba-client >= %{version}
 # Choose some features / extra packages here
 ############################################
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
@@ -255,11 +263,11 @@ Provides:       smbfs
 Obsoletes:      samba-gplv3-client < %{version}
 Obsoletes:      samba-client-gplv2 < %{version}
 %if 0%{?suse_version} > 0
-PreReq:         %{?insserv_prereq}
+Requires:       %{?insserv_prereq}
 %endif
-PreReq:         /sbin/chkconfig
-PreReq:         /sbin/ldconfig
-PreReq:         coreutils
+Requires:       /sbin/chkconfig
+Requires:       /sbin/ldconfig
+Requires:       coreutils
 %{?systemd_requires}
 Requires:       cifs-utils

@@ -305,8 +313,8 @@ Branch:         %{BRANCH}
 Summary:        Samba Documentation
 License:        GPL-3.0+
 Group:          Documentation/Other
-PreReq:         coreutils
-PreReq:         findutils
+Requires:       coreutils
+Requires:       findutils
 Obsoletes:      samba-gplv3-doc < %{version}
 Obsoletes:      samba-doc-gplv2 < %{version}
 %if 0%{?suse_version} > 1110
@@ -328,7 +336,7 @@ Summary:        Samba libraries
 License:        GPL-3.0+
 Group:          Development/Libraries/C and C++
 Requires:       krb5
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 %if 0%{?suse_version} > 1210 &&  0%{?suse_version} < 1315
 Requires:       libfam0-gamin
 %endif
@@ -383,7 +391,7 @@ License:        GPL-3.0+
 Group:          Applications/System
 Requires:       samba = %{version}
 Requires:       samba-winbind = %{version}
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig

 %description test
 samba-test provides testing tools for both the server and client
@@ -409,12 +417,12 @@ Recommends:     logrotate
 Recommends:     /usr/sbin/nscd
 %endif
 %if 0%{?suse_version} > 0
-PreReq:         %{?insserv_prereq}
+Requires:       %{?insserv_prereq}
 %endif
-PreReq:         /sbin/ldconfig
-PreReq:         /usr/sbin/groupadd
-PreReq:         coreutils
-PreReq:         samba-client >= %{version}
+Requires:       /sbin/ldconfig
+Requires:       /usr/sbin/groupadd
+Requires:       coreutils
+Requires:       samba-client >= %{version}

 %description winbind
 This is the winbind-daemon and the wbinfo-tool.
@@ -942,7 +950,7 @@ Obsoletes:      libsmbclient < %{version}
 Summary:        Samba Client Library
 License:        GPL-3.0+
 Group:          System/Libraries
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig

 %description -n %{libsmbclient_name}
 This package includes the libsmbclient library.
@@ -973,7 +981,7 @@ Branch:         %{BRANCH}
 Summary:        Samba netapi Library
 License:        GPL-3.0+
 Group:          System/Libraries
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig

 %description -n %{libnetapi_name}
 This package includes the netapi library.
@@ -1001,7 +1009,7 @@ Branch:         %{BRANCH}
 Summary:        Samba libwbclient Library
 License:        LGPL-3.0+
 Group:          System/Libraries
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 %if 0%{?suse_version} > 1030
 Recommends:     samba-winbind = %{version}-%{release}
 %endif
@@ -1027,6 +1035,16 @@ develop programs which make use of the wbclient programming interface.
 Source Timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}

+%if 0%{?build_vfs_ceph}
+%package ceph
+Summary:        Ceph VFS Module for Samba
+License:        GPL-3.0+
+Group:          Productivity/Networking/Samba
+
+%description ceph
+The Ceph VFS module for Samba allows shares to be backed by the Ceph distributed file system.
+%endif
+

 %prep
 %setup -n samba-%{samba_ver_full} -q
@@ -1183,7 +1201,7 @@ rm \
 %if 0%{?suse_version}
 install -m 0644 vendor-files/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates
 %else
-install -m 0644 ctdb/config/ctdb.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
+install -m 0644 vendor-files/config/sysconfig.ctdb ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
 %endif
 %if 0%{?suse_version} > 1220
 install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
@@ -1196,7 +1214,7 @@ install -m 0755 ctdb/config/ctdb.init ${RPM_BUILD_ROOT}/%{INITDIR}/ctdb
 ln -s %{_sysconfdir}/init.d/ctdb %{buildroot}/%{_sbindir}/rcctdb
 %endif
 mkdir %{buildroot}/%{_defaultdocdir}/ctdb
-for file in README COPYING NEWS doc/examples doc/*.html doc/readonlyrecords.txt doc/recovery-process.txt ; do
+for file in README COPYING doc/examples doc/*.html doc/readonlyrecords.txt doc/recovery-process.txt ; do
 	cp -a ctdb/${file} %{buildroot}/%{_defaultdocdir}/ctdb
 done
 touch %{buildroot}/%{_sysconfdir}/ctdb/nodes
@@ -1359,8 +1377,37 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do
 	echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc"
 done
 for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do
+	# if built we don't want vfs_ceph in the base package
+	case "${file#%{buildroot}}" in
+		%{_libdir}/samba/vfs/ceph.so) continue ;;
+	esac
 	echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba
 done
+# only package Man pages for VFS modules that we ship
+for file in %{buildroot}%{_mandir}/man8/vfs_*; do
+	case "${file#%{buildroot}}" in
+		%{_mandir}/man8/vfs_ceph.8)
+			%if 0%{?build_vfs_ceph} == 0
+			rm ${file}
+			%endif
+			continue
+			;;
+		%{_mandir}/man8/vfs_glusterfs.8)
+			rm ${file}
+			continue
+			;;
+		%{_mandir}/man8/vfs_gpfs.8)
+			rm ${file}
+			continue
+			;;
+		%{_mandir}/man8/vfs_tsmsm.8)
+			rm ${file}
+			continue
+			;;
+	esac
+	# wildcard suffix to account for subsequent gzip
+	echo "${file#%{buildroot}}*" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba
+done
 # copy the schema
 install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema
 install -m 0644 examples/LDAP/samba-nds.schema %{buildroot}/%{_datadir}/samba/LDAP/samba-nds.schema
@@ -1598,11 +1645,11 @@ exit 0
 %post -n ctdb
 %if 0%{?suse_version}
 %if 0%{?suse_version} > 1220
-%{fillup_only}
+%{fillup_only -n ctdb}
 %service_add_post ctdb.service
 %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/ctdb.conf || :
 %else
-%{fillup_and_insserv}
+%{fillup_and_insserv -n ctdb}
 %endif
 %endif

@@ -1676,49 +1723,6 @@ fi
 %{_mandir}/man5/smbpasswd.5.*
 %{_mandir}/man8/nmbd.8.*
 %{_mandir}/man8/smbd.8.*
-%{_mandir}/man8/vfs_acl_tdb.8.*
-%{_mandir}/man8/vfs_acl_xattr.8.*
-%{_mandir}/man8/vfs_aio_fork.8.*
-%{_mandir}/man8/vfs_aio_linux.8.*
-%{_mandir}/man8/vfs_aio_pthread.8.*
-%{_mandir}/man8/vfs_audit.8.*
-%{_mandir}/man8/vfs_btrfs.8.*
-%{_mandir}/man8/vfs_cacheprime.8.*
-%{_mandir}/man8/vfs_cap.8.*
-%{_mandir}/man8/vfs_catia.8.*
-%{_mandir}/man8/vfs_ceph.8.*
-%{_mandir}/man8/vfs_commit.8.*
-%{_mandir}/man8/vfs_crossrename.8.*
-%{_mandir}/man8/vfs_default_quota.8.*
-%{_mandir}/man8/vfs_dirsort.8.*
-%{_mandir}/man8/vfs_extd_audit.8.*
-%{_mandir}/man8/vfs_fake_perms.8.*
-%{_mandir}/man8/vfs_fileid.8.*
-%{_mandir}/man8/vfs_full_audit.8.*
-%{_mandir}/man8/vfs_fruit.8.*
-%{_mandir}/man8/vfs_glusterfs.8.*
-%{_mandir}/man8/vfs_gpfs.8.*
-%{_mandir}/man8/vfs_linux_xfs_sgid.8.*
-%{_mandir}/man8/vfs_media_harmony.8.*
-%{_mandir}/man8/vfs_netatalk.8.*
-%{_mandir}/man8/vfs_offline.8.*
-%{_mandir}/man8/vfs_prealloc.8.*
-%{_mandir}/man8/vfs_preopen.8.*
-%{_mandir}/man8/vfs_readahead.8.*
-%{_mandir}/man8/vfs_readonly.8.*
-%{_mandir}/man8/vfs_recycle.8.*
-%{_mandir}/man8/vfs_shadow_copy.8.*
-%{_mandir}/man8/vfs_shadow_copy2.8.*
-%{_mandir}/man8/vfs_shell_snap.8.*
-%{_mandir}/man8/vfs_snapper.8.*
-%{_mandir}/man8/vfs_streams_depot.8.*
-%{_mandir}/man8/vfs_streams_xattr.8.*
-%{_mandir}/man8/vfs_syncops.8.*
-%{_mandir}/man8/vfs_time_audit.8.*
-%{_mandir}/man8/vfs_tsmsm.8.*
-%{_mandir}/man8/vfs_unityed_media.8.*
-%{_mandir}/man8/vfs_worm.8.*
-%{_mandir}/man8/vfs_xattr_tdb.8.*
 %if 0%{?suse_version} && 0%{?suse_version} < 1021
 %{_includedir}/samba
 %endif
@@ -1760,6 +1764,7 @@ fi
 %{_bindir}/cifsdd
 %{_bindir}/dbwrap_tool
 %{_bindir}/eventlogadm
+%{_bindir}/findsmb
 %{_bindir}/net
 %{_bindir}/nmblookup
 %{_bindir}/oLschema2ldif
@@ -1792,7 +1797,7 @@ fi
 %{_libdir}/samba/charset
 %{_libdir}/samba/smbspool_krb5_wrapper
 %{_mandir}/man1/dbwrap_tool.1.*
-%exclude %doc %{_mandir}/man1/findsmb.1.*
+%{_mandir}/man1/findsmb.1.*
 %{_mandir}/man1/log2pcap.1.*
 %{_mandir}/man1/nmblookup.1.*
 %{_mandir}/man1/nmbstatus.1.*
@@ -1945,6 +1950,7 @@ fi
 %{_libdir}/samba/libnpa-tstream-samba4.so
 %{_libdir}/samba/libnss-info-samba4.so
 %{_libdir}/samba/libpopt-samba3-samba4.so
+%{_libdir}/samba/libposix-eadb-samba4.so
 %{_libdir}/samba/libprinting-migrate-samba4.so
 %{_libdir}/samba/libregistry-samba4.so
 %{_libdir}/samba/libreplace-samba4.so
@@ -2012,6 +2018,7 @@ fi
 %{_bindir}/masktest
 %{_bindir}/ndrdump
 %{_bindir}/smbtorture
+%{_bindir}/vfstest
 %{_mandir}/man1/gentest.1.*
 %{_mandir}/man1/locktest.1.*
 %{_mandir}/man1/masktest.1.*
@@ -2050,6 +2057,7 @@ fi
 %{_mandir}/man8/idmap_nss.8.*
 %{_mandir}/man8/idmap_rfc2307.8.*
 %{_mandir}/man8/idmap_rid.8.*
+%{_mandir}/man8/idmap_script.8.*
 %{_mandir}/man8/idmap_tdb.8.*
 %{_mandir}/man8/idmap_tdb2.8.*
 %{_mandir}/man8/pam_winbind.8.*
@@ -2101,6 +2109,7 @@ fi
 %config %{_sysconfdir}/ctdb/events.d/00.ctdb
 %config %{_sysconfdir}/ctdb/events.d/01.reclock
 %config %{_sysconfdir}/ctdb/events.d/05.system
+%config %{_sysconfdir}/ctdb/events.d/06.nfs
 %config %{_sysconfdir}/ctdb/events.d/10.external
 %config %{_sysconfdir}/ctdb/events.d/10.interface
 %config %{_sysconfdir}/ctdb/events.d/11.natgw
@@ -2143,6 +2152,9 @@ fi
 %{_libdir}/ctdb/ctdb_natgw
 %{_libdir}/ctdb/ctdb_recovery_helper
 %{_libdir}/ctdb/smnotify
+%{_libdir}/ctdb/ctdb_killtcp
+%{_libdir}/ctdb/ctdb_lvs
+%{_libdir}/ctdb/ctdb_mutex_fcntl_helper
 %dir %{_localstatedir}/lib/ctdb
 %dir %{_localstatedir}/lib/ctdb/persistent
 %dir %{_localstatedir}/log/ctdb
@@ -2154,6 +2166,7 @@ fi
 %{_mandir}/man1/ctdb.1.gz
 %{_mandir}/man1/ctdbd.1.gz
 %{_mandir}/man1/ctdbd_wrapper.1.gz
+%{_mandir}/man1/ctdb_diagnostics.1.gz
 %{_mandir}/man1/ltdbtool.1.gz
 %{_mandir}/man1/onnode.1.gz
 %{_mandir}/man1/ping_pong.1.gz
@@ -2180,36 +2193,33 @@ fi

 %files -n ctdb-tests
 %defattr(-,root,root)
-%dir %{_libdir}/ctdb-tests
-%{_libdir}/ctdb-tests/comm_client_test
-%{_libdir}/ctdb-tests/comm_server_test
-%{_libdir}/ctdb-tests/comm_test
-%{_libdir}/ctdb-tests/db_hash_test
-%{_libdir}/ctdb-tests/ctdb_bench
-%{_libdir}/ctdb-tests/ctdb_fetch
-%{_libdir}/ctdb-tests/ctdb_fetch_one
-%{_libdir}/ctdb-tests/ctdb_fetch_readonly_loop
-%{_libdir}/ctdb-tests/ctdb_fetch_readonly_once
-%{_libdir}/ctdb-tests/ctdb_functest
-%{_libdir}/ctdb-tests/ctdb_lock_tdb
-%{_libdir}/ctdb-tests/ctdb_persistent
-%{_libdir}/ctdb-tests/ctdb_porting_tests
-%{_libdir}/ctdb-tests/ctdb_randrec
-%{_libdir}/ctdb-tests/ctdb_store
-%{_libdir}/ctdb-tests/ctdb_stubtest
-%{_libdir}/ctdb-tests/ctdb_takeover_tests
-%{_libdir}/ctdb-tests/ctdb_trackingdb_test
-%{_libdir}/ctdb-tests/ctdb_transaction 
-%{_libdir}/ctdb-tests/ctdb_traverse
-%{_libdir}/ctdb-tests/ctdb_update_record
-%{_libdir}/ctdb-tests/ctdb_update_record_persistent
-%{_libdir}/ctdb-tests/pkt_read_test
-%{_libdir}/ctdb-tests/pkt_write_test
-%{_libdir}/ctdb-tests/protocol_client_test
-%{_libdir}/ctdb-tests/protocol_types_test
-%{_libdir}/ctdb-tests/rb_test
-%{_libdir}/ctdb-tests/reqid_test
-%{_libdir}/ctdb-tests/srvid_test
+%dir %{_libdir}/ctdb/tests
+%{_libdir}/ctdb/tests/comm_client_test
+%{_libdir}/ctdb/tests/comm_server_test
+%{_libdir}/ctdb/tests/comm_test
+%{_libdir}/ctdb/tests/db_hash_test
+%{_libdir}/ctdb/tests/ctdb_takeover_tests
+%{_libdir}/ctdb/tests/pkt_read_test
+%{_libdir}/ctdb/tests/pkt_write_test
+%{_libdir}/ctdb/tests/protocol_client_test
+%{_libdir}/ctdb/tests/protocol_types_test
+%{_libdir}/ctdb/tests/rb_test
+%{_libdir}/ctdb/tests/reqid_test
+%{_libdir}/ctdb/tests/srvid_test
+%{_libdir}/ctdb/tests/ctdb_packet_parse
+%{_libdir}/ctdb/tests/fake_ctdbd
+%{_libdir}/ctdb/tests/fetch_loop
+%{_libdir}/ctdb/tests/fetch_loop_key
+%{_libdir}/ctdb/tests/fetch_readonly
+%{_libdir}/ctdb/tests/fetch_readonly_loop
+%{_libdir}/ctdb/tests/fetch_ring
+%{_libdir}/ctdb/tests/g_lock_loop
+%{_libdir}/ctdb/tests//lock_tdb
+%{_libdir}/ctdb/tests/message_ring
+%{_libdir}/ctdb/tests/porting_tests
+%{_libdir}/ctdb/tests/transaction_loop
+%{_libdir}/ctdb/tests/update_record
+%{_libdir}/ctdb/tests/update_record_persistent
 %dir %{_datadir}/ctdb-tests
 %dir %{_datadir}/ctdb-tests/eventscripts
 %dir %{_datadir}/ctdb-tests/eventscripts/etc-ctdb
@@ -2225,6 +2235,7 @@ fi
 %{_datadir}/ctdb-tests/scripts/integration.bash
 %{_datadir}/ctdb-tests/scripts/test_wrap
 %{_datadir}/ctdb-tests/scripts/unit.sh
+%{_datadir}/ctdb-tests/scripts/script_install_paths.sh
 %dir %{_datadir}/ctdb-tests/simple
 %{_datadir}/ctdb-tests/simple/functions
 %{_datadir}/ctdb-tests/simple/nodes
@@ -2268,6 +2279,7 @@ fi
 %dir %_includedir/samba-4.0/gen_ndr/
 %_includedir/samba-4.0/gen_ndr/krb5pac.h
 %_includedir/samba-4.0/gen_ndr/ndr_krb5pac.h
+%_includedir/samba-4.0/ndr/ndr_krb5pac.h
 %_libdir/libndr-krb5pac.so
 %_libdir/pkgconfig/ndr_krb5pac.pc

@@ -2452,7 +2464,6 @@ fi

 %files -n libtevent-util0
 %defattr(-,root,root)
-%_libdir/libtevent-unix-util.so.0*
 %_libdir/libtevent-util.so.0*

 %files -n libtevent-util-devel
@@ -2462,7 +2473,6 @@ fi
 %_includedir/samba-4.0/util/tevent_ntstatus.h
 %_includedir/samba-4.0/util/tevent_unix.h
 %_includedir/samba-4.0/util/tevent_werror.h
-%_libdir/libtevent-unix-util.so
 %_libdir/libtevent-util.so

 %files -n %{libwbclient_name}
@@ -2476,4 +2486,11 @@ fi
 %{_libdir}/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc

+%if 0%{?build_vfs_ceph}
+%files ceph
+%defattr(-,root,root)
+%{_mandir}/man8/vfs_ceph.8.*
+%{_libdir}/samba/vfs/ceph.so
+%endif
+
 %changelog
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9033976a18387687ee089b25401c9cf6cc07ab69915f21f885780e2f7ee12aa
-size 55878
+oid sha256:52b7e876143a50cbb75dc0b69447da1f40ba3730d1481cd2543154b75c70d279
+size 55809