Accepting request 250671 from network:ldap

- sanitize release line in specfile 

- segfault on certain queries with rwm overlay (bnc#846389)
  0008-ITS-7723-fix-reference-counting.patch

- Add baselibs.conf to sources list

- sanitize release line in specfile 

- segfault on certain queries with rwm overlay (bnc#846389)
  0008-ITS-7723-fix-reference-counting.patch

OBS-URL: https://build.opensuse.org/request/show/250671
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=106

0008-ITS-7723-fix-reference-counting.patch

@@ -0,0 +1,32 @@
+From 742d3e4a6a1f62c3c3ae1e9341f3615b4705a701 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek@redhat.com>
+Date: Wed, 13 Nov 2013 09:06:54 +0100
+Subject: [PATCH] ITS#7723 fix reference counting
+
+---
+ libraries/librewrite/session.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libraries/librewrite/session.c b/libraries/librewrite/session.c
+index 28f2551..7c59d14 100644
+--- a/libraries/librewrite/session.c
++++ b/libraries/librewrite/session.c
+@@ -161,6 +161,7 @@ rewrite_session_find(
+ #ifdef USE_REWRITE_LDAP_PVT_THREADS
+ 	if ( session ) {
+ 		ldap_pvt_thread_mutex_lock( &session->ls_mutex );
++		session->ls_count++;
+ 	}
+ 	ldap_pvt_thread_rdwr_runlock( &info->li_cookies_mutex );
+ #endif /* USE_REWRITE_LDAP_PVT_THREADS */
+@@ -178,6 +179,7 @@ rewrite_session_return(
+ )
+ {
+ 	assert( session != NULL );
++	session->ls_count--;
+ 	ldap_pvt_thread_mutex_unlock( &session->ls_mutex );
+ }
+ 
+-- 
+1.8.3.1
+

openldap2-client.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Sep  3 01:49:12 CEST 2014 - ro@suse.de
+
+- sanitize release line in specfile 
+
+-------------------------------------------------------------------
+Wed Jul 16 15:56:11 UTC 2014 - ckornacker@suse.com
+
+- segfault on certain queries with rwm overlay (bnc#846389)
+  0008-ITS-7723-fix-reference-counting.patch
+
 -------------------------------------------------------------------
 Fri Jun  6 13:16:24 UTC 2014 - ckornacker@suse.com
 

openldap2-client.spec

@@ -77,6 +77,7 @@ Patch4:         0004-libldap-use-gethostbyname_r.dif
 Patch5:         0005-pie-compile.dif
 Patch6:         0006-No-Build-date-and-time-in-binaries.dif
 Patch7:         0007-Recover-on-DB-version-change.dif
+Patch8:         0008-ITS-7723-fix-reference-counting.patch
 Patch100:       openldap-2.3.37.dif
 Patch101:       openldap-2.3.37-libldap-suid.diff
 Patch102:       openldap-2.3.37-libldap-ldapi_url.dif
@@ -149,7 +150,7 @@ Summary:        OpenLDAP Client Libraries
 License:        BSD-3-Clause and OLDAP-2.8 and OLDAP-2.8
 Group:          Productivity/Networking/LDAP/Clients
 Version:        2.3.37
-Release:        2.<RELEASE22>
+Release:        0
 
 %description -n compat-libldap-2_3-0
 This package contains the OpenLDAP client libraries.
@@ -216,6 +217,7 @@ This package contains the OpenLDAP client libraries.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 cp %{SOURCE5} .
 cp %{SOURCE6} .
 cd ../openldap-2.3.37
@@ -554,7 +556,7 @@ then
     cp -p --remove-destination /etc/openldap/schema/* $TEMPDIR
     echo $TEMPDIR > /etc/openldap/UPDATE_NEEDED ;
 fi
-if chkconfig ldap 2>&1 | grep -q on; then
+if /usr/bin/chkconfig ldap 2>&1 | grep -q on; then
     touch /var/run/enable_slapd_service
 fi
 %service_add_pre slapd.service

openldap2.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Sep 22 13:41:56 UTC 2014 - tchvatal@suse.com
+
+- Add baselibs.conf to sources list
+
+-------------------------------------------------------------------
+Wed Sep  3 01:49:12 CEST 2014 - ro@suse.de
+
+- sanitize release line in specfile 
+
+-------------------------------------------------------------------
+Wed Jul 16 15:56:11 UTC 2014 - ckornacker@suse.com
+
+- segfault on certain queries with rwm overlay (bnc#846389)
+  0008-ITS-7723-fix-reference-counting.patch
+
 -------------------------------------------------------------------
 Fri Jun  6 13:16:24 UTC 2014 - ckornacker@suse.com
 

openldap2.spec

@@ -69,6 +69,7 @@ Source4:        sasl-slapd.conf
 Source5:        README.update
 Source6:        README.dynamic-overlays
 Source7:        schema2ldif
+Source8:        baselibs.conf
 Source100:      openldap-2.3.37.tgz
 Patch1:         0001-build-adjustments.dif
 Patch2:         0002-slapd.conf.dif
@@ -77,6 +78,7 @@ Patch4:         0004-libldap-use-gethostbyname_r.dif
 Patch5:         0005-pie-compile.dif
 Patch6:         0006-No-Build-date-and-time-in-binaries.dif
 Patch7:         0007-Recover-on-DB-version-change.dif
+Patch8:         0008-ITS-7723-fix-reference-counting.patch
 Patch100:       openldap-2.3.37.dif
 Patch101:       openldap-2.3.37-libldap-suid.diff
 Patch102:       openldap-2.3.37-libldap-ldapi_url.dif
@@ -149,7 +151,7 @@ Summary:        OpenLDAP Client Libraries
 License:        BSD-3-Clause and OLDAP-2.8 and OLDAP-2.8
 Group:          Productivity/Networking/LDAP/Clients
 Version:        2.3.37
-Release:        2.<RELEASE22>
+Release:        0
 
 %description -n compat-libldap-2_3-0
 This package contains the OpenLDAP client libraries.
@@ -216,6 +218,7 @@ This package contains the OpenLDAP client libraries.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 cp %{SOURCE5} .
 cp %{SOURCE6} .
 cd ../openldap-2.3.37