[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.2-ctdb-13-15-gc859996

Michael Adam obnox at samba.org
Mon Dec 7 15:34:50 MST 2009 

The branch, v3-4-ctdb has been updated
       via  c859996a0c424c5a7073b71dee61a43cf9ae09ef (commit)
       via  c22905c8af1e11aeccb5b13333295383e397bcd6 (commit)
       via  33881e00f2d4cdc4fddb7334a5139f42f15aff78 (commit)
       via  9d830cedaa7b6b471f8c3c91aa09f99017eb7944 (commit)
       via  8b0562e47b9933aff736da03241751dedc75dfe6 (commit)
       via  6b85ff854500c38094de3e5aca690690b78444de (commit)
       via  bd9f0c9d9f1f56fc99de066953240c63f28c8384 (commit)
       via  1fbff7a55e056f0235f6398129435aff4c8d1e18 (commit)
      from  214b5e85d35e9c4ae784691a5a6244360befa4d3 (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb


- Log -----------------------------------------------------------------
commit c859996a0c424c5a7073b71dee61a43cf9ae09ef
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 7 14:29:11 2009 +0100

    v3-4-ctdb: Bump the vendor patch level to 14.
    
    Michael

commit c22905c8af1e11aeccb5b13333295383e397bcd6
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 33881e00f2d4cdc4fddb7334a5139f42f15aff78
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 9d830cedaa7b6b471f8c3c91aa09f99017eb7944
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 8b0562e47b9933aff736da03241751dedc75dfe6
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 6b85ff854500c38094de3e5aca690690b78444de
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 bd9f0c9d9f1f56fc99de066953240c63f28c8384
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 1fbff7a55e056f0235f6398129435aff4c8d1e18
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 ++++++++++++++++++++++++++--------
 source3/VERSION                     |    2 +-
 2 files changed, 71 insertions(+), 23 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
 
diff --git a/source3/VERSION b/source3/VERSION
index 45c8277..37b31cb 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -85,7 +85,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=no
 #                                                      #
 ########################################################
 SAMBA_VERSION_VENDOR_SUFFIX="ctdb"
-SAMBA_VERSION_VENDOR_PATCH=13
+SAMBA_VERSION_VENDOR_PATCH=14
 
 ########################################################
 # This can be set by vendors if they want..            #


-- 
SAMBA-CTDB repository

More information about the samba-cvs mailing list