[arch-commits] Commit in curl/repos (4 files)

[Jan Steffens]

    Date: Saturday, February 16, 2019 @ 02:18:07
  Author: heftig
Revision: 346353

archrelease: copy trunk to testing-x86_64

Added:
  curl/repos/testing-x86_64/
  curl/repos/testing-x86_64/0001-connection_check-set-data-to-the-transfer-doing-the-.patch
    (from rev 346352, curl/trunk/0001-connection_check-set-data-to-the-transfer-doing-the-.patch)
  curl/repos/testing-x86_64/0001-multi-remove-verbose-Expire-in-messages.patch
    (from rev 346352, curl/trunk/0001-multi-remove-verbose-Expire-in-messages.patch)
  curl/repos/testing-x86_64/PKGBUILD
    (from rev 346352, curl/trunk/PKGBUILD)

-----------------------------------------------------------------+
 0001-connection_check-set-data-to-the-transfer-doing-the-.patch |   31 ++++
 0001-multi-remove-verbose-Expire-in-messages.patch              |   26 +++
 PKGBUILD                                                        |   67 ++++++++++
 3 files changed, 124 insertions(+)

Copied: curl/repos/testing-x86_64/0001-connection_check-set-data-to-the-transfer-doing-the-.patch (from rev 346352, curl/trunk/0001-connection_check-set-data-to-the-transfer-doing-the-.patch)
===================================================================
--- testing-x86_64/0001-connection_check-set-data-to-the-transfer-doing-the-.patch	                        (rev 0)
+++ testing-x86_64/0001-connection_check-set-data-to-the-transfer-doing-the-.patch	2019-02-16 02:18:07 UTC (rev 346353)
@@ -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
+

Copied: curl/repos/testing-x86_64/0001-multi-remove-verbose-Expire-in-messages.patch (from rev 346352, curl/trunk/0001-multi-remove-verbose-Expire-in-messages.patch)
===================================================================
--- testing-x86_64/0001-multi-remove-verbose-Expire-in-messages.patch	                        (rev 0)
+++ testing-x86_64/0001-multi-remove-verbose-Expire-in-messages.patch	2019-02-16 02:18:07 UTC (rev 346353)
@@ -0,0 +1,26 @@
+From aabc7ae5ecf70973add429b5acbc86d6a57e4da5 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Mon, 11 Feb 2019 22:57:33 +0100
+Subject: [PATCH] multi: remove verbose "Expire in" ... messages
+
+Reported-by: James Brown
+Bug: https://curl.haxx.se/mail/archive-2019-02/0013.html
+Closes #3558
+---
+ lib/multi.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/lib/multi.c b/lib/multi.c
+index 6b891620f6..cd9d758ca4 100644
+--- a/lib/multi.c
++++ b/lib/multi.c
+@@ -3032,9 +3032,6 @@ void Curl_expire(struct Curl_easy *data, time_t milli, expire_id id)
+ 
+   DEBUGASSERT(id < EXPIRE_LAST);
+ 
+-  infof(data, "Expire in %ld ms for %x (transfer %p)\n",
+-        (long)milli, id, data);
+-
+   set = Curl_now();
+   set.tv_sec += milli/1000;
+   set.tv_usec += (unsigned int)(milli%1000)*1000;

Copied: curl/repos/testing-x86_64/PKGBUILD (from rev 346352, curl/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2019-02-16 02:18:07 UTC (rev 346353)
@@ -0,0 +1,67 @@
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=curl
+pkgver=7.64.0
+pkgrel=5
+pkgdesc="An URL retrieval utility and library"
+arch=('x86_64')
+url="https://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl' 'libnghttp2'
+         'libidn2' 'libidn2.so')
+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
+
+prepare() {
+  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() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --disable-ldap \
+      --disable-ldaps \
+      --disable-manual \
+      --enable-debug \
+      --enable-optimize \
+      --enable-ipv6 \
+      --enable-versioned-symbols \
+      --enable-threaded-resolver \
+      --with-gssapi \
+      --with-libssh2 \
+      --with-random=/dev/urandom \
+      --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install -C scripts
+
+  # license
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}