From 183de6e669f429472b55e771ceb26bdd54a719632865c17f282419df830137fa Mon Sep 17 00:00:00 2001
From: Petr Cerny <null@suse.de>
Date: Thu, 1 Feb 2018 00:18:29 +0000
Subject: [PATCH] Accepting request 571576 from home:pcerny:factory

- .spec file cleanup

- upgrade to 7.6p1
  see main package changelog for details

- Add missing crypto hardware enablement patches for IBM mainframes
  (FATE#323902)

- add missing part of systemd integration (unit type)

OBS-URL: https://build.opensuse.org/request/show/571576
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=134
---
 openssh-7.6p1-SUSE_patches.tar.gz |  4 ++--
 openssh-askpass-gnome.changes     | 11 +++++++++++
 openssh-askpass-gnome.spec        | 16 ++++------------
 openssh.changes                   | 11 +++++++++++
 sshd.service                      |  2 ++
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/openssh-7.6p1-SUSE_patches.tar.gz b/openssh-7.6p1-SUSE_patches.tar.gz
index a01b407..ccbf2b4 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:99ff2a08373933a9a4205908a13079d9cc66aad0475ff12c7ae0fda96801f634
-size 77379
+oid sha256:1b8b4090d531508f682c5169927e1baa356e6ca19d95baf10bdece9a0f6e1e78
+size 78356
diff --git a/openssh-askpass-gnome.changes b/openssh-askpass-gnome.changes
index 5126c21..4bd8e95 100644
--- a/openssh-askpass-gnome.changes
+++ b/openssh-askpass-gnome.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jan 31 22:54:55 UTC 2018 - pcerny@suse.com
+
+- .spec file cleanup
+
+-------------------------------------------------------------------
+Fri Nov  3 12:27:18 UTC 2017 - pcerny@suse.com
+
+- upgrade to 7.6p1
+  see main package changelog for details
+
 -------------------------------------------------------------------
 Mon Jul 25 13:45:53 UTC 2016 - meissner@suse.com
 
diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index 0a1150d..9f6c381 100644
--- a/openssh-askpass-gnome.spec
+++ b/openssh-askpass-gnome.spec
@@ -16,26 +16,18 @@
 #
 
 
+%define _name openssh
 Name:           openssh-askpass-gnome
-BuildRequires:  autoconf
-BuildRequires:  automake
 BuildRequires:  gtk2-devel
-BuildRequires:  krb5-devel
-BuildRequires:  openssh
-BuildRequires:  openssl-devel
-BuildRequires:  pam-devel
-BuildRequires:  tcpd-devel
-BuildRequires:  update-desktop-files
 Version:        7.6p1
 Release:        0
-Requires:       openssh = %{version}
+Requires:       %{_name} = %{version}
 Summary:        A GNOME-Based Passphrase Dialog for OpenSSH
 License:        BSD-2-Clause
 Group:          Productivity/Networking/SSH
 Url:            http://www.openssh.com/
-%define _name openssh
-Source:         http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-Source42:       http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
+Source:         http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{_name}-%{version}.tar.gz
+Source42:       http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%{_name}-%{version}.tar.gz.asc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
diff --git a/openssh.changes b/openssh.changes
index aa2d37a..01fc438 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jan 31 13:31:41 UTC 2018 - pcerny@suse.com
+
+- Add missing crypto hardware enablement patches for IBM mainframes
+  (FATE#323902)
+
+-------------------------------------------------------------------
+Wed Jan 24 21:42:35 UTC 2018 - pcerny@suse.com
+
+- add missing part of systemd integration (unit type)
+
 -------------------------------------------------------------------
 Tue Jan 16 13:04:01 UTC 2018 - dimstar@opensuse.org
 
diff --git a/sshd.service b/sshd.service
index f455f1c..1a5cfbd 100644
--- a/sshd.service
+++ b/sshd.service
@@ -3,8 +3,10 @@ Description=OpenSSH Daemon
 After=network.target
 
 [Service]
+Type=notify
 EnvironmentFile=-/etc/sysconfig/ssh
 ExecStartPre=/usr/sbin/sshd-gen-keys-start
+ExecStartPre=/usr/sbin/sshd -t $SSHD_OPTS
 ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process