new upstream version

.cvsignore

@@ -8,3 +8,4 @@ openldap-2.3.30.tgz
 openldap-2.3.34.tgz
 openldap-2.3.37.tgz
 db-4.6.18.tar.gz
+openldap-2.3.38.tgz

openldap-2.3.37-fortify-open.patch

@@ -1,61 +0,0 @@
---- openldap-2.3.37/servers/slapd/back-ldbm/ldbm.c.orig	2007-01-02 16:44:03.000000000 -0500
-+++ openldap-2.3.37/servers/slapd/back-ldbm/ldbm.c	2007-08-06 05:23:44.000000000 -0400
-@@ -298,10 +298,10 @@ DB_ENV *ldbm_initialize_env(const char *
- 	home = n2;
- #endif
- #if DB_VERSION_X >= 0x030100
--	err = env->open( env, home, envFlags, 0 );
-+	err = (env->open)( env, home, envFlags, 0 );
- #else
- 	/* 3.0.x requires an extra argument */
--	err = env->open( env, home, NULL, envFlags, 0 );
-+	err = (env->open)( env, home, NULL, envFlags, 0 );
- #endif
- 
- 	if ( err != 0 ) {
-@@ -380,9 +380,9 @@ ldbm_open( DB_ENV *env, char *name, int 
- 	name = n2;
- #endif
- #if DB_VERSION_X >= 0x040111
--	err = ret->open( ret, NULL, name, NULL, DB_TYPE, rw, mode);
-+	err = (ret->open)( ret, NULL, name, NULL, DB_TYPE, rw, mode);
- #else
--	err = ret->open( ret, name, NULL, DB_TYPE, rw, mode);
-+	err = (ret->open)( ret, name, NULL, DB_TYPE, rw, mode);
- #endif
- 
- 	if ( err != 0 ) {
---- openldap-2.3.37/servers/slapd/back-bdb/back-bdb.h.orig	2007-01-03 05:36:04.000000000 +0100
-+++ openldap-2.3.37/servers/slapd/back-bdb/back-bdb.h	2007-08-06 12:26:17.000000000 +0200
-@@ -226,7 +226,7 @@ struct bdb_op_info {
- };
- 
- #define	DB_OPEN(db, file, name, type, flags, mode) \
--	(db)->open(db, file, name, type, flags, mode)
-+	((db)->open)(db, file, name, type, flags, mode)
- 
- #if DB_VERSION_MAJOR < 4
- #define LOCK_DETECT(env,f,t,a)		lock_detect(env, f, t, a)
-@@ -257,7 +257,7 @@ struct bdb_op_info {
- #if DB_VERSION_FULL >= 0x04010011
- #undef DB_OPEN
- #define	DB_OPEN(db, file, name, type, flags, mode) \
--	(db)->open(db, NULL, file, name, type, flags, mode)
-+	((db)->open)(db, NULL, file, name, type, flags, mode)
- #endif
- 
- #endif
---- openldap-2.3.37/build/openldap.m4.orig	2007-02-13 05:35:39.000000000 +0100
-+++ openldap-2.3.37/build/openldap.m4	2007-08-06 12:27:58.000000000 +0200
-@@ -627,9 +627,9 @@ main()
- 	}
- 
- #if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1)
--	rc = env->open( env, NULL, flags, 0 );
-+	rc = (env->open)( env, NULL, flags, 0 );
- #else
--	rc = env->open( env, NULL, NULL, flags, 0 );
-+	rc = (env->open)( env, NULL, NULL, flags, 0 );
- #endif
- 
- 	if ( rc == 0 ) {

openldap.spec

@@ -2,7 +2,7 @@
 %define db_version 4.6.18
 %define ldbm_backend berkeley
 %define version_22 2.2.29
-%define version_23 2.3.37
+%define version_23 2.3.38
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -12,7 +12,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -37,7 +37,6 @@ Patch6: openldap-2.3.19-gethostbyXXXX_r.patch
 Patch7: openldap-2.3.34-quiet-slaptest.patch
 Patch8: openldap-2.3.34-pthread.patch
 Patch9: openldap-2.3.37-smbk5pwd.patch
-Patch10: openldap-2.3.37-fortify-open.patch
 
 # Patches for 2.2.29 for the compat-openldap package.
 Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -174,7 +173,6 @@ pushd openldap-%{version_23}
 %patch7 -p1 -b .quiet-slaptest
 %patch8 -p1 -b .pthread
 %patch9 -p1 -b .smbk5pwd
-%patch10 -p1 -b .fortify-open
 
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
@@ -671,7 +669,8 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
-* Thu Sep  6 2007 Jan Safranek <jsafranek@redhat.com> 2.3.37-4%{?dist}
+* Thu Sep  6 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-1%{?dist}
+- new upstream version
 - added images to the guide.html (#273581)
 
 * Wed Aug 22 2007 Jan Safranek <jsafranek@redhat.com> 2.3.37-3%{?dist}

sources

@@ -1,4 +1,4 @@
 6c4c72a1336aa45b463e738034c078d6  openldap-2.2.29.tgz
 3faf83eb8482e55979bda47f1d1e6501  MigrationTools-47.tar.gz
-f5c6cec07469ce8f64710eba3aeb58f8  openldap-2.3.37.tgz
 95768bd92fd48951a427fbab37b9088f  db-4.6.18.tar.gz
+f83b0f2b62f6a06dc1ca83a1f0426efd  openldap-2.3.38.tgz