From 42b74b9016bdfefcc5b17287ca07f385334b941f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Mon, 28 Aug 2023 12:24:01 +0000
Subject: [PATCH] document securetransport and gssapi legacy status on mac
 target

---
 curl-autotools.sh | 12 +++++++++++-
 curl-cmake.sh     | 22 ++++++++++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/curl-autotools.sh b/curl-autotools.sh
index 72998a300..2652d53c1 100755
--- a/curl-autotools.sh
+++ b/curl-autotools.sh
@@ -106,7 +106,8 @@ _VER="$1"
         options="${options} --enable-ldap --enable-ldaps --with-ldap-lib=wldap32"
       else
         # ldap is auto-detected on mac, but without ldaps. Disable it
-        # rather than offering an insecure-only solution.
+        # rather than offering an insecure-only solution. In certain configs
+        # it also results in 'deprecated in macOS 10.11' compiler output.
         options="${options} --disable-ldap --disable-ldaps"
       fi
     fi
@@ -137,6 +138,10 @@ _VER="$1"
 
     if [ "${_OS}" = 'win' ]; then
       options="${options} --with-schannel"
+    elif [ "${_OS}" = 'mac' ]; then
+      # SecureTransport deprecated in 2019 (macOS 10.15 Catalina, iOS 13.0)
+    # options="${options} --with-secure-transport"
+      :
     fi
     CPPFLAGS="${CPPFLAGS} -DHAS_ALPN"
 
@@ -251,6 +256,11 @@ _VER="$1"
       LDFLAGS="${LDFLAGS} -L${_TOP}/gsasl/${_PP}/lib"
     else
       options="${options} --without-libgsasl"
+      if [ "${_OS}" = 'mac' ]; then
+        # GSS API deprecated in 2012-2013 (OS X 10.8 Mountain Lion / 10.9 Mavericks, iOS 7.0)
+      # options="${options} --with-gssapi"
+        :
+      fi
     fi
 
     if [ -d ../nghttp2 ]; then
diff --git a/curl-cmake.sh b/curl-cmake.sh
index 80fb54d84..44537de62 100755
--- a/curl-cmake.sh
+++ b/curl-cmake.sh
@@ -110,7 +110,8 @@ if [ "${CURL_VER_}" = '8.2.1' ]; then
         LIBS="${LIBS} -lwldap32"
       else
         # ldap is auto-detected on mac, but without ldaps. Disable it
-        # rather than offering an insecure-only solution.
+        # rather than offering an insecure-only solution. In certain configs
+        # it also results in 'deprecated in macOS 10.11' compiler output.
         options="${options} -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON"
       fi
     fi
@@ -181,6 +182,10 @@ if [ "${CURL_VER_}" = '8.2.1' ]; then
 
     if [ "${_OS}" = 'win' ]; then
       options="${options} -DCURL_USE_SCHANNEL=ON"
+    elif [ "${_OS}" = 'mac' ]; then
+      # SecureTransport deprecated in 2019 (macOS 10.15 Catalina, iOS 13.0)
+    # options="${options} -DCURL_USE_SECTRANSP=ON"
+      :
     fi
     CPPFLAGS="${CPPFLAGS} -DHAS_ALPN"
 
@@ -261,6 +266,10 @@ if [ "${CURL_VER_}" = '8.2.1' ]; then
       CPPFLAGS="${CPPFLAGS} -I${_TOP}/gsasl/${_PP}/include"
       LDFLAGS="${LDFLAGS} -L${_TOP}/gsasl/${_PP}/lib"
       LIBS="${LIBS} -lgsasl"
+    elif [ "${_OS}" = 'mac' ]; then
+      # GSS API deprecated in 2012-2013 (OS X 10.8 Mountain Lion / 10.9 Mavericks, iOS 7.0)
+    # options="${options} -DCURL_USE_GSSAPI=ON"
+      :
     fi
     if [ -d ../libidn2 ]; then
       options="${options} -DUSE_LIBIDN2=ON"
@@ -450,7 +459,8 @@ else
       LIBS="${LIBS} -lwldap32"
     else
       # ldap is auto-detected on mac, but without ldaps. Disable it
-      # rather than offering an insecure-only solution.
+      # rather than offering an insecure-only solution. In certain configs
+      # it also results in 'deprecated in macOS 10.11' compiler output.
       options="${options} -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON"
     fi
   fi
@@ -517,6 +527,10 @@ else
 
   if [ "${_OS}" = 'win' ]; then
     options="${options} -DCURL_USE_SCHANNEL=ON"
+  elif [ "${_OS}" = 'mac' ]; then
+    # SecureTransport deprecated in 2019 (macOS 10.15 Catalina, iOS 13.0)
+  # options="${options} -DCURL_USE_SECTRANSP=ON"
+    :
   fi
   CPPFLAGS="${CPPFLAGS} -DHAS_ALPN"
 
@@ -597,6 +611,10 @@ else
     CPPFLAGS="${CPPFLAGS} -I${_TOP}/gsasl/${_PP}/include"
     LDFLAGS="${LDFLAGS} -L${_TOP}/gsasl/${_PP}/lib"
     LIBS="${LIBS} -lgsasl"
+  elif [ "${_OS}" = 'mac' ]; then
+    # GSS API deprecated in 2012-2013 (OS X 10.8 Mountain Lion / 10.9 Mavericks, iOS 7.0)
+  # options="${options} -DCURL_USE_GSSAPI=ON"
+    :
   fi
   if [ -d ../libidn2 ]; then
     options="${options} -DUSE_LIBIDN2=ON"