From 5195e7ad09eab230314db6755d474648598ca5fcfde29b67afc8cc897795e301 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <ralf@h4kamp.de>
Date: Tue, 16 Mar 2010 10:44:10 +0000
Subject: [PATCH] - Removed obsolete hunk from openldap2.dif - Remove ldap.conf
 patch to use saner default for Certificate   verification (bnc#575146)

OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=33
---
 ldap_conf.dif            |  8 --------
 openldap2-client.changes |  7 +++++++
 openldap2-client.spec    |  6 ++----
 openldap2.changes        |  7 +++++++
 openldap2.dif            | 14 +-------------
 openldap2.spec           |  2 --
 6 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 ldap_conf.dif

diff --git a/ldap_conf.dif b/ldap_conf.dif
deleted file mode 100644
index ac0bce8..0000000
--- a/ldap_conf.dif
+++ /dev/null
@@ -1,8 +0,0 @@
---- libraries/libldap/ldap.conf	2004/04/01 09:43:12	1.1
-+++ libraries/libldap/ldap.conf	2004/04/01 09:50:42
-@@ -11,3 +11,5 @@
- #SIZELIMIT	12
- #TIMELIMIT	15
- #DEREF		never
-+TLS_REQCERT allow
-+
diff --git a/openldap2-client.changes b/openldap2-client.changes
index dee135f..65db0d8 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 16 10:01:39 UTC 2010 - rhafer@novell.com
+
+- Removed obsolete hunk from openldap2.dif
+- Remove ldap.conf patch to use saner default for Certificate 
+  verification (bnc#575146)
+
 -------------------------------------------------------------------
 Sat Feb 13 23:11:03 CET 2010 - rguenther@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index b4078ed..726a117 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openldap2-client (Version 2.4.21)
+# spec file for package openldap2 (Version 2.4.21)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 %define run_test_suite 1
 
-Name:           openldap2-client
+Name:         openldap2-client
 BuildRequires:  cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel
 %if %sles_version == 9
 BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
@@ -54,7 +54,6 @@ Source6:        schema2ldif
 Source100:      openldap-2.3.37.tar.bz2
 Patch1:         openldap2.dif
 Patch2:         slapd_conf.dif
-Patch3:         ldap_conf.dif
 Patch4:         ldapi_url.dif
 Patch5:         slapd-back-hdb-fortify.dif
 Patch6:         libldap-gethostbyname_r.dif
@@ -173,7 +172,6 @@ Authors:
 %setup -q -n openldap-%{version} -a1 -a2 -b100
 %patch1
 %patch2
-%patch3
 %patch4
 %patch5
 %patch6
diff --git a/openldap2.changes b/openldap2.changes
index dee135f..65db0d8 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 16 10:01:39 UTC 2010 - rhafer@novell.com
+
+- Removed obsolete hunk from openldap2.dif
+- Remove ldap.conf patch to use saner default for Certificate 
+  verification (bnc#575146)
+
 -------------------------------------------------------------------
 Sat Feb 13 23:11:03 CET 2010 - rguenther@suse.de
 
diff --git a/openldap2.dif b/openldap2.dif
index 873b78a..44faf27 100644
--- a/openldap2.dif
+++ b/openldap2.dif
@@ -35,16 +35,4 @@ Index: configure.in
  AC_SUBST(PACKAGE)dnl
  AC_SUBST(VERSION)dnl
  AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
-Index: servers/slapd/aclparse.c
-===================================================================
---- servers/slapd/aclparse.c.orig
-+++ servers/slapd/aclparse.c
-@@ -644,7 +644,7 @@ parse_acl(
- 						if ( rc != LDAP_SUCCESS ) {
- 							char	buf[ SLAP_TEXT_BUFLEN ];
- 
--							snprintf( buf, sizeof( buf ), "%s: line %d: "
-+							snprintf( buf, sizeof( buf ), 
- 								" attr \"%s\" normalization failed (%d: %s)",
- 								fname, lineno,
- 								a->acl_attrs[ 0 ].an_name.bv_val, rc, text );
+
diff --git a/openldap2.spec b/openldap2.spec
index 764bc52..20b593c 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -54,7 +54,6 @@ Source6:        schema2ldif
 Source100:      openldap-2.3.37.tar.bz2
 Patch1:         openldap2.dif
 Patch2:         slapd_conf.dif
-Patch3:         ldap_conf.dif
 Patch4:         ldapi_url.dif
 Patch5:         slapd-back-hdb-fortify.dif
 Patch6:         libldap-gethostbyname_r.dif
@@ -173,7 +172,6 @@ Authors:
 %setup -q -n openldap-%{version} -a1 -a2 -b100
 %patch1
 %patch2
-%patch3
 %patch4
 %patch5
 %patch6