Accepting request 337556 from home:pluskalm:branches:devel:libraries:c_c++

- Update to 7.45.0
  * added CURLOPT_DEFAULT_PROTOCOL
  * added new tool option --proto-default
  * getinfo: added CURLINFO_ACTIVESOCKET
  * turned CURLINFO_* option docs as stand-alone man pages
  * curl: point out unnecessary uses of -X in verbose mode
- Drop curl-disable_failing_tests.patch as it is now part of 
  upstream

OBS-URL: https://build.opensuse.org/request/show/337556
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=144
This commit is contained in:
Ismail Dönmez 2015-10-10 11:43:37 +00:00 committed by Git OBS Bridge
parent 9fc1eac3cb
commit fc8a64ea5a
8 changed files with 30 additions and 33 deletions

View File

@ -12,11 +12,11 @@ https://github.com/bagder/curl/pull/175
lib/vtls/openssl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 3f93e22..34abd64 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -2012,6 +2012,10 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
Index: curl-7.45.0/lib/vtls/openssl.c
===================================================================
--- curl-7.45.0.orig/lib/vtls/openssl.c
+++ curl-7.45.0/lib/vtls/openssl.c
@@ -1952,6 +1952,10 @@ static CURLcode ossl_connect_step1(struc
"none",
data->set.str[STRING_SSL_CAPATH] ? data->set.str[STRING_SSL_CAPATH]:
"none");
@ -27,6 +27,3 @@ index 3f93e22..34abd64 100644
}
if(data->set.str[STRING_SSL_CRLFILE]) {
--
2.3.3

View File

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

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlXK47IACgkQeOEcayedXJEpMgCg8hUSyXOqdU+6oSo5j+FCQVy1
kaUAoLxHC7qRuXCP3ZCsL+VvsiOqDc/E
=JM7A
-----END PGP SIGNATURE-----

3
curl-7.45.0.tar.lzma Normal file
View File

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

7
curl-7.45.0.tar.lzma.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlYU1OQACgkQeOEcayedXJG8AgCgn1gUB53dH6GnPSc2vVOCbSat
H04AnjvZ5PByX/7hizPgsSNTS7zvuU1x
=7FT4
-----END PGP SIGNATURE-----

View File

@ -1,10 +0,0 @@
Index: curl-7.42.1/tests/data/DISABLED
===================================================================
--- curl-7.42.1.orig/tests/data/DISABLED 2015-04-26 18:26:32.000000000 +0200
+++ curl-7.42.1/tests/data/DISABLED 2015-05-20 21:03:57.598275327 +0200
@@ -10,3 +10,5 @@
836
882
938
+# requires python
+1801

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat Oct 10 06:58:35 UTC 2015 - mpluskal@suse.com
- Update to 7.45.0
* added CURLOPT_DEFAULT_PROTOCOL
* added new tool option --proto-default
* getinfo: added CURLINFO_ACTIVESOCKET
* turned CURLINFO_* option docs as stand-alone man pages
* curl: point out unnecessary uses of -X in verbose mode
- Drop curl-disable_failing_tests.patch as it is now part of
upstream
-------------------------------------------------------------------
Wed Aug 26 07:29:40 UTC 2015 - vcizek@suse.com

View File

@ -20,7 +20,7 @@
%bcond_with mozilla_nss
%bcond_without testsuite
Name: curl
Version: 7.44.0
Version: 7.45.0
Release: 0
Summary: A Tool for Transferring Data from URLs
License: BSD-3-Clause and MIT
@ -35,7 +35,6 @@ Patch1: dont-mess-with-rpmoptflags.diff
Patch3: curl-secure-getenv.patch
# PATCH-FIX-OPENSUSE lnussel@suse.de -- use openssl's built in verify path as fallback
Patch4: curl-7.41.0-use-openssl-s-built-in-verify-path-as-fallback.diff
Patch5: curl-disable_failing_tests.patch
BuildRequires: groff
BuildRequires: krb5-mini-devel
BuildRequires: libtool
@ -99,7 +98,6 @@ user interaction or any kind of interactivity.
%patch1
%patch3
%patch4 -p1
%patch5 -p1
%build
# curl complains if macro definition is contained in CFLAGS
@ -114,8 +112,8 @@ autoreconf -fi
--enable-ipv6 \
%if %{with openssl}
--with-ssl \
--without-ca-path \
--without-ca-bundle \
--without-ca-path \
--without-ca-bundle \
%else
--without-ssl \
%if %{with mozilla_nss}