cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ftp/rexx-curl: Unbreak this port with curl 7.85.0

Browse Source 
PR:		266269
This commit is contained in:
Bob Eager 2022-09-10 20:54:46 +08:00 committed by Po-Chuan Hsieh
parent 80c315e254
commit 4f5a0912a8
No known key found for this signature in database
GPG Key ID: 9A4BD10F002DD04B
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ftp/rexx-curl/Makefile
View File

@ -9,8 +9,6 @@ MAINTAINER= bob@eager.cx
COMMENT= External function package providing an interface to the cURL package
WWW= http://rexxcurl.sourceforge.net/
BROKEN= does not build with curl 7.85.0: use of undeclared identifier 'CURLOPT_FTP_RESPONSE_TIMEOUT'
LICENSE= CPLV1
LICENSE_NAME= CPL V1.0 license
LICENSE_FILE= ${WRKSRC}/CPLv1.0.txt

18
ftp/rexx-curl/files/patch-rexxcurl.c
View File

@ -9,7 +9,21 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#else
@@ -1879,9 +1881,9 @@ int rexxcurl_sshkey_callback( CURL *easy
@@ -480,8 +482,13 @@ static curl_options RexxCurlOptions[] =
{ "FTPLISTONLY" ,CURLOPT_FTPLISTONLY ,RXCURLOPT_BOOL , NULL },
#endif
{ "FTPPORT" ,CURLOPT_FTPPORT ,RXCURLOPT_STRING , NULL },
+#if LIBCURL_VERSION_NUM >= 0x075500
+ { "FTPRESPONSETIMEOUT", CURLOPT_SERVER_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
+#endif
#if LIBCURL_VERSION_NUM >= 0x070a08
+# if LIBCURL_VERSION_NUM < 0x075500
{ "FTPRESPONSETIMEOUT", CURLOPT_FTP_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
+# endif
#endif
#if LIBCURL_VERSION_NUM >= 0x070e00
{ "FTPSKIPPASVIP" ,CURLOPT_FTP_SKIP_PASV_IP,RXCURLOPT_BOOL , NULL },
@@ -1879,9 +1886,9 @@ int rexxcurl_sshkey_callback( CURL *easy, /* easy
if ( argv == NULL )
return -1;
@ -21,7 +35,7 @@
rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );
@@ -1964,11 +1966,11 @@ int debug_function( CURL *handle, curl_i
@@ -1964,11 +1971,11 @@ int debug_function( CURL *handle, curl_infotype type,
int c;
char *prefix = "*<><><>";
if ( type == CURLINFO_TEXT )