From 06ccfa2bad3b1708f88e61e304939bdafb75b9ea3867159ffda17702220e8110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Wed, 12 Aug 2020 07:12:45 +0000 Subject: [PATCH 1/2] Accepting request 825908 from home:stroeder:branches:network:ldap updated to 2.4.51 OBS-URL: https://build.opensuse.org/request/show/825908 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=264 --- openldap-2.4.50.tgz | 3 --- openldap-2.4.51.tgz | 3 +++ openldap2.changes | 27 +++++++++++++++++++++++++++ openldap2.spec | 4 +--- 4 files changed, 31 insertions(+), 6 deletions(-) delete mode 100644 openldap-2.4.50.tgz create mode 100644 openldap-2.4.51.tgz diff --git a/openldap-2.4.50.tgz b/openldap-2.4.50.tgz deleted file mode 100644 index dcd24f8..0000000 --- a/openldap-2.4.50.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cb57d958bf5c55a678c6a0f06821e0e5504d5a92e6a33240841fbca1db586b8 -size 5712635 diff --git a/openldap-2.4.51.tgz b/openldap-2.4.51.tgz new file mode 100644 index 0000000..b1c354a --- /dev/null +++ b/openldap-2.4.51.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f490775ea4c6506b7210ee55a102c8f4aacfe9d1c8eaa633c7316d33a714be62 +size 5876819 diff --git a/openldap2.changes b/openldap2.changes index ef68669..755522f 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed Aug 12 06:16:42 UTC 2020 - Michael Ströder + +- updated to 2.4.51 +- removed obsolete patch 0014-ITS-8650-fix-debug-usage.patch + +OpenLDAP 2.4.51 Release (2020/08/11) + Added slapo-ppolicy implement Netscape password policy controls (ITS#9279) + Fixed libldap retry loop in ldap_int_tls_connect (ITS#8650) + Fixed libldap to use getaddrinfo in ldap_pvt_get_fqdn (ITS#9287) + Fixed slapd to enforce singular existence of some overlays (ITS#9309) + Fixed slapd syncrepl to not delete non-replicated attrs (ITS#9227) + Fixed slapd syncrepl to correctly delete entries on resync (ITS#9282) + Fixed slapd syncrepl to use replace on single valued attrs (ITS#9294, ITS#9295) + Fixed slapd-perl dynamic config with threaded slapd (ITS#7573) + Fixed slapo-ppolicy to expose the ppolicy control (ITS#9285) + Fixed slapo-ppolicy race condition for pwdFailureTime (ITS#9302) + Fixed slapo-ppolicy so it can only exist once per DB (ITS#9309) + Fixed slapo-chain to check referral (ITS#9262) + Build Environment + Fix test064 so it no longer uses bashisms (ITS#9263) + Contrib + Fix default prefix value for pw-argon2, pw-pbkdf2 modules (ITS#9248) + slapo-allowed - Fix usage of unitialized variable (ITS#9308) + Documentation + ldap_parse_result(3) - Document ldap_parse_intermediate (ITS#9271) + ------------------------------------------------------------------- Mon Jun 8 12:46:34 UTC 2020 - Callum Farmer diff --git a/openldap2.spec b/openldap2.spec index 6cb4acf..d660470 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -22,7 +22,7 @@ %endif %define run_test_suite 0 -%define version_main 2.4.50 +%define version_main 2.4.51 %if %{suse_version} >= 1310 && %{suse_version} != 1315 %define _rundir /run/slapd @@ -62,7 +62,6 @@ Patch5: 0005-pie-compile.dif Patch7: 0007-Recover-on-DB-version-change.dif Patch8: 0008-In-monitor-backend-do-not-return-Connection0-entries.patch Patch11: 0011-openldap-re24-its7796.patch -Patch14: 0014-ITS-8650-fix-debug-usage.patch Patch15: openldap-r-only.dif Patch16: 0016-Clear-shared-key-only-in-close-function.patch Source200: %{name_ppolicy_check_module}-%{version_ppolicy_check_module}.tar.gz @@ -259,7 +258,6 @@ gzip -k %{S:203} %patch7 -p1 %patch8 -p1 %patch11 -p1 -%patch14 -p1 %patch15 -p1 %patch16 -p1 cp %{SOURCE5} . From 7ec5ff30336adfbc5087e8fbdda362c9b424afd01f846e598ea818fa31a605cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Wed, 12 Aug 2020 07:18:38 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=265 --- 0014-ITS-8650-fix-debug-usage.patch | 30 ----------------------------- 1 file changed, 30 deletions(-) delete mode 100644 0014-ITS-8650-fix-debug-usage.patch diff --git a/0014-ITS-8650-fix-debug-usage.patch b/0014-ITS-8650-fix-debug-usage.patch deleted file mode 100644 index 39b3c92..0000000 --- a/0014-ITS-8650-fix-debug-usage.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 85fc8974f5c32a9a052baafaa9499c8484e043c2 Mon Sep 17 00:00:00 2001 -From: Quanah Gibson-Mount -Date: Tue, 28 Apr 2020 20:49:53 +0000 -Subject: ITS#8650 - Fix Debug usage to follow RE24 format - - -diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c -index c1f15cbc1..ebe5bf125 100644 ---- a/libraries/libldap/tls2.c -+++ b/libraries/libldap/tls2.c -@@ -907,8 +907,8 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv ) - } else if ( sb->sb_trans_needs_write ) { - wr=1; - } -- Debug1( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ldap_int_tls_connect needs %s\n", -- wr ? "write": "read" ); -+ Debug( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ldap_int_tls_connect needs %s\n", -+ wr ? "write": "read", 0, 0 ); - - /* This is mostly copied from result.c:wait4msg(), should - * probably be moved into a separate function */ -@@ -946,7 +946,7 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv ) - start_time_tv.tv_sec = curr_time_tv.tv_sec; - start_time_tv.tv_usec = curr_time_tv.tv_usec; - tv = tv0; -- Debug3( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ld %p %ld s %ld us to go\n", -+ Debug( LDAP_DEBUG_TRACE, "ldap_int_tls_start: ld %p %ld s %ld us to go\n", - (void *)ld, (long) tv.tv_sec, (long) tv.tv_usec ); - ret = ldap_int_poll( ld, sd, &tv, wr); - if ( ret < 0 ) {