From fc1ddcdcae475bf6f570ea36822c4fd54fcbbd04 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Tue, 20 Mar 2012 12:25:08 +0100
Subject: [PATCH] use Digest::SHA instead of Digest::SHA1

---
 Makefile          | 2 +-
 PVE/QemuServer.pm | 4 ++--
 changelog.Debian  | 6 ++++++
 control.in        | 2 +-
 qmupdate          | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ce377af1..a1ad6f98 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=27
+PKGREL=28
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 6cda6df0..0b62d5eb 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -11,7 +11,7 @@ use File::Basename;
 use File::Path;
 use File::stat;
 use Getopt::Long;
-use Digest::SHA1;
+use Digest::SHA;
 use Fcntl ':flock';
 use Cwd 'abs_path';
 use IPC::Open3;
@@ -1486,7 +1486,7 @@ sub parse_vm_config {
     return undef if !defined($raw);
 
     my $res = {
-	digest => Digest::SHA1::sha1_hex($raw),
+	digest => Digest::SHA::sha1_hex($raw),
     };
 
     $filename =~ m|/qemu-server/(\d+)\.conf$|
diff --git a/changelog.Debian b/changelog.Debian
index 2d4e6602..3aa308c1 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -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
 
   * make startall wait up to 10 seconds for quorum
diff --git a/control.in b/control.in
index 45ca559e..df6ee9cf 100644
--- a/control.in
+++ b/control.in
@@ -3,7 +3,7 @@ Version: @@VERSION@@-@@PKGRELEASE@@
 Section: admin
 Priority: optional
 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
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Description: Qemu Server Tools
diff --git a/qmupdate b/qmupdate
index c6796323..0b806ddd 100755
--- a/qmupdate
+++ b/qmupdate
@@ -2,7 +2,7 @@
 
 use strict;
 use IO::File;
-use Digest::SHA1;
+use Digest::SHA;
 
 # 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 {
 
-    my $rand = Digest::SHA1::sha1_hex (rand(), time());
+    my $rand = Digest::SHA::sha1_hex (rand(), time());
 
     my $mac = '';
     for (my $i = 0; $i < 6; $i++) {