[packages/neon] drop openssl-version-check.patch, no longer needed to patch (such code not present)

glen glen at pld-linux.org
Sat Jan 10 11:09:21 CET 2015


commit c6681b440ed3297583b272fce58bac9ff8462bc5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jan 10 12:08:29 2015 +0200

    drop openssl-version-check.patch, no longer needed to patch (such code not present)

 neon.spec                   |  4 +---
 openssl-version-check.patch | 17 -----------------
 2 files changed, 1 insertion(+), 20 deletions(-)
---
diff --git a/neon.spec b/neon.spec
index 2614f78..6409d5d 100644
--- a/neon.spec
+++ b/neon.spec
@@ -10,12 +10,11 @@ Summary:	An HTTP and WebDAV client library
 Summary(pl.UTF-8):	Biblioteka kliencka HTTP i WebDAV
 Name:		neon
 Version:	0.30.1
-Release:	4
+Release:	5
 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
@@ -111,7 +110,6 @@ Dokumentacja API biblioteki neon.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize} --install
diff --git a/openssl-version-check.patch b/openssl-version-check.patch
deleted file mode 100644
index 56bc6a2..0000000
--- a/openssl-version-check.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/c6681b440ed3297583b272fce58bac9ff8462bc5



More information about the pld-cvs-commit mailing list