pool/openssh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 575957 from home:pcerny:factory

Browse Source 
- 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
This commit is contained in:
Petr Cerny 2018-02-12 23:48:52 +00:00 committed by Git OBS Bridge
parent 183de6e669
commit 0a67e4f87e
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openssh-7.6p1-SUSE_patches.tar.gz
View File

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

5
openssh.changes
View File

@ -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 Wed Jan 31 13:31:41 UTC 2018 - pcerny@suse.com

11
openssh.spec
View File

@ -82,11 +82,7 @@ BuildRequires: libedit-devel
%if %{has_libselinux} %if %{has_libselinux}
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
%endif %endif
%if %{suse_version} < 1330
BuildRequires: openssl-devel BuildRequires: openssl-devel
%else
BuildRequires: libopenssl-1_0_0-devel
%endif
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
BuildRequires: pam-devel BuildRequires: pam-devel
%if %{uses_systemd} %if %{uses_systemd}
@ -94,7 +90,6 @@ BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%{?systemd_requires} %{?systemd_requires}
%endif %endif
BuildRequires: tcpd-devel
PreReq: pwdutils %{fillup_prereq} coreutils PreReq: pwdutils %{fillup_prereq} coreutils
%if ! %{uses_systemd} %if ! %{uses_systemd}
PreReq: %{insserv_prereq} PreReq: %{insserv_prereq}
@ -175,6 +170,12 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE11} .
# patch sources # patch sources
PATCH_DIR="../SUSE_patches" PATCH_DIR="../SUSE_patches"
cat $PATCH_DIR/patch.series | while read p; do 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" printf ">> applying '$p'\n"
patch -p2 < "${PATCH_DIR}/$p" patch -p2 < "${PATCH_DIR}/$p"
done done