From 468f90ef9dda064057b370ccc04aec474539dbe4 Mon Sep 17 00:00:00 2001 From: Raymond Colebaugh Date: Apr 15 2024 23:41:15 +0000 Subject: Disable openssh-6.6p1-keyperm.patch in hs+fb builds --- diff --git a/openssh.spec b/openssh.spec index 40a112e..b1e0358 100644 --- a/openssh.spec +++ b/openssh.spec @@ -122,7 +122,9 @@ Patch502: openssh-6.6p1-keycat.patch #https://bugzilla.mindrot.org/show_bug.cgi?id=1644 Patch601: openssh-6.6p1-allow-ip-opts.patch #https://bugzilla.mindrot.org/show_bug.cgi?id=1893 (WONTFIX) +%if ! 0%{?facebook} Patch604: openssh-6.6p1-keyperm.patch +%endif #(drop?) https://bugzilla.mindrot.org/show_bug.cgi?id=1925 Patch606: openssh-5.9p1-ipv6man.patch #? @@ -475,7 +477,9 @@ 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 @@ -865,6 +869,9 @@ test -f %{sysconfig_anaconda} && \ %changelog * Mon Apr 15 2024 Raymond Colebaugh - 8.7p1-38.8 + 0.10.4-5.7 +- Disable openssh-6.6p1-keyperm.patch in hs+fb builds + +* Mon Apr 15 2024 Raymond Colebaugh - 8.7p1-38.8 + 0.10.4-5.7 - Merge new changes from upstream * Fri Jan 05 2024 Dmitry Belyavskiy - 8.7p1-38