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

libldap_r-tpool-resume-ITS5841.diff

@@ -0,0 +1,18 @@
+Index: libraries/libldap_r/tpool.c
+===================================================================
+RCS file: /repo/OpenLDAP/pkg/ldap/libraries/libldap_r/tpool.c,v
+retrieving revision 1.97
+retrieving revision 1.98
+diff -u -r1.97 -r1.98
+--- libraries/libldap_r/tpool.c	10 Mar 2008 12:21:24 -0000	1.97
++++ libraries/libldap_r/tpool.c	9 Dec 2008 09:57:15 -0000	1.98
+@@ -785,8 +785,7 @@
+ 	SET_VARY_OPEN_COUNT(pool);
+ 	pool->ltp_work_list = &pool->ltp_pending_list;
+ 
+-	if (!pool->ltp_finishing)
+-		ldap_pvt_thread_cond_broadcast(&pool->ltp_cond);
++	ldap_pvt_thread_cond_broadcast(&pool->ltp_cond);
+ 
+ 	ldap_pvt_thread_mutex_unlock(&pool->ltp_mutex);
+ 	return(0);

openldap2-client.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Dec 12 14:45:07 CET 2008 - rhafer@suse.de
+
+- Fixed openldap2-devel dependencies (bnc#457989) 
+
+-------------------------------------------------------------------
+Tue Dec  9 11:11:38 CET 2008 - rhafer@suse.de
+
+- Fixed a bug in the threadpool implementation that could cause
+  slapd to lockup when shutting down while the pool is paused.
+  (bnc#450457, ITS#5841)
+
 -------------------------------------------------------------------
 Fri Nov 28 14:08:16 CET 2008 - rhafer@suse.de
 

openldap2-client.spec

@@ -19,15 +19,15 @@
 
 
 Name:           openldap2-client
-BuildRequires:  cyrus-sasl-devel db-devel openslp-devel openssl-devel tcpd-devel
+BuildRequires:  cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel
 %if %sles_version == 9
-BuildRequires:  -pwdutils
+BuildRequires:  -libopenssl-devel -pwdutils openssl-devel
 %endif
 %if %sles_version == 10
-BuildRequires:  -db-devel -pwdutils libdb-4_5-devel
+BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
 %endif
 Version:        2.4.12
-Release:        5
+Release:        6
 Url:            http://www.openldap.org
 License:        BSD 3-Clause
 %if "%{name}" == "openldap2"
@@ -68,6 +68,7 @@ Patch17:        slapo-chain-dangling-its5742.dif
 Patch18:        slapd-db-close-error-its5745.dif
 Patch19:        slapo-syncprov-skip-its5709.dif
 Patch20:        slapadd-no-trickle.dif
+Patch21:        libldap_r-tpool-resume-ITS5841.diff
 Patch100:       openldap-2.3.37.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -126,7 +127,7 @@ License:        BSD 3-Clause; openldap 2.8
 Summary:        Libraries, Header Files and Documentation for OpenLDAP
 AutoReqProv:    on
 Conflicts:      openldap-devel
-Requires:       libldap-2_4-2 = %{version}  cyrus-sasl-devel openssl-devel
+Requires:       libldap-2_4-2 = %{version}  cyrus-sasl-devel libopenssl-devel
 Group:          Development/Libraries/C and C++
 
 %description -n openldap2-devel
@@ -177,6 +178,7 @@ Authors:
 %patch18
 %patch19
 %patch20 -p1
+%patch21
 cp %{SOURCE5} .
 cd ../openldap-2.3.37
 %patch100
@@ -538,6 +540,12 @@ fi
 %endif
 
 %changelog
+* Fri Dec 12 2008 rhafer@suse.de
+- Fixed openldap2-devel dependencies (bnc#457989)
+* Tue Dec 09 2008 rhafer@suse.de
+- Fixed a bug in the threadpool implementation that could cause
+  slapd to lockup when shutting down while the pool is paused.
+  (bnc#450457, ITS#5841)
 * Fri Nov 28 2008 rhafer@suse.de
 - Disable the slapadd trickle-task it cause performance issues
   when using libdb-4.5 (bnc#449641)

openldap2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Dec 12 14:45:07 CET 2008 - rhafer@suse.de
+
+- Fixed openldap2-devel dependencies (bnc#457989) 
+
+-------------------------------------------------------------------
+Tue Dec  9 11:11:38 CET 2008 - rhafer@suse.de
+
+- Fixed a bug in the threadpool implementation that could cause
+  slapd to lockup when shutting down while the pool is paused.
+  (bnc#450457, ITS#5841)
+
 -------------------------------------------------------------------
 Fri Nov 28 14:08:16 CET 2008 - rhafer@suse.de
 

openldap2.spec

@@ -19,15 +19,15 @@
 
 
 Name:           openldap2
-BuildRequires:  cyrus-sasl-devel db-devel openslp-devel openssl-devel tcpd-devel
+BuildRequires:  cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel
 %if %sles_version == 9
-BuildRequires:  -pwdutils
+BuildRequires:  -libopenssl-devel -pwdutils openssl-devel
 %endif
 %if %sles_version == 10
-BuildRequires:  -db-devel -pwdutils libdb-4_5-devel
+BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
 %endif
 Version:        2.4.12
-Release:        5
+Release:        6
 Url:            http://www.openldap.org
 License:        BSD 3-Clause; openldap 2.8
 %if "%{name}" == "openldap2"
@@ -68,6 +68,7 @@ Patch17:        slapo-chain-dangling-its5742.dif
 Patch18:        slapd-db-close-error-its5745.dif
 Patch19:        slapo-syncprov-skip-its5709.dif
 Patch20:        slapadd-no-trickle.dif
+Patch21:        libldap_r-tpool-resume-ITS5841.diff
 Patch100:       openldap-2.3.37.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -129,7 +130,7 @@ License:        BSD 3-Clause; openldap 2.8
 Summary:        Libraries, Header Files and Documentation for OpenLDAP
 AutoReqProv:    on
 Conflicts:      openldap-devel
-Requires:       libldap-2_4-2 = %{version}  cyrus-sasl-devel openssl-devel
+Requires:       libldap-2_4-2 = %{version}  cyrus-sasl-devel libopenssl-devel
 Group:          Development/Libraries/C and C++
 
 %description -n openldap2-devel
@@ -180,6 +181,7 @@ Authors:
 %patch18
 %patch19
 %patch20 -p1
+%patch21
 cp %{SOURCE5} .
 cd ../openldap-2.3.37
 %patch100
@@ -541,6 +543,12 @@ fi
 %endif
 
 %changelog
+* Fri Dec 12 2008 rhafer@suse.de
+- Fixed openldap2-devel dependencies (bnc#457989)
+* Tue Dec 09 2008 rhafer@suse.de
+- Fixed a bug in the threadpool implementation that could cause
+  slapd to lockup when shutting down while the pool is paused.
+  (bnc#450457, ITS#5841)
 * Fri Nov 28 2008 rhafer@suse.de
 - Disable the slapadd trickle-task it cause performance issues
   when using libdb-4.5 (bnc#449641)