From aa37ad4090c9298110d95ea708f04ddc769b028364bff2ed02299f74b8a3ea5a Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 21 Aug 2013 07:31:25 +0000 Subject: [PATCH] Accepting request 195764 from home:elvigia:branches:devel:libraries:c_c++ - version 0.30.0 * drop neon-openssl-version.patch * API and ABI backwards-compatible with 0.27.x and later * ne_path_escape: fix excessive memory allocation * added ne_ssl_clicert_import, ne_ssl_context_get_flag, ne_set_addrlist2, added ne_addr_canonical.. * support chunked bodies with negative length passed to ne_set_request_body_provider - permanently drop neon-aes-ni.patch which is not applied and obsolete, bug in openSSL already fixed and the ENGINE loading issue addressed in a different fashion. OBS-URL: https://build.opensuse.org/request/show/195764 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/neon?expand=0&rev=35 --- neon-0.29.6.tar.gz | 3 --- neon-0.30.0.tar.gz | 3 +++ neon-aes-ni.patch | 26 -------------------------- neon-openssl-version.patch | 21 --------------------- neon.changes | 19 +++++++++++++++++++ neon.spec | 11 ++--------- 6 files changed, 24 insertions(+), 59 deletions(-) delete mode 100644 neon-0.29.6.tar.gz create mode 100644 neon-0.30.0.tar.gz delete mode 100644 neon-aes-ni.patch delete mode 100644 neon-openssl-version.patch diff --git a/neon-0.29.6.tar.gz b/neon-0.29.6.tar.gz deleted file mode 100644 index 10717d7..0000000 --- a/neon-0.29.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43 -size 882267 diff --git a/neon-0.30.0.tar.gz b/neon-0.30.0.tar.gz new file mode 100644 index 0000000..bad3a69 --- /dev/null +++ b/neon-0.30.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2962cfcb5d30f3272e3d2fa0e473434419770a3801afe3d46e5d1650787990c2 +size 909989 diff --git a/neon-aes-ni.patch b/neon-aes-ni.patch deleted file mode 100644 index baef625..0000000 --- a/neon-aes-ni.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/ne_openssl.c.orig -+++ src/ne_openssl.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #ifdef NE_HAVE_TS_SSL - #include /* for abort() */ -@@ -1132,11 +1133,15 @@ static void thread_lock_neon(int mode, i - - int ne__ssl_init(void) - { -+ OPENSSL_config(NULL); - CRYPTO_malloc_init(); - SSL_load_error_strings(); - SSL_library_init(); -+ ENGINE_load_builtin_engines(); -+ ENGINE_register_all_complete(); - OpenSSL_add_all_algorithms(); - -+ - #ifdef NE_HAVE_TS_SSL - /* If some other library has already come along and set up the - * thread-safety callbacks, then it must be presumed that the diff --git a/neon-openssl-version.patch b/neon-openssl-version.patch deleted file mode 100644 index feff779..0000000 --- a/neon-openssl-version.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 9c65303..0d69b95 100644 --- a/neon.changes +++ b/neon.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Aug 21 03:19:07 UTC 2013 - crrodriguez@opensuse.org + +- version 0.30.0 +* drop neon-openssl-version.patch +* API and ABI backwards-compatible with 0.27.x and later +* ne_path_escape: fix excessive memory allocation +* added ne_ssl_clicert_import, ne_ssl_context_get_flag, + ne_set_addrlist2, added ne_addr_canonical.. +* support chunked bodies with negative length passed to + ne_set_request_body_provider + +------------------------------------------------------------------- +Wed Aug 21 00:34:06 UTC 2013 - crrodriguez@opensuse.org + +- permanently drop neon-aes-ni.patch which is not applied + and obsolete, bug in openSSL already fixed and the ENGINE + loading issue addressed in a different fashion. + ------------------------------------------------------------------- Wed Jun 6 13:45:57 CEST 2012 - meissner@suse.de diff --git a/neon.spec b/neon.spec index 4f70098..7b83d3b 100644 --- a/neon.spec +++ b/neon.spec @@ -1,7 +1,7 @@ # # spec file for package neon # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: neon -Version: 0.29.6 +Version: 0.30.0 Release: 0 Summary: An HTTP and WebDAV Client Library License: GPL-2.0+ @@ -39,9 +39,6 @@ Source: http://www.webdav.org/neon/neon-%{version}.tar.gz 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 -# PATCH-FIX-UPSTREAM neon-openssl-version.patch [bnc#764906] -- fix "SSL disabled due to library version mismatch" -Patch2: neon-openssl-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -152,10 +149,6 @@ properties (PROPPATCH/PROPFIND) %prep %setup -q %patch0 -# disable temporarily (bnc#720601) -#%patch1 - -%patch2 -p1 %build rm -f aclocal.m4 ltmain.sh