Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
--- config/rootfiles/common/curl | 57 ++++++++++++++++++++++++++++++++++++++++++-- lfs/curl | 10 ++++---- 2 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index 0fd2819..82fd6c3 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -10,16 +10,59 @@ usr/bin/curl #usr/include/curl/multi.h #usr/include/curl/stdcheaders.h #usr/include/curl/typecheck-gcc.h -#usr/lib/libcurl.a #usr/lib/libcurl.la usr/lib/libcurl.so usr/lib/libcurl.so.3 usr/lib/libcurl.so.4 -usr/lib/libcurl.so.4.3.0 +usr/lib/libcurl.so.4.4.0 #usr/lib/pkgconfig/libcurl.pc #usr/share/aclocal/libcurl.m4 #usr/share/man/man1/curl-config.1 #usr/share/man/man1/curl.1 +#usr/share/man/man3/CURLINFO_ACTIVESOCKET.3 +#usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3 +#usr/share/man/man3/CURLINFO_CERTINFO.3 +#usr/share/man/man3/CURLINFO_CONDITION_UNMET.3 +#usr/share/man/man3/CURLINFO_CONNECT_TIME.3 +#usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3 +#usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3 +#usr/share/man/man3/CURLINFO_CONTENT_TYPE.3 +#usr/share/man/man3/CURLINFO_COOKIELIST.3 +#usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3 +#usr/share/man/man3/CURLINFO_FILETIME.3 +#usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3 +#usr/share/man/man3/CURLINFO_HEADER_SIZE.3 +#usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3 +#usr/share/man/man3/CURLINFO_HTTP_CONNECTCODE.3 +#usr/share/man/man3/CURLINFO_LASTSOCKET.3 +#usr/share/man/man3/CURLINFO_LOCAL_IP.3 +#usr/share/man/man3/CURLINFO_LOCAL_PORT.3 +#usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3 +#usr/share/man/man3/CURLINFO_NUM_CONNECTS.3 +#usr/share/man/man3/CURLINFO_OS_ERRNO.3 +#usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3 +#usr/share/man/man3/CURLINFO_PRIMARY_IP.3 +#usr/share/man/man3/CURLINFO_PRIMARY_PORT.3 +#usr/share/man/man3/CURLINFO_PRIVATE.3 +#usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3 +#usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3 +#usr/share/man/man3/CURLINFO_REDIRECT_TIME.3 +#usr/share/man/man3/CURLINFO_REDIRECT_URL.3 +#usr/share/man/man3/CURLINFO_REQUEST_SIZE.3 +#usr/share/man/man3/CURLINFO_RESPONSE_CODE.3 +#usr/share/man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3 +#usr/share/man/man3/CURLINFO_RTSP_CSEQ_RECV.3 +#usr/share/man/man3/CURLINFO_RTSP_SERVER_CSEQ.3 +#usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3 +#usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3 +#usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3 +#usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3 +#usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3 +#usr/share/man/man3/CURLINFO_SSL_ENGINES.3 +#usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3 +#usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3 +#usr/share/man/man3/CURLINFO_TLS_SESSION.3 +#usr/share/man/man3/CURLINFO_TOTAL_TIME.3 #usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3 #usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3 #usr/share/man/man3/CURLMOPT_MAXCONNECTS.3 @@ -29,6 +72,8 @@ usr/lib/libcurl.so.4.3.0 #usr/share/man/man3/CURLMOPT_PIPELINING.3 #usr/share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3 #usr/share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3 +#usr/share/man/man3/CURLMOPT_PUSHDATA.3 +#usr/share/man/man3/CURLMOPT_PUSHFUNCTION.3 #usr/share/man/man3/CURLMOPT_SOCKETDATA.3 #usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3 #usr/share/man/man3/CURLMOPT_TIMERDATA.3 @@ -64,6 +109,7 @@ usr/lib/libcurl.so.4.3.0 #usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3 #usr/share/man/man3/CURLOPT_DEBUGDATA.3 #usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3 +#usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3 #usr/share/man/man3/CURLOPT_DIRLISTONLY.3 #usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3 #usr/share/man/man3/CURLOPT_DNS_INTERFACE.3 @@ -221,6 +267,9 @@ usr/lib/libcurl.so.4.3.0 #usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3 #usr/share/man/man3/CURLOPT_SSL_VERIFYSTATUS.3 #usr/share/man/man3/CURLOPT_STDERR.3 +#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_KEEPALIVE.3 #usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3 #usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3 @@ -304,5 +353,9 @@ usr/lib/libcurl.so.4.3.0 #usr/share/man/man3/libcurl-multi.3 #usr/share/man/man3/libcurl-share.3 #usr/share/man/man3/libcurl-symbols.3 +#usr/share/man/man3/libcurl-thread.3 #usr/share/man/man3/libcurl-tutorial.3 #usr/share/man/man3/libcurl.3 +#usr/share/zsh +#usr/share/zsh/site-functions +#usr/share/zsh/site-functions/_curl diff --git a/lfs/curl b/lfs/curl index 29de280..0f49680 100644 --- a/lfs/curl +++ b/lfs/curl @@ -24,10 +24,10 @@
include Config
-VER = 7.43.0 +VER = 7.47.1
THISAPP = curl-$(VER) -DL_FILE = $(THISAPP).tar.gz +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 = 3037f0b6ce03d434618e9db5506ae6be +$(DL_FILE)_MD5 = 8242c073d8e5fc1c2a1aa946f1e903a4
install : $(TARGET)
@@ -69,9 +69,11 @@ $(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 -xvf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ --prefix=/usr \ + --enable-threaded-resolver \ + --disable-static \ --disable-ipv6 \ --with-ca-bundle=/etc/ssl/certs/ca-bundle.crt cd $(DIR_APP) && make $(MAKETUNING)