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
This commit is contained in:
parent
136676bdf4
commit
c6f30351d4
21
neon-openssl-version.patch
Normal file
21
neon-openssl-version.patch
Normal file
@ -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) {
|
@ -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
|
Fri May 4 11:31:00 UTC 2012 - lnussel@suse.de
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Name: neon
|
Name: neon
|
||||||
Version: 0.29.6
|
Version: 0.29.6
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -41,6 +40,7 @@ Source2: baselibs.conf
|
|||||||
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
|
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
|
||||||
Patch0: %{name}-0.28.4-bloat.patch
|
Patch0: %{name}-0.28.4-bloat.patch
|
||||||
Patch1: neon-aes-ni.patch
|
Patch1: neon-aes-ni.patch
|
||||||
|
Patch2: neon-openssl-version.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -154,6 +154,8 @@ properties (PROPPATCH/PROPFIND)
|
|||||||
# disable temporarily (bnc#720601)
|
# disable temporarily (bnc#720601)
|
||||||
#%patch1
|
#%patch1
|
||||||
|
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
rm -f aclocal.m4 ltmain.sh
|
rm -f aclocal.m4 ltmain.sh
|
||||||
sh autogen.sh
|
sh autogen.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user