From 83e55b87c5e17fff9b85c33ea53d891673aecfea Mon Sep 17 00:00:00 2001
From: Jan Šafránek <jsafrane@fedoraproject.org>
Date: Feb 22 2008 10:59:07 +0000
Subject: new upstream release


---

diff --git a/openldap-2.3.27-modify-noop.patch b/openldap-2.3.27-modify-noop.patch
deleted file mode 100644
index 2f97656..0000000
--- a/openldap-2.3.27-modify-noop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-432013: CVE-2008-0658 openldap: slapd crash on modrdn operation with NOOP control on entry in bdb storage
-
-Source: upstream, 
-http://www.openldap.org/its/index.cgi/Software%20Bugs?id=5358
-http://www.openldap.org/devel/cvsweb.cgi/servers/slapd/back-bdb/modrdn.c.diff?r1=1.197&r2=1.198
-
-===================================================================
-RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/back-bdb/modify.c,v
-retrieving revision 1.124.2.16
-retrieving revision 1.124.2.17
---- servers/slapd/back-bdb/modrdn.c     2008/01/11 03:01:37     1.197
-+++ servers/slapd/back-bdb/modrdn.c     2008/02/07 11:06:24     1.198
-@@ -739,6 +739,8 @@
- 		} else {
- 			rs->sr_err = LDAP_X_NO_OPERATION;
- 			ltid = NULL;
-+			/* Only free attrs if they were dup'd.  */
-+			if ( dummy.e_attrs == e->e_attrs ) dummy.e_attrs = NULL;
- 			goto return_results;
- 		}
diff --git a/openldap-2.3.34-pthread.patch b/openldap-2.3.34-pthread.patch
deleted file mode 100644
index 94b3857..0000000
--- a/openldap-2.3.34-pthread.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Make libldap_r.so link with pthread.
-
---- openldap-2.3.34/libraries/libldap_r/Makefile.in.orig	2007-01-02 22:43:50.000000000 +0100
-+++ openldap-2.3.34/libraries/libldap_r/Makefile.in	2007-04-24 10:27:53.000000000 +0200
-@@ -56,7 +56,7 @@
- XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
- XXXLIBS = $(LTHREAD_LIBS)
- NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
--UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
- 
- .links : Makefile
- 	@for i in $(XXSRCS); do \
diff --git a/openldap.spec b/openldap.spec
index f7b439f..bbb8025 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -1,7 +1,7 @@
 %define migtools_version 47
 %define db_version 4.4.20
 %define ldbm_backend berkeley
-%define version 2.4.7
+%define version 2.4.8
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -9,7 +9,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version}
-Release: 7%{?dist}
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -31,10 +31,8 @@ Patch3: openldap-2.4.6-pie.patch
 Patch4: openldap-2.3.11-toollinks.patch
 Patch5: openldap-2.4.6-nosql.patch
 Patch6: openldap-2.3.19-gethostbyXXXX_r.patch
-Patch8: openldap-2.3.34-pthread.patch
 Patch9: openldap-2.3.37-smbk5pwd.patch
 Patch10: openldap-2.4.6-multilib.patch
-Patch11: openldap-2.3.27-modify-noop.patch
 
 # Patches for the evolution library
 Patch200: openldap-2.4.6-evolution-ntlm.patch
@@ -144,10 +142,8 @@ pushd openldap-%{version}
 %patch4 -p1 -b .toollinks
 %patch5 -p1 -b .nosql
 %patch6 -p1 -b .gethostbyname_r
-%patch8 -p1 -b .pthread
 %patch9 -p1 -b .smbk5pwd
 %patch10 -p1 -b .multilib
-%patch11 -p0 -b .modify-noop
 
 cp %{_datadir}/libtool/config.{sub,guess} build/
 popd
@@ -607,6 +603,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Fri Feb 22 2008 Jan Safranek <jsafranek@redhat.com> 2.4.8-1
+- new upstream release
+
 * Fri Feb  8 2008 Jan Safranek <jsafranek@redhat.com> 2.4.7-7
 - fix CVE-2008-0658 (#432014)
 
diff --git a/sources b/sources
index 43c8add..0ac952c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 3faf83eb8482e55979bda47f1d1e6501  MigrationTools-47.tar.gz
 33851f01b455cca48aa601956de93c6f  db-4.4.20.tar.gz
-4738ccb79215c027b857a6ea56e7351d  openldap-2.4.7.tgz
+5ef2ea680479e0cee13fdf64a4ef548a  openldap-2.4.8.tgz