[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Tue Dec 8 00:03:36 MST 2009


The branch, master has been updated
       via  4608e3f... packaging(RHEL-CTDB): clean some commented out lines from the files sections
       via  ac702b8... packaging(RHEL-CTDB): explicitly list library versions in samba-winbind-32bit
       via  551758a... packaging(RHEL-CTDB): explicitly list library versions in samba-common
       via  b921de7... packaging(RHEL-CTDB): explicitly list all packaged idmap/nss-info/charset modules
       via  cb831f36.. packaging(RHEL-CTDB): explicitly list all the vfs modules in the main package
       via  8c37e70... packaging(RHEL-CTDB): add some checks to test the built smbd
       via  87de8ae... packaging(RHEL-CTDB): make everything instead of all in the build stage
      from  52083a8... s4-selftest: show the test summary at the end of 'make test' in the build farm

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4608e3f9c875cb0fed76480d6b7384f3f297e1e7
Author: Michael Adam <obnox at 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 ac702b87bb3467fff9cc77749adf34da92866ea7
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 7 14:26:03 2009 +0100

    packaging(RHEL-CTDB): explicitly list library versions in samba-winbind-32bit
    
    Michael

commit 551758a6d7827a16fc60ab4f9b790abd5b588edf
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 7 14:25:32 2009 +0100

    packaging(RHEL-CTDB): explicitly list library versions in samba-common
    
    Michael

commit b921de7594f82537b611a8de54f1027b19a187ef
Author: Michael Adam <obnox at 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 cb831f36f5df68b4355fa00ffd16ce17300dea78
Author: Michael Adam <obnox at 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 8c37e70d5134e841900fac69d80413d5b2a0334e
Author: Michael Adam <obnox at 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 87de8aec9ecdfffb29a6468ed77141ff1c5fff0c
Author: Michael Adam <obnox at 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


More information about the samba-cvs mailing list