[arch-commits] Commit in curl/repos (8 files)

2017-02-24 Thread Christian Hesse 
Date: Friday, February 24, 2017 @ 09:44:18
  Author: eworm
Revision: 289478

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  curl/repos/staging-i686/PKGBUILD
(from rev 289477, curl/trunk/PKGBUILD)
  curl/repos/staging-i686/curlbuild.h
(from rev 289477, curl/trunk/curlbuild.h)
  curl/repos/staging-x86_64/PKGBUILD
(from rev 289477, curl/trunk/PKGBUILD)
  curl/repos/staging-x86_64/curlbuild.h
(from rev 289477, curl/trunk/curlbuild.h)
Deleted:
  curl/repos/staging-i686/PKGBUILD
  curl/repos/staging-i686/curlbuild.h
  curl/repos/staging-x86_64/PKGBUILD
  curl/repos/staging-x86_64/curlbuild.h

+
 /PKGBUILD  |  118 +++
 /curlbuild.h   |   18 ++
 staging-i686/PKGBUILD  |   59 -
 staging-i686/curlbuild.h   |9 ---
 staging-x86_64/PKGBUILD|   59 -
 staging-x86_64/curlbuild.h |9 ---
 6 files changed, 136 insertions(+), 136 deletions(-)

Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD   2017-02-24 09:44:13 UTC (rev 289477)
+++ staging-i686/PKGBUILD   2017-02-24 09:44:18 UTC (rev 289478)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner 
-# Contributor: Angel Velasquez 
-# Contributor: Eric Belanger 
-# Contributor: Lucien Immink 
-# Contributor: Daniel J Griffiths 
-
-pkgname=curl
-pkgver=7.53.0
-pkgrel=2
-pkgdesc="An URL retrieval utility and library"
-arch=('i686' 'x86_64')
-url="https://curl.haxx.se;
-license=('MIT')
-depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
-provides=('libcurl.so')
-options=('strip' 'debug')
-source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-'curlbuild.h')
-sha512sums=('abfcca6938adc975f5062465d0d8a1d80d89c91377eca38337fcf3b1ee11a542ab6c795938d64ae0c442b9a8a65704bd5a4b423be88dd92f7e3bb263fb86fabe'
-'SKIP'
-
'4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5')
-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-random=/dev/urandom \
-  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  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"
-
-  # 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/staging-i686/PKGBUILD (from rev 289477, curl/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2017-02-24 09:44:18 UTC (rev 289478)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Dave Reisner 
+# Contributor: Angel Velasquez 
+# Contributor: Eric Belanger 
+# Contributor: Lucien Immink 
+# Contributor: Daniel J Griffiths 
+
+pkgname=curl
+pkgver=7.53.1
+pkgrel=2
+pkgdesc="An URL retrieval utility and library"
+arch=('i686' 'x86_64')
+url="https://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+'curlbuild.h')
+sha512sums=('f4bd2bcbf0eca312be549d2552e453b9634bbe8f74a981c1d663c42efc79cc44b419d9f37da8f6fe2f315487e55a41078cbfcd0d82af4ec84885464b56b6d217'
+'SKIP'
+
'4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5')
+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 \
+

[arch-commits] Commit in curl/repos (8 files)

2017-02-24 Thread Christian Hesse 
Date: Friday, February 24, 2017 @ 09:41:53
  Author: eworm
Revision: 289476

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/PKGBUILD
(from rev 289475, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 289475, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 289475, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 289475, 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  |  118 +++
 /curlbuild.h   |   18 ++
 testing-i686/PKGBUILD  |   59 -
 testing-i686/curlbuild.h   |9 ---
 testing-x86_64/PKGBUILD|   59 -
 testing-x86_64/curlbuild.h |9 ---
 6 files changed, 136 insertions(+), 136 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2017-02-24 09:41:49 UTC (rev 289475)
+++ testing-i686/PKGBUILD   2017-02-24 09:41:53 UTC (rev 289476)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner 
-# Contributor: Angel Velasquez 
-# Contributor: Eric Belanger 
-# Contributor: Lucien Immink 
-# Contributor: Daniel J Griffiths 
-
-pkgname=curl
-pkgver=7.53.0
-pkgrel=1
-pkgdesc="An URL retrieval utility and library"
-arch=('i686' 'x86_64')
-url="https://curl.haxx.se;
-license=('MIT')
-depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
-provides=('libcurl.so')
-options=('strip' 'debug')
-source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-'curlbuild.h')
-sha512sums=('abfcca6938adc975f5062465d0d8a1d80d89c91377eca38337fcf3b1ee11a542ab6c795938d64ae0c442b9a8a65704bd5a4b423be88dd92f7e3bb263fb86fabe'
-'SKIP'
-
'4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5')
-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-random=/dev/urandom \
-  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  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"
-
-  # 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 289475, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-02-24 09:41:53 UTC (rev 289476)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Dave Reisner 
+# Contributor: Angel Velasquez 
+# Contributor: Eric Belanger 
+# Contributor: Lucien Immink 
+# Contributor: Daniel J Griffiths 
+
+pkgname=curl
+pkgver=7.53.1
+pkgrel=1
+pkgdesc="An URL retrieval utility and library"
+arch=('i686' 'x86_64')
+url="https://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+'curlbuild.h')
+sha512sums=('f4bd2bcbf0eca312be549d2552e453b9634bbe8f74a981c1d663c42efc79cc44b419d9f37da8f6fe2f315487e55a41078cbfcd0d82af4ec84885464b56b6d217'
+'SKIP'
+
'4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5')
+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 \
+

[arch-commits] Commit in curl/repos (8 files)

2017-02-11 Thread Pierre Schmitz 
Date: Saturday, February 11, 2017 @ 11:18:18
  Author: pierre
Revision: 288654

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  curl/repos/staging-i686/
  curl/repos/staging-i686/0001-vtls-s-SSLEAY-OPENSSL.patch
(from rev 288653, curl/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch)
  curl/repos/staging-i686/PKGBUILD
(from rev 288653, curl/trunk/PKGBUILD)
  curl/repos/staging-i686/curlbuild.h
(from rev 288653, curl/trunk/curlbuild.h)
  curl/repos/staging-x86_64/
  curl/repos/staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch
(from rev 288653, curl/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch)
  curl/repos/staging-x86_64/PKGBUILD
(from rev 288653, curl/trunk/PKGBUILD)
  curl/repos/staging-x86_64/curlbuild.h
(from rev 288653, curl/trunk/curlbuild.h)

-+
 staging-i686/0001-vtls-s-SSLEAY-OPENSSL.patch   |   39 
 staging-i686/PKGBUILD   |   67 ++
 staging-i686/curlbuild.h|9 ++
 staging-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch |   39 
 staging-x86_64/PKGBUILD |   67 ++
 staging-x86_64/curlbuild.h  |9 ++
 6 files changed, 230 insertions(+)

