diff --git a/.gitignore b/.gitignore index 128fbb8..8e867ca 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /openldap-2.4.46.tgz /openldap-2.4.47.tgz /openldap-2.4.50.tgz +/openldap-2.4.52.tgz diff --git a/openldap-ITS-8650-Fix-Debug-usage-to-follow-RE24-format.patch b/openldap-ITS-8650-Fix-Debug-usage-to-follow-RE24-format.patch deleted file mode 100644 index 350626e..0000000 --- a/openldap-ITS-8650-Fix-Debug-usage-to-follow-RE24-format.patch +++ /dev/null @@ -1,36 +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: [PATCH] ITS#8650 - Fix Debug usage to follow RE24 format - ---- - libraries/libldap/tls2.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -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 ) { --- -2.25.4 - diff --git a/openldap.spec b/openldap.spec index d74038b..b7aa7a3 100644 --- a/openldap.spec +++ b/openldap.spec @@ -4,8 +4,8 @@ %global check_password_version 1.1 Name: openldap -Version: 2.4.50 -Release: 4%{?dist} +Version: 2.4.52 +Release: 1%{?dist} Summary: LDAP support libraries License: OpenLDAP URL: http://www.openldap.org/ @@ -33,7 +33,6 @@ Patch17: openldap-allop-overlay.patch # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=327585 Patch19: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch Patch24: openldap-openssl-manpage-defaultCA.patch -Patch25: openldap-ITS-8650-Fix-Debug-usage-to-follow-RE24-format.patch # check-password module specific patches Patch90: check-password-makefile.patch @@ -111,7 +110,6 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi %patch17 -p1 %patch19 -p1 %patch24 -p1 -%patch25 -p1 # build smbk5pwd with other overlays ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays @@ -481,6 +479,9 @@ exit 0 %{_mandir}/man3/* %changelog +* Thu Sep 03 2020 Simon Pichugin - 2.4.52-1 +- Rebase to version 2.4.52 (#1868240) + * Sat Aug 01 2020 Fedora Release Engineering - 2.4.50-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 8b790c5..3faa763 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ltb-project-openldap-ppolicy-check-password-1.1.tar.gz) = f3384a164ce5db488908cf6380bad8500b800b09d12a8f04e1b6ccb6f6af6ab3971fcdbe4acca7a1b6d16b408a11065c2b1ab2497863fe07d3c28262b0f6776e -SHA512 (openldap-2.4.50.tgz) = f528043ff9de36f7b65d8816c9a9c24f0ac400041b2969965178ee6eae62c92a11af33a0a883e4954e5fff98a0738a9f9aa2faf5b385d21974754e045aab31ae +SHA512 (openldap-2.4.52.tgz) = aba0e11b91d175230a525f7a74a8d896b743719364487976e0502570fec353d107d3fadedf4c0b8516eca2f572b38bd0a4288283a6918ef7ea322c889396f84c