curl: update to 7.39.0 (fixes CVE-2014-3707)

This commit is contained in:
Alessio Sergi 2014-11-05 10:15:25 +01:00
parent 2c708c4875
commit 46001d1d7c
2 changed files with 4 additions and 36 deletions

View File

@ -1,32 +0,0 @@
From d9762a7cdb35e70f8cb0bf1c2f8019e8391616e1 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@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
--- lib/asyn-thread.c
+++ 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

View File

@ -1,20 +1,20 @@
# Template build file for 'curl'.
pkgname=curl
version=7.38.0
revision=2
version=7.39.0
revision=1
build_style=gnu-configure
configure_args="ac_cv_sizeof_off_t=8 --disable-ldaps --without-gssapi
--enable-threaded-resolver --enable-ipv6
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
hostmakedepends="pkg-config perl groff"
makedepends="zlib-devel libidn-devel libressl-devel ca-certificates"
makedepends="zlib-devel libidn-devel libressl-devel"
depends="ca-certificates"
short_desc="Client that groks URLs"
maintainer="Juan RP <xtraeme@gmail.com>"
license="MIT"
homepage="http://curl.haxx.se"
distfiles="$homepage/download/$pkgname-$version.tar.bz2"
checksum=035bd41e99aa1a4e64713f4cea5ccdf366ca8199e9be1b53d5a043d5165f9eba
checksum=b222566e7087cd9701b301dd6634b360ae118cc1cbc7697e534dc451102ea4e0
libcurl_package() {
short_desc="The multiprotocol file transfer library"