[arch-commits] Commit in lib32-curl/trunk (0001-curl-fix-q-regression.patch PKGBUILD)

[Felix Yan]

    Date: Sunday, July 3, 2016 @ 15:40:33
  Author: felixonmars
Revision: 181896

upgpkg: lib32-curl 7.49.1-1

Added:
  lib32-curl/trunk/0001-curl-fix-q-regression.patch
Modified:
  lib32-curl/trunk/PKGBUILD

----------------------------------+
 0001-curl-fix-q-regression.patch |   28 ++++++++++++++++++++++++++++
 PKGBUILD                         |   19 ++++++++++++++-----
 2 files changed, 42 insertions(+), 5 deletions(-)

Added: 0001-curl-fix-q-regression.patch
===================================================================
--- 0001-curl-fix-q-regression.patch	                        (rev 0)
+++ 0001-curl-fix-q-regression.patch	2016-07-03 15:40:33 UTC (rev 181896)
@@ -0,0 +1,28 @@
+From 6dbc23cfd86bbf8c1616759068a5909ced3dcc99 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Tue, 31 May 2016 14:13:33 +0200
+Subject: [PATCH] curl: fix -q [regression]
+
+This broke in 7.49.0 with commit e200034425a7625
+
+Fixes #842
+---
+ src/tool_operate.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tool_operate.c b/src/tool_operate.c
+index 5f49efb..2b53c9a 100644
+--- a/src/tool_operate.c
++++ b/src/tool_operate.c
+@@ -1842,7 +1842,7 @@ CURLcode operate(struct GlobalConfig *config, int argc, argv_item_t argv[])
+ 
+   /* Parse .curlrc if necessary */
+   if((argc == 1) ||
+-     (!curlx_strequal(argv[1], "-q") ||
++     (!curlx_strequal(argv[1], "-q") &&
+       !curlx_strequal(argv[1], "--disable"))) {
+     parseconfig(NULL, config); /* ignore possible failure */
+ 
+-- 
+2.8.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-03 15:40:12 UTC (rev 181895)
+++ PKGBUILD	2016-07-03 15:40:33 UTC (rev 181896)
@@ -8,7 +8,7 @@
 
 pkgname=lib32-curl
 _pkgname=curl
-pkgver=7.48.0
+pkgver=7.49.1
 pkgrel=1
 pkgdesc="An URL retrieval utility and library (32-bit)"
 arch=('x86_64')
@@ -15,11 +15,20 @@
 url="http://curl.haxx.se"
 license=('MIT')
 depends=('lib32-libssh2' 'lib32-krb5' 'lib32-libidn' "${_pkgname}")
-source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc})
-md5sums=('b2cac71029d28cb989150bac72aafab5'
-         'SKIP')
-validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg
+source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc}
+        '0001-curl-fix-q-regression.patch')
+md5sums=('2feb3767b958add6a177c6602ff21e8c'
+         'SKIP'
+         'cf4fe87fc22ae744d87800891d608fa3')
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
+              '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg (old key)
 
+prepare() {
+  cd "$_pkgname-$pkgver"
+
+  patch -Np1 <../0001-curl-fix-q-regression.patch
+}
+
 build() {
   cd "$_pkgname-$pkgver"