From 27350401f9568aa0a9355e0467695d1559228c58 Mon Sep 17 00:00:00 2001 From: Vitaly Lipatov <lav@etersoft.ru> Date: Wed, 29 Aug 2018 11:21:42 +0300 Subject: [PATCH] fix openssl 1.1 detection, use grep -a for check text in binary --- .gear/nxssh.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gear/nxssh.spec b/.gear/nxssh.spec index fec2002..947f8cc 100644 --- a/.gear/nxssh.spec +++ b/.gear/nxssh.spec @@ -32,7 +32,7 @@ Openssh portable (Etersoft edition) for using with NX in RX@Etersoft. %setup # fix build with openssl 1.1 -if [ -s %_libdir/libssl.so.1.1 ] ; then +if [ -s %_libdir/libssl.so.1.1 ] || [ -s /%_lib/libssl.so.1.1 ] ; then %patch1 -p1 fi @@ -49,7 +49,7 @@ confdir="" %make_build || %make echo "checking ssh config path" -grep "/etc${confdir}/ssh_config" nxssh +grep -a "/etc${confdir}/ssh_config" nxssh %install mkdir -p %buildroot%_bindir/ -- 2.24.1