remove compile time ssl version check. relax openssl version strictness. refs 00c6dbc...

diff --git a/neon.spec b/neon.spec
index 1cbcc34f426177e319e8073097c3bc86ce69dc95..2614f78dd8dcf4187bad2bb34da39dfb16a18869 100644 (file)
--- a/neon.spec
+++ b/neon.spec
@@ -10,11 +10,12 @@ Summary:    An HTTP and WebDAV client library
 Summary(pl.UTF-8):     Biblioteka kliencka HTTP i WebDAV
 Name:          neon
 Version:       0.30.1
-Release:       3
+Release:       4
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://www.webdav.org/neon/%{name}-%{version}.tar.gz
 # Source0-md5: 231adebe5c2f78fded3e3df6e958878e
+Patch0:                openssl-version-check.patch
 URL:           http://www.webdav.org/neon/
 BuildRequires: autoconf >= 2.58
 BuildRequires: automake
@@ -26,7 +27,7 @@ BuildRequires:        openssl-devel >= 0.9.7d
 %{?with_pakchois:BuildRequires:        pakchois-devel}
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
-%requires_eq_to        openssl openssl-devel
+%requires_ge_to        openssl openssl-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -110,6 +111,7 @@ Dokumentacja API biblioteki neon.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize} --install

diff --git a/openssl-version-check.patch b/openssl-version-check.patch
new file mode 100644 (file)
index 0000000..56bc6a2
--- /dev/null
+++ b/openssl-version-check.patch
@@ -0,0 +1,17 @@
+neon has version check for no apparent reason - drop it
+--- neon-0.29.6/src/ne_socket.c~       2010-10-09 19:07:17.000000000 +0300
++++ neon-0.29.6/src/ne_socket.c        2015-01-10 11:47:34.384399098 +0200
+@@ -1718,13 +1718,6 @@
+       return NE_SOCK_ERROR;
+     }
+ 
+-    /* 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;
+-    }
+-
+     sock->ssl = ssl = SSL_new(ctx->ctx);
+     if (!ssl) {
+       set_error(sock, _("Could not create SSL structure"));