From 5e850f6d735dbba260c574aba6cb351c4f88d8573e9d6c97a92cd3b8c33d0682 Mon Sep 17 00:00:00 2001 From: Petr Cerny Date: Wed, 2 May 2018 12:05:42 +0000 Subject: [PATCH] Accepting request 602971 from home:dimstar:Factory - Use TIRPC on suse_version >= 1500: sunrpc is deprecated and should be replaced by TIRPC. This has several effects: * We get RPC support back... from build log in oS:F/standard: [ 48s] checking rpc/types.h usability... no [ 48s] checking rpc/types.h presence... no [ 48s] checking for rpc/types.h... no vs this branch: [ 50s] checking rpc/types.h usability... yes [ 50s] checking rpc/types.h presence... yes [ 50s] checking for rpc/types.h... yes AND as a side-effect, FALSE for ldapbody.c is now defined (not the nicest of side-effects, but seems that ldap patch relies on RPC headers to be included. So all in all: this fixes the build failures for openSUSE Tumblewee OBS-URL: https://build.opensuse.org/request/show/602971 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=143 --- openssh.changes | 6 ++++++ openssh.spec | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/openssh.changes b/openssh.changes index 65da9dd..2f43ed2 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 2 08:14:41 UTC 2018 - dimstar@opensuse.org + +- Use TIRPC on suse_version >= 1500: sunrpc is deprecated and + should be replaced by TIRPC. + ------------------------------------------------------------------- Mon Apr 30 15:11:31 UTC 2018 - pcerny@suse.com diff --git a/openssh.spec b/openssh.spec index 20f3e54..1ca6b44 100644 --- a/openssh.spec +++ b/openssh.spec @@ -62,6 +62,10 @@ %define sandbox_seccomp 1 %endif +%if 0%{?suse_version} >= 1500 +%define use_tirpc 1 +%endif + %define _fwdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d %define _fwdefdir %{_fwdir}/services %define _appdefdir %( grep "configdirspec=" $( which xmkmf ) | sed -r 's,^[^=]+=.*-I(.*)/config.*$,\\1/app-defaults,' ) @@ -85,6 +89,9 @@ BuildRequires: libselinux-devel BuildRequires: openldap2-devel BuildRequires: openssl-devel BuildRequires: pam-devel +%if 0%{?use_tirpc} +BuildRequires: libtirpc-devel +%endif %if %{uses_systemd} BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd)