From 291eacd4825273693f0ce117e3076d7bb1b2ae9f Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Fri, 29 Jul 2022 09:30:18 -0700 Subject: [PATCH 1/3] audit_glibc: Fix the error message "The glibc version must be 2.35" should have read "The glibc version must be 2.23". --- Library/Homebrew/formula_auditor.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/formula_auditor.rb b/Library/Homebrew/formula_auditor.rb index a06941104d..880aaf3674 100644 --- a/Library/Homebrew/formula_auditor.rb +++ b/Library/Homebrew/formula_auditor.rb @@ -410,13 +410,10 @@ module Homebrew end def audit_glibc - return if formula.name != "glibc" return unless @core_tap + return if formula.name != "glibc" || formula.version.to_s == OS::CI_GLIBC_VERSION - version = formula.version.to_s - return if version == OS::CI_GLIBC_VERSION - - problem "The glibc version must be #{version}, as this is the version used by our CI on Linux. " \ + problem "The glibc version must be #{OS::CI_GLIBC_VERSION}, as this is the version used by our CI on Linux. " \ "Glibc is for users who have a system Glibc with a lower version, " \ "which allows them to use our Linux bottles, which were compiled against system Glibc on CI." end From 1ac5fc05bd4c46c5f5812428790f465f531dec4e Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Fri, 29 Jul 2022 10:13:09 -0700 Subject: [PATCH 2/3] audit_glibc: Permit glibc 2.35 See https://github.com/Homebrew/brew/issues/13619 --- Library/Homebrew/formula_auditor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/formula_auditor.rb b/Library/Homebrew/formula_auditor.rb index 880aaf3674..179e7b3510 100644 --- a/Library/Homebrew/formula_auditor.rb +++ b/Library/Homebrew/formula_auditor.rb @@ -411,7 +411,7 @@ module Homebrew def audit_glibc return unless @core_tap - return if formula.name != "glibc" || formula.version.to_s == OS::CI_GLIBC_VERSION + return if formula.name != "glibc" || [OS::CI_GLIBC_VERSION, "2.35"].include?(formula.version.to_s) problem "The glibc version must be #{OS::CI_GLIBC_VERSION}, as this is the version used by our CI on Linux. " \ "Glibc is for users who have a system Glibc with a lower version, " \ From 7d1197e8eb938f30c3db9a8754c5557a8c08ed5c Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Fri, 29 Jul 2022 14:06:51 -0700 Subject: [PATCH 3/3] audit_glibc: Permit glibc 2.27, 2.31, or 2.35 --- Library/Homebrew/formula_auditor.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/formula_auditor.rb b/Library/Homebrew/formula_auditor.rb index 179e7b3510..1a6f60b98d 100644 --- a/Library/Homebrew/formula_auditor.rb +++ b/Library/Homebrew/formula_auditor.rb @@ -411,7 +411,8 @@ module Homebrew def audit_glibc return unless @core_tap - return if formula.name != "glibc" || [OS::CI_GLIBC_VERSION, "2.35"].include?(formula.version.to_s) + return if formula.name != "glibc" + return if [OS::CI_GLIBC_VERSION, "2.27", "2.31", "2.35"].include?(formula.version.to_s) problem "The glibc version must be #{OS::CI_GLIBC_VERSION}, as this is the version used by our CI on Linux. " \ "Glibc is for users who have a system Glibc with a lower version, " \