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

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

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
 

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