From c2cfddf9bf3902c9c9567ef5b0bc0fc374cd211c8015beab61077d5aa7a9e1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 20 May 2011 15:40:30 +0000
Subject: [PATCH] Accepting request 70837 from
 home:elvigia:branches:devel:libraries:c_c++

- Update to 7.21.6
* curl-config: fix --version
* use HTTPS properly after CONNECT
* SFTP: close file before post quote operations

OBS-URL: https://build.opensuse.org/request/show/70837
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=46
---
 _service                                  | 12 ------------
 _service:download_url:curl-7.21.4.tar.bz2 |  3 ---
 curl-7.21.6.tar.bz2                       |  3 +++
 curl-no-sslv2.patch                       | 16 ----------------
 curl.changes                              |  8 ++++++++
 curl.spec                                 |  6 +++---
 6 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 _service
 delete mode 100644 _service:download_url:curl-7.21.4.tar.bz2
 create mode 100644 curl-7.21.6.tar.bz2
 delete mode 100644 curl-no-sslv2.patch

diff --git a/_service b/_service
deleted file mode 100644
index f94c024..0000000
--- a/_service
+++ /dev/null
@@ -1,12 +0,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.4.tar.bz2</param>
-  </service>
-  <service name="verify_file">
-    <param name="file">_service:download_url:curl-7.21.4.tar.bz2</param>
-    <param name="verifier">sha256</param>
-    <param name="checksum">d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1</param>
-  </service>
-</services>
\ No newline at end of file
diff --git a/_service:download_url:curl-7.21.4.tar.bz2 b/_service:download_url:curl-7.21.4.tar.bz2
deleted file mode 100644
index 64ce98b..0000000
--- a/_service:download_url:curl-7.21.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5337445462cbb4810ff73f14de4b259f825b218654f890dc6451a51aa694de1
-size 2256354
diff --git a/curl-7.21.6.tar.bz2 b/curl-7.21.6.tar.bz2
new file mode 100644
index 0000000..8664a8e
--- /dev/null
+++ b/curl-7.21.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9a3d3593796147ad9ca994c9e6834a42b49756420a10e996dbf849495d3d955
+size 2311355
diff --git a/curl-no-sslv2.patch b/curl-no-sslv2.patch
deleted file mode 100644
index 23f102e..0000000
--- a/curl-no-sslv2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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();
diff --git a/curl.changes b/curl.changes
index 8b939f0..a930685 100644
--- a/curl.changes
+++ b/curl.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May 20 15:37:54 UTC 2011 - crrodriguez@opensuse.org
+
+- Update to 7.21.6
+* curl-config: fix --version 
+* use HTTPS properly after CONNECT
+* SFTP: close file before post quote operations
+
 -------------------------------------------------------------------
 Thu Apr 14 17:02:19 UTC 2011 - crrodriguez@opensuse.org
 
diff --git a/curl.spec b/curl.spec
index 8f032bc..69200d3 100644
--- a/curl.spec
+++ b/curl.spec
@@ -41,7 +41,7 @@ BuildRequires:  libcares-devel
 BuildRequires:  stunnel
 %endif
 #define cvs_suffix -20090302
-Version:        7.21.4
+Version:        7.21.6
 Release:        2
 AutoReqProv:    on
 # bug437293
@@ -56,7 +56,6 @@ 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
@@ -89,13 +88,14 @@ 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,
 # will hopefully change in the future)
 sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure
 export CFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="-Wl,--no-copy-dt-needed-entries"
 ./configure \
 	--prefix=%{_prefix} \
 	--enable-ipv6 \