[SCM] Samba Shared Repository - branch v3-3-stable updated -
release-3-3-0pre1-144-gdc4b7a4
Karolin Seeger
kseeger at samba.org
Wed Sep 10 09:56:31 GMT 2008
The branch, v3-3-stable has been updated
via dc4b7a43192543d90ede3817fbfaccea61d8f5c8 (commit)
via 93fb563fc8ae9ea036f255ddd0121162ac0fde75 (commit)
via 6dcc1c52216115f26823feac95b88ff568a94cae (commit)
via da8fa524cd8fdc64d317ca215558f434c34d9a3e (commit)
via 0325da50d0c9074990c815d826442dae9893eb78 (commit)
via af408ea49ebecd10b08eb635388715dec7956000 (commit)
via 92c485d375bbc1d80d019443ed7cc73c8ed7d0a6 (commit)
via 847420d29c2db305efc818a1747a0e7d44f478fa (commit)
via ba760a186ecec232cc85311a8e1de2eeaa60789b (commit)
via ddfedbeb4907ed3ab1a10f483020acae13badae2 (commit)
via cff70da9d0fa41533973e249cf3d456b2bfc9b1b (commit)
via 86035a22e27098bd301c180f2ef451b90a7aac86 (commit)
via d587fe03721e20606badd438eb596e0d69eb96b7 (commit)
via af21cfce1b93ea4fee0a4830f62d993495d7f4de (commit)
from d802c787beb4ff4e3a185c5297010f47ba9df5da (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable
- Log -----------------------------------------------------------------
commit dc4b7a43192543d90ede3817fbfaccea61d8f5c8
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Sep 10 11:46:53 2008 +0200
WHATSNEW: Update changes since 3.3.0pre1.
Karolin
commit 93fb563fc8ae9ea036f255ddd0121162ac0fde75
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 17:38:55 2008 +0200
packaging(RHEL): use ccache if available
Michael
(cherry picked from commit e8abbfabde3da0844ffb4e2507084c139a70d503)
(cherry picked from commit 4e44f8a960fd0045905416e6a812c3f4163e565c)
commit 6dcc1c52216115f26823feac95b88ff568a94cae
Author: Michael Adam <obnox at samba.org>
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)
(cherry picked from commit 81ee5988eac33b2bdade3bd46c201b690f6ca3e2)
commit da8fa524cd8fdc64d317ca215558f434c34d9a3e
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 15:51:57 2008 +0200
packaging(RHEL): add cifs.upcall binary and manpage to client package
Michael
(cherry picked from commit f1b80bcb58b8aa5c586835dc201ce674b3417835)
(cherry picked from commit b4c58d49902d62f25aa0c9289d1857aa2636c028)
commit 0325da50d0c9074990c815d826442dae9893eb78
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 15:51:33 2008 +0200
packaging(RHEL): fix installation of pam modules.
Michael
(cherry picked from commit 0f045f18ebaa752b9d906afc64fd5badb3bf352c)
(cherry picked from commit 730fbb255a8cd2adb2939ac275a2f4272771ee0f)
commit af408ea49ebecd10b08eb635388715dec7956000
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 14:46:31 2008 +0200
packaging(RHEL): remove leftovers of smbmount from SPEC file.
Michael
(cherry picked from commit 041875c64daba3d185b1954eb0eb9a21b2f41ee1)
(cherry picked from commit 364e1c50b28799ee6a5debe3ab30f64730515421)
commit 92c485d375bbc1d80d019443ed7cc73c8ed7d0a6
Author: Michael Adam <obnox at samba.org>
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)
(cherry picked from commit 8eb83a2c94fbc6f014480d22b422f6bfe008b8f7)
commit 847420d29c2db305efc818a1747a0e7d44f478fa
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:57:16 2008 +0200
packaging(RHEL): remove workaround code for libsmclient/sharemodes installation
With 3.3.0, this is not needed any more
(libdir/modulesdir separation and corrected library creation).
Michael
(cherry picked from commit 5348e28f6674cab643b42c1265c24983d9a9189d)
(cherry picked from commit e03183e11be968740223a42a4080a53320f318ec)
commit ba760a186ecec232cc85311a8e1de2eeaa60789b
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:55:55 2008 +0200
packaging(RHEL): fix libdir installation by using _libarch/_libarchdir
Michael
(cherry picked from commit 829f83c27ad03e4d2a7b5dc0b0459823fa4f3804)
(cherry picked from commit f8b8774a33fdf5f390dbebd2b56411b689f8cb8d)
commit ddfedbeb4907ed3ab1a10f483020acae13badae2
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:44:06 2008 +0200
packaging(RHEL): remove duplicate installation of pam_smbpass.so
Michael
(cherry picked from commit cdc24fbb195b1a5460c05fcd20d7ba81ad69ef22)
(cherry picked from commit 6a68739e618b2815158f2e577a920c018e5a4093)
commit cff70da9d0fa41533973e249cf3d456b2bfc9b1b
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:41:30 2008 +0200
packaging(RHEL): remove smbmount related stuff from spec file
Michael
(cherry picked from commit 4420cf6199e3c718a3dea84fe814d6ad6e83c2d8)
(cherry picked from commit 18f8be31f697b807ab34d5d08a028e09e9d9f09c)
commit 86035a22e27098bd301c180f2ef451b90a7aac86
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:40:04 2008 +0200
packaging(RHEL): don't make proto for samba 3.3
Michael
(cherry picked from commit 75c28699496d843e21eefef564c72023b24975a1)
(cherry picked from commit 88cc5106c32443197a7b3e53554529420321d47f)
commit d587fe03721e20606badd438eb596e0d69eb96b7
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:38:31 2008 +0200
packaging(RHEL): use --libdir and --with-modulesdir instead of --with-libdir
Michael
(cherry picked from commit dc6625637fb9de7d64d4416a1eb43f214590d393)
(cherry picked from commit 0de6722276277550de08a9fd225baae91f2aeaf1)
commit af21cfce1b93ea4fee0a4830f62d993495d7f4de
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 15:45:18 2008 +0200
packaging(RHEL): fix version of GPL (2 --> 3)
Michael
(cherry picked from commit c015e8e0cf4131f21305451943df13b81f51ea6a)
(cherry picked from commit 45948bd82b1810d9b796471e39c5a445a8e087d2)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 2 +
packaging/RHEL/samba.spec.tmpl | 130 ++++++++++++++++++++--------------------
2 files changed, 66 insertions(+), 66 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d322491..798ae25 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -91,6 +91,8 @@ Commit Highlights:
------------------
o Michael Adam <obnox at samba.org>
+ * BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
+ * BUG 5507: Fix several issues in the RHEL SPEC file.
* BUG 5609: Remove configure option "--with-libdir" and add
"--with-modulesdir".
* Extend "net rpc vampire keytab" to support differential replication
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index c4d4fd6..20567bb 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/
@@ -33,6 +33,15 @@ BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-deve
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
+# rpm screws up the arch lib dir when using --target on RHEL5
+%ifarch i386 i486 i586 i686 ppc s390
+%define _libarch lib
+%else
+%define _libarch %_lib
+%endif
+
+%define _libarchdir /usr/%{_libarch}
+
%description
Samba is the protocol by which a lot of PC-related machines share
@@ -113,21 +122,23 @@ 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 \
- --with-libdir=%{_libdir}/samba \
+ --libdir=%{_libarchdir} \
+ --with-modulesdir=%{_libarchdir}/samba \
+ --with-pammodulesdir=%{_libarch}/security \
--with-lockdir=/var/lib/samba \
--with-logfilebase=/var/log/samba \
--with-mandir=%{_mandir} \
@@ -147,15 +158,12 @@ 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
make showlayout
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" proto
-
## check for gcc 3.4 or later
CC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
CC_MAJOR=`echo ${CC_VERSION} | cut -d. -f 1`
@@ -188,9 +196,9 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/swat/{help,include,using_samba/{figs,gifsa}}
mkdir -p $RPM_BUILD_ROOT%{_includedir}
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/samba/{auth,charset,idmap,vfs,pdb}
-mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
+mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}}
+mkdir -p $RPM_BUILD_ROOT%{_libarchdir}/samba/{auth,charset,idmap,vfs,pdb}
+mkdir -p $RPM_BUILD_ROOT/%{_libarch}/security
mkdir -p $RPM_BUILD_ROOT%{_mandir}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/{bin,sbin}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
@@ -208,43 +216,16 @@ 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
-install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_lib}/libnss_wins.so
-( cd $RPM_BUILD_ROOT/%{_lib};
+# NSS winbind support
+install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so
+install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
+( cd $RPM_BUILD_ROOT/%{_libarch};
ln -sf libnss_winbind.so libnss_winbind.so.2;
ln -sf libnss_wins.so libnss_wins.so.2 )
-# make install puts libsmbclient.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.so $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.a || true
-install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so
-install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
-install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
-ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0
-
-# make install puts libsmbsharemodes.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
-install -m 755 source/bin/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so
-install -m 755 source/bin/libsmbsharemodes.a $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.a
-install -m 644 source/include/smb_share_modes.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbsharemodes.*
-ln -s /%{_libdir}/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so.0
-
-# Install pam_smbpass.so
-install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
-
## 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
@@ -363,10 +344,10 @@ fi
%{_bindir}/pdbedit
%{_bindir}/eventlogadm
-%{_libdir}/samba/idmap/*.so
-%{_libdir}/samba/nss_info/*.so
-%{_libdir}/samba/vfs/*.so
-%{_libdir}/samba/auth/*.so
+%{_libarchdir}/samba/idmap/*.so
+%{_libarchdir}/samba/nss_info/*.so
+%{_libarchdir}/samba/vfs/*.so
+%{_libarchdir}/samba/auth/*.so
%{_mandir}/man1/smbcontrol.1*
%{_mandir}/man1/smbstatus.1*
@@ -415,16 +396,12 @@ fi
%files client
%defattr(-,root,root)
-/sbin/mount.smb
-/sbin/mount.smbfs
/sbin/mount.cifs
/sbin/umount.cifs
+%{_sbindir}/cifs.upcall
%{_bindir}/rpcclient
%{_bindir}/smbcacls
-%{_bindir}/smbmount
-%{_bindir}/smbmnt
-%{_bindir}/smbumount
%{_bindir}/findsmb
%{_bindir}/smbcquotas
%{_bindir}/nmblookup
@@ -436,11 +413,9 @@ 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/cifs.upcall.8.*
%{_mandir}/man8/smbspool.8*
%{_mandir}/man1/smbget.1*
%{_mandir}/man5/smbgetrc.5*
@@ -459,27 +434,44 @@ 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
-%attr(755,root,root) /%{_lib}/libnss_wins.so*
-%attr(755,root,root) /%{_lib}/libnss_winbind.so*
-%attr(755,root,root) /%{_lib}/security/pam_winbind.so
-%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
+%attr(755,root,root) /%{_libarch}/libnss_wins.so*
+%attr(755,root,root) /%{_libarch}/libnss_winbind.so*
+%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
+%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
%{_includedir}/libsmbclient.h
-%{_libdir}/libsmbclient.*
+%{_libarchdir}/libsmbclient.*
%{_includedir}/smb_share_modes.h
-%{_libdir}/libsmbsharemodes.*
+%{_libarchdir}/libsmbsharemodes.*
+
+%{_libarchdir}/samba/*.dat
+%{_libarchdir}/samba/*.msg
+%{_libarchdir}/samba/charset/*.so
-%{_libdir}/samba/*.dat
-%{_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 +480,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 <jerry at samba,org>
- Removed ChangeLog entries since they are kept in CVS
--
Samba Shared Repository
More information about the samba-cvs
mailing list