Skip to content

Commit

Permalink
document securetransport and gssapi legacy status on mac target
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Aug 29, 2023
1 parent f854d97 commit 42b74b9
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 3 deletions.
12 changes: 11 additions & 1 deletion curl-autotools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down
22 changes: 20 additions & 2 deletions curl-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 42b74b9

Please sign in to comment.