From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AC0B9138334 for ; Thu, 7 Nov 2019 21:11:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB4F4E0BE3; Thu, 7 Nov 2019 21:11:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4036E0BE3 for ; Thu, 7 Nov 2019 21:11:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38F2B34CA3A for ; Thu, 7 Nov 2019 21:11:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CDC0896 for ; Thu, 7 Nov 2019 21:11:16 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1573161064.29c5c5c901eba0bd11a86c9f0c7174ae43b4c189.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/WWW-Curl/, dev-perl/WWW-Curl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT117793.patch dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT130591.patch X-VCS-Directories: dev-perl/WWW-Curl/files/ dev-perl/WWW-Curl/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 29c5c5c901eba0bd11a86c9f0c7174ae43b4c189 X-VCS-Branch: master Date: Thu, 7 Nov 2019 21:11:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a8dade77-9d39-4522-ada0-cebe4f54ea49 X-Archives-Hash: 14651bce3baddef6159f3d9bd2693f7e commit: 29c5c5c901eba0bd11a86c9f0c7174ae43b4c189 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Nov 7 21:10:28 2019 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Nov 7 21:11:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c5c5c9 dev-perl/WWW-Curl: Add patches by Slaven Rezic, bug 694466 Closes: https://bugs.gentoo.org/694466 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas K. Hüttel gentoo.org> dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild | 4 ++- .../WWW-Curl/files/WWW-Curl-4.17-RT117793.patch | 25 +++++++++++++ .../WWW-Curl/files/WWW-Curl-4.17-RT130591.patch | 41 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild index f2ce9d9aeaf..d9eb8c504ab 100644 --- a/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild +++ b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,5 +21,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.150.0-curl-7.50.2.patch "${FILESDIR}"/${PN}-4.17-dotinc.patch "${FILESDIR}"/${PN}-4.17-networktests.patch + "${FILESDIR}"/${PN}-4.17-RT117793.patch + "${FILESDIR}"/${PN}-4.17-RT130591.patch ) PERL_RM_FILES=("t/meta.t" "t/pod-coverage.t" "t/pod.t") diff --git a/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT117793.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT117793.patch new file mode 100644 index 00000000000..e89d237ea23 --- /dev/null +++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT117793.patch @@ -0,0 +1,25 @@ +From 292c05a8aa9c18bd27d0aaff0b4ee601d9b87b92 Mon Sep 17 00:00:00 2001 +From: Slaven Rezic +Date: Sun, 16 Apr 2017 22:17:00 +0200 +Subject: [PATCH] compilation fixes for curl 7.50.2 and newer (RT #117793) + +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index f9170bb..bb852e4 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -127,7 +127,7 @@ if (!defined($curl_h)) { + close H; + + for my $e (sort @syms) { +- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { ++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) { + next; + } + my ($group) = $e =~ m/^([^_]+_)/; +-- +2.1.2 + diff --git a/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT130591.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT130591.patch new file mode 100644 index 00000000000..753b3edb4cf --- /dev/null +++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT130591.patch @@ -0,0 +1,41 @@ +From 0ef6ea22479b4696a0d62cd44aac8f4fe866db2f Mon Sep 17 00:00:00 2001 +From: Slaven Rezic +Date: Sun, 29 Sep 2019 16:19:57 +0000 +Subject: [PATCH] compat for libcurl 7.66.0 (fix for RT #130591) + +--- + Curl.xs | 4 ++++ + Makefile.PL | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Curl.xs b/Curl.xs +index ea9f870..e81c415 100644 +--- a/Curl.xs ++++ b/Curl.xs +@@ -18,6 +18,10 @@ + #include + #include + ++#ifdef CURLINC_MULTI_H ++#define __CURL_MULTI_H ++#endif ++ + #define header_callback_func writeheader_callback_func + + /* Do a favor for older perl versions */ +diff --git a/Makefile.PL b/Makefile.PL +index bb852e4..713656a 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -127,7 +127,7 @@ if (!defined($curl_h)) { + close H; + + for my $e (sort @syms) { +- if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) { ++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) { + next; + } + my ($group) = $e =~ m/^([^_]+_)/; +-- +2.1.4 +