[SCM] Samba Shared Repository - branch v3-devel updated -
release-3-2-0pre2-4076-gd87c219
Michael Adam
obnox at samba.org
Tue Sep 9 08:56:34 GMT 2008
The branch, v3-devel has been updated
via d87c2192ab7b68b2f68442c50618d94146d77ad9 (commit)
via e8abbfabde3da0844ffb4e2507084c139a70d503 (commit)
via 206985dfda5a9f62df975629046b00a88ec666f5 (commit)
via f1b80bcb58b8aa5c586835dc201ce674b3417835 (commit)
via 0f045f18ebaa752b9d906afc64fd5badb3bf352c (commit)
via 041875c64daba3d185b1954eb0eb9a21b2f41ee1 (commit)
via f23183bbec55faf2d6496e04e73f8dd415a08d1c (commit)
via 5348e28f6674cab643b42c1265c24983d9a9189d (commit)
via 829f83c27ad03e4d2a7b5dc0b0459823fa4f3804 (commit)
via 3eaa33e9df6d58ef93f13a840b38a063649fffbc (commit)
via cdc24fbb195b1a5460c05fcd20d7ba81ad69ef22 (commit)
via 4420cf6199e3c718a3dea84fe814d6ad6e83c2d8 (commit)
via 75c28699496d843e21eefef564c72023b24975a1 (commit)
via dc6625637fb9de7d64d4416a1eb43f214590d393 (commit)
via c015e8e0cf4131f21305451943df13b81f51ea6a (commit)
from 7e0cca19fec078c0b46807492a7a035f4fab612b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -----------------------------------------------------------------
commit d87c2192ab7b68b2f68442c50618d94146d77ad9
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 13:44:52 2008 +0200
packaging(RHEL): add makerpms.git.sh to build rpms from inside a git checkout
This expects a path to a release docs tarball (.tar.bz2) in the DOCS_TARBALL
environment variable. The tarball should have a prefix of "docs/".
Michael
commit e8abbfabde3da0844ffb4e2507084c139a70d503
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 17:38:55 2008 +0200
packaging(RHEL): use ccache if available
Michael
commit 206985dfda5a9f62df975629046b00a88ec666f5
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
commit f1b80bcb58b8aa5c586835dc201ce674b3417835
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
commit 0f045f18ebaa752b9d906afc64fd5badb3bf352c
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 8 15:51:33 2008 +0200
packaging(RHEL): fix installation of pam modules.
Michael
commit 041875c64daba3d185b1954eb0eb9a21b2f41ee1
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
commit f23183bbec55faf2d6496e04e73f8dd415a08d1c
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
commit 5348e28f6674cab643b42c1265c24983d9a9189d
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
commit 829f83c27ad03e4d2a7b5dc0b0459823fa4f3804
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
commit 3eaa33e9df6d58ef93f13a840b38a063649fffbc
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:48:37 2008 +0200
packaging(RHEL): remove libmsrpc stuff which is no more...
Michael
commit cdc24fbb195b1a5460c05fcd20d7ba81ad69ef22
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
commit 4420cf6199e3c718a3dea84fe814d6ad6e83c2d8
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
commit 75c28699496d843e21eefef564c72023b24975a1
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
commit dc6625637fb9de7d64d4416a1eb43f214590d393
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
commit c015e8e0cf4131f21305451943df13b81f51ea6a
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
-----------------------------------------------------------------------
Summary of changes:
.../makerpms.sh => RHEL/makerpms.git.sh} | 45 +++++-
packaging/RHEL/samba.spec.tmpl | 140 +++++++++-----------
2 files changed, 101 insertions(+), 84 deletions(-)
copy packaging/{RHEL-CTDB/makerpms.sh => RHEL/makerpms.git.sh} (77%)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL/makerpms.git.sh
similarity index 77%
copy from packaging/RHEL-CTDB/makerpms.sh
copy to packaging/RHEL/makerpms.git.sh
index 219982f..a8cb477 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL/makerpms.git.sh
@@ -14,6 +14,7 @@
# that are under the /usr/src/redhat directory.
# Set DOCS_TARBALL to the path to a docs release tarball in .tar.bz2 format.
+# This tarball should contain the compiled docs with a prefix of "docs/".
# extra options passed to rpmbuild
EXTRA_OPTIONS="$1"
@@ -23,6 +24,9 @@ RPMSRCDIR=`rpm --eval %_sourcedir`
# At this point the RPMSPECDIR and RPMSRCDIR variables must have a value!
+USERID=`id -u`
+GRPID=`id -g`
+
DIRNAME=$(dirname $0)
TOPDIR=${DIRNAME}/../..
SRCDIR=${TOPDIR}/source
@@ -66,16 +70,47 @@ VERSION=`echo ${VERSION} | sed 's/-/_/g'`
VERSION=`echo ${VERSION} | sed 's/\"//g'`
echo "VERSION: ${VERSION}"
sed -e s/PVERSION/${VERSION}/g \
+ -e s/PRELEASE/1/g \
+ -e s/PRPMREV//g \
< ${DIRNAME}/${SPECFILE}.tmpl \
> ${DIRNAME}/${SPECFILE}
+
##
## create the tarball
##
pushd ${TOPDIR}
+rm -rf ../samba-${VERSION}
+git archive --prefix=samba-${VERSION}/ HEAD | (cd .. && tar -xf -)
+RC=$?
+popd
+if [ $RC -ne 0 ]; then
+ echo "Build failed!"
+ exit 1
+fi
+
+if [ "x${DOCS_TARBALL}" != "x" ] && [ -f ${DOCS_TARBALL} ]; then
+ cp ${DOCS_TARBALL} /tmp/${DOCS}
+ pushd ${TOPDIR}/../samba-${VERSION}
+ tar xjf /tmp/${DOCS}
+ RC=$?
+ rm -f /tmp/${DOCS}
+ popd
+ if [ $RC -ne 0 ]; then
+ echo "Build failed!"
+ exit 1
+ fi
+fi
+
+pushd ${TOPDIR}/..
+chown -R ${USERID}.${GRPID} samba-${VERSION}${REVISION}
+if [ ! -d samba-${VERSION} ]; then
+ ln -s samba-${VERSION}${REVISION} samba-${VERSION} || exit 1
+fi
echo -n "Creating samba-${VERSION}.tar.bz2 ... "
-git archive --prefix=samba-${VERSION}/ HEAD | bzip2 > ${RPMSRCDIR}/samba-${VERSION}.tar.bz2
+tar --exclude=.svn -cf - samba-${VERSION}/. | bzip2 > ${RPMSRCDIR}/samba-${VERSION}.tar.bz2
RC=$?
+rm -rf samba-${VERSION}/
popd
echo "Done."
if [ $RC -ne 0 ]; then
@@ -87,17 +122,10 @@ fi
##
## copy additional source files
##
-if [ "x${DOCS_TARBALL}" != "x" ] && [ -f ${DOCS_TARBALL} ]; then
- cp ${DOCS_TARBALL} ${RPMSRCDIR}/${DOCS}
-fi
-
pushd ${DIRNAME}
-
chmod 755 setup/filter-requires-samba.sh
tar --exclude=.svn -jcvf - setup > ${RPMSRCDIR}/setup.tar.bz2
-
cp -p ${SPECFILE} ${RPMSPECDIR}
-
popd
##
@@ -111,6 +139,7 @@ if [ "x$?" = "x0" ] && [ `arch` = "x86_64" ]; then
# hi ho, a hacking we will go ...
ln -sf /lib/libcom_err.so.2 /lib/libcom_err.so
ln -sf /lib/libuuid.so.1 /lib/libuuid.so
+ ln -sf /lib/libkeyutils.so.1 /lib/libkeyutils.so
${RPM} -ba --rebuild --target=i386 $SPECFILE
fi
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index d71e5b0..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,51 +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 libmsrpc.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.a || true
-install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
-install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
-install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
-ln -s /%{_libdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.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
@@ -371,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*
@@ -423,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
@@ -444,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*
@@ -467,29 +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.*
-%{_includedir}/libmsrpc.h
-%{_libdir}/libmsrpc.*
+%{_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*
@@ -498,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