Rewrite Digest::SHA1 to SHA
This commit is contained in:
parent
4c59be95ed
commit
977ad70344
33
0009-Rewrite_Digest_SHA1_to_SHA.patch
Normal file
33
0009-Rewrite_Digest_SHA1_to_SHA.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From c5a4d036fff8925bc10f17d68837b862a9a894e4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= <mspacek@redhat.com>
|
||||||
|
Date: Wed, 10 Jul 2024 15:58:33 +0200
|
||||||
|
Subject: [PATCH] Rewrite Digest::SHA1 to SHA
|
||||||
|
|
||||||
|
---
|
||||||
|
utils/sha1pass | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/utils/sha1pass b/utils/sha1pass
|
||||||
|
index 3be2dbc..34cc99c 100755
|
||||||
|
--- a/utils/sha1pass
|
||||||
|
+++ b/utils/sha1pass
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
#!/usr/bin/perl
|
||||||
|
|
||||||
|
use bytes;
|
||||||
|
-use Digest::SHA1;
|
||||||
|
+use Digest::SHA;
|
||||||
|
use MIME::Base64;
|
||||||
|
|
||||||
|
sub random_bytes($) {
|
||||||
|
@@ -29,6 +29,6 @@ sub random_bytes($) {
|
||||||
|
unless (defined($salt)) {
|
||||||
|
$salt = MIME::Base64::encode(random_bytes(6), '');
|
||||||
|
}
|
||||||
|
-$pass = Digest::SHA1::sha1_base64($salt, $pass);
|
||||||
|
+$pass = Digest::SHA::sha1_base64($salt, $pass);
|
||||||
|
|
||||||
|
print '$4$', $salt, '$', $pass, "\$\n";
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
@ -10,7 +10,7 @@ Summary: Simple kernel loader which boots from a FAT filesystem
|
|||||||
Name: syslinux
|
Name: syslinux
|
||||||
Version: 6.04
|
Version: 6.04
|
||||||
%define tarball_version 6.04-pre1
|
%define tarball_version 6.04-pre1
|
||||||
Release: 0.27%{?dist}
|
Release: 0.28%{?dist}
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
|
URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
|
||||||
Source0: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.xz
|
Source0: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.xz
|
||||||
@ -22,6 +22,7 @@ Patch0005: 0005-Workaround-multiple-definition-of-symbol-errors.patch
|
|||||||
Patch0006: 0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
|
Patch0006: 0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch
|
||||||
Patch0007: 0007-Fix-backspace-when-editing-a-multiline-cmdline.patch
|
Patch0007: 0007-Fix-backspace-when-editing-a-multiline-cmdline.patch
|
||||||
Patch0008: 0008-Fix-build-with-GCC-14.patch
|
Patch0008: 0008-Fix-build-with-GCC-14.patch
|
||||||
|
Patch0009: 0009-Rewrite_Digest_SHA1_to_SHA.patch
|
||||||
|
|
||||||
# this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files
|
# this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files
|
||||||
# in noarch packages are a reason to stop the build.
|
# in noarch packages are a reason to stop the build.
|
||||||
@ -261,6 +262,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 11 2024 Michal Josef Špaček <mspacek@redhat.com> - 6.04-0.28
|
||||||
|
- Rewrite Digest::SHA1 to SHA
|
||||||
|
|
||||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.04-0.27
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.04-0.27
|
||||||
- Bump release for June 2024 mass rebuild
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user