From e8dcb2ae87ee31b5fbd3a7587f401f25b5b553f3 Mon Sep 17 00:00:00 2001 From: Kent Peacock Date: Aug 24 2022 23:30:02 +0000 Subject: Fix macro usage --- diff --git a/openssh.spec b/openssh.spec index 86f3d44..d7d36e1 100644 --- a/openssh.spec +++ b/openssh.spec @@ -81,8 +81,9 @@ Source12: sshd-keygen@.service Source13: sshd-keygen Source15: sshd-keygen.target Source16: ssh-agent.service -%if 0%{facebook} && 0%{use_quilt} +%if 0%{?facebook} && 0%{?use_quilt} Source17: series +BuildRequires: quilt %endif #https://bugzilla.mindrot.org/show_bug.cgi?id=2581 @@ -264,7 +265,7 @@ Patch1006: openssh-8.7p1-negotiate-supported-algs.patch # c9s specific logic factored out of openssh-7.7p1-fips.patch Patch2000: openssh-7.7p1-fips-warning.patch -%if 0%{facebook} && !0%{use_quilt} +%if 0%{?facebook} && !0%{?use_quilt} # Add a unique log session identifier to output messages for # each sshd process and its children. Patch2010: fb87_log_session_id.patch @@ -288,7 +289,7 @@ Patch2017: fb87_log_accept_env.patch # to be the full principal list of a user's SSH certificate when forced # command is present and the user is authenticated by the certificate. Patch2018: fb87_pass_principals_to_child.patch -# Log extra authenticaton informatino to the auth_info structured +# Log extra authentication information to the auth_info structured # logging field, and add tests for pubkey and cert auth. Patch2019: fb87_log_auth_info.patch %endif @@ -338,10 +339,6 @@ BuildRequires: xauth # for tarball signature verification BuildRequires: gnupg2 -%if 0%{?facebook} && 0%{?use_quilt} -BuildRequires: quilt -%endif - %package clients Summary: An open source SSH client applications Requires: openssh = %{version}-%{release} @@ -502,7 +499,7 @@ popd %patch100 -p1 -b .coverity -%if 0%{facebook} && !0%{use_quilt} +%if 0%{?facebook} && !0%{?use_quilt} %patch2010 -p1 -b .log_session_id %patch2011 -p1 -b .slog %patch2012 -p1 -b .log_port_forwards @@ -515,7 +512,7 @@ popd %patch2019 -p1 -b .log_auth_info %endif -%if 0%{facebook} && 0%{use_quilt} +%if 0%{?facebook} && 0%{?use_quilt} ln -sf %{_sourcedir} patches quilt push -a %endif