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)