diff --git a/www/p5-Net-Curl/Makefile b/www/p5-Net-Curl/Makefile index b579501e7631..09016bc18754 100644 --- a/www/p5-Net-Curl/Makefile +++ b/www/p5-Net-Curl/Makefile @@ -1,23 +1,22 @@ PORTNAME= Net-Curl -DISTVERSION= 0.57 -PORTREVISION= 1 +DISTVERSION= 0.58 CATEGORIES= www ftp perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= andrew.fengler@scaleengine.com COMMENT= Perl interface for libcurl WWW= https://metacpan.org/dist/Net-Curl LICENSE= MIT BUILD_DEPENDS= p5-ExtUtils-PkgConfig>=1.16:devel/p5-ExtUtils-PkgConfig LIB_DEPENDS= libcurl.so:ftp/curl USES= localbase perl5 USE_PERL5= configure post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/Curl/Curl.so .include diff --git a/www/p5-Net-Curl/distinfo b/www/p5-Net-Curl/distinfo index 85f2cab35dda..4c5c9d218d4a 100644 --- a/www/p5-Net-Curl/distinfo +++ b/www/p5-Net-Curl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737539879 -SHA256 (Net-Curl-0.57.tar.gz) = 881ea6ac7a99fa13f7f737b0a937972757c3c6d6e76965c637d1131262cf53cf -SIZE (Net-Curl-0.57.tar.gz) = 109678 +TIMESTAMP = 1788459413 +SHA256 (Net-Curl-0.58.tar.gz) = 37c1585cc70e21579c7c733e306e97a46adc093a3777af6d8ba37d73986d7f5a +SIZE (Net-Curl-0.58.tar.gz) = 110108 diff --git a/www/p5-Net-Curl/files/patch-Curl__Multi.xsh b/www/p5-Net-Curl/files/patch-Curl__Multi.xsh index abd309296ba7..38c1ec7b468c 100644 --- a/www/p5-Net-Curl/files/patch-Curl__Multi.xsh +++ b/www/p5-Net-Curl/files/patch-Curl__Multi.xsh @@ -1,25 +1,55 @@ ---- Curl_Multi.xsh.orig 2021-05-12 05:52:08 UTC +--- Curl_Multi.xsh.orig 2025-08-13 15:48:34 UTC +++ Curl_Multi.xsh -@@ -66,9 +66,21 @@ cb_multi_socket( CURL *easy_handle, curl_socket_t s, i +@@ -65,15 +65,39 @@ cb_multi_socket( CURL *easy_handle, curl_socket_t s, i + perl_curl_multi_t *multi; perl_curl_easy_t *easy; ++ SV *easy_sv; + /* Check if userptr is NULL */ + if (!userptr) { + return -1; + } ++ multi = (perl_curl_multi_t *) userptr; - (void) curl_easy_getinfo( easy_handle, CURLINFO_PRIVATE, (void *) &easy ); ++ if ( ! multi->cb[ CB_MULTI_SOCKET ].func || ! SvOK( multi->cb[ CB_MULTI_SOCKET ].func ) ) { ++ return 0; /* Ignore socket events if no Perl callback is registered */ ++ } + + CURLcode res = curl_easy_getinfo( easy_handle, CURLINFO_PRIVATE, (void *) &easy ); + if (res != CURLE_OK || !easy) { + return -1; + } + -+ /* Check if the callback is set */ ++ /* Check if the callback is set - note: the above check might obviate this check */ + if (multi->cb[CB_MULTI_SOCKET].func == NULL) { + return -1; + } - ++ ++ if ( easy ) { ++ easy_sv = SELF2PERL( easy ); ++ } else { ++ easy_sv = &PL_sv_undef; ++ } ++ /* $multi, $easy, $socket, $what, $socketdata, $userdata */ SV *args[] = { + /* 0 */ SELF2PERL( multi ), +- /* 1 */ SELF2PERL( easy ), ++ /* 1 */ easy_sv, + /* 2 */ newSVuv( s ), + /* 3 */ newSViv( what ), + /* 4 */ &PL_sv_undef +@@ -91,6 +115,10 @@ cb_multi_timer( CURLM *multi_handle, long timeout_ms, + + perl_curl_multi_t *multi; + multi = (perl_curl_multi_t *) userptr; ++ ++ if ( ! multi->cb[ CB_MULTI_TIMER ].func || ! SvOK( multi->cb[ CB_MULTI_TIMER ].func ) ) { ++ return 0; /* Ignore timer events if no Perl callback is registered */ ++ } + + /* $multi, $timeout, $userdata */ + SV *args[] = { diff --git a/www/p5-Net-Curl/files/patch-Makefile.PL b/www/p5-Net-Curl/files/patch-Makefile.PL deleted file mode 100644 index f3e843a6182c..000000000000 --- a/www/p5-Net-Curl/files/patch-Makefile.PL +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.PL.orig 2025-05-11 19:09:26 UTC -+++ Makefile.PL -@@ -341,7 +341,7 @@ sub get_constants_headers - - my @out; - foreach my $e (sort keys %syms) { -- if ( $e =~ /(OBSOLETE|^CURL_DEPRECATED\z|^CURL_EXTERN|^CURL_IGNORE_DEPRECATION\z|^CURLOPTDEPRECATED\z|_LAST\z|_LASTENTRY\z|^CURL_FORMAT_OFF_T$|^CURL_ISOCPP$|^CURLOPT$)/ ) { -+ if ( $e =~ /(OBSOLETE|^CURL_DEPRECATED\z|^CURL_EXTERN|^CURL_IGNORE_DEPRECATION\z|^CURLOPTDEPRECATED\z|_LAST\z|_LASTENTRY\z|^CURL_FORMAT_OFF_T$|^CURL_ISOCPP$|^CURLOPT$|^CURL_HAS_)/ ) { - next; - } - push @out, $e; diff --git a/www/p5-Net-Curl/files/patch-inc_symbols-in-versions b/www/p5-Net-Curl/files/patch-inc_symbols-in-versions deleted file mode 100644 index 50d4a7b6f1bb..000000000000 --- a/www/p5-Net-Curl/files/patch-inc_symbols-in-versions +++ /dev/null @@ -1,80 +0,0 @@ ---- inc/symbols-in-versions.orig 2025-05-11 19:08:52 UTC -+++ inc/symbols-in-versions -@@ -45,6 +45,7 @@ CURL_GLOBAL_WIN32 7.8.1 - CURL_GLOBAL_NOTHING 7.8 - CURL_GLOBAL_SSL 7.8 - CURL_GLOBAL_WIN32 7.8.1 -+CURL_HAS_DECLSPEC_ATTRIBUTE 8.13.0 - CURL_HET_DEFAULT 7.59.0 - CURL_HTTP_VERSION_1_0 7.9.1 - CURL_HTTP_VERSION_1_1 7.9.1 -@@ -336,11 +337,11 @@ CURLE_URL_MALFORMAT 7.1 - CURLE_UNSUPPORTED_PROTOCOL 7.1 - CURLE_UPLOAD_FAILED 7.16.3 - CURLE_URL_MALFORMAT 7.1 -+CURLE_ECH_REQUIRED 8.8.0 - CURLE_URL_MALFORMAT_USER 7.1 7.17.0 - CURLE_USE_SSL_FAILED 7.17.0 - CURLE_WEIRD_SERVER_REPLY 7.51.0 - CURLE_WRITE_ERROR 7.1 --CURLE_ECH_REQUIRED 8.8.0 - CURLFILETYPE_DEVICE_BLOCK 7.21.0 - CURLFILETYPE_DEVICE_CHAR 7.21.0 - CURLFILETYPE_DIRECTORY 7.21.0 -@@ -358,6 +359,9 @@ CURLFINFOFLAG_KNOWN_UID 7.21.0 - CURLFINFOFLAG_KNOWN_SIZE 7.21.0 - CURLFINFOFLAG_KNOWN_TIME 7.21.0 - CURLFINFOFLAG_KNOWN_UID 7.21.0 -+CURLFOLLOW_ALL 8.13.0 -+CURLFOLLOW_OBEYCODE 8.13.0 -+CURLFOLLOW_FIRSTONLY 8.13.0 - CURLFORM_ARRAY 7.9.1 7.56.0 - CURLFORM_ARRAY_END 7.9.1 7.9.5 7.9.6 - CURLFORM_ARRAY_START 7.9.1 7.9.5 7.9.6 -@@ -449,6 +453,7 @@ CURLINFO_HTTPAUTH_AVAIL 7.10.8 - CURLINFO_HTTP_CONNECTCODE 7.10.7 - CURLINFO_HTTP_VERSION 7.50.0 - CURLINFO_HTTPAUTH_AVAIL 7.10.8 -+CURLINFO_HTTPAUTH_USED 8.12.0 - CURLINFO_LASTONE 7.4.1 - CURLINFO_LASTSOCKET 7.15.2 7.45.0 - CURLINFO_LOCAL_IP 7.21.0 -@@ -471,6 +476,7 @@ CURLINFO_PROXYAUTH_AVAIL 7.10.8 - CURLINFO_PROXY_ERROR 7.73.0 - CURLINFO_PROXY_SSL_VERIFYRESULT 7.52.0 - CURLINFO_PROXYAUTH_AVAIL 7.10.8 -+CURLINFO_PROXYAUTH_USED 8.12.0 - CURLINFO_PTR 7.54.1 - CURLINFO_QUEUE_TIME_T 8.6.0 - CURLINFO_REDIRECT_COUNT 7.9.7 -@@ -889,6 +895,7 @@ CURLOPT_UPLOAD_BUFFERSIZE 7.62.0 - CURLOPT_UPKEEP_INTERVAL_MS 7.62.0 - CURLOPT_UPLOAD 7.1 - CURLOPT_UPLOAD_BUFFERSIZE 7.62.0 -+CURLOPT_UPLOAD_FLAGS 8.13.0 - CURLOPT_URL 7.1 - CURLOPT_USE_SSL 7.17.0 - CURLOPT_USERAGENT 7.1 -@@ -1122,6 +1129,11 @@ CURLUPART_ZONEID 7.65.0 - CURLUPART_URL 7.62.0 - CURLUPART_USER 7.62.0 - CURLUPART_ZONEID 7.65.0 -+CURLULFLAG_ANSWERED 8.13.0 -+CURLULFLAG_DELETED 8.13.0 -+CURLULFLAG_DRAFT 8.13.0 -+CURLULFLAG_FLAGGED 8.13.0 -+CURLULFLAG_SEEN 8.13.0 - CURLUSESSL_ALL 7.17.0 - CURLUSESSL_CONTROL 7.17.0 - CURLUSESSL_NONE 7.17.0 -@@ -1150,8 +1162,8 @@ LIBCURL_TIMESTAMP 7.16.2 - CURLWS_TEXT 7.86.0 - LIBCURL_COPYRIGHT 7.18.0 - LIBCURL_TIMESTAMP 7.16.2 --LIBCURL_VERSION 7.11.0 -+LIBCURL_VERSION 7.1.1 - LIBCURL_VERSION_MAJOR 7.11.0 - LIBCURL_VERSION_MINOR 7.11.0 --LIBCURL_VERSION_NUM 7.11.0 -+LIBCURL_VERSION_NUM 7.1.1 - LIBCURL_VERSION_PATCH 7.11.0