6 changed files with 126 additions and 92 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/CPAN-2.16.tar.gz
+SOURCES/CPAN-2.27.tar.gz
--- a/.perl-CPAN.metadata
+++ b/.perl-CPAN.metadata
@ -1 +1 @@
-353f0d6590743bcd113fd39050f6182c96449e43 SOURCES/CPAN-2.16.tar.gz
+f14e6be485bff20faa2028a73ee73429c32f0bea SOURCES/CPAN-2.27.tar.gz
--- a/SOURCES/CPAN-2.14-For-cpan-j-make-the-file-an-absolute-path.patch
+++ b/SOURCES/CPAN-2.14-For-cpan-j-make-the-file-an-absolute-path.patch
@ -1,52 +0,0 @@
-From 8b3473d00f9490f8ee07425ef44b23c6f72a8938 Mon Sep 17 00:00:00 2001
-From: brian d foy <brian.d.foy@gmail.com>
-Date: Tue, 18 Oct 2016 16:02:51 -0400
-Subject: [PATCH] For cpan -j, make the file an absolute path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is an additional fix for rt.cpan.org #116507.
-Since . will not be in @INC, we can't assume we are
-loading from the current directory (although that's
-a very likely situation for -j). Take whatever
-argument we get and expand it to an absolute path.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
---
- lib/App/Cpan.pm | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/lib/App/Cpan.pm b/lib/App/Cpan.pm
-index 6561bd4..a9e73cd 100644
--- a/lib/App/Cpan.pm
-+++ b/lib/App/Cpan.pm
-@@ -291,7 +291,7 @@ use CPAN 1.80 (); # needs no test
- use Config;
- use autouse Cwd => qw(cwd);
- use autouse 'Data::Dumper' => qw(Dumper);
-use File::Spec::Functions;
-+use File::Spec::Functions qw(catfile file_name_is_absolute rel2abs);
- use File::Basename;
- use Getopt::Std;
- 
-@@ -1095,12 +1095,14 @@ sub _shell
- 
- sub _load_config # -j
- 	{
-	my $file = shift || '';
-+	my $argument = shift;
-+
-+	my $file = file_name_is_absolute( $argument ) ? $argument : rel2abs( $argument );
-+	croak( "cpan config file [$file] for -j does not exist!\n" ) unless -e $file;
- 
- 	# should I clear out any existing config here?
- 	$CPAN::Config = {};
- 	delete $INC{'CPAN/Config.pm'};
-	croak( "Config file [$file] does not exist!\n" ) unless -e $file;
- 
- 	my $rc = eval "require '$file'";
- 
-- 
-2.7.4
-
--- a/SOURCES/CPAN-2.18-Attemp-to-create-site-library-directories-on-first-t.patch
+++ b/SOURCES/CPAN-2.18-Attemp-to-create-site-library-directories-on-first-t.patch
@ -1,4 +1,4 @@
-From 16089db168d6f62a6ba88d1d160946b8c756acbc Mon Sep 17 00:00:00 2001
+From 5f0215694664fe0dc78ef59a7c8ca0af83896187 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
 Date: Thu, 30 Oct 2014 13:19:16 +0100
 Subject: [PATCH] Attemp to create site library directories on first time
@ -21,10 +21,10 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
 1 file changed, 18 insertions(+)

 diff --git a/lib/CPAN/FirstTime.pm b/lib/CPAN/FirstTime.pm
-index fb6b7eb..79035b8 100644
+index 531c115..8d82795 100644
 --- a/lib/CPAN/FirstTime.pm
 +++ b/lib/CPAN/FirstTime.pm
-@@ -2059,6 +2059,24 @@ sub _print_urllist {
+@@ -2068,6 +2068,24 @@ sub _print_urllist {
 }
 
 sub _can_write_to_libdirs {
@ -50,5 +50,5 @@ index fb6b7eb..79035b8 100644
         && -w $Config{installarchlib}
         && -w $Config{installsitelib}
 -- 
-2.5.5
+2.13.6

--- a/SOURCES/CPAN-2.18-Replace-configuration-directory-string-with-a-marke.patch
+++ b/SOURCES/CPAN-2.18-Replace-configuration-directory-string-with-a-marke.patch
@ -1,4 +1,4 @@
-From f850784742603449bc881030fa5dc2bb0490d771 Mon Sep 17 00:00:00 2001
+From c6f460b4bb60352e40e25efe72acd3c2bd14f216 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
 Date: Wed, 28 Jan 2015 13:21:10 +0100
 Subject: [PATCH] Replace configuration directory string with a marker
@ -19,10 +19,10 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
 5 files changed, 17 insertions(+), 17 deletions(-)

 diff --git a/Makefile.PL b/Makefile.PL
-index a0370cd..564e3ce 100644
+index 2cd2f82..3b826cf 100644
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -340,21 +340,21 @@ record-session :
+@@ -339,21 +339,21 @@ record-session :
 	$(PERL) -Ilib -MCPAN -e '$$CPAN::Suppress_readline=$$CPAN::Echo_readline=1;shell' | tee ttt.out
 
 run-with-sqlite :
@ -50,7 +50,7 @@ index a0370cd..564e3ce 100644
 runadmin :
 	$(PERL) -Ilib -MCPAN::Admin -eshell
 diff --git a/README b/README
-index f28834f..2be2869 100644
+index aaf3101..2618d71 100644
 --- a/README
 +++ b/README
@@ -269,7 +269,7 @@ DESCRIPTION
@ -80,7 +80,7 @@ index f28834f..2be2869 100644
     search path of the CPAN module before the use() or require() statements.
     The mkmyconfig command writes this file for you.
 
-@@ -1993,8 +1993,8 @@ FAQ
+@@ -1996,8 +1996,8 @@ FAQ
 
         You may want to configure something like
 
@ -92,10 +92,10 @@ index f28834f..2be2869 100644
         so that STDOUT is captured in a file for later inspection.
 
 diff --git a/lib/CPAN.pm b/lib/CPAN.pm
-index ab2d00f..981b5c8 100644
+index 4f02850..2c117b4 100644
 --- a/lib/CPAN.pm
 +++ b/lib/CPAN.pm
-@@ -1722,7 +1722,7 @@ restarting the whole get/make/test/install procedure from scratch.
+@@ -1745,7 +1745,7 @@ restarting the whole get/make/test/install procedure from scratch.
 
 =item Lockfile
 
@ -104,7 +104,7 @@ index ab2d00f..981b5c8 100644
 Batch jobs can run without a lockfile and not disturb each other.
 
 The shell offers to run in I<downgraded mode> when another process is
-@@ -1796,7 +1796,7 @@ C<install_tested>.
+@@ -1819,7 +1819,7 @@ C<install_tested>.
 
 =head2 mkmyconfig
 
@ -113,7 +113,7 @@ index ab2d00f..981b5c8 100644
 directory so that you can save your own preferences instead of the
 system-wide ones.
 
-@@ -2011,7 +2011,7 @@ in a file CPAN/Config.pm.
+@@ -2034,7 +2034,7 @@ in a file CPAN/Config.pm.
 
 Default values defined in the CPAN/Config.pm file can be
 overridden in a user specific file: CPAN/MyConfig.pm. Such a file is
@ -122,7 +122,7 @@ index ab2d00f..981b5c8 100644
 added to the search path of the CPAN module before the use() or
 require() statements. The mkmyconfig command writes this file for you.
 
-@@ -3703,8 +3703,8 @@ there is too much output to keep track of.
+@@ -3729,8 +3729,8 @@ there is too much output to keep track of.
 
 You may want to configure something like
 
@ -134,10 +134,10 @@ index ab2d00f..981b5c8 100644
 so that STDOUT is captured in a file for later inspection.
 
 diff --git a/lib/CPAN/HandleConfig.pm b/lib/CPAN/HandleConfig.pm
-index bd28948..a9612af 100644
+index c72439f..a6b92e8 100644
 --- a/lib/CPAN/HandleConfig.pm
 +++ b/lib/CPAN/HandleConfig.pm
-@@ -537,7 +537,7 @@ sub cpan_home_dir_candidates {
+@@ -538,7 +538,7 @@ sub cpan_home_dir_candidates {
     push @dirs, $ENV{USERPROFILE} if $ENV{USERPROFILE};
 
     $CPAN::Config->{load_module_verbosity} = $old_v;
@ -160,5 +160,5 @@ index fe0e29c..493c140 100644
 
 =head1 TO DO
 -- 
-2.5.5
+2.13.6

--- a/SPECS/perl-CPAN.spec
+++ b/SPECS/perl-CPAN.spec
@ -1,38 +1,41 @@
 # 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
+# Run optional test
+%if ! (0%{?rhel})
+%bcond_without perl_CPAN_enables_optional_test
+%else
+%bcond_with perl_CPAN_enables_optional_test
+%endif

 Name:           perl-CPAN
-Version:        2.16
+Version:        2.27
 Release:        2%{?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
+URL:            https://metacpan.org/release/CPAN
+Source0:        https://cpan.metacpan.org/authors/id/A/AN/ANDK/CPAN-%{version}.tar.gz
 # 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
+Patch0:         CPAN-2.18-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
-# 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
+Patch1:         CPAN-2.18-Replace-configuration-directory-string-with-a-marke.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  make
-BuildRequires:  perl
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(Config)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(File::Basename)
 BuildRequires:  perl(File::Path)
+# Module::Signature not used
 BuildRequires:  perl(strict)
 BuildRequires:  perl(vars)
 BuildRequires:  sed
 # Optional:
 BuildRequires:  perl(File::Spec)
-# YAML::Syck is not not used because @ST_PREFS is empty in Makefile.PL
+# YAML::Syck is not used because @ST_PREFS is empty in Makefile.PL

 # Run-time:
 # Prefer Archive::Tar and Compress::Zlib over tar and gzip
@ -52,6 +55,7 @@ BuildRequires:  perl(Data::Dumper)
 # Devel::Size not used at tests
 BuildRequires:  perl(DirHandle)
 BuildRequires:  perl(Dumpvalue)
+BuildRequires:  perl(Errno)
 BuildRequires:  perl(Exporter)
 # ExtUtils::Manifest not used at tests
 BuildRequires:  perl(Fcntl)
@ -66,6 +70,8 @@ BuildRequires:  perl(Getopt::Std)
 # HTTP::Request is optional
 BuildRequires:  perl(HTTP::Tiny) >= 0.005
 BuildRequires:  perl(if)
+# YAML::XS or YAML::Syck or JSON::PP, we already use YAML::Syck at a different
+# place, keep JSON::PP optional
 BuildRequires:  perl(lib)
 # local::lib is optional
 # LWP is optional, prefer HTTP::Tiny and Net::FTP
@ -75,8 +81,10 @@ BuildRequires:  perl(lib)
 # Module::Signature is optional
 # Net::Config not used at tests
 # Net::FTP not used at tests
+# Net::Ping is required but >= 2.13 version is a soft dependency
 BuildRequires:  perl(Net::Ping)
 BuildRequires:  perl(overload)
+# Pod::Perldoc is optional
 BuildRequires:  perl(POSIX)
 BuildRequires:  perl(Safe)
 BuildRequires:  perl(Sys::Hostname)
@ -90,22 +98,32 @@ BuildRequires:  perl(Text::Wrap)
 # User::pwent not used at tests
 BuildRequires:  perl(warnings)
 # Optional:
+#%%if !%%{defined perl_bootstrap}
+# CPAN::DistnameInfo not used at tests
+#%%endif
 BuildRequires:  perl(CPAN::Meta) >= 2.110350
 # Crypt::OpenPGP not used at tests
 # Digest::MD5 not used at tests
 BuildRequires:  perl(Digest::SHA)
+# Keep Log::Log4perl optional
 # Keep MIME::Base64 optional
+%if !%{defined perl_bootstrap}
 BuildRequires:  perl(Module::Build)
+%endif

 # Tests:
+BuildRequires:  perl(blib)
 # CPAN::Checksums not used
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(Pod::Usage)
 BuildRequires:  perl(Test::More)
+BuildRequires:  perl(version)

+%if %{with perl_CPAN_enables_optional_test}
 # Optional tests:
 %if %{with perl_CPAN_enables_gnupg_test}
 BuildRequires:  %{_bindir}/gpg
+# CPAN::Perl::Releases is helpfull only on RC or TRIAL Perl interpreters
 # Digest::SHA1 not needed if Digest::SHA is available
 # Digest::SHA::PurePerl not needed if Digest::SHA is available
 %endif
@ -120,6 +138,7 @@ BuildRequires:  perl(Module::Signature) >= 0.66
 %endif
 BuildRequires:  perl(Perl::Version)
 %endif
+BuildRequires:  perl(Pod::Perldoc::ToMan)
 %if %{with perl_CPAN_enables_gnupg_test}
 BuildRequires:  perl(Socket)
 %endif
@ -131,10 +150,14 @@ BuildRequires:  perl(Test::Pod) >= 1.00
 BuildRequires:  perl(Test::Pod::Coverage) >= 0.18
 BuildRequires:  perl(YAML) >= 0.60
 %endif
+%endif

 Requires:       make
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Archive::Tar) >= 1.50
+%if !%{defined perl_bootstrap}
+Recommends:     perl(CPAN::DistnameInfo)
+%endif
 Requires:       perl(CPAN::Meta::Requirements) >= 2.121
 Requires:       perl(Data::Dumper)
 %if !%{defined perl_bootstrap}
@ -145,7 +168,12 @@ Requires:       perl(ExtUtils::Manifest)
 Requires:       perl(File::HomeDir) >= 0.65
 %endif
 Requires:       perl(File::Temp) >= 0.16
+# YAML::XS or YAML::Syck or JSON::PP, we already use YAML::Syck at a different
+# place, keep JSON::PP optional
 Requires:       perl(lib)
+%if !%{defined perl_bootstrap}
+Suggests:       perl(Log::Log4perl)
+%endif
 Requires:       perl(Net::Config)
 Requires:       perl(Net::FTP)
 Requires:       perl(POSIX)
@ -174,14 +202,17 @@ Requires:       perl(ExtUtils::CBuilder)
 # local::lib recommended by CPAN::FirstTime default choice, bug #1122498
 Requires:       perl(local::lib)
 %endif
+%if ! %{defined perl_bootstrap}
 Requires:       perl(Module::Build)
-%if !%{defined perl_bootstrap}
+%endif
+Recommends:     perl(Pod::Perldoc)
+%if ! %{defined perl_bootstrap}
 Recommends:     perl(Term::ReadKey)
 Requires:       perl(Text::Glob)
 # Text::Levenshtein::XS or Text::Levenshtein::Damerau::XS or Text::Levenshtein
 # or Text::Levenshtein::Damerau::PP
 Suggests:       perl(Text::Levenshtein::Damerau::XS)
-# YAML::Syck or YAML or Data::Dumper
+# YAML::Syck or YAML or Data::Dumper or overload
 Suggests:       perl(YAML::Syck)
 %endif
 Provides:       cpan = %{version}
@ -202,7 +233,6 @@ external download clients to fetch distributions from the net.
 %setup -q -n CPAN-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 # Change configuration name
 find -type f -exec sed -i -e 's/XCPANCONFIGNAMEX/cpan/g' {} \;
 # Remove bundled modules
@ -210,15 +240,17 @@ rm -r ./inc/*
 sed -i -e '/inc\//d' MANIFEST

 %build
-perl Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}

 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -delete
+%{make_install}
 %{_fixperms} $RPM_BUILD_ROOT/*

 %check
+unset AUTHOR_TEST CPAN_EXPECT_TIMEOUT CPAN_RUN_SHELL_TEST_WITHOUT_EXPECT \
+    ftp_proxy http_proxy no_proxy \
+    PERL5_CPAN_IS_RUNNING PERL5_CPAN_IS_RUNNING_IN_RECURSION PERL_CORE VERBOSE
 make test

 %files
@ -229,8 +261,62 @@ make test
 %{_mandir}/man3/*

 %changelog
-* Fri Mar 29 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.16-2
- Rebuild with enable hardening (bug #1636329)
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jul 04 2019 Petr Pisar <ppisar@redhat.com> - 2.27-1
+- 2.27 bump
+
+* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.26-3
+- Perl 5.30 re-rebuild of bootstrapped packages
+
+* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.26-2
+- Perl 5.30 rebuild
+
+* Tue Mar 19 2019 Petr Pisar <ppisar@redhat.com> - 2.26-1
+- 2.26 bump
+
+* Mon Mar 04 2019 Petr Pisar <ppisar@redhat.com> - 2.25-1
+- 2.25 bump
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jan 02 2019 Petr Pisar <ppisar@redhat.com> - 2.22-1
+- 2.22 bump
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-418
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sun Jul 01 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.20-417
+- Perl 5.28 re-rebuild of bootstrapped packages
+
+* Tue Jun 26 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.20-416
+- Increase release to favour standalone package
+
+* Wed May 23 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2.20-1
+- Upgrade to 2.20 as provided in perl-5.28.0
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.18-397
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Dec 19 2017 Petr Pisar <ppisar@redhat.com> - 2.18-396
+- Rebase patches to prevent from installing back-up files
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18-395
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Jun 07 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.18-394
+- Perl 5.26 re-rebuild of bootstrapped packages
+
+* Sat Jun 03 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.18-393
+- Perl 5.26 rebuild
+
+* Fri May 12 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2.18-2
+- Don't BR: perl(Module::Build) when bootstrapping
+
+* Wed May 10 2017 Petr Pisar <ppisar@redhat.com> - 2.18-1
+- Upgrade to CPAN-2.18 as provided in perl-5.25.12

 * Wed Feb 15 2017 Petr Pisar <ppisar@redhat.com> - 2.16-1
 - 2.16 bump