From a9e4866cde383f7428aa1875f4c775edc3ec366864a190a8ca18fe72e5232244 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 11 Apr 2022 21:25:05 +0000
Subject: [PATCH] Accepting request 969283 from
 home:stroeder:branches:network:ldap

- Use libargon2 instead of libsodium because it supports p>1
- Added new contrib overlays: authzid, datamorph, variant, vc

OBS-URL: https://build.opensuse.org/request/show/969283
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=297
---
 openldap2.changes |  6 ++++++
 openldap2.spec    | 24 ++++++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/openldap2.changes b/openldap2.changes
index 7460b57..542d892 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 11 20:52:33 UTC 2022 - Michael Ströder <michael@stroeder.com>
+
+- Use libargon2 instead of libsodium because it supports p>1
+- Added new contrib overlays: authzid, datamorph, variant, vc
+
 -------------------------------------------------------------------
 Sat Apr  2 22:57:29 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/openldap2.spec b/openldap2.spec
index ceee4c8..bc7fb0d 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -58,11 +58,11 @@ Patch8:         0008-In-monitor-backend-do-not-return-Connection0-entries.patch
 Patch16:        0016-Clear-shared-key-only-in-close-function.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  argon2-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  db-devel
 BuildRequires:  groff
 BuildRequires:  libopenssl-devel
-BuildRequires:  libsodium-devel
 BuildRequires:  libtool
 BuildRequires:  openslp-devel
 BuildRequires:  sysuser-tools
@@ -152,7 +152,9 @@ addpartial    Intercepts ADD requests, applies changes to existing entries
 allop
 allowed       Generates attributes indicating access rights
 autogroup
+authzid       implements RFC 3829 support
 cloak
+datamorph     store enumerated values and fixed size integers
 denyop
 lastbind      writes last bind timestamp to entry
 noopsrch      handles no-op search control
@@ -160,6 +162,8 @@ pw-sha2       generates/validates SHA-2 password hashes
 pw-pbkdf2     generates/validates PBKDF2 password hashes
 smbk5pwd      generates Samba3 password hashes (heimdal krb disabled)
 trace         traces overlay invocation
+variant       allows attributes/values to be shared between several entries
+vc            implements the verify credentials extended operation
 
 %package doc
 Summary:        OpenLDAP Documentation
@@ -279,12 +283,12 @@ export STRIP=""
         --enable-syncprov=mod \
         --enable-ppolicy=mod \
         --with-yielding-select \
-        --with-argon2 \
+        --with-argon2=libargon2 \
   || cat config.log
 make depend
 %make_build
 # Build selected contrib overlays
-for SLAPO_NAME in addpartial allowed allop autogroup lastbind denyop cloak noopsrch passwd/sha2 passwd/pbkdf2 trace
+for SLAPO_NAME in addpartial allowed allop autogroup authzid datamorph lastbind denyop cloak noopsrch passwd/sha2 passwd/pbkdf2 trace variant vc
 do
   make -C contrib/slapd-modules/${SLAPO_NAME} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}"
 done
@@ -333,7 +337,7 @@ make STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdi
 # Additional symbolic link to slapd executable in /usr/sbin/
 ln -s %{_libdir}/slapd %{buildroot}%{_sbindir}/slapd
 # Install selected contrib overlays
-for SLAPO_NAME in addpartial allowed allop autogroup lastbind denyop cloak noopsrch passwd/sha2 passwd/pbkdf2 trace
+for SLAPO_NAME in addpartial allowed allop autogroup authzid datamorph lastbind denyop cloak noopsrch passwd/sha2 passwd/pbkdf2 trace variant vc
 do
   make -C contrib/slapd-modules/${SLAPO_NAME} STRIP="" DESTDIR="%{buildroot}" "mandir=%{_mandir}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" install
 done
@@ -544,17 +548,21 @@ ln -fs libldap.so "%{buildroot}%{_libdir}/libldap_r.so"
 
 %files contrib
 %{_libdir}/openldap/addpartial.*
-%{_libdir}/openldap/allowed.*
 %{_libdir}/openldap/allop.*
+%{_libdir}/openldap/allowed.*
+%{_libdir}/openldap/authzid.*
 %{_libdir}/openldap/autogroup.*
+%{_libdir}/openldap/cloak.*
+%{_libdir}/openldap/datamorph.*
+%{_libdir}/openldap/denyop.*
 %{_libdir}/openldap/lastbind.*
 %{_libdir}/openldap/noopsrch.*
-%{_libdir}/openldap/pw-sha2.*
 %{_libdir}/openldap/pw-pbkdf2.*
-%{_libdir}/openldap/denyop.*
-%{_libdir}/openldap/cloak.*
+%{_libdir}/openldap/pw-sha2.*
 %{_libdir}/openldap/smbk5pwd.*
 %{_libdir}/openldap/trace.*
+%{_libdir}/openldap/variant.*
+%{_libdir}/openldap/vc.*
 
 %files client
 %doc %{_mandir}/man1/ldap*