[pkg-kolab] r1581 - in libkolab-perl/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2011-11-20 17:42:15 +0000 (Sun, 20 Nov 2011)
New Revision: 1581

Added:
   libkolab-perl/trunk/debian/patches/99-sha1-to-sha.diff
Modified:
   libkolab-perl/trunk/debian/changelog
   libkolab-perl/trunk/debian/control
   libkolab-perl/trunk/debian/patches/series
Log:
99-sha1-to-sha.diff: Convert usage of Digest::SHA1 to Digest::SHA

(Closes: #640153)

Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog	2011-11-20 17:01:02 UTC (rev 1580)
+++ libkolab-perl/trunk/debian/changelog	2011-11-20 17:42:15 UTC (rev 1581)
@@ -12,7 +12,8 @@
   * Updated Standards-Version to 3.9.2: no changes
   * d/watch: updated regexp to match perl-kolab-2.3+git-20101212.src.rpm 
   * Moved to debhelper compat level 8 and dh
-  * Depends on libdigest-sha1-perl (Closes: #640153)
+  * 99-sha1-to-sha.diff: Convert usage of Digest::SHA1 to Digest::SHA
+    (Closes: #640153)
 
  -- Mathieu Parent <sathieu at debian.org>  Tue, 24 May 2011 22:27:18 +0200
 

Modified: libkolab-perl/trunk/debian/control
===================================================================
--- libkolab-perl/trunk/debian/control	2011-11-20 17:01:02 UTC (rev 1580)
+++ libkolab-perl/trunk/debian/control	2011-11-20 17:42:15 UTC (rev 1581)
@@ -12,7 +12,7 @@
 
 Package: libkolab-perl
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libdigest-sha1-perl, libconvert-asn1-perl, libmail-imapclient-perl, libmime-tools-perl, libnet-ldap-perl (>= 1:0.39-1), liburi-perl, kolab-libcyrus-imap-perl
+Depends: ${misc:Depends}, ${perl:Depends}, libconvert-asn1-perl, libmail-imapclient-perl, libmime-tools-perl, libnet-ldap-perl (>= 1:0.39-1), liburi-perl, kolab-libcyrus-imap-perl
 Description: Perl modules for Kolab
  Kolab is a secure, scalable, and reliable groupware server.  It consists
  of a number of well-known and proven components for the standard tasks

Added: libkolab-perl/trunk/debian/patches/99-sha1-to-sha.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/99-sha1-to-sha.diff	                        (rev 0)
+++ libkolab-perl/trunk/debian/patches/99-sha1-to-sha.diff	2011-11-20 17:42:15 UTC (rev 1581)
@@ -0,0 +1,64 @@
+Description: Convert usage of Digest::SHA1 to Digest::SHA
+Bug: https://issues.kolab.org/show_bug.cgi?id=515
+diff a/perl-kolab/perl-kolab/bin/kolabpasswd.in b/perl-kolab/perl-kolab/bin/kolabpasswd.in
+--- a/bin/kolabpasswd.in
++++ b/bin/kolabpasswd.in
+@@ -55,7 +55,7 @@ use Term::ReadKey;
+ use IO::File;
+ use File::Temp;
+ use Net::LDAP;
+-use Digest::SHA1;
++use Digest::SHA qw(sha1);
+ use MIME::Base64;
+ use Kolab::Util;
+ use Kolab;
+@@ -109,11 +109,8 @@ sub __generate_hex_salt {
+ # Hash a password without using slappasswd
+ sub hashPassword2 {
+   my $pw = shift;
+-  my $ctx = Digest::SHA1->new;
+   my $salt = __generate_hex_salt();
+-  $ctx->add($pw);
+-  $ctx->add($salt);
+-  my $hashpw = '{SSHA}' . encode_base64($ctx->digest . $salt ,'');
++  my $hashpw = '{SSHA}' . encode_base64(sha1($pw . $salt) . $salt ,'');
+   return $hashpw;
+ }
+ 
+diff a/perl-kolab/perl-kolab/lib/Kolab/LDAP.pm b/perl-kolab/perl-kolab/lib/Kolab/LDAP.pm
+--- a/lib/Kolab/LDAP.pm
++++ b/lib/Kolab/LDAP.pm
+@@ -37,7 +37,7 @@ use DB_File;
+ use Kolab;
+ use Kolab::Util;
+ use Kolab::Cyrus;
+-use Digest::SHA1 qw(sha1);
++use Digest::SHA qw(sha1);
+ use MIME::Base64 qw(encode_base64);
+ 
+ require Exporter;
+diff a/perl-kolab/perl-kolab/sbin/kolab_bootstrap.in b/perl-kolab/perl-kolab/sbin/kolab_bootstrap.in
+--- a/sbin/kolab_bootstrap.in
++++ b/sbin/kolab_bootstrap.in
+@@ -69,7 +69,7 @@ use Getopt::Std;
+ use Term::ReadKey;
+ use Time::Local;
+ use Time::localtime;
+-use Digest::SHA1;
++use Digest::SHA qw(sha1);
+ use MIME::Base64;
+ 
+ # Reload only kolab.globals into our configuration.
+@@ -154,11 +154,8 @@ sub __generate_hex_salt {
+ # Hash a password without using slappasswd
+ sub hashPassword2 {
+   my $pw = shift;
+-  my $ctx = Digest::SHA1->new;
+   my $salt = __generate_hex_salt();
+-  $ctx->add($pw);
+-  $ctx->add($salt);
+-  my $hashpw = '{SSHA}' . encode_base64($ctx->digest . $salt ,'');
++  my $hashpw = '{SSHA}' . encode_base64(sha1($pw . $salt) . $salt ,'');
+   return $hashpw;
+ }
+ 

Modified: libkolab-perl/trunk/debian/patches/series
===================================================================
--- libkolab-perl/trunk/debian/patches/series	2011-11-20 17:01:02 UTC (rev 1580)
+++ libkolab-perl/trunk/debian/patches/series	2011-11-20 17:42:15 UTC (rev 1581)
@@ -1,3 +1,4 @@
 30-bootstrap.diff
 40-disable-amavis.diff
 92-sieve-port-4190.diff
+99-sha1-to-sha.diff