Commit 27350401 authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix openssl 1.1 detection, use grep -a for check text in binary

parent 504370ea
Pipeline #2591 passed with stages
in 15 minutes 53 seconds
...@@ -32,7 +32,7 @@ Openssh portable (Etersoft edition) for using with NX in RX@Etersoft. ...@@ -32,7 +32,7 @@ Openssh portable (Etersoft edition) for using with NX in RX@Etersoft.
%setup %setup
# fix build with openssl 1.1 # 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 %patch1 -p1
fi fi
...@@ -49,7 +49,7 @@ confdir="" ...@@ -49,7 +49,7 @@ confdir=""
%make_build || %make %make_build || %make
echo "checking ssh config path" echo "checking ssh config path"
grep "/etc${confdir}/ssh_config" nxssh grep -a "/etc${confdir}/ssh_config" nxssh
%install %install
mkdir -p %buildroot%_bindir/ mkdir -p %buildroot%_bindir/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment