diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-25 05:04:47 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-25 05:04:47 +0200 |
| commit | c5fa33fe50913381685a5d609713f8d1f5d63ba8 (patch) | |
| tree | ee1e8e12b4b7575bb071ecbfbf9cf5e6acf497cb /package | |
| parent | 74e7797a2f1a8cb7c96c74a48a94268879780d7d (diff) | |
update curl to latest stable version
Diffstat (limited to 'package')
| -rw-r--r-- | package/curl/Makefile | 8 | ||||
| -rw-r--r-- | package/curl/patches/patch-lib_url_c | 28 | ||||
| -rw-r--r-- | package/curl/patches/patch-src_tool_operate_c | 6 |
3 files changed, 36 insertions, 6 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile index 4482fc22b..17bbda944 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.41.0 -PKG_RELEASE:= 2 -PKG_HASH:= 58c9f7cb1be9c26e6a2fd9326c14e054780dc4bb74b590a1d47fb3788a31535d +PKG_VERSION:= 7.42.0 +PKG_RELEASE:= 1 +PKG_HASH:= 088f6a63289dbdcf23d692fdfaaf6262c19e373beb5237b9b9e7bcf9815a8f49 PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_DEPENDS:= libcurl @@ -73,6 +73,8 @@ CONFIGURE_ARGS+= --enable-cookies \ --enable-ftp \ --enable-http \ --enable-proxy \ + --disable-curldebug \ + --disable-ntlm-wb \ --disable-symbol-hiding \ --disable-ares \ --disable-dict \ diff --git a/package/curl/patches/patch-lib_url_c b/package/curl/patches/patch-lib_url_c new file mode 100644 index 000000000..f4c934576 --- /dev/null +++ b/package/curl/patches/patch-lib_url_c @@ -0,0 +1,28 @@ +--- curl-7.42.0.orig/lib/url.c 2015-04-22 07:55:54.000000000 +0200 ++++ curl-7.42.0/lib/url.c 2015-04-24 18:00:21.000000000 +0200 +@@ -3069,9 +3069,11 @@ ConnectionExists(struct SessionHandle *d + struct connectdata *check; + struct connectdata *chosen = 0; + bool canPipeline = IsPipeliningPossible(data, needle); ++#ifdef USE_NTLM + bool wantNTLMhttp = ((data->state.authhost.want & CURLAUTH_NTLM) || + (data->state.authhost.want & CURLAUTH_NTLM_WB)) && + (needle->handler->protocol & PROTO_FAMILY_HTTP) ? TRUE : FALSE; ++#endif + struct connectbundle *bundle; + + *force_reuse = FALSE; +@@ -3208,8 +3210,11 @@ ConnectionExists(struct SessionHandle *d + continue; + } + +- if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) || +- (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)) { ++ if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) ++#ifdef USE_NTLM ++ || (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE) ++#endif ++ ) { + /* This protocol requires credentials per connection or is HTTP+NTLM, + so verify that we're using the same name and password as well */ + if(!strequal(needle->user, check->user) || diff --git a/package/curl/patches/patch-src_tool_operate_c b/package/curl/patches/patch-src_tool_operate_c index eb1a3d52b..f9b563b16 100644 --- a/package/curl/patches/patch-src_tool_operate_c +++ b/package/curl/patches/patch-src_tool_operate_c @@ -1,6 +1,6 @@ ---- curl-7.36.0.orig/src/tool_operate.c 2014-03-25 11:36:28.000000000 +0100 -+++ curl-7.36.0/src/tool_operate.c 2014-04-02 14:59:00.000000000 +0200 -@@ -1794,8 +1794,10 @@ CURLcode operate(struct GlobalConfig *co +--- curl-7.42.0.orig/src/tool_operate.c 2015-04-16 23:39:50.000000000 +0200 ++++ curl-7.42.0/src/tool_operate.c 2015-04-24 13:31:09.000000000 +0200 +@@ -1828,8 +1828,10 @@ CURLcode operate(struct GlobalConfig *co if(res == PARAM_HELP_REQUESTED) tool_help(); /* Check if we were asked for the manual */ |