[SCM] Samba Shared Repository - branch master updated - dfff610b464cb08a07bf235c161c242d16684972

Michael Adam obnox at samba.org
Thu Dec 11 16:54:23 GMT 2008


The branch, master has been updated
       via  dfff610b464cb08a07bf235c161c242d16684972 (commit)
       via  2ef0fc467a33e1b448853273316a72c3e7e72c47 (commit)
       via  05c9766cef9d0bba1b7ab496f06e976a6bcc2dae (commit)
       via  9e4a95c928d023a3b253bbf7d9056aa91d5c278a (commit)
       via  0acddd96d92bd229650190f498b5782d1b96fac7 (commit)
       via  0c9d433f9ec98471b52c2c65130602a393e8bbb0 (commit)
       via  9ecb169debbdfea03036dc293366bf2063be1448 (commit)
       via  1ad04b031902aa6d89365f839178b6fb23bfdb2a (commit)
      from  138283c7c1f35b77ae773aca04cd499276df96ef (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit dfff610b464cb08a07bf235c161c242d16684972
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)
    (cherry picked from commit 6e51f250c5d38e973948aa1d53222bcccdcca365)

commit 2ef0fc467a33e1b448853273316a72c3e7e72c47
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)
    (cherry picked from commit 7d929d9fa363a1f1c67926678524f338e84b3535)

commit 05c9766cef9d0bba1b7ab496f06e976a6bcc2dae
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)
    (cherry picked from commit 05b51bc176f87e7dc1b65adf3d866e797159d953)

commit 9e4a95c928d023a3b253bbf7d9056aa91d5c278a
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)
    (cherry picked from commit 9538e3130f33ffde1d68eaea303b2b2dd9ddd71d)

commit 0acddd96d92bd229650190f498b5782d1b96fac7
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)
    (cherry picked from commit e1dca5f1870975b7d9a57869357c971d559afdfe)

commit 0c9d433f9ec98471b52c2c65130602a393e8bbb0
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)
    (cherry picked from commit 0e35ff0b46be2f9deab6e539c34970c85c3b58ce)

commit 9ecb169debbdfea03036dc293366bf2063be1448
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)
    (cherry picked from commit 086873f00de96ca48717b05dddb71e776c74ca7d)

commit 1ad04b031902aa6d89365f839178b6fb23bfdb2a
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
    (cherry picked from commit 24282daa5e293ef9362a69f7f70a684587d6763a)

-----------------------------------------------------------------------

Summary of changes:
 packaging/RHEL-CTDB/makerpms.sh     |   25 +++++------------------
 packaging/RHEL-CTDB/makespec.sh     |   36 +++++++++++++++++++++++++++++++++++
 packaging/RHEL-CTDB/samba.spec.tmpl |   19 ++++++++---------
 3 files changed, 51 insertions(+), 29 deletions(-)
 create mode 100755 packaging/RHEL-CTDB/makespec.sh


Changeset truncated at 500 lines:

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 910fe37..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} \
@@ -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