From 673551b2c952cba09790aca8d27351dd738d88d4a6c11af99489c794201cedc5 Mon Sep 17 00:00:00 2001
From: Petr Cerny <null@suse.de>
Date: Thu, 19 Sep 2013 13:51:33 +0000
Subject: [PATCH] Accepting request 199729 from home:pcerny:factory

- spec file and patch cleanup
- patches from SLE11
- init script is moved into documentation for openSUSE 12.3+

OBS-URL: https://build.opensuse.org/request/show/199729
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=56
---
 openssh.changes | 34 ++++++++++++++++++++++++++++------
 openssh.spec    | 20 ++++++++++++++++++++
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/openssh.changes b/openssh.changes
index d5da5cb..c7120e0 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -2,13 +2,35 @@
 Thu Sep 19 02:02:56 UTC 2013 - pcerny@suse.com
 
 - spec file and patch cleanup
-  * removing obsoleted auditing patch
-    (openssh-%{version}-audit.patch)
-- added patches from SLE
-  * GSSAPI key exchange
+  * key converter is now in the -key-converter.patch
+  * openssh-nodaemon-nopid.patch is -no_fork-no_pid_file.patch
+  * openssh-nocrazyabicheck.patch is
+    -disable-openssl-abi-check.patch
+  * removing obsolete -engines.diff patch
+- patches from SLE11
+  * use auditing infrastructure extending upstream hooks
+    (-auditX-*.patch) instead of the single old patch
+    (-audit.patch)
   * FIPS enablement (currently disabled)
-  * small bugfixes 
-- split the LDAP helper into a separate package: openssh-akc-ldap
+    (-fingerprint_hash.patch, -fips.patch)
+  * GSSAPI key exchange
+    (bnc#784689, fate#313068, -gssapi_key_exchange.patch)
+  * SysV init script update - 'stop' now terminates all sshd
+    processes and closes all connections, 'soft-stop' only
+    terminates the listener process (keeps active sessions intact)
+    (fate#314243)
+  * helper application for retrieving users' public keys from
+    an LDAP server (bnc#683733, fate#302144, -ldap.patch)
+    - subpackage openssh-akc-ldap
+  * several bugfixes:
+    - login invocation
+      (bnc#833605, -login_options.patch)
+    - disable locked accounts when using PAM
+      (bnc#708678, fate#312033, -pam-check-locks.patch)
+    - fix wtmp handling
+      (bnc#18024, -lastlog.patch)
+- init script is moved into documentation for openSUSE 12.3+
+  (as it confused systemd)
 
 -------------------------------------------------------------------
 Tue Sep 10 21:15:59 UTC 2013 - crrodriguez@opensuse.org
diff --git a/openssh.spec b/openssh.spec
index 44db526..c5d3617 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -50,6 +50,12 @@
 %define has_krb_mini 0
 %endif
 
+%if 0%{?suse_version} >= 1230
+%define init_script_allowed 0
+%else
+%define init_script_allowed 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,' )
@@ -260,8 +266,12 @@ install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/sshd
 install -d -m 755 %{buildroot}%{_sysconfdir}/slp.reg.d/
 install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/slp.reg.d/
 install -d -m 755 %{buildroot}%{_initddir}
+%if %{init_script_allowed}
 install -m 755 %{SOURCE1} %{buildroot}%{_initddir}/sshd
 ln -vs ../..%{_initddir}/sshd %{buildroot}%{_sbindir}/rcsshd
+%else
+install -m 755 %{SOURCE1} .
+%endif
 install -d -m 755 %{buildroot}/var/adm/fillup-templates
 install -m 644 %{SOURCE8} %{buildroot}/var/adm/fillup-templates
 # install shell script to automate the process of adding your public key to a remote machine
@@ -293,20 +303,26 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd
 %endif
 
 %post
+%if %{init_script_allowed}
 %{fillup_and_insserv -n ssh sshd}
+%endif
 %if %{has_systemd}
 %service_add_post sshd.service
 %endif
 
 %preun
+%if %{init_script_allowed}
 %stop_on_removal sshd
+%endif
 %if %{has_systemd}
 %service_del_preun sshd.service
 %endif
 
 %postun
+%if %{init_script_allowed}
 %restart_on_update sshd
 %{insserv_cleanup}
+%endif
 %if %{has_systemd}
 %service_del_postun sshd.service
 %endif
@@ -320,7 +336,11 @@ getent passwd sshd >/dev/null || %{_sbindir}/useradd -r -g sshd -d /var/lib/sshd
 %verify(not mode) %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh/ssh_config
 %verify(not mode) %attr(0640,root,root) %config(noreplace) %{_sysconfdir}/ssh/sshd_config
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/sshd
+%if %{init_script_allowed}
 %attr(0755,root,root) %config %{_initddir}/sshd
+%else
+%doc sshd.init
+%endif
 %attr(0755,root,root) %{_bindir}/*
 %attr(0755,root,root) %{_sbindir}/*
 %attr(0755,root,root) %dir %{_libexecdir}/ssh