proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-08 10:32:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use Digest::SHA instead of Digest::SHA1

Browse Source
This commit is contained in:
Dietmar Maurer 2012-03-20 12:33:38 +01:00
parent 5cc52e702d
commit 52878b0a38
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/API2/Backup.pm
View File

@ -2,6 +2,7 @@ package PVE::API2::Backup;
use strict; use strict;
use warnings; use warnings;
use Digest::SHA;
use PVE::SafeSyslog; use PVE::SafeSyslog;
use PVE::Tools qw(extract_param); use PVE::Tools qw(extract_param);
@ -91,7 +92,7 @@ sub parse_vzdump_cron_config {
my $jid = 1; # we start at 1 my $jid = 1; # we start at 1
my $digest = Digest::SHA1::sha1_hex(defined($raw) ? $raw : ''); my $digest = Digest::SHA::sha1_hex(defined($raw) ? $raw : '');
while ($raw && $raw =~ s/^(.*?)(\n|$)//) { while ($raw && $raw =~ s/^(.*?)(\n|$)//) {
my $line = $1; my $line = $1;

6
PVE/OpenVZ.pm
View File

@ -12,7 +12,7 @@ use PVE::Cluster qw(cfs_register_file cfs_read_file);
use PVE::SafeSyslog; use PVE::SafeSyslog;
use PVE::INotify; use PVE::INotify;
use PVE::JSONSchema; use PVE::JSONSchema;
use Digest::SHA1; use Digest::SHA;
use Encode; use Encode;
use constant SCRIPT_EXT => qw (start stop mount umount premount postumount); use constant SCRIPT_EXT => qw (start stop mount umount premount postumount);
@ -783,7 +783,7 @@ sub parse_ovz_config {
return undef if !defined($raw); return undef if !defined($raw);
my $data = { my $data = {
digest => Digest::SHA1::sha1_hex($raw), digest => Digest::SHA::sha1_hex($raw),
}; };
$filename =~ m|/openvz/(\d+)\.conf$| $filename =~ m|/openvz/(\d+)\.conf$|
@ -1238,7 +1238,7 @@ sub set_rootpasswd {
my $shadow = "$privatedir/etc/shadow"; my $shadow = "$privatedir/etc/shadow";
if ($opt_rootpasswd !~ m/^\$/) { if ($opt_rootpasswd !~ m/^\$/) {
my $time = substr (Digest::SHA1::sha1_base64 (time), 0, 8); my $time = substr (Digest::SHA::sha1_base64 (time), 0, 8);
$opt_rootpasswd = crypt(encode("utf8", $opt_rootpasswd), "\$1\$$time\$"); $opt_rootpasswd = crypt(encode("utf8", $opt_rootpasswd), "\$1\$$time\$");
}; };

2
PVE/REST.pm
View File

@ -2,7 +2,6 @@ package PVE::REST;
use warnings; use warnings;
use strict; use strict;
use Digest::SHA1 qw(sha1_base64);
use PVE::Cluster; use PVE::Cluster;
use PVE::SafeSyslog; use PVE::SafeSyslog;
use PVE::Tools; use PVE::Tools;
@ -10,7 +9,6 @@ use PVE::API2;
use Apache2::Const; use Apache2::Const;
use mod_perl2; use mod_perl2;
use JSON; use JSON;
use Digest::SHA;
use LWP::UserAgent; use LWP::UserAgent;
use HTTP::Request::Common; use HTTP::Request::Common;
use HTTP::Status qw(:constants :is status_message); use HTTP::Status qw(:constants :is status_message);

6
debian/changelog.Debian vendored
View File

@ -1,3 +1,9 @@
pve-manager (2.0-42) unstable; urgency=low
* use Digest::SHA instead of Digest::SHA1
-- Proxmox Support Team <support@proxmox.com> Tue, 20 Mar 2012 12:33:19 +0100
pve-manager (2.0-41) unstable; urgency=low pve-manager (2.0-41) unstable; urgency=low
* add Chinese translation * add Chinese translation

2
debian/control.in vendored
View File

@ -3,7 +3,7 @@ Version: @VERSION@-@PACKAGERELEASE@
Section: admin Section: admin
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends: perl5, libtimedate-perl, apache2-mpm-prefork, libauthen-pam-perl, libintl-perl, rsync, libapache2-request-perl, libjson-perl, libdigest-sha1-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl, wget, libnet-dns-perl, vlan, ifenslave-2.6 (>= 1.1.0-10), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, netcat-traditional, pve-cluster, libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libpve-access-control, libio-socket-ssl-perl, libfilesys-df-perl, libfile-readbackwards-perl, libfile-sync-perl, redhat-cluster-pve, resource-agents-pve, fence-agents-pve, cstream, mail-transport-agent, libxml-parser-perl, perl-suid, lzop Depends: perl5, libtimedate-perl, apache2-mpm-prefork, libauthen-pam-perl, libintl-perl, rsync, libapache2-request-perl, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl, wget, libnet-dns-perl, vlan, ifenslave-2.6 (>= 1.1.0-10), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, netcat-traditional, pve-cluster, libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libpve-access-control, libio-socket-ssl-perl, libfilesys-df-perl, libfile-readbackwards-perl, libfile-sync-perl, redhat-cluster-pve, resource-agents-pve, fence-agents-pve, cstream, mail-transport-agent, libxml-parser-perl, perl-suid, lzop
Conflicts: netcat-openbsd, vzdump Conflicts: netcat-openbsd, vzdump
Replaces: vzdump Replaces: vzdump
Provides: vzdump Provides: vzdump

2
defines.mk
View File

@ -2,7 +2,7 @@ RELEASE=2.0
VERSION=2.0 VERSION=2.0
PACKAGE=pve-manager PACKAGE=pve-manager
PACKAGERELEASE=41 PACKAGERELEASE=42
BINDIR=${DESTDIR}/usr/bin BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5 PERLLIBDIR=${DESTDIR}/usr/share/perl5