From 0a67e4f87e096104295053a6f5a31b521d1d1c0a512ee509771f2c56b78ffa99 Mon Sep 17 00:00:00 2001
From: Petr Cerny <null@suse.de>
Date: Mon, 12 Feb 2018 23:48:52 +0000
Subject: [PATCH 1/3] Accepting request 575957 from home:pcerny:factory

- add OpenSSL 1.0 to 1.1 shim to remove dependency on old OpenSSL

OBS-URL: https://build.opensuse.org/request/show/575957
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=136
---
 openssh-7.6p1-SUSE_patches.tar.gz |  4 ++--
 openssh.changes                   |  5 +++++
 openssh.spec                      | 11 ++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/openssh-7.6p1-SUSE_patches.tar.gz b/openssh-7.6p1-SUSE_patches.tar.gz
index ccbf2b4..43298a9 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:1b8b4090d531508f682c5169927e1baa356e6ca19d95baf10bdece9a0f6e1e78
-size 78356
+oid sha256:476f021b1259a5b25c56ef81624e0c6fba39834f6432776c75c1700715daf616
+size 99505
diff --git a/openssh.changes b/openssh.changes
index 01fc438..11fa4aa 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 12 22:55:01 UTC 2018 - pcerny@suse.com
+
+- add OpenSSL 1.0 to 1.1 shim to remove dependency on old OpenSSL
+
 -------------------------------------------------------------------
 Wed Jan 31 13:31:41 UTC 2018 - pcerny@suse.com
 
diff --git a/openssh.spec b/openssh.spec
index 0af12a4..856f12b 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -82,11 +82,7 @@ BuildRequires:  libedit-devel
 %if %{has_libselinux}
 BuildRequires:  libselinux-devel
 %endif
-%if %{suse_version} < 1330
 BuildRequires:  openssl-devel
-%else
-BuildRequires:  libopenssl-1_0_0-devel
-%endif
 BuildRequires:  openldap2-devel
 BuildRequires:  pam-devel
 %if %{uses_systemd}
@@ -94,7 +90,6 @@ BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(systemd)
 %{?systemd_requires}
 %endif
-BuildRequires:  tcpd-devel
 PreReq:         pwdutils %{fillup_prereq} coreutils
 %if ! %{uses_systemd}
 PreReq:         %{insserv_prereq}
@@ -175,6 +170,12 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE11} .
 # patch sources
 PATCH_DIR="../SUSE_patches"
 cat $PATCH_DIR/patch.series | while read p; do
+%if %{suse_version} < 1330
+    if [[ "$p" =~ "openssl_1.1.0.patch" ]]; then
+        printf ">> skiping '$p'"
+        continue
+    fi
+%endif
     printf ">> applying '$p'\n"
     patch -p2 < "${PATCH_DIR}/$p"
 done

From f82cf6b5dab1d9097bcdd6169b48a0d0bf4a1dfb6fe812e32051d2c3a21a26b3 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 5 Mar 2018 16:40:33 +0000
Subject: [PATCH 2/3] (update tracker: bsc#1080779)

OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=137
---
 openssh-askpass-gnome.spec | 2 +-
 openssh.changes            | 1 +
 openssh.spec               | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index 9f6c381..a1ae655 100644
--- a/openssh-askpass-gnome.spec
+++ b/openssh-askpass-gnome.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openssh-askpass-gnome
 #
-# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/openssh.changes b/openssh.changes
index 11fa4aa..06f4998 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -2,6 +2,7 @@
 Mon Feb 12 22:55:01 UTC 2018 - pcerny@suse.com
 
 - add OpenSSL 1.0 to 1.1 shim to remove dependency on old OpenSSL
+  (update tracker: bsc#1080779)
 
 -------------------------------------------------------------------
 Wed Jan 31 13:31:41 UTC 2018 - pcerny@suse.com
diff --git a/openssh.spec b/openssh.spec
index 856f12b..cbd2f1a 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openssh
 #
-# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -82,8 +82,8 @@ BuildRequires:  libedit-devel
 %if %{has_libselinux}
 BuildRequires:  libselinux-devel
 %endif
-BuildRequires:  openssl-devel
 BuildRequires:  openldap2-devel
+BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 %if %{uses_systemd}
 BuildRequires:  pkgconfig(libsystemd)

From 01100ac5fc38b6d109b289397144bd4834c3e1d7824c313c7a17c360f5af6308 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 5 Mar 2018 16:42:43 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/network/openssh?expand=0&rev=138

---
 openssh.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openssh.spec b/openssh.spec
index cbd2f1a..4deb49c 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -171,8 +171,8 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE11} .
 PATCH_DIR="../SUSE_patches"
 cat $PATCH_DIR/patch.series | while read p; do
 %if %{suse_version} < 1330
-    if [[ "$p" =~ "openssl_1.1.0.patch" ]]; then
-        printf ">> skiping '$p'"
+    if echo "$p" | grep openssl_1.1.0.patch ; then
+        printf ">> skipping '$p'"
         continue
     fi
 %endif