Attachment 236417 Details for Bug 266269 – Patches for two files

[patch] Patches for two files

rexxcurl.diff (text/plain), 2.15 KB, created by Bob Eager on 2022-09-07 11:40:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Eager

Created: 2022-09-07 11:40:42 UTC

Size: 2.15 KB

patch

obsolete

>Warning: current directory name differs from Makefile header:
>	rexx-curl != 
>===> Generating patch
>===> Viewing diff with ydiff -s -w 0
>diff -ruN ../rexx-curl.orig/Makefile ./Makefile
>--- ../rexx-curl.orig/Makefile	2022-09-05 22:07:55.000000000 +0100
>+++ ./Makefile	2022-09-06 21:38:27.991249000 +0100
>@@ -8,8 +8,6 @@
> MAINTAINER=	bob@eager.cx
> COMMENT=	External function package providing an interface to the cURL package
> 
>-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
>diff -ruN ../rexx-curl.orig/files/patch-rexxcurl.c ./files/patch-rexxcurl.c
>--- ../rexx-curl.orig/files/patch-rexxcurl.c	2019-04-08 18:47:09.000000000 +0100
>+++ ./files/patch-rexxcurl.c	2022-09-06 21:37:57.844088000 +0100
>@@ -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 )
>====> Cleaning up
>===> Done

Actions: View | Diff

Attachments on bug 266269: 236417