From 39e7dca0eecd026659598f0243ef01ab46b92006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> Date: Wed, 10 May 2017 16:53:39 +0200 Subject: Upgrade to CPAN-2.18 as provided in perl-5.25.12
This is to be ready for finishing Perl 5.26 bootstrap. --- CPAN-2.16-Rebase-to-2.18-from-perl-5.25.12.patch | 117 +++++++++++++++++++++++ perl-CPAN.spec | 21 ++-- 2 files changed, 131 insertions(+), 7 deletions(-) create mode 100644 CPAN-2.16-Rebase-to-2.18-from-perl-5.25.12.patch diff --git a/CPAN-2.16-Rebase-to-2.18-from-perl-5.25.12.patch b/CPAN-2.16-Rebase-to-2.18-from-perl-5.25.12.patch new file mode 100644 index 0000000..404a47a --- /dev/null +++ b/CPAN-2.16-Rebase-to-2.18-from-perl-5.25.12.patch @@ -0,0 +1,117 @@ +From 582ed99d657fb10750e31e942f88b6ddc0259e01 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> +Date: Wed, 10 May 2017 16:44:06 +0200 +Subject: [PATCH] Rebase to 2.18 from perl-5.25.12 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař <[email protected]> +--- + lib/CPAN.pm | 2 +- + lib/CPAN/Bundle.pm | 7 ++++++- + lib/CPAN/Distribution.pm | 8 +++++++- + 3 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/lib/CPAN.pm b/lib/CPAN.pm +index 1fba5c1..4f02850 100644 +--- a/lib/CPAN.pm ++++ b/lib/CPAN.pm +@@ -2,7 +2,7 @@ + # vim: ts=4 sts=4 sw=4: + use strict; + package CPAN; +-$CPAN::VERSION = '2.16'; ++$CPAN::VERSION = '2.18'; + $CPAN::VERSION =~ s/_//; + + # we need to run chdir all over and we would get at wrong libraries +diff --git a/lib/CPAN/Bundle.pm b/lib/CPAN/Bundle.pm +index 3f17b54..3b4e93d 100644 +--- a/lib/CPAN/Bundle.pm ++++ b/lib/CPAN/Bundle.pm +@@ -8,7 +8,7 @@ use CPAN::Module; + use vars qw( + $VERSION + ); +-$VERSION = "5.5002"; ++$VERSION = "5.5003"; + + sub look { + my $self = shift; +@@ -21,6 +21,11 @@ sub undelay { + delete $self->{later}; + for my $c ( $self->contains ) { + my $obj = CPAN::Shell->expandany($c) or next; ++ if ($obj->id eq $self->id){ ++ my $id = $obj->id; ++ $CPAN::Frontend->mywarn("$id seems to contain itself, skipping\n"); ++ next; ++ } + $obj->undelay; + } + } +diff --git a/lib/CPAN/Distribution.pm b/lib/CPAN/Distribution.pm +index b5744fd..64976eb 100644 +--- a/lib/CPAN/Distribution.pm ++++ b/lib/CPAN/Distribution.pm +@@ -8,7 +8,7 @@ use CPAN::InfoObj; + use File::Path (); + @CPAN::Distribution::ISA = qw(CPAN::InfoObj); + use vars qw($VERSION); +-$VERSION = "2.16"; ++$VERSION = "2.18"; + + # no prepare, because prepare is not a command on the shell command line + # TODO: clear instance cache on reload +@@ -377,6 +377,7 @@ sub get { + ? $ENV{PERL5LIB} + : ($ENV{PERLLIB} || ""); + local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : ""; ++ # local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # get + $CPAN::META->set_perl5lib; + local $ENV{MAKEFLAGS}; # protect us from outer make calls + +@@ -1302,6 +1303,7 @@ Could not determine which directory to use for looking at $dist. + : ($ENV{PERLLIB} || ""); + + local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : ""; ++ # local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # look + $CPAN::META->set_perl5lib; + local $ENV{MAKEFLAGS}; # protect us from outer make calls + +@@ -1821,6 +1823,7 @@ sub prepare { + ? $ENV{PERL5LIB} + : ($ENV{PERLLIB} || ""); + local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : ""; ++ local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # prepare + $CPAN::META->set_perl5lib; + local $ENV{MAKEFLAGS}; # protect us from outer make calls + +@@ -2115,6 +2118,7 @@ is part of the perl-%s distribution. To install that, you need to run + ? $ENV{PERL5LIB} + : ($ENV{PERLLIB} || ""); + local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : ""; ++ local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # make + $CPAN::META->set_perl5lib; + local $ENV{MAKEFLAGS}; # protect us from outer make calls + +@@ -3482,6 +3486,7 @@ sub test { + : ($ENV{PERLLIB} || ""); + + local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : ""; ++ local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # test + $CPAN::META->set_perl5lib; + local $ENV{MAKEFLAGS}; # protect us from outer make calls + local $ENV{PERL_MM_USE_DEFAULT} = 1 if $CPAN::Config->{use_prompt_default}; +@@ -3955,6 +3960,7 @@ sub install { + : ($ENV{PERLLIB} || ""); + + local $ENV{PERL5OPT} = defined $ENV{PERL5OPT} ? $ENV{PERL5OPT} : ""; ++ local $ENV{PERL_USE_UNSAFE_INC} = exists $ENV{PERL_USE_UNSAFE_INC} ? $ENV{PERL_USE_UNSAFE_INC} : 1; # install + $CPAN::META->set_perl5lib; + local $ENV{PERL_MM_USE_DEFAULT} = 1 if $CPAN::Config->{use_prompt_default}; + local $ENV{NONINTERACTIVE_TESTING} = 1 if $CPAN::Config->{use_prompt_default}; +-- +2.9.3 + diff --git a/perl-CPAN.spec b/perl-CPAN.spec index d61cea2..f057514 100644 --- a/perl-CPAN.spec +++ b/perl-CPAN.spec @@ -1,22 +1,25 @@ # Don not run gnupg1 tests by default, they need network access # (Socket::inet_aton('pool.sks-keyservers.net')). %bcond_with perl_CPAN_enables_gnupg_test +%global cpan_version 2.16 Name: perl-CPAN -Version: 2.16 +Version: 2.18 Release: 1%{?dist} Summary: Query, download and build perl modules from CPAN sites License: GPL+ or Artistic -Group: Development/Libraries URL: http://search.cpan.org/dist/CPAN/ -Source0: http://www.cpan.org/authors/id/A/AN/ANDK/CPAN-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/A/AN/ANDK/CPAN-%{cpan_version}.tar.gz +# Upgrade to CPAN-2.18 as provided in perl-5.25.12 to properly dual-live after +# upgrading perl to 5.26 +Patch0: CPAN-2.16-Rebase-to-2.18-from-perl-5.25.12.patch # Create site paths for the first time, bug #1158873, CPAN RT#99905 -Patch0: CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch +Patch1: CPAN-2.14-Attemp-to-create-site-library-directories-on-first-t.patch # Change configuration directory name -Patch1: CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch +Patch2: CPAN-2.14-Replace-configuration-directory-string-with-a-marke.patch # Do not search cpan -j file in @INC, CPAN RT#116507, proposed in # <https://github.com/andk/cpanpm/pull/105> -Patch2: CPAN-2.14-For-cpan-j-make-the-file-an-absolute-path.patch +Patch3: CPAN-2.14-For-cpan-j-make-the-file-an-absolute-path.patch BuildArch: noarch BuildRequires: coreutils BuildRequires: findutils @@ -199,10 +202,11 @@ capabilities and knows how to use LWP, HTTP::Tiny, Net::FTP and certain external download clients to fetch distributions from the net. %prep -%setup -q -n CPAN-%{version} +%setup -q -n CPAN-%{cpan_version} %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Change configuration name find -type f -exec sed -i -e 's/XCPANCONFIGNAMEX/cpan/g' {} \; # Remove bundled modules @@ -229,6 +233,9 @@ make test %{_mandir}/man3/* %changelog +* Wed May 10 2017 Petr Pisar <[email protected]> - 2.18-1 +- Upgrade to CPAN-2.18 as provided in perl-5.25.12 + * Wed Feb 15 2017 Petr Pisar <[email protected]> - 2.16-1 - 2.16 bump -- cgit v1.1 https://src.fedoraproject.org/cgit/perl-CPAN.git/commit/?h=master&id=39e7dca0eecd026659598f0243ef01ab46b92006 _______________________________________________ perl-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
