From 816dd7459b2b8525997c396d03bc39de7722f575 Mon Sep 17 00:00:00 2001 From: dcrosby Date: Tue, 23 Apr 2024 12:47:47 -0700 Subject: [PATCH] [WIP] handle libxcrypt dependencies To address https://github.com/chef/omnibus/issues/890 See https://src.fedoraproject.org/rpms/libxcrypt/pull-request/16 Signed-off-by: David Crosby --- cspell.json | 1 + omnibus/config/projects/chef.rb | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cspell.json b/cspell.json index 9e616aad65d..f6d89f05f49 100644 --- a/cspell.json +++ b/cspell.json @@ -634,6 +634,7 @@ "LGRPID", "LHND", "libselinux", + "libxcrypt", "linuxbrew", "linuxmint", "LISTBOX", diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index 0e120562f05..a37e07913d4 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -83,4 +83,13 @@ skip_packager true end -runtime_dependency "coreutils" if rhel? \ No newline at end of file +if rhel? + runtime_dependency "coreutils" + if platform_version.satisfies?("< 8") + # Don't touch older platforms + elsif platform_version.satisfies?("< 9") + runtime_dependency "libxcrypt-compat" + else + runtime_dependency "libxcrypt" + end +end