From dadb2364fa576f1b9d7e01fe26de6fae296c5844 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 1 Jun 2022 05:04:47 -0500
Subject: user/openldap: Update to 2.6.2

* Fix all tests.
  Suite now runs in ~20m instead of ~2h, so re-enable.

* Update our patches for 2.6.

* Build deps before all target to fix #720.
---
 user/openldap/configs.patch | 41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

(limited to 'user/openldap/configs.patch')

diff --git a/user/openldap/configs.patch b/user/openldap/configs.patch
index e7ec65c4b..c7077672a 100644
--- a/user/openldap/configs.patch
+++ b/user/openldap/configs.patch
@@ -1,3 +1,6 @@
+* Use /run/openldap for the state directory.
+* We use .so instead of .la for module suffix.
+
 --- a/servers/slapd/slapd.conf
 +++ b/servers/slapd/slapd.conf
 @@ -2,7 +2,7 @@
@@ -9,7 +12,7 @@
  
  # Define global ACLs to disable default read access.
  
-@@ -10,13 +10,16 @@
+@@ -10,13 +10,14 @@
  # service AND an understanding of referrals.
  #referral	ldap://root.openldap.org
  
@@ -20,18 +23,16 @@
 +argsfile	/run/openldap/slapd.args
  
  # Load dynamic backend modules:
--# modulepath	%MODULEDIR%
--# moduleload	back_mdb.la
+-modulepath	%MODULEDIR%
+-moduleload	back_mdb.la
 -# moduleload	back_ldap.la
 +modulepath	/usr/lib/openldap
 +moduleload	back_mdb.so
-+# moduleload	back_hdb.so
-+# moduleload	back_bbd.so
 +# moduleload	back_ldap.so
  
  # Sample security restrictions
  #	Require integrity protection (prevent hijacking)
-@@ -53,13 +56,16 @@
+@@ -62,13 +63,16 @@
  maxsize		1073741824
  suffix		"dc=my-domain,dc=com"
  rootdn		"cn=Manager,dc=my-domain,dc=com"
@@ -63,30 +64,18 @@
  #
  # Do not enable referrals until AFTER you have a working directory
  # service AND an understanding of referrals.
-@@ -26,22 +27,23 @@
- #
- # Load dynamic backend modules:
- #
--#dn: cn=module,cn=config
--#objectClass: olcModuleList
--#cn: module
--#olcModulepath:	%MODULEDIR%
--#olcModuleload:	back_bdb.la
--#olcModuleload:	back_hdb.la
+@@ -29,16 +30,16 @@
+ dn: cn=module,cn=config
+ objectClass: olcModuleList
+ cn: module
+-olcModulepath:	%MODULEDIR%
+-olcModuleload:	back_mdb.la
 -#olcModuleload:	back_ldap.la
 -#olcModuleload:	back_passwd.la
--#olcModuleload:	back_shell.la
-+dn: cn=module,cn=config
-+objectClass: olcModuleList
-+cn: module
 +olcModulepath:	/usr/lib/openldap
-+#olcModuleload:	back_bdb.so
-+#olcModuleload:	back_hdb.so
-+#olcModuleload:	back_ldap.so
 +olcModuleload:	back_mdb.so
++#olcModuleload:	back_ldap.so
 +#olcModuleload:	back_passwd.so
-+#olcModuleload:	back_shell.so
- 
  
  dn: cn=schema,cn=config
  objectClass: olcSchemaConfig
@@ -97,7 +86,7 @@
  
  # Frontend settings
  #
-@@ -83,13 +85,16 @@
+@@ -81,13 +82,16 @@
  olcDatabase: mdb
  olcSuffix: dc=my-domain,dc=com
  olcRootDN: cn=Manager,dc=my-domain,dc=com
-- 
cgit v1.2.3-70-g09d2