Accepting request 603107 from network

- 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 (forwarded request 602971 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/603107
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=117

openssh-7.6p1-SUSE_patches.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:476f021b1259a5b25c56ef81624e0c6fba39834f6432776c75c1700715daf616
-size 99505
+oid sha256:13854b50b2b34c148cab87ea676226342d871d11d4670fe2f93514d61fbcf9b1
+size 151540

openssh.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+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
+
+- additional rebased patches (bsc#1080779)
+  * auditing support
+  * LDAP integration
+  * various distribution tweaks from SLE12 
+    (X forwarding over IPv6, sftp forced permissions
+     and verbose batch mode)
+
 -------------------------------------------------------------------
 Wed Apr  4 13:19:30 CEST 2018 - kukuk@suse.de
 

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)
@@ -180,11 +187,11 @@ cat $PATCH_DIR/patch.series | while read p; do
     patch -p2 < "${PATCH_DIR}/$p"
 done
 
-#LDAP: # set libexec dir in the LDAP patch
-#LDAP: sed -i.libexec 's,@LIBEXECDIR@,%{_libexecdir}/ssh,' \
-#LDAP:     $( grep -Rl @LIBEXECDIR@ \
-#LDAP:         $( grep "^+++" %{PATCH33} | sed -r 's@^.+/([^/\t ]+).*$@\1@' )
-#LDAP:     )
+# set libexec dir in the LDAP patch
+sed -i.libexec 's,@LIBEXECDIR@,%{_libexecdir}/ssh,' \
+    $( grep -Rl @LIBEXECDIR@ \
+        $( grep "^+++" $PATCH_DIR/openssh-7.6p1-ldap.patch | sed -r 's@^.+/([^/\t ]+).*$@\1@' )
+    )
 
 %build
 autoreconf -fiv
@@ -381,10 +388,10 @@ rpm -q openssh-fips >& /dev/null && DISABLE_RESTART_ON_UPDATE=yes
 %files helpers
 %defattr(-,root,root)
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh
-#verify(not mode) %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ldap.conf
+%verify(not mode) %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ldap.conf
 %attr(0755,root,root) %dir %{_libexecdir}/ssh
-#attr(0755,root,root) %{_libexecdir}/ssh/ssh-ldap*
-#doc HOWTO.ldap-keys openssh-lpk-openldap.schema openssh-lpk-sun.schema
+%attr(0755,root,root) %{_libexecdir}/ssh/ssh-ldap*
+%doc HOWTO.ldap-keys openssh-lpk-openldap.schema openssh-lpk-sun.schema
 
 %files fips
 %defattr(-,root,root)