From c6f30351d43ad24d85b7d8839ed718c73922f793ab76e84cd1cb87679729350b Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 6 Jun 2012 16:13:18 +0000
Subject: [PATCH] Accepting request 123834 from
 home:msmeissn:branches:devel:libraries:c_c++

- disable explicit openssl version check. openssl 1.0 is stable
  api wise.

OBS-URL: https://build.opensuse.org/request/show/123834
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/neon?expand=0&rev=32
---
 neon-openssl-version.patch | 21 +++++++++++++++++++++
 neon.changes               |  6 ++++++
 neon.spec                  |  4 +++-
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 neon-openssl-version.patch

diff --git a/neon-openssl-version.patch b/neon-openssl-version.patch
new file mode 100644
index 0000000..feff779
--- /dev/null
+++ b/neon-openssl-version.patch
@@ -0,0 +1,21 @@
+Index: neon-0.29.6/src/ne_socket.c
+===================================================================
+--- neon-0.29.6.orig/src/ne_socket.c
++++ neon-0.29.6/src/ne_socket.c
+@@ -1718,12 +1718,16 @@ int ne_sock_connect_ssl(ne_socket *sock,
+ 	return NE_SOCK_ERROR;
+     }
+ 
++#if 0
++    /* with openssl 1.0 the version checking is not needed anymore
++     * as compatibility is now better */
+     /* If runtime library version differs from compile-time version
+      * number in major/minor/fix level, abort soon. */
+     if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & 0xFFFFF000) {
+         set_error(sock, _("SSL disabled due to library version mismatch"));
+         return NE_SOCK_ERROR;
+     }
++#endif
+ 
+     sock->ssl = ssl = SSL_new(ctx->ctx);
+     if (!ssl) {
diff --git a/neon.changes b/neon.changes
index 60e10fa..e626296 100644
--- a/neon.changes
+++ b/neon.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun  6 13:45:57 CEST 2012 - meissner@suse.de
+
+- disable explicit openssl version check. openssl 1.0 is stable
+  api wise.
+
 -------------------------------------------------------------------
 Fri May  4 11:31:00 UTC 2012 - lnussel@suse.de
 
diff --git a/neon.spec b/neon.spec
index f16b31c..7f90285 100644
--- a/neon.spec
+++ b/neon.spec
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           neon
 Version:        0.29.6
 Release:        0
@@ -41,6 +40,7 @@ Source2:        baselibs.conf
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
 Patch0:         %{name}-0.28.4-bloat.patch
 Patch1:         neon-aes-ni.patch
+Patch2:         neon-openssl-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -154,6 +154,8 @@ properties (PROPPATCH/PROPFIND)
 # disable temporarily (bnc#720601)
 #%patch1
 
+%patch2 -p1
+
 %build
 rm -f aclocal.m4 ltmain.sh
 sh autogen.sh