From 4c643aed0227bbfa7ea2a4c21eef2a715104c086 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 23 Aug 2022 09:49:54 +0100 Subject: [PATCH] linkage_checker: disable libcrypt.so.1 linkage --- .../extend/os/linux/linkage_checker.rb | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/Library/Homebrew/extend/os/linux/linkage_checker.rb b/Library/Homebrew/extend/os/linux/linkage_checker.rb index 16016c8a4b..8e42455b5f 100644 --- a/Library/Homebrew/extend/os/linux/linkage_checker.rb +++ b/Library/Homebrew/extend/os/linux/linkage_checker.rb @@ -10,7 +10,6 @@ class LinkageChecker libanl.so.1 libatomic.so.1 libc.so.6 - libcrypt.so.1 libdl.so.2 libm.so.6 libmvec.so.1 @@ -29,17 +28,10 @@ class LinkageChecker def display_deprecated_warning(strict: false) return unless @libcrypt_found - # Steps when moving this to `odisabled`: - # - Remove `libcrypt.so.1` from SYSTEM_LIBRARY_ALLOWLIST above. - # - Remove the `disable` and `disable_for_developer` kwargs here. - # - Remove `broken_library_linkage?` override below and the generic alias in HOMEBREW_LIBRARY/linkage_checker.rb. - # - Remove `fail_on_libcrypt1?`. - # Steps when removing this entirely (assuming the above has already been done): + # Steps when removing this entirely: # - Remove the `display_` overrides here and the associated generic aliases in HOMEBREW_LIBRARY/linkage_checker.rb # - Remove the setting of `@libcrypt_found` in `check_dylibs` below. - odeprecated "linkage to libcrypt.so.1", "libcrypt.so.2 in the libxcrypt formula", - disable: fail_on_libcrypt1?(strict: strict), - disable_for_developers: false + odisabled "linkage to libcrypt.so.1", "libcrypt.so.2 in the libxcrypt formula" end def display_normal_output @@ -53,16 +45,11 @@ class LinkageChecker end def broken_library_linkage?(test: false, strict: false) - generic_broken_library_linkage?(test: test, strict: strict) || - (fail_on_libcrypt1?(strict: strict) && @libcrypt_found) + generic_broken_library_linkage?(test: test, strict: strict) end private - def fail_on_libcrypt1?(strict:) - strict || ENV["HOMEBREW_DISALLOW_LIBCRYPT1"].present? - end - def check_dylibs(rebuild_cache:) generic_check_dylibs(rebuild_cache: rebuild_cache)