From 67804a01243927621bc7a60953571fd8030e6ab4cd2de2506b198d06e92aa4a7 Mon Sep 17 00:00:00 2001 From: Petr Cerny Date: Mon, 30 Apr 2018 23:44:41 +0000 Subject: [PATCH 1/2] Accepting request 602709 from home:pcerny:factory - 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) OBS-URL: https://build.opensuse.org/request/show/602709 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=142 --- openssh-7.6p1-SUSE_patches.tar.gz | 4 ++-- openssh.changes | 10 ++++++++++ openssh.spec | 16 ++++++++-------- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/openssh-7.6p1-SUSE_patches.tar.gz b/openssh-7.6p1-SUSE_patches.tar.gz index 43298a9..f7ca541 100644 --- a/openssh-7.6p1-SUSE_patches.tar.gz +++ b/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 diff --git a/openssh.changes b/openssh.changes index 36c46df..65da9dd 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 diff --git a/openssh.spec b/openssh.spec index 01e7f8f..20f3e54 100644 --- a/openssh.spec +++ b/openssh.spec @@ -180,11 +180,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 +381,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) From 5e850f6d735dbba260c574aba6cb351c4f88d8573e9d6c97a92cd3b8c33d0682 Mon Sep 17 00:00:00 2001 From: Petr Cerny Date: Wed, 2 May 2018 12:05:42 +0000 Subject: [PATCH 2/2] 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)