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

[Christian Hesse]

    Date: Thursday, February 14, 2019 @ 15:38:55
  Author: eworm
Revision: 346271

upgpkg: curl 7.64.0-4

multi: remove verbose "Expire in" ... messages (FS#61754)

Added:
  curl/trunk/0001-multi-remove-verbose-Expire-in-messages.patch
Modified:
  curl/trunk/PKGBUILD

----------------------------------------------------+
 0001-multi-remove-verbose-Expire-in-messages.patch |   26 +++++++++++++++++++
 PKGBUILD                                           |   14 ++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

Added: 0001-multi-remove-verbose-Expire-in-messages.patch
===================================================================
--- 0001-multi-remove-verbose-Expire-in-messages.patch	                        (rev 0)
+++ 0001-multi-remove-verbose-Expire-in-messages.patch	2019-02-14 15:38:55 UTC (rev 346271)
@@ -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;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-14 14:14:59 UTC (rev 346270)
+++ PKGBUILD	2019-02-14 15:38:55 UTC (rev 346271)
@@ -6,7 +6,7 @@
 
 pkgname=curl
 pkgver=7.64.0
-pkgrel=3
+pkgrel=4
 pkgdesc="An URL retrieval utility and library"
 arch=('x86_64')
 url="https://curl.haxx.se"
@@ -15,11 +15,19 @@
          'libidn2' 'libidn2.so')
 provides=('libcurl.so')
 options=('strip' 'debug')
-source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc})
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+        "0001-multi-remove-verbose-Expire-in-messages.patch")
 sha512sums=('ea0e68f9cbf2eb4f235d8506962dcc7709f769ef3526c0e4c130fdaf7186a1a13b303c6ce919cb9125bbf7c64ddf4f8efb3d9269b906f856e6d7b3def027fb81'
-            'SKIP')
+            'SKIP'
+            'f09b63c36bd958c35bf6e3885efe46fea75fa2780510cac66220bfc1d771de9040560586e0672dac5eb7db7acf67051cf74e56518a8ada6f691c6d8f9dc84fa4')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 < ../0001-multi-remove-verbose-Expire-in-messages.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"