[packages/neon] remove compile time ssl version check. relax openssl version strictness. refs 00c6dbc, 8c7138b5

glen glen at pld-linux.org
Sat Jan 10 10:51:42 CET 2015


commit 547f737b06e1222c7dc9910dcc7edaa8d2d4e966
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jan 10 11:49:08 2015 +0200

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

 neon.spec                   |  6 ++++--
 openssl-version-check.patch | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/neon.spec b/neon.spec
index 1cbcc34..2614f78 100644
--- 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
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"));
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/neon.git/commitdiff/547f737b06e1222c7dc9910dcc7edaa8d2d4e966



More information about the pld-cvs-commit mailing list