Compare commits

...
Sign in to create a new pull request.

4 commits

Author SHA1 Message Date
Simon Pichugin
4e9682d134 Rebase to version 2.6.6
Related: rhbz#2240709
2023-09-26 14:03:07 -07:00
Simon Pichugin
c0a21247f6 Rebase to version 2.6.4
Related: rhbz#2176317
2023-03-07 15:36:34 -08:00
Simon Pichugin
7f4e1f2790 Rebase to version 2.6.3
Related: rhbz#2119231
2022-08-17 20:40:47 -07:00
Simon Pichugin
46b31c42cf Add export symbols related to LDAP_CONNECTIONLESS
Related: rhbz#2117827
2022-08-11 21:36:47 -07:00
5 changed files with 60 additions and 28 deletions

3
.gitignore vendored
View file

@ -34,3 +34,6 @@
/openldap-2.5.8.tgz
/openldap-2.6.1.tgz
/openldap-2.6.2.tgz
/openldap-2.6.3.tgz
/openldap-2.6.4.tgz
/openldap-2.6.6.tgz

View file

@ -0,0 +1,37 @@
From 6779e56fafb0aa8ae5efa7068da34a630b51b530 Mon Sep 17 00:00:00 2001
From: Simon Pichugin <spichugi@redhat.com>
Date: Fri, 5 Aug 2022 13:23:52 -0700
Subject: [PATCH] Add export symbols related to LDAP_CONNECTIONLESS
---
libraries/liblber/lber.map | 1 +
libraries/libldap/ldap.map | 1 +
2 files changed, 2 insertions(+)
diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map
index 9a4094b0f..083cd1f32 100644
--- a/libraries/liblber/lber.map
+++ b/libraries/liblber/lber.map
@@ -121,6 +121,7 @@ OPENLDAP_2.200
ber_sockbuf_io_fd;
ber_sockbuf_io_readahead;
ber_sockbuf_io_tcp;
+ ber_sockbuf_io_udp;
ber_sockbuf_remove_io;
ber_sos_dump;
ber_start;
diff --git a/libraries/libldap/ldap.map b/libraries/libldap/ldap.map
index b28c9c21e..021aaba63 100644
--- a/libraries/libldap/ldap.map
+++ b/libraries/libldap/ldap.map
@@ -200,6 +200,7 @@ OPENLDAP_2.200
ldap_is_ldap_url;
ldap_is_ldapi_url;
ldap_is_ldaps_url;
+ ldap_is_ldapc_url;
ldap_is_read_ready;
ldap_is_write_ready;
ldap_ld_free;
--
2.37.1

View file

@ -1,24 +0,0 @@
From 59e013602d7b1aa0d7da79d65367c9ec391b96f8 Mon Sep 17 00:00:00 2001
From: Simon Pichugin <spichugi@redhat.com>
Date: Wed, 3 Nov 2021 19:03:40 -0700
Subject: [PATCH] Fix missing mapping
---
libraries/liblber/lber.map | 1 +
1 file changed, 1 insertion(+)
diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map
index 9a4094b0f..083cd1f32 100644
--- a/libraries/liblber/lber.map
+++ b/libraries/liblber/lber.map
@@ -121,6 +121,7 @@ OPENLDAP_2.200
ber_sockbuf_io_fd;
ber_sockbuf_io_readahead;
ber_sockbuf_io_tcp;
+ ber_sockbuf_io_udp;
ber_sockbuf_remove_io;
ber_sos_dump;
ber_start;
--
2.31.1

View file

@ -13,8 +13,8 @@
%global __brp_remove_la_files %nil
Name: openldap
Version: 2.6.2
Release: 4%{?dist}
Version: 2.6.6
Release: 1%{?dist}
Summary: LDAP support libraries
License: OpenLDAP
URL: http://www.openldap.org/
@ -45,7 +45,7 @@ Patch6: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
# System-wide default for CA certs
Patch7: openldap-openssl-manpage-defaultCA.patch
Patch8: openldap-fix-missing-mapping.patch
Patch8: openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch
# check-password module specific patches
Patch90: check-password-makefile.patch
@ -504,6 +504,22 @@ exit 0
%{_libdir}/libslapi-2.4*.so.*
%changelog
* Tue Sep 26 2023 Simon Pichugin <spichugi@redhat.com> - 2.6.6-1
- Rebase to version 2.6.6
Related: rhbz#2240709
* Tue Mar 07 2023 Simon Pichugin <spichugi@redhat.com> - 2.6.4-1
- Rebase to version 2.6.4
Related: rhbz#2176317
* Wed Aug 17 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.3-1
- Rebase to version 2.6.3
Related: rhbz#2119231
* Thu Aug 11 2022 Simon Pichugin <spichugi@redhat.com> - 2.6.2-5
- Add export symbols related to LDAP_CONNECTIONLESS
Related: rhbz#2117827
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View file

@ -1,2 +1,2 @@
SHA512 (openldap-ppolicy-check-password-1.1.tar.gz) = a92854d7438cb95fac361da80a49d084d502155e8ce0ad2ea679db9529bbe0182aa4354e6139793c775e496349375d8f017678941d23315ff1c20fefc9573cdc
SHA512 (openldap-2.6.2.tgz) = a490a760ec954710e78821877744e8a6caa4e4f47cc292baae8106af2a4b62c16b7e8003af05ae16f58b28464d89e5459f9e4cf33241fe440c0c6ca041364420
SHA512 (openldap-2.6.6.tgz) = 0e800807b23f090b465dc18c2f0d342585f96768543b3298b85d17c18272d1c5576a66326d30b3520cac493cbd2ea70e309cd923bf19447c973a63d940619fa6