From 5a72171cbd45b70256dbf26f1edb705c5965dd0cd767494873f2775af0e60c88 Mon Sep 17 00:00:00 2001 From: Howard Guo Date: Thu, 23 Jul 2015 13:05:14 +0000 Subject: [PATCH] Accepting request 317890 from home:guohouzuo:branches:network:ldap upgrade to 2.4.41 OBS-URL: https://build.opensuse.org/request/show/317890 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=135 --- 0008-ITS-7723-fix-reference-counting.patch | 32 ------------------- ...nd-do-not-return-Connection0-entries.patch | 29 +++++++++++++++++ 0009-gcc5.patch | 22 ------------- openldap-2.4.39.tgz | 3 -- openldap-2.4.41.tgz | 3 ++ openldap2-client.changes | 9 ++++++ openldap2-client.spec | 10 +++--- openldap2.changes | 9 ++++++ openldap2.spec | 10 +++--- 9 files changed, 58 insertions(+), 69 deletions(-) delete mode 100644 0008-ITS-7723-fix-reference-counting.patch create mode 100644 0008-In-monitor-backend-do-not-return-Connection0-entries.patch delete mode 100644 0009-gcc5.patch delete mode 100644 openldap-2.4.39.tgz create mode 100644 openldap-2.4.41.tgz diff --git a/0008-ITS-7723-fix-reference-counting.patch b/0008-ITS-7723-fix-reference-counting.patch deleted file mode 100644 index 5622254..0000000 --- a/0008-ITS-7723-fix-reference-counting.patch +++ /dev/null @@ -1,32 +0,0 @@ -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/0008-In-monitor-backend-do-not-return-Connection0-entries.patch b/0008-In-monitor-backend-do-not-return-Connection0-entries.patch new file mode 100644 index 0000000..1cdb257 --- /dev/null +++ b/0008-In-monitor-backend-do-not-return-Connection0-entries.patch @@ -0,0 +1,29 @@ +From d4b247e43fe1ea1b3713f3d8f493422d5adcc537 Mon Sep 17 00:00:00 2001 +From: HouzuoGuo +Date: Fri, 13 Mar 2015 16:14:10 +0100 +Subject: [PATCH] In monitor backend, do not return Connection0 entries as they + are created for internal use only. + +--- + servers/slapd/back-monitor/conn.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c +index c1995b0..2d27738 100644 +--- a/servers/slapd/back-monitor/conn.c ++++ b/servers/slapd/back-monitor/conn.c +@@ -454,6 +454,11 @@ monitor_subsys_conn_create( + c != NULL; + c = connection_next( c, &connindex ) ) + { ++ /* Connection 0 is created by connection_client_setup for internal use only */ ++ if (c->c_connid == 0) { ++ continue; ++ } ++ + monitor_entry_t *mp; + + if ( conn_create( mi, c, &e, ms ) != SLAP_CB_CONTINUE +-- +2.1.4 + diff --git a/0009-gcc5.patch b/0009-gcc5.patch deleted file mode 100644 index 72a37e2..0000000 --- a/0009-gcc5.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: openldap-2.4.39/build/openldap.m4 -=================================================================== ---- openldap-2.4.39.orig/build/openldap.m4 2014-01-25 14:36:15.000000000 +0100 -+++ openldap-2.4.39/build/openldap.m4 2015-02-19 10:58:35.128769091 +0100 -@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION], - #endif - __db_version DB_VERSION_MAJOR - ]) -- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none -+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none - ol_cv_bdb_major=${3} - ]) - case $ol_cv_bdb_major in [[1-9]]*) : ;; *) -@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor ve - #endif - __db_version DB_VERSION_MINOR - ]) -- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none -+ set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none - ol_cv_bdb_minor=${3} - ]) - case $ol_cv_bdb_minor in [[0-9]]*) : ;; *) diff --git a/openldap-2.4.39.tgz b/openldap-2.4.39.tgz deleted file mode 100644 index 5acaad0..0000000 --- a/openldap-2.4.39.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8267c87347103fef56b783b24877c0feda1063d3cb85d070e503d076584bf8a7 -size 5509060 diff --git a/openldap-2.4.41.tgz b/openldap-2.4.41.tgz new file mode 100644 index 0000000..47f5291 --- /dev/null +++ b/openldap-2.4.41.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27856bb4a8b44feca2b326c309000e16a9dadd52362c8ab6eec6c67a43737f6e +size 5644124 diff --git a/openldap2-client.changes b/openldap2-client.changes index 97e8b34..c968442 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jul 21 08:12:50 UTC 2015 - hguo@suse.com + +- Upgrade to upstream 2.4.41 release with accumulcated bug fixes and stability improvements. + * Add patch 0008-In-monitor-backend-do-not-return-Connection0-entries.patch + * Remove already applied patch 0008-ITS-7723-fix-reference-counting.patch + * Remove already applied patch 0009-gcc5.patch + (Implements fate#319301) + ------------------------------------------------------------------- Thu Feb 19 10:03:30 UTC 2015 - rguenther@suse.com diff --git a/openldap2-client.spec b/openldap2-client.spec index 23d08d2..37a0d69 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,7 +1,7 @@ # # spec file for package openldap2-client # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ %define run_test_suite 0 -%define version_main 2.4.39 +%define version_main 2.4.41 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run @@ -27,7 +27,7 @@ Name: openldap2-client Summary: The OpenLDAP commandline client tools License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Clients -Version: 2.4.39 +Version: 2.4.41 Release: 0 Url: http://www.openldap.org Source: openldap-%{version_main}.tgz @@ -47,8 +47,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 -Patch9: 0009-gcc5.patch +Patch8: 0008-In-monitor-backend-do-not-return-Connection0-entries.patch Patch100: openldap-2.3.37.dif Patch101: openldap-2.3.37-libldap-suid.diff Patch102: openldap-2.3.37-libldap-ldapi_url.dif @@ -210,7 +209,6 @@ This package contains the OpenLDAP client libraries. %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 cp %{SOURCE5} . cp %{SOURCE6} . cd ../openldap-2.3.37 diff --git a/openldap2.changes b/openldap2.changes index 97e8b34..c968442 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jul 21 08:12:50 UTC 2015 - hguo@suse.com + +- Upgrade to upstream 2.4.41 release with accumulcated bug fixes and stability improvements. + * Add patch 0008-In-monitor-backend-do-not-return-Connection0-entries.patch + * Remove already applied patch 0008-ITS-7723-fix-reference-counting.patch + * Remove already applied patch 0009-gcc5.patch + (Implements fate#319301) + ------------------------------------------------------------------- Thu Feb 19 10:03:30 UTC 2015 - rguenther@suse.com diff --git a/openldap2.spec b/openldap2.spec index ff26711..832f90f 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -1,7 +1,7 @@ # # spec file for package openldap2 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ %define run_test_suite 0 -%define version_main 2.4.39 +%define version_main 2.4.41 %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run @@ -27,7 +27,7 @@ Name: openldap2 Summary: The OpenLDAP Server License: OLDAP-2.8 Group: Productivity/Networking/LDAP/Clients -Version: 2.4.39 +Version: 2.4.41 Release: 0 Url: http://www.openldap.org Source: openldap-%{version_main}.tgz @@ -47,8 +47,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 -Patch9: 0009-gcc5.patch +Patch8: 0008-In-monitor-backend-do-not-return-Connection0-entries.patch Patch100: openldap-2.3.37.dif Patch101: openldap-2.3.37-libldap-suid.diff Patch102: openldap-2.3.37-libldap-ldapi_url.dif @@ -210,7 +209,6 @@ This package contains the OpenLDAP client libraries. %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 cp %{SOURCE5} . cp %{SOURCE6} . cd ../openldap-2.3.37