Accepting request 592907 from network:ldap

- Upgrade to upstream 2.4.46 release
- removed obsolete back-port patches:
  * 0013-ITS-8692-let-back-sock-generate-increment-line.patch
  * 0016-ITS-8782-fix-cancel-memleak.patch
OpenLDAP 2.4.46 Release (2018/03/22)
	Fixed libldap connection delete callbacks when TLS fails to start (ITS#8717)
	Fixed libldap to not reuse tls_session if TLS hostname check fails (ITS#7373)
	Fixed libldap cross-compiling with OpenSSL 1.1 (ITS#8687)
	Fixed libldap OpenSSL 1.1.1 compatibility with BIO_method (ITS#8791)
	Fixed libldap MozNSS CA certificate hash matching (ITS#7374)
	Fixed libldap MozNSS with PEM certs when also using an NSS cert db (ITS#7389)
	Fixed libldap MozNSS initialization (ITS#8484)
	Fixed libldap GnuTLS with GNUTLS_E_AGAIN (ITS#8650)
	Fixed libldap memory leak with cancel operations (ITS#8782)
	Fixed slapd Eventlog registry key creation on 64-bit Windows (ITS#8705)
	Fixed slapd to maintain SSF across SASL binds (ITS#8796)
	Fixed slapd syncrepl deadlock when updating cookie (ITS#8752)
	Fixed slapd syncrepl callback to always be last in the stack (ITS#8752)
	Fixed slapd telephoneNumberNormalize when the value is spaces and hyphens (ITS#8778)
	Fixed slapd CSN queue processing (ITS#8801)
	Fixed slapd-ldap TLS connection timeout with high latency connections (ITS#8720)
	Fixed slapd-ldap to ignore unknown schema when omit-unknown-schema is set (ITS#7520)
	Fixed slapd-mdb with an optimization for long lived read transactions (ITS#8226)
	Fixed slapd-meta assert when olcDbRewrite is modified (ITS#8404)
	Fixed slapd-sock with LDAP_MOD_INCREMENT operations (ITS#8692)
	Fixed slapo-accesslog cleanup to only occur on failed operations (ITS#8752)
	Fixed slapo-dds entryTTL to actually decrease as per RFC 2589 (ITS#7100)
	Fixed slapo-syncprov memory leak with delete operations (ITS#8690)
	Fixed slapo-syncprov to not clear pending operation when checkpointing (ITS#8444)
	Fixed slapo-syncprov to correctly record contextCSN values in the accesslog (ITS#8100)
	Fixed slapo-syncprov not to log checkpoints to accesslog db (ITS#8607)
	Fixed slapo-syncprov to process changes from this SID on REFRESH (ITS#8800)
	Fixed slapo-syncprov session log parsing to not block other operations (ITS#8486)
	Build Environment
		Fixed Windows build with newer MINGW version (ITS#8697)
		Fixed compiler warnings and removed unused variables (ITS#8578)
	Contrib
		Fixed ldapc++ Control structure (ITS#8583)
	Documentation
		Delete stub manpage for back-ldbm (ITS#8713)
		Fixed ldap_bind(3) to mention the LDAP_SASL_SIMPLE mechanism (ITS#8121)
		Fixed ldap.conf(5) to note SASL_MECH/SASL_REALM are no longer user-only (ITS#8818)
		Fixed slapd-config(5) typo for olcTLSCipherSuite (ITS#8715)
		Fixed slapo-syncprov(5) indexing requirements (ITS#5048)

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

0013-ITS-8692-let-back-sock-generate-increment-line.patch

@@ -1,28 +0,0 @@
-From 6c37844c5c52b95aff5e4e547cda8a7258e92a35 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Str=C3=B6der?= <michael@stroeder.com>
-Date: Wed, 12 Jul 2017 20:18:22 +0200
-Subject: [PATCH] ITS#8692 let back-sock generate increment: line in case of
- LDAP_MOD_INCREMENT (see RFC 4525, section 3)
-
----
- servers/slapd/back-sock/modify.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/servers/slapd/back-sock/modify.c b/servers/slapd/back-sock/modify.c
-index c35d31bc6..9342d2702 100644
---- a/servers/slapd/back-sock/modify.c
-+++ b/servers/slapd/back-sock/modify.c
-@@ -85,6 +85,10 @@ sock_back_modify(
- 		case LDAP_MOD_REPLACE:
- 			fprintf( fp, "replace: %s\n", mod->sm_desc->ad_cname.bv_val );
- 			break;
-+
-+		case LDAP_MOD_INCREMENT:
-+			fprintf( fp, "increment: %s\n", mod->sm_desc->ad_cname.bv_val );
-+			break;
- 		}
- 
- 		if( mod->sm_values != NULL ) {
--- 
-2.13.2
-

0016-ITS-8782-fix-cancel-memleak.patch

@@ -1,46 +0,0 @@
-From f82ca15a1862749e13a989599d7f4c52c7648957 Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Mon, 4 Dec 2017 15:59:33 +0000
-Subject: ITS#8782 plug memleaks in cancel
-
-
-diff --git a/libraries/libldap/cancel.c b/libraries/libldap/cancel.c
-index b09f6f021..f3677b13a 100644
---- a/libraries/libldap/cancel.c
-+++ b/libraries/libldap/cancel.c
-@@ -42,14 +42,14 @@ ldap_cancel(
- 	int		*msgidp )
- {
- 	BerElement *cancelidber = NULL;
--	struct berval *cancelidvalp = NULL;
-+	struct berval cancelidvalp = { 0, NULL };
- 	int rc;
- 
- 	cancelidber = ber_alloc_t( LBER_USE_DER );
- 	ber_printf( cancelidber, "{i}", cancelid );
--	ber_flatten( cancelidber, &cancelidvalp );
-+	ber_flatten2( cancelidber, &cancelidvalp, 0 );
- 	rc = ldap_extended_operation( ld, LDAP_EXOP_CANCEL,
--		cancelidvalp, sctrls, cctrls, msgidp );
-+		&cancelidvalp, sctrls, cctrls, msgidp );
- 	ber_free( cancelidber, 1 );
- 	return rc;
- }
-@@ -62,14 +62,14 @@ ldap_cancel_s(
- 	LDAPControl	**cctrls )
- {
- 	BerElement *cancelidber = NULL;
--	struct berval *cancelidvalp = NULL;
-+	struct berval cancelidvalp = { 0, NULL };
- 	int rc;
- 
- 	cancelidber = ber_alloc_t( LBER_USE_DER );
- 	ber_printf( cancelidber, "{i}", cancelid );
--	ber_flatten( cancelidber, &cancelidvalp );
-+	ber_flatten2( cancelidber, &cancelidvalp, 0 );
- 	rc = ldap_extended_operation_s( ld, LDAP_EXOP_CANCEL,
--		cancelidvalp, sctrls, cctrls, NULL, NULL );
-+		&cancelidvalp, sctrls, cctrls, NULL, NULL );
- 	ber_free( cancelidber, 1 );
- 	return rc;
- }

openldap-2.4.45.tgz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
-size 5672845

openldap-2.4.46.tgz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d
+size 5700204

openldap2.changes

@@ -1,3 +1,52 @@
+-------------------------------------------------------------------
+Fri Mar 23 19:43:23 UTC 2018 - michael@stroeder.com
+
+- Upgrade to upstream 2.4.46 release
+- removed obsolete back-port patches:
+  * 0013-ITS-8692-let-back-sock-generate-increment-line.patch
+  * 0016-ITS-8782-fix-cancel-memleak.patch
+
+OpenLDAP 2.4.46 Release (2018/03/22)
+	Fixed libldap connection delete callbacks when TLS fails to start (ITS#8717)
+	Fixed libldap to not reuse tls_session if TLS hostname check fails (ITS#7373)
+	Fixed libldap cross-compiling with OpenSSL 1.1 (ITS#8687)
+	Fixed libldap OpenSSL 1.1.1 compatibility with BIO_method (ITS#8791)
+	Fixed libldap MozNSS CA certificate hash matching (ITS#7374)
+	Fixed libldap MozNSS with PEM certs when also using an NSS cert db (ITS#7389)
+	Fixed libldap MozNSS initialization (ITS#8484)
+	Fixed libldap GnuTLS with GNUTLS_E_AGAIN (ITS#8650)
+	Fixed libldap memory leak with cancel operations (ITS#8782)
+	Fixed slapd Eventlog registry key creation on 64-bit Windows (ITS#8705)
+	Fixed slapd to maintain SSF across SASL binds (ITS#8796)
+	Fixed slapd syncrepl deadlock when updating cookie (ITS#8752)
+	Fixed slapd syncrepl callback to always be last in the stack (ITS#8752)
+	Fixed slapd telephoneNumberNormalize when the value is spaces and hyphens (ITS#8778)
+	Fixed slapd CSN queue processing (ITS#8801)
+	Fixed slapd-ldap TLS connection timeout with high latency connections (ITS#8720)
+	Fixed slapd-ldap to ignore unknown schema when omit-unknown-schema is set (ITS#7520)
+	Fixed slapd-mdb with an optimization for long lived read transactions (ITS#8226)
+	Fixed slapd-meta assert when olcDbRewrite is modified (ITS#8404)
+	Fixed slapd-sock with LDAP_MOD_INCREMENT operations (ITS#8692)
+	Fixed slapo-accesslog cleanup to only occur on failed operations (ITS#8752)
+	Fixed slapo-dds entryTTL to actually decrease as per RFC 2589 (ITS#7100)
+	Fixed slapo-syncprov memory leak with delete operations (ITS#8690)
+	Fixed slapo-syncprov to not clear pending operation when checkpointing (ITS#8444)
+	Fixed slapo-syncprov to correctly record contextCSN values in the accesslog (ITS#8100)
+	Fixed slapo-syncprov not to log checkpoints to accesslog db (ITS#8607)
+	Fixed slapo-syncprov to process changes from this SID on REFRESH (ITS#8800)
+	Fixed slapo-syncprov session log parsing to not block other operations (ITS#8486)
+	Build Environment
+		Fixed Windows build with newer MINGW version (ITS#8697)
+		Fixed compiler warnings and removed unused variables (ITS#8578)
+	Contrib
+		Fixed ldapc++ Control structure (ITS#8583)
+	Documentation
+		Delete stub manpage for back-ldbm (ITS#8713)
+		Fixed ldap_bind(3) to mention the LDAP_SASL_SIMPLE mechanism (ITS#8121)
+		Fixed ldap.conf(5) to note SASL_MECH/SASL_REALM are no longer user-only (ITS#8818)
+		Fixed slapd-config(5) typo for olcTLSCipherSuite (ITS#8715)
+		Fixed slapo-syncprov(5) indexing requirements (ITS#5048)
+
 -------------------------------------------------------------------
 Thu Feb 22 15:10:42 UTC 2018 - fvogt@suse.com
 

openldap2.spec

@@ -22,7 +22,7 @@
 %endif
 
 %define run_test_suite 0
-%define version_main 2.4.45
+%define version_main 2.4.46
 
 %if %{suse_version} >= 1310 && %{suse_version} != 1315
 %define  _rundir /run/slapd
@@ -63,10 +63,8 @@ Patch8:         0008-In-monitor-backend-do-not-return-Connection0-entries.patch
 Patch9:         0009-Fix-ldap-host-lookup-ipv6.patch
 Patch11:        0011-openldap-re24-its7796.patch
 Patch12:        0012-ITS8051-sockdnpat.patch
-Patch13:        0013-ITS-8692-let-back-sock-generate-increment-line.patch
 Patch14:        0014-ITS-8714-Send-out-EXTENDED-operation-message-from-back-sock.patch
 Patch15:        openldap-r-only.dif
-Patch16:        0016-ITS-8782-fix-cancel-memleak.patch
 Source200:      %{name_ppolicy_check_module}-%{version_ppolicy_check_module}.tar.gz
 Source201:      %{name_ppolicy_check_module}.Makefile
 Source202:      %{name_ppolicy_check_module}.conf
@@ -260,10 +258,8 @@ gzip -k %{S:203}
 %patch9 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 cp %{SOURCE5} .
 
 # Move ppolicy check module and its Makefile into openldap-2.4/contrib/slapd-modules/
@@ -517,7 +513,6 @@ fi
 %doc %{_mandir}/man5/slapd-bdb.*
 %doc %{_mandir}/man5/slapd-config.*
 %doc %{_mandir}/man5/slapd-hdb.*
-%doc %{_mandir}/man5/slapd-ldbm.*
 %doc %{_mandir}/man5/slapd-ldap.*
 %doc %{_mandir}/man5/slapd-ldif.*
 %doc %{_mandir}/man5/slapd-mdb.*