From df493e3615dc86d3bb905d57ed0270fb653fd0b0 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 09:33:44 +0000 Subject: auto-import openldap-2.0.27-2 from openldap-2.0.27-2.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 61541f9..93a3365 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ MigrationTools-44.tar.gz -db-4.0.14.tar.gz -openldap-2.0.25.tgz +db-4.1.24.NC.tar.gz +openldap-2.0.27.tgz diff --git a/openldap.spec b/openldap.spec index f585d5a..f500b4e 100644 --- a/openldap.spec +++ b/openldap.spec @@ -1,10 +1,10 @@ %define migtools_ver 44 -%define db_version 4.0.14 +%define db_version 4.1.24.NC %define backend gdbm Summary: The configuration files, libraries, and documentation for OpenLDAP. Name: openldap -Version: 2.0.25 -Release: 1 +Version: 2.0.27 +Release: 2 License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz @@ -32,6 +32,11 @@ Patch22: MigrationTools-36-mktemp.patch Patch23: MigrationTools-27-simple.patch Patch24: MigrationTools-26-suffix.patch Patch25: MigrationTools-44-schema.patch +Patch100: http://sleepycat.com/update/4.1.24/patch.4.1.24.2 +Patch101: http://sleepycat.com/update/4.1.24/patch.4.1.24.3 +Patch102: http://sleepycat.com/update/4.1.24/patch.4.1.24.4 +Patch103: http://sleepycat.com/update/4.1.24/patch.4.1.24.5 +Patch104: http://sleepycat.com/update/4.1.24/patch.4.1.24.6 URL: http://www.openldap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPreReq: cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel @@ -108,6 +113,13 @@ pushd MigrationTools-%{migtools_ver} %patch24 -p1 -b .suffix %patch25 -p1 -b .schema popd +pushd db-%{db_version} +%patch100 -p0 -b .2 +%patch101 -p0 -b .3 +%patch102 -p0 -b .4 +%patch103 -p0 -b .5 +%patch104 -p0 -b .6 +popd mkdir build-gdbm ln -s ../configure build-gdbm @@ -174,9 +186,9 @@ popd # Build the servers with Kerberos support and whichever backend we want. Even # enable the bdb backend, which doesn't exist yet. pushd build-krb5 -CPPFLAGS="-I${dbdir}/include -I/usr/kerberos/include -DHAVE_KERBEROS_V" +CPPFLAGS="-I${dbdir}/include -I%{_prefix}/kerberos/include -DHAVE_KERBEROS_V" export CPPFLAGS -LDFLAGS="-L${dbdir}/lib -L/usr/kerberos/lib" +LDFLAGS="-L${dbdir}/lib -L%{_prefix}/kerberos/%{_lib}" export LDFLAGS build --enable-ldbm --with-ldbm-api=%{backend} --enable-bdb --disable-shared --with-kerberos=k5only --enable-kpasswd unset CPPFLAGS @@ -377,6 +389,22 @@ fi %attr(0644,root,root) %{_mandir}/man3/* %changelog +* Mon Nov 11 2002 Nalin Dahyabhai 2.0.27-2 +- add patches for db 4.1.24 from sleepycat's updates page + +* Mon Nov 4 2002 Nalin Dahyabhai +- add a sample TLSCACertificateFile directive to the default slapd.conf + +* Tue Sep 24 2002 Nalin Dahyabhai 2.0.27-1 +- update to 2.0.27 + +* Fri Sep 20 2002 Nalin Dahyabhai 2.0.26-1 +- update to 2.0.26, db 4.1.24.NC + +* Fri Sep 13 2002 Nalin Dahyabhai 2.0.25-2 +- change LD_FLAGS to refer to %{_prefix}/kerberos/%{_lib} instead of + /usr/kerberos/lib, which might not be right on some arches + * Mon Aug 26 2002 Nalin Dahyabhai 2.0.25-1 - update to 2.0.25 "stable", ldbm-over-gdbm (putting off migration of LDBM slapd databases until we move to 2.1.x) diff --git a/sources b/sources index a54d359..7ca75d5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 2cc51cbf0276c161724626c70b59f0b1 MigrationTools-44.tar.gz -12262c64fcd64b772e7cffad8e4d0ebc db-4.0.14.tar.gz -57ed9ea3d872595076d6eab7b93337bd openldap-2.0.25.tgz +44742c0f760292aad79b61ba025950d1 db-4.1.24.NC.tar.gz +a1e6508c471dd47205a3492cf57110a6 openldap-2.0.27.tgz