From 7910715d863c29a93343db838c9b4b2aafdb2a3f Mon Sep 17 00:00:00 2001 From: Alexander Ryzhov Date: Fri, 27 Sep 2019 15:02:29 +0300 Subject: [PATCH] perl-www-curl: curl 7.66.0 compatibility Signed-off-by: Alexander Ryzhov --- lang/perl-www-curl/Makefile | 2 +- .../patches/210-curl_7.66_compat.patch | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 lang/perl-www-curl/patches/210-curl_7.66_compat.patch diff --git a/lang/perl-www-curl/Makefile b/lang/perl-www-curl/Makefile index 10c2e7d2e1..2a4e8ccaad 100644 --- a/lang/perl-www-curl/Makefile +++ b/lang/perl-www-curl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-www-curl PKG_VERSION:=4.17 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SZ/SZBALINT/ PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz diff --git a/lang/perl-www-curl/patches/210-curl_7.66_compat.patch b/lang/perl-www-curl/patches/210-curl_7.66_compat.patch new file mode 100644 index 0000000000..e26d953dd0 --- /dev/null +++ b/lang/perl-www-curl/patches/210-curl_7.66_compat.patch @@ -0,0 +1,56 @@ +--- a/Curl.xs ++++ b/Curl.xs +@@ -70,7 +70,7 @@ + + + typedef struct { +-#ifdef __CURL_MULTI_H ++#ifdef CURLINC_MULTI_H + struct CURLM *curlm; + #else + struct void *curlm; +@@ -234,7 +234,7 @@ + { + perl_curl_multi *self; + Newz(1, self, 1, perl_curl_multi); +-#ifdef __CURL_MULTI_H ++#ifdef CURLINC_MULTI_H + self->curlm=curl_multi_init(); + #else + croak("curl version too old to support curl_multi_init()"); +@@ -245,7 +245,7 @@ + /* delete the multi */ + static void perl_curl_multi_delete(perl_curl_multi *self) + { +-#ifdef __CURL_MULTI_H ++#ifdef CURLINC_MULTI_H + if (self->curlm) + curl_multi_cleanup(self->curlm); + Safefree(self); +@@ -1065,7 +1065,7 @@ + WWW::Curl::Multi curlm + WWW::Curl::Easy curl + CODE: +-#ifdef __CURL_MULTI_H ++#ifdef CURLINC_MULTI_H + curl_multi_add_handle(curlm->curlm, curl->curl); + #endif + +@@ -1074,7 +1074,7 @@ + WWW::Curl::Multi curlm + WWW::Curl::Easy curl + CODE: +-#ifdef __CURL_MULTI_H ++#ifdef CURLINC_MULTI_H + curl_multi_remove_handle(curlm->curlm, curl->curl); + #endif + +@@ -1149,7 +1149,7 @@ + PREINIT: + int remaining; + CODE: +-#ifdef __CURL_MULTI_H ++#ifdef CURLINC_MULTI_H + while(CURLM_CALL_MULTI_PERFORM == + curl_multi_perform(self->curlm, &remaining)); + RETVAL = remaining;