[arch-commits] Commit in lib32-curl/repos/multilib-x86_64 (5 files)
Felix Yan <felixonmar at archlinux.org
Felix Yan <felixonmar at archlinux.org
Mon Aug 1 15:15:12 UTC 2016
Date: Monday, August 1, 2016 @ 15:15:11
Author: felixonmars
Revision: 184753
archrelease: copy trunk to multilib-x86_64
Added:
lib32-curl/repos/multilib-x86_64/PKGBUILD
(from rev 184752, lib32-curl/trunk/PKGBUILD)
lib32-curl/repos/multilib-x86_64/curlbuild.h
(from rev 184752, lib32-curl/trunk/curlbuild.h)
Deleted:
lib32-curl/repos/multilib-x86_64/0001-curl-fix-q-regression.patch
lib32-curl/repos/multilib-x86_64/PKGBUILD
lib32-curl/repos/multilib-x86_64/curlbuild.h
----------------------------------+
0001-curl-fix-q-regression.patch | 28 -------
PKGBUILD | 136 +++++++++++++++++--------------------
curlbuild.h | 18 ++--
3 files changed, 73 insertions(+), 109 deletions(-)
Deleted: 0001-curl-fix-q-regression.patch
===================================================================
--- 0001-curl-fix-q-regression.patch 2016-08-01 15:14:51 UTC (rev 184752)
+++ 0001-curl-fix-q-regression.patch 2016-08-01 15:15:11 UTC (rev 184753)
@@ -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
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-01 15:14:51 UTC (rev 184752)
+++ PKGBUILD 2016-08-01 15:15:11 UTC (rev 184753)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Daniel Wallace <danielwallace at aur.archlinux.org>
-# Contributor: 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=lib32-curl
-_pkgname=curl
-pkgver=7.49.1
-pkgrel=1
-pkgdesc="An URL retrieval utility and library (32-bit)"
-arch=('x86_64')
-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')
-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"
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-dependency-tracking \
- --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 \
- --libdir=/usr/lib32
-
- make
-}
-
-package() {
- cd "$_pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- rm -rf "${pkgdir}"/usr/{share,bin}
-
- # license
- install -d "$pkgdir/usr/share/licenses"
- ln -s "$_pkgname" "$pkgdir/usr/share/licenses/$pkgname"
-
- # devel
- find "${pkgdir}/usr/include/curl" -type f -not -name curlbuild.h -delete
- mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/$_pkgname/curlbuild-32.h"
-}
Copied: lib32-curl/repos/multilib-x86_64/PKGBUILD (from rev 184752, lib32-curl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-08-01 15:15:11 UTC (rev 184753)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Daniel Wallace <danielwallace at aur.archlinux.org>
+# Contributor: 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=lib32-curl
+_pkgname=curl
+pkgver=7.50.0
+pkgrel=1
+pkgdesc="An URL retrieval utility and library (32-bit)"
+arch=('x86_64')
+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=('03940d7d4fcea1521fbbf07c1cf16f5e'
+ 'SKIP')
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' # Daniel Stenberg
+ '914C533DF9B2ADA2204F586D78E11C6B279D5C91') # Daniel Stenberg (old key)
+
+build() {
+ cd "$_pkgname-$pkgver"
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-dependency-tracking \
+ --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 \
+ --libdir=/usr/lib32
+
+ make
+}
+
+package() {
+ cd "$_pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "${pkgdir}"/usr/{share,bin}
+
+ # license
+ install -d "$pkgdir/usr/share/licenses"
+ ln -s "$_pkgname" "$pkgdir/usr/share/licenses/$pkgname"
+
+ # devel
+ find "${pkgdir}/usr/include/curl" -type f -not -name curlbuild.h -delete
+ mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/$_pkgname/curlbuild-32.h"
+}
Deleted: curlbuild.h
===================================================================
--- curlbuild.h 2016-08-01 15:14:51 UTC (rev 184752)
+++ curlbuild.h 2016-08-01 15:15:11 UTC (rev 184753)
@@ -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: lib32-curl/repos/multilib-x86_64/curlbuild.h (from rev 184752, lib32-curl/trunk/curlbuild.h)
===================================================================
--- curlbuild.h (rev 0)
+++ curlbuild.h 2016-08-01 15:15:11 UTC (rev 184753)
@@ -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