[openldap] Update 2.6.10 (#45736)

ports/openldap/android.diff

@@ -0,0 +1,13 @@
+diff --git a/libraries/libldap/utf-8-conv.c b/libraries/libldap/utf-8-conv.c
+index 98ed58d..4bd5459 100644
+--- a/libraries/libldap/utf-8-conv.c
++++ b/libraries/libldap/utf-8-conv.c
+@@ -328,7 +328,7 @@ ldap_x_wcs_to_utf8s ( char *utf8str, const wchar_t *wcstr, size_t count )
+ 	return (p - utf8str);
+ }
+ 
+-#ifdef ANDROID
++#if 0
+ int wctomb(char *s, wchar_t wc) { return wcrtomb(s,wc,NULL); }
+ int mbtowc(wchar_t *pwc, const char *s, size_t n) { return mbrtowc(pwc, s, n, NULL); }
+ #endif

ports/openldap/cyrus-sasl.diff

@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index f01b7e6..c4a6faa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2008,14 +2008,13 @@ WITH_SASL=no
+ ol_link_sasl=no
+ ol_link_spasswd=no
+ if test $ol_with_cyrus_sasl != no ; then
++	PKG_CHECK_MODULES(SASL, libsasl2, [have_openssl=yes], [AC_MSG_FAILURE([OpenSSL is required])])
++	CFLAGS="$CFLAGS $SASL_CFLAGS"
+ 	AC_CHECK_HEADERS(sasl/sasl.h sasl.h)
+ 
+ 	if test $ac_cv_header_sasl_sasl_h = yes ||
+ 	   test $ac_cv_header_sasl_h = yes; then
+-		AC_CHECK_LIB(sasl2, sasl_client_init,
+-			[ol_link_sasl="-lsasl2"],
+-			[AC_CHECK_LIB(sasl, sasl_client_init,
+-				[ol_link_sasl="-lsasl"])])
++		ol_link_sasl="$SASL_LIBS"
+ 	fi
+ 
+ 	if test $ol_link_sasl = no ; then

ports/openldap/m4.patch

@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 71dd7a6..6741ec6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -38,6 +38,7 @@ m4_ifndef([PKG_PREREQ],
- 
- AC_CONFIG_AUX_DIR(build)dnl
- AC_CONFIG_MACRO_DIRS([build])
-+AC_CONFIG_MACRO_DIR([m4])
- 
- eval `$ac_aux_dir/version.sh`
- if test -z "$OL_STRING"; then

ports/openldap/portfile.cmake

@@ -1,24 +1,18 @@
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${VERSION}.tgz"
+         "https://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-${VERSION}.tgz"
     FILENAME "openldap-${VERSION}.tgz"
-    SHA512 b119d60e179b4e27e9285c7c485f5728ab65dca7010879ffba41530f11f8ba359ea5693a3d1b9bb7279b7b8954f51c12db50e29aa231a5fa0bef11c7d1b5773a
+    SHA512 18129ad9a385457941e3203de5f130fe2571701abf24592c5beffb01361aae3182c196b2cd48ffeecb792b9b0e5f82c8d92445a7ec63819084757bdedba63b20
 )
 
-vcpkg_list(SET EXTRA_PATCHES)
-
-# Check autoconf version < 2.70
-execute_process(COMMAND autoconf --version OUTPUT_VARIABLE AUTOCONF_VERSION_STR)
-if(NOT "${AUTOCONF_VERSION_STR}" STREQUAL "" AND "${AUTOCONF_VERSION_STR}" MATCHES ".*2\\.[0-6].*")
-    vcpkg_list(APPEND EXTRA_PATCHES m4.patch)
-endif()
-
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
+        android.diff
+        cyrus-sasl.diff
         openssl.patch
         subdirs.patch
-        ${EXTRA_PATCHES}
 )
 
 vcpkg_list(SET FEATURE_OPTIONS)
@@ -28,22 +22,20 @@ endif()
 
 if("cyrus-sasl" IN_LIST FEATURES)
     vcpkg_list(APPEND FEATURE_OPTIONS --with-cyrus-sasl)
-    message(
-" openldap currently requires the following libraries from the system package manager:
-    libsasl2-dev
-These can be installed on Ubuntu systems via sudo apt install libsasl2-dev"
-    )
 else()
     vcpkg_list(APPEND FEATURE_OPTIONS --without-cyrus-sasl)
 endif()
 
+if(VCPKG_TARGET_IS_ANDROID)
+    vcpkg_list(APPEND FEATURE_OPTIONS -with-yielding_select=yes)
+endif()
+
 # Disable build environment details in binaries
 set(ENV{SOURCE_DATE_EPOCH} "1659614616")
 
-vcpkg_configure_make(
+vcpkg_make_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_VERBOSE_FLAGS
-    AUTOCONFIG
+    AUTORECONF
     OPTIONS
         ${FEATURE_OPTIONS}
         --disable-cleartext
@@ -60,11 +52,10 @@ vcpkg_configure_make(
         ac_cv_lib_odbc32_SQLDriverConnect=no
 )
 
-vcpkg_build_make(BUILD_TARGET depend LOGFILE_ROOT depend)
-vcpkg_install_make()
+vcpkg_make_install(TARGETS depend install)
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

ports/openldap/vcpkg.json

@@ -1,16 +1,23 @@
 {
   "name": "openldap",
-  "version": "2.5.18",
-  "description": "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol. When using the cyrus-sasl feature on Linux, you need to install the libsasl2-dev development package.",
+  "version": "2.6.10",
+  "description": "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol.",
   "homepage": "https://www.openldap.org/software/",
   "license": "OLDAP-2.8",
   "supports": "!windows, (mingw & !x86)",
   "dependencies": [
-    "openssl"
+    "openssl",
+    {
+      "name": "vcpkg-make",
+      "host": true
+    }
   ],
   "features": {
     "cyrus-sasl": {
-      "description": "with Cyrus SASL support"
+      "description": "Enable Cyrus SASL support",
+      "dependencies": [
+        "cyrus-sasl"
+      ]
     },
     "tools": {
       "description": "Enable client tools"

versions/baseline.json

@@ -6945,7 +6945,7 @@
       "port-version": 0
     },
     "openldap": {
-      "baseline": "2.5.18",
+      "baseline": "2.6.10",
       "port-version": 0
     },
     "openmama": {

versions/o-/openldap.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b49c6475c57f176ace4dc3f4b2a62caf893025d3",
+      "version": "2.6.10",
+      "port-version": 0
+    },
     {
       "git-tree": "9863e8742d129ddc3f95382d56eae14c5bd5e551",
       "version": "2.5.18",