[SCM] Debian packaging for apache2 branch, master, updated. debian/2.2.22-3-42-gab80d43

[Arno Töll]

The following commit has been merged in the master branch:
commit ab80d4393042eb8e9ac0d2f4ce93c1c70cb8780f
Author: Arno Töll <arno at debian.org>
Date:   Mon Jul 23 23:44:50 2012 +0200

    Make use of Perl builtin modules in dbmmanage to fix 682401

diff --git a/debian/changelog b/debian/changelog
index 6fa1ac1..34371d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apache2 (2.2.22-10) unstable; urgency=low
+
+  * Fix "dbmmanage: please use Digest::SHA instead of Digest::SHA1" by changing
+    perl module imports to make use Digest::SHA shipped with perl 5.10 (Closes:
+    #682401)
+
+ -- Arno Töll <arno at debian.org>  Mon, 23 Jul 2012 22:25:37 +0200
+
 apache2 (2.2.22-9) unstable; urgency=low
 
   * Fix typo in conf.d/security comment. Closes: #678740
diff --git a/debian/patches/dbmmanage-perl-510.patch b/debian/patches/dbmmanage-perl-510.patch
new file mode 100644
index 0000000..0729016
--- /dev/null
+++ b/debian/patches/dbmmanage-perl-510.patch
@@ -0,0 +1,54 @@
+Description: Make use of builtin SHA1 perl routines in Perl 5.10
+Forwarded: not-needed
+Author: Arno Töll <arno at debian.org>
+Last-Update: 2012-07-23
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682401
+--- a/support/dbmmanage.in
++++ b/support/dbmmanage.in
+@@ -20,6 +20,7 @@
+ #
+ # usage: dbmmanage <DBMfile> <command> <user> <password> <groups> <comment>
+ 
++require v5.10;
+ package dbmmanage;
+ #                               -ldb    -lndbm    -lgdbm    -lsdbm
+ BEGIN { @AnyDBM_File::ISA = qw(DB_File NDBM_File GDBM_File SDBM_File) }
+@@ -49,14 +50,15 @@
+ }
+ 
+ sub need_sha1_crypt {
+-    if (!eval ('require "Digest/SHA1.pm";')) {
++    if (!eval ('require "Digest/SHA.pm";')) {
+         print STDERR <<SHAERR;
+ dbmmanage SHA1 passwords require the interface or the module Digest::SHA1
+-available from CPAN:
++available from CPAN and Debian:
+ 
+-    http://www.cpan.org/modules/by-module/Digest/Digest-MD5-2.12.tar.gz
++    Debian package: libdigest-sha-perl
++    CPAN: http://search.cpan.org/~mshelor/Digest-SHA-5.71/lib/Digest/SHA.pm
+ 
+-Please install Digest::SHA1 and try again, or use a different crypt option:
++Please install Digest::SHA and try again, or use a different crypt option:
+ 
+ SHAERR
+         usage();
+@@ -67,7 +69,9 @@
+     if (!eval ('require "Crypt/PasswdMD5.pm";')) {
+         print STDERR <<MD5ERR;
+ dbmmanage MD5 passwords require the module Crypt::PasswdMD5 available from CPAN
++and Debian:
+ 
++    Debian package: libcrypt-passwdmd5-perl
+     http://www.cpan.org/modules/by-module/Crypt/Crypt-PasswdMD5-1.1.tar.gz
+ 
+ Please install Crypt::PasswdMD5 and try again, or use a different crypt option:
+@@ -209,7 +213,7 @@
+ 
+ sub cryptpw_sha1 {
+     my($pw, $salt) = @_;
+-    '{SHA}' . Digest::SHA1::sha1_base64($pw) . "=";
++    '{SHA}' . Digest::SHA::sha1_base64($pw) . "=";
+ }
+ 
+ sub cryptpw {
diff --git a/debian/patches/series b/debian/patches/series
index 15b506b..4622d6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@
 # If you're aware of that you can uncomment it at any time later and work on it
 # as you wish.
 #202_suexec-custom
+dbmmanage-perl-510.patch

-- 
Debian packaging for apache2