Skip to content
Snippets Groups Projects
Commit acea0203 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'deps/c55ce6f-7dc4d86' into 'master'

Update curl/curl from curl-8_5_0 to curl-8_6_0

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7406



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarAndrew Patterson <apatterson@gitlab.com>
Co-authored-by: default avatardeps <bot@dependencies.io>
parents 5f7b1db6 e09f28c8
3 merge requests!122heptapod#1474: making 1.3 the new oldstable,!121heptapod#1448: making Heptapod 1.3 the stable series,!120Merge upstream first commit of the 16-9-stable branch
......@@ -16,7 +16,7 @@
name 'curl'
version = Gitlab::Version.new('curl', 'curl-8_5_0')
version = Gitlab::Version.new('curl', 'curl-8_6_0')
default_version version.print(false)
display_version version.print(false).delete_prefix('curl-').tr('_', '.')
......@@ -68,7 +68,8 @@
"--without-ca-path",
"--without-ca-bundle",
"--with-ca-fallback",
"--without-zstd"
"--without-zstd",
"-without-libpsl"
]
openssl_library_path = "=#{install_dir}/embedded" unless Build::Check.use_system_ssl?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment