[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Wed May 18 15:11:02 MDT 2011
The branch, master has been updated
via 0b0abc1 packaging(RHEL-CTDB): honour rpm build target options handed in to makerpms.sh
via c07cccd packaging(RHEL-CTDB): adapt configure.rpm
via b2dbdaa packaging(RHEL-CTDB): enforce building of libtdb and libtalloc
via ec625f7 packaging(RHEL-CTDB): build libtdb and libtalloc packages ourselves
via ac0307f packaging(RHEL-CTDB): update configure.rpm (--disable-smbtorture4)
via 51d5975 packaging(RHEL-CTDB): disable smbtorture4 in the rpm build
via b758875 packaging(RHEL-CTDB): Remove the packaging of the winbind-32bit compat package
via ab62871 packaging(RHEL-CTDB): create the rpm directories
from eb57d47 Make protocol version 2 the default protocol, and only run on version 1 if V1 is explcitly given as a module option.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0b0abc1723063b1360557cbd42198708720fa0a4
Author: Michael Adam <obnox at samba.org>
Date: Wed May 18 10:35:42 2011 +0200
packaging(RHEL-CTDB): honour rpm build target options handed in to makerpms.sh
This allows to call e.g. "makerpms.sh -bs" to only build the source rpm.
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Wed May 18 23:10:59 CEST 2011 on sn-devel-104
commit c07cccd98355102d9747004ec44e029937644b91
Author: Michael Adam <obnox at samba.org>
Date: Fri May 6 17:22:06 2011 +0200
packaging(RHEL-CTDB): adapt configure.rpm
commit b2dbdaaa0f6f03506a9e55631aa89db503bca73f
Author: Michael Adam <obnox at samba.org>
Date: Fri May 6 17:21:10 2011 +0200
packaging(RHEL-CTDB): enforce building of libtdb and libtalloc
commit ec625f7b7bc1a06da8541f9d8538ce88851bb10e
Author: Michael Adam <obnox at samba.org>
Date: Fri May 6 12:29:10 2011 +0200
packaging(RHEL-CTDB): build libtdb and libtalloc packages ourselves
and add appropriate dependencies to the samba-common package.
It should also be possible to run with appropriate system talloc
and tdb packages.
commit ac0307ff898d5f8edfa783e9f5e7a89ebf6d6524
Author: Michael Adam <obnox at samba.org>
Date: Fri May 6 18:36:38 2011 +0200
packaging(RHEL-CTDB): update configure.rpm (--disable-smbtorture4)
commit 51d5975e5e88967414e594c56e5041ac278790a1
Author: Michael Adam <obnox at samba.org>
Date: Fri May 6 18:35:55 2011 +0200
packaging(RHEL-CTDB): disable smbtorture4 in the rpm build
commit b7588755e7c021e4071691787686b07f8041845e
Author: Michael Adam <obnox at samba.org>
Date: Fri May 6 12:03:52 2011 +0200
packaging(RHEL-CTDB): Remove the packaging of the winbind-32bit compat package
commit ab628716e0c989a9d80afbdff58ecda863330b67
Author: Volker Lendecke <vl at samba.org>
Date: Wed Apr 27 10:25:05 2011 +0200
packaging(RHEL-CTDB): create the rpm directories
In RHEL6, rpms are built in /root/rpmbuild, and those directories do not
necessarily exist.
-----------------------------------------------------------------------
Summary of changes:
packaging/RHEL-CTDB/configure.rpm | 3 +
packaging/RHEL-CTDB/makerpms.sh | 19 ++++-
packaging/RHEL-CTDB/makespec.sh | 15 +++-
packaging/RHEL-CTDB/samba.spec.tmpl | 157 +++++++++--------------------------
4 files changed, 76 insertions(+), 118 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index 616336e..c7057ec 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -60,6 +60,9 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
--without-dnsupdate \
--with-aio-support \
--disable-merged-build \
+ --disable-smbtorture4 \
+ --disable-external-libtalloc \
+ --disable-external-libtdb \
$*
make showlayout
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index c1a4b70..d23d14e 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -42,6 +42,14 @@ case $RPMVER in
;;
esac
+mkdir -p `rpm --eval %_specdir`
+mkdir -p `rpm --eval %_sourcedir`
+mkdir -p `rpm --eval %_builddir`
+mkdir -p `rpm --eval %_srcrpmdir`
+mkdir -p `rpm --eval %_rpmdir`/noarch
+mkdir -p `rpm --eval %_rpmdir`/i386
+mkdir -p `rpm --eval %_rpmdir`/x86_64
+
##
## Delete the old debuginfo remnants:
##
@@ -131,8 +139,17 @@ fi
##
echo "$(basename $0): Getting Ready to build release package"
+case ${EXTRA_OPTIONS} in
+ *-b*)
+ BUILD_TARGET=""
+ ;;
+ *)
+ BUILD_TARGET="-ba"
+ ;;
+esac
+
pushd ${RPMSPECDIR}
-${RPM} -ba $EXTRA_OPTIONS $SPECFILE
+${RPM} ${BUILD_TARGET} ${EXTRA_OPTIONS} ${SPECFILE}
popd
echo "$(basename $0): Done."
diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index 29dcbeb..946ce8e 100755
--- a/packaging/RHEL-CTDB/makespec.sh
+++ b/packaging/RHEL-CTDB/makespec.sh
@@ -45,8 +45,21 @@ else
echo "GITHASH: ${GITHASH}"
fi
-sed -e s/PVERSION/${VERSION}/g \
+
+#
+# get the versions of libtdb and libtalloc we provide
+#
+#LIBTDBVERSION=1.2.9
+LIBTDBVERSION=$(grep ^VERSION ${DIRNAME}/../../lib/tdb/wscript | sed -e "s/'//g" -e 's/.* //')
+
+#LIBTALLOCVERSION=2.0.1
+LIBTALLOCVERSION=$(grep ^VERSION ${DIRNAME}/../../lib/talloc/wscript | sed -e "s/'//g" -e 's/.* //')
+
+sed \
+ -e s/PVERSION/${VERSION}/g \
-e s/GITHASH/${GITHASH}/g \
+ -e s/LIBTDBVERSION/${LIBTDBVERSION}/g \
+ -e s/LIBTALLOCVERSION/${LIBTALLOCVERSION}/g \
< ${SPECFILE}.tmpl \
> ${SPECFILE}
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 479e985..fae9ffe 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -77,6 +77,8 @@ shares and printing to SMB printers.
Summary: Files used by both Samba servers and clients.
Group: Applications/System
Provides: samba-common = %{version}-%{release}
+Requires: libtalloc >= 2.0.1
+Requires: libtdb >= 1.2.6
%description common
Samba-common provides files necessary for both the server and client
@@ -84,6 +86,28 @@ packages of Samba.
#######################################################################
+%package libtdb
+Summary: the tdb library
+Group: Applications/System
+Provides: libtdb = LIBTDBVERSION-%{release}
+Obsoletes: libtdb
+#Conflicts: libtdb < LIBTALLOCVERSION
+
+%description libtdb
+Samba's tdb library.
+
+#######################################################################
+%package libtalloc
+Summary: the talloc library
+Group: Applications/System
+Provides: libtalloc = LIBTALLOCVERSION-%{release}
+Obsoletes: libtalloc
+#Conflicts: libtalloc < LIBTALLOCVERSION
+
+%description libtalloc
+Samba's talloc library
+
+#######################################################################
%package swat
Summary: The Samba SMB server configuration program.
Group: Applications/System
@@ -95,15 +119,6 @@ The samba-swat package includes the new SWAT (Samba Web Administration
Tool), for remotely managing Samba's smb.conf file using your favorite
Web browser.
-%ifarch x86_64 ppc64
-%package winbind-32bit
-Summary: Samba winbind compatibility package for 32bit apps on 64bit archs
-Group: Applications/System
-
-%description winbind-32bit
-Compatibility package for 32 bit apps on 64 bit architecures
-%endif
-
#######################################################################
%package doc
@@ -146,81 +161,6 @@ export CC
./autogen.sh
-##
-## build the files for the winbind-32bit compat package
-## and copy them to a safe location
-##
-%ifarch x86_64 ppc64
-
-# a directory to store the 32bit compatibility modules for later install
-%define _32bit_tmp_dir %{_tmppath}/%{name}-%{version}-32bit
-
-CC_SAVE="$CC"
-CC="$CC -m32"
-
-CFLAGS="$RPM_OPT_FLAGS -O3 -D_GNU_SOURCE -m32" ./configure \
- --prefix=%{_prefix} \
- --localstatedir=/var \
- --with-configdir=%{_sysconfdir}/samba \
- --with-libdir=/usr/lib/samba \
- --with-pammodulesdir=/lib/security \
- --with-lockdir=/var/lib/samba \
- --with-logfilebase=/var/log/samba \
- --with-mandir=%{_mandir} \
- --with-piddir=/var/run \
- --with-privatedir=%{_sysconfdir}/samba \
- --disable-cups \
- --with-acl-support \
- --with-ads \
- --with-automount \
- --with-fhs \
- --with-pam_smbpass \
- --with-libsmbclient \
- --with-libsmbsharemodes \
- --without-smbwrapper \
- --with-pam \
- --with-quotas \
- --with-syslog \
- --with-utmp \
- --with-cluster-support \
- --with-ctdb=/usr/include \
- --without-ldb \
- --without-dnsupdate \
- --with-aio-support \
- --disable-merged-build
-
-make showlayout
-
-make samba3-idl
-
-## 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`
-CC_MINOR=`echo ${CC_VERSION} | cut -d. -f 2`
-if [ ${CC_MAJOR} -ge 3 ]; then
- if [ ${CC_MAJOR} -gt 3 -o ${CC_MINOR} -ge 4 ]; then
- make pch
- fi
-fi
-
-make -j%{numcpu} %{?_smp_mflags} \
- nss_modules pam_modules
-
-rm -rf %{_32bit_tmp_dir}
-mkdir %{_32bit_tmp_dir}
-
-mv ../nsswitch/libnss_winbind.so %{_32bit_tmp_dir}/
-mv bin/pam_winbind.so %{_32bit_tmp_dir}/
-mv bin/libtalloc.so* %{_32bit_tmp_dir}/
-mv bin/libtdb.so* %{_32bit_tmp_dir}/
-mv bin/libwbclient.so* %{_32bit_tmp_dir}/
-
-make clean
-
-CC="$CC_SAVE"
-
-%endif
-
CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--prefix=%{_prefix} \
--localstatedir=/var \
@@ -254,7 +194,10 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--without-ldb \
--without-dnsupdate \
--with-aio-support\
- --disable-merged-build
+ --disable-merged-build \
+ --disable-smbtorture4 \
+ --disable-external-libtalloc \
+ --disable-external-libtdb
make showlayout
@@ -335,24 +278,15 @@ install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_win
cp -p source3/bin/winbind_krb5_locator.so ${RPM_BUILD_ROOT}/%{_libarchdir}/krb5/plugins/libkrb5
-# install files for winbind-32bit package
-%ifarch x86_64 ppc64
-
-install -m 755 %{_32bit_tmp_dir}/libnss_winbind.so ${RPM_BUILD_ROOT}/lib/libnss_winbind.so.2
-( cd ${RPM_BUILD_ROOT}/lib; ln -sf libnss_winbind.so.2 libnss_winbind.so )
-
-mv %{_32bit_tmp_dir}/libtalloc* ${RPM_BUILD_ROOT}/usr/lib
-mv %{_32bit_tmp_dir}/libtdb* ${RPM_BUILD_ROOT}/usr/lib
-mv %{_32bit_tmp_dir}/libwbclient* ${RPM_BUILD_ROOT}/usr/lib
-mv %{_32bit_tmp_dir}/pam_winbind.so ${RPM_BUILD_ROOT}/lib/security
-
-rm -rf %{_32bit_tmp_dir}
-
-%endif
## cleanup
/bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
+# remove installed but unpackaged files:
+/bin/rm -f $RPM_BUILD_ROOT/usr/lib*/libtalloc.so
+/bin/rm -f $RPM_BUILD_ROOT/usr/lib*/libtdb.so
+
+
# Install the miscellany
echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
@@ -580,6 +514,14 @@ exit 0
##########
+%files libtalloc
+%{_libarchdir}/libtalloc.so.LIBTALLOCVERSION
+%{_libarchdir}/libtalloc.so.2
+
+%files libtdb
+%{_libarchdir}/libtdb.so.LIBTDBVERSION
+%{_libarchdir}/libtdb.so.1
+
%files common
%defattr(-,root,root)
%dir %{_sysconfdir}/samba
@@ -621,10 +563,6 @@ exit 0
%{_includedir}/tdb.h
%{_libarchdir}/libnetapi.so
%{_libarchdir}/libnetapi.so.0
-%{_libarchdir}/libtalloc.so
-%{_libarchdir}/libtalloc.so.2
-%{_libarchdir}/libtdb.so
-%{_libarchdir}/libtdb.so.1
%{_libarchdir}/libwbclient.so
%{_libarchdir}/libwbclient.so.0
@@ -665,19 +603,6 @@ exit 0
%{_mandir}/man7/winbind_krb5_locator.7*
%{_mandir}/man8/idmap_*.8*
-%ifarch x86_64 ppc64
-%files winbind-32bit
-%attr(755,root,root) /lib/libnss_winbind.so
-%attr(755,root,root) /lib/libnss_winbind.so.2
-%attr(755,root,root) /usr/lib/libtalloc.so
-%attr(755,root,root) /usr/lib/libtalloc.so.2
-%attr(755,root,root) /usr/lib/libtdb.so
-%attr(755,root,root) /usr/lib/libtdb.so.1
-%attr(755,root,root) /usr/lib/libwbclient.so
-%attr(755,root,root) /usr/lib/libwbclient.so.0
-%attr(755,root,root) /lib/security/pam_winbind.so
-%endif
-
%changelog
--
Samba Shared Repository
More information about the samba-cvs
mailing list