- temporary workaround for #548269
This commit is contained in:
parent
ab4974c767
commit
0fb58f6b85
13
curl-7.19.7-ares-ipv6.patch
Normal file
13
curl-7.19.7-ares-ipv6.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/lib/hostares.c b/lib/hostares.c
|
||||||
|
index 15f9c84..719efc1 100644
|
||||||
|
--- a/lib/hostares.c
|
||||||
|
+++ b/lib/hostares.c
|
||||||
|
@@ -327,7 +327,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn,
|
||||||
|
|
||||||
|
switch(data->set.ip_version) {
|
||||||
|
default:
|
||||||
|
-#if ARES_VERSION >= 0x010601
|
||||||
|
+#if 0
|
||||||
|
family = PF_UNSPEC; /* supported by c-ares since 1.6.1, so for older
|
||||||
|
c-ares versions this just falls through and defaults
|
||||||
|
to PF_INET */
|
15
curl.spec
15
curl.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
|
||||||
Name: curl
|
Name: curl
|
||||||
Version: 7.19.7
|
Version: 7.19.7
|
||||||
Release: 8%{?dist}
|
Release: 9%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
|
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
|
||||||
@ -16,6 +16,7 @@ Patch102: curl-7.16.0-privlibs.patch
|
|||||||
Patch103: curl-7.19.4-debug.patch
|
Patch103: curl-7.19.4-debug.patch
|
||||||
Patch104: curl-7.19.7-s390-sleep.patch
|
Patch104: curl-7.19.7-s390-sleep.patch
|
||||||
Patch105: curl-7.19.7-localhost6.patch
|
Patch105: curl-7.19.7-localhost6.patch
|
||||||
|
Patch106: curl-7.19.7-ares-ipv6.patch
|
||||||
Provides: webclient
|
Provides: webclient
|
||||||
URL: http://curl.haxx.se/
|
URL: http://curl.haxx.se/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -96,7 +97,13 @@ use cURL's capabilities internally.
|
|||||||
%patch104 -p1
|
%patch104 -p1
|
||||||
|
|
||||||
# we have localhost6 instead of ip6-localhost as name for ::1
|
# we have localhost6 instead of ip6-localhost as name for ::1
|
||||||
%patch105 -p1
|
# temporarily disabled (clash with patch #106)
|
||||||
|
#%patch105 -p1
|
||||||
|
|
||||||
|
# rebuild of cURL against newer c-ares-devel has caused a regression (#548269)
|
||||||
|
# this patch reverts back the old behavior of curl-7.19.7-4.fc13
|
||||||
|
# NOTE: this is a temporary workaround only
|
||||||
|
%patch106 -p1
|
||||||
|
|
||||||
autoconf
|
autoconf
|
||||||
|
|
||||||
@ -189,6 +196,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/aclocal/libcurl.m4
|
%{_datadir}/aclocal/libcurl.m4
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Dec 20 2009 Kamil Dudka <kdudka@redhat.com> 7.19.7-9
|
||||||
|
- temporary workaround for #548269
|
||||||
|
(restored behavior of 7.19.7-4)
|
||||||
|
|
||||||
* Wed Dec 09 2009 Kamil Dudka <kdudka@redhat.com> 7.19.7-8
|
* Wed Dec 09 2009 Kamil Dudka <kdudka@redhat.com> 7.19.7-8
|
||||||
- replace hard wired port numbers in the test suite
|
- replace hard wired port numbers in the test suite
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user