Copied: curl/repos/staging-i686/0001-vtls-s-SSLEAY-OPENSSL.patch (from rev 
288653, curl/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch)
===
--- staging-i686/0001-vtls-s-SSLEAY-OPENSSL.patch   
(rev 0)
+++ staging-i686/0001-vtls-s-SSLEAY-OPENSSL.patch   2017-02-11 11:18:18 UTC 
(rev 288654)
@@ -0,0 +1,39 @@
+From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg 
+Date: Mon, 26 Dec 2016 00:06:33 +0100
+Subject: vtls: s/SSLEAY/OPENSSL
+
+Fixed an old leftover use of the USE_SSLEAY define which would make a
+socket get removed from the applications sockets to monitor when the
+multi_socket API was used, leading to timeouts.
+
+Bug: #1174
+---
+ lib/vtls/vtls.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
+index b808e1c..707f24b 100644
+--- a/lib/vtls/vtls.c
 b/lib/vtls/vtls.c
+@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
+   curlssl_close_all(data);
+ }
+ 
+-#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
++#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
+ defined(USE_DARWINSSL) || defined(USE_NSS)
+ /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
+ int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
+@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
+   (void)numsocks;
+   return GETSOCK_BLANK;
+ }
+-/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
++/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
+ #endif
+ 
+ void Curl_ssl_close(struct connectdata *conn, int sockindex)
+-- 
+cgit v1.1
+

Copied: curl/repos/staging-i686/PKGBUILD (from rev 288653, curl/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2017-02-11 11:18:18 UTC (rev 288654)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Dave Reisner 
+# Contributor: Angel Velasquez 
+# Contributor: Eric Belanger 
+# Contributor: Lucien Immink 
+# Contributor: Daniel J Griffiths 
+
+pkgname=curl
+pkgver=7.52.1
+pkgrel=3
+pkgdesc="An URL retrieval utility and library"
+arch=('i686' 'x86_64')
+url="https://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+'curlbuild.h'
+'0001-vtls-s-SSLEAY-OPENSSL.patch')
+sha512sums=('414c3daa2754172f6fb645b3669d15f621fd248488d88666312963275c19c70d2b0c3b3bcb8d8aa8db6d504a59cb846dd2003ec38080d06caba6dfa8eb2d52ed'
+'SKIP'
+
'4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5'
+
'fb094c61e63a2de9e573c7bcf79d5af04dbaaf136eb0da84c4ddb81a233505c8f20d4761e7f518b8859e176206bd35b252476d00e45291e3e626e43e4dac4a6d')
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
+  '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg 
(old key)
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/0001-vtls-s-SSLEAY-OPENSSL.patch"
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+  --prefix=/usr \
+  --mandir=/usr/share/man \
+  --disable-ldap \
+

[arch-commits] Commit in curl/repos (8 files)

2016-12-27 Thread Christian Hesse 
Date: Wednesday, December 28, 2016 @ 07:20:36
  Author: eworm
Revision: 284924

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/
  curl/repos/testing-i686/0001-vtls-s-SSLEAY-OPENSSL.patch
(from rev 284923, curl/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch)
  curl/repos/testing-i686/PKGBUILD
(from rev 284923, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 284923, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/
  curl/repos/testing-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch
(from rev 284923, curl/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 284923, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 284923, curl/trunk/curlbuild.h)

-+
 testing-i686/0001-vtls-s-SSLEAY-OPENSSL.patch   |   39 
 testing-i686/PKGBUILD   |   67 ++
 testing-i686/curlbuild.h|9 ++
 testing-x86_64/0001-vtls-s-SSLEAY-OPENSSL.patch |   39 
 testing-x86_64/PKGBUILD |   67 ++
 testing-x86_64/curlbuild.h  |9 ++
 6 files changed, 230 insertions(+)

Copied: curl/repos/testing-i686/0001-vtls-s-SSLEAY-OPENSSL.patch (from rev 
284923, curl/trunk/0001-vtls-s-SSLEAY-OPENSSL.patch)
===
--- testing-i686/0001-vtls-s-SSLEAY-OPENSSL.patch   
(rev 0)
+++ testing-i686/0001-vtls-s-SSLEAY-OPENSSL.patch   2016-12-28 07:20:36 UTC 
(rev 284924)
@@ -0,0 +1,39 @@
+From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg 
+Date: Mon, 26 Dec 2016 00:06:33 +0100
+Subject: vtls: s/SSLEAY/OPENSSL
+
+Fixed an old leftover use of the USE_SSLEAY define which would make a
+socket get removed from the applications sockets to monitor when the
+multi_socket API was used, leading to timeouts.
+
+Bug: #1174
+---
+ lib/vtls/vtls.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
+index b808e1c..707f24b 100644
+--- a/lib/vtls/vtls.c
 b/lib/vtls/vtls.c
+@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
+   curlssl_close_all(data);
+ }
+ 
+-#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
++#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
+ defined(USE_DARWINSSL) || defined(USE_NSS)
+ /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
+ int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
+@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
+   (void)numsocks;
+   return GETSOCK_BLANK;
+ }
+-/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
++/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
+ #endif
+ 
+ void Curl_ssl_close(struct connectdata *conn, int sockindex)
+-- 
+cgit v1.1
+

Copied: curl/repos/testing-i686/PKGBUILD (from rev 284923, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-12-28 07:20:36 UTC (rev 284924)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Dave Reisner 
+# Contributor: Angel Velasquez 
+# Contributor: Eric Belanger 
+# Contributor: Lucien Immink 
+# Contributor: Daniel J Griffiths 
+
+pkgname=curl
+pkgver=7.52.1
+pkgrel=2
+pkgdesc="An URL retrieval utility and library"
+arch=('i686' 'x86_64')
+url="https://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib' 'libpsl')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=("https://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
+'curlbuild.h'
+'0001-vtls-s-SSLEAY-OPENSSL.patch')
+sha512sums=('414c3daa2754172f6fb645b3669d15f621fd248488d88666312963275c19c70d2b0c3b3bcb8d8aa8db6d504a59cb846dd2003ec38080d06caba6dfa8eb2d52ed'
+'SKIP'
+
'4e71366c3faaab76a6e438fcc484fb1ce16b2ae84eefa176879cf164e8fb0b04e4a355384e66a1137e9641e95041ee573553b43da98ec92820696d7256beb4f5'
+
'fb094c61e63a2de9e573c7bcf79d5af04dbaaf136eb0da84c4ddb81a233505c8f20d4761e7f518b8859e176206bd35b252476d00e45291e3e626e43e4dac4a6d')
+validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2'   # Daniel Stenberg
+  '914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg 
(old key)
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/0001-vtls-s-SSLEAY-OPENSSL.patch"
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+  --prefix=/usr \
+  --mandir=/usr/share/man \
+  --disable-ldap \
+

[arch-commits] Commit in curl/repos (8 files)

2016-07-21 Thread Dave Reisner 
Date: Thursday, July 21, 2016 @ 13:02:15
  Author: dreisner
