From 7328f7b5b676bb879b2f38002ba6d2cec6d8021be7b38eb186e072655eeeecaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Fri, 23 Mar 2018 20:12:01 +0000 Subject: [PATCH] Accepting request 590763 from home:stroeder:branches:network:ldap Upgrade to upstream 2.4.46 release OBS-URL: https://build.opensuse.org/request/show/590763 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=204 --- ...et-back-sock-generate-increment-line.patch | 28 ----------- 0016-ITS-8782-fix-cancel-memleak.patch | 46 ------------------- openldap-2.4.45.tgz | 3 -- openldap-2.4.46.tgz | 3 ++ openldap2.changes | 8 ++++ openldap2.spec | 7 +-- 6 files changed, 12 insertions(+), 83 deletions(-) delete mode 100644 0013-ITS-8692-let-back-sock-generate-increment-line.patch delete mode 100644 0016-ITS-8782-fix-cancel-memleak.patch delete mode 100644 openldap-2.4.45.tgz create mode 100644 openldap-2.4.46.tgz diff --git a/0013-ITS-8692-let-back-sock-generate-increment-line.patch b/0013-ITS-8692-let-back-sock-generate-increment-line.patch deleted file mode 100644 index 7fbb1f0..0000000 --- a/0013-ITS-8692-let-back-sock-generate-increment-line.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6c37844c5c52b95aff5e4e547cda8a7258e92a35 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20Str=C3=B6der?= -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 - diff --git a/0016-ITS-8782-fix-cancel-memleak.patch b/0016-ITS-8782-fix-cancel-memleak.patch deleted file mode 100644 index afcc54b..0000000 --- a/0016-ITS-8782-fix-cancel-memleak.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f82ca15a1862749e13a989599d7f4c52c7648957 Mon Sep 17 00:00:00 2001 -From: Howard Chu -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; - } diff --git a/openldap-2.4.45.tgz b/openldap-2.4.45.tgz deleted file mode 100644 index 0af5b2a..0000000 --- a/openldap-2.4.45.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824 -size 5672845 diff --git a/openldap-2.4.46.tgz b/openldap-2.4.46.tgz new file mode 100644 index 0000000..981f5c5 --- /dev/null +++ b/openldap-2.4.46.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d +size 5700204 diff --git a/openldap2.changes b/openldap2.changes index a31af99..0eece97 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Thu Feb 22 15:10:42 UTC 2018 - fvogt@suse.com diff --git a/openldap2.spec b/openldap2.spec index d89cb23..f58797b 100644 --- a/openldap2.spec +++ b/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.*