From 25b7d28f91d88dc2ac431cebba9a9c2998b365f1 Mon Sep 17 00:00:00 2001 From: Seeker Date: Sat, 18 Jul 2020 15:23:27 -0700 Subject: [PATCH 1/2] dev-cmd/audit: add libressl to uses_from_macos allow list --- Library/Homebrew/dev-cmd/audit.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 373f60669f..1c0109bea9 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -323,6 +323,7 @@ module Homebrew USES_FROM_MACOS_ALLOWLIST = %w[ apr apr-util + libressl openblas openssl@1.1 ].freeze From e77c15669012c7aae7650940bef0142931cd3659 Mon Sep 17 00:00:00 2001 From: Seeker Date: Tue, 21 Jul 2020 08:19:41 -0700 Subject: [PATCH 2/2] dev-cmd/audit: rename USES_FROM_MACOS_ALLOWLIST Rename to PROVIDED_BY_MACOS_DEPENDS_ON_ALLOWLIST --- Library/Homebrew/dev-cmd/audit.rb | 4 ++-- Library/Homebrew/test/dev-cmd/audit_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 1c0109bea9..fd599906a4 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -320,7 +320,7 @@ module Homebrew problem "Formula name conflicts with existing core formula." end - USES_FROM_MACOS_ALLOWLIST = %w[ + PROVIDED_BY_MACOS_DEPENDS_ON_ALLOWLIST = %w[ apr apr-util libressl @@ -384,7 +384,7 @@ module Homebrew dep_f.keg_only? && dep_f.keg_only_reason.provided_by_macos? && dep_f.keg_only_reason.applicable? && - !USES_FROM_MACOS_ALLOWLIST.include?(dep.name) + !PROVIDED_BY_MACOS_DEPENDS_ON_ALLOWLIST.include?(dep.name) new_formula_problem( "Dependency '#{dep.name}' is provided by macOS; " \ "please replace 'depends_on' with 'uses_from_macos'.", diff --git a/Library/Homebrew/test/dev-cmd/audit_spec.rb b/Library/Homebrew/test/dev-cmd/audit_spec.rb index 9b80945ebf..2e26853298 100644 --- a/Library/Homebrew/test/dev-cmd/audit_spec.rb +++ b/Library/Homebrew/test/dev-cmd/audit_spec.rb @@ -541,7 +541,7 @@ module Homebrew include_examples "formulae exist", described_class::VERSIONED_KEG_ONLY_ALLOWLIST include_examples "formulae exist", described_class::VERSIONED_HEAD_SPEC_ALLOWLIST - include_examples "formulae exist", described_class::USES_FROM_MACOS_ALLOWLIST + include_examples "formulae exist", described_class::PROVIDED_BY_MACOS_DEPENDS_ON_ALLOWLIST include_examples "formulae exist", described_class::THROTTLED_FORMULAE.keys include_examples "formulae exist", described_class::UNSTABLE_ALLOWLIST.keys include_examples "formulae exist", described_class::GNOME_DEVEL_ALLOWLIST.keys