From f0b8ef2d59937375ddd72137efd1c80a6a276a107b01d2561029f9ee7f75d7b7 Mon Sep 17 00:00:00 2001 From: "P. Janouch" Date: Fri, 17 Jun 2016 13:15:20 +0000 Subject: [PATCH] Accepting request 402804 from home:AndreasStieger:branches:devel:libraries:c_c++ curl 7.49.1 OBS-URL: https://build.opensuse.org/request/show/402804 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=166 --- ...nvalid-Network-is-unreachable-errors.patch | 34 --------- curl-7.48.0.tar.lzma | 3 - curl-7.48.0.tar.lzma.asc | 7 -- curl-7.49.1.tar.lzma | 3 + curl-7.49.1.tar.lzma.asc | 11 +++ curl.changes | 23 +++++++ curl.keyring | 69 ++++++++++++++++--- curl.spec | 21 +++--- 8 files changed, 106 insertions(+), 65 deletions(-) delete mode 100644 0001-Fix-invalid-Network-is-unreachable-errors.patch delete mode 100644 curl-7.48.0.tar.lzma delete mode 100644 curl-7.48.0.tar.lzma.asc create mode 100644 curl-7.49.1.tar.lzma create mode 100644 curl-7.49.1.tar.lzma.asc diff --git a/0001-Fix-invalid-Network-is-unreachable-errors.patch b/0001-Fix-invalid-Network-is-unreachable-errors.patch deleted file mode 100644 index 5b0bad1..0000000 --- a/0001-Fix-invalid-Network-is-unreachable-errors.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7781f212206ab3e7e26a73132c604b2dbb2498a1 Mon Sep 17 00:00:00 2001 -From: Antonio Larrosa -Date: Thu, 5 May 2016 19:50:15 +0200 -Subject: [PATCH] Fix invalid "Network is unreachable" errors - -Sometimes, in systems with both ipv4 and ipv6 addresses but where the -network doesn't support ipv6, Curl_is_connected returns an error -(intermittently) even if the ipv4 socket connects successfully. - -This happens because there's a for-loop that iterates on the sockets -but the error variable is not resetted when the ipv4 is checked and -is ok. - -This patch fixes this problem by setting error to 0 when checking the -second socket and not having a result yet. ---- - lib/connect.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/connect.c b/lib/connect.c -index 8dfe9e2..ac2f268 100644 ---- a/lib/connect.c -+++ b/lib/connect.c -@@ -764,6 +764,7 @@ CURLcode Curl_is_connected(struct connectdata *conn, - rc = Curl_socket_ready(CURL_SOCKET_BAD, conn->tempsock[i], 0); - - if(rc == 0) { /* no connection yet */ -+ error = 0; - if(curlx_tvdiff(now, conn->connecttime) >= conn->timeoutms_per_addr) { - infof(data, "After %ldms connect time, move on!\n", - conn->timeoutms_per_addr); --- -2.8.1 - diff --git a/curl-7.48.0.tar.lzma b/curl-7.48.0.tar.lzma deleted file mode 100644 index 2a04633..0000000 --- a/curl-7.48.0.tar.lzma +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df764ca663a6589280fd6ac0adb24051ef26cfefef24451f28f99eb7338894d6 -size 5924818 diff --git a/curl-7.48.0.tar.lzma.asc b/curl-7.48.0.tar.lzma.asc deleted file mode 100644 index ab9f061..0000000 --- a/curl-7.48.0.tar.lzma.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlbyPqAACgkQeOEcayedXJHnxQCgiQ5JvClsu1EWLgDFM4aqAsZf -mmYAnizZMyraOk0q42/1A/0GnkavRUx1 -=rVbn ------END PGP SIGNATURE----- diff --git a/curl-7.49.1.tar.lzma b/curl-7.49.1.tar.lzma new file mode 100644 index 0000000..8920576 --- /dev/null +++ b/curl-7.49.1.tar.lzma @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:540dd7e2017293ac13c925951a8e3187382b6fe7be045d5806912aae3c1f7c0c +size 5989789 diff --git a/curl-7.49.1.tar.lzma.asc b/curl-7.49.1.tar.lzma.asc new file mode 100644 index 0000000..2fdbc9b --- /dev/null +++ b/curl-7.49.1.tar.lzma.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCgAGBQJXS9rrAAoJEFzJCP23HhLCQ4MIAIKNa1jj9CcGbnuFDi/buyAW +k0YEQZOOohvX0Kx/oYbga8gSKiy0NBYqS6u+MK3b8k5yDdRS6yD2eHZRdcFF/w4N +kKRS77fkYm+OdZ9KrTcK4X9VJs0T9YYBkAEJFSTmvDmM6mtoage/Kf44q+jbyB4O +QqtoZhRui2cZ+w4Eaj4R40sWpFSWKYwpzMqfrsfWlcoIUk9TZRePT60FfDXYXvVV +GeybgTlYHlFJ+imQd0jwL8+YmO4/Q48FrRoVYMX/oqiC/f4tRVeIJML2BS+W2J65 +iCPw3CPb6INCrSd4/yRAajXUxco66EQX/FO5aeCvdDDvoWdp5UD6zDTemC1gUyw= +=4/tM +-----END PGP SIGNATURE----- diff --git a/curl.changes b/curl.changes index 618e080..acc19b5 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Tue Jun 14 11:47:27 UTC 2016 - astieger@suse.com + +- curl 7.49.1: + * http2: use HTTP/2 in the HTTP/1.1-alike response + * ssh: fix build for libssh2 before 1.2.6 + * a number of bug and build fixes +- curl 7.49.0: + * schannel: Add ALPN support + * SSH: support CURLINFO_FILETIME + * SSH: new CURLOPT_QUOTE command "statvfs" + * wolfssl: Add ALPN support + * http2: added --http2-prior-knowledge + * http2: added CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE + * libcurl: added CURLOPT_CONNECT_TO + * curl: added --connect-to + * libcurl: added CURLOPT_TCP_FASTOPEN + * curl: added --tcp-fastopen + * curl: remove support for --ftpport, -http-request and --socks + * a number of bug and build fixes +- update upstream signing key and download URLs +- 0001-Fix-invalid-Network-is-unreachable-errors.patch is upstream + ------------------------------------------------------------------- Mon Jun 6 10:18:29 UTC 2016 - idonmez@suse.com diff --git a/curl.keyring b/curl.keyring index 71ba182..13ef84b 100644 --- a/curl.keyring +++ b/curl.keyring @@ -1,9 +1,5 @@ -pub 1024D/279D5C91 2003-04-28 -uid Daniel Stenberg (Haxx) -sub 1024g/B70B3510 2003-04-28 - -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 mQGiBD6tnnoRBACRPnFBVoapBrTpPrCNZ2rq3DcmW6n/soQJW47+zP+vcrcxQ1WJ QiWSzLGO+QOIUZSYfnliR22r8HkFX9EUSW3IAcRMJMsaO3wMJ0a+78a9QqWLp6RV @@ -14,15 +10,68 @@ f9UxLfo02YQ8diGYeq0u9k1RezC13w4TVUmQfg0Uqn4xM6DNzO1O6yCK8rlNwsvL gHNJA/9m1pfzjpvdxtmJNKRU3C4cRCjXhxNdM7laSEj0/wOGaR2QWWEge51orWwo SLQUIe4BDPvtRStQHC+tI7qr7d12rMMEBXviJC5EkGBOzlgWr9virjM/u/pkGMc2 m5r3pVuWH/JSsHsV952y2kWP64uP4zdLXOpVzX/xs0sYJ9nOPLQnRGFuaWVsIFN0 -ZW5iZXJnIChIYXh4KSA8ZGFuaWVsQGhheHguc2U+iFkEExECABkFAj6tnnoECwcD -AgMVAgMDFgIBAh4BAheAAAoJEHjhHGsnnVyRjngAn1gK6Q0qUTHwYJBAhIDmrRi0 -ebfDAJ4qDSHd6UU2MEkkFCgGfYgEBXKbb7kBDQQ+rZ59EAQAmYsA8gPjJ75gOIPb +ZW5iZXJnIChIYXh4KSA8ZGFuaWVsQGhheHguc2U+iF4EExECAB4CHgECF4AFAlQU +ki4FCwkIBwMFFQoJCAsFFgIDAQAACgkQeOEcayedXJEOOwCggCsNHdAQPAlPte3w +i2IZEekkM0YAoOXXPFAWjUwIHjZY41l7WgzACbANiFkEExECABkFAj6tnnoECwcD +AgMVAgMDFgIBAh4BAheAAAoJEHjhHGsnnVyRjngAoO1y3LoSOEgD8vR062cdYDmv +jLvVAJ0dmp1UiuQp+oMyq2VbWyw8LXN1XLkBDQQ+rZ59EAQAmYsA8gPjJ75gOIPb XNg9Z31QzIz65qS9XdNsFNAdKxnY4b72nhc0oaS9/7Dcdf2Q+1mDa2p72DWk+9iz 7knmBL++csBP2z9eMe5h8oV53prqNOHDHyL3WLOa25ga9381gZnzWoQME74iSBBM wDw8vbLEgIZ34JaQ7Oe+9N3+6n8AAwcD/Av+Ms+3gCc5pLp4nx36qqi36fodaG9+ dwIcMbr9bivEtjmDHeuPsD6X1J9+Y/ikUBIDpMPv33lJxLoubOtpLhEuN2XN/ojT rueVPDKA1f+GyfHnyfpf/78IgX1hGVqu/3RBWKPpXFwSZA4q8vFR+FaPC5WbU68t FLJpYuC9ZO/LiEYEGBECAAYFAj6tnn0ACgkQeOEcayedXJGtPQCgxrbd59afemZ9 -OIadZD8kUGC29dUAoJ94aGUkWCwoEiPyEZRGXv9XRlfx -=yTQx +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 +j/qx4ytjt5uxt6Jm6IXV9cry8i6x +=Phs/ -----END PGP PUBLIC KEY BLOCK----- diff --git a/curl.spec b/curl.spec index 241c558..a82b955 100644 --- a/curl.spec +++ b/curl.spec @@ -20,32 +20,30 @@ %bcond_with mozilla_nss %bcond_without testsuite Name: curl -Version: 7.48.0 +Version: 7.49.1 Release: 0 Summary: A Tool for Transferring Data from URLs License: BSD-3-Clause and MIT Group: Productivity/Networking/Web/Utilities -Url: http://curl.haxx.se/ -Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma -Source2: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma.asc +Url: https://curl.haxx.se/ +Source: https://curl.haxx.se/download/%{name}-%{version}.tar.lzma +Source2: https://curl.haxx.se/download/%{name}-%{version}.tar.lzma.asc Source3: baselibs.conf -Source4: %{name}.keyring +Source4: https://daniel.haxx.se/mykey.asc#/%{name}.keyring Patch0: libcurl-ocloexec.patch Patch1: dont-mess-with-rpmoptflags.diff Patch3: curl-secure-getenv.patch -# PATCH-FIX-UPSTREAM 0001-Fix-invalid-Network-is-unreachable-errors.patch -- Fixes "network is unreachable" errors in valid situations when ipv6 is not working but ipv4 is -Patch4: 0001-Fix-invalid-Network-is-unreachable-errors.patch BuildRequires: groff BuildRequires: krb5-mini-devel BuildRequires: libtool BuildRequires: lzma BuildRequires: openldap2-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(libidn) BuildRequires: pkgconfig(libmetalink) BuildRequires: pkgconfig(libnghttp2) BuildRequires: pkgconfig(libpsl) -BuildRequires: pkgconfig(libssh2) >= 1.6.0 +BuildRequires: pkgconfig(libssh2) BuildRequires: pkgconfig(zlib) Requires: libcurl4 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -99,7 +97,6 @@ user interaction or any kind of interactivity. %patch0 %patch1 %patch3 -%patch4 -p1 %build # curl complains if macro definition is contained in CFLAGS @@ -163,9 +160,11 @@ popd %make_install rm -f %{buildroot}%{_libdir}/libcurl.la install -Dm 0644 docs/libcurl/libcurl.m4 %{buildroot}%{_datadir}/aclocal/libcurl.m4 +pushd scripts +make %{?_smp_mflags} DESTDIR=%{buildroot} install +popd %post -n libcurl4 -p /sbin/ldconfig - %postun -n libcurl4 -p /sbin/ldconfig %files