Accepting request 361133 from network:samba:STABLE

- Update to 4.3.5. Check WHATSNEW.txt from the main tar ball, the web page, or the samba package change log for a detailed list of changes. - Shift samba-client sysconfig data into samba and samba-winbind; (bsc#947361). - Enable clustering (CTDB) support; (bsc#966271). - s3: smbd: Fix timestamp rounding inside SMB2 create; (bso#11703); (bsc#964023). OBS-URL: https://build.opensuse.org/request/show/361133 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=197
2016-02-25 21:00:57 +00:00
parent eea7d52f2d 122cd26916
commit d9e7a3a5ee
8 changed files with 359 additions and 34 deletions
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbcf78012784e1d3c77c637c797cee2cb1c055e67ea013b2b46d69aa0d7f4bc3
-size 12794
+oid sha256:abff919fade9fd55a74acd398865ab0ad9ef30052a25c876f54a831bbe512a45
+size 12703
--- a/samba-4.3.4.tar.asc
+++ b/samba-4.3.4.tar.asc
@@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iD8DBQBWlLgLbzORW2Vot+oRAg0iAJ9MoZJhzdA2Mz5OagDo6Kzl9h9hYACffa+6
-HhjKN2ZSSyGOWTDMTFFBYzE=
-=9Y+5
-----END PGP SIGNATURE-----
--- a/samba-4.3.4.tar.gz
+++ b/samba-4.3.4.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d0eb52e842832af922f7d57716eacff23192906ec3bdf6727e18ca24f1419d9
-size 20434434
--- a/samba-4.3.5.tar.asc
+++ b/samba-4.3.5.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iD8DBQBWytsFbzORW2Vot+oRAmI6AKCoN7/kv/DEjcFzALl9f8x/mosHZQCgqswq
+v2Ohl6/IDmiJeFBvhe/cNX4=
+=igWD
+-----END PGP SIGNATURE-----
--- a/samba-4.3.5.tar.gz
+++ b/samba-4.3.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:583f927a823b272757fd4df0be267bd20a223b06cfc3c662df17e4870f14bf1c
+size 20443260
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Tue Feb 23 09:47:53 UTC 2016 - lmuelle@suse.com
+
+- Update to 4.3.5.
+  + s3:utils/smbget: Fix recursive download; (bso#6482).
+  + s3: smbd: posix_acls: Fix check for setting u:g:o entry on a filesystemi
+    with no ACL support; (bso#10489).
+  + s3:smbd/oplock: Obey kernel oplock setting when releasing oplocks;
+    (bso#11400).
+  + vfs_shadow_copy2: Fix case where snapshots are outside the share;
+    (bso#11580).
+  + smbclient: Query disk usage relative to current directory; (bso#11662).
+  + winbindd: Handle expired sessions correctly; (bso#11670).
+  + smbd: Show correct disk size for different quota and dfree block sizes;
+    (bso#11681).
+  + smbcacls: Fix uninitialized variable; (bso#11682).
+  + s3:smbd: Ignore initial allocation size for directory creation;
+    (bso#11684).
+  + s3-client: Add a KRB5 wrapper for smbspool; (bso#11690).
+  + s3-parm: Clean up defaults when removing global parameters; (bso#11693).
+  + Use M2Crypto.RC4.RC4 on platforms without Crypto.Cipher.ARC4; (bso#11699).
+  + s3: smbd: Fix timestamp rounding inside SMB2 create; (bso#11703).
+  + ctdb: Remove error messages after kernel security update; CVE-2015-8543;
+    (bso#11705).
+  + loadparm: Fix memory leak issue; (bso#11708).
+  + lib/tsocket: Work around sockets not supporting FIONREAD; (bso#11714).
+  + ctdb-scripts: Drop use of "smbcontrol winbindd ip-dropped ...";
+    (bso#11719).
+  + s3:smbd:open: Skip redundant call to file_set_dosmode when creating a new
+    file; (bso#11727).
+  + param: Fix str_list_v3 to accept ";" again; (bso#11732).
+
+-------------------------------------------------------------------
+Mon Feb 22 16:16:32 UTC 2016 - lmuelle@suse.com
+
+- Shift samba-client sysconfig data into samba and samba-winbind; (bsc#947361).
+
+-------------------------------------------------------------------
+Sun Feb 14 18:41:34 UTC 2016 - lmuelle@suse.com
+
+- Enable clustering (CTDB) support; (bsc#966271).
+
+-------------------------------------------------------------------
+Fri Feb 12 17:41:03 UTC 2016 - lmuelle@suse.com
+
+- s3: smbd: Fix timestamp rounding inside SMB2 create; (bso#11703);
+  (bsc#964023).
+
 -------------------------------------------------------------------
 Fri Jan 15 21:58:31 UTC 2016 - lmuelle@suse.com

--- a/samba.spec
+++ b/samba.spec
@@ -12,12 +12,16 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #


 %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}

+%if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315
+%define         build_ctdb_pmda 1
+%endif
+
 Name:           samba
 BuildRequires:  cups-devel
 BuildRequires:  cyrus-sasl-devel
@@ -83,9 +87,6 @@ BuildRequires:  keyutils-devel
 %if 0%{?fedora_version} || 0%{?rhel_version} > 500
 BuildRequires:  keyutils-libs-devel
 %endif
-%if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version}
-BuildRequires:  ctdb-devel > 1.0.105
-%endif
 %if 0%{?suse_version} > 1110
 BuildRequires:  fdupes
 %endif
@@ -97,13 +98,10 @@ BuildRequires:  fdupes
 BuildRequires:  %{pkgconfig_req}
 BuildRequires:  libldb-devel
 BuildRequires:  python-ldb-devel
-#!BuildIgnore: libtalloc
 BuildRequires:  libtalloc-devel
 BuildRequires:  python-talloc-devel
-#!BuildIgnore: libtdb
 BuildRequires:  libtdb-devel
 BuildRequires:  python-tdb
-#!BuildIgnore:  libtevent
 BuildRequires:  libtevent-devel
 BuildRequires:  python-tevent
 # to generate the man pages
@@ -119,7 +117,10 @@ BuildRequires:  libavahi-devel
 BuildRequires:  systemd
 BuildRequires:  systemd-devel
 %endif
-%define	samba_ver 4.3.4
+%if 0%{?build_ctdb_pmda}
+BuildRequires:  libpcp-devel
+%endif
+%define	samba_ver 4.3.5
 %define	samba_ver_suffix %nil
 %if "%{samba_ver_suffix}" == ""
 %define samba_source_location https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -141,11 +142,11 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3565
+%define SOURCE_TIMESTAMP 3599
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
-Version:        4.3.4
+Version:        4.3.5
 Release:        0
 Url:            https://www.samba.org/
 Provides:       samba-gplv3 = %{version}
@@ -256,7 +257,6 @@ Obsoletes:      samba-gplv3-client < %{version}
 Provides:       samba-client-gplv2 = %{version}
 Obsoletes:      samba-client-gplv2 < %{version}
 %if 0%{?suse_version} > 0
-PreReq:         %{?fillup_prereq}
 PreReq:         %{?insserv_prereq}
 %endif
 PreReq:         /sbin/chkconfig
@@ -441,6 +441,68 @@ Source Timestamp: %{SOURCE_TIMESTAMP}
 Branch:         %{BRANCH}


+%package -n ctdb
+Summary:        Clustered TDB
+License:        GPL-3.0+
+Group:          System/Daemons
+%if 0%{?suse_version}
+Requires(pre):  %{?fillup_prereq}
+%if 0%{?suse_version} > 1220
+BuildRequires:  systemd-rpm-macros
+# bnc886095: The CTDB resource agent could be split out into a separate rpm,
+# with corresponding ctdb and tdb-tools requirements. Until then, just add the
+# tdb-tools requirement to ctdb.
+Requires:       tdb-tools
+%else
+Requires(pre):  %{insserv_prereq}
+%endif
+%else
+Requires(pre): /sbin/chkconfig
+%endif
+Requires(pre): coreutils
+Requires(pre): /bin/mktemp
+Requires(pre): /usr/bin/killall
+Requires(pre): sed
+
+%description -n ctdb
+ctdb is the clustered database used by Samba
+
+Source Timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
+
+%package -n ctdb-devel
+Summary:        Libraries and Header Files to Develop Programs with ctdb support
+License:        GPL-3.0+
+Group:          Development/Libraries/C and C++
+
+%description -n ctdb-devel
+This package contains the static libraries and header files needed to
+develop programs which make use of ctdb.
+
+
+%if 0%{?build_ctdb_pmda}
+%package -n ctdb-pcp-pmda
+Summary:        Performance Co-Pilot (PCP) monitoring agent
+License:        GPL-3.0+
+Group:          System/Monitoring
+
+%description -n ctdb-pcp-pmda
+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.
+%endif
+
+
+%package -n ctdb-tests
+Summary:        CTDB clustered database test suite
+License:        GPL-3.0+
+Group:          Development/Tools
+
+%description -n ctdb-tests
+Test suite for clustered database (CTDB).
+
+
 %package -n libdcerpc-atsvc0
 Summary:        DCE/RPC AT scheduler service library
 License:        GPL-3.0+
@@ -953,7 +1015,7 @@ Branch:         %{BRANCH}


 %package -n libtevent-util0
-Summary:        tevent <-> system status code conversion utility library
+Summary:        Samba tevent <-> system status code conversion utility library
 License:        GPL-3.0+
 Group:          System/Libraries

@@ -1151,7 +1213,11 @@ CONFIGURE_OPTIONS="\
 	--disable-rpath \
 	--disable-rpath-install \
 	--enable-debug \
+%if 0%{?build_ctdb_pmda}
+	--enable-pmda \
+%endif
 	--enable-fhs \
+	--with-cluster-support \
 	--with-pam \
 	--with-pammodulesdir=%{_lib}/security \
 	--with-piddir=%{PIDDIR} \
@@ -1167,7 +1233,7 @@ CONFIGURE_OPTIONS="\
 %if ! %with_dc
 	--without-ad-dc \
 %endif
-	--bundled-libraries=NONE,${bundled_libraries_extra} \
+	--bundled-libraries=NONE,socket_wrapper,${bundled_libraries_extra} \
 "
 ./configure ${CONFIGURE_OPTIONS}
 make %{build_make_smp_mflags} \
@@ -1202,12 +1268,13 @@ install -d -m 0755 -p \
 	%{buildroot}/%{_datadir}/omc/svcinfo.d \
 	%{buildroot}/%{_datadir}/samba/{LDAP,templates} \
 	%{buildroot}/%{_localstatedir}/adm \
+	%{buildroot}/%{_localstatedir}/lib/ctdb/persistent \
 	%{buildroot}/%{LOCKDIR}/{drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},netlogon,lock/msg.lock,printing,private/msg.sock,profiles,winbindd_privileged} \
 	%{buildroot}/%{LOGDIR} \
 	%{buildroot}/%{PIDDIR} \
 	%{buildroot}/%{_var}/adm/fillup-templates \
 	%{buildroot}/%{_var}/cache/krb5rcache \
-	%{buildroot}/%{_var}/run \
+	%{buildroot}/%{_var}/log/ctdb \
 	%{buildroot}/%{DOCDIR} \
 	%{buildroot}/%{DOCBOOKDIR} \
 	%{buildroot}/%{_datadir}/susehelp/meta/Administration/System
@@ -1223,6 +1290,29 @@ rm \
 	%{buildroot}/%{_libdir}/samba/ldb/ldbsamba_extensions.so \
 %endif

+# CTDB
+%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
+%endif
+%if 0%{?suse_version} > 1220
+install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
+ln -s service %{buildroot}/%{_sbindir}/rcctdb
+# create tmpfile conf
+install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
+echo "d /run/ctdbd 0755 root root" >%{buildroot}/%{_tmpfilesdir}/ctdb.conf
+%else
+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
+	cp -a ctdb/${file} %{buildroot}/%{_defaultdocdir}/ctdb
+done
+# sudo can be used by statd-callout, but is not needed
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/sudoers.d/ctdb
+
 # utility scripts
 scripts="creategroup mksmbpasswd.sh"
 install -d -m 0755 examples/scripts
@@ -1275,8 +1365,7 @@ for srv_name in nmb smb winbind; do
 	ln -s service %{buildroot}/%{_sbindir}/rc${srv_name}
 done
 install -m 0644 systemd/sysconfig.* %{buildroot}%_var/adm/fillup-templates
-install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d
-install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}%{_prefix}/lib/tmpfiles.d/samba.conf
+install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}/%{_tmpfilesdir}/samba.conf
 %else
 for script in ${startScripts}; do
 	install -m 0755 "init/${script}${scriptSuffix}" \
@@ -1499,9 +1588,6 @@ fi
 if ! test -e %{_bindir}/get_printing_ticket; then
 	ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
 fi
-%if 0%{?suse_version} > 1220
-%{fillup_only -ans samba client}
-%endif
 %{?fillup_only:%{fillup_only -nsd dhcp samba-client network}}

 %postun client
@@ -1611,6 +1697,47 @@ fi
 %{?insserv_cleanup:%{insserv_cleanup}}
 %endif

+%pre -n ctdb
+%if 0%{?suse_version} > 1220
+%service_add_pre ctdb.service
+%endif
+
+%preun -n ctdb
+%if 0%{?suse_version} > 1220
+%service_del_preun ctdb.service
+%endif
+%if 0%{?suse_version} == 0
+if [ $1 = 0 ] ; then
+	test -x /sbin/chkconfig && /sbin/chkconfig --del ctdb
+fi
+%endif
+exit 0
+
+%post -n ctdb
+%if 0%{?suse_version}
+%if 0%{?suse_version} > 1220
+%{fillup_only}
+%service_add_post ctdb.service
+%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/ctdb.conf || :
+%else
+%{fillup_and_insserv}
+%endif
+%endif
+
+%postun -n ctdb
+%if 0%{?suse_version}
+%if 0%{?suse_version} > 1220
+%service_del_postun ctdb.service
+%else
+%{insserv_cleanup}
+%endif
+%else
+if [ "$1" -ge "1" ]; then
+	%{INITDIR}/ctdb restart >/dev/null
+fi
+%endif
+exit 0
+
 %post -n %{libsmbclient_name} -p /sbin/ldconfig
 %postun -n %{libsmbclient_name} -p /sbin/ldconfig

@@ -1777,6 +1904,7 @@ fi
 %{_bindir}/smbpasswd
 %{_bindir}/smbprngenpdf
 %{_bindir}/smbspool
+%{_bindir}/smbspool_krb5_wrapper
 %{_bindir}/smbtar
 %{_bindir}/smbtree
 %{_bindir}/testparm
@@ -1817,6 +1945,7 @@ fi
 %{_mandir}/man8/samba-regedit.8.*
 %{_mandir}/man8/smbpasswd.8.*
 %{_mandir}/man8/smbspool.8.*
+%{_mandir}/man8/smbspool_krb5_wrapper.8.*
 %dir %{_datadir}/samba
 %dir %{_datadir}/samba/LDAP
 %config %{_datadir}/samba/LDAP/samba-nds.schema
@@ -1833,7 +1962,6 @@ fi
 %if 0%{?suse_version} > 1220
 %dir %{_tmpfilesdir}
 %{_tmpfilesdir}/samba.conf
-%{_var}/adm/fillup-templates/sysconfig.samba-client
 %endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020

@@ -2090,6 +2218,155 @@ fi
 %doc %{_datadir}/susehelp
 %endif

+%files -n ctdb
+%defattr(-,root,root)
+%dir %{_sysconfdir}/ctdb
+%if 0%{?suse_version}
+%{_var}/adm/fillup-templates/sysconfig.ctdb
+%else
+%{_sysconfdir}/sysconfig/ctdb
+%endif
+%{_sysconfdir}/ctdb/notify.sh
+%{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh
+%{_sysconfdir}/ctdb/debug-hung-script.sh
+%{_sysconfdir}/ctdb/debug_locks.sh
+%{_sysconfdir}/ctdb/functions
+%{_sysconfdir}/ctdb/gcore_trace.sh
+%{_sysconfdir}/ctdb/nfs-linux-kernel-callout
+%{_sysconfdir}/ctdb/statd-callout
+%if 0%{?suse_version} > 1220
+%attr(644,root,root) %{_unitdir}/ctdb.service
+%dir %{_tmpfilesdir}
+%{_tmpfilesdir}/ctdb.conf
+%ghost %dir /run/ctdbd
+%else
+%attr(755,root,root) %{INITDIR}/ctdb
+%endif
+%dir %{_sysconfdir}/ctdb/events.d
+%config %{_sysconfdir}/ctdb/events.d/00.ctdb
+%config %{_sysconfdir}/ctdb/events.d/01.reclock
+%config %{_sysconfdir}/ctdb/events.d/10.external
+%config %{_sysconfdir}/ctdb/events.d/10.interface
+%config %{_sysconfdir}/ctdb/events.d/11.natgw
+%config %{_sysconfdir}/ctdb/events.d/11.routing
+%config %{_sysconfdir}/ctdb/events.d/13.per_ip_routing
+%config %{_sysconfdir}/ctdb/events.d/20.multipathd
+%config %{_sysconfdir}/ctdb/events.d/31.clamd
+%config %{_sysconfdir}/ctdb/events.d/40.vsftpd
+%config %{_sysconfdir}/ctdb/events.d/41.httpd
+%config %{_sysconfdir}/ctdb/events.d/50.samba
+%config %{_sysconfdir}/ctdb/events.d/60.nfs
+%config %{_sysconfdir}/ctdb/events.d/62.cnfs
+%config %{_sysconfdir}/ctdb/events.d/70.iscsi
+%config %{_sysconfdir}/ctdb/events.d/91.lvs
+%config %{_sysconfdir}/ctdb/events.d/40.fs_use
+%config %{_sysconfdir}/ctdb/events.d/49.winbind
+%config %{_sysconfdir}/ctdb/events.d/99.timeout
+%{_sysconfdir}/ctdb/events.d/README
+%dir %{_sysconfdir}/ctdb/nfs-checks.d
+%config %{_sysconfdir}/ctdb/nfs-checks.d/00.portmapper.check
+%config %{_sysconfdir}/ctdb/nfs-checks.d/10.status.check
+%config %{_sysconfdir}/ctdb/nfs-checks.d/20.nfs.check
+%config %{_sysconfdir}/ctdb/nfs-checks.d/30.nlockmgr.check
+%config %{_sysconfdir}/ctdb/nfs-checks.d/40.mountd.check
+%config %{_sysconfdir}/ctdb/nfs-checks.d/50.rquotad.check
+%{_sysconfdir}/ctdb/nfs-checks.d/README
+%dir %{_sysconfdir}/ctdb/notify.d
+%{_sysconfdir}/ctdb/notify.d/README
+%{_sbindir}/ctdbd
+%{_sbindir}/ctdbd_wrapper
+%{_sbindir}/rcctdb
+%{_bindir}/ctdb
+%{_bindir}/smnotify
+%{_bindir}/ctdb_diagnostics
+%{_bindir}/ctdb_event_helper
+%{_bindir}/ctdb_run_cluster_tests
+%{_bindir}/ctdb_run_tests
+%{_bindir}/ltdbtool
+%{_bindir}/onnode
+%{_bindir}/ping_pong
+%{_bindir}/ctdb_lock_helper
+%dir %{_localstatedir}/lib/ctdb
+%dir %{_localstatedir}/lib/ctdb/persistent
+%dir %{_localstatedir}/log/ctdb
+%if 0%{?suse_version} > 1220
+%ghost %dir /run/ctdb
+%else
+%ghost %dir %{_localstatedir}/run/ctdb
+%endif
+%{_mandir}/man1/ctdb.1.gz
+%{_mandir}/man1/ctdbd.1.gz
+%{_mandir}/man1/ctdbd_wrapper.1.gz
+%{_mandir}/man1/ltdbtool.1.gz
+%{_mandir}/man1/onnode.1.gz
+%{_mandir}/man1/ping_pong.1.gz
+%{_mandir}/man5/ctdbd.conf.5.*
+%{_mandir}/man7/ctdb-statistics.7.*
+%{_mandir}/man7/ctdb-tunables.7.*
+%{_mandir}/man7/ctdb.7.*
+%doc %{_defaultdocdir}/ctdb
+
+%files -n ctdb-devel
+%defattr(-,root,root)
+%{_includedir}/samba-4.0/ctdb.h
+%{_includedir}/samba-4.0/ctdb_client.h
+%{_includedir}/samba-4.0/ctdb_private.h
+%{_includedir}/samba-4.0/ctdb_protocol.h
+%{_includedir}/samba-4.0/ctdb_typesafe_cb.h
+%{_includedir}/samba-4.0/ctdb_version.h
+%{_libdir}/pkgconfig/ctdb.pc
+
+%if 0%{?build_ctdb_pmda}
+%files -n ctdb-pcp-pmda
+%defattr(-,root,root)
+%dir %{_localstatedir}/lib/pcp
+%dir %{_localstatedir}/lib/pcp/pmdas
+%dir %{_localstatedir}/lib/pcp/pmdas/ctdb
+%{_localstatedir}/lib/pcp/pmdas/ctdb/Install
+%{_localstatedir}/lib/pcp/pmdas/ctdb/README
+%{_localstatedir}/lib/pcp/pmdas/ctdb/Remove
+%{_localstatedir}/lib/pcp/pmdas/ctdb/domain.h
+%{_localstatedir}/lib/pcp/pmdas/ctdb/help
+%{_localstatedir}/lib/pcp/pmdas/ctdb/pmdactdb
+%{_localstatedir}/lib/pcp/pmdas/ctdb/pmns
+%endif
+
+%files -n ctdb-tests
+%defattr(-,root,root)
+%dir %{_libdir}/ctdb-tests
+%{_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/rb_test
+%dir %{_datadir}/ctdb-tests
+%dir %{_datadir}/ctdb-tests/eventscripts
+%dir %{_datadir}/ctdb-tests/eventscripts/etc-ctdb
+%{_datadir}/ctdb-tests/eventscripts/etc-ctdb/events.d
+%{_datadir}/ctdb-tests/eventscripts/etc-ctdb/functions
+%{_datadir}/ctdb-tests/eventscripts/etc-ctdb/nfs-checks.d
+%{_datadir}/ctdb-tests/eventscripts/etc-ctdb/nfs-linux-kernel-callout
+%{_datadir}/ctdb-tests/eventscripts/etc-ctdb/statd-callout
+%dir %{_datadir}/ctdb-tests/scripts
+%{_datadir}/ctdb-tests/scripts/common.sh
+%{_datadir}/ctdb-tests/scripts/integration.bash
+%{_datadir}/ctdb-tests/scripts/test_wrap
+%{_datadir}/ctdb-tests/scripts/unit.sh
+
 %files -n libdcerpc-atsvc0
 %defattr(-,root,root)
 %_libdir/libdcerpc-atsvc.so.0*
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c55ddd7c96994480e41332b1dea933150ae0c5de9f4b0138a8beae03c8b9bf7
-size 53092
+oid sha256:dfbf445865578d7e39cbe5d2d1f9f38b1c19496edc80b7f6ddb541ee4f80418e
+size 55671