From 3f0a4bafa9bcc9d2ca693511c95ec6f81033fe59 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 09:32:03 +0000 Subject: auto-import openldap-2.0.21-1 from openldap-2.0.21-1.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 4c390dc..b9f954d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ -MigrationTools-38.tar.gz -autoconf-2.13.1.tar.gz -openldap-2.0.11.tgz +MigrationTools-39.tar.gz +openldap-2.0.21.tgz diff --git a/openldap.spec b/openldap.spec index 46f5b19..bc56243 100644 --- a/openldap.spec +++ b/openldap.spec @@ -1,12 +1,11 @@ -%define migtools_ver 38 +%define migtools_ver 39 Summary: The configuration files, libraries, and documentation for OpenLDAP. Name: openldap -Version: 2.0.11 -Release: 13 +Version: 2.0.21 +Release: 1 License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz -Source1: ftp.openldap.org:/pub/tools/autoconf-2.13.1.tar.gz Source2: ldap.init Source3: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_ver}.tar.gz Source4: migration-tools.txt @@ -16,18 +15,15 @@ Source7: kerberosobject.schema Source8: README.upgrading Source9: README.sendbuf Source10: http://www.OpenLDAP.org/doc/admin/guide.html -Patch0: openldap-2.0.11-config.patch -Patch1: openldap-2.0.3-redhat.patch +Patch0: openldap-2.0.16-config.patch +Patch1: openldap-2.0.12-redhat.patch Patch2: openldap-1.2.11-cldap.patch Patch3: openldap-2.0.3-syslog.patch -Patch4: openldap-2.0.3-krb5-1.1.patch -Patch5: openldap-2.0.1-fast.patch Patch6: openldap-2.0.7-sendbuf.patch Patch7: openldap-2.0.11-ldaprc.patch Patch8: openldap-2.0.11-debug.patch Patch9: openldap-2.0.11-libtool.patch Patch10: openldap-2.0.11-linkage.patch -Patch11: openldap-2.0.11-tls.patch Patch21: MigrationTools-38-instdir.patch Patch22: MigrationTools-36-mktemp.patch Patch23: MigrationTools-27-simple.patch @@ -35,7 +31,9 @@ Patch24: MigrationTools-26-suffix.patch Patch25: MigrationTools-24-schema.patch URL: http://www.openldap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPreReq: autoconf, cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel, pam-devel, perl, tcp_wrappers +BuildPreReq: cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel +BuildPreReq: pam-devel +BuildPreReq: perl, tcp_wrappers BuildPreReq: libtool >= 1.4 Requires: cyrus-sasl, cyrus-sasl-md5, mktemp @@ -90,19 +88,16 @@ over the Internet. The openldap-clients package contains the client programs needed for accessing and modifying OpenLDAP directories. %prep -%setup -q -a 1 -a 3 +%setup -q -a 3 %patch0 -p1 -b .config %patch1 -p1 -b .redhat %patch2 -p1 -b .cldap %patch3 -p1 -b .syslog -%patch4 -p1 -b .krb5-1.1 -%patch5 -p1 -b .fast %patch6 -p1 -b .sendbuf %patch7 -p1 -b .ldaprc %patch8 -p1 -b .debug %patch9 -p1 -b .libtool %patch10 -p1 -b .linkage -%patch11 -p1 -b .tls pushd MigrationTools-%{migtools_ver} %patch21 -p1 -b .instdir %patch22 -p1 -b .mktemp @@ -111,54 +106,38 @@ pushd MigrationTools-%{migtools_ver} %patch25 -p2 -b .schema popd -top=`pwd` - -pushd autoconf-2.13.1 -./configure --prefix=$top/build -make install -popd - -PATH=${top}/build/bin:${PATH} -autoheader -autoconf - %build +%ifarch ia64 +RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0" +%endif CPPFLAGS="-I/usr/kerberos/include"; export CPPFLAGS CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -DHAVE_KERBEROS_V -fPIC"; export CFLAGS LDFLAGS="-L/usr/kerberos/lib"; export LDFLAGS TARGET_PLATFORM=%{_target_platform} %define _target_platform --target=${TARGET_PLATFORM} -configure_flags=' - --enable-ldbm - --enable-passwd - --with-ldbm-api=gdbm - --enable-shell - - --enable-local --enable-cldap --disable-rlookups - - --with-kerberos=k5 - --enable-kbind - --with-tls - --with-cyrus-sasl - - --enable-wrappers - - --enable-cleartext - --enable-crypt - --enable-kpasswd - --enable-spasswd - - --libexecdir=%{_sbindir} - --localstatedir=/%{_var}/run' - -%configure ${configure_flags} --without-slapd --with-slurpd --without-ldapd --with-threads --disable-shared --enable-static -make depend -make -cp servers/slurpd/slurpd slurpd.semistatic - -make distclean - -%configure ${configure_flags} --with-slapd --without-slurpd --without-ldapd --without-threads --enable-shared --enable-static +libtoolize --force +%configure \ + --with-slapd --with-slurpd --without-ldapd \ + --with-threads=posix --enable-shared --enable-static \ + --enable-ldbm --with-ldbm-api=gdbm \ + --enable-passwd \ + --enable-shell \ + \ + --enable-local --enable-cldap --disable-rlookups \ + \ + --with-kerberos=k5only \ + --with-tls \ + --with-cyrus-sasl \ + \ + --enable-wrappers \ + \ + --enable-cleartext \ + --enable-crypt \ + --enable-kpasswd \ + --enable-spasswd \ + \ + --libexecdir=%{_sbindir} \ + --localstatedir=/%{_var}/run make depend make @@ -174,8 +153,6 @@ make localstatedir=/%{_var}/run \ sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/openldap $@ -install -m755 slurpd.semistatic $RPM_BUILD_ROOT%{_sbindir}/slurpd - # hack the default config files perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/etc/openldap/slapd.conf @@ -216,16 +193,8 @@ fi install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat install -m644 %{SOURCE5} %{SOURCE6} %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat/ -# juggle the shared libraries -mkdir -p $RPM_BUILD_ROOT/lib -mv $RPM_BUILD_ROOT%{_libdir}/*.so* $RPM_BUILD_ROOT/lib/ -pushd $RPM_BUILD_ROOT%{_libdir} -for lib in ../../lib/lib*.so.*.* ; do - ln -sf ${lib} `basename ${lib} | cut -f1,2 -d.` -done - # tweak permissions -chmod +rx $RPM_BUILD_ROOT/lib/lib*.so* $RPM_BUILD_ROOT/%{_libdir}/lib*.so* +chmod +rx $RPM_BUILD_ROOT/%{_libdir}/lib*.so* chmod +r $RPM_BUILD_ROOT/%{_libdir}/lib*.*a chmod -x $RPM_BUILD_ROOT/%{_libdir}/lib*.*a @@ -287,7 +256,7 @@ fi %doc ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README doc/rfc %attr(0755,root,root) %dir /etc/openldap %attr(0644,root,root) %config(noreplace) /etc/openldap/ldap*.conf -%attr(0755,root,root) /lib/lib*.so.* +%attr(0755,root,root) %{_libdir}/lib*.so.* %attr(0644,root,root) %{_mandir}/man5/* %attr(0755,root,root) %dir %{_datadir}/openldap %attr(0644,root,root) %{_datadir}/openldap/ldapfriendly @@ -327,7 +296,58 @@ fi %attr(0644,root,root) %{_mandir}/man3/* %changelog -* Tue Aug 21 2001 Nalin Dahyabhai +* Wed Jan 16 2002 Nalin Dahyabhai 2.0.21-1 +- build for RHL 7.2 errata + +* Wed Jan 16 2002 Nalin Dahyabhai 2.0.21-2 +- update to 2.0.21, now earmarked as STABLE + +* Wed Jan 16 2002 Nalin Dahyabhai 2.0.20-2 +- temporarily disable optimizations for ia64 arches +- specify pthreads at configure-time instead of letting configure guess + +* Mon Jan 14 2002 Nalin Dahyabhai +- and one for Raw Hide + +* Mon Jan 14 2002 Nalin Dahyabhai 2.0.20-0.7 +- build for RHL 7/7.1 + +* Mon Jan 14 2002 Nalin Dahyabhai 2.0.20-1 +- update to 2.0.20 (security errata) + +* Thu Dec 20 2001 Nalin Dahyabhai 2.0.19-1 +- update to 2.0.19 + +* Wed Nov 6 2001 Nalin Dahyabhai 2.0.18-2 +- fix the commented-out replication example in slapd.conf + +* Fri Oct 26 2001 Nalin Dahyabhai 2.0.18-1 +- update to 2.0.18 + +* Mon Oct 15 2001 Nalin Dahyabhai 2.0.17-1 +- update to 2.0.17 + +* Wed Oct 10 2001 Nalin Dahyabhai +- disable kbind support (deprecated, and I suspect unused) +- configure with --with-kerberos=k5only instead of --with-kerberos=k5 +- build slapd with threads + +* Thu Sep 27 2001 Nalin Dahyabhai 2.0.15-2 +- rebuild, 2.0.15 is now designated stable + +* Fri Sep 21 2001 Nalin Dahyabhai 2.0.15-1 +- update to 2.0.15 + +* Mon Sep 10 2001 Nalin Dahyabhai 2.0.14-1 +- update to 2.0.14 + +* Fri Aug 31 2001 Nalin Dahyabhai 2.0.12-1 +- update to 2.0.12 to pull in fixes for setting of default TLS options, among + other things +- update to migration tools 39 +- drop tls patch, which was fixed better in this release + +* Tue Aug 21 2001 Nalin Dahyabhai 2.0.11-13 - install saucer correctly * Thu Aug 16 2001 Nalin Dahyabhai @@ -341,11 +361,13 @@ fi * Mon Aug 6 2001 Nalin Dahyabhai - add a build-time requirement on pam-devel - add a build-time requirement on a sufficiently-new libtool to link - shared libraries to other shared libraries + shared libraries to other shared libraries (which is needed in order + for prelinking to work) * Fri Aug 3 2001 Nalin Dahyabhai - require cyrus-sasl-md5 (support for DIGEST-MD5 is required for RFC - compliance) by name (follows from #43079) + compliance) by name (follows from #43079, which split cyrus-sasl's + cram-md5 and digest-md5 modules out into cyrus-sasl-md5) * Fri Jul 20 2001 Nalin Dahyabhai - enable passwd back-end (noted by Alan Sparks and Sergio Kessler) diff --git a/sources b/sources index 065f5ce..30bd1b5 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -056e2efa8e5d247a5df0a8eedf5bb732 MigrationTools-38.tar.gz -5a9e617c1d5339d3c90c545c93e30949 autoconf-2.13.1.tar.gz -e51b06374012b9e7077e1f3e9f65ccd0 openldap-2.0.11.tgz +5b06cc1a59d11c911d24c574e137d358 MigrationTools-39.tar.gz +a4561f9119818dacfa774de75be555d3 openldap-2.0.21.tgz