Revision: 272087

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/PKGBUILD
(from rev 272086, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 272086, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 272086, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 272086, 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  |  120 +++
 /curlbuild.h   |   18 ++
 testing-i686/PKGBUILD  |   60 -
 testing-i686/curlbuild.h   |9 ---
 testing-x86_64/PKGBUILD|   60 -
 testing-x86_64/curlbuild.h |9 ---
 6 files changed, 138 insertions(+), 138 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2016-07-21 13:01:41 UTC (rev 272086)
+++ testing-i686/PKGBUILD   2016-07-21 13:02:15 UTC (rev 272087)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner 
-# Contributor: Angel Velasquez 
-# Contributor: Eric Belanger 
-# Contributor: Lucien Immink 
-# Contributor: Daniel J Griffiths 
-
-pkgname=curl
-pkgver=7.50.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=('03940d7d4fcea1521fbbf07c1cf16f5e'
- '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 wordsize=$(cpp -include 'bits/wordsize.h' <<<'__WORDSIZE' | sed 
'/^#/d')
-  local _curlbuild=curlbuild-$wordsize.h
-
-  # 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 272086, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-07-21 13:02:15 UTC (rev 272087)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Dave Reisner 
+# Contributor: Angel Velasquez 
+# Contributor: Eric Belanger 
+# Contributor: Lucien Immink 
+# Contributor: Daniel J Griffiths 
+
+pkgname=curl
+pkgver=7.50.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=('03940d7d4fcea1521fbbf07c1cf16f5e'
+ '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 wordsize=$(cpp -include 'bits/wordsize.h' <<<'__WORDSIZE' | sed '$!d')
+  local _curlbuild=curlbuild-$wordsize.h
+

[arch-commits] Commit in curl/repos (8 files)

2016-05-31 Thread Dave Reisner 
Date: Tuesday, May 31, 2016 @ 15:18:11
  Author: dreisner
Revision: 268777

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/0001-curl-fix-q-regression.patch
(from rev 268776, curl/trunk/0001-curl-fix-q-regression.patch)
  curl/repos/testing-i686/PKGBUILD
(from rev 268776, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 268776, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/0001-curl-fix-q-regression.patch
(from rev 268776, curl/trunk/0001-curl-fix-q-regression.patch)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 268776, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 268776, curl/trunk/curlbuild.h)
Deleted:
  curl/repos/testing-i686/0001-curl-fix-q-regression.patch
  curl/repos/testing-x86_64/0001-curl-fix-q-regression.patch

-+
 /0001-curl-fix-q-regression.patch   |   56 
 testing-i686/0001-curl-fix-q-regression.patch   |   28 
 testing-i686/PKGBUILD   |   74 ++
 testing-i686/curlbuild.h|9 ++
 testing-x86_64/0001-curl-fix-q-regression.patch |   28 
 testing-x86_64/PKGBUILD |   74 ++
 testing-x86_64/curlbuild.h  |9 ++
 7 files changed, 222 insertions(+), 56 deletions(-)

Deleted: testing-i686/0001-curl-fix-q-regression.patch
===
--- testing-i686/0001-curl-fix-q-regression.patch   2016-05-31 13:17:18 UTC 
(rev 268776)
+++ testing-i686/0001-curl-fix-q-regression.patch   2016-05-31 13:18:11 UTC 
(rev 268777)
@@ -1,28 +0,0 @@
-From 6dbc23cfd86bbf8c1616759068a5909ced3dcc99 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg 
-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
-

Copied: curl/repos/testing-i686/0001-curl-fix-q-regression.patch (from rev 
268776, 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:18:11 UTC 
(rev 268777)
@@ -0,0 +1,28 @@
+From 6dbc23cfd86bbf8c1616759068a5909ced3dcc99 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg 
+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
+

Copied: curl/repos/testing-i686/PKGBUILD (from rev 268776, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2016-05-31 13:18:11 UTC (rev 268777)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Dave Reisner 
+# Contributor: Angel Velasquez 
+# Contributor: Eric Belanger 
+# Contributor: Lucien Immink 
+# Contributor: Daniel J Griffiths 
+
+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'
+

[arch-commits] Commit in curl/repos (8 files)

2015-08-12 Thread Dave Reisner 
Date: Wednesday, August 12, 2015 @ 16:05:00
  Author: dreisner
Revision: 243367

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/PKGBUILD
(from rev 243366, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 243366, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 243366, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 243366, 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  |  130 +++
 /curlbuild.h   |   18 +
 testing-i686/PKGBUILD  |   70 ---
 testing-i686/curlbuild.h   |9 --
 testing-x86_64/PKGBUILD|   70 ---
 testing-x86_64/curlbuild.h |9 --
 6 files changed, 148 insertions(+), 158 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2015-08-12 14:04:33 UTC (rev 243366)
+++ testing-i686/PKGBUILD   2015-08-12 14:05:00 UTC (rev 243367)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-# Contributor: Angel Velasquez an...@archlinux.org
-# Contributor: Eric Belanger e...@archlinux.org
-# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-
-pkgname=curl
-pkgver=7.43.0
-pkgrel=2
-pkgdesc=An URL retrieval utility and library
-arch=('i686' 'x86_64')
-url=http://curl.haxx.se;
-license=('MIT')
-depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib')
-provides=('libcurl.so')
-options=('strip' 'debug')
-source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
-curlbuild.h)
-md5sums=('3037f0b6ce03d434618e9db5506ae6be'
- 'SKIP'
- '751bd433ede935c8fae727377625a8ae')
-validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg
-
-build() {
-  cd $pkgname-$pkgver
-
-  # Consider re-adding libidn support once upstream security issues are
-  # resolved. As of version 1.30, it does not handle bad utf-8 properly.
-  # http://curl.haxx.se/mail/lib-2015-06/0143.html
-  # https://lists.gnu.org/archive/html/bug-wget/2015-06/msg2.html
-
-  ./configure \
-  --prefix=/usr \
-  --mandir=/usr/share/man \
-  --disable-ldap \
-  --disable-ldaps \
-  --enable-ipv6 \
-  --enable-manual \
-  --enable-versioned-symbols \
-  --enable-threaded-resolver \
-  --with-gssapi \
-  --without-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 243366, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-08-12 14:05:00 UTC (rev 243367)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.44.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=('cf46112b5151e2f1a3fd38439bdade23'
+ 'SKIP'
+ '751bd433ede935c8fae727377625a8ae')
+validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg
+
+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

[arch-commits] Commit in curl/repos (8 files)

2014-10-23 Thread Dave Reisner 
Date: Thursday, October 23, 2014 @ 14:07:39
  Author: dreisner
Revision: 225230

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/
  
curl/repos/testing-i686/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
(from rev 225229, 
curl/trunk/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch)
  curl/repos/testing-i686/PKGBUILD
(from rev 225229, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 225229, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/
  
curl/repos/testing-x86_64/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
(from rev 225229, 
curl/trunk/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 225229, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 225229, curl/trunk/curlbuild.h)

--+
 testing-i686/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch   | 
  32 
 testing-i686/PKGBUILD| 
  73 ++
 testing-i686/curlbuild.h | 
   9 +
 testing-x86_64/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch | 
  32 
 testing-x86_64/PKGBUILD  | 
  73 ++
 testing-x86_64/curlbuild.h   | 
   9 +
 6 files changed, 228 insertions(+)

Copied: 
curl/repos/testing-i686/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
 (from rev 225229, 
curl/trunk/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch)
===
--- testing-i686/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch  
(rev 0)
+++ testing-i686/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch  
2014-10-23 12:07:39 UTC (rev 225230)
@@ -0,0 +1,32 @@
+From d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg dan...@haxx.se
+Date: Tue, 23 Sep 2014 11:44:03 +0200
+Subject: [PATCH] threaded-resolver: revert Curl_expire_latest() switch
+
+The switch to using Curl_expire_latest() in commit cacdc27f52b was a
+mistake and was against the advice even mentioned in that commit. The
+comparison in asyn-thread.c:Curl_resolver_is_resolved() makes
+Curl_expire() the suitable function to use.
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=1426
+Reported-By: graysky
+---
+ lib/asyn-thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
+index e4ad32b..6cdc9ad 100644
+--- a/lib/asyn-thread.c
 b/lib/asyn-thread.c
+@@ -541,7 +541,7 @@ CURLcode Curl_resolver_is_resolved(struct connectdata 
*conn,
+   td-poll_interval = 250;
+ 
+ td-interval_end = elapsed + td-poll_interval;
+-Curl_expire_latest(conn-data, td-poll_interval);
++Curl_expire(conn-data, td-poll_interval);
+   }
+ 
+   return CURLE_OK;
+-- 
+2.1.0
+

Copied: curl/repos/testing-i686/PKGBUILD (from rev 225229, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-10-23 12:07:39 UTC (rev 225230)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.38.0
+pkgrel=3
+pkgdesc=An URL retrieval utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'libidn' 'openssl' 'zlib')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
+curlbuild.h)
+md5sums=('b6e3ea55bb718f2270489581efa50a8a'
+ 'SKIP'
+ '845110402d78209a957bb9b342d8bb9e'
+ '751bd433ede935c8fae727377625a8ae')
+validpgpkeys=('914C533DF9B2ADA2204F586D78E11C6B279D5C91')  # Daniel Stenberg
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 ../0001-threaded-resolver-revert-Curl_expire_latest-switch.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
+

[arch-commits] Commit in curl/repos (8 files)

2014-09-23 Thread Dave Reisner 
Date: Tuesday, September 23, 2014 @ 21:51:17
  Author: dreisner
Revision: 222891

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/
  
curl/repos/testing-i686/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
(from rev 222890, 
curl/trunk/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch)
  curl/repos/testing-i686/PKGBUILD
(from rev 222890, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 222890, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/
  
curl/repos/testing-x86_64/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
(from rev 222890, 
curl/trunk/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 222890, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 222890, curl/trunk/curlbuild.h)

--+
 testing-i686/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch   | 
  32 
 testing-i686/PKGBUILD| 
  71 ++
 testing-i686/curlbuild.h | 
   9 +
 testing-x86_64/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch | 
  32 
 testing-x86_64/PKGBUILD  | 
  71 ++
 testing-x86_64/curlbuild.h   | 
   9 +
 6 files changed, 224 insertions(+)

Copied: 
curl/repos/testing-i686/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
 (from rev 222890, 
curl/trunk/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch)
===
--- testing-i686/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch  
(rev 0)
+++ testing-i686/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch  
2014-09-23 19:51:17 UTC (rev 222891)
@@ -0,0 +1,32 @@
+From d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg dan...@haxx.se
+Date: Tue, 23 Sep 2014 11:44:03 +0200
+Subject: [PATCH] threaded-resolver: revert Curl_expire_latest() switch
+
+The switch to using Curl_expire_latest() in commit cacdc27f52b was a
+mistake and was against the advice even mentioned in that commit. The
+comparison in asyn-thread.c:Curl_resolver_is_resolved() makes
+Curl_expire() the suitable function to use.
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=1426
+Reported-By: graysky
+---
+ lib/asyn-thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
+index e4ad32b..6cdc9ad 100644
+--- a/lib/asyn-thread.c
 b/lib/asyn-thread.c
+@@ -541,7 +541,7 @@ CURLcode Curl_resolver_is_resolved(struct connectdata 
*conn,
+   td-poll_interval = 250;
+ 
+ td-interval_end = elapsed + td-poll_interval;
+-Curl_expire_latest(conn-data, td-poll_interval);
++Curl_expire(conn-data, td-poll_interval);
+   }
+ 
+   return CURLE_OK;
+-- 
+2.1.0
+

Copied: curl/repos/testing-i686/PKGBUILD (from rev 222890, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-09-23 19:51:17 UTC (rev 222891)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.38.0
+pkgrel=2
+pkgdesc=An URL retrieval utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz;
+0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
+curlbuild.h)
+md5sums=('b6e3ea55bb718f2270489581efa50a8a'
+ '845110402d78209a957bb9b342d8bb9e'
+ '751bd433ede935c8fae727377625a8ae')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 ../0001-threaded-resolver-revert-Curl_expire_latest-switch.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 \
+  --without-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

[arch-commits] Commit in curl/repos (8 files)

2013-12-28 Thread Dave Reisner 
Date: Saturday, December 28, 2013 @ 18:21:18
  Author: dreisner
Revision: 202855

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/
  
curl/repos/testing-i686/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
(from rev 202854, 
curl/trunk/0001-connect-Try-all-addresses-in-first-connection-attemp.patch)
  curl/repos/testing-i686/PKGBUILD
(from rev 202854, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 202854, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/
  
curl/repos/testing-x86_64/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
(from rev 202854, 
curl/trunk/0001-connect-Try-all-addresses-in-first-connection-attemp.patch)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 202854, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 202854, curl/trunk/curlbuild.h)

+
 testing-i686/0001-connect-Try-all-addresses-in-first-connection-attemp.patch   
|   47 ++
 testing-i686/PKGBUILD  
|   71 ++
 testing-i686/curlbuild.h   
|9 +
 testing-x86_64/0001-connect-Try-all-addresses-in-first-connection-attemp.patch 
|   47 ++
 testing-x86_64/PKGBUILD
|   71 ++
 testing-x86_64/curlbuild.h 
|9 +
 6 files changed, 254 insertions(+)

Copied: 
curl/repos/testing-i686/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
 (from rev 202854, 
curl/trunk/0001-connect-Try-all-addresses-in-first-connection-attemp.patch)
===
--- 
testing-i686/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
(rev 0)
+++ 
testing-i686/0001-connect-Try-all-addresses-in-first-connection-attemp.patch
2013-12-28 17:21:18 UTC (rev 202855)
@@ -0,0 +1,47 @@
+From 4e1ece2e44f432c2614f2090155c0aaf2226ea80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= bj...@haxx.se
+Date: Sat, 28 Dec 2013 13:42:57 +0100
+Subject: [PATCH] connect: Try all addresses in first connection attempt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes a bug when all addresses in the first family fail immediately, due
+to Network unreachable for example, curl would hang and never try the
+next address family.
+
+Iterate through all address families when to trying establish the first
+connection attempt.
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=1315
+Reported-by: Michal Górny and Anthony G. Basile
+---
+ lib/connect.c | 12 ++--
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/connect.c b/lib/connect.c
+index 4b6ee00..588ac28 100644
+--- a/lib/connect.c
 b/lib/connect.c
+@@ -1104,12 +1104,12 @@ CURLcode Curl_connecthost(struct connectdata *conn,  
/* context */
+ conn-tempaddr[0]-ai_next == NULL ? timeout_ms : timeout_ms / 2;
+ 
+   /* start connecting to first IP */
+-  res = singleipconnect(conn, conn-tempaddr[0], (conn-tempsock[0]));
+-  while(res != CURLE_OK 
+-conn-tempaddr[0] 
+-conn-tempaddr[0]-ai_next 
+-conn-tempsock[0] == CURL_SOCKET_BAD)
+-res = trynextip(conn, FIRSTSOCKET, 0);
++  while(conn-tempaddr[0]) {
++res = singleipconnect(conn, conn-tempaddr[0], (conn-tempsock[0]));
++if(res == CURLE_OK)
++break;
++conn-tempaddr[0] = conn-tempaddr[0]-ai_next;
++  }
+ 
+   if(conn-tempsock[0] == CURL_SOCKET_BAD)
+ return res;
+-- 
+1.8.5.2
+

Copied: curl/repos/testing-i686/PKGBUILD (from rev 202854, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-12-28 17:21:18 UTC (rev 202855)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.34.0
+pkgrel=2
+pkgdesc=An URL retrieval utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+0001-connect-Try-all-addresses-in-first-connection-attemp.patch
+curlbuild.h)
+md5sums=('d5b7edccbd1793e3549842e01331da20'
+ 'SKIP'
+ 'ee755b0e886207fc1e8154e426c46ca7'
+ '751bd433ede935c8fae727377625a8ae')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1

[arch-commits] Commit in curl/repos (8 files)

2013-12-12 Thread Dave Reisner 
Date: Thursday, December 12, 2013 @ 16:39:41
  Author: dreisner
Revision: 201472

archrelease: copy trunk to core-i686, core-x86_64

Added:
  curl/repos/core-i686/PKGBUILD
(from rev 201471, curl/trunk/PKGBUILD)
  curl/repos/core-i686/curlbuild.h
(from rev 201471, curl/trunk/curlbuild.h)
  curl/repos/core-x86_64/PKGBUILD
(from rev 201471, curl/trunk/PKGBUILD)
  curl/repos/core-x86_64/curlbuild.h
(from rev 201471, curl/trunk/curlbuild.h)
Deleted:
  curl/repos/core-i686/PKGBUILD
  curl/repos/core-i686/curlbuild.h
  curl/repos/core-x86_64/PKGBUILD
  curl/repos/core-x86_64/curlbuild.h

-+
 /PKGBUILD   |  142 ++
 /curlbuild.h|   18 +
 core-i686/PKGBUILD  |   71 ---
 core-i686/curlbuild.h   |9 --
 core-x86_64/PKGBUILD|   71 ---
 core-x86_64/curlbuild.h |9 --
 6 files changed, 160 insertions(+), 160 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2013-12-12 15:39:10 UTC (rev 201471)
+++ core-i686/PKGBUILD  2013-12-12 15:39:41 UTC (rev 201472)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-# Contributor: Angel Velasquez an...@archlinux.org
-# Contributor: Eric Belanger e...@archlinux.org
-# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-
-pkgname=curl
-pkgver=7.33.0
-pkgrel=3
-pkgdesc=An URL retrieval utility and library
-arch=('i686' 'x86_64')
-url=http://curl.haxx.se;
-license=('MIT')
-depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-provides=('libcurl.so')
-options=('strip' 'debug')
-source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
-
0001-glob-fix-regression-from-commit-5ca96cb844.patch::https://github.com/bagder/curl/commit/867b52a.patch;
-curlbuild.h)
-md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93'
- 'SKIP'
- 'd71c7eab7d38f1731f78285634a4c390'
- '751bd433ede935c8fae727377625a8ae')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  patch -Np1  $srcdir/0001-glob-fix-regression-from-commit-5ca96cb844.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 \
-  --without-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/core-i686/PKGBUILD (from rev 201471, curl/trunk/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2013-12-12 15:39:41 UTC (rev 201472)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.33.0
+pkgrel=3
+pkgdesc=An URL retrieval utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+provides=('libcurl.so')
+options=('strip' 'debug')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+
0001-glob-fix-regression-from-commit-5ca96cb844.patch::https://github.com/bagder/curl/commit/867b52a.patch;
+curlbuild.h)
+md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93'
+ 'SKIP'
+ 'd6590a94c96c63098a57dd8c7875dfe7'
+ '751bd433ede935c8fae727377625a8ae')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1  $srcdir/0001-glob-fix-regression-from-commit-5ca96cb844.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 \
+  --without-libidn \
+  --with-random=/dev/urandom \
+  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+

[arch-commits] Commit in curl/repos (8 files)

2013-08-29 Thread Dave Reisner 
Date: Friday, August 30, 2013 @ 04:01:21
  Author: dreisner
Revision: 193741

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/
  
curl/repos/testing-i686/0001-curl_multi_remove_handle-allow-multiple-removes.patch
(from rev 193740, 
curl/trunk/0001-curl_multi_remove_handle-allow-multiple-removes.patch)
  curl/repos/testing-i686/PKGBUILD
(from rev 193740, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 193740, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/
  
curl/repos/testing-x86_64/0001-curl_multi_remove_handle-allow-multiple-removes.patch
(from rev 193740, 
curl/trunk/0001-curl_multi_remove_handle-allow-multiple-removes.patch)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 193740, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 193740, curl/trunk/curlbuild.h)

---+
 testing-i686/0001-curl_multi_remove_handle-allow-multiple-removes.patch   |   
29 
 testing-i686/PKGBUILD |   
71 ++
 testing-i686/curlbuild.h  |
9 +
 testing-x86_64/0001-curl_multi_remove_handle-allow-multiple-removes.patch |   
29 
 testing-x86_64/PKGBUILD   |   
71 ++
 testing-x86_64/curlbuild.h|
9 +
 6 files changed, 218 insertions(+)

Copied: 
curl/repos/testing-i686/0001-curl_multi_remove_handle-allow-multiple-removes.patch
 (from rev 193740, 
curl/trunk/0001-curl_multi_remove_handle-allow-multiple-removes.patch)
===
--- testing-i686/0001-curl_multi_remove_handle-allow-multiple-removes.patch 
(rev 0)
+++ testing-i686/0001-curl_multi_remove_handle-allow-multiple-removes.patch 
2013-08-30 02:01:21 UTC (rev 193741)
@@ -0,0 +1,29 @@
+From 84f3b3dd448399f9548468676e1bd1475dba8de5 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg dan...@haxx.se
+Date: Thu, 29 Aug 2013 22:08:01 +0200
+Subject: [PATCH] curl_multi_remove_handle: allow multiple removes
+
+When removing an already removed handle, avoid that to ruin the
+internals and just return OK instead.
+---
+ lib/multi.c | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/multi.c b/lib/multi.c
+index fb495e0..e723a3e 100644
+--- a/lib/multi.c
 b/lib/multi.c
+@@ -483,6 +483,10 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
+   if(!GOOD_EASY_HANDLE(curl_handle))
+ return CURLM_BAD_EASY_HANDLE;
+ 
++  /* Prevent users from trying to remove same easy handle more than once */
++  if(!data-multi)
++return CURLM_OK; /* it is already removed so let's say it is fine! */
++
+   if(easy) {
+ bool premature = (data-mstate  CURLM_STATE_COMPLETED) ? TRUE : FALSE;
+ bool easy_owns_conn = (data-easy_conn 
+-- 
+1.8.4
+

Copied: curl/repos/testing-i686/PKGBUILD (from rev 193740, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-08-30 02:01:21 UTC (rev 193741)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.32.0
+pkgrel=2
+pkgdesc=An URL retrieval utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+provides=('libcurl.so')
+options=('!libtool')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+0001-curl_multi_remove_handle-allow-multiple-removes.patch
+curlbuild.h)
+md5sums=('f77cf3cb59cf2bfe686b80338323fd40'
+ 'SKIP'
+ '589a2ccdf90e198fca398809e9d16128'
+ '751bd433ede935c8fae727377625a8ae')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 
$srcdir/0001-curl_multi_remove_handle-allow-multiple-removes.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 \
+  --without-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

[arch-commits] Commit in curl/repos (8 files)

2013-02-11 Thread Dave Reisner 
Date: Monday, February 11, 2013 @ 12:07:41
  Author: dreisner
Revision: 177928

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/
  
curl/repos/testing-i686/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
(from rev 177927, 
curl/trunk/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch)
  curl/repos/testing-i686/PKGBUILD
(from rev 177927, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 177927, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/
  
curl/repos/testing-x86_64/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
(from rev 177927, 
curl/trunk/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 177927, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 177927, curl/trunk/curlbuild.h)

+
 testing-i686/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch   
|   39 +
 testing-i686/PKGBUILD  
|   68 ++
 testing-i686/curlbuild.h   
|9 +
 testing-x86_64/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch 
|   39 +
 testing-x86_64/PKGBUILD
|   68 ++
 testing-x86_64/curlbuild.h 
|9 +
 6 files changed, 232 insertions(+)

Copied: 
curl/repos/testing-i686/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
 (from rev 177927, 
curl/trunk/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch)
===
--- 
testing-i686/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
(rev 0)
+++ 
testing-i686/0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
2013-02-11 11:07:41 UTC (rev 177928)
@@ -0,0 +1,39 @@
+From da3fc1ee91de656a30f3a12de394bcba55119872 Mon Sep 17 00:00:00 2001
+From: Linus Nielsen Feltzing li...@haxx.se
+Date: Sun, 10 Feb 2013 22:57:58 +0100
+Subject: [PATCH] Fix NULL pointer reference when closing an unused multi
+ handle.
+
+---
+ lib/multi.c|  8 +---
+ tests/data/Makefile.am |  1 +
+ tests/data/test1508| 31 +
+ tests/libtest/Makefile.inc |  6 +-
+ tests/libtest/lib1508.c| 49 ++
+ 5 files changed, 91 insertions(+), 4 deletions(-)
+ create mode 100644 tests/data/test1508
+ create mode 100644 tests/libtest/lib1508.c
+
+diff --git a/lib/multi.c b/lib/multi.c
+index fa0afb9..706df23 100644
+--- a/lib/multi.c
 b/lib/multi.c
+@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
+ /* Close all the connections in the connection cache */
+ close_all_connections(multi);
+ 
+-multi-closure_handle-dns.hostcache = multi-hostcache;
+-Curl_hostcache_clean(multi-closure_handle);
++if(multi-closure_handle) {
++  multi-closure_handle-dns.hostcache = multi-hostcache;
++  Curl_hostcache_clean(multi-closure_handle);
+ 
+-Curl_close(multi-closure_handle);
++  Curl_close(multi-closure_handle);
++}
+ multi-closure_handle = NULL;
+ 
+ Curl_hash_destroy(multi-sockhash);
+-- 
+1.8.1.3
+

Copied: curl/repos/testing-i686/PKGBUILD (from rev 177927, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-02-11 11:07:41 UTC (rev 177928)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.29.0
+pkgrel=2
+pkgdesc=An URL retrieval utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+options=('!libtool')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+0001-Fix-NULL-pointer-reference-when-closing-an-unused-mu.patch
+curlbuild.h)
+md5sums=('4f57d3b4a3963038bd5e04dbff385390'
+ '6283fbb36933cf8720acc34c43169f1d'
+ '5bfd1899e8b19cfdd78774f6337f8b47'
+ '751bd433ede935c8fae727377625a8ae')
+
+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
+
+build() {
+  cd $pkgname-$pkgver
+
+  patch -Np1

[arch-commits] Commit in curl/repos (8 files)

2012-01-24 Thread Dave Reisner 
Date: Tuesday, January 24, 2012 @ 12:51:49
  Author: dreisner
Revision: 147206

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/
  curl/repos/testing-i686/PKGBUILD
(from rev 147205, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 147205, curl/trunk/curlbuild.h)
  curl/repos/testing-i686/fix-J-with-O-regression.patch
(from rev 147205, curl/trunk/fix-J-with-O-regression.patch)
  curl/repos/testing-x86_64/
  curl/repos/testing-x86_64/PKGBUILD
(from rev 147205, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 147205, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/fix-J-with-O-regression.patch
(from rev 147205, curl/trunk/fix-J-with-O-regression.patch)

--+
 testing-i686/PKGBUILD|   66 +++
 testing-i686/curlbuild.h |9 +
 testing-i686/fix-J-with-O-regression.patch   |  142 +
 testing-x86_64/PKGBUILD  |   66 +++
 testing-x86_64/curlbuild.h   |9 +
 testing-x86_64/fix-J-with-O-regression.patch |  142 +
 6 files changed, 434 insertions(+)

Copied: curl/repos/testing-i686/PKGBUILD (from rev 147205, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-01-24 17:51:49 UTC (rev 147206)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.24.0
+pkgrel=1
+pkgdesc=An URL retrival utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+options=('!libtool')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+fix-J-with-O-regression.patch
+curlbuild.h)
+md5sums=('b93420f80a2baaa61a0f45214eddc2ba'
+ '710242df6bc318d16eea611e7d1b1410'
+ 'aa4539ec4f4a2dad1663dc22dd3ab0a1'
+ '751bd433ede935c8fae727377625a8ae')
+
+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
+
+build() {
+  cd $pkgname-$pkgver
+
+  ./configure \
+  --prefix=/usr \
+  --mandir=/usr/share/man \
+  --disable-dependency-tracking \
+  --disable-ldap \
+  --disable-ldaps \
+  --enable-ipv6 \
+  --enable-manual \
+  --enable-versioned-symbols \
+  --enable-threaded-resolver \
+  --without-libidn \
+  --with-random=/dev/urandom \
+  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # license
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+
+  # devel
+  install -Dm644 docs/libcurl/libcurl.m4 $pkgdir/usr/share/aclocal/libcurl.m4
+  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/curlbuild.h (from rev 147205, 
curl/trunk/curlbuild.h)
===
--- testing-i686/curlbuild.h(rev 0)
+++ testing-i686/curlbuild.h2012-01-24 17:51:49 UTC (rev 147206)
@@ -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-i686/fix-J-with-O-regression.patch (from rev 147205, 
curl/trunk/fix-J-with-O-regression.patch)
===
--- testing-i686/fix-J-with-O-regression.patch  (rev 0)
+++ testing-i686/fix-J-with-O-regression.patch  2012-01-24 17:51:49 UTC (rev 
147206)
@@ -0,0 +1,142 @@
+From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg dan...@haxx.se
+Date: Sun, 20 Nov 2011 23:33:46 +0100
+Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes!
+
+A regression between 7.22.0 and 7.23.0 -- downloading a file with the
+flags -O and -J results in the content being written to stdout if and
+only if there was no Content-Disposition header in the http response. If
+there is a C-D header with a filename attribute, the output is correctly
+written.
+
+Reported by: Dave Reisner
+Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html
+---
+ src/tool_cb_hdr.c  |3 +-
+ src/tool_operate.c |

[arch-commits] Commit in curl/repos (8 files)

2011-11-21 Thread Dave Reisner 
Date: Monday, November 21, 2011 @ 19:34:16
  Author: dreisner
Revision: 143050

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/
  curl/repos/testing-i686/PKGBUILD
(from rev 143049, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 143049, curl/trunk/curlbuild.h)
  curl/repos/testing-i686/fix-J-with-O-regression.patch
(from rev 143049, curl/trunk/fix-J-with-O-regression.patch)
  curl/repos/testing-x86_64/
  curl/repos/testing-x86_64/PKGBUILD
(from rev 143049, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 143049, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/fix-J-with-O-regression.patch
(from rev 143049, curl/trunk/fix-J-with-O-regression.patch)

--+
 testing-i686/PKGBUILD|   70 
 testing-i686/curlbuild.h |9 +
 testing-i686/fix-J-with-O-regression.patch   |  142 +
 testing-x86_64/PKGBUILD  |   70 
 testing-x86_64/curlbuild.h   |9 +
 testing-x86_64/fix-J-with-O-regression.patch |  142 +
 6 files changed, 442 insertions(+)

Copied: curl/repos/testing-i686/PKGBUILD (from rev 143049, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-11-22 00:34:16 UTC (rev 143050)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.23.1
+pkgrel=2
+pkgdesc=An URL retrival utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+makedepends=('perl-libwww')
+options=('!libtool')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+fix-J-with-O-regression.patch
+curlbuild.h)
+md5sums=('8e23151f569fb54afef093ac0695077d'
+ '5d8eb7e2e38be0fb00a043f714f6d49f'
+ 'aa4539ec4f4a2dad1663dc22dd3ab0a1'
+ '751bd433ede935c8fae727377625a8ae')
+
+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
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # upstream bugfix
+  # http://curl.haxx.se/mail/archive-2011-11/0030.html
+  patch -Np1  $srcdir/fix-J-with-O-regression.patch
+
+  ./configure \
+  --prefix=/usr \
+  --mandir=/usr/share/man \
+  --disable-dependency-tracking \
+  --disable-ldap \
+  --disable-ldaps \
+  --enable-ipv6 \
+  --enable-manual \
+  --enable-versioned-symbols \
+  --enable-threaded-resolver \
+  --without-libidn \
+  --with-random=/dev/urandom \
+  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # license
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+
+  # devel
+  install -Dm644 docs/libcurl/libcurl.m4 $pkgdir/usr/share/aclocal/libcurl.m4
+  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/curlbuild.h (from rev 143049, 
curl/trunk/curlbuild.h)
===
--- testing-i686/curlbuild.h(rev 0)
+++ testing-i686/curlbuild.h2011-11-22 00:34:16 UTC (rev 143050)
@@ -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-i686/fix-J-with-O-regression.patch (from rev 143049, 
curl/trunk/fix-J-with-O-regression.patch)
===
--- testing-i686/fix-J-with-O-regression.patch  (rev 0)
+++ testing-i686/fix-J-with-O-regression.patch  2011-11-22 00:34:16 UTC (rev 
143050)
@@ -0,0 +1,142 @@
+From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg dan...@haxx.se
+Date: Sun, 20 Nov 2011 23:33:46 +0100
+Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes!
+
+A regression between 7.22.0 and 7.23.0 -- downloading a file with the
+flags -O and -J results in the content being written to stdout if and
+only if there was no Content-Disposition header in the http response. If
+there is a C-D header with a filename attribute, the output

[arch-commits] Commit in curl/repos (8 files)

2011-11-17 Thread Dave Reisner 
Date: Thursday, November 17, 2011 @ 16:30:16
  Author: dreisner
Revision: 142904

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/PKGBUILD
(from rev 142903, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 142903, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 142903, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 142903, 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

+
 testing-i686/PKGBUILD  |  128 +--
 testing-i686/curlbuild.h   |   18 +++---
 testing-x86_64/PKGBUILD|  128 +--
 testing-x86_64/curlbuild.h |   18 +++---
 4 files changed, 146 insertions(+), 146 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2011-11-17 21:29:59 UTC (rev 142903)
+++ testing-i686/PKGBUILD   2011-11-17 21:30:16 UTC (rev 142904)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-# Contributor: Angel Velasquez an...@archlinux.org
-# Contributor: Eric Belanger e...@archlinux.org
-# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-
-pkgname=curl
-pkgver=7.23.0
-pkgrel=1
-pkgdesc=An URL retrival utility and library
-arch=('i686' 'x86_64')
-url=http://curl.haxx.se;
-license=('MIT')
-depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-makedepends=('perl-libwww')
-options=('!libtool')
-source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
-curlbuild.h)
-md5sums=('018a9acee77ed70017c6f6cec855635a'
- '6a0d4a24923e587153462b8602468921'
- '751bd433ede935c8fae727377625a8ae')
-
-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
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure \
-  --prefix=/usr \
-  --mandir=/usr/share/man \
-  --disable-dependency-tracking \
-  --disable-ldap \
-  --disable-ldaps \
-  --enable-ipv6 \
-  --enable-manual \
-  --enable-versioned-symbols \
-  --enable-threaded-resolver \
-  --without-libidn \
-  --with-random=/dev/urandom \
-  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  # license
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-
-  # devel
-  install -Dm644 docs/libcurl/libcurl.m4 $pkgdir/usr/share/aclocal/libcurl.m4
-  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 142903, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-11-17 21:30:16 UTC (rev 142904)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.23.1
+pkgrel=1
+pkgdesc=An URL retrival utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+makedepends=('perl-libwww')
+options=('!libtool')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+curlbuild.h)
+md5sums=('8e23151f569fb54afef093ac0695077d'
+ '5d8eb7e2e38be0fb00a043f714f6d49f'
+ '751bd433ede935c8fae727377625a8ae')
+
+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
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure \
+  --prefix=/usr \
+  --mandir=/usr/share/man \
+  --disable-dependency-tracking \
+  --disable-ldap \
+  --disable-ldaps \
+  --enable-ipv6 \
+  --enable-manual \
+  --enable-versioned-symbols \
+  --enable-threaded-resolver \
+  --without-libidn \
+  --with-random=/dev/urandom \
+  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # license
+  install -Dm644 COPYING

[arch-commits] Commit in curl/repos (8 files)

2011-10-30 Thread Dave Reisner 
Date: Sunday, October 30, 2011 @ 11:39:03
  Author: dreisner
Revision: 141474

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/PKGBUILD
(from rev 141473, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 141473, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 141473, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 141473, 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

+
 testing-i686/PKGBUILD  |  128 +--
 testing-i686/curlbuild.h   |   18 +++---
 testing-x86_64/PKGBUILD|  128 +--
 testing-x86_64/curlbuild.h |   18 +++---
 4 files changed, 146 insertions(+), 146 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2011-10-30 15:38:49 UTC (rev 141473)
+++ testing-i686/PKGBUILD   2011-10-30 15:39:03 UTC (rev 141474)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-# Contributor: Angel Velasquez an...@archlinux.org
-# Contributor: Eric Belanger e...@archlinux.org
-# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-
-pkgname=curl
-pkgver=7.22.0
-pkgrel=3
-pkgdesc=An URL retrival utility and library
-arch=('i686' 'x86_64')
-url=http://curl.haxx.se;
-license=('MIT')
-depends=('libssh2' 'openssl' 'zlib')
-makedepends=('perl-libwww')
-options=('!libtool')
-source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
-curlbuild.h)
-md5sums=('e8c36126d21c893f085aca233906b5cc'
- '1b061c348b63ea3e90c3f2c3af6a08d6'
- '751bd433ede935c8fae727377625a8ae')
-
-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
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure \
-  --prefix=/usr \
-  --mandir=/usr/share/man \
-  --disable-dependency-tracking \
-  --disable-ldap \
-  --disable-ldaps \
-  --enable-ipv6 \
-  --enable-manual \
-  --enable-versioned-symbols \
-  --enable-threaded-resolver \
-  --without-libidn \
-  --with-random=/dev/urandom \
-  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  # license
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-
-  # devel
-  install -Dm644 docs/libcurl/libcurl.m4 $pkgdir/usr/share/aclocal/libcurl.m4
-  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 141473, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-30 15:39:03 UTC (rev 141474)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.22.0
+pkgrel=4
+pkgdesc=An URL retrival utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
+makedepends=('perl-libwww')
+options=('!libtool')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+curlbuild.h)
+md5sums=('e8c36126d21c893f085aca233906b5cc'
+ '1b061c348b63ea3e90c3f2c3af6a08d6'
+ '751bd433ede935c8fae727377625a8ae')
+
+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
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure \
+  --prefix=/usr \
+  --mandir=/usr/share/man \
+  --disable-dependency-tracking \
+  --disable-ldap \
+  --disable-ldaps \
+  --enable-ipv6 \
+  --enable-manual \
+  --enable-versioned-symbols \
+  --enable-threaded-resolver \
+  --without-libidn \
+  --with-random=/dev/urandom \
+  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
+
+  # license
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+
+

[arch-commits] Commit in curl/repos (8 files)

2011-10-29 Thread Dave Reisner 
Date: Saturday, October 29, 2011 @ 15:16:01
  Author: dreisner
Revision: 141358

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  curl/repos/testing-i686/PKGBUILD
(from rev 141357, curl/trunk/PKGBUILD)
  curl/repos/testing-i686/curlbuild.h
(from rev 141357, curl/trunk/curlbuild.h)
  curl/repos/testing-x86_64/PKGBUILD
(from rev 141357, curl/trunk/PKGBUILD)
  curl/repos/testing-x86_64/curlbuild.h
(from rev 141357, 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

+
 testing-i686/PKGBUILD  |  133 ---
 testing-i686/curlbuild.h   |   18 ++---
 testing-x86_64/PKGBUILD|  133 ---
 testing-x86_64/curlbuild.h |   18 ++---
 4 files changed, 146 insertions(+), 156 deletions(-)

Deleted: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2011-10-29 19:15:47 UTC (rev 141357)
+++ testing-i686/PKGBUILD   2011-10-29 19:16:01 UTC (rev 141358)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner dreis...@archlinux.org
-# Contributor: Angel Velasquez an...@archlinux.org
-# Contributor: Eric Belanger e...@archlinux.org
-# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-
-pkgname=curl
-pkgver=7.22.0
-pkgrel=2
-pkgdesc=An URL retrival utility and library
-arch=('i686' 'x86_64')
-url=http://curl.haxx.se;
-license=('MIT')
-depends=('libssh2' 'openssl' 'zlib')
-makedepends=('perl-libwww')
-options=('!libtool')
-source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
-curlbuild.h)
-md5sums=('e8c36126d21c893f085aca233906b5cc'
- '1b061c348b63ea3e90c3f2c3af6a08d6'
- '751bd433ede935c8fae727377625a8ae')
-
-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
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure \
-  --prefix=/usr \
-  --mandir=/usr/share/man \
-  --disable-dependency-tracking \
-  --disable-ldap \
-  --disable-ldaps \
-  --enable-ipv6 \
-  --enable-manual \
-  --enable-versioned-symbols \
-  --enable-threaded-resolver \
-  --without-libidn \
-  --with-random=/dev/urandom \
-  --with-ca-bundle=/etc/ssl/certs/ca-bundle.crt
-  make
-
-  perl lib/mk-ca-bundle.pl
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  # license
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-
-  # cert bundle
-  install -Dm644 ca-bundle.crt $pkgdir/etc/ssl/certs/ca-bundle.crt
-
-  # devel
-  install -Dm644 docs/libcurl/libcurl.m4 $pkgdir/usr/share/aclocal/libcurl.m4
-  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 141357, curl/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-29 19:16:01 UTC (rev 141358)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Dave Reisner dreis...@archlinux.org
+# Contributor: Angel Velasquez an...@archlinux.org
+# Contributor: Eric Belanger e...@archlinux.org
+# Contributor: Lucien Immink l.imm...@student.fnt.hvu.nl
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=curl
+pkgver=7.22.0
+pkgrel=3
+pkgdesc=An URL retrival utility and library
+arch=('i686' 'x86_64')
+url=http://curl.haxx.se;
+license=('MIT')
+depends=('libssh2' 'openssl' 'zlib')
+makedepends=('perl-libwww')
+options=('!libtool')
+source=(http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz{,.asc}
+curlbuild.h)
+md5sums=('e8c36126d21c893f085aca233906b5cc'
+ '1b061c348b63ea3e90c3f2c3af6a08d6'
+ '751bd433ede935c8fae727377625a8ae')
+
+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
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure \
+  --prefix=/usr \
+  --mandir=/usr/share/man \
+  --disable-dependency-tracking \
+  --disable-ldap \
+  --disable-ldaps \
+  --enable-ipv6 \
+  --enable-manual \
+  --enable-versioned-symbols \
+  --enable-threaded-resolver \
+  --without-libidn \
+  --with-random=/dev/urandom \
+  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir