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

Merge pull request #13740 from Bo98/libcrypt1-disable

Browse Source 
linkage_checker: disable libcrypt.so.1 linkage
This commit is contained in:
Mike McQuaid 2022-08-23 12:25:03 +01:00 committed by GitHub
commit c6013cade4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/extend/os/linux/linkage_checker.rb
View File

@ -10,7 +10,6 @@ class LinkageChecker
libanl.so.1 libanl.so.1
libatomic.so.1 libatomic.so.1
libc.so.6 libc.so.6
libcrypt.so.1
libdl.so.2 libdl.so.2
libm.so.6 libm.so.6
libmvec.so.1 libmvec.so.1
@ -29,17 +28,10 @@ class LinkageChecker
def display_deprecated_warning(strict: false) def display_deprecated_warning(strict: false)
return unless @libcrypt_found return unless @libcrypt_found
# Steps when moving this to `odisabled`: # Steps when removing this entirely:
# - 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):
# - Remove the `display_` overrides here and the associated generic aliases in HOMEBREW_LIBRARY/linkage_checker.rb # - 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. # - Remove the setting of `@libcrypt_found` in `check_dylibs` below.
odeprecated "linkage to libcrypt.so.1", "libcrypt.so.2 in the libxcrypt formula", odisabled "linkage to libcrypt.so.1", "libcrypt.so.2 in the libxcrypt formula"
disable: fail_on_libcrypt1?(strict: strict),
disable_for_developers: false
end end
def display_normal_output def display_normal_output
@ -53,16 +45,11 @@ class LinkageChecker
end end
def broken_library_linkage?(test: false, strict: false) def broken_library_linkage?(test: false, strict: false)
generic_broken_library_linkage?(test: test, strict: strict) || generic_broken_library_linkage?(test: test, strict: strict)
(fail_on_libcrypt1?(strict: strict) && @libcrypt_found)
end end
private private
def fail_on_libcrypt1?(strict:)
strict || ENV["HOMEBREW_DISALLOW_LIBCRYPT1"].present?
end
def check_dylibs(rebuild_cache:) def check_dylibs(rebuild_cache:)
generic_check_dylibs(rebuild_cache: rebuild_cache) generic_check_dylibs(rebuild_cache: rebuild_cache)