Skip to content

Commit

Permalink
curl 8.11.0
Browse files Browse the repository at this point in the history
Notable change: On Windows the CA bundle is no longer searched accross
`PATH`. Instead it's only looked for in the directory where `curl.exe`
resides.

The latest CA bundle is also embedded in `curl.exe` and thus works
without a `curl-ca-bundle.crt` on disk next to it.

https://curl.se/ch/8.11.0.html
  • Loading branch information
vszakats committed Nov 6, 2024
1 parent 5bb7298 commit 9429b74
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 16 deletions.
6 changes: 3 additions & 3 deletions _versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
export DOCKER_IMAGE='debian:testing-20241016-slim'
export DOCKER_CONTENT_TRUST='1'

export CURL_VER_='8.10.1'
export CURL_HASH=73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee
export CURL_VER_='8.11.0'
export CURL_HASH=db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb
# Create revision string
# NOTE: Set _REV to 1 after bumping CURL_VER_, then increment for each
# CI rebuild via `main` branch push (e.g. after bumping a dependency).
export _REV="${CW_REVISION:-7}"
export _REV="${CW_REVISION:-1}"

export TRURL_VER_='0.16'
export TRURL_HASH=2c26e3016f591f06234838bbe1dd4b165dce2c871c82ca6a32222d19696588d6
Expand Down
15 changes: 2 additions & 13 deletions curl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,7 @@ _VER="$1"
options+=' -DCURL_DISABLE_NTLM=ON'
options+=' -DCURL_DISABLE_SHA512_256=ON'
options+=' -DCURL_DISABLE_DICT=ON -DCURL_DISABLE_FILE=ON -DCURL_DISABLE_GOPHER=ON -DCURL_DISABLE_MQTT=ON -DCURL_DISABLE_RTSP=ON -DCURL_DISABLE_SMB=ON -DCURL_DISABLE_TELNET=ON -DCURL_DISABLE_TFTP=ON'
if [ "${CURL_VER_}" != '8.10.1' ]; then
options+=' -DCURL_DISABLE_IPFS=ON'
fi
options+=' -DCURL_DISABLE_IPFS=ON'
options+=' -DCURL_DISABLE_FTP=ON'
options+=' -DCURL_DISABLE_POP3=ON -DCURL_DISABLE_SMTP=ON'
[[ "${_CONFIG}" != *'imap'* ]] && options+=' -DCURL_DISABLE_IMAP=ON'
Expand Down Expand Up @@ -284,9 +282,6 @@ _VER="$1"
options+=' -DUSE_NGTCP2=ON'
options+=" -DNGTCP2_INCLUDE_DIR=${_TOP}/ngtcp2/${_PPS}/include"
options+=" -DNGTCP2_LIBRARY=${_TOP}/ngtcp2/${_PPS}/lib/libngtcp2.a"
if [ "${CURL_VER_}" = '8.10.1' ]; then
options+=" -DCMAKE_LIBRARY_PATH=${_TOP}/ngtcp2/${_PPS}/lib"
fi
CPPFLAGS+=' -DNGTCP2_STATICLIB'
else
options+=' -DUSE_NGTCP2=OFF'
Expand Down Expand Up @@ -356,8 +351,7 @@ _VER="$1"
options+=" -DCURL_CA_EMBED=${_TOP}/cacert/${_CACERT}"
fi
if [ "${_OS}" = 'win' ] && \
[ "${CURL_VER_}" != '8.10.1' ]; then
if [ "${_OS}" = 'win' ]; then
options+=' -DCURL_CA_SEARCH_SAFE=ON'
fi
else
Expand All @@ -383,11 +377,6 @@ _VER="$1"
# Auto-detection is disabled for this feature in cross-builds.
# Ensure it is set as in native builds.
options+=' -DHAVE_WRITABLE_ARGV=1'
if [ "${CURL_VER_}" = '8.10.1' ]; then
if [ "${_CRT}" = 'musl' ]; then
options+=' -DHAVE_POLL_FINE=1'
fi
fi
fi
options+=' -DCURL_USE_PKGCONFIG=OFF'
Expand Down

0 comments on commit 9429b74

Please sign in to comment.