Changes - j0ke.net Open Build Service

[-] [+]	Changed	nrpe.spec
@@ -26,6 +26,7 @@ Patch0: %{myname}-suse-init.patch Patch1: %{myname}-config.patch Patch2: %{myname}-%{version}_ADH.patch +Patch3: %{myname}-%{version}_openssl.patch BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{_prefix} Prefix: /etc/init.d @@ -70,6 +71,9 @@ %patch0 %patch1 %patch2 +%if 0%{?rhel} >= 8 +%patch3 +%endif %pre # Create `nagios' group on the system if necessary @@ -149,8 +153,8 @@ ./configure \ %if 0%{?rhel} >= 8 --with-ssl=`pwd`/openssl-1.0.2t \ - --with-ssl-inc=`pwd`/openssl-1.0.2t/include/openssl \ - --with-ssl-lib=`pwd`/openssl-1.0.2t/ \ + --with-ssl-inc=`pwd`/openssl-1.0.2t/include \ + --with-ssl-lib=`pwd`/openssl-1.0.2t \ %endif --with-init-dir=/etc/init.d \ --with-nrpe-port=%{nsport} \
[-] [+]	Added	nrpe-2.15_openssl.patch ^
@@ -0,0 +1,13 @@ +--- configure.orig 2019-10-15 09:13:46.254901444 +0200 ++++ configure 2019-10-15 09:14:28.062903299 +0200 +@@ -6739,7 +6739,9 @@ + + echo "" + echo "* Generating DH Parameters for SSL/TLS *" +- if test -f "$ssldir/sbin/openssl"; then ++ if test -f "$ssldir/apps/openssl"; then ++ sslbin=$ssldir/apps/openssl ++ elif test -f "$ssldir/sbin/openssl"; then + sslbin=$ssldir/sbin/openssl + else + sslbin=$ssldir/bin/openssl