Skip to content

Commit 40d85f6

Browse files
authored
Update bundled components for static builds. (#21401)
* Bump versions of vendored dependencies for static builds. * Disable brotli in bundled libcurl. It doesn’t build correctly against the version of libbrotli in Alpine 3.23.0.
1 parent 5c61d4a commit 40d85f6

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

packaging/makeself/bundled-packages.version

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Source of truth for all the packages we bundle in static builds
22
PACKAGES=("OPENSSL" "CURL" "BASH" "IOPING" "LIBNETFILTER_ACT")
33
SOURCE_TYPES=("GH_REPO_CLONE" "GH_REPO_CLONE" "DW_TARBALL" "GH_REPO_SOURCE" "DW_TARBALL")
4-
OPENSSL_VERSION="openssl-3.5.4"
4+
OPENSSL_VERSION="openssl-3.6.0"
55
OPENSSL_SOURCE="https://github.com/openssl/openssl"
6-
LIBUCONTEXT_VERSION="libucontext-1.3.2"
6+
LIBUCONTEXT_VERSION="libucontext-1.3.3"
77
LIBUCONTEXT_SOURCE="https://github.com/kaniini/libucontext"
8-
LIBUNWIND_VERSION="177deb5f89c5d792c9618db54fdcebd260e271e8" # Should be updated to a stable version once https://github.com/libunwind/libunwind/issues/742 is fixed.
8+
LIBUNWIND_VERSION="v1.8.3"
99
LIBUNWIND_SOURCE="https://github.com/libunwind/libunwind"
10-
CURL_VERSION="curl-8_16_0"
10+
CURL_VERSION="curl-8_17_0"
1111
CURL_SOURCE="https://github.com/curl/curl"
12-
BASH_VERSION="5.2.37"
12+
BASH_VERSION="5.3"
1313
BASH_ARTIFACT_SOURCE="http://ftp.gnu.org/gnu/bash"
14-
BASH_ARTIFACT_SHA256="9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff"
14+
BASH_ARTIFACT_SHA256="0d5cd86965f869a26cf64f4b71be7b96f90a3ba8b3d74e27e8e9d9d5550f31ba"
1515
IOPING_VERSION="1.3"
1616
IOPING_SOURCE="https://github.com/koct9i/ioping"
1717
IOPING_ARTIFACT_SHA256="7aa48e70aaa766bc112dea57ebbe56700626871052380709df3a26f46766e8c8"

packaging/makeself/jobs/30-curl.install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ if [ "${CACHE_HIT:-0}" -eq 0 ]; then
4646
--with-openssl \
4747
--with-ca-bundle=/opt/netdata/etc/ssl/certs/ca-certificates.crt \
4848
--with-ca-path=/opt/netdata/etc/ssl/certs \
49+
--without-brotli \
4950
--disable-dependency-tracking
5051

5152
# Curl autoconf does not honour the curl_LDFLAGS environment variable

0 commit comments

Comments
 (0)