The branch, v3-5-test has been updated via a18692d... packaging(RHEL-CTDB): clean some commented out lines from the files sections via 0cc9a21... packaging(RHEL-CTDB): explicitly list library versions in samba-winbind-32bit via a135a15... packaging(RHEL-CTDB): explicitly list library versions in samba-common via ae0e6ab... packaging(RHEL-CTDB): explicitly list all packaged idmap/nss-info/charset modules via d420b30... packaging(RHEL-CTDB): explicitly list all the vfs modules in the main package via c6435cd... packaging(RHEL-CTDB): add some checks to test the built smbd via 1aec010... packaging(RHEL-CTDB): make everything instead of all in the build stage from eea0985... parent_sd can never be null in this function, so don't check for it.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log ----------------------------------------------------------------- commit a18692ddcffbe3faf1abc50091c9481e53e8c801 Author: Michael Adam <ob...@samba.org> Date: Mon Dec 7 14:27:28 2009 +0100 packaging(RHEL-CTDB): clean some commented out lines from the files sections Michael commit 0cc9a21c6f352765c1a3760d5f8eebd4dc6f8b8e Author: Michael Adam <ob...@samba.org> Date: Mon Dec 7 14:26:03 2009 +0100 packaging(RHEL-CTDB): explicitly list library versions in samba-winbind-32bit Michael commit a135a15a2bb5c56089715b842754c34b3ba9d55e Author: Michael Adam <ob...@samba.org> Date: Mon Dec 7 14:25:32 2009 +0100 packaging(RHEL-CTDB): explicitly list library versions in samba-common Michael commit ae0e6ab4c7bfd1547f0b0252a66523b9ab47f9c7 Author: Michael Adam <ob...@samba.org> Date: Mon Dec 7 14:20:24 2009 +0100 packaging(RHEL-CTDB): explicitly list all packaged idmap/nss-info/charset modules in the samba-common package. This is to better be able to catch regressions or build problems. Michael commit d420b308c1640d96fd9d2b8fe2b4b8ac5071b38d Author: Michael Adam <ob...@samba.org> Date: Mon Dec 7 14:16:15 2009 +0100 packaging(RHEL-CTDB): explicitly list all the vfs modules in the main package Instead of the wildcard list, to better control regressions or build problems. Michael commit c6435cd8b36320b27a2a9940380daa776536e3e6 Author: Michael Adam <ob...@samba.org> Date: Mon Dec 7 14:12:05 2009 +0100 packaging(RHEL-CTDB): add some checks to test the built smbd Test whether some required features have been built into smbd. Can be extended... Michael commit 1aec01077944b6a2762624895bac42333ca36963 Author: Michael Adam <ob...@samba.org> Date: Mon Dec 7 14:11:32 2009 +0100 packaging(RHEL-CTDB): make everything instead of all in the build stage Michael ----------------------------------------------------------------------- Summary of changes: packaging/RHEL-CTDB/samba.spec.tmpl | 92 ++++++++++++++++++++++++++-------- 1 files changed, 70 insertions(+), 22 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 5b05b99..a22bfbd 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -268,7 +268,17 @@ fi make -j %{numcpu} %{?_smp_mflags} \ - all modules pam_smbpass + everything modules pam_smbpass + +# check that desired suppor has been compiled into smbd: +export LD_LIBRARY_PATH=./bin +for test in HAVE_POSIX_ACLS HAVE_LDAP HAVE_KRB5 HAVE_GPFS CLUSTER_SUPPORT +do + if ! $(./bin/smbd -b | grep -q $test ) ; then + echo "ERROR: '$test' is not in smbd. Build stopped." + exit 1; + fi +done # Remove some permission bits to avoid to many dependencies cd .. @@ -460,8 +470,34 @@ exit 0 %{_bindir}/tdbdump %{_bindir}/eventlogadm -%{_libarchdir}/samba/vfs/*.so -%{_libarchdir}/samba/auth/*.so +%{_libarchdir}/samba/auth/script.so +%{_libarchdir}/samba/vfs/acl_tdb.so +%{_libarchdir}/samba/vfs/acl_xattr.so +%{_libarchdir}/samba/vfs/aio_fork.so +%{_libarchdir}/samba/vfs/audit.so +%{_libarchdir}/samba/vfs/cap.so +%{_libarchdir}/samba/vfs/default_quota.so +%{_libarchdir}/samba/vfs/dirsort.so +%{_libarchdir}/samba/vfs/expand_msdfs.so +%{_libarchdir}/samba/vfs/extd_audit.so +%{_libarchdir}/samba/vfs/fake_perms.so +%{_libarchdir}/samba/vfs/fileid.so +%{_libarchdir}/samba/vfs/full_audit.so +%{_libarchdir}/samba/vfs/gpfs.so +%{_libarchdir}/samba/vfs/netatalk.so +%{_libarchdir}/samba/vfs/preopen.so +%{_libarchdir}/samba/vfs/readahead.so +%{_libarchdir}/samba/vfs/readonly.so +%{_libarchdir}/samba/vfs/recycle.so +%{_libarchdir}/samba/vfs/shadow_copy.so +%{_libarchdir}/samba/vfs/shadow_copy2.so +%{_libarchdir}/samba/vfs/smb_traffic_analyzer.so +%{_libarchdir}/samba/vfs/streams_depot.so +%{_libarchdir}/samba/vfs/streams_xattr.so +%{_libarchdir}/samba/vfs/syncops.so +%{_libarchdir}/samba/vfs/tsmsm.so +%{_libarchdir}/samba/vfs/xattr_tdb.so + %{_mandir}/man1/smbcontrol.1* %{_mandir}/man1/smbstatus.1* @@ -546,33 +582,42 @@ exit 0 %config(noreplace) %{_sysconfdir}/samba/lmhosts %attr(755,root,root) %config %{initdir}/winbind -#%attr(755,root,root) /%{_libarch}/libnss_wins.so* -%attr(755,root,root) /%{_libarch}/libnss_winbind.so* +%attr(755,root,root) /%{_libarch}/libnss_winbind.so +%attr(755,root,root) /%{_libarch}/libnss_winbind.so.2 %attr(755,root,root) /%{_libarch}/security/pam_winbind.so %attr(755,root,root) /%{_libarch}/security/pam_smbpass.so /usr/share/locale/*/LC_MESSAGES/pam_winbind.mo -%{_libarchdir}/samba/idmap/*.so -%{_libarchdir}/samba/nss_info/*.so +%{_libarchdir}/samba/charset/CP437.so +%{_libarchdir}/samba/charset/CP850.so +%{_libarchdir}/samba/idmap/ad.so +%{_libarchdir}/samba/idmap/rid.so +%{_libarchdir}/samba/idmap/tdb2.so +%{_libarchdir}/samba/lowcase.dat +%{_libarchdir}/samba/nss_info/rfc2307.so +%{_libarchdir}/samba/nss_info/sfu.so +%{_libarchdir}/samba/nss_info/sfu20.so +%{_libarchdir}/samba/upcase.dat +%{_libarchdir}/samba/valid.dat %{_includedir}/libsmbclient.h %{_libarchdir}/libsmbclient.* -#%{_includedir}/libmsrpc.h -#%{_libarchdir}/libmsrpc.* %{_includedir}/smb_share_modes.h -%{_libarchdir}/libsmbsharemodes.* - -%{_libarchdir}/samba/*.dat -%{_libarchdir}/samba/charset/*.so +%{_libarchdir}/libsmbsharemodes.so +%{_libarchdir}/libsmbsharemodes.so.0 %{_includedir}/netapi.h %{_includedir}/wbclient.h %{_includedir}/talloc.h %{_includedir}/tdb.h -%{_libarchdir}/libnetapi.so* -%{_libarchdir}/libtalloc.so* -%{_libarchdir}/libtdb.so* -%{_libarchdir}/libwbclient.so* +%{_libarchdir}/libnetapi.so +%{_libarchdir}/libnetapi.so.0 +%{_libarchdir}/libtalloc.so +%{_libarchdir}/libtalloc.so.1 +%{_libarchdir}/libtdb.so +%{_libarchdir}/libtdb.so.1 +%{_libarchdir}/libwbclient.so +%{_libarchdir}/libwbclient.so.0 %{_libarchdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so @@ -619,11 +664,14 @@ exit 0 %ifarch x86_64 ppc64 %files winbind-32bit -%attr(755,root,root) /lib/libnss_winbind.so* -#%attr(755,root,root) /lib/libnss_wins.so* -%attr(755,root,root) /usr/lib/libtalloc.so* -%attr(755,root,root) /usr/lib/libtdb.so* -%attr(755,root,root) /usr/lib/libwbclient.so* +%attr(755,root,root) /lib/libnss_winbind.so +%attr(755,root,root) /lib/libnss_winbind.so.2 +%attr(755,root,root) /usr/lib/libtalloc.so +%attr(755,root,root) /usr/lib/libtalloc.so.1 +%attr(755,root,root) /usr/lib/libtdb.so +%attr(755,root,root) /usr/lib/libtdb.so.1 +%attr(755,root,root) /usr/lib/libwbclient.so +%attr(755,root,root) /usr/lib/libwbclient.so.0 %attr(755,root,root) /lib/security/pam_winbind.so %endif -- Samba Shared Repository