Accepting request 236974 from home:vitezslav_cizek:branches:devel:libraries:c_c++

- update to 7.37.0 This release includes many bugfixes and the following changes: * URL parser: IPv6 zone identifiers are now supported * CURLOPT_PROXYHEADER: set headers for proxy-only * CURLOPT_HEADEROPT: added * curl: add --proxy-header * sasl: Added support for DIGEST-MD5 via Windows SSPI * sasl: Added DIGEST-MD5 qop-option validation in native challange handling * imap: Expanded mailbox SEARCH support to use URL query strings [7] * imap: Extended FETCH support to include PARTIAL URL specifier [7] * nss: implement non-blocking SSL handshake * build: Reworked Visual Studio project files * poll: enable poll on darwin13 * mk-ca-bundle: added -p * libtests: add a wait_ms() function - dropped patches: * curl-mkhelp.patch (upstream) * curl-test815.patch (upstream) OBS-URL: https://build.opensuse.org/request/show/236974 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=109
2014-06-13 18:45:54 +00:00 · 2014-06-13 18:45:54 +00:00 · 6850329ab5
commit 6850329ab5
parent 72b5dc06cb
8 changed files with 33 additions and 96 deletions
--- a/curl-7.36.0.tar.lzma
+++ b/curl-7.36.0.tar.lzma
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:94126649f4f12d3332ca1185559ec5faca6929227e794387b7b82b73714b388a
-size 2276862
--- a/curl-7.36.0.tar.lzma.asc
+++ b/curl-7.36.0.tar.lzma.asc
@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlMyeZEACgkQeOEcayedXJFTpACfaOmp5/t6thzl/LLM4L6/AO70
-i5oAoJLzbaqGU31OhelQxcyrRX2gDubB
-=++7u
-----END PGP SIGNATURE-----
--- a/curl-7.37.0.tar.lzma
+++ b/curl-7.37.0.tar.lzma
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3cdc4666dc934b3fa8adf2e225769becee0dea072ba4ee6369ce60d8713e357a
+size 2323713
--- a/curl-7.37.0.tar.lzma.asc
+++ b/curl-7.37.0.tar.lzma.asc
@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlN8QMkACgkQeOEcayedXJE24wCgr1aAWOegokq2WJQVLDIrW32n
+je4AoPKSxcgo3RY8MW8SLPvmtGFSDVdz
+=jHo4
+-----END PGP SIGNATURE-----
--- a/curl-mkhelp.patch
+++ b/curl-mkhelp.patch
@ -1,34 +0,0 @@
-From 38d582ff541353d738858299d4a2b78bafac03ed Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Wed, 26 Mar 2014 13:22:10 +0100
-Subject: [PATCH] mkhelp: generate code for --disable-manual as well
-
-This allows configure --disable-manual to run and build without having
-to regenerate the src/tool_hugehelp.c file which otherwise is necessary
-since we ship tarballs with that file present.
-
-Reported-by: Remi Gacogne
-Bug: http://curl.haxx.se/bug/view.cgi?id=1350
---
- src/mkhelp.pl | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/mkhelp.pl b/src/mkhelp.pl
-index 444b669..7ed86f7 100644
--- a/src/mkhelp.pl
-+++ b/src/mkhelp.pl
-@@ -256,6 +256,10 @@
- 
- sub foot {
-   print <<FOOT
-+#else /* !USE_MANUAL */
-+/* built-in manual is disabled, blank function */
-+#include "tool_hugehelp.h"
-+void hugehelp(void) {}
- #endif /* USE_MANUAL */
- FOOT
-   ;
-- 
-1.9.1
-
-
--- a/curl-test815.patch
+++ b/curl-test815.patch
@ -1,43 +0,0 @@
-From f82e0edc171b33528bc4f59036505d98ecf1d816 Mon Sep 17 00:00:00 2001
-From: Dan Fandrich <dan@coneharvesters.com>
-Date: Wed, 26 Mar 2014 22:02:31 +0100
-Subject: [PATCH] test815/816: Use authentication for both URLs
-
-The improved connection reuse logic would otherwise create a new
-connection for each one, which isn't supported by the test
-server, nor expected by the test.
---
- tests/data/test815 | 2 +-
- tests/data/test816 | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/data/test815 b/tests/data/test815
-index c006c6d..5c5ef79 100644
--- a/tests/data/test815
-+++ b/tests/data/test815
-@@ -26,7 +26,7 @@ imap
- IMAP STORE - delete message (CUSTOMREQUEST)
-  </name>
-  <command>
-imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/815 -X CLOSE
-+imap://%HOSTIP:%IMAPPORT/815 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/815 -X CLOSE -u user:secret
- </command>
- </client>
- 
-diff --git a/tests/data/test816 b/tests/data/test816
-index 386f877..b8b1a9d 100644
--- a/tests/data/test816
-+++ b/tests/data/test816
-@@ -29,7 +29,7 @@ imap
- IMAP STORE - delete message with confirmation (CUSTOMREQUEST)
-  </name>
-  <command>
-imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/816 -X EXPUNGE
-+imap://%HOSTIP:%IMAPPORT/816 -X 'STORE 123 +Flags \Deleted' -u user:secret -: imap://%HOSTIP:%IMAPPORT/816 -X EXPUNGE -u user:secret
- </command>
- </client>
- 
-- 
-1.9.1
-
-
--- a/curl.changes
+++ b/curl.changes
@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Jun 12 11:45:03 UTC 2014 - vcizek@suse.com
+
+- update to 7.37.0
+  This release includes many bugfixes and the following changes:
+  * URL parser: IPv6 zone identifiers are now supported
+  * CURLOPT_PROXYHEADER: set headers for proxy-only
+  * CURLOPT_HEADEROPT: added
+  * curl: add --proxy-header
+  * sasl: Added support for DIGEST-MD5 via Windows SSPI
+  * sasl: Added DIGEST-MD5 qop-option validation in native challange handling
+  * imap: Expanded mailbox SEARCH support to use URL query strings [7]
+  * imap: Extended FETCH support to include PARTIAL URL specifier [7]
+  * nss: implement non-blocking SSL handshake
+  * build: Reworked Visual Studio project files
+  * poll: enable poll on darwin13
+  * mk-ca-bundle: added -p
+  * libtests: add a wait_ms() function
+  - dropped patches:
+    * curl-mkhelp.patch (upstream)
+    * curl-test815.patch (upstream)
+
 -------------------------------------------------------------------
 Fri Apr 11 06:51:54 UTC 2014 - vcizek@suse.com

--- a/curl.spec
+++ b/curl.spec
@ -21,7 +21,7 @@
 %bcond_without testsuite

 Name:           curl
-Version:        7.36.0
+Version:        7.37.0
 Release:        0
 Summary:        A Tool for Transferring Data from URLs
 License:        BSD-3-Clause and MIT
@ -34,8 +34,6 @@ Source4:        %{name}.keyring
 Patch:          libcurl-ocloexec.patch
 Patch1:         dont-mess-with-rpmoptflags.diff
 Patch3:         curl-secure-getenv.patch
-Patch4:         curl-mkhelp.patch
-Patch5:         curl-test815.patch
 # Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run one-shot check by "gpg-offline --verify --package=curl curl-*.asc".
 %if 0%{?VERIFY_SIG}
 BuildRequires:  gpg-offline
@ -102,12 +100,6 @@ user interaction or any kind of interactivity.
 %patch
 %patch1
 %patch3
-%patch4 -p1
-%patch5 -p1
-# temporary workaround to fix build of 7.36.0
-# http://curl.haxx.se/mail/tracker-2014-03/0083.html
-# removes tool_hugehelp.c to regenerate it later
-rm src/tool_hugehelp.c

 %build
 # curl complains if macro definition is contained in CFLAGS