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

Merge pull request #5383 from MikeMcQuaid/link-provided-by-macos-consistently

Browse Source 
link: prevent :provided_by_macos links everywhere.
This commit is contained in:
Mike McQuaid 2018-12-07 14:58:32 +00:00 committed by GitHub
commit d20f0a8a31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/cmd/link.rb
View File

@ -78,28 +78,14 @@ module Homebrew
if keg_only if keg_only
if Homebrew.default_prefix? if Homebrew.default_prefix?
f = keg.to_formula f = keg.to_formula
caveats = Caveats.new(f) if f.keg_only_reason.reason == :provided_by_macos
caveats = Caveats.new(f)
if f.keg_only_reason.reason == :provided_by_macos &&
(MacOS.version >= :mojave ||
MacOS::Xcode.version >= "10.0" ||
MacOS::CLT.version >= "10.0")
opoo <<~EOS opoo <<~EOS
Refusing to link macOS-provided software: #{keg.name} Refusing to link macOS-provided software: #{keg.name}
#{caveats.keg_only_text(skip_reason: true).strip} #{caveats.keg_only_text(skip_reason: true).strip}
EOS EOS
next next
end end
if keg.name.start_with?("openssl", "libressl")
opoo <<~EOS
Refusing to link: #{keg.name}
Linking keg-only #{keg.name} means you may end up linking against the insecure,
deprecated system OpenSSL while using the headers from Homebrew's #{keg.name}.
#{caveats.keg_only_text(skip_reason: true).strip}
EOS
next
end
end end
unless args.force? unless args.force?

8
Library/Homebrew/dev-cmd/audit.rb
View File

@ -531,7 +531,13 @@ module Homebrew
return unless @versioned_formula return unless @versioned_formula
return unless @core_tap return unless @core_tap
return if formula.keg_only? && formula.keg_only_reason.reason == :versioned_formula if formula.keg_only?
return if formula.keg_only_reason.reason == :versioned_formula
if formula.name.start_with?("openssl", "libressl") &&
formula.keg_only_reason.reason == :provided_by_macos
return
end
end
keg_only_whitelist = %w[ keg_only_whitelist = %w[
autoconf@2.13 autoconf@2.13