From 379f205a164ac0ede684f05635fe37fba30198b1 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Fri, 23 Feb 2001 04:55:46 +0000 Subject: [PATCH] - (bal) Patch to force OpenSSH rpm to require the same version of OpenSSL that it was compiled against. Patch by Pekka Savola --- ChangeLog | 4 +++- contrib/redhat/openssh.spec | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4d4148a6c..2d2fa53b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 20010223 - (bal) Fix --define rh7 in openssh.spec file. Patch by Steve Tell + - (bal) Patch to force OpenSSH rpm to require the same version of OpenSSL + that it was compiled against. Patch by Pekka Savola 20010222 - (bal) Corrected SCO luid patch by svaughan @@ -4102,4 +4104,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.813 2001/02/23 04:45:15 mouring Exp $ +$Id: ChangeLog,v 1.814 2001/02/23 04:55:46 mouring Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 1e18aa9e1..b7c25159d 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -22,6 +22,8 @@ # rpm -ba|--rebuild --define "rh7 1" %{?rh7:%define redhat7 1} +%define exact_openssl_version %(rpm -q openssl | cut -d - -f 2) + Summary: OpenSSH free Secure Shell (SSH) implementation Name: openssh Version: %{oversion} @@ -37,6 +39,7 @@ Group: Applications/Internet BuildRoot: /tmp/openssh-%{version}-buildroot Obsoletes: ssh PreReq: openssl >= 0.9.5a +RreReq: openssl = %{exact_openssl_version} Requires: openssl >= 0.9.5a Requires: rpm >= 3.0.5 BuildPreReq: perl, openssl-devel, tcp_wrappers