auto-import openldap-2.0.27-8 from openldap-2.0.27-8.src.rpm

.cvsignore

@@ -1,3 +1,3 @@
 MigrationTools-44.tar.gz
-db-4.1.24.NC.tar.gz
+db-4.0.14.tar.gz
 openldap-2.0.27.tgz

openldap.spec

@@ -1,10 +1,11 @@
 %define migtools_ver 44
-%define db_version 4.1.24.NC
+%define db_version 4.0.14
-%define backend gdbm
+%define ldbm_backend gdbm
+#%define ldbm_backend berkeley
 Summary: The configuration files, libraries, and documentation for OpenLDAP.
 Name: openldap
 Version: 2.0.27
-Release: 2.8.0
+Release: 8
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -33,17 +34,10 @@ Patch23: MigrationTools-27-simple.patch
 Patch24: MigrationTools-26-suffix.patch
 Patch25: MigrationTools-44-schema.patch
 Patch26: openldap-2.0.27-susesec.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
-Patch105: http://sleepycat.com/update/4.1.24/patch.4.1.24.7
-Patch106: http://sleepycat.com/update/4.1.24/patch.4.1.24.8
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPreReq: cyrus-sasl-devel, gdbm-devel, krb5-devel, openssl-devel
-BuildPreReq: pam-devel, perl, pkgconfig, tcp_wrappers
+BuildPreReq: pam-devel, perl, pkgconfig >= 0.14.0-3, tcp_wrappers
 BuildPreReq: libtool >= 1.4
 Requires: cyrus-sasl, cyrus-sasl-md5, mktemp
 
@@ -116,15 +110,6 @@ pushd MigrationTools-%{migtools_ver}
 %patch25 -p1 -b .schema
 popd
 %patch26 -p0 -b .susesec
-pushd db-%{db_version}
-%patch100 -p0 -b .2
-%patch101 -p0 -b .3
-%patch102 -p0 -b .4
-%patch103 -p0 -b .5
-%patch104 -p0 -b .6
-%patch105 -p0 -b .7
-%patch106 -p0 -b .8
-popd
 
 mkdir build-gdbm
 ln -s ../configure build-gdbm
@@ -183,7 +168,7 @@ make %{_smp_mflags} LIBTOOL=libtool
 # Build Berkeley DB and install it into a temporary area, isolating OpenLDAP
 # from any future changes to the system-wide Berkeley DB library.
 pushd db-%{db_version}/dist
-./configure --with-pic --disable-shared --with-uniquename=_openldap_rhl --prefix=${dbdir}
+./configure --with-pic --disable-shared --with-uniquename=_openldap_rhl --prefix=${dbdir} --libdir=${dbdir}/%{_lib}
 make %{_smp_mflags}
 make install
 popd
@@ -196,6 +181,9 @@ popd
 # Build one for tools which use db.
 CPPFLAGS="$OPENSSL_CPPFLAGS" ; export CPPFLAGS
 LDFLAGS="$OPENSSL_LDFLAGS" ; export LDFLAGS
+LIBS="-lpthread"; export LIBS
+CPPFLAGS="$CPPFLAGS -I${dbdir}/include"
+LDFLAGS="$LDFLAGS -L${dbdir}/%{_lib}"
 pushd build-berkeley
 build --enable-ldbm --with-ldbm-api=berkeley --disable-shared --without-kerberos
 popd
@@ -203,15 +191,17 @@ popd
 # enable the bdb backend, which doesn't exist yet.
 CPPFLAGS="$OPENSSL_CPPFLAGS" ; export CPPFLAGS
 LDFLAGS="$OPENSSL_LDFLAGS" ; export LDFLAGS
+LIBS="-lpthread"; export LIBS
 pushd build-krb5
 CPPFLAGS="$CPPFLAGS -I${dbdir}/include -I%{_prefix}/kerberos/include -DHAVE_KERBEROS_V"
