Skip to content

Commit 9429b74

Browse files
committed
curl 8.11.0
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
1 parent 5bb7298 commit 9429b74

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

_versions.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
export DOCKER_IMAGE='debian:testing-20241016-slim'
77
export DOCKER_CONTENT_TRUST='1'
88

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

1616
export TRURL_VER_='0.16'
1717
export TRURL_HASH=2c26e3016f591f06234838bbe1dd4b165dce2c871c82ca6a32222d19696588d6

curl.sh

+2-13
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ _VER="$1"
107107
options+=' -DCURL_DISABLE_NTLM=ON'
108108
options+=' -DCURL_DISABLE_SHA512_256=ON'
109109
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'
110-
if [ "${CURL_VER_}" != '8.10.1' ]; then
111-
options+=' -DCURL_DISABLE_IPFS=ON'
112-
fi
110+
options+=' -DCURL_DISABLE_IPFS=ON'
113111
options+=' -DCURL_DISABLE_FTP=ON'
114112
options+=' -DCURL_DISABLE_POP3=ON -DCURL_DISABLE_SMTP=ON'
115113
[[ "${_CONFIG}" != *'imap'* ]] && options+=' -DCURL_DISABLE_IMAP=ON'
@@ -284,9 +282,6 @@ _VER="$1"
284282
options+=' -DUSE_NGTCP2=ON'
285283
options+=" -DNGTCP2_INCLUDE_DIR=${_TOP}/ngtcp2/${_PPS}/include"
286284
options+=" -DNGTCP2_LIBRARY=${_TOP}/ngtcp2/${_PPS}/lib/libngtcp2.a"
287-
if [ "${CURL_VER_}" = '8.10.1' ]; then
288-
options+=" -DCMAKE_LIBRARY_PATH=${_TOP}/ngtcp2/${_PPS}/lib"
289-
fi
290285
CPPFLAGS+=' -DNGTCP2_STATICLIB'
291286
else
292287
options+=' -DUSE_NGTCP2=OFF'
@@ -356,8 +351,7 @@ _VER="$1"
356351
options+=" -DCURL_CA_EMBED=${_TOP}/cacert/${_CACERT}"
357352
fi
358353
359-
if [ "${_OS}" = 'win' ] && \
360-
[ "${CURL_VER_}" != '8.10.1' ]; then
354+
if [ "${_OS}" = 'win' ]; then
361355
options+=' -DCURL_CA_SEARCH_SAFE=ON'
362356
fi
363357
else
@@ -383,11 +377,6 @@ _VER="$1"
383377
# Auto-detection is disabled for this feature in cross-builds.
384378
# Ensure it is set as in native builds.
385379
options+=' -DHAVE_WRITABLE_ARGV=1'
386-
if [ "${CURL_VER_}" = '8.10.1' ]; then
387-
if [ "${_CRT}" = 'musl' ]; then
388-
options+=' -DHAVE_POLL_FINE=1'
389-
fi
390-
fi
391380
fi
392381
393382
options+=' -DCURL_USE_PKGCONFIG=OFF'

0 commit comments

Comments
 (0)