From 582ed99d657fb10750e31e942f88b6ddc0259e01 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>

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ř <ppisar@redhat.com>

---

 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