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

[Felix Yan <felixonmar at archlinux.org]

    Date: Monday, August 1, 2016 @ 15:14:51
  Author: felixonmars
Revision: 184752

upgpkg: lib32-curl 7.50.0-1

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

----------------------------------+
 0001-curl-fix-q-regression.patch |   28 ----------------------------
 PKGBUILD                         |   16 ++++------------
 2 files changed, 4 insertions(+), 40 deletions(-)

Deleted: 0001-curl-fix-q-regression.patch
===================================================================
--- 0001-curl-fix-q-regression.patch	2016-08-01 14:45:17 UTC (rev 184751)
+++ 0001-curl-fix-q-regression.patch	2016-08-01 15:14:51 UTC (rev 184752)
@@ -1,28 +0,0 @@
-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-08-01 14:45:17 UTC (rev 184751)
+++ PKGBUILD	2016-08-01 15:14:51 UTC (rev 184752)
@@ -8,7 +8,7 @@
 
 pkgname=lib32-curl
 _pkgname=curl
-pkgver=7.49.1
+pkgver=7.50.0
 pkgrel=1
 pkgdesc="An URL retrieval utility and library (32-bit)"
 arch=('x86_64')
@@ -15,20 +15,12 @@
 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}
-        '0001-curl-fix-q-regression.patch')
-md5sums=('2feb3767b958add6a177c6602ff21e8c'
-         'SKIP'
-         'cf4fe87fc22ae744d87800891d608fa3')
+source=("http://curl.haxx.se/download/$_pkgname-$pkgver.tar.gz"{,.asc})
+md5sums=('03940d7d4fcea1521fbbf07c1cf16f5e'
+         'SKIP')
 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"