[SCM] Debian packaging of libnet-xmpp-perl branch, master, updated. 2c7fce7678f015018efcd8493e75a73f2d9d6636

[gregor herrmann]

The following commit has been merged in the master branch:
commit ca075bcba4adff53921498b9e4968153839ca176
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Aug 8 20:00:41 2011 +0200

    Add patch to use Digest::SHA instead of Digest::SHA1 (cf. #594273); remove
    libdigest-sha1-perl from debian/control.

diff --git a/debian/control b/debian/control
index 1827d19..1568db1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: gregor herrmann <gregoa at debian.org>
 Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: perl,
  libxml-stream-perl,
- libdigest-sha1-perl,
  libauthen-sasl-perl
 Standards-Version: 3.9.2
 Homepage: http://search.cpan.org/dist/Net-XMPP/
@@ -17,7 +16,6 @@ Package: libnet-xmpp-perl
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends},
  libxml-stream-perl,
- libdigest-sha1-perl,
  libauthen-sasl-perl
 Description: XMPP Perl library
  Net::XMPP is a convenient tool to use for any perl script that would like to
diff --git a/debian/patches/digest-sha.patch b/debian/patches/digest-sha.patch
new file mode 100644
index 0000000..507a691
--- /dev/null
+++ b/debian/patches/digest-sha.patch
@@ -0,0 +1,67 @@
+Description: use Digest::SHA instead of Digest::SHA1
+Origin: vendor
+Bug: https://rt.cpan.org/Ticket/Display.html?id=68181
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2011-08-08
+
+--- a/Build.PL
++++ b/Build.PL
+@@ -10,7 +10,7 @@
+     dist_version_from   => 'lib/Net/XMPP.pm',
+     requires => {
+         'XML::Stream' => 1.22,
+-        'Digest::SHA1' => 1.02,
++        'Digest::SHA' => 0,
+     	},
+     create_makefile_pl => 'passthrough',
+ );
+--- a/lib/Net/XMPP/Protocol.pm
++++ b/lib/Net/XMPP/Protocol.pm
+@@ -1880,12 +1880,12 @@
+     #--------------------------------------------------------------------------
+     if ($authType eq "zerok")
+     {
+-        my $hashA = Digest::SHA1::sha1_hex(delete($args{password}));
+-        $args{hash} = Digest::SHA1::sha1_hex($hashA.$token);
++        my $hashA = Digest::SHA::sha1_hex(delete($args{password}));
++        $args{hash} = Digest::SHA::sha1_hex($hashA.$token);
+ 
+         for (1..$sequence)
+         {
+-            $args{hash} = Digest::SHA1::sha1_hex($args{hash});
++            $args{hash} = Digest::SHA::sha1_hex($args{hash});
+         }
+     }
+ 
+@@ -1900,7 +1900,7 @@
+     if ($authType eq "digest")
+     {
+         my $password = delete($args{password});
+-        $args{digest} = Digest::SHA1::sha1_hex($self->GetStreamID().$password);
++        $args{digest} = Digest::SHA::sha1_hex($self->GetStreamID().$password);
+     }
+ 
+     #--------------------------------------------------------------------------
+--- a/META.yml
++++ b/META.yml
+@@ -9,7 +9,7 @@
+   license: |-
+     http://opensource.org/licenses/artistic-license.php
+ requires:
+-  Digest::SHA1: 1.02
++  Digest::SHA: 0
+   XML::Stream: 1.22
+ provides:
+   Net::XMPP:
+--- a/lib/Net/XMPP.pm
++++ b/lib/Net/XMPP.pm
+@@ -219,7 +219,7 @@
+ use XML::Stream 1.22 qw( Node );
+ use Time::Local;
+ use Carp;
+-use Digest::SHA1;
++use Digest::SHA;
+ use Authen::SASL;
+ use MIME::Base64;
+ use POSIX;
diff --git a/debian/patches/series b/debian/patches/series
index faecb55..681b2bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_networking_tests.patch
+digest-sha.patch

-- 
Debian packaging of libnet-xmpp-perl