From 2a53bafffe1313eec256e5466924f35d8976532d Mon Sep 17 00:00:00 2001 From: Marcel Lorenz Date: Sun, 26 Jun 2016 10:07:44 +0200 Subject: [PATCH] curl: update to 7.49.1 https://curl.haxx.se/changes.html#7_49_1 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer --- config/rootfiles/common/curl | 3 +++ lfs/curl | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index 1fb29561e5..8208b97aba 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -189,6 +189,7 @@ usr/lib/libcurl.so.4.4.0 #usr/share/man/man3/CURLOPT_NOPROGRESS.3 #usr/share/man/man3/CURLOPT_NOPROXY.3 #usr/share/man/man3/CURLOPT_NOSIGNAL.3 +#usr/share/man/man3/CURLOPT_CONNECT_TO.3 #usr/share/man/man3/CURLOPT_OPENSOCKETDATA.3 #usr/share/man/man3/CURLOPT_OPENSOCKETFUNCTION.3 #usr/share/man/man3/CURLOPT_PASSWORD.3 @@ -272,6 +273,7 @@ usr/lib/libcurl.so.4.4.0 #usr/share/man/man3/CURLOPT_STREAM_DEPENDS.3 #usr/share/man/man3/CURLOPT_STREAM_DEPENDS_E.3 #usr/share/man/man3/CURLOPT_STREAM_WEIGHT.3 +#usr/share/man/man3/CURLOPT_TCP_FASTOPEN.3 #usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3 #usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3 #usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3 @@ -337,6 +339,7 @@ usr/lib/libcurl.so.4.4.0 #usr/share/man/man3/curl_multi_remove_handle.3 #usr/share/man/man3/curl_multi_setopt.3 #usr/share/man/man3/curl_multi_socket.3 +#usr/share/man/man3/curl_multi_socket_all.3 #usr/share/man/man3/curl_multi_socket_action.3 #usr/share/man/man3/curl_multi_strerror.3 #usr/share/man/man3/curl_multi_timeout.3 diff --git a/lfs/curl b/lfs/curl index 2fcfa7e6e3..eb2354485b 100644 --- a/lfs/curl +++ b/lfs/curl @@ -24,10 +24,10 @@ include Config -VER = 7.48.0 +VER = 7.49.1 THISAPP = curl-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.lzma DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = d42e0fc34a5cace5739631cc040974fe +$(DL_FILE)_MD5 = ae5e5e395da413d1fa0864e1d0a3fa57 install : $(TARGET) @@ -69,10 +69,12 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ --prefix=/usr \ --disable-ipv6 \ + --disable-static \ + --enable-threaded-resolver \ --with-ca-bundle=/etc/ssl/certs/ca-bundle.crt cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.39.2