[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated -
793506c531bbb92db56d0b31f6f94a3a7a820a5b
Michael Adam
obnox at samba.org
Mon Jun 29 15:55:26 GMT 2009
The branch, v3-4-ctdb has been updated
via 793506c531bbb92db56d0b31f6f94a3a7a820a5b (commit)
via 1a83fed4bb2c17dad805a3c64a3875fd06c712be (commit)
via 7effcb0715233acf8b1cccf5a087620307fd6d2a (commit)
via cc324942794b20c0036ca2e5e95536fc1750a8a3 (commit)
via 61a7a65f3c6c52723c34ad91134f39ceec1cb4a5 (commit)
via 138a7560d9c4ce09b1a7a502a21fcd4befd72498 (commit)
via fab2b3e07cee8ffc7a09d3458db1f833c6c836eb (commit)
from 7d0d0435315a48ecc964e2d7dfc47b68065ad90c (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb
- Log -----------------------------------------------------------------
commit 793506c531bbb92db56d0b31f6f94a3a7a820a5b
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:47:45 2009 +0100
packaging(RHEL-CTDB): also pack libwbcient in winbind-32bit package
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit 1a83fed4bb2c17dad805a3c64a3875fd06c712be
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:30:35 2009 +0100
packaging(RHEL-CTDB): add new pam_winbind.mo to the common package
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit 7effcb0715233acf8b1cccf5a087620307fd6d2a
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:28:36 2009 +0100
packaging(RHEL-CTDB): add new binary sharesec to the client package.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit cc324942794b20c0036ca2e5e95536fc1750a8a3
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:26:11 2009 +0100
packaging(RHEL-CTDB): add new binary ldbrename to the common rpm
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit 61a7a65f3c6c52723c34ad91134f39ceec1cb4a5
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 17:07:14 2009 +0200
packaging(RHEL-CTDB): fix location of nsswitch/ directory for install
This has been moved to the top level directory in 3.4.
Michael
commit 138a7560d9c4ce09b1a7a502a21fcd4befd72498
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 17:05:00 2009 +0200
packaging(RHEL-CTDB): don't pass CFLAGS to make.
This breaks the build since 3.3 since it overwrites the CFLAGS
set by configure.
Michael
commit fab2b3e07cee8ffc7a09d3458db1f833c6c836eb
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 17:03:09 2009 +0200
packaging(RHEL-CTDB): don't "make proto" any more.
This has become unnecessary in 3.3
Michael
-----------------------------------------------------------------------
Summary of changes:
packaging/RHEL-CTDB/samba.spec.tmpl | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 9fa4b68..a9bac92 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -189,8 +189,6 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" ./configure \
make showlayout
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" 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`
@@ -201,16 +199,17 @@ if [ ${CC_MAJOR} -ge 3 ]; then
fi
fi
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" %{?_smp_mflags} \
+make %{?_smp_mflags} \
nss_modules pam_modules
rm -rf %{_32bit_tmp_dir}
mkdir %{_32bit_tmp_dir}
-mv nsswitch/libnss_winbind.so %{_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
@@ -265,7 +264,7 @@ if [ ${CC_MAJOR} -ge 3 ]; then
fi
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags} \
+make %{?_smp_mflags} \
all modules pam_smbpass
# Remove some permission bits to avoid to many dependencies
@@ -302,14 +301,14 @@ make DESTDIR=$RPM_BUILD_ROOT \
cd ..
# NSS winbind support
-install -m 755 source3/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
+install -m 755 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 )
#
# do not install libnss_wins.so in order to reduce dependencies
# (we do not need it for the samba-ctdb scenario)
#
-#install -m 755 source3/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
+#install -m 755 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 )
@@ -321,6 +320,7 @@ install -m 755 %{_32bit_tmp_dir}/libnss_winbind.so ${RPM_BUILD_ROOT}/lib/libnss_
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}
@@ -513,6 +513,7 @@ exit 0
%{_bindir}/smbspool
%{_bindir}/smbtar
%{_bindir}/smbtree
+%{_bindir}/sharesec
%{_mandir}/man8/mount.cifs.8.*
%{_mandir}/man8/umount.cifs.8.*
@@ -543,6 +544,7 @@ exit 0
%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
+/usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
%{_includedir}/libsmbclient.h
%{_libarchdir}/libsmbclient.*
@@ -575,6 +577,7 @@ exit 0
%{_bindir}/ldbedit
%{_bindir}/ldbmodify
%{_bindir}/ldbsearch
+%{_bindir}/ldbrename
%{_bindir}/wbinfo
%{_bindir}/ntlm_auth
%{_bindir}/pdbedit
@@ -604,6 +607,7 @@ exit 0
#%attr(755,root,root) /lib/libnss_wins.so*
%attr(755,root,root) /usr/lib/libtalloc.so*
%attr(755,root,root) /usr/lib/libtdb.so*
+%attr(755,root,root) /usr/lib/libwbclient.so*
%attr(755,root,root) /lib/security/pam_winbind.so
%endif
--
SAMBA-CTDB repository
More information about the samba-cvs
mailing list