Merge pull request #12907 from iMichka/certs

debian7: force usage of brewed ca-certificates
This commit is contained in:
Mike McQuaid 2022-02-22 13:34:01 +00:00 committed by GitHub
commit 01506f120a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions

View File

@ -493,8 +493,10 @@ else
# shellcheck disable=SC2154
if [[ -n "${HOMEBREW_ON_DEBIAN7}" ]]
then
# Special version for our debian 7 docker container used to build patchelf and binutils
# Special version for our debian 7 docker container used to build binutils
HOMEBREW_MINIMUM_CURL_VERSION="7.25.0"
HOMEBREW_SYSTEM_CA_CERTIFICATES_TOO_OLD="1"
HOMEBREW_FORCE_BREWED_CA_CERTIFICATES="1"
else
# Ensure the system Curl is a version that supports modern HTTPS certificates.
HOMEBREW_MINIMUM_CURL_VERSION="7.41.0"

View File

@ -100,7 +100,9 @@ class DevelopmentTools
sig { returns(T::Boolean) }
def ca_file_handles_most_https_certificates?
true
# The system CA file is too old for some modern HTTPS certificates on
# older OS versions.
ENV["HOMEBREW_SYSTEM_CA_CERTIFICATES_TOO_OLD"].nil?
end
sig { returns(T::Boolean) }

View File

@ -10,7 +10,7 @@ class DevelopmentTools
alias generic_locate locate
undef installed?, default_compiler, curl_handles_most_https_certificates?,
ca_file_handles_most_https_certificates?, subversion_handles_most_https_certificates?
subversion_handles_most_https_certificates?
sig { params(tool: String).returns(T.nilable(Pathname)) }
def locate(tool)
@ -37,13 +37,6 @@ class DevelopmentTools
:clang
end
sig { returns(T::Boolean) }
def ca_file_handles_most_https_certificates?
# The system CA file is too old for some modern HTTPS certificates on
# older macOS versions.
ENV["HOMEBREW_SYSTEM_CA_CERTIFICATES_TOO_OLD"].nil?
end
sig { returns(T::Boolean) }
def curl_handles_most_https_certificates?
# The system Curl is too old for some modern HTTPS certificates on