mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-20 00:21:35 +00:00
Apply a band-aid to fix the build without proxy support.
Note that some of the tests shall fail for the present.
This commit is contained in:
parent
731195e519
commit
bd3c754a8f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=226872
@ -202,6 +202,13 @@ post-install:
|
||||
# Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use
|
||||
# the user's locale when dates are sent to the server.
|
||||
test: build
|
||||
.if defined(WITHOUT_PROXY)
|
||||
@${ECHO_MSG} "******************************************"
|
||||
@${ECHO_MSG} "* You have disabled curl proxy support. *"
|
||||
@${ECHO_MSG} "* Some tests SHALL FAIL! *"
|
||||
@${ECHO_MSG} "* This is being addressed. *"
|
||||
@${ECHO_MSG} "******************************************"
|
||||
.endif
|
||||
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LC_ALL=C ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
47
ftp/curl/files/patch-lib::ftp.c
Normal file
47
ftp/curl/files/patch-lib::ftp.c
Normal file
@ -0,0 +1,47 @@
|
||||
--- ../../../tags/curl-7.19.2-stock/lib/ftp.c 2009-01-23 18:11:47.000000000 +0200
|
||||
+++ lib/ftp.c 2009-01-26 03:31:07.000000000 +0200
|
||||
@@ -1901,7 +1901,7 @@
|
||||
result = CURLE_COULDNT_CONNECT;
|
||||
break;
|
||||
}
|
||||
-#ifndef CURL_DISABLE_HTTP
|
||||
+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
|
||||
if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {
|
||||
/* FIX: this MUST wait for a proper connect first if 'connected' is
|
||||
* FALSE */
|
||||
@@ -1927,7 +1927,7 @@
|
||||
if(CURLE_OK != result)
|
||||
return result;
|
||||
}
|
||||
-#endif /* CURL_DISABLE_HTTP */
|
||||
+#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_PROXY */
|
||||
|
||||
state(conn, FTP_STOP); /* this phase is completed */
|
||||
|
||||
@@ -3056,7 +3056,7 @@
|
||||
bool *done) /* see description above */
|
||||
{
|
||||
CURLcode result;
|
||||
-#ifndef CURL_DISABLE_HTTP
|
||||
+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
|
||||
/* for FTP over HTTP proxy */
|
||||
struct HTTP http_proxy;
|
||||
struct FTP *ftp_save;
|
||||
@@ -3079,7 +3079,7 @@
|
||||
|
||||
ftpc->response_time = RESP_TIMEOUT; /* set default response time-out */
|
||||
|
||||
-#ifndef CURL_DISABLE_HTTP
|
||||
+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
|
||||
if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {
|
||||
/* BLOCKING */
|
||||
/* We want "seamless" FTP operations through HTTP proxy tunnel */
|
||||
@@ -3102,7 +3102,7 @@
|
||||
if(CURLE_OK != result)
|
||||
return result;
|
||||
}
|
||||
-#endif /* CURL_DISABLE_HTTP */
|
||||
+#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_PROXY */
|
||||
|
||||
if(conn->protocol & PROT_FTPS) {
|
||||
/* BLOCKING */
|
Loading…
Reference in New Issue
Block a user