Correct an SHA version in a message

This commit is contained in:
Petr Písař 2021-03-09 09:33:19 +01:00
parent f6a7d83240
commit e1adc8042f
2 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 215c69b180f8de546c5965c37950d67c6cd8dc33 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Tue, 9 Mar 2021 09:29:43 +0100
Subject: [PATCH] SHA1 -> SHA256 in checksum chat()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Petr Pisar: Ported from 2c24e534bbd1b843233dda3d66650645883f70a2
commit in upstream devel branch.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
lib/App/cpanminus/script.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/App/cpanminus/script.pm b/lib/App/cpanminus/script.pm
index 1b26b5d..af44442 100644
--- a/lib/App/cpanminus/script.pm
+++ b/lib/App/cpanminus/script.pm
@@ -1637,7 +1637,7 @@ sub verify_archive {
sub verify_checksum {
my($self, $file, $chk_file) = @_;
- $self->chat("Verifying the SHA1 for $file\n");
+ $self->chat("Verifying the SHA256 for $file\n");
open my $fh, "<$chk_file" or die "$chk_file: $!";
my $data = join '', <$fh>;
--
2.26.2

View File

@ -1,6 +1,6 @@
Name: perl-App-cpanminus Name: perl-App-cpanminus
Version: 1.7044 Version: 1.7044
Release: 11%{?dist} Release: 12%{?dist}
Summary: Get, unpack, build and install CPAN modules Summary: Get, unpack, build and install CPAN modules
# Other files: GPL+ or Artistic # Other files: GPL+ or Artistic
## unbundled ## unbundled
@ -11,6 +11,9 @@ License: GPL+ or Artistic
URL: https://metacpan.org/release/App-cpanminus URL: https://metacpan.org/release/App-cpanminus
Source0: https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-%{version}.tar.gz Source0: https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/App-cpanminus-%{version}.tar.gz
Source1: fatunpack Source1: fatunpack
# Correct an SHA version in a message, in upstream's devel branch,
# <https://github.com/miyagawa/cpanminus/pull/617>
Patch0: App-cpanminus-1.7044-SHA1-SHA256-in-checksum-chat.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: %{_bindir}/podselect BuildRequires: %{_bindir}/podselect
BuildRequires: coreutils BuildRequires: coreutils
@ -128,6 +131,8 @@ for F in bin/cpanm lib/App/cpanminus/fatscript.pm; do
mv "${F}.stripped" "$F" mv "${F}.stripped" "$F"
done done
%patch0 -p1
%build %build
perl Makefile.PL INSTALLDIRS=vendor perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags} make %{?_smp_mflags}
@ -149,6 +154,9 @@ make test
%{_bindir}/cpanm %{_bindir}/cpanm
%changelog %changelog
* Tue Mar 09 2021 Petr Pisar <ppisar@redhat.com> - 1.7044-12
- Correct an SHA version in a message
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7044-11 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7044-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild