- disabled openssl version checking in code (rpm deps are sufficient)

Changed files:
    openssh-no-openssl-ver-check.patch -> 1.1
    openssh.spec -> 1.86

diff --git a/openssh-no-openssl-ver-check.patch b/openssh-no-openssl-ver-check.patch
new file mode 100644 (file)
index 0000000..641da77
--- /dev/null
+++ b/openssh-no-openssl-ver-check.patch
@@ -0,0 +1,12 @@
+--- openssh-2.9p2/entropy.c.orig       Sun Mar 18 23:38:16 2001
++++ openssh-2.9p2/entropy.c    Mon Jul 16 17:11:41 2001
+@@ -71,9 +71,6 @@
+ void
+ check_openssl_version(void) 
+ {
+-      if (SSLeay() != OPENSSL_VERSION_NUMBER)
+-              fatal("OpenSSL version mismatch. Built against %lx, you "
+-                  "have %lx", OPENSSL_VERSION_NUMBER, SSLeay());
+ }
+ 
+ #if defined(PRNGD_SOCKET) || defined(PRNGD_PORT)

diff --git a/openssh.spec b/openssh.spec
index 7f2389d583270c66371be04d25b7b79162f2a938..5eca00fc35767c137138e9522010c4ad294f1877 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -19,6 +19,7 @@ Source5:      %{name}.sysconfig
 Source6:       passwd.pamd
 Patch0:                %{name}-libwrap.patch
 Patch1:                %{name}-no_libnsl.patch
+Patch2:                %{name}-no-openssl-ver-check.patch
 URL:           http://www.openssh.com/
 BuildRequires: XFree86-devel
 BuildRequires: autoconf
@@ -29,7 +30,6 @@ BuildRequires:        pam-devel
 BuildRequires: zlib-devel
 BuildRequires: libwrap-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%requires_eq   openssl
 Prereq:                openssl
 Obsoletes:     ssh < %{version}
 Obsoletes:     ssh > %{version}
@@ -166,6 +166,7 @@ Ten pakiet zawiera ,,odpytywacz has
 %setup  -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 autoconf