The branch, v3-2-test has been updated via 5359d8ae840dba48bb6f2163085d22b80108db2c (commit) via 998b699f27630d3ea6d781da4f09c1cfd3e24511 (commit) via 80d5e3621cac803c007e38e437d07f7dab2379aa (commit) via 17351dc1ea2be1d2478d6ae00d63ec8967539ab0 (commit) via 84810cd8a66503acb447e7c3bd439b76c735366b (commit) via fdaef16604064cbd0be75838f9d6359a3d7a8e1b (commit) via e243a6a724fc820fa01aa3e16f18212ed6729415 (commit) from eec57823cd6503339f8a54fed7dce0d4d41ab9a5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit 5359d8ae840dba48bb6f2163085d22b80108db2c Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 29 16:44:06 2008 +0200 packaging(RHEL): remove duplicate installation of pam_smbpass.so Michael (cherry picked from commit cdc24fbb195b1a5460c05fcd20d7ba81ad69ef22) commit 998b699f27630d3ea6d781da4f09c1cfd3e24511 Author: Michael Adam <[EMAIL PROTECTED]> Date: Mon Sep 8 17:38:55 2008 +0200 packaging(RHEL): use ccache if available Michael (cherry picked from commit e8abbfabde3da0844ffb4e2507084c139a70d503) commit 80d5e3621cac803c007e38e437d07f7dab2379aa Author: Michael Adam <[EMAIL PROTECTED]> Date: Mon Sep 8 15:52:27 2008 +0200 packaging(RHEL): add ldbtools binaries and man pages to common package Michael (cherry picked from commit 206985dfda5a9f62df975629046b00a88ec666f5) commit 17351dc1ea2be1d2478d6ae00d63ec8967539ab0 Author: Michael Adam <[EMAIL PROTECTED]> Date: Mon Sep 8 14:46:31 2008 +0200 packaging(RHEL): remove leftovers of smbmount from SPEC file. Michael (cherry picked from commit 041875c64daba3d185b1954eb0eb9a21b2f41ee1) commit 84810cd8a66503acb447e7c3bd439b76c735366b Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 29 17:45:45 2008 +0200 packaging(RHEL): add new libs (talloc, tdb, ...) to the common package Michael (cherry picked from commit f23183bbec55faf2d6496e04e73f8dd415a08d1c) commit fdaef16604064cbd0be75838f9d6359a3d7a8e1b Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 29 16:41:30 2008 +0200 packaging(RHEL): remove smbmount related stuff from spec file Michael (cherry picked from commit 4420cf6199e3c718a3dea84fe814d6ad6e83c2d8) commit e243a6a724fc820fa01aa3e16f18212ed6729415 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 29 15:45:18 2008 +0200 packaging(RHEL): fix version of GPL (2 --> 3) Michael (cherry picked from commit c015e8e0cf4131f21305451943df13b81f51ea6a) ----------------------------------------------------------------------- Summary of changes: packaging/RHEL/samba.spec.tmpl | 54 ++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 24 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index c4d4fd6..8c34a4a 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -8,7 +8,7 @@ Name: samba Version: PVERSION Release: PRELEASEPRPMREV Epoch: 0 -License: GNU GPL version 2 +License: GNU GPL version 3 Group: System Environment/Daemons URL: http://www.samba.org/ @@ -113,17 +113,17 @@ cd source # RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64" ## check for ccache -# ccache -h 2>&1 > /dev/null -#if [ $? -eq 0 ]; then -# CC="ccache gcc" -#else + ccache -h 2>&1 > /dev/null +if [ $? -eq 0 ]; then + CC="ccache gcc" +else CC="gcc" -#fi +fi ## always run autogen.sh ./autogen.sh -CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ +CC="$CC" CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --prefix=%{_prefix} \ --localstatedir=/var \ --with-configdir=%{_sysconfdir}/samba \ @@ -147,7 +147,6 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --with-pam \ --with-quotas \ --with-shared-modules=idmap_rid,idmap_ad \ - --with-smbmount \ --with-syslog \ --with-utmp \ --with-dnsupdate @@ -208,9 +207,6 @@ make DESTDIR=$RPM_BUILD_ROOT \ install cd .. -# pam_smbpass -cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so - # NSS & PAM winbind support install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so @@ -240,11 +236,6 @@ install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smb ## cleanup /bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security -# we need a symlink for mount to recognise the smb and smbfs filesystem types -ln -sf %{_prefix}/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs -ln -sf %{_prefix}/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb -/bin/rm -f $RPM_BUILD_ROOT/mount.smbfs - # Install the miscellany echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts @@ -415,16 +406,11 @@ fi %files client %defattr(-,root,root) -/sbin/mount.smb -/sbin/mount.smbfs /sbin/mount.cifs /sbin/umount.cifs %{_bindir}/rpcclient %{_bindir}/smbcacls -%{_bindir}/smbmount -%{_bindir}/smbmnt -%{_bindir}/smbumount %{_bindir}/findsmb %{_bindir}/smbcquotas %{_bindir}/nmblookup @@ -436,9 +422,6 @@ fi %{_bindir}/net %{_bindir}/smbtree -%{_mandir}/man8/smbmnt.8* -%{_mandir}/man8/smbmount.8* -%{_mandir}/man8/smbumount.8* %{_mandir}/man8/mount.cifs.8.* %{_mandir}/man8/umount.cifs.8.* %{_mandir}/man8/smbspool.8* @@ -459,6 +442,8 @@ fi %files common %defattr(-,root,root) %dir %{_sysconfdir}/samba +%dir %{_libarchdir}/samba +%dir %{_libarchdir}/samba/charset %config(noreplace) %{_sysconfdir}/samba/smb.conf %config(noreplace) %{_sysconfdir}/samba/lmhosts @@ -476,10 +461,25 @@ fi %{_libdir}/samba/*.msg %{_libdir}/samba/charset/*.so +%{_includedir}/netapi.h +%{_includedir}/wbclient.h +%{_includedir}/talloc.h +%{_includedir}/tdb.h +%{_libarchdir}/libnetapi.so* +%{_libarchdir}/libtalloc.so* +%{_libarchdir}/libtdb.so* +%{_libarchdir}/libwbclient.so* + %{_bindir}/testparm %{_bindir}/smbpasswd %{_bindir}/profiles +%{_bindir}/ldbadd +%{_bindir}/ldbdel +%{_bindir}/ldbedit +%{_bindir}/ldbmodify +%{_bindir}/ldbsearch + %{_mandir}/man1/profiles.1* %{_mandir}/man1/testparm.1* %{_mandir}/man5/smb.conf.5* @@ -488,6 +488,12 @@ fi %{_mandir}/man7/libsmbclient.7* %{_mandir}/man7/pam_winbind.7* +%{_mandir}/man1/ldbadd.1* +%{_mandir}/man1/ldbdel.1* +%{_mandir}/man1/ldbedit.1* +%{_mandir}/man1/ldbmodify.1* +%{_mandir}/man1/ldbsearch.1* + %changelog * Fri Jan 16 2004 Gerald (Jerry) Carter <[EMAIL PROTECTED],org> - Removed ChangeLog entries since they are kept in CVS -- Samba Shared Repository