diff --git a/CPAN-2.29.tar.gz b/CPAN-2.29.tar.gz deleted file mode 100644 index b0ea66e..0000000 Binary files a/CPAN-2.29.tar.gz and /dev/null differ diff --git a/CPAN-2.36.tar.gz b/CPAN-2.36.tar.gz new file mode 100644 index 0000000..5d29343 Binary files /dev/null and b/CPAN-2.36.tar.gz differ diff --git a/backport-CVE-2023-31484.patch b/backport-CVE-2023-31484.patch deleted file mode 100644 index e178d0f..0000000 --- a/backport-CVE-2023-31484.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9c98370287f4e709924aee7c58ef21c85289a7f0 Mon Sep 17 00:00:00 2001 -From: Stig Palmquist -Date: Tue, 28 Feb 2023 11:54:06 +0100 -Subject: [PATCH] Add verify_SSL=>1 to HTTP::Tiny to verify https server - identity - ---- - lib/CPAN/HTTP/Client.pm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/CPAN/HTTP/Client.pm b/lib/CPAN/HTTP/Client.pm -index 4fc792c..a616fee 100644 ---- a/lib/CPAN/HTTP/Client.pm -+++ b/lib/CPAN/HTTP/Client.pm -@@ -32,6 +32,7 @@ sub mirror { - - my $want_proxy = $self->_want_proxy($uri); - my $http = HTTP::Tiny->new( -+ verify_SSL => 1, - $want_proxy ? (proxy => $self->{proxy}) : () - ); - --- -2.33.0 - diff --git a/perl-CPAN.spec b/perl-CPAN.spec index 21b8e82..80ac2b0 100644 --- a/perl-CPAN.spec +++ b/perl-CPAN.spec @@ -1,13 +1,12 @@ Name: perl-CPAN -Version: 2.29 -Release: 2 +Version: 2.36 +Release: 1 Summary: Query, download and build perl modules from CPAN sites -License: GPL+ or Artistic +License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/CPAN Source0: https://cpan.metacpan.org/authors/id/A/AN/ANDK/CPAN-%{version}.tar.gz BuildArch: noarch -Patch1: backport-CVE-2023-31484.patch BuildRequires: coreutils findutils perl(Test::Pod) perl(Test::Pod::Coverage) >= 0.18 BuildRequires: perl-interpreter perl-generators perl(ExtUtils::MakeMaker) @@ -43,7 +42,7 @@ Bundles simplify handling of sets of related modules. %package_help %prep -%autosetup -n CPAN-%{version} -p1 +%autosetup -n CPAN-%{version} %build perl Makefile.PL INSTALLDIRS=vendor NO_PERLLOCAL=1 NO_PACKLIST=1 @@ -66,6 +65,9 @@ make test %{_mandir}/man3/* %changelog +* Wed Jul 12 2023 leeffo - 2.36-1 +- upgrade to version 2.36 + * Tue Jul 4 2023 yanglongkang - 2.29-2 - fix CVE-2023-31484