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

[Jan Steffens]

    Date: Saturday, February 16, 2019 @ 02:17:52
  Author: heftig
Revision: 346352

7.64.0-5: patch for crash; add options to avoid filtering out debug flags

Added:
  curl/trunk/0001-connection_check-set-data-to-the-transfer-doing-the-.patch
Modified:
  curl/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-connection_check-set-data-to-the-transfer-doing-the-.patch |   31 ++++++++++
 PKGBUILD                                                        |   10 ++-
 2 files changed, 40 insertions(+), 1 deletion(-)

Added: 0001-connection_check-set-data-to-the-transfer-doing-the-.patch
===================================================================
--- 0001-connection_check-set-data-to-the-transfer-doing-the-.patch	                        (rev 0)
+++ 0001-connection_check-set-data-to-the-transfer-doing-the-.patch	2019-02-16 02:17:52 UTC (rev 346352)
@@ -0,0 +1,31 @@
+From 38d8e1bd4ed1ae52930ae466ecbac78e888b142f Mon Sep 17 00:00:00 2001
+Message-Id: <38d8e1bd4ed1ae52930ae466ecbac78e888b142f.1550283194.git.jan.steffens at gmail.com>
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Mon, 11 Feb 2019 07:56:00 +0100
+Subject: [PATCH] connection_check: set ->data to the transfer doing the check
+
+The http2 code for connection checking needs a transfer to use. Make
+sure a working one is set before handler->connection_check() is called.
+
+Reported-by: jnbr on github
+Fixes #3541
+Closes #3547
+---
+ lib/url.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/url.c b/lib/url.c
+index bdb472999..bc47685db 100644
+--- a/lib/url.c
++++ b/lib/url.c
+@@ -964,6 +964,7 @@ static bool extract_if_dead(struct connectdata *conn,
+       /* The protocol has a special method for checking the state of the
+          connection. Use it to check if the connection is dead. */
+       unsigned int state;
++      conn->data = data; /* use this transfer for now */
+       state = conn->handler->connection_check(conn, CONNCHECK_ISDEAD);
+       dead = (state & CONNRESULT_DEAD);
+     }
+-- 
+2.20.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-15 23:58:16 UTC (rev 346351)
+++ PKGBUILD	2019-02-16 02:17:52 UTC (rev 346352)
@@ -6,7 +6,7 @@
 
 pkgname=curl
 pkgver=7.64.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An URL retrieval utility and library"
 arch=('x86_64')
 url="https://curl.haxx.se"
@@ -16,9 +16,11 @@
 provides=('libcurl.so')
 options=('strip' 'debug')
 source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        "0001-connection_check-set-data-to-the-transfer-doing-the-.patch"
         "0001-multi-remove-verbose-Expire-in-messages.patch")
 sha512sums=('ea0e68f9cbf2eb4f235d8506962dcc7709f769ef3526c0e4c130fdaf7186a1a13b303c6ce919cb9125bbf7c64ddf4f8efb3d9269b906f856e6d7b3def027fb81'
             'SKIP'
+            'e9fdd70ec6798f48080582e4cb554fc4cd247075c293c66dcf8b27cab151def1c709c306e4dc8a1439b9843f31fe51248b5d6c7f5183e4af65819a084fddcb1f'
             'f09b63c36bd958c35bf6e3885efe46fea75fa2780510cac66220bfc1d771de9040560586e0672dac5eb7db7acf67051cf74e56518a8ada6f691c6d8f9dc84fa4')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
 
@@ -26,6 +28,10 @@
   cd "$pkgname-$pkgver"
 
   patch -Np1 < ../0001-multi-remove-verbose-Expire-in-messages.patch
+
+  # Crash in cargo:
+  # https://github.com/curl/curl/issues/3541
+  patch -Np1 < ../0001-connection_check-set-data-to-the-transfer-doing-the-.patch
 }
 
 build() {
@@ -37,6 +43,8 @@
       --disable-ldap \
       --disable-ldaps \
       --disable-manual \
+      --enable-debug \
+      --enable-optimize \
       --enable-ipv6 \
       --enable-versioned-symbols \
       --enable-threaded-resolver \