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
This commit is contained in:
Petr Cerny 2018-04-30 23:44:41 +00:00 committed by Git OBS Bridge
parent 731c398148
commit 67804a0124
3 changed files with 20 additions and 10 deletions

View File

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

View File

@ -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 Wed Apr 4 13:19:30 CEST 2018 - kukuk@suse.de

View File

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