Date: Thu, 30 May 2019 22:12:20 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r503109 - in branches/2019Q2/ftp/curl: . files Message-ID: <201905302212.x4UMCKiX047662@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Thu May 30 22:12:20 2019 New Revision: 503109 URL: https://svnweb.freebsd.org/changeset/ports/503109 Log: MFH: r503090 Fix runtime with PROXY disabled - Bump PORTREVISION for package change Obtained from: https://github.com/curl/curl/commit/f4f485c17b9a8b41c23ad1fa9fbcfc1973172ead Approved by: ports-secteam (blanket) Added: branches/2019Q2/ftp/curl/files/patch-src-tool_setopt.c - copied unchanged from r503090, head/ftp/curl/files/patch-src-tool_setopt.c branches/2019Q2/ftp/curl/files/patch-src-tool_setopt.h - copied unchanged from r503090, head/ftp/curl/files/patch-src-tool_setopt.h Modified: branches/2019Q2/ftp/curl/Makefile Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/ftp/curl/Makefile ============================================================================== --- branches/2019Q2/ftp/curl/Makefile Thu May 30 21:57:07 2019 (r503108) +++ branches/2019Q2/ftp/curl/Makefile Thu May 30 22:12:20 2019 (r503109) @@ -3,7 +3,7 @@ PORTNAME= curl PORTVERSION= 7.65.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp net www MASTER_SITES= https://curl.haxx.se/download/ \ LOCAL/sunpoet Copied: branches/2019Q2/ftp/curl/files/patch-src-tool_setopt.c (from r503090, head/ftp/curl/files/patch-src-tool_setopt.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q2/ftp/curl/files/patch-src-tool_setopt.c Thu May 30 22:12:20 2019 (r503109, copy of r503090, head/ftp/curl/files/patch-src-tool_setopt.c) @@ -0,0 +1,61 @@ +Obtained from: https://github.com/curl/curl/commit/f4f485c17b9a8b41c23ad1fa9fbcfc1973172ead + +--- src/tool_setopt.c.orig 2019-05-16 20:54:53 UTC ++++ src/tool_setopt.c +@@ -713,4 +713,56 @@ CURLcode tool_setopt(CURL *curl, bool st + return ret; + } + ++#else /* CURL_DISABLE_LIBCURL_OPTION */ ++ ++#include "tool_cfgable.h" ++#include "tool_setopt.h" ++ + #endif /* CURL_DISABLE_LIBCURL_OPTION */ ++ ++CURLcode tool_real_error(CURLcode result, CURLoption tag) ++{ ++#ifdef CURL_DISABLE_PROXY ++ switch(tag) { ++ case CURLOPT_HAPROXYPROTOCOL: ++ case CURLOPT_HTTPPROXYTUNNEL: ++ case CURLOPT_NOPROXY: ++ case CURLOPT_PRE_PROXY: ++ case CURLOPT_PROXY: ++ case CURLOPT_PROXYAUTH: ++ case CURLOPT_PROXY_CAINFO: ++ case CURLOPT_PROXY_CAPATH: ++ case CURLOPT_PROXY_CRLFILE: ++ case CURLOPT_PROXYHEADER: ++ case CURLOPT_PROXY_KEYPASSWD: ++ case CURLOPT_PROXYPASSWORD: ++ case CURLOPT_PROXY_PINNEDPUBLICKEY: ++ case CURLOPT_PROXYPORT: ++ case CURLOPT_PROXY_SERVICE_NAME: ++ case CURLOPT_PROXY_SSLCERT: ++ case CURLOPT_PROXY_SSLCERTTYPE: ++ case CURLOPT_PROXY_SSL_CIPHER_LIST: ++ case CURLOPT_PROXY_SSLKEY: ++ case CURLOPT_PROXY_SSLKEYTYPE: ++ case CURLOPT_PROXY_SSL_OPTIONS: ++ case CURLOPT_PROXY_SSL_VERIFYHOST: ++ case CURLOPT_PROXY_SSL_VERIFYPEER: ++ case CURLOPT_PROXY_SSLVERSION: ++ case CURLOPT_PROXY_TLS13_CIPHERS: ++ case CURLOPT_PROXY_TLSAUTH_PASSWORD: ++ case CURLOPT_PROXY_TLSAUTH_TYPE: ++ case CURLOPT_PROXY_TLSAUTH_USERNAME: ++ case CURLOPT_PROXY_TRANSFER_MODE: ++ case CURLOPT_PROXYTYPE: ++ case CURLOPT_PROXYUSERNAME: ++ case CURLOPT_PROXYUSERPWD: ++ return CURLE_OK; /* pretend it worked */ ++ default: ++ break; ++ } ++#else ++ (void)tag; ++#endif ++ return result; ++} ++ Copied: branches/2019Q2/ftp/curl/files/patch-src-tool_setopt.h (from r503090, head/ftp/curl/files/patch-src-tool_setopt.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q2/ftp/curl/files/patch-src-tool_setopt.h Thu May 30 22:12:20 2019 (r503109, copy of r503090, head/ftp/curl/files/patch-src-tool_setopt.h) @@ -0,0 +1,90 @@ +Obtained from: https://github.com/curl/curl/commit/f4f485c17b9a8b41c23ad1fa9fbcfc1973172ead + +--- src/tool_setopt.h.orig 2019-04-15 07:05:14 UTC ++++ src/tool_setopt.h +@@ -29,11 +29,14 @@ + * Macros used in operate() + */ + +-#define SETOPT_CHECK(v) do { \ +- result = (v); \ +- if(result) \ +- goto show_error; \ +-} WHILE_FALSE ++#define SETOPT_CHECK(v,opt) do { \ ++ result = tool_real_error((v), opt); \ ++ if(result) \ ++ goto show_error; \ ++ } WHILE_FALSE ++ ++/* allow removed features to simulate success: */ ++CURLcode tool_real_error(CURLcode result, CURLoption tag); + + #ifndef CURL_DISABLE_LIBCURL_OPTION + +@@ -97,25 +100,25 @@ CURLcode tool_setopt(CURL *curl, bool st + const char *name, CURLoption tag, ...); + + #define my_setopt(x,y,z) \ +- SETOPT_CHECK(tool_setopt(x, FALSE, global, #y, y, z)) ++ SETOPT_CHECK(tool_setopt(x, FALSE, global, #y, y, z), y) + + #define my_setopt_str(x,y,z) \ +- SETOPT_CHECK(tool_setopt(x, TRUE, global, #y, y, z)) ++ SETOPT_CHECK(tool_setopt(x, TRUE, global, #y, y, z), y) + + #define my_setopt_enum(x,y,z) \ +- SETOPT_CHECK(tool_setopt_enum(x, global, #y, y, setopt_nv_ ## y, z)) ++ SETOPT_CHECK(tool_setopt_enum(x, global, #y, y, setopt_nv_ ## y, z), y) + + #define my_setopt_flags(x,y,z) \ +- SETOPT_CHECK(tool_setopt_flags(x, global, #y, y, setopt_nv_ ## y, z)) ++ SETOPT_CHECK(tool_setopt_flags(x, global, #y, y, setopt_nv_ ## y, z), y) + + #define my_setopt_bitmask(x,y,z) \ +- SETOPT_CHECK(tool_setopt_bitmask(x, global, #y, y, setopt_nv_ ## y, z)) ++ SETOPT_CHECK(tool_setopt_bitmask(x, global, #y, y, setopt_nv_ ## y, z), y) + + #define my_setopt_mimepost(x,y,z) \ +- SETOPT_CHECK(tool_setopt_mimepost(x, global, #y, y, z)) ++ SETOPT_CHECK(tool_setopt_mimepost(x, global, #y, y, z), y) + + #define my_setopt_slist(x,y,z) \ +- SETOPT_CHECK(tool_setopt_slist(x, global, #y, y, z)) ++ SETOPT_CHECK(tool_setopt_slist(x, global, #y, y, z), y) + + #define res_setopt(x,y,z) tool_setopt(x, FALSE, global, #y, y, z) + +@@ -126,25 +129,25 @@ CURLcode tool_setopt(CURL *curl, bool st + /* No --libcurl, so pass options directly to library */ + + #define my_setopt(x,y,z) \ +- SETOPT_CHECK(curl_easy_setopt(x, y, z)) ++ SETOPT_CHECK(curl_easy_setopt(x, y, z), y) + + #define my_setopt_str(x,y,z) \ +- SETOPT_CHECK(curl_easy_setopt(x, y, z)) ++ SETOPT_CHECK(curl_easy_setopt(x, y, z), y) + + #define my_setopt_enum(x,y,z) \ +- SETOPT_CHECK(curl_easy_setopt(x, y, z)) ++ SETOPT_CHECK(curl_easy_setopt(x, y, z), y) + + #define my_setopt_flags(x,y,z) \ +- SETOPT_CHECK(curl_easy_setopt(x, y, z)) ++ SETOPT_CHECK(curl_easy_setopt(x, y, z), y) + + #define my_setopt_bitmask(x,y,z) \ +- SETOPT_CHECK(curl_easy_setopt(x, y, z)) ++ SETOPT_CHECK(curl_easy_setopt(x, y, z), y) + + #define my_setopt_mimepost(x,y,z) \ +- SETOPT_CHECK(curl_easy_setopt(x, y, z)) ++ SETOPT_CHECK(curl_easy_setopt(x, y, z), y) + + #define my_setopt_slist(x,y,z) \ +- SETOPT_CHECK(curl_easy_setopt(x, y, z)) ++ SETOPT_CHECK(curl_easy_setopt(x, y, z), y) + + #define res_setopt(x,y,z) curl_easy_setopt(x,y,z) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905302212.x4UMCKiX047662>