Attachment #236417 for bug #266269

View | Details | Raw Unified | Return to bug 266269
Collapse All | Expand All

Lines 8-15 Link Here

(-)./Makefile (-2 lines)
8	MAINTAINER= bob@eager.cx	8	MAINTAINER= bob@eager.cx
9	COMMENT= External function package providing an interface to the cURL package	9	COMMENT= External function package providing an interface to the cURL package
10		10
11	BROKEN= does not build with curl 7.85.0: use of undeclared identifier 'CURLOPT_FTP_RESPONSE_TIMEOUT'
12
13	LICENSE= CPLV1	11	LICENSE= CPLV1
14	LICENSE_NAME= CPL V1.0 license	12	LICENSE_NAME= CPL V1.0 license
15	LICENSE_FILE= ${WRKSRC}/CPLv1.0.txt	13	LICENSE_FILE= ${WRKSRC}/CPLv1.0.txt




 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #else
@@ -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;
 

       rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
       rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );
 
@@ -1964,11 +1971,11 @@ int debug_function( CURL *handle, curl_infotype type, 
    int c;
    char *prefix = "*<><><>";
    if ( type == CURLINFO_TEXT )

Return to bug 266269

Lines 9-15 Link Here

(-)./files/patch-rexxcurl.c (-2 / +16 lines)
9	#ifdef HAVE_CONFIG_H	9	#ifdef HAVE_CONFIG_H
10	# include "config.h"	10	# include "config.h"
11	#else	11	#else
12	@@ -1879,9 +1881,9 @@ int rexxcurl_sshkey_callback( CURL *easy	12	@@ -480,8 +482,13 @@ static curl_options RexxCurlOptions[] =
		13	{ "FTPLISTONLY" ,CURLOPT_FTPLISTONLY ,RXCURLOPT_BOOL , NULL },
		14	#endif
		15	{ "FTPPORT" ,CURLOPT_FTPPORT ,RXCURLOPT_STRING , NULL },
		16	+#if LIBCURL_VERSION_NUM >= 0x075500
		17	+ { "FTPRESPONSETIMEOUT", CURLOPT_SERVER_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
		18	+#endif
		19	#if LIBCURL_VERSION_NUM >= 0x070a08
		20	+# if LIBCURL_VERSION_NUM < 0x075500
		21	{ "FTPRESPONSETIMEOUT", CURLOPT_FTP_RESPONSE_TIMEOUT, RXCURLOPT_LONG, NULL },
		22	+# endif
		23	#endif
		24	#if LIBCURL_VERSION_NUM >= 0x070e00
		25	{ "FTPSKIPPASVIP" ,CURLOPT_FTP_SKIP_PASV_IP,RXCURLOPT_BOOL , NULL },
		26	@@ -1879,9 +1886,9 @@ int rexxcurl_sshkey_callback( CURL easy, / easy
13	if ( argv == NULL )	27	if ( argv == NULL )
14	return -1;	28	return -1;
15		29
Lines 21-27 Link Here
21	rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );	35	rx_foundkeytype_len = sprintf( rx_foundkeytype, "%u", foundkey->keytype );
22	rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );	36	rx_libcurlviewofkey_len = sprintf( rx_libcurlviewofkey, "%u", match );
23		37
24	@@ -1964,11 +1966,11 @@ int debug_function( CURL *handle, curl_i	38	@@ -1964,11 +1971,11 @@ int debug_function( CURL *handle, curl_infotype type,
25	int c;	39	int c;
26	char prefix = "<><><>";	40	char prefix = "<><><>";
27	if ( type == CURLINFO_TEXT )	41	if ( type == CURLINFO_TEXT )