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 <[email protected]>
+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 <[email protected]>
+# Contributor: Angel Velasquez <[email protected]>
+# Contributor: Eric Belanger <[email protected]>
+# Contributor: Lucien Immink <[email protected]>
+# Contributor: Daniel J Griffiths <[email protected]>
+
+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"
+
+ 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/curlbuild.h (from rev 225229,
curl/trunk/curlbuild.h)
===================================================================
--- testing-i686/curlbuild.h (rev 0)
+++ testing-i686/curlbuild.h 2014-10-23 12:07:39 UTC (rev 225230)
@@ -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-threaded-resolver-revert-Curl_expire_latest-switch.patch
(from rev 225229,
curl/trunk/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch)
===================================================================
---
testing-x86_64/0001-threaded-resolver-revert-Curl_expire_latest-switch.patch
(rev 0)
+++
testing-x86_64/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 <[email protected]>
+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-x86_64/PKGBUILD (from rev 225229,
curl/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-10-23 12:07:39 UTC (rev 225230)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Dave Reisner <[email protected]>
+# Contributor: Angel Velasquez <[email protected]>
+# Contributor: Eric Belanger <[email protected]>
+# Contributor: Lucien Immink <[email protected]>
+# Contributor: Daniel J Griffiths <[email protected]>
+
+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"
+
+ 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/curlbuild.h (from rev 225229,
curl/trunk/curlbuild.h)
===================================================================
--- testing-x86_64/curlbuild.h (rev 0)
+++ testing-x86_64/curlbuild.h 2014-10-23 12:07:39 UTC (rev 225230)
@@ -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
