From b82d685b96218f126f42c8ebc706d50dfa1a795a Mon Sep 17 00:00:00 2001
From: david22swan <david.swan@puppet.com>
Date: Fri, 10 Nov 2023 17:50:15 +0000
Subject: [PATCH] (CAT-1505) Ensure openssl-3.0 headers are not overwritten by
 openssl-1.1.1

When installing openssl-1.1.1 in order to support ruby-2.7.8 the previously installed openssl-3.0 headers are being overwritten.
This pr moves them out of the way while ruby-2.7.8 is being set up and then moves them back once it is done.
---
 configs/components/post-additional-rubies.rb | 6 ++++++
 configs/components/pre-additional-rubies.rb  | 5 +++++
 configs/projects/_pdk-components.rb          | 2 ++
 3 files changed, 13 insertions(+)
 create mode 100644 configs/components/post-additional-rubies.rb
 create mode 100644 configs/components/pre-additional-rubies.rb

diff --git a/configs/components/post-additional-rubies.rb b/configs/components/post-additional-rubies.rb
new file mode 100644
index 000000000..f97d9c15a
--- /dev/null
+++ b/configs/components/post-additional-rubies.rb
@@ -0,0 +1,6 @@
+component "post-additional-rubies" do |pkg, settings, platform|
+  pkg.build do
+    [ "rm -rf #{settings[:prefix]}/include/openssl",
+      "mv /tmp/openssl #{settings[:prefix]}/include/openssl"]
+  end
+end
diff --git a/configs/components/pre-additional-rubies.rb b/configs/components/pre-additional-rubies.rb
new file mode 100644
index 000000000..6c6bc1907
--- /dev/null
+++ b/configs/components/pre-additional-rubies.rb
@@ -0,0 +1,5 @@
+component "pre-additional-rubies" do |pkg, settings, platform|
+  pkg.build do
+    ["mv #{settings[:prefix]}/include/openssl /tmp/openssl"]
+  end
+end
diff --git a/configs/projects/_pdk-components.rb b/configs/projects/_pdk-components.rb
index 69469e565..fed6339f0 100644
--- a/configs/projects/_pdk-components.rb
+++ b/configs/projects/_pdk-components.rb
@@ -41,6 +41,7 @@
     raise "Not sure which openssl version to use for ruby #{rubyver}" unless rubyver.start_with?("2.7")
 
     # old ruby versions don't support openssl 3
+    proj.component "pre-additional-rubies"
     proj.component "openssl-1.1.1"
     proj.component "ruby-#{rubyver}"
 
@@ -49,6 +50,7 @@
     proj.component "ruby-#{ruby_minor}-augeas" unless platform.is_windows?
     proj.component "ruby-#{ruby_minor}-selinux" if platform.is_el? || platform.is_fedora?
     proj.component "ruby-#{ruby_minor}-stomp"
+    proj.component "post-additional-rubies"
   end
 end