[arch-commits] Commit in curl/repos (10 files)
Dave Reisner
dreisner at archlinux.org
Tue May 31 13:15:06 UTC 2016
Date: Tuesday, May 31, 2016 @ 15:15:06
Author: dreisner
Revision: 268775
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
curl/repos/testing-i686/0001-curl-fix-q-regression.patch
(from rev 268774, curl/trunk/0001-curl-fix-q-regression.patch)
curl/repos/testing-i686/PKGBUILD
(from rev 268774, curl/trunk/PKGBUILD)
curl/repos/testing-i686/curlbuild.h
(from rev 268774, curl/trunk/curlbuild.h)
curl/repos/testing-x86_64/0001-curl-fix-q-regression.patch
(from rev 268774, curl/trunk/0001-curl-fix-q-regression.patch)
curl/repos/testing-x86_64/PKGBUILD
(from rev 268774, curl/trunk/PKGBUILD)
curl/repos/testing-x86_64/curlbuild.h
(from rev 268774, curl/trunk/curlbuild.h)
Deleted:
curl/repos/testing-i686/PKGBUILD
curl/repos/testing-i686/curlbuild.h
curl/repos/testing-x86_64/PKGBUILD
curl/repos/testing-x86_64/curlbuild.h
-------------------------------------------------+
/PKGBUILD | 148 ++++++++++++++++++++++
/curlbuild.h | 18 ++
testing-i686/0001-curl-fix-q-regression.patch | 28 ++++
testing-i686/PKGBUILD | 66 ---------
testing-i686/curlbuild.h | 9 -
testing-x86_64/0001-curl-fix-q-regression.patch | 28 ++++
testing-x86_64/PKGBUILD | 66 ---------
testing-x86_64/curlbuild.h | 9 -
8 files changed, 222 insertions(+), 150 deletions(-)
Copied: curl/repos/testing-i686/0001-curl-fix-q-regression.patch (from rev 268774, curl/trunk/0001-curl-fix-q-regression.patch)
===================================================================
--- testing-i686/0001-curl-fix-q-regression.patch (rev 0)
+++ testing-i686/0001-curl-fix-q-regression.patch 2016-05-31 13:15:06 UTC (rev 268775)
@@ -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
+
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2016-05-31 13:14:34 UTC (rev 268774)
+++ testing-i686/PKGBUILD 2016-05-31 13:15:06 UTC (rev 268775)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=curl
-pkgver=7.49.0
-pkgrel=1
-pkgdesc="An URL retrieval utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('ca-certificates' 'krb5' 'libidn' 'libssh2' 'openssl' 'zlib')
-provides=('libcurl.so')
-options=('strip' 'debug')
-source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
- curlbuild.h)
-md5sums=('a50a3b683d7a785e3035e5ce611160e2'
- 'SKIP'
- '751bd433ede935c8fae727377625a8ae')
-validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' # Daniel Stenberg
- '914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg (old key)
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-ldap \
- --disable-ldaps \
- --enable-ipv6 \
- --enable-manual \
- --enable-versioned-symbols \
- --enable-threaded-resolver \
- --with-gssapi \
- --with-libidn \
- --with-random=/dev/urandom \
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- 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
-
- # license
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
- # devel
- mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
- install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
-}
Copied: curl/repos/testing-i686/PKGBUILD (from rev 268774, curl/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-05-31 13:15:06 UTC (rev 268775)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=curl
+pkgver=7.49.1
+pkgrel=1
+pkgdesc="An URL retrieval utility and library"
+arch=('i686' 'x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libidn' 'libssh2' 'openssl' 'zlib')
+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'
+ 'SKIP'
+ '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"
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-ldap \
+ --disable-ldaps \
+ --enable-ipv6 \
+ --enable-manual \
+ --enable-versioned-symbols \
+ --enable-threaded-resolver \
+ --with-gssapi \
+ --with-libidn \
+ --with-random=/dev/urandom \
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ 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
+
+ # license
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+ # devel
+ mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
+ install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+}
Deleted: testing-i686/curlbuild.h
===================================================================
--- testing-i686/curlbuild.h 2016-05-31 13:14:34 UTC (rev 268774)
+++ testing-i686/curlbuild.h 2016-05-31 13:15:06 UTC (rev 268775)
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif
Copied: curl/repos/testing-i686/curlbuild.h (from rev 268774, curl/trunk/curlbuild.h)
===================================================================
--- testing-i686/curlbuild.h (rev 0)
+++ testing-i686/curlbuild.h 2016-05-31 13:15:06 UTC (rev 268775)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif
Copied: curl/repos/testing-x86_64/0001-curl-fix-q-regression.patch (from rev 268774, curl/trunk/0001-curl-fix-q-regression.patch)
===================================================================
--- testing-x86_64/0001-curl-fix-q-regression.patch (rev 0)
+++ testing-x86_64/0001-curl-fix-q-regression.patch 2016-05-31 13:15:06 UTC (rev 268775)
@@ -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
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2016-05-31 13:14:34 UTC (rev 268774)
+++ testing-x86_64/PKGBUILD 2016-05-31 13:15:06 UTC (rev 268775)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=curl
-pkgver=7.49.0
-pkgrel=1
-pkgdesc="An URL retrieval utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('ca-certificates' 'krb5' 'libidn' 'libssh2' 'openssl' 'zlib')
-provides=('libcurl.so')
-options=('strip' 'debug')
-source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
- curlbuild.h)
-md5sums=('a50a3b683d7a785e3035e5ce611160e2'
- 'SKIP'
- '751bd433ede935c8fae727377625a8ae')
-validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' # Daniel Stenberg
- '914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg (old key)
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-ldap \
- --disable-ldaps \
- --enable-ipv6 \
- --enable-manual \
- --enable-versioned-symbols \
- --enable-threaded-resolver \
- --with-gssapi \
- --with-libidn \
- --with-random=/dev/urandom \
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- 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
-
- # license
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
- # devel
- mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
- install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
-}
Copied: curl/repos/testing-x86_64/PKGBUILD (from rev 268774, curl/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-05-31 13:15:06 UTC (rev 268775)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=curl
+pkgver=7.49.1
+pkgrel=1
+pkgdesc="An URL retrieval utility and library"
+arch=('i686' 'x86_64')
+url="http://curl.haxx.se"
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libidn' 'libssh2' 'openssl' 'zlib')
+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'
+ 'SKIP'
+ '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"
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-ldap \
+ --disable-ldaps \
+ --enable-ipv6 \
+ --enable-manual \
+ --enable-versioned-symbols \
+ --enable-threaded-resolver \
+ --with-gssapi \
+ --with-libidn \
+ --with-random=/dev/urandom \
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ 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
+
+ # license
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+ # devel
+ mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild"
+ install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h"
+}
Deleted: testing-x86_64/curlbuild.h
===================================================================
--- testing-x86_64/curlbuild.h 2016-05-31 13:14:34 UTC (rev 268774)
+++ testing-x86_64/curlbuild.h 2016-05-31 13:15:06 UTC (rev 268775)
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif
Copied: curl/repos/testing-x86_64/curlbuild.h (from rev 268774, curl/trunk/curlbuild.h)
===================================================================
--- testing-x86_64/curlbuild.h (rev 0)
+++ testing-x86_64/curlbuild.h 2016-05-31 13:15:06 UTC (rev 268775)
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "curlbuild-32.h"
+#elif __WORDSIZE == 64
+#include "curlbuild-64.h"
+#else
+#error "Unknown word size"
+#endif
More information about the arch-commits
mailing list