From: Rosen Penev <rosenp@gmail.com>
Date: Sat, 9 Nov 2019 19:30:15 +0000 (-0800)
Subject: Revert "perl-www-curl: curl 7.66.0 compatibility"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ec6cd9b9c395d8f8dc6c8566a536fa6805734c96;p=feed%2Fpackages.git

Revert "perl-www-curl: curl 7.66.0 compatibility"

This reverts commit 3d98d7fd05d72ec163ae1b19fb0be40ea80ef881.

This was a bad backport.
---

diff --git a/lang/perl-www-curl/Makefile b/lang/perl-www-curl/Makefile
index 2a4e8ccaad..10c2e7d2e1 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:=6
+PKG_RELEASE:=5
 
 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
deleted file mode 100644
index e26d953dd0..0000000000
--- a/lang/perl-www-curl/patches/210-curl_7.66_compat.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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;