Date: Thu, 1 Nov 2018 19:13:16 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483704 - in head/ftp/curl: . files Message-ID: <201811011913.wA1JDGfl036579@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Thu Nov 1 19:13:16 2018 New Revision: 483704 URL: https://svnweb.freebsd.org/changeset/ports/483704 Log: Update to 7.62.0 Changes: https://curl.haxx.se/changes.html Security: e0ab1773-07c1-46c6-9170-4c5e81c00927 MFH: 2018Q4 Modified: head/ftp/curl/Makefile head/ftp/curl/distinfo head/ftp/curl/files/patch-configure head/ftp/curl/files/patch-lib-url.c head/ftp/curl/files/patch-lib-vtls-openssl.c head/ftp/curl/files/patch-src-tool_operate.c head/ftp/curl/pkg-plist Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Thu Nov 1 19:13:07 2018 (r483703) +++ head/ftp/curl/Makefile Thu Nov 1 19:13:16 2018 (r483704) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= curl -PORTVERSION= 7.61.1 +PORTVERSION= 7.62.0 CATEGORIES= ftp net www MASTER_SITES= https://curl.haxx.se/download/ \ LOCAL/sunpoet Modified: head/ftp/curl/distinfo ============================================================================== --- head/ftp/curl/distinfo Thu Nov 1 19:13:07 2018 (r483703) +++ head/ftp/curl/distinfo Thu Nov 1 19:13:16 2018 (r483704) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536185778 -SHA256 (curl-7.61.1.tar.xz) = 3d5913d6a39bd22e68e34dff697fd6e4c3c81563f580c76fca2009315cd81891 -SIZE (curl-7.61.1.tar.xz) = 2360392 +TIMESTAMP = 1541005821 +SHA256 (curl-7.62.0.tar.xz) = dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1 +SIZE (curl-7.62.0.tar.xz) = 2395476 Modified: head/ftp/curl/files/patch-configure ============================================================================== --- head/ftp/curl/files/patch-configure Thu Nov 1 19:13:07 2018 (r483703) +++ head/ftp/curl/files/patch-configure Thu Nov 1 19:13:16 2018 (r483704) @@ -6,9 +6,9 @@ Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> Last-Update: 2010-12-19 ---- configure.orig 2017-06-14 06:10:57 UTC +--- configure.orig 2018-10-30 10:03:34 UTC +++ configure -@@ -4149,9 +4149,10 @@ $as_echo "$as_me: LIBS note: LIBS should +@@ -3652,9 +3652,10 @@ $as_echo "$as_me: LIBS note: LIBS should -I*) xc_bad_var_ldflags=yes ;; @@ -22,7 +22,7 @@ Last-Update: 2010-12-19 esac done if test $xc_bad_var_ldflags = yes; then -@@ -4221,9 +4222,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar +@@ -3724,9 +3725,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in @@ -36,7 +36,7 @@ Last-Update: 2010-12-19 -U*) xc_bad_var_cflags=yes ;; -@@ -17982,6 +17984,8 @@ $as_echo "$as_me: WARNING: compiler opti +@@ -17364,6 +17366,8 @@ $as_echo "$as_me: WARNING: compiler opti tmp_CFLAGS="$CFLAGS" tmp_CPPFLAGS="$CPPFLAGS" @@ -45,7 +45,7 @@ Last-Update: 2010-12-19 ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -18012,6 +18016,7 @@ $as_echo "$as_me: WARNING: compiler opti +@@ -17394,6 +17398,7 @@ $as_echo "$as_me: WARNING: compiler opti done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -53,7 +53,7 @@ Last-Update: 2010-12-19 # if test "$want_debug" = "yes"; then -@@ -18229,6 +18234,8 @@ $as_echo "$honor_optimize_option" >&6; } +@@ -17616,6 +17621,8 @@ $as_echo "$honor_optimize_option" >&6; } # if test "$honor_optimize_option" = "yes"; then @@ -62,7 +62,7 @@ Last-Update: 2010-12-19 ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -18259,6 +18266,7 @@ $as_echo "$honor_optimize_option" >&6; } +@@ -17646,6 +17653,7 @@ $as_echo "$honor_optimize_option" >&6; } done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -70,7 +70,7 @@ Last-Update: 2010-12-19 if test "$want_optimize" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 -@@ -26661,30 +26669,30 @@ $as_echo "found" >&6; } +@@ -26970,30 +26978,30 @@ $as_echo "found" >&6; } ;; off) LIB_RTMP="-lrtmp" @@ -110,7 +110,7 @@ Last-Update: 2010-12-19 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -41279,9 +41287,10 @@ $as_echo "$as_me: LIBS note: LIBS should +@@ -41444,9 +41452,10 @@ $as_echo "$as_me: LIBS note: LIBS should -I*) xc_bad_var_ldflags=yes ;; @@ -124,7 +124,7 @@ Last-Update: 2010-12-19 esac done if test $xc_bad_var_ldflags = yes; then -@@ -41351,9 +41360,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar +@@ -41516,9 +41525,10 @@ $as_echo "$as_me: $xc_bad_var_msg librar xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in Modified: head/ftp/curl/files/patch-lib-url.c ============================================================================== --- head/ftp/curl/files/patch-lib-url.c Thu Nov 1 19:13:07 2018 (r483703) +++ head/ftp/curl/files/patch-lib-url.c Thu Nov 1 19:13:16 2018 (r483704) @@ -3,16 +3,16 @@ Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> Last-Update: 2010-12-18 ---- lib/url.c.orig 2018-01-23 07:55:37 UTC +--- lib/url.c.orig 2018-10-30 06:47:16 UTC +++ lib/url.c -@@ -589,6 +589,10 @@ CURLcode Curl_open(struct Curl_easy **cu - data->state.current_speed = -1; /* init to negative == impossible */ - data->set.fnmatch = ZERO_NULL; - data->set.maxconnects = DEFAULT_CONNCACHE_SIZE; /* for easy handles */ +@@ -536,6 +536,10 @@ CURLcode Curl_init_userdefined(struct Cu + set->fnmatch = ZERO_NULL; + set->upkeep_interval_ms = CURL_UPKEEP_INTERVAL_DEFAULT; + set->maxconnects = DEFAULT_CONNCACHE_SIZE; /* for easy handles */ +#if defined(__FreeBSD_version) -+ /* different handling of signals and threads */ -+ data->set.no_signal = TRUE; -+#endif /* __FreeBSD_version */ - - Curl_http2_init_state(&data->state); - } ++ /* different handling of signals and threads */ ++ set->no_signal = TRUE; ++#endif + set->httpversion = + #ifdef USE_NGHTTP2 + CURL_HTTP_VERSION_2TLS Modified: head/ftp/curl/files/patch-lib-vtls-openssl.c ============================================================================== --- head/ftp/curl/files/patch-lib-vtls-openssl.c Thu Nov 1 19:13:07 2018 (r483703) +++ head/ftp/curl/files/patch-lib-vtls-openssl.c Thu Nov 1 19:13:16 2018 (r483704) @@ -1,20 +1,6 @@ ---- lib/vtls/openssl.c.orig 2018-03-22 14:26:38 UTC +--- lib/vtls/openssl.c.orig 2018-10-27 13:34:01 UTC +++ lib/vtls/openssl.c -@@ -117,12 +117,7 @@ - #define X509_get0_notBefore(x) X509_get_notBefore(x) - #define X509_get0_notAfter(x) X509_get_notAfter(x) - #define CONST_EXTS /* nope */ --#ifdef LIBRESSL_VERSION_NUMBER --static unsigned long OpenSSL_version_num(void) --{ -- return LIBRESSL_VERSION_NUMBER; --} --#else -+#ifndef LIBRESSL_VERSION_NUMBER - #define OpenSSL_version_num() SSLeay() - #endif - #endif -@@ -3526,7 +3521,11 @@ static size_t Curl_ossl_version(char *bu +@@ -3715,7 +3715,11 @@ static size_t Curl_ossl_version(char *bu unsigned long ssleay_value; sub[2]='\0'; sub[1]='\0'; Modified: head/ftp/curl/files/patch-src-tool_operate.c ============================================================================== --- head/ftp/curl/files/patch-src-tool_operate.c Thu Nov 1 19:13:07 2018 (r483703) +++ head/ftp/curl/files/patch-src-tool_operate.c Thu Nov 1 19:13:16 2018 (r483704) @@ -1,6 +1,6 @@ ---- src/tool_operate.c.orig 2017-06-09 09:57:41 UTC +--- src/tool_operate.c.orig 2018-10-27 10:00:54 UTC +++ src/tool_operate.c -@@ -654,20 +654,7 @@ static CURLcode operate_do(struct Global +@@ -603,20 +603,7 @@ static CURLcode operate_do(struct Global DEBUGASSERT(!outs.filename); } @@ -22,7 +22,7 @@ #ifdef __VMS /* open file for output, forcing VMS output format into stream mode which is needed for stat() call above to always work. */ -@@ -675,7 +662,8 @@ static CURLcode operate_do(struct Global +@@ -624,7 +611,8 @@ static CURLcode operate_do(struct Global "ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0"); #else /* open file for output: */ @@ -32,7 +32,7 @@ #endif if(!file) { helpf(global->errors, "Can't open '%s'!\n", outfile); -@@ -684,6 +672,19 @@ static CURLcode operate_do(struct Global +@@ -633,6 +621,19 @@ static CURLcode operate_do(struct Global } outs.fopened = TRUE; outs.stream = file; Modified: head/ftp/curl/pkg-plist ============================================================================== --- head/ftp/curl/pkg-plist Thu Nov 1 19:13:07 2018 (r483703) +++ head/ftp/curl/pkg-plist Thu Nov 1 19:13:16 2018 (r483704) @@ -8,6 +8,7 @@ include/curl/multi.h include/curl/stdcheaders.h include/curl/system.h include/curl/typecheck-gcc.h +include/curl/urlapi.h lib/libcurl.a lib/libcurl.so lib/libcurl.so.4 @@ -136,6 +137,7 @@ man/man3/CURLOPT_DNS_LOCAL_IP6.3.gz man/man3/CURLOPT_DNS_SERVERS.3.gz man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3.gz man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3.gz +man/man3/CURLOPT_DOH_URL.3.gz man/man3/CURLOPT_EGDSOCKET.3.gz man/man3/CURLOPT_ERRORBUFFER.3.gz man/man3/CURLOPT_EXPECT_100_TIMEOUT_MS.3.gz @@ -339,7 +341,9 @@ man/man3/CURLOPT_TRANSFERTEXT.3.gz man/man3/CURLOPT_TRANSFER_ENCODING.3.gz man/man3/CURLOPT_UNIX_SOCKET_PATH.3.gz man/man3/CURLOPT_UNRESTRICTED_AUTH.3.gz +man/man3/CURLOPT_UPKEEP_INTERVAL_MS.3.gz man/man3/CURLOPT_UPLOAD.3.gz +man/man3/CURLOPT_UPLOAD_BUFFERSIZE.3.gz man/man3/CURLOPT_URL.3.gz man/man3/CURLOPT_USERAGENT.3.gz man/man3/CURLOPT_USERNAME.3.gz @@ -365,6 +369,7 @@ man/man3/curl_easy_send.3.gz man/man3/curl_easy_setopt.3.gz man/man3/curl_easy_strerror.3.gz man/man3/curl_easy_unescape.3.gz +man/man3/curl_easy_upkeep.3.gz man/man3/curl_escape.3.gz man/man3/curl_formadd.3.gz man/man3/curl_formfree.3.gz @@ -413,6 +418,11 @@ man/man3/curl_slist_free_all.3.gz man/man3/curl_strequal.3.gz man/man3/curl_strnequal.3.gz man/man3/curl_unescape.3.gz +man/man3/curl_url.3.gz +man/man3/curl_url_cleanup.3.gz +man/man3/curl_url_dup.3.gz +man/man3/curl_url_get.3.gz +man/man3/curl_url_set.3.gz man/man3/curl_version.3.gz man/man3/curl_version_info.3.gz man/man3/libcurl-easy.3.gz @@ -424,6 +434,7 @@ man/man3/libcurl-share.3.gz man/man3/libcurl-symbols.3.gz man/man3/libcurl-thread.3.gz man/man3/libcurl-tutorial.3.gz +man/man3/libcurl-url.3.gz man/man3/libcurl.3.gz share/aclocal/libcurl.m4 share/zsh/site-functions/_curl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811011913.wA1JDGfl036579>