Skip to content

Commit cf9a7c7

Browse files
Kyle-Nealedd-agent-integrations-bot[bot]
andauthored
Bump curl version to 8.20.0 (DataDog#23771)
* Bump curl version to 8.20.0 Addresses CVE-2026-5773 (SMB connection reuse). Also bumps the vcpkg desired_commit to the upstream commit that adds curl 8.20.0 so the Windows librdkafka build picks up the new port version. Fixes: [VULN-82927](https://datadoghq.atlassian.net/browse/VULN-82927) * Update dependency resolution * Update dependency resolution --------- Co-authored-by: dd-agent-integrations-bot[bot] <dd-agent-integrations-bot[bot]@users.noreply.github.com>
1 parent f9a018d commit cf9a7c7

12 files changed

Lines changed: 96 additions & 96 deletions

File tree

.builders/images/linux-aarch64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ RUN \
157157
# curl
158158
RUN \
159159
DOWNLOAD_URL="https://curl.haxx.se/download/curl-{{version}}.tar.gz" \
160-
VERSION="8.19.0" \
161-
SHA256="2a2c11db4c122691aa23b4363befda1bfd801770bfebf41e1d21cee4f2ab0f71" \
160+
VERSION="8.20.0" \
161+
SHA256="fc5819cad3f9f5482669adcdc49a782c15f36d2a0715b395b06d9173593d2dc0" \
162162
RELATIVE_PATH="curl-{{version}}" \
163163
bash install-from-source.sh \
164164
--disable-manual \

.builders/images/linux-x86_64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ RUN \
161161
# curl
162162
RUN \
163163
DOWNLOAD_URL="https://curl.haxx.se/download/curl-{{version}}.tar.gz" \
164-
VERSION="8.19.0" \
165-
SHA256="2a2c11db4c122691aa23b4363befda1bfd801770bfebf41e1d21cee4f2ab0f71" \
164+
VERSION="8.20.0" \
165+
SHA256="fc5819cad3f9f5482669adcdc49a782c15f36d2a0715b395b06d9173593d2dc0" \
166166
RELATIVE_PATH="curl-{{version}}" \
167167
bash install-from-source.sh \
168168
--disable-manual \

.builders/images/macos/builder_setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ RELATIVE_PATH="libxslt-{{version}}" \
7070

7171
# curl
7272
DOWNLOAD_URL="https://curl.haxx.se/download/curl-{{version}}.tar.gz" \
73-
VERSION="8.19.0" \
74-
SHA256="2a2c11db4c122691aa23b4363befda1bfd801770bfebf41e1d21cee4f2ab0f71" \
73+
VERSION="8.20.0" \
74+
SHA256="fc5819cad3f9f5482669adcdc49a782c15f36d2a0715b395b06d9173593d2dc0" \
7575
RELATIVE_PATH="curl-{{version}}" \
7676
install-from-source \
7777
--disable-manual \

.builders/images/windows-x86_64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ RUN New-Item -ItemType Junction -Path C:\OpenSSL -Target 'C:\Program Files\OpenS
166166
RunOnVSConsole -Command 'ninja -C C:\pgbuild install' && `
167167
Add-ToPath -Append "C:\postgresql\bin"
168168

169-
ENV CURL_VERSION="8.19.0"
169+
ENV CURL_VERSION="8.20.0"
170170

171171
# Set up runner
172172
COPY runner_dependencies.txt C:\runner_dependencies.txt

.builders/images/windows-x86_64/build_script.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Remove-Item "librdkafka-${kafka_version}.tar.gz"
2424
$triplet = "x64-windows"
2525
$vcpkg_dir = "C:\vcpkg"
2626
$librdkafka_dir = "C:\librdkafka\librdkafka-${kafka_version}"
27-
$desired_commit = "36118ef68885436fd2a999188216337365856ad4"
27+
$desired_commit = "3e797c57a635d3ce8f3473ef344ea44c09c246c8"
2828

2929
# Clone and configure vcpkg
3030
if (-Not (Test-Path -Path "$vcpkg_dir\.git")) {

.deps/builder_inputs.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
# Hash inputs are defined in .builders/inputs_hash.py (SHARED_INPUTS,
1212
# RESOLUTION_INPUTS).
1313
[resolution]
14-
hash = "aa676a172ec12e2926234fe5865bfde2281f669258fc87a35f724404c0f2e3ae"
14+
hash = "8104b34b44ca0999d2483c114404e1b96d0f3610887ee1bcbf796cbe7b692fc1"
1515

1616
[images]
17-
linux-aarch64 = "f183db47c9b55ef83e324c5eeb8edaba75feaa5766f695da6f4f5964668579d4"
18-
linux-x86_64 = "6be1f5dc7b15d968e86b029bb14e6506dc47ef98c9e2fcd4f8fd38b8606751ac"
19-
macos-aarch64 = "9f7be2b1033bb3c36ce7ce6e3e50af9b50fb3ca24eedfa91f17355f913bc5006"
20-
macos-x86_64 = "3ae85bb4ba101b21bb6e50c81f5829c7c73fc563252557e86dcbfba048add8e2"
21-
windows-x86_64 = "45eff85143d43b51ca80bff7431ff3ca2b96ae1b242dbed7cad379767032bf9f"
17+
linux-aarch64 = "cac3eb96271496d0c482af95e7dd0766356ecc8d07623d33d8a5c7dc974a6e49"
18+
linux-x86_64 = "430b5dc4b41e6eb8a061c9418fb214adec780a957b0bd3bf7a861a7812d73993"
19+
macos-aarch64 = "bd20131cfae81eed46998431117e50a724744679c959a6d9648ca63dd4d3bfdc"
20+
macos-x86_64 = "37e8f1ef74292fb9f2df305603aa991121d35162d47eba98fcbd46e458f7dc54"
21+
windows-x86_64 = "898a5f8d290d6faf02384140a51f15b6c85ff4f0b778594fa758c483042e2854"

.deps/image_digests.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"linux-aarch64": "sha256:75e43dcd27c73cb11b93530d0f4a6e832ed36c8940777f361e03fe4fd0311ce1",
3-
"linux-x86_64": "sha256:6a16bc2e11096b8c17bfdc1deaef4b5f0828ea57811bbffc31a84a354b663cf8",
4-
"windows-x86_64": "sha256:db6ee72b8ef6e6ba9ce212d02b320e5a6a9e0ae20e578693f94a15f7aff417e0"
2+
"linux-aarch64": "sha256:67ce10febfd314cd2fcdc3ae33209c3b37277a3e4a452c7dfd408f885de06bfd",
3+
"linux-x86_64": "sha256:41a0b42f62074e6200f8a8e59d0f27f3913a9aab0ea610ba17ed51bb307a70ed",
4+
"windows-x86_64": "sha256:8cd1f72c73611f520596d3788da7e7b62bcb6c0d40fdcee3612e845a5aad8ad5"
55
}

.deps/resolved/linux-aarch64_3.13.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
aerospike @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/aerospike/aerospike-7.1.1-20260423151051-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=13e750c0fbc8fd5f41810e5b3e72be2d132124e47a148dd147352a84b90fc614
2-
botocore @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/botocore/botocore-1.42.72-20260520150257-py3-none-any.whl#sha256=f1933a8ca6c1108ed23f7b01f82577327fc254e330025887fdd4ba17db03e8e2
2+
botocore @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/botocore/botocore-1.42.72-20260521170357-py3-none-any.whl#sha256=f1933a8ca6c1108ed23f7b01f82577327fc254e330025887fdd4ba17db03e8e2
33
cm-client @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/cm-client/cm_client-45.0.4-20260326173357-py3-none-manylinux2014_aarch64.whl#sha256=0bbcf2766028850c26a917deef3704a096cc9ba0c25220d45ff424334d25dcd7
4-
confluent-kafka @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/confluent-kafka/confluent_kafka-2.13.2-20260520150715-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=dffb540e50308294349c680b6fef9223b2c3fa48e2b30694b3fa56379317214b
5-
cryptography @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/cryptography/cryptography-46.0.7-20260520150719-cp313-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=6e660e501d7780ead3d3cc0b307eaab1fce18f5abccef86d8a216ad4dcbcedfd
4+
confluent-kafka @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/confluent-kafka/confluent_kafka-2.13.2-20260521170923-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=4c54fd34838b0d9386246f7b1af8e968158f8182ae99433d0298c1d8cadb1edf
5+
cryptography @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/cryptography/cryptography-46.0.7-20260521170928-cp313-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=6fc057fdd2f42994583cf9b5dd987e7157c1790ab5874bc1b5c80bec5d2177e4
66
ddtrace @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/ddtrace/ddtrace-3.19.5-20260417115249-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl#sha256=a4f8d07adccdd43908156ab2c143dbb6261ed9a3c43ba58a3bb6bd1b6ef94734
77
foundationdb @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/foundationdb/foundationdb-6.3.25-20260326173358-py3-none-manylinux2014_aarch64.whl#sha256=d34180500220db4458e57505c774de0363456d4129f0e3fe98c9e99e8eef77c2
88
gssapi @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/gssapi/gssapi-1.11.1-20260519113308-cp311-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=861b3cde93aec1b05a5e9ac917780dbac66d773bd427834bdf738825e559d197
9-
keystoneauth1 @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/keystoneauth1/keystoneauth1-5.14.0-20260520150315-py3-none-any.whl#sha256=981596c8e7346d2b46ee5ec738312b8e46b0beb29d62104ccb7c113ed9c7fbef
9+
keystoneauth1 @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/keystoneauth1/keystoneauth1-5.14.0-20260521170420-py3-none-any.whl#sha256=981596c8e7346d2b46ee5ec738312b8e46b0beb29d62104ccb7c113ed9c7fbef
1010
krb5 @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/krb5/krb5-0.9.0-20260519113309-cp311-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=f6dd9d9a2d81b129b52ace318104ea9c04c1e7a5e11724aede73ba7c12f7fcac
11-
openstacksdk @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/openstacksdk/openstacksdk-4.10.0-20260520150335-py3-none-any.whl#sha256=88abe8f44e3b8c5c25b1093de735c700aa727a7ac408e273aa855d6db6ba38bf
12-
os-service-types @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/os-service-types/os_service_types-1.8.2-20260520150354-py3-none-any.whl#sha256=758ccaa020eea0edd84bcf4123746ddd060d1dbaeef63d04d76bd2e0ae6f91d8
13-
pbr @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/pbr/pbr-7.0.3-20260520150413-py2.py3-none-any.whl#sha256=1544652b80307f0b4c491bd66f58f969cb0656994e632365f90e8e044c223b4e
11+
openstacksdk @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/openstacksdk/openstacksdk-4.10.0-20260521170444-py3-none-any.whl#sha256=88abe8f44e3b8c5c25b1093de735c700aa727a7ac408e273aa855d6db6ba38bf
12+
os-service-types @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/os-service-types/os_service_types-1.8.2-20260521170508-py3-none-any.whl#sha256=758ccaa020eea0edd84bcf4123746ddd060d1dbaeef63d04d76bd2e0ae6f91d8
13+
pbr @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/pbr/pbr-7.0.3-20260521170532-py2.py3-none-any.whl#sha256=1544652b80307f0b4c491bd66f58f969cb0656994e632365f90e8e044c223b4e
1414
psutil @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/psutil/psutil-6.0.0-20260326173401-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=22e075e3cbc57b5da0d93f72f691746c5198ce88c5aea6fdb54186b3e8c46832
15-
psycopg-c @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/psycopg-c/psycopg_c-3.3.3-20260518161020-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=91f63a673fb68a595ab2c0a4e05178a7eacb964b154afb9cda19caae1e7e9a0b
15+
psycopg-c @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/psycopg-c/psycopg_c-3.3.3-20260521171045-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=91f63a673fb68a595ab2c0a4e05178a7eacb964b154afb9cda19caae1e7e9a0b
1616
pymongo @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/pymongo/pymongo-4.8.0-20260415154515-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=30d8af4ef8fda85d1a865bdb254e6b2e3988f26b723eb39a4843c766371ff517
1717
pyodbc @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/pyodbc/pyodbc-5.3.0-20260415154516-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=91a4191cf30930755d82e8edd6ac861443dfb6fbbf7915753b73209038ad5ad2
18-
pysnmp-mibs @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/pysnmp-mibs/pysnmp_mibs-0.1.6-20260520150436-py2.py3-none-any.whl#sha256=0cc4610711208cdc64361464a23d1f2dce88ec5990a12b4bdce4f13b6a169810
18+
pysnmp-mibs @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/pysnmp-mibs/pysnmp_mibs-0.1.6-20260521170600-py2.py3-none-any.whl#sha256=0cc4610711208cdc64361464a23d1f2dce88ec5990a12b4bdce4f13b6a169810
1919
pyvmomi @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/pyvmomi/pyvmomi-8.0.3.0.1-20260326173403-py2.py3-none-manylinux2014_aarch64.whl#sha256=dd71476b7308286ed4219373ca9523e4f06bfed3f5932f60e5c67d8d5a673e1e
20-
requests-unixsocket2 @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/requests-unixsocket2/requests_unixsocket2-1.0.1-20260520150457-py3-none-any.whl#sha256=aae3f1743ab60955ea91e9a095d54997ea56b956bab652bf194379ef4dc6fa7f
21-
securesystemslib @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/securesystemslib/securesystemslib-0.28.0-20260520150517-py3-none-any.whl#sha256=861ab6f8c1930e0c05915f32a34f1c4ae1d76ee542ad2b424121e3e26a9fb1dd
22-
setuptools @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/setuptools/setuptools-82.0.1-20260520150537-py3-none-any.whl#sha256=b020c62c9ea6c1c3e7a29a8e385967909ceb85a77398f7fbe3c63e2abab52e87
20+
requests-unixsocket2 @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/requests-unixsocket2/requests_unixsocket2-1.0.1-20260521170624-py3-none-any.whl#sha256=aae3f1743ab60955ea91e9a095d54997ea56b956bab652bf194379ef4dc6fa7f
21+
securesystemslib @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/securesystemslib/securesystemslib-0.28.0-20260521170648-py3-none-any.whl#sha256=861ab6f8c1930e0c05915f32a34f1c4ae1d76ee542ad2b424121e3e26a9fb1dd
22+
setuptools @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/setuptools/setuptools-82.0.1-20260521170712-py3-none-any.whl#sha256=b020c62c9ea6c1c3e7a29a8e385967909ceb85a77398f7fbe3c63e2abab52e87
2323
simplejson @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/simplejson/simplejson-3.20.2-20260326173404-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl#sha256=cb739020a718c2e32041a0fa0a3f79398f45c067347fe8f286c8222fa777bc5d
24-
stevedore @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/stevedore/stevedore-5.8.0-20260520150538-py3-none-any.whl#sha256=b9c2fdfb8d02797f171fc63ada01759955b4bac02a7cbe63d2ad2e827e3530f6
25-
supervisor @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/supervisor/supervisor-4.3.0-20260520150558-py2.py3-none-any.whl#sha256=81d63e968a5133203a334102b8e6e72b1f5ecfc9673c1af7680f9f7e0db8d4fd
26-
vertica-python @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/vertica-python/vertica_python-1.4.0-20260520150617-py3-none-any.whl#sha256=df8d667b7bd070532a72c25f37e7259d3673c1908ae726fdfb3087d777caa9da
27-
websocket-client @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/websocket-client/websocket_client-1.9.0-20260520150637-py3-none-any.whl#sha256=b628876a9b1eed1d49f1a230bf4b1c21fa3cd9163594f9f9628c8a8b22f97e10
24+
stevedore @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/stevedore/stevedore-5.8.0-20260521170714-py3-none-any.whl#sha256=b9c2fdfb8d02797f171fc63ada01759955b4bac02a7cbe63d2ad2e827e3530f6
25+
supervisor @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/supervisor/supervisor-4.3.0-20260521170738-py2.py3-none-any.whl#sha256=81d63e968a5133203a334102b8e6e72b1f5ecfc9673c1af7680f9f7e0db8d4fd
26+
vertica-python @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/vertica-python/vertica_python-1.4.0-20260521170811-py3-none-any.whl#sha256=df8d667b7bd070532a72c25f37e7259d3673c1908ae726fdfb3087d777caa9da
27+
websocket-client @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/built/websocket-client/websocket_client-1.9.0-20260521170836-py3-none-any.whl#sha256=b628876a9b1eed1d49f1a230bf4b1c21fa3cd9163594f9f9628c8a8b22f97e10
2828
annotated-types @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/external/annotated-types/annotated_types-0.7.0-py3-none-any.whl#sha256=1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53
2929
attrs @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/external/attrs/attrs-26.1.0-py3-none-any.whl#sha256=c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309
3030
aws-msk-iam-sasl-signer-python @ https://agent-int-packages.datadoghq.com/${INTEGRATIONS_WHEELS_STORAGE}/external/aws-msk-iam-sasl-signer-python/aws_msk_iam_sasl_signer_python-1.0.2-py2.py3-none-any.whl#sha256=310eb2db9ca0ff55ed06a24212739b87533e7f1cf6f34e43aabbd97a3b21290e

0 commit comments

Comments
 (0)