[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-4623-g6e51f25
Michael Adam
obnox at samba.org
Thu Dec 11 16:53:11 GMT 2008
The branch, v3-3-test has been updated
via 6e51f250c5d38e973948aa1d53222bcccdcca365 (commit)
via 7d929d9fa363a1f1c67926678524f338e84b3535 (commit)
via b486890eb0883508c5ade3e1e4e99ac728b6bf71 (commit)
via 05b51bc176f87e7dc1b65adf3d866e797159d953 (commit)
via 402ac73f436e1b1b71199bbef44be775dc67801c (commit)
via 9538e3130f33ffde1d68eaea303b2b2dd9ddd71d (commit)
via e1dca5f1870975b7d9a57869357c971d559afdfe (commit)
via 0e35ff0b46be2f9deab6e539c34970c85c3b58ce (commit)
via 086873f00de96ca48717b05dddb71e776c74ca7d (commit)
via 24282daa5e293ef9362a69f7f70a684587d6763a (commit)
from 11bd02bc8e1484a953632d3293db716da2647c04 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 6e51f250c5d38e973948aa1d53222bcccdcca365
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 1 23:19:02 2008 +0100
packaging(RHEL-CTDB): don't show failure messages in check for ccache
by fixing the order of "> /dev/null 2>&1"
Michael
(cherry picked from commit 0e9d5638a7c375b3b18f19f83f97924ab45ad382)
commit 7d929d9fa363a1f1c67926678524f338e84b3535
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 1 23:03:38 2008 +0100
packaging(RHEL-CTDB): fix the build when ccache is not found.
Michael
(cherry picked from commit c98fb34ef933944a96a286d2d276cf2adc99e25e)
commit b486890eb0883508c5ade3e1e4e99ac728b6bf71
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 1 03:05:40 2008 +0100
packaging(RHEL-CTDB): explicitly build the gpfs module
to prevent potetential problems on PTF8 systems where there
is no valid autodetecting configure check yet.
Michael
(cherry picked from commit 37039d345e9a25654bef038f2b8bb4b891cfa6f0)
commit 05b51bc176f87e7dc1b65adf3d866e797159d953
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 1 03:07:19 2008 +0100
packaging(RHEL-CTDB): use ccache if available
Michael
(cherry picked from commit 36ca917a63f23126536e786bed845dee48fbf61c)
commit 402ac73f436e1b1b71199bbef44be775dc67801c
Author: Michael Adam <obnox at samba.org>
Date: Thu Sep 18 05:02:14 2008 +0200
packaging(RHEL-CTDB): adapt configure.rpm to changes to the spec file
Michael
(cherry picked from commit d249a9ca2a1761f20655cbcfe39fbc942547974d)
commit 9538e3130f33ffde1d68eaea303b2b2dd9ddd71d
Author: Michael Adam <obnox at samba.org>
Date: Tue Nov 11 13:47:37 2008 +0100
packaging(RHEL-CTDB): move the cifs.upcall manpage to the client package
Michael
(cherry picked from commit 16f23eb27467ace9751ef2d1fbb6c4d3a5ae9550)
commit e1dca5f1870975b7d9a57869357c971d559afdfe
Author: Michael Adam <obnox at samba.org>
Date: Tue Nov 11 13:45:40 2008 +0100
packaging(RHEL-CTDB): add the cifs.upcall binary to the client package.
Michael
(cherry picked from commit 1875b373a319ac9494fdc907793e59804c577a4d)
commit 0e35ff0b46be2f9deab6e539c34970c85c3b58ce
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 15 16:15:42 2008 +0200
packaging(RHEL-CTDB): fix typo in makerpms.sh
Michael
(cherry picked from commit 5fc5e82d4c2c386894fde95f94992171620c7853)
commit 086873f00de96ca48717b05dddb71e776c74ca7d
Author: Michael Adam <obnox at samba.org>
Date: Fri Sep 12 15:50:33 2008 +0200
packaging(RHEL-CTDB): refactor creation of spec file from template out
into new script makespec.sh
Michael
(cherry picked from commit d49a9d1c67e4d98017ce5f7d1351bca1366e1a8d)
commit 24282daa5e293ef9362a69f7f70a684587d6763a
Author: Michael Adam <obnox at samba.org>
Date: Wed Sep 10 23:06:28 2008 +0200
packaging(RHEL-CTDB): fix installation of pam modules
use configure parameter to specify the pam modules dir.
Michael
-----------------------------------------------------------------------
Summary of changes:
packaging/RHEL-CTDB/configure.rpm | 68 +++++++++++++++++++++++------------
packaging/RHEL-CTDB/makerpms.sh | 25 +++----------
packaging/RHEL-CTDB/makespec.sh | 36 ++++++++++++++++++
packaging/RHEL-CTDB/samba.spec.tmpl | 21 +++++------
4 files changed, 97 insertions(+), 53 deletions(-)
create mode 100755 packaging/RHEL-CTDB/makespec.sh
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index 7596040..b9a1ee1 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -1,37 +1,56 @@
+#!/bin/sh
case `uname -m` in
- x86_64)
- libdir=/usr/lib64/samba
- ;;
- *)
- libdir=/usr/lib/samba
- ;;
+ x86_64)
+ _libarch=lib64
+ ;;
+ *)
+ _libarch=lib
+ ;;
esac
-CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \
- --prefix=/usr \
- --localstatedir=/var \
- --with-configdir=/etc/samba \
- --with-libdir=$libdir \
- --with-lockdir=/var/lib/samba \
- --with-logfilebase=/var/log/samba \
- --with-mandir=/usr/man \
- --with-piddir=/var/run \
- --with-privatedir=/etc/samba \
- --with-sambabook=/usr/share/swat/using_samba \
- --with-swatdir=/usr/share/swat \
+_libarchdir=/usr/${_libarch}
+
+_prefix=/usr
+_sysconfdir=/etc
+_mandir=/usr/man
+_datadir=/usr/share
+
+# check for ccache
+ccache -h 2>&1 > /dev/null
+if [ $? -eq 0 ]; then
+ CC="ccache gcc"
+else
+ CC="gcc"
+fi
+
+./autogen.sh
+
+CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \
+ --prefix=${_prefix} \
+ --localstatedir=/var \
+ --with-configdir=${_sysconfdir}/samba \
+ --with-libdir=${_libarchdir}/samba \
+ --with-pammodulesdir=/${_libarch}/security \
+ --with-lockdir=/var/lib/samba \
+ --with-logfilebase=/var/log/samba \
+ --with-mandir=${_mandir} \
+ --with-piddir=/var/run \
+ --with-privatedir=${_sysconfdir}/samba \
+ --with-sambabook=${_datadir}/swat/using_samba \
+ --with-swatdir=${_datadir}/swat \
--disable-cups \
- --with-acl-support \
+ --with-acl-support \
--with-ads \
- --with-automount \
- --with-fhs \
+ --with-automount \
+ --with-fhs \
--with-pam_smbpass \
--with-libsmbclient \
--with-libsmbsharemodes \
- --without-smbwrapper \
+ --without-smbwrapper \
--with-pam \
--with-quotas \
- --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \
+ --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \
--with-syslog \
--with-utmp \
--with-cluster-support \
@@ -40,3 +59,6 @@ CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \
--without-dnsupdate \
--with-aio-support \
$*
+
+make showlayout
+
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 219982f..50fa96c 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -25,8 +25,6 @@ RPMSRCDIR=`rpm --eval %_sourcedir`
DIRNAME=$(dirname $0)
TOPDIR=${DIRNAME}/../..
-SRCDIR=${TOPDIR}/source
-VERSION_H=${SRCDIR}/include/version.h
SPECFILE="samba.spec"
DOCS="docs.tar.bz2"
@@ -49,25 +47,14 @@ esac
##
## determine the samba version and create the SPEC file
##
-pushd ${SRCDIR}
-./script/mkversion.sh
-popd
-if [ ! -f ${VERSION_H} ] ; then
- echo "Error creating version.h"
- exit 1
+${DIRNAME}/makespec.sh
+RC=$?
+if [ $RC -ne 0 ]; then
+ exit ${RC}
fi
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
-if test "x${vendor_version}" != "x" ; then
- VERSION="${VERSION}-${vendor_version}"
-fi
-VERSION=`echo ${VERSION} | sed 's/-/_/g'`
-VERSION=`echo ${VERSION} | sed 's/\"//g'`
-echo "VERSION: ${VERSION}"
-sed -e s/PVERSION/${VERSION}/g \
- < ${DIRNAME}/${SPECFILE}.tmpl \
- > ${DIRNAME}/${SPECFILE}
+RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//')
+VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
##
## create the tarball
diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
new file mode 100755
index 0000000..7d10d55
--- /dev/null
+++ b/packaging/RHEL-CTDB/makespec.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Copyright (C) Michael Adam 2008
+#
+# Script to determine the samba version and create the SPEC file from template
+
+DIRNAME=$(dirname $0)
+TOPDIR=${DIRNAME}/../..
+SRCDIR=${TOPDIR}/source
+VERSION_H=${SRCDIR}/include/version.h
+SPECFILE=${DIRNAME}/samba.spec
+
+##
+## determine the samba version and create the SPEC file
+##
+pushd ${SRCDIR}
+./script/mkversion.sh
+popd
+if [ ! -f ${VERSION_H} ] ; then
+ echo "Error creating version.h"
+ exit 1
+fi
+
+VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
+vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print
+$3}'`
+if test "x${vendor_version}" != "x" ; then
+ VERSION="${VERSION}-${vendor_version}"
+fi
+VERSION=`echo ${VERSION} | sed 's/-/_/g'`
+VERSION=`echo ${VERSION} | sed 's/\"//g'`
+echo "VERSION: ${VERSION}"
+sed -e s/PVERSION/${VERSION}/g \
+ < ${SPECFILE}.tmpl \
+ > ${SPECFILE}
+
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index b34f01f..8a583a9 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -133,12 +133,11 @@ 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
+if ccache -h >/dev/null 2>&1 ; then
+ CC="ccache gcc"
+else
CC="gcc"
-#fi
+fi
## always run autogen.sh
./autogen.sh
@@ -149,6 +148,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--with-configdir=%{_sysconfdir}/samba \
--libdir=%{_libarchdir} \
--with-modulesdir=%{_libarchdir}/samba \
+ --with-pammodulesdir=%{_libarch}/security \
--with-lockdir=/var/lib/samba \
--with-logfilebase=/var/log/samba \
--with-mandir=%{_mandir} \
@@ -167,7 +167,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--without-smbwrapper \
--with-pam \
--with-quotas \
- --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \
+ --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs \
--with-syslog \
--with-utmp \
--with-cluster-support \
@@ -230,8 +230,7 @@ make DESTDIR=$RPM_BUILD_ROOT \
install
cd ..
-# NSS & PAM winbind support
-install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_winbind.so
+# NSS winbind support
install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
( cd $RPM_BUILD_ROOT/%{_libarch};
ln -sf libnss_winbind.so.2 libnss_winbind.so )
@@ -242,8 +241,6 @@ install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/lib
#install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
# ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so libnss_wins.so.2 )
-# Install pam_smbpass.so
-install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so
## cleanup
/bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
@@ -419,6 +416,8 @@ exit 0
/sbin/mount.cifs
/sbin/umount.cifs
+%{_sbindir}/cifs.upcall
+
%{_bindir}/rpcclient
%{_bindir}/smbcacls
%{_bindir}/findsmb
@@ -432,6 +431,7 @@ exit 0
%{_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*
@@ -512,7 +512,6 @@ exit 0
%{_mandir}/man1/ldbedit.1*
%{_mandir}/man1/ldbmodify.1*
%{_mandir}/man1/ldbsearch.1*
-%{_mandir}/man8/cifs.upcall.8*
%ifarch i386 i486 i586 i686 ppc s390
%files winbind-32bit
--
Samba Shared Repository
More information about the samba-cvs
mailing list