use Digest::SHA instead of Digest::SHA1

This commit is contained in:
Dietmar Maurer 2012-03-20 12:25:08 +01:00
parent 30f6cd84a2
commit fc1ddcdcae
5 changed files with 12 additions and 6 deletions

View File

@ -2,7 +2,7 @@ RELEASE=2.0
VERSION=2.0 VERSION=2.0
PACKAGE=qemu-server PACKAGE=qemu-server
PKGREL=27 PKGREL=28
DESTDIR= DESTDIR=
PREFIX=/usr PREFIX=/usr

View File

@ -11,7 +11,7 @@ use File::Basename;
use File::Path; use File::Path;
use File::stat; use File::stat;
use Getopt::Long; use Getopt::Long;
use Digest::SHA1; use Digest::SHA;
use Fcntl ':flock'; use Fcntl ':flock';
use Cwd 'abs_path'; use Cwd 'abs_path';
use IPC::Open3; use IPC::Open3;
@ -1486,7 +1486,7 @@ sub parse_vm_config {
return undef if !defined($raw); return undef if !defined($raw);
my $res = { my $res = {
digest => Digest::SHA1::sha1_hex($raw), digest => Digest::SHA::sha1_hex($raw),
}; };
$filename =~ m|/qemu-server/(\d+)\.conf$| $filename =~ m|/qemu-server/(\d+)\.conf$|

View File

@ -1,3 +1,9 @@
qemu-server (2.0-28) unstable; urgency=low
* use Digest::SHA instead of Digest::SHA1
-- Proxmox Support Team <support@proxmox.com> Tue, 20 Mar 2012 12:24:01 +0100
qemu-server (2.0-27) unstable; urgency=low qemu-server (2.0-27) unstable; urgency=low
* make startall wait up to 10 seconds for quorum * make startall wait up to 10 seconds for quorum

View File

@ -3,7 +3,7 @@ Version: @@VERSION@@-@@PKGRELEASE@@
Section: admin Section: admin
Priority: optional Priority: optional
Architecture: @@ARCH@@ Architecture: @@ARCH@@
Depends: libc6 (>= 2.7-18), perl (>= 5.10.0-19), libterm-readline-gnu-perl, libdigest-sha1-perl, pve-qemu-kvm (>= 0.11.1) | pve-qemu-kvm-2.6.18, netcat-traditional, libpve-storage-perl, pve-cluster, redhat-cluster-pve Depends: libc6 (>= 2.7-18), perl (>= 5.10.0-19), libterm-readline-gnu-perl, pve-qemu-kvm (>= 0.11.1) | pve-qemu-kvm-2.6.18, netcat-traditional, libpve-storage-perl, pve-cluster, redhat-cluster-pve
Conflicts: netcat-openbsd Conflicts: netcat-openbsd
Maintainer: Proxmox Support Team <support@proxmox.com> Maintainer: Proxmox Support Team <support@proxmox.com>
Description: Qemu Server Tools Description: Qemu Server Tools

View File

@ -2,7 +2,7 @@
use strict; use strict;
use IO::File; use IO::File;
use Digest::SHA1; use Digest::SHA;
# script to upgrade V0.9.1 to V0.9.2 format # script to upgrade V0.9.1 to V0.9.2 format
@ -78,7 +78,7 @@ sub parse_network_0_9_1 {
sub random_ether_addr { sub random_ether_addr {
my $rand = Digest::SHA1::sha1_hex (rand(), time()); my $rand = Digest::SHA::sha1_hex (rand(), time());
my $mac = ''; my $mac = '';
for (my $i = 0; $i < 6; $i++) { for (my $i = 0; $i < 6; $i++) {