From dadb2364fa576f1b9d7e01fe26de6fae296c5844 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" 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/fix-manpages.patch | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'user/openldap/fix-manpages.patch') diff --git a/user/openldap/fix-manpages.patch b/user/openldap/fix-manpages.patch index 179569494..03c925537 100644 --- a/user/openldap/fix-manpages.patch +++ b/user/openldap/fix-manpages.patch @@ -8,7 +8,7 @@ diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1 index 3def6da..466c772 100644 --- a/doc/man/man1/ldapmodify.1 +++ b/doc/man/man1/ldapmodify.1 -@@ -397,8 +397,7 @@ exit status and a diagnostic message being written to standard error. +@@ -382,8 +382,7 @@ exit status and a diagnostic message being written to standard error. .BR ldap_add_ext (3), .BR ldap_delete_ext (3), .BR ldap_modify_ext (3), @@ -18,18 +18,6 @@ index 3def6da..466c772 100644 .SH AUTHOR The OpenLDAP Project .SH ACKNOWLEDGEMENTS -diff --git a/doc/man/man5/ldap.conf.5 b/doc/man/man5/ldap.conf.5 -index cfde143..63592cb 100644 ---- a/doc/man/man5/ldap.conf.5 -+++ b/doc/man/man5/ldap.conf.5 -@@ -317,6 +317,7 @@ certificates in separate individual files. The - .B TLS_CACERT - is always used before - .B TLS_CACERTDIR. -+The specified directory must be managed with the LibreSSL c_rehash utility. - This parameter is ignored with GnuTLS. - - When using Mozilla NSS, may contain a Mozilla NSS cert/key diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8 index b739f4d..e2a1a00 100644 --- a/doc/man/man8/slapd.8 @@ -41,9 +29,9 @@ index b739f4d..e2a1a00 100644 -.B LIBEXECDIR/slapd +.B slapd [\c - .BR \-4 | \-6 ] + .BR \-V [ V [ V ]] [\c -@@ -317,7 +317,7 @@ the LDAP databases defined in the default config file, just type: +@@ -332,7 +332,7 @@ the LDAP databases defined in the default config file, just type: .LP .nf .ft tt @@ -52,7 +40,7 @@ index b739f4d..e2a1a00 100644 .ft .fi .LP -@@ -328,7 +328,7 @@ on voluminous debugging which will be printed on standard error, type: +@@ -343,7 +343,7 @@ on voluminous debugging which will be printed on standard error, type: .LP .nf .ft tt @@ -61,7 +49,7 @@ index b739f4d..e2a1a00 100644 .ft .fi .LP -@@ -336,7 +336,7 @@ To test whether the configuration file is correct or not, type: +@@ -351,7 +351,7 @@ To test whether the configuration file is correct or not, type: .LP .nf .ft tt -- cgit v1.2.3-70-g09d2