-LDFLAGS="$LDFLAGS -L${dbdir}/lib -L%{_prefix}/kerberos/%{_lib}"
+LDFLAGS="$LDFLAGS -L${dbdir}/%{_lib} -L%{_prefix}/kerberos/%{_lib}"
-build --enable-ldbm --with-ldbm-api=%{backend} --enable-bdb --disable-shared --with-kerberos=k5only --enable-kpasswd
+build --enable-ldbm --with-ldbm-api=%{ldbm_backend} --enable-bdb --disable-shared --with-kerberos=k5only --enable-kpasswd
 popd
 # Build clients without Kerberos password-checking support, which is only
 # useful in the server anyway.
 CPPFLAGS="$OPENSSL_CPPFLAGS" ; export CPPFLAGS
 LDFLAGS="$OPENSSL_LDFLAGS" ; export LDFLAGS
+unset LIBS
 pushd build-clients
 build --disable-ldbm --enable-shared --without-kerberos
 popd
@@ -237,7 +227,7 @@ makeinstall -C servers/slapd/tools
 mv $RPM_BUILD_ROOT%{_sbindir}/slapadd $RPM_BUILD_ROOT%{_sbindir}/slapadd-gdbm
 mv $RPM_BUILD_ROOT%{_sbindir}/slapcat $RPM_BUILD_ROOT%{_sbindir}/slapcat-gdbm
 popd
-if [ %{backend} != gdbm ] ; then
+if [ %{ldbm_backend} != gdbm ] ; then
 	pushd build-berkeley
 	makeinstall -C servers/slapd/tools
 	mv $RPM_BUILD_ROOT%{_sbindir}/slapadd $RPM_BUILD_ROOT%{_sbindir}/slapadd-berkeley
@@ -256,8 +246,8 @@ makeinstall -C servers
 popd
 
 # Set the right set of slap... tools for the server.
-ln -f $RPM_BUILD_ROOT%{_sbindir}/slapadd-%{backend} $RPM_BUILD_ROOT%{_sbindir}/slapadd
+ln -f $RPM_BUILD_ROOT%{_sbindir}/slapadd-%{ldbm_backend} $RPM_BUILD_ROOT%{_sbindir}/slapadd
-ln -f $RPM_BUILD_ROOT%{_sbindir}/slapcat-%{backend} $RPM_BUILD_ROOT%{_sbindir}/slapcat
+ln -f $RPM_BUILD_ROOT%{_sbindir}/slapcat-%{ldbm_backend} $RPM_BUILD_ROOT%{_sbindir}/slapcat
 
 # Install the padl.com migration tools.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/openldap/migration
@@ -405,8 +395,25 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/*
 
 %changelog
-* Thu Dec 12 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.27-2.8.0
+* Mon Feb 10 2003 Nalin Dahyabhai <nalin@redhat.com> 2.0.27-8
-- rebuild for erratum
+- back down to db 4.0.x, which 2.0.x can compile with in ldbm-over-db setups
+- tweak SuSE patch to fix a few copy-paste errors and a NULL dereference
+- temporarily require an exact version of pkg-config (or pkgconfig, if you prefer)
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Tue Jan  7 2003 Nalin Dahyabhai <nalin@redhat.com> 2.0.27-6
+- rebuild
+
+* Mon Dec 16 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.27-5
+- rebuild
+
+* Fri Dec 13 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.27-4
+- check for setgid as well
+
+* Thu Dec 12 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.27-3
+- rebuild
 
 * Thu Dec 12 2002 Nalin Dahyabhai <nalin@redhat.com>
 - incorporate fixes from SuSE's security audit, except for fixes to ITS 1963,

sources

@@ -1,3 +1,3 @@
 2cc51cbf0276c161724626c70b59f0b1  MigrationTools-44.tar.gz
-44742c0f760292aad79b61ba025950d1  db-4.1.24.NC.tar.gz
+12262c64fcd64b772e7cffad8e4d0ebc  db-4.0.14.tar.gz
 a1e6508c471dd47205a3492cf57110a6  openldap-2.0.27.tgz