admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

debian7: force usage of brewed ca-certificates

Browse Source
This commit is contained in:
Michka Popoff 2022-02-21 22:49:55 +01:00
parent 6661f5b14d
commit bc83c39337
No known key found for this signature in database
GPG Key ID: 033D03F151030611
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/brew.sh
View File

@ -493,8 +493,10 @@ else
# shellcheck disable=SC2154 # shellcheck disable=SC2154
if [[ -n "${HOMEBREW_ON_DEBIAN7}" ]] if [[ -n "${HOMEBREW_ON_DEBIAN7}" ]]
then 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_MINIMUM_CURL_VERSION="7.25.0"
HOMEBREW_SYSTEM_CA_CERTIFICATES_TOO_OLD="1"
HOMEBREW_FORCE_BREWED_CA_CERTIFICATES="1"
else else
# Ensure the system Curl is a version that supports modern HTTPS certificates. # Ensure the system Curl is a version that supports modern HTTPS certificates.
HOMEBREW_MINIMUM_CURL_VERSION="7.41.0" HOMEBREW_MINIMUM_CURL_VERSION="7.41.0"

4
Library/Homebrew/development_tools.rb
View File

@ -100,7 +100,9 @@ class DevelopmentTools
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def ca_file_handles_most_https_certificates? 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 end
sig { returns(T::Boolean) } sig { returns(T::Boolean) }

9
Library/Homebrew/extend/os/mac/development_tools.rb
View File

@ -10,7 +10,7 @@ class DevelopmentTools
alias generic_locate locate alias generic_locate locate
undef installed?, default_compiler, curl_handles_most_https_certificates?, 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)) } sig { params(tool: String).returns(T.nilable(Pathname)) }
def locate(tool) def locate(tool)
@ -37,13 +37,6 @@ class DevelopmentTools
:clang :clang
end 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) } sig { returns(T::Boolean) }
def curl_handles_most_https_certificates? def curl_handles_most_https_certificates?
# The system Curl is too old for some modern HTTPS certificates on # The system Curl is too old for some modern HTTPS certificates on