Attachment 251481 Details for Bug 279775 – Patches for files in port directory

[patch] Patches for files in port directory

0001-Fix-compile-failure-due-to-removal-of-feature-in-cur.patch (text/plain), 2.50 KB, created by Bob Eager on 2024-06-15 22:00:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bob Eager

Created: 2024-06-15 22:00:58 UTC

Size: 2.50 KB

patch

obsolete

>From 171def2f6c9e04a5e03ee0ab23ef2b7bc58e08d0 Mon Sep 17 00:00:00 2001
>From: Bob Eager <bob@eager.cx>
>Date: Sat, 15 Jun 2024 23:46:56 +0100
>Subject: [PATCH] Fix compile failure due to removal of feature in curl 8.8.0
>
>---
> ftp/rexx-curl/Makefile               |  1 +
> ftp/rexx-curl/files/patch-rexxcurl.c | 14 ++++++++++++--
> 2 files changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile
>index 1e80b1056999..f27b977a9f5b 100644
>--- a/ftp/rexx-curl/Makefile
>+++ b/ftp/rexx-curl/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	curl
> PORTVERSION=	2.1.0
>+PORTREVISION=	1
> CATEGORIES=	ftp
> MASTER_SITES=	SF/rexx${PORTNAME}/rexx${PORTNAME}/${PORTVERSION}
> PKGNAMEPREFIX=	rexx-
>diff --git a/ftp/rexx-curl/files/patch-rexxcurl.c b/ftp/rexx-curl/files/patch-rexxcurl.c
>index c709be7477b9..66939b4ee190 100644
>--- a/ftp/rexx-curl/files/patch-rexxcurl.c
>+++ b/ftp/rexx-curl/files/patch-rexxcurl.c
>@@ -23,7 +23,17 @@
>  #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 
>+@@ -959,9 +966,6 @@ static curl_options RexxCurlSubOptions[] =
>+    { "NTLM"                   ,CURLAUTH_NTLM                      ,RXCURLOPT_BITMAP_AUTH , NULL },
>+    { "AUTH_GSSNEGOTIATE"      ,CURLAUTH_GSSNEGOTIATE              ,RXCURLOPT_BITMAP_AUTH , "GSSNEGOTIATE" },
>+    { "AUTH_NTLM"              ,CURLAUTH_NTLM                      ,RXCURLOPT_BITMAP_AUTH , "NTLM"         },
>+-# if LIBCURL_VERSION_NUM >= 0x071600
>+-   { "NTLM_WB"                ,CURLAUTH_NTLM_WB                   ,RXCURLOPT_BITMAP_AUTH , NULL },
>+-# endif
>+    { "ANY"                    ,CURLAUTH_ANY                       ,RXCURLOPT_BITMAP_AUTH , NULL },
>+    { "ANYSAFE"                ,CURLAUTH_ANYSAFE                   ,RXCURLOPT_BITMAP_AUTH , NULL },
>+    { "AUTH_ANY"               ,CURLAUTH_ANY                       ,RXCURLOPT_BITMAP_AUTH , "ANY"     },
>+@@ -1879,9 +1883,9 @@ int rexxcurl_sshkey_callback( CURL *easy,     /* easy 
>        if ( argv == NULL )
>           return -1;
>  
>@@ -35,7 +45,7 @@
>        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, 
>+@@ -1964,11 +1968,11 @@ int debug_function( CURL *handle, curl_infotype type, 
>     int c;
>     char *prefix = "*<><><>";
>     if ( type == CURLINFO_TEXT )
>-- 
>2.45.2
>

Actions: View | Diff

Attachments on bug 279775: 251481 | 253306