From b709ba7705bbb448a65610a04b03155ff8053259d5cf9b38c147f11307c27be4 Mon Sep 17 00:00:00 2001 From: Christian Kornacker Date: Wed, 16 Jul 2014 16:08:39 +0000 Subject: [PATCH 1/3] - segfault on certain queries with rwm overlay (bnc#846389) 0008-ITS-7723-fix-reference-counting.patch OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=123 --- 0008-ITS-7723-fix-reference-counting.patch | 32 ++++++++++++++++++++++ openldap2-client.changes | 6 ++++ openldap2-client.spec | 4 ++- openldap2.changes | 6 ++++ openldap2.spec | 2 ++ 5 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0008-ITS-7723-fix-reference-counting.patch diff --git a/0008-ITS-7723-fix-reference-counting.patch b/0008-ITS-7723-fix-reference-counting.patch new file mode 100644 index 0000000..5622254 --- /dev/null +++ b/0008-ITS-7723-fix-reference-counting.patch @@ -0,0 +1,32 @@ +From 742d3e4a6a1f62c3c3ae1e9341f3615b4705a701 Mon Sep 17 00:00:00 2001 +From: Jan Synacek +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 + diff --git a/openldap2-client.changes b/openldap2-client.changes index 8e1b020..8506119 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/openldap2-client.spec b/openldap2-client.spec index f6a72bf..8551fc0 100644 --- a/openldap2-client.spec +++ b/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 @@ -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 diff --git a/openldap2.changes b/openldap2.changes index 8e1b020..8506119 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/openldap2.spec b/openldap2.spec index 045ae43..e274513 100644 --- a/openldap2.spec +++ b/openldap2.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 @@ -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 From 4aac668048ffdf433d9bb1d3de3221f5bb1dfd3df4fde10bdff2a93dd15187b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 9 Sep 2014 14:59:20 +0000 Subject: [PATCH 2/3] Accepting request 247326 from home:oertel:factory-relnums sanitize release line in specfile OBS-URL: https://build.opensuse.org/request/show/247326 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=124 --- openldap2-client.changes | 5 +++++ openldap2-client.spec | 2 +- openldap2.changes | 5 +++++ openldap2.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/openldap2-client.changes b/openldap2-client.changes index 8506119..02d3d15 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/openldap2-client.spec b/openldap2-client.spec index 8551fc0..7870cf3 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -150,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. +Release: 0 %description -n compat-libldap-2_3-0 This package contains the OpenLDAP client libraries. diff --git a/openldap2.changes b/openldap2.changes index 8506119..02d3d15 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/openldap2.spec b/openldap2.spec index e274513..fea4c86 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -150,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. +Release: 0 %description -n compat-libldap-2_3-0 This package contains the OpenLDAP client libraries. From 4c24b776b2868be6f59383336f5577b68eb9ea7179b26f8184b480ca9e8df6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 22 Sep 2014 13:42:19 +0000 Subject: [PATCH 3/3] - Add baselibs.conf to sources list OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=125 --- openldap2.changes | 5 +++++ openldap2.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/openldap2.changes b/openldap2.changes index 02d3d15..98cb202 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/openldap2.spec b/openldap2.spec index fea4c86..6ec0d6c 100644 --- a/openldap2.spec +++ b/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