From 0c4ab9d007909b69c39bb7a1e418bb4c52edb81c3e77326198a5be17468856e8 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 16 May 2012 22:21:36 +0000
Subject: [PATCH] Accepting request 120648 from home:elvigia:branches:network

- By default openSSH checks at *runtime* if the openssl
  API version matches with the running library, that might
  be good if you are compiling SSH yourself but it is a totally
  insane way to check for binary/source compatibility in a distribution.

OBS-URL: https://build.opensuse.org/request/show/120648
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=25
---
 openssh-nocrazyabicheck.patch | 15 +++++++++++++++
 openssh.changes               |  8 ++++++++
 openssh.spec                  |  2 ++
 3 files changed, 25 insertions(+)
 create mode 100644 openssh-nocrazyabicheck.patch

diff --git a/openssh-nocrazyabicheck.patch b/openssh-nocrazyabicheck.patch
new file mode 100644
index 0000000..c9b07c4
--- /dev/null
+++ b/openssh-nocrazyabicheck.patch
@@ -0,0 +1,15 @@
+--- entropy.c.orig
++++ entropy.c
+@@ -213,10 +213,11 @@ seed_rng(void)
+ 	 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
+ 	 * We match major, minor, fix and status (not patch)
+ 	 */
++    /*
+ 	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
+ 		fatal("OpenSSL version mismatch. Built against %lx, you "
+ 		    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
+-
++*/
+ #ifndef OPENSSL_PRNG_ONLY
+ 	if (RAND_status() == 1) {
+ 		debug3("RNG is ready, skipping seeding");
diff --git a/openssh.changes b/openssh.changes
index 91e625f..21a1939 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu May 10 20:50:33 UTC 2012 - crrodriguez@opensuse.org
+
+- By default openSSH checks at *runtime* if the openssl 
+  API version matches with the running library, that might
+  be good if you are compiling SSH yourself but it is a totally
+  insane way to check for binary/source compatibility in a distribution.
+
 -------------------------------------------------------------------
 Mon Feb 20 08:29:17 UTC 2012 - meissner@suse.com
 
diff --git a/openssh.spec b/openssh.spec
index 6482726..890e560 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -72,6 +72,7 @@ Patch17:        %{name}-5.9p1-homechroot.patch
 Patch18:        %{name}-5.9p1-sshconfig-knownhostschanges.diff
 Patch19:        %{name}-5.9p1-host_ident.diff
 Patch20:        converter-linking.patch
+Patch21:        openssh-nocrazyabicheck.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1140
 BuildRequires:  systemd
@@ -121,6 +122,7 @@ Window System passphrase dialog for OpenSSH.
 %patch18
 %patch19 -p1
 %patch20
+%patch21
 cp -v %{SOURCE4} .
 cp -v %{SOURCE6} .
 cd ../x11-ssh-askpass-%{xversion}