Skip to content

Commit

Permalink
curl 8.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Jul 24, 2024
1 parent 2823029 commit 9f26c2a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
6 changes: 3 additions & 3 deletions _versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

export DOCKER_IMAGE='debian:testing-20240722-slim'

export CURL_VER_='8.8.0'
export CURL_HASH=0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400
export CURL_VER_='8.9.0'
export CURL_HASH=ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412
# 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:-3}"
export _REV="${CW_REVISION:-1}"

export TRURL_VER_='0.13'
export TRURL_HASH=8ceeb09d0e08dc677897f26651aa625d9ad18021f881f9d5f31e5a95bb3cc047
Expand Down
16 changes: 0 additions & 16 deletions curl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,6 @@ _VER="$1"

if [[ "${_CONFIG}" = *'debug'* ]]; then
options+=' -DENABLE_DEBUG=ON'
if [ "${CURL_VER_}" != '8.8.0' ]; then
# curl would only set this automatically for the 'Debug' configuration
# Required for certain BUILD_TESTING=ON 'testdeps' build targets to link
# correctly.
# Officially we should use `-DCMAKE_BUILD_TYPE=Debug` which also enables
# debug info, but it has the side-effect of adding a `-d` suffix to the
# DLL and static lib names (`libcurl-d-x64.dll`, `libcurl-d.a`,
# `libcurl-d.dll.a` on Windows) which breaks packaging logic. We also
# strip debug info when making libs reproducible anyway.
# The `-d` suffix may be deleted/customized via `CMAKE_DEBUG_POSTFIX`.
CPPFLAGS+=' -DDEBUGBUILD'
fi
fi

if [[ "${_CONFIG}" = *'curltests'* ]]; then
Expand Down Expand Up @@ -243,10 +231,6 @@ _VER="$1"
# Another known deprecation issue:
# curl/lib/vtls/sectransp.c:1206:7: warning: 'CFURLCreateDataAndPropertiesFromResource' is deprecated: first deprecated in macOS 10.9 - For resource data, use the CFReadStream API. For file resource properties, use CFURLCopyResourcePropertiesForKeys. [-Wdeprecated-declarations]
options+=' -DCURL_USE_SECTRANSP=ON'
if [ "${CURL_VER_}" = '8.8.0' ]; then
# Without this, SecureTransport becomes the default TLS backend
[ -n "${mainssl}" ] && options+=" -DCURL_DEFAULT_SSL_BACKEND=${mainssl}"
fi
fi
else
if [ "${_OS}" = 'win' ]; then
Expand Down

0 comments on commit 9f26c2a

Please sign in to comment.