Accepting request 66602 from home:elvigia:branches:devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/66602
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=44

_service

@@ -1,13 +1,12 @@
-<?xml version="1.0" ?>
 <services>
   <service name="download_url">
     <param name="protocol">http</param>
     <param name="host">curl.haxx.se</param>
-    <param name="path">/download/curl-7.21.2.tar.bz2</param>
+    <param name="path">/download/curl-7.21.4.tar.bz2</param>
   </service>
   <service name="verify_file">
-    <param name="file">_service:download_url:curl-7.21.2.tar.bz2</param>
+    <param name="file">_service:download_url:curl-7.21.4.tar.bz2</param>
     <param name="verifier">sha256</param>
-    <param name="checksum">f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21</param>
+    <param name="checksum">d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1</param>
   </service>
 </services>

_service:download_url:curl-7.21.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21
-size 2167919

_service:download_url:curl-7.21.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1
+size 2256354

curl-no-sslv2.patch

@@ -0,0 +1,16 @@
+--- lib/ssluse.c.orig
++++ lib/ssluse.c
+@@ -1449,8 +1449,13 @@ ossl_connect_step1(struct connectdata *c
+     use_sni(TRUE);
+     break;
+   case CURL_SSLVERSION_SSLv2:
++#ifdef OPENSSL_NO_SSL2
++    failf(data, "openSSL was compiled without SSLv2 support");
++    return CURLE_SSL_CONNECT_ERROR;
++#else
+     req_method = SSLv2_client_method();
+     use_sni(FALSE);
++#endif
+     break;
+   case CURL_SSLVERSION_SSLv3:
+     req_method = SSLv3_client_method();

curl.changes

@@ -1,4 +1,23 @@
 -------------------------------------------------------------------
+Sat Apr  9 20:42:27 UTC 2011 - crrodriguez@opensuse.org
+
+- Support openSSL compiled without SSLv2 support
+- Update to version 7.21.4
+  * SMTP: add brackets for MAIL FROM
+  * multi: connect fail => use next IP address
+  * pubkey_show: allocate buffer to fit any-size result
+  * Curl_do: avoid using stale conn pointer
+  * tftpd test server: avoid buffer overflow report from glibc
+  * OpenSSL get_cert_chain: support larger data sets
+  * SCP/SFTP transfers: acknowledge speedcheck
+  * connect problem: use UDP correctly
+  * OpenSSL: improved error message on SSL_CTX_new failures
+  * HTTP: memory leak on multiple Location:
+  * curl.1: typo in -v description
+  * CURLOPT_SOCKOPTFUNCTION: return proper error code --keepalive-time
+  * file: add support for CURLOPT_TIMECONDITION
+  * multi: fix CURLM_STATE_TOOFAST for multi_socket
+-------------------------------------------------------------------
 Fri Oct 22 16:37:03 UTC 2010 - cristian.rodriguez@opensuse.org
 
 - Update to version  7.21.2

curl.spec

@@ -40,8 +40,8 @@ BuildRequires:  libssh2-devel openssh
 BuildRequires:  stunnel
 %endif
 #define cvs_suffix -20090302
-Version:        7.21.2
+Version:        7.21.4
-Release:        1
+Release:        2
 AutoReqProv:    on
 # bug437293
 %ifarch ppc64
@@ -55,6 +55,7 @@ Url:            http://curl.haxx.se/
 Source:         curl-%version%{?cvs_suffix}.tar.bz2
 Source2:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Patch:          curl-no-sslv2.patch
 
 %description
 Curl is a client to get documents and files from or send documents to a
@@ -87,7 +88,7 @@ user interaction or any kind of interactivity.
 
 %prep
 %setup -q -n curl-%version%{?cvs_suffix}
-
+%patch
 %build
 # local hack to make curl-config --libs stop printing libraries it depends on
 # (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere,
@@ -114,7 +115,9 @@ export CFLAGS="$RPM_OPT_FLAGS"
 	--with-libssh2\
 	--libdir=%{_libdir} \
 	--enable-hidden-symbols \
-	--disable-static
+	--disable-static \
+    --enable-threaded-resolver
+
 : if this fails, the above sed hack did not work
 ./libtool --config | grep -q link_all_deplibs=no
 # enable-hidden-symbols needs gcc4 and causes that curl exports only its API