From 3786242ca0970d33536aab3496bf8d3cff28d376 Mon Sep 17 00:00:00 2001
From: Stephen Sachs <stesachs@amazon.com>
Date: Thu, 30 Jan 2025 14:36:58 +0100
Subject: [PATCH 1/2] python3-pip no longer a dependency for
 spack/postinstall.sh

Removed in
https://github.com/spack/spack-configs/commit/f8ab2987a045abbcaa2c1b90ec88f49f0ec26a19
---
 recipes/pcs/hpc_ready_ami/assets/scripts/install-spack.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/pcs/hpc_ready_ami/assets/scripts/install-spack.sh b/recipes/pcs/hpc_ready_ami/assets/scripts/install-spack.sh
index 2e37e3c..860e56e 100755
--- a/recipes/pcs/hpc_ready_ami/assets/scripts/install-spack.sh
+++ b/recipes/pcs/hpc_ready_ami/assets/scripts/install-spack.sh
@@ -81,22 +81,22 @@ download_and_install_spack() {
 
 handle_ubuntu_22.04() {
     logger "Installing deps for Ubuntu 22.04" "INFO"
-    sudo apt update && sudo apt install -y git python3-pip unzip && sudo apt clean
+    sudo apt update && sudo apt install -y git unzip && sudo apt clean
 }
 
 handle_rhel_9() { 
     logger "Installing deps for RHEL 9" "INFO"
-    sudo dnf install -y git python3-pip && sudo dnf clean all
+    sudo dnf install -y git && sudo dnf clean all
 }
 
 handle_rocky_9() {
     logger "Installing deps for Rocky Linux 9" "INFO"
-    sudo dnf install -y git python3-pip && sudo dnf clean all
+    sudo dnf install -y git && sudo dnf clean all
 }
 
 handle_amzn_2() {
     logger "Installing deps for Amazon Linux 2" "INFO"
-    sudo yum makecache && sudo yum install -y git python3-pip && sudo yum clean all
+    sudo yum makecache && sudo yum install -y git && sudo yum clean all
 }
 
 # Main function

From b2ab93c71a6cdfc67cbd3f0f9f8aa538440adbcd Mon Sep 17 00:00:00 2001
From: nicholasteock <nicholasteock@gmail.com>
Date: Thu, 20 Feb 2025 14:37:23 +0800
Subject: [PATCH 2/2] Remove ocsp-must-staple argument when issuing
 certificates

Removed --ocsp-must-staple argument from CertificateNode user script and CertificateRenewalLambda code, as LetsEncrypt has sunset support for OCSP Stapling.
---
 recipes/security/public_certs/assets/main.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/security/public_certs/assets/main.yaml b/recipes/security/public_certs/assets/main.yaml
index b571b02..ed4cd35 100644
--- a/recipes/security/public_certs/assets/main.yaml
+++ b/recipes/security/public_certs/assets/main.yaml
@@ -168,7 +168,7 @@ Resources:
               cd acme.sh-$VERSION
               ./acme.sh --install
               ./acme.sh --set-default-ca --server letsencrypt
-              ./acme.sh --issue --dns dns_aws --ocsp-must-staple --keylength 4096  -d ${DomainName} -d "*.${DomainName}"
+              ./acme.sh --issue --dns dns_aws --keylength 4096  -d ${DomainName} -d "*.${DomainName}"
 
               CERTKEYFILE=$HOME/.acme.sh/${DomainName}/${DomainName}.key
               CERTCERFILE=$HOME/.acme.sh/${DomainName}/${DomainName}.cer
@@ -322,7 +322,7 @@ Resources:
                   cd acme.sh-$VERSION
                   ./acme.sh --install
                   ./acme.sh --set-default-ca --server letsencrypt
-                  ./acme.sh --issue --dns dns_aws --ocsp-must-staple --keylength 4096  -d ${DomainName} -d "*.${DomainName}"
+                  ./acme.sh --issue --dns dns_aws --keylength 4096  -d ${DomainName} -d "*.${DomainName}"
 
                   CERTKEYFILE=$HOME/.acme.sh/${DomainName}/${DomainName}.key
                   CERTCERFILE=$HOME/.acme.sh/${DomainName}/${DomainName}.cer