[arch-commits] Commit in curl/trunk (2 files)

[Christian Hesse]

    Date: Wednesday, October 4, 2017 @ 09:49:59
  Author: eworm
Revision: 306711

upgpkg: curl 7.56.0-1

new upstream release, including security fixes

https://security.archlinux.org/CVE-2017-1000254

Modified:
  curl/trunk/PKGBUILD
Deleted:
  curl/trunk/0001-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch

--------------------------------------------------------------+
 0001-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch |   34 ----------
 PKGBUILD                                                     |   17 +----
 2 files changed, 5 insertions(+), 46 deletions(-)

Deleted: 0001-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch
===================================================================
--- 0001-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch	2017-10-04 09:30:10 UTC (rev 306710)
+++ 0001-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch	2017-10-04 09:49:59 UTC (rev 306711)
@@ -1,34 +0,0 @@
-From 74dac344b2feb2e0f4baddb70532dc8e45d2d817 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Fri, 18 Aug 2017 10:43:02 +0200
-Subject: [PATCH] http: Don't wait on CONNECT when there is no proxy
-
-Since curl 7.55.0, NetworkManager almost always failed its connectivity
-check by timeout. I bisected this to 5113ad04 (http-proxy: do the HTTP
-CONNECT process entirely non-blocking).
-
-This patch replaces !Curl_connect_complete with Curl_connect_ongoing,
-which returns false if the CONNECT state was left uninitialized and lets
-the connection continue.
-
-Closes #1803
-Fixes #1804
-
-Also-fixed-by: Gergely Nagy
----
- lib/http.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/http.c b/lib/http.c
-index 35c7c3d43f..3e33132783 100644
---- a/lib/http.c
-+++ b/lib/http.c
-@@ -1371,7 +1371,7 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool *done)
-   if(CONNECT_FIRSTSOCKET_PROXY_SSL())
-     return CURLE_OK; /* wait for HTTPS proxy SSL initialization to complete */
- 
--  if(!Curl_connect_complete(conn))
-+  if(Curl_connect_ongoing(conn))
-     /* nothing else to do except wait right now - we're not done here. */
-     return CURLE_OK;
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-04 09:30:10 UTC (rev 306710)
+++ PKGBUILD	2017-10-04 09:49:59 UTC (rev 306711)
@@ -6,8 +6,8 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=curl
-pkgver=7.55.1
-pkgrel=2
+pkgver=7.56.0
+pkgrel=1
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64')
 url="https://curl.haxx.se"
@@ -15,19 +15,12 @@
 depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl' 'libnghttp2')
 provides=('libcurl.so')
 options=('strip' 'debug')
-source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        0001-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch)
-sha512sums=('4b0bf36a978b8b5ba66aecedbc2ae8ae9230da63ba5b80f9553d96671e013ccd679ee9cc10946c50b94d640858d74f3ec5d4e198c6b9f8842c941986d275cf7a'
-            'SKIP'
-            'ca1f1a3d4a15dc2efa39674daec5e17f52cda5e82c5bb532a6fc833aa9398f111d63431c9858cf10ca778b023c0da2ea519ad5d1fa930a6ef161c9a71d191a1d')
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc})
+sha512sums=('f95f7d8315e7ad07796519c2ee4b831e160b28392f51a9dfc05a109f594584962a77579c11501e5bfd46048d2de939ba52c43444c2fa24d83957fde799c1ea32'
+            'SKIP')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
               '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i ../0001-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"