From e10d641b6c1318a7c0b5530600ed126ae497023c Mon Sep 17 00:00:00 2001
From: Symas Support <support@symas.com>
Date: Thu, 3 Aug 2023 11:42:53 +0000
Subject: [PATCH] 2.6.6 with openssl 1.1 release bits
---
rpm/openldap.spec | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/rpm/openldap.spec b/rpm/openldap.spec
index c266cbb48f..5494695358 100644
--- a/rpm/openldap.spec
+++ b/rpm/openldap.spec
@@ -12,7 +12,7 @@
%{!?_varfix: %define _varfix /var/symas }
Name: symas-openldap
-Version: 2.6.5
+Version: 2.6.6
Release: 1%{?dist}
Summary: Symas's openldap build
@@ -21,9 +21,9 @@ URL: https://www.openldap.org
VCS: https://git.symas.net/symas-public/openldap.git
# These are the packages required to build OpenLDAP
-BuildRequires: symas-openssl-devel >= 3.0.0, symas-cyrus-sasl-devel >= 2.1.28-5
-BuildRequires: gcc, libtool-ltdl-devel, symas-heimdal-devel >= 7.8.0-3
-BuildRequires: symas-libevent-devel >= 2.1.12-3, symas-libargon2-devel
+BuildRequires: symas-openssl-devel < 2.0.0, symas-cyrus-sasl-devel
+BuildRequires: gcc, libtool-ltdl-devel, symas-heimdal-devel
+BuildRequires: symas-libevent-devel, symas-libargon2-devel
BuildRequires: cracklib-devel, systemd-devel
# SOURCE0 is unused, it's just for a theoretical reference
@@ -69,7 +69,7 @@ Symas's OpenLDAP 2.6 build
# Library package information
%package libs
Summary: openldap Libaries
-Requires: symas-openssl-libs >= 3.0.0, symas-cyrus-sasl-libs >= 2.1.28-5
+Requires: symas-openssl-libs < 2.0.0, symas-cyrus-sasl-libs
AutoReqProv: no
%description libs
@@ -87,13 +87,13 @@ The symas-openldap-devel package contains the linking libraries and include file
# Server package information
%package servers
Summary: openldap server binaries
-Requires: symas-openldap-libs = %{version}-%{release}, symas-libargon2-libs, symas-heimdal-libs >= 7.8.0-3
+Requires: symas-openldap-libs = %{version}-%{release}, symas-libargon2-libs, symas-heimdal-libs
%if 0%{?centos_ver} && 0%{?centos_ver} == 7
Requires: cracklib >= 2.9.0
%else
Requires: cracklib >= 2.9.6
%endif
-Requires: symas-libevent-libs >= 2.1.12-3
+Requires: symas-libevent-libs
%if 0%{?suse_version}
Requires: libltdl7
%else
@@ -445,6 +445,9 @@ make test
%systemd_postun_with_restart symas-openldap-servers.service
%changelog
+* Thu Aug 03 2023 Symas Support <support@symas.com> - 2.6.6-1
+- OpenLDAP 2.6.6-1 release
+- Changing back to openssl 1.1.1
* Tue Jul 11 2023 Symas Support <support@symas.com> - 2.6.5-1
- OpenLDAP 2.6.5 release
* Wed May 31 2023 Symas Support <support@symas.com> - 2.6.5~rc1-2
--
GitLab