From nobody Sat Sep 10 13:05:24 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MPtPx75hLz4c0tc; Sat, 10 Sep 2022 13:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MPtPx2T12z3vxJ; Sat, 10 Sep 2022 13:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662815125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fKtLBTtb2ZaJkhDH0ntVmpgH9ib9kbzhUPw4kuauE2o=; b=WhrSF4LJS6kWZTVa4NJuepldjhI6I6E4lfPflORWisfzOYmuPbqeFW5c0sVKzRpEJKhkKH AUhd7xHg3w7ZDdS75wFq+LXbNUMoX+8mwWkIn/eTVO8yXfPJhSANeGyO4Qrtx/GLLpYfgw bA0Bu+dyTkKDORCjR7Aoc+40wuLzcZNfUKpMBvja2q8HsoVNgaDKp3DC+N87QpMbZrAaG/ ILriB76kdsrxSu5BKXJlLF01NukL5hNEXi2SnAhb5TsS6vEs7riPL1Dz4ritMCLVNqKSkG LjbLem801qjfrBL1IZjpZKAULF/QPFzk9eVNWR3CzWqSwTfY1aFTz252Iy9Ezw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MPtPw3gyzzJwZ; Sat, 10 Sep 2022 13:05:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28AD5OHj029645; Sat, 10 Sep 2022 13:05:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28AD5OGm029644; Sat, 10 Sep 2022 13:05:24 GMT (envelope-from git) Date: Sat, 10 Sep 2022 13:05:24 GMT Message-Id: <202209101305.28AD5OGm029644@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4f5a0912a88a - main - ftp/rexx-curl: Unbreak this port with curl 7.85.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f5a0912a88a5eac1c7db59e6c455f737e754f1a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662815125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fKtLBTtb2ZaJkhDH0ntVmpgH9ib9kbzhUPw4kuauE2o=; b=le+MDOR5EhUcp/frjMgDxqQONQ8jJKmy58nBoa5g1hJVpMRjXh4QreWZOewH3w+2XuAAFe a5fEHCmrvfLqHi60Mf8Y3vVsB+MEOfGBXEw2zYLaVYcM43pFbFTxTS2D/FYzrJT1VrFnoA QlO3ns5ZNzjmvaGVNgcgtfH85nmHFBM7BK2p8ynxND/KD5+Q+h34WjpLqsGoR6aizcdnBP RlFTWJcZYBls3/E6/3ES5ilCLxQDK0thAQ2X3ru/JTWjkNH7ykLDfHkwOHHsRhK1+JD1Q7 bCbsTmVVtnaVzkISDD27w7ZhDl2Uu5DBE30jR0rO134K+55S5uZnxGeYVG95NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662815125; a=rsa-sha256; cv=none; b=MzFPuTQuHYUajxVPyINHT9Z8M6nmahGC5Ufqn6XFmpJpDls3+vkj6dQ4I46O3BebpLEIVL VOUDzvah/FOHQGzashW+ZO28ovQ/hOdmSx6iOLc9XV3S+Dpcukw9hoDR7IpYfyOu5Xh+uN LEtjSkFbAah1vb76y6vFtFexvJnt8y41qt/QUP820YWmqooZsrNll1HuGWtTn7qQxY/kmK JArTwNwOb+KSZWKyz0fVSdQt+0rSXhZ66KgrRCxjzTpSBKMzmz1TXNsDTohmWxbIxgnuXy fLJHNvlDrREiKm2+tVN+Taf24iAH+Mdhf2/RXncmKNd4PheOkBjLOtDohfSR7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f5a0912a88a5eac1c7db59e6c455f737e754f1a commit 4f5a0912a88a5eac1c7db59e6c455f737e754f1a Author: Bob Eager AuthorDate: 2022-09-10 12:54:46 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-09-10 13:03:01 +0000 ftp/rexx-curl: Unbreak this port with curl 7.85.0 PR: 266269 --- ftp/rexx-curl/Makefile | 2 -- ftp/rexx-curl/files/patch-rexxcurl.c | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ftp/rexx-curl/Makefile b/ftp/rexx-curl/Makefile index 72f7512fa58d..c87f71570cd3 100644 --- a/ftp/rexx-curl/Makefile +++ b/ftp/rexx-curl/Makefile @@ -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 diff --git a/ftp/rexx-curl/files/patch-rexxcurl.c b/ftp/rexx-curl/files/patch-rexxcurl.c index 6e64288906fe..c709be7477b9 100644 --- a/ftp/rexx-curl/files/patch-rexxcurl.c +++ b/ftp/rexx-curl/files/patch-rexxcurl.c @@ -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 )