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

---
 PVE/API2/Backup.pm      | 3 ++-
 PVE/OpenVZ.pm           | 6 +++---
 PVE/REST.pm             | 2 --
 debian/changelog.Debian | 6 ++++++
 debian/control.in       | 2 +-
 defines.mk              | 2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/PVE/API2/Backup.pm b/PVE/API2/Backup.pm
index 8e1f34e6..ddcdf57b 100644
--- a/PVE/API2/Backup.pm
+++ b/PVE/API2/Backup.pm
@@ -2,6 +2,7 @@ package PVE::API2::Backup;
 
 use strict;
 use warnings;
+use Digest::SHA;
 
 use PVE::SafeSyslog;
 use PVE::Tools qw(extract_param);
@@ -91,7 +92,7 @@ sub parse_vzdump_cron_config {
 
     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|$)//) {
 	my $line = $1;
diff --git a/PVE/OpenVZ.pm b/PVE/OpenVZ.pm
index 78c4c257..592e2c4e 100644
--- a/PVE/OpenVZ.pm
+++ b/PVE/OpenVZ.pm
@@ -12,7 +12,7 @@ use PVE::Cluster qw(cfs_register_file cfs_read_file);
 use PVE::SafeSyslog;
 use PVE::INotify;
 use PVE::JSONSchema;
-use Digest::SHA1;
+use Digest::SHA;
 use Encode;
 
 use constant SCRIPT_EXT => qw (start stop mount umount premount postumount);
@@ -783,7 +783,7 @@ sub parse_ovz_config {
     return undef if !defined($raw);
 
     my $data = {
-	digest => Digest::SHA1::sha1_hex($raw),
+	digest => Digest::SHA::sha1_hex($raw),
     };
 
     $filename =~ m|/openvz/(\d+)\.conf$|
@@ -1238,7 +1238,7 @@ sub set_rootpasswd {
     my $shadow = "$privatedir/etc/shadow";
 
     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\$");
     };
 
diff --git a/PVE/REST.pm b/PVE/REST.pm
index 46b61783..69f68ae0 100644
--- a/PVE/REST.pm
+++ b/PVE/REST.pm
@@ -2,7 +2,6 @@ package PVE::REST;
 
 use warnings;
 use strict;
-use Digest::SHA1 qw(sha1_base64);
 use PVE::Cluster;
 use PVE::SafeSyslog;
 use PVE::Tools;
@@ -10,7 +9,6 @@ use PVE::API2;
 use Apache2::Const;
 use mod_perl2;
 use JSON;
-use Digest::SHA;
 use LWP::UserAgent;
 use HTTP::Request::Common;
 use HTTP::Status qw(:constants :is status_message);
diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index 5bbe638a..223e6648 100644
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -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
 
   * add Chinese translation
diff --git a/debian/control.in b/debian/control.in
index 44709d42..bbe32aa6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Version: @VERSION@-@PACKAGERELEASE@
 Section: admin
 Priority: optional
 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
 Replaces: vzdump
 Provides: vzdump
diff --git a/defines.mk b/defines.mk
index 216151ea..b6681d6b 100644
--- a/defines.mk
+++ b/defines.mk
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=pve-manager
-PACKAGERELEASE=41
+PACKAGERELEASE=42
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5