From ab91ccf3d3c50e5f1f882459800475fae467ad0b Mon Sep 17 00:00:00 2001 From: Maqsood Ahmad Date: Fri, 15 Mar 2024 12:25:01 +0530 Subject: [PATCH] (PE-37599) Build client-tools-runtime-2021.7.x project for Red Hat 9 FIPS (Intel) --- configs/projects/_shared-client-tools-runtime.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/configs/projects/_shared-client-tools-runtime.rb b/configs/projects/_shared-client-tools-runtime.rb index 65a566248..3672454ae 100644 --- a/configs/projects/_shared-client-tools-runtime.rb +++ b/configs/projects/_shared-client-tools-runtime.rb @@ -25,8 +25,8 @@ # and krb5-devel if proj.settings[:openssl_version] # already defined in the project -elsif platform.name =~ /^redhatfips-8/ - proj.setting(:openssl_version, '1.1.1k') +elsif platform.name =~ /^redhatfips-[89]/ + proj.setting(:openssl_version, '1.1.1-fips') else proj.setting(:openssl_version, '1.1.1') end @@ -107,13 +107,14 @@ # Common deps proj.component "runtime-client-tools" -if platform.name =~ /^redhatfips-7/ && proj.openssl_version == '1.1.1' - proj.component "openssl-1.1.1-fips" -elsif platform.name =~ /^redhatfips-8/ && proj.openssl_version == '1.1.1k' +if proj.openssl_version =~ /^3\./ + proj.component "openssl-#{proj.openssl_version}" +elsif platform.name =~ /^redhatfips-.*/ proj.component "openssl-1.1.1-fips" -elsif proj.settings[:openssl_version] +else proj.component "openssl-#{proj.openssl_version}" end + proj.component "curl" proj.component "puppet-ca-bundle" proj.component "libicu"