From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 16 Dec 2022 16:58:12 +0000 (+0000)
Subject: openldap: Update to 2.6.3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9b1e5cf5f59d08e611b7a2fb25ee2f66ebc12fa;p=ipfire-3.x.git

openldap: Update to 2.6.3

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/openldap/openldap.nm b/openldap/openldap.nm
index cb6a3a5e6..1faf968c1 100644
--- a/openldap/openldap.nm
+++ b/openldap/openldap.nm
@@ -4,11 +4,11 @@
 ###############################################################################
 
 name       = openldap
-version    = 2.4.44
+version    = 2.6.3
 release    = 1
 
 groups     = System/Daemons
-url        = http://www.openldap.org/
+url        = https://www.openldap.org/
 license    = OpenLDAP
 summary    = LDAP support libraries.
 
@@ -21,7 +21,7 @@ description
 	documentation for OpenLDAP.
 end
 
-source_dl  = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+source_dl  = https://mirror.eu.oneandone.net/software/openldap/openldap-release/
 sources    = %{thisapp}.tgz
 
 build
@@ -43,6 +43,7 @@ build
 		--libexecdir=%{libdir} \
 		--with-threads=posix \
 		--disable-perl \
+		--disable-wt \
 		--enable-dynamic \
 		--enable-crypt \
 		--enable-modules \
@@ -70,6 +71,7 @@ build
 		ln -svf	slapd %{BUILDROOT}/usr/sbin/slappasswd
 		ln -svf	slapd %{BUILDROOT}/usr/sbin/slapschema
 		ln -svf	slapd %{BUILDROOT}/usr/sbin/slaptest
+		ln -svf	slapd %{BUILDROOT}/usr/sbin/slapmodify
 
 		# Remove unneeded files.
 		rm -rvf %{BUILDROOT}%{sysconfidir}/slapd.{conf,ldif}
diff --git a/openldap/patches/openldap-2.4.17-disable_sys_err.patch b/openldap/patches/openldap-2.4.17-disable_sys_err.patch
deleted file mode 100644
index c1ab72de3..000000000
--- a/openldap/patches/openldap-2.4.17-disable_sys_err.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur openldap-2.4.16.org/include/ac/errno.h openldap-2.4.16/include/ac/errno.h
---- openldap-2.4.16.org/include/ac/errno.h	2009-01-22 01:00:52.000000000 +0100
-+++ openldap-2.4.16/include/ac/errno.h	2009-04-28 13:48:01.000000000 +0200
-@@ -36,12 +36,7 @@
- #undef _AC_ERRNO_UNKNOWN
- #define _AC_ERRNO_UNKNOWN "unknown error"
- 
--#ifdef HAVE_SYS_ERRLIST
--	/* this is thread safe */
--#	define	STRERROR(e) ( (e) > -1 && (e) < sys_nerr \
--			? sys_errlist[(e)] : _AC_ERRNO_UNKNOWN )
--
--#elif defined( HAVE_STRERROR )
-+#if defined( HAVE_STRERROR )
- 	/* this may not be thread safe */
- 	/* and, yes, some implementations of strerror may return NULL */
- #	define	STRERROR(e) ( strerror(e) \