diff --git a/openldap-2.6.1.tgz b/openldap-2.6.3.tgz similarity index 46% rename from openldap-2.6.1.tgz rename to openldap-2.6.3.tgz index ee21529799871ae623266464bb42eed66662c972..562d84412e9dd26a5a301e12de275d60109e3b03 100644 Binary files a/openldap-2.6.1.tgz and b/openldap-2.6.3.tgz differ diff --git a/openldap-fix-missing-mapping.patch b/openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch similarity index 43% rename from openldap-fix-missing-mapping.patch rename to openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch index dd4a7cc78fe811c1d285d82ec0e05bd93c8f525a..0c1b3bb61b4e6a37d33c23865241fcf464081718 100644 --- a/openldap-fix-missing-mapping.patch +++ b/openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch @@ -1,11 +1,12 @@ -From 59e013602d7b1aa0d7da79d65367c9ec391b96f8 Mon Sep 17 00:00:00 2001 +From 6779e56fafb0aa8ae5efa7068da34a630b51b530 Mon Sep 17 00:00:00 2001 From: Simon Pichugin -Date: Wed, 3 Nov 2021 19:03:40 -0700 -Subject: [PATCH] Fix missing mapping +Date: Fri, 5 Aug 2022 13:23:52 -0700 +Subject: [PATCH] Add export symbols related to LDAP_CONNECTIONLESS --- libraries/liblber/lber.map | 1 + - 1 file changed, 1 insertion(+) + 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 @@ -19,6 +20,18 @@ index 9a4094b0f..083cd1f32 100644 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.31.1 +2.37.1 diff --git a/openldap.spec b/openldap.spec index cdb3789b82f8ac2d32e3b9374b332458c09a9e67..c803295577cd9b65e8110fefd3241bf973df25d6 100644 --- a/openldap.spec +++ b/openldap.spec @@ -2,10 +2,11 @@ %global so_ver 2 %global so_ver_compat 2 %global __brp_remove_la_files %nil +%define anolis_release 1 Name: openldap -Version: 2.6.1 -Release: 1%{?dist} +Version: 2.6.3 +Release: %{anolis_release}%{?dist} Summary: LDAP support libraries License: OpenLDAP @@ -27,7 +28,7 @@ Patch3: openldap-ai-addrconfig.patch Patch4: openldap-allop-overlay.patch Patch5: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch Patch6: openldap-openssl-manpage-defaultCA.patch -Patch7: openldap-fix-missing-mapping.patch +Patch7: openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch Patch8: check-password-makefile.patch Patch9: check-password.patch @@ -44,10 +45,18 @@ similar to the way DNS (Domain Name System) information is propagated over the Internet. The openldap package contains configuration files, libraries, and documentation for OpenLDAP. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %package devel Summary: LDAP development libraries and header files -Requires: openldap%{?_isa} = %{version}-%{release} -Requires: cyrus-sasl-devel%{?_isa} +Requires: openldap = %{version}-%{release} +Requires: cyrus-sasl-devel %description devel The openldap-devel package includes the development libraries and @@ -59,7 +68,7 @@ customized LDAP clients. %package compat Summary: Package providing legacy non-threaded libldap -Requires: openldap%{?_isa} = %{version}-%{release} +Requires: openldap = %{version}-%{release} Provides: libldap-2.4.so.%{so_ver_compat}()(%{__isa_bits}bit) Provides: libldap_r-2.4.so.%{so_ver_compat}()(%{__isa_bits}bit) Provides: liblber-2.4.so.%{so_ver_compat}()(%{__isa_bits}bit) @@ -74,7 +83,7 @@ and are available for compatibility reasons. %package servers Summary: LDAP server License: OpenLDAP -Requires: openldap%{?_isa} = %{version}-%{release} +Requires: openldap = %{version}-%{release} Requires(pre): shadow-utils BuildRequires: systemd BuildRequires: cracklib-devel @@ -92,7 +101,7 @@ over the Internet. This package contains the slapd server and related files. %package clients Summary: LDAP client utilities -Requires: openldap%{?_isa} = %{version}-%{release} +Requires: openldap = %{version}-%{release} %description clients OpenLDAP is an open-source suite of LDAP (Lightweight Directory Access @@ -358,11 +367,8 @@ exit 0 %systemd_postun_with_restart slapd.service %files -%doc openldap-%{version}/ANNOUNCEMENT -%doc openldap-%{version}/CHANGES %license openldap-%{version}/COPYRIGHT %license openldap-%{version}/LICENSE -%doc openldap-%{version}/README %dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap/certs %config(noreplace) %{_sysconfdir}/openldap/ldap.conf @@ -373,6 +379,11 @@ exit 0 %{_mandir}/man5/ldif.5* %{_mandir}/man5/ldap.conf.5* +%files doc +%doc openldap-%{version}/ANNOUNCEMENT +%doc openldap-%{version}/README +%doc openldap-%{version}/CHANGES + %files servers %doc openldap-%{version}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd %doc openldap-%{version}/doc/guide/admin/*.html @@ -421,5 +432,8 @@ exit 0 %changelog +* Mon Sep 5 2022 mgb01105731 - 2.6.3-1 +- update to 2.6.3 + * Thu Mar 17 2022 forrest_ly - 2.6.1-1 - Init for Anolis OS 23