From: Wu Weixin <wuweixin@gmail.com>
Date: Fri, 2 Aug 2024 14:16:40 +0000 (+0800)
Subject: Fix without_openssl always being set to 1
X-Git-Tag: V_9_9_P1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49f325fd47af4e53fcd7aafdbcc280e53f5aa5ce;p=thirdparty%2Fopenssh-portable.git

Fix without_openssl always being set to 1

In Fedora systems, %{?rhel} is empty. In RHEL systems, %{?fedora} is
empty. Therefore, the original code always sets without_openssl to 1.
---

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 8893f3ad3..c053a80b9 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -33,10 +33,10 @@
 
 %global without_openssl 0
 # build without openssl where 1.1.1 is not available
-%if 0%{?fedora} <= 28
+%if %{defined fedora} && 0%{?fedora} <= 28
 %global without_openssl 1
 %endif
-%if 0%{?rhel} <= 7
+%if %{defined rhel} && 0%{?rhel} <= 7
 %global without_openssl 1
 %endif