* [gentoo-commits] repo/gentoo:master commit in: dev-perl/WWW-Curl/, dev-perl/WWW-Curl/files/
@ 2018-03-21 8:20 Kent Fredric
0 siblings, 0 replies; 3+ messages in thread
From: Kent Fredric @ 2018-03-21 8:20 UTC (permalink / raw
To: gentoo-commits
commit: cb7bcc894d9da062a55040a3d2cdc733bfe0fbc3
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 08:16:28 2018 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Wed Mar 21 08:17:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb7bcc89
dev-perl/WWW-Curl: EAPI6 + tests
- EAPI6ify
- Enable tests
- Purge unwanted POD tests
- Add network controls to network tests
- Patchify dot-inc fix.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild | 25 +++
dev-perl/WWW-Curl/files/WWW-Curl-4.17-dotinc.patch | 26 +++
.../files/WWW-Curl-4.17-networktests.patch | 190 +++++++++++++++++++++
3 files changed, 241 insertions(+)
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
new file mode 100644
index 00000000000..002c1a778c6
--- /dev/null
+++ b/dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SZBALINT
+DIST_VERSION=4.17
+inherit perl-module
+
+DESCRIPTION="Perl extension interface for libcurl"
+
+LICENSE="|| ( MPL-1.0 MPL-1.1 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.150.0-curl-7.50.2.patch
+ "${FILESDIR}"/${PN}-4.17-dotinc.patch
+ "${FILESDIR}"/${PN}-4.17-networktests.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-dotinc.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-dotinc.patch
new file mode 100644
index 00000000000..bb6ea23ceb7
--- /dev/null
+++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-dotinc.patch
@@ -0,0 +1,26 @@
+From 326705b559b7e488314a776d171aef40e687e91b Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Fri, 16 Jun 2017 13:42:13 +1200
+Subject: Fix for '.' in @INC removal on Perl 5.26+
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=122110
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index fc1a55a..b455410 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,7 +1,7 @@
+ # Makefile.PL for Perl module WWW::Curl
+ # Check out the README file for more information.
+
+-use inc::Module::Install;
++use lib q[.]; use inc::Module::Install;
+
+ name 'WWW-Curl';
+ abstract 'Perl extension interface for libcurl';
+--
+2.16.2
+
diff --git a/dev-perl/WWW-Curl/files/WWW-Curl-4.17-networktests.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-networktests.patch
new file mode 100644
index 00000000000..38bc8b4ecd2
--- /dev/null
+++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-networktests.patch
@@ -0,0 +1,190 @@
+From 7102fd54eb385920ddf41c59e1196fc221ad9ea2 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Wed, 21 Mar 2018 21:08:45 +1300
+Subject: Disable network tests w/ NO_NETWORK_TESTING set.
+
+Gentoo users can opt-in to these tests by doing:
+
+ DIST_TEST_OVERRIDE="do network"
+
+Or Similar
+---
+ t/01basic.t | 6 ++++++
+ t/02callbacks.t | 7 +++++++
+ t/04abort-test.t | 7 +++++++
+ t/05progress.t | 7 +++++++
+ t/08ssl.t | 7 +++++++
+ t/09times.t | 7 +++++++
+ t/14duphandle.t | 7 ++++++-
+ t/15duphandle-callback.t | 7 ++++++-
+ t/18twinhandles.t | 7 ++++++-
+ t/21write-to-scalar.t | 6 ++++++
+ 10 files changed, 65 insertions(+), 3 deletions(-)
+
+diff --git a/t/01basic.t b/t/01basic.t
+index 93e12b1..77ca444 100644
+--- a/t/01basic.t
++++ b/t/01basic.t
+@@ -1,5 +1,11 @@
+ #!perl
+
++BEGIN {
++ if ( $ENV{NO_NETWORK_TESTING} ) {
++ print "1..0 # SKIP NO_NETWORK_TESTING set";
++ exit 0;
++ }
++}
+ use strict;
+ use warnings;
+ use Test::More tests => 19;
+diff --git a/t/02callbacks.t b/t/02callbacks.t
+index 76aff4f..344b4c5 100644
+--- a/t/02callbacks.t
++++ b/t/02callbacks.t
+@@ -1,5 +1,12 @@
+ #!perl
+
++BEGIN {
++ if ( $ENV{NO_NETWORK_TESTING} ) {
++ print "1..0 # SKIP NO_NETWORK_TESTING set";
++ exit 0;
++ }
++}
++
+ use strict;
+ use warnings;
+ use Test::More tests => 7;
+diff --git a/t/04abort-test.t b/t/04abort-test.t
+index c653c49..dcba4fd 100644
+--- a/t/04abort-test.t
++++ b/t/04abort-test.t
+@@ -1,5 +1,12 @@
+ #!perl
+
++BEGIN {
++ if ( $ENV{NO_NETWORK_TESTING} ) {
++ print "1..0 # SKIP NO_NETWORK_TESTING set";
++ exit 0;
++ }
++}
++
+ use strict;
+ use warnings;
+ use Test::More tests => 8;
+diff --git a/t/05progress.t b/t/05progress.t
+index 52129ea..25a08fa 100644
+--- a/t/05progress.t
++++ b/t/05progress.t
+@@ -1,5 +1,12 @@
+ #!perl
+
++BEGIN {
++ if ( $ENV{NO_NETWORK_TESTING} ) {
++ print "1..0 # SKIP NO_NETWORK_TESTING set";
++ exit 0;
++ }
++}
++
+ use strict;
+ use warnings;
+ use Test::More tests => 16;
+diff --git a/t/08ssl.t b/t/08ssl.t
+index 7374e06..d332d37 100644
+--- a/t/08ssl.t
++++ b/t/08ssl.t
+@@ -1,5 +1,12 @@
+ #!perl
+
++BEGIN {
++ if ( $ENV{NO_NETWORK_TESTING} ) {
++ print "1..0 # SKIP NO_NETWORK_TESTING set";
++ exit 0;
++ }
++}
++
+ use strict;
+ use warnings;
+ use Test::More;
+diff --git a/t/09times.t b/t/09times.t
+index 6b3c43a..49bf76a 100644
+--- a/t/09times.t
++++ b/t/09times.t
+@@ -1,5 +1,12 @@
+ #!perl
+
++BEGIN {
++ if ( $ENV{NO_NETWORK_TESTING} ) {
++ print "1..0 # SKIP NO_NETWORK_TESTING set";
++ exit 0;
++ }
++}
++
+ use strict;
+ use warnings;
+ use Test::More tests => 19;
+diff --git a/t/14duphandle.t b/t/14duphandle.t
+index f56ac57..f4211d0 100644
+--- a/t/14duphandle.t
++++ b/t/14duphandle.t
+@@ -1,5 +1,10 @@
+ #!perl
+-
++BEGIN {
++ if ( $ENV{NO_NETWORK_TESTING} ) {
++ print "1..0 # SKIP NO_NETWORK_TESTING set";
++ exit 0;
++ }
++}
+ use strict;
+ use warnings;
+ use lib 'inc';
+diff --git a/t/15duphandle-callback.t b/t/15duphandle-callback.t
+index 3c5ecd0..ee67b8a 100644
+--- a/t/15duphandle-callback.t
++++ b/t/15duphandle-callback.t
+@@ -1,5 +1,10 @@
+ #!perl
+-
++BEGIN {
++ if ( $ENV{NO_NETWORK_TESTING} ) {
++ print "1..0 # SKIP NO_NETWORK_TESTING set";
++ exit 0;
++ }
++}
+ use strict;
+ use warnings;
+ use lib 'inc';
+diff --git a/t/18twinhandles.t b/t/18twinhandles.t
+index 5b0b86b..a6acdb7 100644
+--- a/t/18twinhandles.t
++++ b/t/18twinhandles.t
+@@ -1,5 +1,10 @@
+ #!perl
+-
++BEGIN {
++ if ( $ENV{NO_NETWORK_TESTING} ) {
++ print "1..0 # SKIP NO_NETWORK_TESTING set";
++ exit 0;
++ }
++}
+ use strict;
+ use warnings;
+ use Test::More tests => 12;
+diff --git a/t/21write-to-scalar.t b/t/21write-to-scalar.t
+index 85d916e..6b691b5 100644
+--- a/t/21write-to-scalar.t
++++ b/t/21write-to-scalar.t
+@@ -1,4 +1,10 @@
+ #!perl
++BEGIN {
++ if ( $ENV{NO_NETWORK_TESTING} ) {
++ print "1..0 # SKIP NO_NETWORK_TESTING set";
++ exit 0;
++ }
++}
+ use strict;
+ use warnings;
+ use Test::More 'no_plan';
+--
+2.16.2
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/WWW-Curl/, dev-perl/WWW-Curl/files/
@ 2019-11-07 21:11 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2019-11-07 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 29c5c5c901eba0bd11a86c9f0c7174ae43b4c189
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 7 21:10:28 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> 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 <dilfridge <AT> 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 <cpansand@cvrsnica-freebsd-101.herceg.de>
+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 <cpansand@cloud1.bbbike.org>
+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 <curl/easy.h>
+ #include <curl/multi.h>
+
++#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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-perl/WWW-Curl/, dev-perl/WWW-Curl/files/
@ 2020-04-30 6:14 Robin H. Johnson
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2020-04-30 6:14 UTC (permalink / raw
To: gentoo-commits
commit: c2bce6bb75b6f51f9481fe5a28ab3cc39fc682e6
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 06:13:44 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 06:14:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2bce6bb
dev-perl/WWW-Curl: compile-fix for newer net-misc/curl
Reference: https://rt.cpan.org/Public/Bug/Display.html?id=132197
Closes: https://bugs.gentoo.org/713008
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
dev-perl/WWW-Curl/WWW-Curl-4.170.0-r1.ebuild | 1 +
.../WWW-Curl/files/WWW-Curl-4.17-RT132197.patch | 41 ++++++++++++++++++++++
2 files changed, 42 insertions(+)
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 d9eb8c504ab..55cab9448db 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
@@ -23,5 +23,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.17-networktests.patch
"${FILESDIR}"/${PN}-4.17-RT117793.patch
"${FILESDIR}"/${PN}-4.17-RT130591.patch
+ "${FILESDIR}"/${PN}-4.17-RT132197.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-RT132197.patch b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT132197.patch
new file mode 100644
index 00000000000..77a97dd7186
--- /dev/null
+++ b/dev-perl/WWW-Curl/files/WWW-Curl-4.17-RT132197.patch
@@ -0,0 +1,41 @@
+From ee910449bf764d9f582e612c9b8b61b1d18e3a7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 9 Apr 2020 14:31:05 +0200
+Subject: [PATCH] Adapt to changes in cURL 7.69.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+WIN32 macro was removed (1adebe7886ddf20b0733bf9ccbae4ed4866dcfb6) and
+then added under a CURL_WIN32 name
+(8bd863f97b6c79f561bc063e634cecdf4badf776). This a C preprocessor
+macro for driving the C compiler, not a cURL option. Thus this fix
+ignores it.
+
+CURLOPT(na,t,nu) macro was added
+(920deff8618a19ae80bd319851722f1b05751f69) as replacement for CINIT()
+macro. It's not a cURL option. This fix also ignores it.
+
+CPAN RT#132197
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ Makefile.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index ad2bd3d..b9e6a46 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|^CURLINC_)/) {
++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_|^CURL_WIN32\z|^CURLOPT\z)/) {
+ next;
+ }
+ my ($group) = $e =~ m/^([^_]+_)/;
+--
+2.21.1
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-30 6:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-30 6:14 [gentoo-commits] repo/gentoo:master commit in: dev-perl/WWW-Curl/, dev-perl/WWW-Curl/files/ Robin H. Johnson
-- strict thread matches above, loose matches on Subject: below --
2019-11-07 21:11 Andreas K. Hüttel
2018-03-21 8:20 Kent Fredric
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox