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-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 01fc438..06f4998 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 0af12a4..4deb49c 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,19 +82,14 @@ 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: openssl-devel BuildRequires: pam-devel %if %{uses_systemd} 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 echo "$p" | grep openssl_1.1.0.patch ; then + printf ">> skipping '$p'" + continue + fi +%endif printf ">> applying '$p'\n" patch -p2 < "${PATCH_DIR}/$p" done