diff --git a/backport-ITS-9898-tests-fix-slapd-addel-non-std-syntax.patch b/backport-ITS-9898-tests-fix-slapd-addel-non-std-syntax.patch deleted file mode 100644 index 1426d22c8a7d1b7fa9af4dc10b852bda5f736cb8..0000000000000000000000000000000000000000 --- a/backport-ITS-9898-tests-fix-slapd-addel-non-std-syntax.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 21abafcc9d040b0aa1cf7e47b76abc975e27dc68 Mon Sep 17 00:00:00 2001 -From: Howard Chu -Date: Tue, 9 Aug 2022 18:11:30 +0100 -Subject: [PATCH] ITS#9898 tests: fix slapd-addel non-std syntax - -Broken in f5bef58cae5e16d56c48b1efd55249fa7ce54cc6 ---- - tests/progs/slapd-addel.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c -index ca007ce3f..f67c1fbde 100644 ---- a/tests/progs/slapd-addel.c -+++ b/tests/progs/slapd-addel.c -@@ -65,9 +65,9 @@ main( int argc, char **argv ) - char *filename = NULL, *buf = NULL; - int friendly = 0; - struct LDIFFP *fp; -- LDIFRecord record = {}; -+ LDIFRecord record = {0}; - struct tester_conn_args *config; -- struct berval bv = {}; -+ struct berval bv = {0}; - unsigned long lineno = 0; - - config = tester_init( "slapd-addel", TESTER_ADDEL ); --- -2.33.0 - diff --git a/backport-ITS-9904-ldif_open_url-check-for-ber_strdup-failure.patch b/backport-ITS-9904-ldif_open_url-check-for-ber_strdup-failure.patch deleted file mode 100644 index 8670d1b72faafcd3b47c1caaa899a165fabf61a9..0000000000000000000000000000000000000000 --- a/backport-ITS-9904-ldif_open_url-check-for-ber_strdup-failure.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ea8dd2d279c5aeaf9d4672a4e95bebd99babcce1 Mon Sep 17 00:00:00 2001 -From: Howard Chu -Date: Wed, 24 Aug 2022 14:40:51 +0100 -Subject: [PATCH] ITS#9904 ldif_open_url: check for ber_strdup failure - -Code present since 1999, df8f7cbb9b79be3be9205d116d1dd0b263d6861a ---- - libraries/libldap/fetch.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libraries/libldap/fetch.c b/libraries/libldap/fetch.c -index 9e426dc64..536871bcf 100644 ---- a/libraries/libldap/fetch.c -+++ b/libraries/libldap/fetch.c -@@ -69,6 +69,8 @@ ldif_open_url( - } - - p = ber_strdup( urlstr ); -+ if ( p == NULL ) -+ return NULL; - - /* But we should convert to LDAP_DIRSEP before use */ - if ( LDAP_DIRSEP[0] != '/' ) { --- -2.33.0 - diff --git a/openldap-2.6.3.tgz b/openldap-2.6.5.tgz old mode 100644 new mode 100755 similarity index 46% rename from openldap-2.6.3.tgz rename to openldap-2.6.5.tgz index 562d84412e9dd26a5a301e12de275d60109e3b03..389b462b18d7e0196cc1c06dbb2b6655afa6a04e Binary files a/openldap-2.6.3.tgz and b/openldap-2.6.5.tgz differ diff --git a/openldap.spec b/openldap.spec index 90c918fdeaf32379902ff3a57ad3f3af0ed21ede..6d68e6c4c3cb8e9795254c08e1e2337a00afa9a2 100644 --- a/openldap.spec +++ b/openldap.spec @@ -1,7 +1,7 @@ %global systemctl_bin /usr/bin/systemctl Name: openldap -Version: 2.6.3 +Version: 2.6.5 Release: 4 Summary: LDAP support libraries License: OLDAP-2.8 @@ -25,9 +25,6 @@ Patch5: backport-openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-s Patch7: backport-check-password-makefile.patch Patch8: backport-check-password.patch Patch9: add-ber_sockbuf_io_udp-to-liber.map.patch -Patch6000: backport-ITS-9898-tests-fix-slapd-addel-non-std-syntax.patch -Patch6001: backport-ITS-9904-ldif_open_url-check-for-ber_strdup-failure.patch - BuildRequires: cyrus-sasl-devel openssl-devel krb5-devel unixODBC-devel BuildRequires: glibc-devel libtool libtool-ltdl-devel groff perl-interpreter perl-devel perl-generators perl-ExtUtils-Embed @@ -102,9 +99,6 @@ AUTOMAKE=%{_bindir}/true autoreconf -fi %patch9 -p1 -%patch6000 -p1 -%patch6001 -p1 - ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays mv contrib/slapd-modules/smbk5pwd/README contrib/slapd-modules/smbk5pwd/README.smbk5pwd ln -s ../../../contrib/slapd-modules/allop/allop.c servers/slapd/overlays @@ -397,6 +391,9 @@ popd %doc ltb-project-openldap-ppolicy-check-password-1.1/README.check_pwd %changelog +* Thu Jul 27 2023 zhangchenglin - 2.6.5-1 +- update to version 2.6.5 + * Tue May 30 2023 liyunfei - 2.6.3-4 - add clang compile support @@ -406,7 +403,7 @@ popd * Tue Feb 28 2023 zhujunhao - 2.6.3-2 - add options for build cross -* Tue Feb 8 2023 zhujunhao - 2.6.3-1 +* Wed Feb 8 2023 zhujunhao - 2.6.3-1 - upgrade to 2.6.3 * Mon Nov 7 2022 zhujunhao - 2.6.0-5