Date: Tuesday, May 31, 2016 @ 15:14:34 Author: dreisner Revision: 268774
upgpkg: curl 7.49.1-1 Added: curl/trunk/0001-curl-fix-q-regression.patch Modified: curl/trunk/PKGBUILD ----------------------------------+ 0001-curl-fix-q-regression.patch | 28 ++++++++++++++++++++++++++++ PKGBUILD | 16 ++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) Added: 0001-curl-fix-q-regression.patch =================================================================== --- 0001-curl-fix-q-regression.patch (rev 0) +++ 0001-curl-fix-q-regression.patch 2016-05-31 13:14:34 UTC (rev 268774) @@ -0,0 +1,28 @@ +From 6dbc23cfd86bbf8c1616759068a5909ced3dcc99 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <[email protected]> +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-05-31 10:45:13 UTC (rev 268773) +++ PKGBUILD 2016-05-31 13:14:34 UTC (rev 268774) @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=curl -pkgver=7.49.0 +pkgver=7.49.1 pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') @@ -16,13 +16,21 @@ provides=('libcurl.so') options=('strip' 'debug') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - curlbuild.h) -md5sums=('a50a3b683d7a785e3035e5ce611160e2' + curlbuild.h + '0001-curl-fix-q-regression.patch') +md5sums=('2feb3767b958add6a177c6602ff21e8c' 'SKIP' - '751bd433ede935c8fae727377625a8ae') + '751bd433ede935c8fae727377625a8ae' + '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"
