@crossbind/port-curl-ios 2.0.0-beta.56 → 2.0.0-beta.58

package/dist/prebuilt/ios-iphonesimulator-mt-release/include/curl/curl.h

@@ -93,7 +93,9 @@
     defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \
    (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \
    (defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000)) || \
-    defined(__sun__) || defined(__serenity__) || defined(__vxworks__)
+    defined(__sun__) || defined(__serenity__) || defined(__vxworks__) || \
+   (defined(__linux__) && defined(_POSIX_C_SOURCE) && \
+    _POSIX_C_SOURCE >= 200112L)
 #include <sys/select.h>
 #endif
 
@@ -632,7 +634,7 @@ typedef enum {
                                      match */
   CURLE_SSL_INVALIDCERTSTATUS,   /* 91 - invalid certificate status */
   CURLE_HTTP2_STREAM,            /* 92 - stream error in HTTP/2 framing layer
-                                    */
+                                  */
   CURLE_RECURSIVE_API_CALL,      /* 93 - an api function was called from
                                     inside a callback */
   CURLE_AUTH_ERROR,              /* 94 - an authentication function returned an
@@ -843,12 +845,20 @@ typedef enum {
 #endif
 #define CURLAUTH_BEARER       (((unsigned long)1) << 6)
 #define CURLAUTH_AWS_SIGV4    (((unsigned long)1) << 7)
+#define CURLAUTH_HTTPSIG      (((unsigned long)1) << 8)
 #define CURLAUTH_ONLY         (((unsigned long)1) << 31)
-#define CURLAUTH_ANY          ((~CURLAUTH_DIGEST_IE) & \
+#define CURLAUTH_ANY          ((~(CURLAUTH_DIGEST_IE |                  \
+                                  CURLAUTH_HTTPSIG)) &                  \
                                ((unsigned long)0xffffffff))
-#define CURLAUTH_ANYSAFE      ((~(CURLAUTH_BASIC | CURLAUTH_DIGEST_IE)) & \
+#define CURLAUTH_ANYSAFE      ((~(CURLAUTH_BASIC | CURLAUTH_DIGEST_IE | \
+                                  CURLAUTH_HTTPSIG)) &                  \
                                ((unsigned long)0xffffffff))
 
+/* constants for CURLOPT_HTTPSIG_ALGORITHM */
+#define CURLHTTPSIG_NONE          0L
+#define CURLHTTPSIG_ED25519       1L
+#define CURLHTTPSIG_HMAC_SHA256   2L
+
 /* all types supported by server */
 #define CURLSSH_AUTH_ANY       ((unsigned long)0xffffffff)
 #define CURLSSH_AUTH_NONE      0L        /* none allowed, silly but complete */
@@ -1537,8 +1547,7 @@ typedef enum {
 
   /* FTP Option that causes missing dirs to be created on the remote server.
      In 7.19.4 we introduced the convenience enums for this option using the
-     CURLFTP_CREATE_DIR prefix.
-  */
+     CURLFTP_CREATE_DIR prefix. */
   CURLOPT(CURLOPT_FTP_CREATE_MISSING_DIRS, CURLOPTTYPE_LONG, 110),
 
   /* Set this to a bitmask value to enable the particular authentications
@@ -1589,7 +1598,7 @@ typedef enum {
      CURLUSESSL_TRY     - try using SSL, proceed anyway otherwise
      CURLUSESSL_CONTROL - SSL for the control connection or fail
      CURLUSESSL_ALL     - SSL for all communication or fail
-  */
+   */
   CURLOPT(CURLOPT_USE_SSL, CURLOPTTYPE_VALUES, 119),
 
   /* The _LARGE version of the standard POSTFIELDSIZE option */
@@ -1615,7 +1624,7 @@ typedef enum {
      CURLFTPAUTH_DEFAULT - let libcurl decide
      CURLFTPAUTH_SSL     - try "AUTH SSL" first, then TLS
      CURLFTPAUTH_TLS     - try "AUTH TLS" first, then SSL
-  */
+   */
   CURLOPT(CURLOPT_FTPSSLAUTH, CURLOPTTYPE_VALUES, 129),
 
   CURLOPTDEPRECATED(CURLOPT_IOCTLFUNCTION, CURLOPTTYPE_FUNCTIONPOINT, 130,
@@ -1650,8 +1659,7 @@ typedef enum {
   CURLOPT(CURLOPT_LOCALPORT, CURLOPTTYPE_LONG, 139),
 
   /* Number of ports to try, including the first one set with LOCALPORT.
-     Thus, setting it to 1 makes no additional attempts but the first.
-  */
+     Thus, setting it to 1 makes no additional attempts but the first. */
   CURLOPT(CURLOPT_LOCALPORTRANGE, CURLOPTTYPE_LONG, 140),
 
   /* no transfer, set up connection and let application use the socket by
@@ -1863,13 +1871,16 @@ typedef enum {
   CURLOPT(CURLOPT_RESOLVE, CURLOPTTYPE_SLISTPOINT, 203),
 
   /* Set a username for authenticated TLS */
-  CURLOPT(CURLOPT_TLSAUTH_USERNAME, CURLOPTTYPE_STRINGPOINT, 204),
+  CURLOPTDEPRECATED(CURLOPT_TLSAUTH_USERNAME, CURLOPTTYPE_STRINGPOINT, 204,
+                    8.22.0, "Support was removed"),
 
   /* Set a password for authenticated TLS */
-  CURLOPT(CURLOPT_TLSAUTH_PASSWORD, CURLOPTTYPE_STRINGPOINT, 205),
+  CURLOPTDEPRECATED(CURLOPT_TLSAUTH_PASSWORD, CURLOPTTYPE_STRINGPOINT, 205,
+                    8.22.0, "Support was removed"),
 
   /* Set authentication type for authenticated TLS */
-  CURLOPT(CURLOPT_TLSAUTH_TYPE, CURLOPTTYPE_STRINGPOINT, 206),
+  CURLOPTDEPRECATED(CURLOPT_TLSAUTH_TYPE, CURLOPTTYPE_STRINGPOINT, 206,
+                    8.22.0, "Support was removed"),
 
   /* Set to 1 to enable the "TE:" header in HTTP requests to ask for
      compressed transfer-encoded responses. Set to 0 to disable the use of TE:
@@ -2030,13 +2041,16 @@ typedef enum {
   CURLOPT(CURLOPT_PROXY_SSLVERSION, CURLOPTTYPE_VALUES, 250),
 
   /* Set a username for authenticated TLS for proxy */
-  CURLOPT(CURLOPT_PROXY_TLSAUTH_USERNAME, CURLOPTTYPE_STRINGPOINT, 251),
+  CURLOPTDEPRECATED(CURLOPT_PROXY_TLSAUTH_USERNAME, CURLOPTTYPE_STRINGPOINT,
+                    251, 8.22.0, "Support was removed"),
 
   /* Set a password for authenticated TLS for proxy */
-  CURLOPT(CURLOPT_PROXY_TLSAUTH_PASSWORD, CURLOPTTYPE_STRINGPOINT, 252),
+  CURLOPTDEPRECATED(CURLOPT_PROXY_TLSAUTH_PASSWORD, CURLOPTTYPE_STRINGPOINT,
+                    252, 8.22.0, "Support was removed"),
 
   /* Set authentication type for authenticated TLS for proxy */
-  CURLOPT(CURLOPT_PROXY_TLSAUTH_TYPE, CURLOPTTYPE_STRINGPOINT, 253),
+  CURLOPTDEPRECATED(CURLOPT_PROXY_TLSAUTH_TYPE, CURLOPTTYPE_STRINGPOINT, 253,
+                    8.22.0, "Support was removed"),
 
   /* name of the file keeping your private SSL-certificate for proxy */
   CURLOPT(CURLOPT_PROXY_SSLCERT, CURLOPTTYPE_STRINGPOINT, 254),
@@ -2262,6 +2276,18 @@ typedef enum {
   /* set TLS supported signature algorithms */
   CURLOPT(CURLOPT_SSL_SIGNATURE_ALGORITHMS, CURLOPTTYPE_STRINGPOINT, 328),
 
+  /* RFC 9421 HTTP Message Signatures algorithm */
+  CURLOPT(CURLOPT_HTTPSIG_ALGORITHM, CURLOPTTYPE_VALUES, 329),
+
+  /* Hex-encoded key for HTTP Message Signatures */
+  CURLOPT(CURLOPT_HTTPSIG_KEY, CURLOPTTYPE_STRINGPOINT, 330),
+
+  /* Key identifier for HTTP Message Signatures */
+  CURLOPT(CURLOPT_HTTPSIG_KEYID, CURLOPTTYPE_STRINGPOINT, 331),
+
+  /* Space-separated list of components to sign for HTTP Message Signatures */
+  CURLOPT(CURLOPT_HTTPSIG_HEADERS, CURLOPTTYPE_STRINGPOINT, 332),
+
   CURLOPT_LASTENTRY /* the last unused */
 } CURLoption;
 

package/dist/prebuilt/ios-iphonesimulator-mt-release/include/curl/curlver.h

@@ -32,12 +32,12 @@
 
 /* This is the version number of the libcurl package from which this header
    file origins: */
-#define LIBCURL_VERSION "8.21.0"
+#define LIBCURL_VERSION "8.22.0"
 
 /* The numeric version number is also available "in parts" by using these
    defines: */
 #define LIBCURL_VERSION_MAJOR 8
-#define LIBCURL_VERSION_MINOR 21
+#define LIBCURL_VERSION_MINOR 22
 #define LIBCURL_VERSION_PATCH 0
 /* This is the numeric version of the libcurl version number, meant for easier
    parsing and comparisons by programs. The LIBCURL_VERSION_NUM define always
@@ -56,9 +56,8 @@
 
    Note: This define is the full hex number and _does not_ use the
    CURL_VERSION_BITS() macro since curl's own configure script greps for it
-   and needs it to contain the full number.
-*/
-#define LIBCURL_VERSION_NUM 0x081500
+   and needs it to contain the full number. */
+#define LIBCURL_VERSION_NUM 0x081600
 
 /*
  * This is the date and time when the full source package was created. The
@@ -69,7 +68,7 @@
  *
  * "2007-11-23"
  */
-#define LIBCURL_TIMESTAMP "2026-06-24"
+#define LIBCURL_TIMESTAMP "2026-09-02"
 
 #define CURL_VERSION_BITS(x, y, z) ((x) << 16 | (y) << 8 | (z))
 #define CURL_AT_LEAST_VERSION(x, y, z) \

package/dist/prebuilt/ios-iphonesimulator-mt-release/include/curl/multi.h

@@ -24,20 +24,20 @@
  *
  ***************************************************************************/
 /*
-  This is an "external" header file. Do not give away any internals here!
-
-  GOALS
-
-  o Enable a "pull" interface. The application that uses libcurl decides where
-    and when to ask libcurl to get/send data.
-
-  o Enable multiple simultaneous transfers in the same thread without making it
-    complicated for the application.
-
-  o Enable the application to select() on its own file descriptors and curl's
-    file descriptors simultaneous easily.
-
-*/
+ * This is an "external" header file. Do not give away any internals here!
+ *
+ * GOALS
+ *
+ * o Enable a "pull" interface. The application that uses libcurl decides where
+ *   and when to ask libcurl to get/send data.
+ *
+ * o Enable multiple simultaneous transfers in the same thread without making
+ *   it complicated for the application.
+ *
+ * o Enable the application to select() on its own file descriptors and curl's
+ *   file descriptors simultaneous easily.
+ *
+ */
 
 /*
  * This header file should not really need to include "curl.h" since curl.h

package/dist/prebuilt/ios-iphonesimulator-mt-release/include/curl/typecheck-gcc.h

@@ -496,6 +496,9 @@ CURLWARNING(Wcurl_easy_getinfo_err_curl_off_t,
    (option) == CURLOPT_USERAGENT ||                                     \
    (option) == CURLOPT_USERNAME ||                                      \
    (option) == CURLOPT_AWS_SIGV4 ||                                     \
+   (option) == CURLOPT_HTTPSIG_HEADERS ||                               \
+   (option) == CURLOPT_HTTPSIG_KEY ||                                   \
+   (option) == CURLOPT_HTTPSIG_KEYID ||                                 \
    (option) == CURLOPT_USERPWD ||                                       \
    (option) == CURLOPT_XOAUTH2_BEARER ||                                \
    0)
@@ -605,9 +608,10 @@ CURLWARNING(Wcurl_easy_getinfo_err_curl_off_t,
  * == or whatsoever.
  */
 
-/* XXX: should evaluate to true if expr is a pointer */
+/* XXX: should evaluate to true if expr is a pointer or a char[] array */
 #define curlcheck_any_ptr(expr)                                         \
-  (sizeof(expr) == sizeof(void *))
+  (sizeof(expr) == sizeof(void *) ||                                    \
+   __builtin_types_compatible_p(__typeof__(expr), char[]))
 
 /* evaluates to true if expr is NULL */
 /* XXX: must not evaluate expr, so this check is not accurate */
@@ -674,7 +678,7 @@ CURLWARNING(Wcurl_easy_getinfo_err_curl_off_t,
   (__builtin_types_compatible_p(__typeof__(expr), curl_off_t))
 
 /* evaluates to true if expr is abuffer suitable for CURLOPT_ERRORBUFFER */
-/* XXX: also check size of an char[] array? */
+/* XXX: also check size of a char[] array? */
 #define curlcheck_error_buffer(expr)                                    \
   (curlcheck_NULL(expr) ||                                              \
    __builtin_types_compatible_p(__typeof__(expr), char *) ||            \

package/dist/prebuilt/ios-iphonesimulator-mt-release/include/curl/urlapi.h

@@ -64,6 +64,7 @@ typedef enum {
   CURLUE_BAD_USER,            /* 29 */
   CURLUE_LACKS_IDN,           /* 30 */
   CURLUE_TOO_LARGE,           /* 31 */
+  CURLUE_BACKSLASH,           /* 32 */
   CURLUE_LAST
 } CURLUcode;
 

package/dist/prebuilt/ios-iphonesimulator-mt-release/lib/cmake/CURL/CURLConfig.cmake

@@ -54,7 +54,7 @@ option(CURL_USE_PKGCONFIG "Enable pkg-config to detect CURL dependencies. Defaul
 
 if(CMAKE_VERSION VERSION_LESS 3.18)
   message(STATUS "CURL: CURL-specific Find modules require "
-    "CMake 3.18 or upper, found: ${CMAKE_VERSION}.")
+    "CMake 3.18 or greater, found: ${CMAKE_VERSION}.")
 endif()
 
 include(CMakeFindDependencyMacro)
@@ -98,7 +98,7 @@ if("")
   list(APPEND _curl_libs CURL::cares)
 endif()
 if("")
-  find_dependency(GSS MODULE)
+  find_dependency(GSS MODULE COMPONENTS "")
   list(APPEND _curl_libs CURL::gss)
 endif()
 if("")
@@ -188,13 +188,13 @@ if(NOT TARGET CURL::libcurl)
 endif()
 
 # For compatibility with CMake's FindCURL.cmake
-set(CURL_VERSION_STRING "8.21.0")
+set(CURL_VERSION_STRING "8.22.0")
 set(CURL_LIBRARIES CURL::libcurl)
 set(CURL_LIBRARIES_PRIVATE "/Users/runner/work/crossbind/crossbind/ports/openssl/ios/ssl.xcframework/ios-arm64-simulator/libssl.a;/Users/runner/work/crossbind/crossbind/ports/openssl/ios/crypto.xcframework/ios-arm64-simulator/libcrypto.a;/Users/runner/work/crossbind/crossbind/ports/openssl/ios/crypto.xcframework/ios-arm64-simulator/libcrypto.a;/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/lib/libz.tbd")
 set_and_check(CURL_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include")
 
 set(CURL_SUPPORTED_PROTOCOLS "DICT;FILE;FTP;FTPS;GOPHER;GOPHERS;HTTP;HTTPS;IMAP;IMAPS;IPFS;IPNS;MQTT;MQTTS;POP3;POP3S;RTSP;SMTP;SMTPS;TELNET;TFTP;WS;WSS")
-set(CURL_SUPPORTED_FEATURES "alt-svc;AsynchDNS;HSTS;HTTPS-proxy;Largefile;libz;SSL;threadsafe;TLS-SRP;UnixSockets")
+set(CURL_SUPPORTED_FEATURES "alt-svc;AsynchDNS;HSTS;HTTPS-proxy;Largefile;libz;SSL;threadsafe;UnixSockets")
 
 foreach(_curl_item IN LISTS CURL_SUPPORTED_PROTOCOLS CURL_SUPPORTED_FEATURES)
   set(CURL_SUPPORTS_${_curl_item} TRUE)

package/dist/prebuilt/ios-iphonesimulator-mt-release/lib/cmake/CURL/CURLConfigVersion.cmake

@@ -15,19 +15,19 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "8.21.0")
+set(PACKAGE_VERSION "8.22.0")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("8.21.0" MATCHES "^([0-9]+)\\.")
+  if("8.22.0" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "8.21.0")
+    set(CVF_VERSION_MAJOR "8.22.0")
   endif()
 
   if(PACKAGE_FIND_VERSION_RANGE)

package/dist/prebuilt/ios-iphonesimulator-mt-release/lib/cmake/CURL/FindGSS.cmake

@@ -23,6 +23,10 @@
 ###########################################################################
 # Find the GSS Kerberos library
 #
+# This module accepts optional COMPONENTS to control the GSS library flavor:
+#
+# - Apple
+#
 # Input variables:
 #
 # - `GSS_ROOT_DIR`:  Absolute path to the root installation of GSS. (also supported as environment)
@@ -32,7 +36,7 @@
 # - `GSS_FOUND`:     System has GSS.
 # - `GSS_VERSION`:   Version of GSS.
 # - `CURL::gss`:     GSS library target.
-#   - `INTERFACE_CURL_GSS_FLAVOR`: Custom property. "GNU" or "MIT" if detected.
+#   - `INTERFACE_CURL_GSS_FLAVOR`: Custom property. "Apple", "GNU" or "MIT" if detected.
 
 set(_gnu_modname "gss")
 set(_mit_modname "mit-krb5-gssapi")
@@ -46,8 +50,12 @@ set(_gss_root_hints "${GSS_ROOT_DIR}" "$ENV{GSS_ROOT_DIR}")
 set(_gss_CFLAGS "")
 set(_gss_LIBRARY_DIRS "")
 
+if(NOT APPLE AND GSS_FIND_COMPONENTS STREQUAL "Apple")
+  set(GSS_FIND_COMPONENTS "")
+endif()
+
 # Try to find library using system pkg-config if user did not specify root dir
-if(NOT GSS_ROOT_DIR AND NOT "$ENV{GSS_ROOT_DIR}")
+if(NOT GSS_ROOT_DIR AND NOT "$ENV{GSS_ROOT_DIR}" AND NOT GSS_FIND_COMPONENTS STREQUAL "Apple")
   if(CURL_USE_PKGCONFIG)
     find_package(PkgConfig QUIET)
     pkg_search_module(_gss ${_mit_modname} ${_gnu_modname})
@@ -60,136 +68,146 @@ if(NOT GSS_ROOT_DIR AND NOT "$ENV{GSS_ROOT_DIR}")
 endif()
 
 if(NOT _gss_FOUND)  # Not found by pkg-config. Let us take more traditional approach.
-  find_file(_gss_configure_script NAMES "krb5-config" PATH_SUFFIXES "bin" HINTS ${_gss_root_hints}
-    NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
-  # If not found in user-supplied directories, maybe system knows better
-  find_file(_gss_configure_script NAMES "krb5-config" PATH_SUFFIXES "bin")
-
-  if(_gss_configure_script)
-
-    set(_gss_INCLUDE_DIRS "")
-    set(_gss_LIBRARIES "")
-
-    execute_process(COMMAND ${_gss_configure_script} "--cflags" "gssapi"
-      OUTPUT_VARIABLE _gss_cflags_raw
-      RESULT_VARIABLE _gss_configure_failed
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-    message(STATUS "FindGSS krb5-config --cflags: ${_gss_cflags_raw}")
-
-    if(NOT _gss_configure_failed)  # 0 means success
-      # Should also work in an odd case when multiple directories are given.
-      string(STRIP "${_gss_cflags_raw}" _gss_cflags_raw)
-      string(REGEX REPLACE " +-(I)" ";-\\1" _gss_cflags_raw "${_gss_cflags_raw}")
-      string(REGEX REPLACE " +-([^I][^ \\t;]*)" ";-\\1" _gss_cflags_raw "${_gss_cflags_raw}")
-
-      foreach(_flag IN LISTS _gss_cflags_raw)
-        if(_flag MATCHES "^-I")
-          string(REGEX REPLACE "^-I" "" _flag "${_flag}")
-          list(APPEND _gss_INCLUDE_DIRS "${_flag}")
-        else()
-          list(APPEND _gss_CFLAGS "${_flag}")
-        endif()
-      endforeach()
-    endif()
+  if(GSS_FIND_COMPONENTS STREQUAL "Apple")
+    find_path(_gss_INCLUDE_DIRS NAMES "GSS/gssapi.h" PATH_SUFFIXES "include")
+    find_library(_gss_LIBRARIES NAMES "GSS")
 
-    execute_process(COMMAND ${_gss_configure_script} "--libs" "gssapi"
-      OUTPUT_VARIABLE _gss_lib_flags
-      RESULT_VARIABLE _gss_configure_failed
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-    message(STATUS "FindGSS krb5-config --libs: ${_gss_lib_flags}")
-
-    if(NOT _gss_configure_failed)  # 0 means success
-      # This script gives us libraries and link directories.
-      string(STRIP "${_gss_lib_flags}" _gss_lib_flags)
-      string(REGEX REPLACE " +-(L|l)" ";-\\1" _gss_lib_flags "${_gss_lib_flags}")
-      string(REGEX REPLACE " +-([^Ll][^ \\t;]*)" ";-\\1" _gss_lib_flags "${_gss_lib_flags}")
-
-      foreach(_flag IN LISTS _gss_lib_flags)
-        if(_flag MATCHES "^-l")
-          string(REGEX REPLACE "^-l" "" _flag "${_flag}")
-          list(APPEND _gss_LIBRARIES "${_flag}")
-        elseif(_flag MATCHES "^-L")
-          string(REGEX REPLACE "^-L" "" _flag "${_flag}")
-          list(APPEND _gss_LIBRARY_DIRS "${_flag}")
-        endif()
-      endforeach()
+    if(_gss_INCLUDE_DIRS AND _gss_LIBRARIES)
+      message(STATUS "Found AppleGSS: ${_gss_INCLUDE_DIRS}")
+      set(_gss_flavor "Apple")
     endif()
+  else()
+    find_file(_gss_configure_script NAMES "krb5-config" PATH_SUFFIXES "bin" HINTS ${_gss_root_hints}
+      NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
+    # If not found in user-supplied directories, maybe system knows better
+    find_file(_gss_configure_script NAMES "krb5-config" PATH_SUFFIXES "bin")
 
-    execute_process(COMMAND ${_gss_configure_script} "--version"
-      OUTPUT_VARIABLE _gss_version
-      RESULT_VARIABLE _gss_configure_failed
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    # Older versions may not have the "--version" parameter. In this case we do not care.
-    if(_gss_configure_failed)
-      set(_gss_version 0)
-    else()
-      # Strip prefix string to leave the version number only
-      string(REPLACE "Kerberos 5 release " "" _gss_version "${_gss_version}")
-    endif()
+    if(_gss_configure_script)
 
-    execute_process(COMMAND ${_gss_configure_script} "--vendor"
-      OUTPUT_VARIABLE _gss_vendor
-      RESULT_VARIABLE _gss_configure_failed
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
+      set(_gss_INCLUDE_DIRS "")
+      set(_gss_LIBRARIES "")
 
-    # Older versions may not have the "--vendor" parameter. In this case we do not care.
-    if(NOT _gss_configure_failed AND NOT _gss_vendor MATCHES "Heimdal|heimdal")
-      set(_gss_flavor "MIT")  # assume a default, should not really matter
-    endif()
+      execute_process(COMMAND ${_gss_configure_script} "--cflags" "gssapi"
+        OUTPUT_VARIABLE _gss_cflags_raw
+        RESULT_VARIABLE _gss_configure_failed
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+      message(STATUS "FindGSS krb5-config --cflags: ${_gss_cflags_raw}")
 
-  else()  # Either there is no config script or we are on a platform that does not provide one (Windows?)
+      if(NOT _gss_configure_failed)  # 0 means success
+        # Should also work in an odd case when multiple directories are given.
+        string(STRIP "${_gss_cflags_raw}" _gss_cflags_raw)
+        string(REGEX REPLACE " +-(I)" ";-\\1" _gss_cflags_raw "${_gss_cflags_raw}")
+        string(REGEX REPLACE " +-([^I][^ \\t;]*)" ";-\\1" _gss_cflags_raw "${_gss_cflags_raw}")
 
-    find_path(_gss_INCLUDE_DIRS NAMES "gssapi/gssapi.h" HINTS ${_gss_root_hints} PATH_SUFFIXES "include" "inc")
+        foreach(_flag IN LISTS _gss_cflags_raw)
+          if(_flag MATCHES "^-I")
+            string(REGEX REPLACE "^-I" "" _flag "${_flag}")
+            list(APPEND _gss_INCLUDE_DIRS "${_flag}")
+          else()
+            list(APPEND _gss_CFLAGS "${_flag}")
+          endif()
+        endforeach()
+      endif()
 
-    if(_gss_INCLUDE_DIRS)  # We have found something
-      set(_gss_libdir_suffixes "")
+      execute_process(COMMAND ${_gss_configure_script} "--libs" "gssapi"
+        OUTPUT_VARIABLE _gss_lib_flags
+        RESULT_VARIABLE _gss_configure_failed
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+      message(STATUS "FindGSS krb5-config --libs: ${_gss_lib_flags}")
 
-      cmake_push_check_state()
-      list(APPEND CMAKE_REQUIRED_INCLUDES "${_gss_INCLUDE_DIRS}")
-      check_include_files("gssapi/gssapi_generic.h;gssapi/gssapi_krb5.h" _gss_have_mit_headers)
-      cmake_pop_check_state()
+      if(NOT _gss_configure_failed)  # 0 means success
+        # This script gives us libraries and link directories.
+        string(STRIP "${_gss_lib_flags}" _gss_lib_flags)
+        string(REGEX REPLACE " +-(L|l)" ";-\\1" _gss_lib_flags "${_gss_lib_flags}")
+        string(REGEX REPLACE " +-([^Ll][^ \\t;]*)" ";-\\1" _gss_lib_flags "${_gss_lib_flags}")
 
-      if(_gss_have_mit_headers)
-        set(_gss_flavor "MIT")
-        if(WIN32)
-          if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-            list(APPEND _gss_libdir_suffixes "lib/AMD64")
-            set(_gss_libname "gssapi64")
-          else()
-            list(APPEND _gss_libdir_suffixes "lib/i386")
-            set(_gss_libname "gssapi32")
+        foreach(_flag IN LISTS _gss_lib_flags)
+          if(_flag MATCHES "^-l")
+            string(REGEX REPLACE "^-l" "" _flag "${_flag}")
+            list(APPEND _gss_LIBRARIES "${_flag}")
+          elseif(_flag MATCHES "^-L")
+            string(REGEX REPLACE "^-L" "" _flag "${_flag}")
+            list(APPEND _gss_LIBRARY_DIRS "${_flag}")
           endif()
-        else()
-          list(APPEND _gss_libdir_suffixes "lib" "lib64")  # those suffixes are not checked for HINTS
-          set(_gss_libname "gssapi_krb5")
-        endif()
+        endforeach()
       endif()
-    else()
-      find_path(_gss_INCLUDE_DIRS NAMES "gss.h" HINTS ${_gss_root_hints} PATH_SUFFIXES "include")
 
-      if(_gss_INCLUDE_DIRS)
-        set(_gss_flavor "GNU")
-        set(_gss_pc_requires ${_gnu_modname})
-        set(_gss_libname "gss")
+      execute_process(COMMAND ${_gss_configure_script} "--version"
+        OUTPUT_VARIABLE _gss_version
+        RESULT_VARIABLE _gss_configure_failed
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+      # Older versions may not have the "--version" parameter. In this case we do not care.
+      if(_gss_configure_failed)
+        set(_gss_version 0)
+      else()
+        # Strip prefix string to leave the version number only
+        string(REPLACE "Kerberos 5 release " "" _gss_version "${_gss_version}")
       endif()
-    endif()
 
-    # If we have headers, look up libraries
-    if(_gss_flavor)
-      set(_gss_libdir_hints ${_gss_root_hints})
-      if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
-        cmake_path(GET _gss_INCLUDE_DIRS PARENT_PATH _gss_calculated_potential_root)
+      execute_process(COMMAND ${_gss_configure_script} "--vendor"
+        OUTPUT_VARIABLE _gss_vendor
+        RESULT_VARIABLE _gss_configure_failed
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+      # Older versions may not have the "--vendor" parameter. In this case we do not care.
+      if(NOT _gss_configure_failed AND NOT _gss_vendor MATCHES "Heimdal|heimdal")
+        set(_gss_flavor "MIT")  # assume a default, should not really matter
+      endif()
+
+    else()  # Either there is no config script or we are on a platform that does not provide one (Windows?)
+
+      find_path(_gss_INCLUDE_DIRS NAMES "gssapi/gssapi.h" HINTS ${_gss_root_hints} PATH_SUFFIXES "include" "inc")
+
+      if(_gss_INCLUDE_DIRS)  # We have found something
+        set(_gss_libdir_suffixes "")
+
+        cmake_push_check_state()
+        list(APPEND CMAKE_REQUIRED_INCLUDES "${_gss_INCLUDE_DIRS}")
+        check_include_files("gssapi/gssapi_generic.h;gssapi/gssapi_krb5.h" _gss_have_mit_headers)
+        cmake_pop_check_state()
+
+        if(_gss_have_mit_headers)
+          set(_gss_flavor "MIT")
+          if(WIN32)
+            if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+              list(APPEND _gss_libdir_suffixes "lib/AMD64")
+              set(_gss_libname "gssapi64")
+            else()
+              list(APPEND _gss_libdir_suffixes "lib/i386")
+              set(_gss_libname "gssapi32")
+            endif()
+          else()
+            list(APPEND _gss_libdir_suffixes "lib" "lib64")  # those suffixes are not checked for HINTS
+            set(_gss_libname "gssapi_krb5")
+          endif()
+        endif()
       else()
-        get_filename_component(_gss_calculated_potential_root "${_gss_INCLUDE_DIRS}" DIRECTORY)
+        find_path(_gss_INCLUDE_DIRS NAMES "gss.h" HINTS ${_gss_root_hints} PATH_SUFFIXES "include")
+
+        if(_gss_INCLUDE_DIRS)
+          set(_gss_flavor "GNU")
+          set(_gss_pc_requires ${_gnu_modname})
+          set(_gss_libname "gss")
+        endif()
       endif()
-      list(APPEND _gss_libdir_hints ${_gss_calculated_potential_root})
 
-      find_library(_gss_LIBRARIES NAMES ${_gss_libname} HINTS ${_gss_libdir_hints} PATH_SUFFIXES ${_gss_libdir_suffixes})
+      # If we have headers, look up libraries
+      if(_gss_flavor)
+        set(_gss_libdir_hints ${_gss_root_hints})
+        if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
+          cmake_path(GET _gss_INCLUDE_DIRS PARENT_PATH _gss_calculated_potential_root)
+        else()
+          get_filename_component(_gss_calculated_potential_root "${_gss_INCLUDE_DIRS}" DIRECTORY)
+        endif()
+        list(APPEND _gss_libdir_hints ${_gss_calculated_potential_root})
+
+        find_library(_gss_LIBRARIES NAMES ${_gss_libname} HINTS ${_gss_libdir_hints} PATH_SUFFIXES ${_gss_libdir_suffixes})
+      endif()
     endif()
   endif()
   if(NOT _gss_flavor)
-    message(FATAL_ERROR "GNU or MIT GSS is required")
+    message(FATAL_ERROR "MIT, GNU or Apple GSS is required")
   endif()
 else()
   if(_gss_MODULE_NAME STREQUAL _gnu_modname)
@@ -199,7 +217,7 @@ else()
     set(_gss_flavor "MIT")
     set(_gss_pc_requires ${_mit_modname})
   else()
-    message(FATAL_ERROR "GNU or MIT GSS is required")
+    message(FATAL_ERROR "MIT, GNU or Apple GSS is required")
   endif()
   message(STATUS "Found GSS/${_gss_flavor} (via pkg-config): ${_gss_INCLUDE_DIRS} (found version \"${_gss_version}\")")
 endif()

package/dist/prebuilt/ios-iphonesimulator-mt-release/lib/cmake/CURL/FindLibgsasl.cmake

@@ -46,6 +46,7 @@ endif()
 if(_libgsasl_FOUND)
   set(Libgsasl_FOUND TRUE)
   set(LIBGSASL_FOUND TRUE)
+  set(LIBGSASL_VERSION ${_libgsasl_VERSION})
   message(STATUS "Found Libgsasl (via pkg-config): ${_libgsasl_INCLUDE_DIRS} (found version \"${LIBGSASL_VERSION}\")")
 else()
   find_path(LIBGSASL_INCLUDE_DIR NAMES "gsasl.h")