Date: Thursday, July 21, 2016 @ 12:42:38 Author: dreisner Revision: 272084
upgpkg: curl 7.50.0-1 Modified: curl/trunk/PKGBUILD Deleted: curl/trunk/0001-curl-fix-q-regression.patch ----------------------------------+ 0001-curl-fix-q-regression.patch | 28 ---------------------------- PKGBUILD | 26 ++++++-------------------- 2 files changed, 6 insertions(+), 48 deletions(-) Deleted: 0001-curl-fix-q-regression.patch =================================================================== --- 0001-curl-fix-q-regression.patch 2016-07-21 09:05:34 UTC (rev 272083) +++ 0001-curl-fix-q-regression.patch 2016-07-21 12:42:38 UTC (rev 272084) @@ -1,28 +0,0 @@ -From 6dbc23cfd86bbf8c1616759068a5909ced3dcc99 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <dan...@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-21 09:05:34 UTC (rev 272083) +++ PKGBUILD 2016-07-21 12:42:38 UTC (rev 272084) @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1...@archlinux.us> pkgname=curl -pkgver=7.49.1 +pkgver=7.50.0 pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') @@ -16,21 +16,13 @@ provides=('libcurl.so') options=('strip' 'debug') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - curlbuild.h - '0001-curl-fix-q-regression.patch') -md5sums=('2feb3767b958add6a177c6602ff21e8c' + curlbuild.h) +md5sums=('03940d7d4fcea1521fbbf07c1cf16f5e' 'SKIP' - '751bd433ede935c8fae727377625a8ae' - 'cf4fe87fc22ae744d87800891d608fa3') + '751bd433ede935c8fae727377625a8ae') 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" @@ -56,14 +48,8 @@ make DESTDIR="$pkgdir" install - local ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') - case $ptrsize in - 8) _curlbuild=curlbuild-64.h ;; - 4) _curlbuild=curlbuild-32.h ;; - *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" - exit 1 - ;; - esac + local wordsize=$(cpp -include 'bits/wordsize.h' <<<'__WORDSIZE' | sed '/^#/d') + local _curlbuild=curlbuild-$wordsize.h # license install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"