From c63234791a789d7b6a983ed21428c10d44f5feb7 Mon Sep 17 00:00:00 2001
From: Raymond Colebaugh <raymondcolebaugh@gmail.com>
Date: Jul 10 2024 22:47:39 +0000
Subject: [PATCH 1/2] Reenable keyperm patch in facebook builds


---

diff --git a/openssh.spec b/openssh.spec
index 2c3dee8..26eca4f 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -52,7 +52,7 @@
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %global openssh_ver 8.7p1
 %global openssh_rel 43
-%global hyperscale_rel 1
+%global hyperscale_rel 2
 %global pam_ssh_agent_ver 0.10.4
 %global pam_ssh_agent_rel 5
 
@@ -475,9 +475,7 @@ popd
 %patch502 -p1 -b .keycat
 
 %patch601 -p1 -b .ip-opts
-%if ! 0%{?facebook}
 %patch604 -p1 -b .keyperm
-%endif
 %patch606 -p1 -b .ipv6man
 %patch607 -p1 -b .sigpipe
 %patch609 -p1 -b .x11
@@ -862,6 +860,9 @@ test -f %{sysconfig_anaconda} && \
 %endif
 
 %changelog
+* Wed Jul 10 2024 Raymond Colebaugh <raymondcolebaugh@gmail.com> - 8.7p1-43.2 + 0.10.4-5.2
+- Reenable keyperm patch in facebook builds
+
 * Tue Jul 09 2024 Michel Lind <salimma@centosproject.org> - 8.7p1-43.1 + 0.10.4-5.7
 - Merge new changes from upstream
 - Drop old EL8 workarounds

From a59efe4ad5ce0eae1b072fe181e2907f2df64525 Mon Sep 17 00:00:00 2001
From: Raymond Colebaugh <raymondcolebaugh@gmail.com>
Date: Jul 10 2024 23:49:36 +0000
Subject: [PATCH 2/2] Fix pam_ssh_agent version string in changelog


---

diff --git a/openssh.spec b/openssh.spec
index 26eca4f..28ec48a 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -860,7 +860,7 @@ test -f %{sysconfig_anaconda} && \
 %endif
 
 %changelog
-* Wed Jul 10 2024 Raymond Colebaugh <raymondcolebaugh@gmail.com> - 8.7p1-43.2 + 0.10.4-5.2
+* Wed Jul 10 2024 Raymond Colebaugh <raymondcolebaugh@gmail.com> - 8.7p1-43.2 + 0.10.4-5.43.2
 - Reenable keyperm patch in facebook builds
 
 * Tue Jul 09 2024 Michel Lind <salimma@centosproject.org> - 8.7p1-43.1 + 0.10.4-5.7