diff options
author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-11-01 19:13:16 +0000 |
---|---|---|
committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2018-11-01 19:13:16 +0000 |
commit | 53cd419ef4b9655c1a49081408a7a34c5f6af5a9 (patch) | |
tree | 52f0b899ca60888eefbd076127469ce00e031779 /ftp | |
parent | d4de0fc668d530be8de923ac67d388e6fa189739 (diff) | |
download | ports-53cd419ef4b9655c1a49081408a7a34c5f6af5a9.tar.gz ports-53cd419ef4b9655c1a49081408a7a34c5f6af5a9.zip |
Notes
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/curl/Makefile | 2 | ||||
-rw-r--r-- | ftp/curl/distinfo | 6 | ||||
-rw-r--r-- | ftp/curl/files/patch-configure | 20 | ||||
-rw-r--r-- | ftp/curl/files/patch-lib-url.c | 22 | ||||
-rw-r--r-- | ftp/curl/files/patch-lib-vtls-openssl.c | 18 | ||||
-rw-r--r-- | ftp/curl/files/patch-src-tool_operate.c | 8 | ||||
-rw-r--r-- | ftp/curl/pkg-plist | 11 |
7 files changed, 42 insertions, 45 deletions
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index 3b673567e0fa..8c19a12c3f5f 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -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 diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 0d4b56b800c8..e762232ceb01 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -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 diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure index 3b494adcfd4e..9e73d736dddb 100644 --- a/ftp/curl/files/patch-configure +++ b/ftp/curl/files/patch-configure @@ -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 diff --git a/ftp/curl/files/patch-lib-url.c b/ftp/curl/files/patch-lib-url.c index 2afbeb8e1c4e..1618ec1285c1 100644 --- a/ftp/curl/files/patch-lib-url.c +++ b/ftp/curl/files/patch-lib-url.c @@ -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 diff --git a/ftp/curl/files/patch-lib-vtls-openssl.c b/ftp/curl/files/patch-lib-vtls-openssl.c index e705e691d2b8..d41f50c454c9 100644 --- a/ftp/curl/files/patch-lib-vtls-openssl.c +++ b/ftp/curl/files/patch-lib-vtls-openssl.c @@ -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'; diff --git a/ftp/curl/files/patch-src-tool_operate.c b/ftp/curl/files/patch-src-tool_operate.c index 693ebd0333cd..ccded252b3dd 100644 --- a/ftp/curl/files/patch-src-tool_operate.c +++ b/ftp/curl/files/patch-src-tool_operate.c @@ -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; diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist index 626c07ce565e..de68207b1404 100644 --- a/ftp/curl/pkg-plist +++ b/ftp/curl/pkg-plist @@ -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 |