Enable argon2 only in Fedora

libsodium is not included in RHEL, nor is openldap-servers shipped.
Bump version 2.6.10-5
2026-01-14 14:38:58 -05:00 · 2026-01-12 19:35:28 -08:00 · 2025-10-15 13:17:44 +02:00 · 2025-08-29 17:10:05 -07:00 · 2025-08-28 13:23:51 +02:00
1 changed files with 25 additions and 4 deletions
--- a/openldap.spec
+++ b/openldap.spec
@ -9,6 +9,9 @@
 # Build openldap-servers package and its libslapi in openldap-devel and openldap-compat
 %bcond servers 1

+# Build with argon2 support
+%bcond argon2 %{undefined rhel}
+
 # When you change "Version: " to the new major version, remember to change this value too
 %global major_version 2.6

@ -17,7 +20,7 @@

 Name: openldap
 Version: 2.6.10
-Release: 4%{?dist}
+Release: 6%{?dist}
 Summary: LDAP support libraries
 License: OLDAP-2.8
 URL: http://www.openldap.org/
@ -74,6 +77,9 @@ BuildRequires: unixODBC-devel
 BuildRequires: cracklib-devel
 BuildRequires: systemd
 BuildRequires: systemd-rpm-macros
+%if %{with argon2}
+BuildRequires: libsodium-devel
+%endif

 %description
 OpenLDAP is an open source suite of LDAP (Lightweight Directory Access
@ -221,6 +227,9 @@ pushd openldap-%{version}
 	--enable-rlookups \
 %if %{with servers}
 	--enable-slapi \
+%if %{with argon2}
+        --enable-argon2 \
+%endif
 %endif
 	--disable-slp \
 	\
@ -460,6 +469,12 @@ exit 0
 %{_datadir}/openldap-servers/
 %{_libdir}/openldap/accesslog*
 %{_libdir}/openldap/allop*
+%if %{with argon2}
+%{_libdir}/openldap/argon2*
+%{_mandir}/man5/slappw-argon2.5*
+%else
+%exclude %{_mandir}/man5/slappw-argon2.5*
+%endif
 %{_libdir}/openldap/auditlog*
 %{_libdir}/openldap/autoca*
 %{_libdir}/openldap/back_asyncmeta*
@ -502,7 +517,6 @@ exit 0
 %{_mandir}/man8/lloadd.8*
 %{_mandir}/man5/slapd*.5*
 %{_mandir}/man5/slapo-*.5*
-%{_mandir}/man5/slappw-argon2.5*
 %{_mandir}/man8/slap*.8*
 %{_sysusersdir}/openldap.conf
 # obsolete configuration
@ -551,9 +565,16 @@ exit 0
 %endif

 %changelog
+* Wed Jan 14 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 2.6.10-6
+- Enable argon2 only in Fedora
+
+* Tue Jan 13 2026 Simon Pichugin <spichugi@redhat.com> - 2.6.10-5
+- Add support for argon2 (rhbz#2229405)
+- Bump version 2.6.10-5
+
 * Fri Aug 29 2025 Simon Pichugin <spichugi@redhat.com> - 2.6.10-4
- Fix LDAP initialization does unnecessary resolution of hostname (rhbz#2392068)
- Convert STI tests to FMF (rhbz#2392069)
+- Fix LDAP initialization does unnecessary resolution of hostname (rhbz#2331728)
+- Convert STI tests to FMF (rhbz#2382998)

 * Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
Author	SHA1	Message	Date
Yaakov Selkowitz	a09115fad0	Enable argon2 only in Fedora libsodium is not included in RHEL, nor is openldap-servers shipped.	2026-01-14 14:38:58 -05:00
Simon Pichugin	24f6f7ee20	Bump version 2.6.10-5 Resolves: rhbz#2167213 Resolves: FC-2548	2026-01-12 19:35:28 -08:00
Viktor Ashirov	d2ffb52585	Add support for argon2 Resolves: rhbz#2167213	2025-10-15 13:17:44 +02:00
Simon Pichugin	96644176b3	Fix LDAP initialization does unnecessary resolution of hostname Resolves: rhbz#2331728	2025-08-29 17:10:05 -07:00
Viktor Ashirov	b6036115c7	Convert STI tests to FMF Resolves: rhbz#2382998 openldap: STI tests will no longer be run in F43	2025-08-28 13:23:51 +02:00