[libapache-htpasswd-perl] 05/24: Import Debian changes 1.8-1.1

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libapache-htpasswd-perl.

commit 9fdbfb2b187ddefa7029f48b61e138ac913e460b
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Sat Aug 20 09:38:28 2011 +0200

    Import Debian changes 1.8-1.1
    
    libapache-htpasswd-perl (1.8-1.1) unstable; urgency=low
    
      * Non-maintainer upload.
      * patch HTpasswd.pm, META.yml, Makefile.PL and test.pl to use
        Digest::SHA from perl core instead of Digest::SHA1. The patch also
        fixes the test to check for Digest::SHA instead of Digest::MD5 when
        testing SHA1-hashed passwords. Drop libdigest-sha1-perl from
        (Build-)Depends. (Closes: #636853).
---
 Htpasswd.pm      |  8 ++++----
 META.yml         |  2 +-
 Makefile.PL      |  2 +-
 debian/changelog | 11 +++++++++++
 debian/control   |  4 ++--
 test.pl          |  4 ++--
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Htpasswd.pm b/Htpasswd.pm
index f30a8aa..c67a11f 100644
--- a/Htpasswd.pm
+++ b/Htpasswd.pm
@@ -84,9 +84,9 @@ sub htCheckPassword {
     }
     elsif (index($cryptPass, $SHA1Magic) == 0) {
         # This is an SHA1 password
-        require Digest::SHA1;
+        require Digest::SHA;
         require MIME::Base64;
-        return 1 if '{SHA}'.MIME::Base64::encode_base64( Digest::SHA1::sha1( $pass ), '' ) eq $cryptPass;
+        return 1 if '{SHA}'.MIME::Base64::encode_base64( Digest::SHA::sha1( $pass ), '' ) eq $cryptPass;
     }
 
     # See if it is encrypted using crypt
@@ -726,7 +726,7 @@ by running these commands:
 
 If you are going to use MD5 encrypted passwords, you need to install L<Crypt::PasswdMD5>.
 
-If you need to support SHA1 encrypted passwords, you need to install L<Digest::SHA1> and L<MIME::Base64>.
+If you need to support SHA1 encrypted passwords, you need to install L<Digest::SHA> and L<MIME::Base64>.
 
 =head1 DOCUMENTATION
 
@@ -819,7 +819,7 @@ software, use at your own risk.
 
 =head1 SEE ALSO
 
-L<Apache::Htgroup>, L<Crypt::PasswdMD5>, L<Digest::SHA1>, L<MIME::Base64>
+L<Apache::Htgroup>, L<Crypt::PasswdMD5>, L<Digest::SHA>, L<MIME::Base64>
 
 =cut
 
diff --git a/META.yml b/META.yml
index e02a609..1806b9f 100644
--- a/META.yml
+++ b/META.yml
@@ -6,7 +6,7 @@ version_from: Htpasswd.pm
 installdirs:  site
 requires:
     Crypt::PasswdMD5:              0
-    Digest::SHA1:                  2
+    Digest::SHA:                   0
     MIME::Base64:                  0
 
 distribution_type: module
diff --git a/Makefile.PL b/Makefile.PL
index 6112b79..d552d40 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,7 +9,7 @@ if ($^O !~ /MSWIN/i) {
 	   'dist'        => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
 	   'clean'       => { FILES => q[*% *.bak *.old *.test]},
 		 'PREREQ_PM' => {
-							'Digest::SHA1' => 2.0,
+							'Digest::SHA' => 0,
 							'MIME::Base64' => 0, 
 							'Crypt::PasswdMD5' => 0, 
 			},
diff --git a/debian/changelog b/debian/changelog
index 6c039d6..f193705 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libapache-htpasswd-perl (1.8-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * patch HTpasswd.pm, META.yml, Makefile.PL and test.pl to use
+    Digest::SHA from perl core instead of Digest::SHA1. The patch also
+    fixes the test to check for Digest::SHA instead of Digest::MD5 when
+    testing SHA1-hashed passwords. Drop libdigest-sha1-perl from
+    (Build-)Depends. (Closes: #636853).
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 20 Aug 2011 09:38:28 +0200
+
 libapache-htpasswd-perl (1.8-1) unstable; urgency=low
 
   * New upstream release. (Closes: #468266, 493050)
diff --git a/debian/control b/debian/control
index bd24690..bc18086 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
 Source: libapache-htpasswd-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 4.0.0), perl (>= 5.6.0-17), cdbs (>= 0.4.26-2), libdigest-sha1-perl, libcrypt-passwdmd5-perl
+Build-Depends: debhelper (>= 4.0.0), perl (>= 5.6.0-17), cdbs (>= 0.4.26-2), libcrypt-passwdmd5-perl
 Maintainer: Tatsuki Sugiura <sugi at nemui.org>
 Homepage: http://search.cpan.org/~kmeltz/Apache-Htpasswd/
 Standards-Version: 3.8.0
 
 Package: libapache-htpasswd-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libcrypt-passwdmd5-perl, libdigest-sha1-perl
+Depends: ${perl:Depends}, ${misc:Depends}, libcrypt-passwdmd5-perl
 Description: Manage Unix crypt-style password file
  This module comes with a set of methods to use with htaccess password
  files. These files (and htaccess) are used to do Basic Authentication
diff --git a/test.pl b/test.pl
index 2e4251e..36c5c79 100755
--- a/test.pl
+++ b/test.pl
@@ -115,9 +115,9 @@ close TEST;
         }
 
 	# 19: check whether SHA1 passwords work
-        eval { require Digest::MD5; require MIME::Base64 };
+        eval { require Digest::SHA; require MIME::Base64 };
         if ($@) {
-            &report_skip('Digest::MD5 and MIME::Base64 required for this test');
+            &report_skip('Digest::SHA and MIME::Base64 required for this test');
         } else {
             &report_result($pwdFile->htCheckPassword("SHA1user","123"),$!);
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache-htpasswd-perl.git