#7 Reenable keyperm patch in facebook builds
Merged 4 months ago by dcavalca. Opened 4 months ago by rcolebaugh.
rpms/ rcolebaugh/openssh c9s-sig-hyperscale  into  c9s-sig-hyperscale

file modified
+4 -3
@@ -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 @@ 

  %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 @@ 

  %endif

  

  %changelog

+ * 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

  - Merge new changes from upstream

  - Drop old EL8 workarounds

There is a bit of other logic that changes the group/permissions for the sshd host keys. Rather than add many more conditionals and branch further from the c9s build, let's just reenable the keyperm patch.

Did a scratch build on CBS: https://cbs.centos.org/koji/taskinfo?taskID=4072597

This doesn't look right, the second version is lower than the previous one.

This doesn't look right, the second version is lower than the previous one.

I believe the end of this version number is the hyperscale_rel, I think it just wasn't kept up to date for the past couple releases

1 new commit added

  • Fix pam_ssh_agent version string in changelog
4 months ago

Pull-Request has been merged by dcavalca

4 months ago

Cool thank you @dcavalca, looks like a bunch of the previous changelog entries were using the incorrect format. Just fixed the version string for this latest changelog entry to 8.7p1-43.2 + 0.10.4-5.43.2

Metadata