Thank you. Merged! > On 4 Feb 2019, at 17:30, Matthias Fischer wrote: > > For details see: > https://curl.haxx.se/changes.html > > Best, > Matthias > > Signed-off-by: Matthias Fischer > --- > config/rootfiles/common/curl | 24 ++++++++++++++++++++++++ > lfs/curl | 4 ++-- > 2 files changed, 26 insertions(+), 2 deletions(-) > > diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl > index aea07a6c7..5c616f8da 100644 > --- a/config/rootfiles/common/curl > +++ b/config/rootfiles/common/curl > @@ -9,6 +9,7 @@ usr/bin/curl > #usr/include/curl/stdcheaders.h > #usr/include/curl/system.h > #usr/include/curl/typecheck-gcc.h > +#usr/include/curl/urlapi.h > #usr/lib/libcurl.la > #usr/lib/libcurl.so > usr/lib/libcurl.so.4 > @@ -19,9 +20,11 @@ usr/lib/libcurl.so.4.5.0 > #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_APPCONNECT_TIME_T.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_CONNECT_TIME_T.3 > #usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3 > #usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3 > #usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3 > @@ -40,9 +43,11 @@ usr/lib/libcurl.so.4.5.0 > #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_NAMELOOKUP_TIME_T.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_PRETRANSFER_TIME_T.3 > #usr/share/man/man3/CURLINFO_PRIMARY_IP.3 > #usr/share/man/man3/CURLINFO_PRIMARY_PORT.3 > #usr/share/man/man3/CURLINFO_PRIVATE.3 > @@ -51,6 +56,7 @@ usr/lib/libcurl.so.4.5.0 > #usr/share/man/man3/CURLINFO_PROXY_SSL_VERIFYRESULT.3 > #usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3 > #usr/share/man/man3/CURLINFO_REDIRECT_TIME.3 > +#usr/share/man/man3/CURLINFO_REDIRECT_TIME_T.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 > @@ -70,9 +76,11 @@ usr/lib/libcurl.so.4.5.0 > #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_STARTTRANSFER_TIME_T.3 > #usr/share/man/man3/CURLINFO_TLS_SESSION.3 > #usr/share/man/man3/CURLINFO_TLS_SSL_PTR.3 > #usr/share/man/man3/CURLINFO_TOTAL_TIME.3 > +#usr/share/man/man3/CURLINFO_TOTAL_TIME_T.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 > @@ -118,17 +126,21 @@ usr/lib/libcurl.so.4.5.0 > #usr/share/man/man3/CURLOPT_COPYPOSTFIELDS.3 > #usr/share/man/man3/CURLOPT_CRLF.3 > #usr/share/man/man3/CURLOPT_CRLFILE.3 > +#usr/share/man/man3/CURLOPT_CURLU.3 > #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_DISALLOW_USERNAME_IN_URL.3 > #usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3 > #usr/share/man/man3/CURLOPT_DNS_INTERFACE.3 > #usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3 > #usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3 > #usr/share/man/man3/CURLOPT_DNS_SERVERS.3 > +#usr/share/man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3 > #usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3 > +#usr/share/man/man3/CURLOPT_DOH_URL.3 > #usr/share/man/man3/CURLOPT_EGDSOCKET.3 > #usr/share/man/man3/CURLOPT_ERRORBUFFER.3 > #usr/share/man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3 > @@ -153,6 +165,7 @@ usr/lib/libcurl.so.4.5.0 > #usr/share/man/man3/CURLOPT_FTP_USE_PRET.3 > #usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3 > #usr/share/man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3 > +#usr/share/man/man3/CURLOPT_HAPROXYPROTOCOL.3 > #usr/share/man/man3/CURLOPT_HEADER.3 > #usr/share/man/man3/CURLOPT_HEADERDATA.3 > #usr/share/man/man3/CURLOPT_HEADERFUNCTION.3 > @@ -244,6 +257,7 @@ usr/lib/libcurl.so.4.5.0 > #usr/share/man/man3/CURLOPT_PROXY_SSL_OPTIONS.3 > #usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYHOST.3 > #usr/share/man/man3/CURLOPT_PROXY_SSL_VERIFYPEER.3 > +#usr/share/man/man3/CURLOPT_PROXY_TLS13_CIPHERS.3 > #usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_PASSWORD.3 > #usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_TYPE.3 > #usr/share/man/man3/CURLOPT_PROXY_TLSAUTH_USERNAME.3 > @@ -322,6 +336,7 @@ usr/lib/libcurl.so.4.5.0 > #usr/share/man/man3/CURLOPT_TIMEOUT_MS.3 > #usr/share/man/man3/CURLOPT_TIMEVALUE.3 > #usr/share/man/man3/CURLOPT_TIMEVALUE_LARGE.3 > +#usr/share/man/man3/CURLOPT_TLS13_CIPHERS.3 > #usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3 > #usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3 > #usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3 > @@ -329,7 +344,9 @@ usr/lib/libcurl.so.4.5.0 > #usr/share/man/man3/CURLOPT_TRANSFER_ENCODING.3 > #usr/share/man/man3/CURLOPT_UNIX_SOCKET_PATH.3 > #usr/share/man/man3/CURLOPT_UNRESTRICTED_AUTH.3 > +#usr/share/man/man3/CURLOPT_UPKEEP_INTERVAL_MS.3 > #usr/share/man/man3/CURLOPT_UPLOAD.3 > +#usr/share/man/man3/CURLOPT_UPLOAD_BUFFERSIZE.3 > #usr/share/man/man3/CURLOPT_URL.3 > #usr/share/man/man3/CURLOPT_USERAGENT.3 > #usr/share/man/man3/CURLOPT_USERNAME.3 > @@ -355,6 +372,7 @@ usr/lib/libcurl.so.4.5.0 > #usr/share/man/man3/curl_easy_setopt.3 > #usr/share/man/man3/curl_easy_strerror.3 > #usr/share/man/man3/curl_easy_unescape.3 > +#usr/share/man/man3/curl_easy_upkeep.3 > #usr/share/man/man3/curl_escape.3 > #usr/share/man/man3/curl_formadd.3 > #usr/share/man/man3/curl_formfree.3 > @@ -403,6 +421,11 @@ usr/lib/libcurl.so.4.5.0 > #usr/share/man/man3/curl_strequal.3 > #usr/share/man/man3/curl_strnequal.3 > #usr/share/man/man3/curl_unescape.3 > +#usr/share/man/man3/curl_url.3 > +#usr/share/man/man3/curl_url_cleanup.3 > +#usr/share/man/man3/curl_url_dup.3 > +#usr/share/man/man3/curl_url_get.3 > +#usr/share/man/man3/curl_url_set.3 > #usr/share/man/man3/curl_version.3 > #usr/share/man/man3/curl_version_info.3 > #usr/share/man/man3/libcurl-easy.3 > @@ -414,4 +437,5 @@ usr/lib/libcurl.so.4.5.0 > #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-url.3 > #usr/share/man/man3/libcurl.3 > diff --git a/lfs/curl b/lfs/curl > index baf298e18..f00677b5e 100644 > --- a/lfs/curl > +++ b/lfs/curl > @@ -24,7 +24,7 @@ > > include Config > > -VER = 7.59.0 > +VER = 7.63.0 > > THISAPP = curl-$(VER) > DL_FILE = $(THISAPP).tar.gz > @@ -40,7 +40,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = a44f98c25c7506e7103039b542aa5ad8 > +$(DL_FILE)_MD5 = 6121427a7199cd6094fc48c9e31e8992 > > install : $(TARGET) > > -- > 2.18.0 >