[SCM] Debian packaging of libnet-jabber-perl branch, master, updated. de82160ae7b9fe1eb66c4cbaedc4e3cfc75f10f9
Salvatore Bonaccorso
carnil at debian.org
Mon Mar 25 05:42:13 UTC 2013
The following commit has been merged in the master branch:
commit 7a74fc2a88cfa3331c207c1261a4859ab500f85e
Author: Salvatore Bonaccorso <carnil at debian.org>
Date: Mon Mar 25 06:27:10 2013 +0100
Add 30use_Digest-SHA.patch
Use Digest::SHA from Perl core present since 5.9.3. libdigest-sha1-perl
was removed from Debian.
Thanks: Adrian La Duca <mortimus.persona at gmail.com>
Closes: #703862
diff --git a/debian/patches/30use_Digest-SHA.patch b/debian/patches/30use_Digest-SHA.patch
new file mode 100644
index 0000000..4debfb5
--- /dev/null
+++ b/debian/patches/30use_Digest-SHA.patch
@@ -0,0 +1,48 @@
+Description: Use Digest::SHA instead of Digest::SHA1
+Origin: vendor
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=84190
+Bug-Debian: http://bugs.debian.org/703862
+Forwarded: yes
+Author: Salvatore Bonaccorso <carnil at debian.org>
+Last-Update: 2013-03-25
+
+--- a/lib/Net/Jabber/Component.pm
++++ b/lib/Net/Jabber/Component.pm
+@@ -219,7 +219,7 @@
+
+ $self->{STREAM}->SetCallBacks(node=>undef);
+
+- $self->Send("<handshake>".Digest::SHA1::sha1_hex($self->{SESSION}->{id}.$args{secret})."</handshake>");
++ $self->Send("<handshake>".Digest::SHA::sha1_hex($self->{SESSION}->{id}.$args{secret})."</handshake>");
+ my $handshake = $self->Process();
+
+ if (!defined($handshake) ||
+--- a/lib/Net/Jabber/Key.pm
++++ b/lib/Net/Jabber/Key.pm
+@@ -103,14 +103,14 @@
+
+ $self->{CACHE} = {};
+
+- if (eval "require Digest::SHA1")
++ if (eval "require Digest::SHA")
+ {
+ $self->{DIGEST} = 1;
+- Digest::SHA1->import(qw(sha1 sha1_hex sha1_base64));
++ Digest::SHA->import(qw(sha1 sha1_hex sha1_base64));
+ }
+ else
+ {
+- print "ERROR: You cannot use Key.pm unless you have Digest::SHA1 installed.\n";
++ print "ERROR: You cannot use Key.pm unless you have Digest::SHA installed.\n";
+ exit(0);
+ }
+
+@@ -131,7 +131,7 @@
+ my $self = shift;
+
+ my $string = $$.time.rand(1000000);
+- $string = Digest::SHA1::sha1_hex($string);
++ $string = Digest::SHA::sha1_hex($string);
+ $self->{DEBUG}->Log1("Generate: key($string)");
+ return $string;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 70bee32..ac8b167 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
10shebangs.patch
20disable_networking_tests.patch
+30use_Digest-SHA.patch
--
Debian packaging of libnet-jabber-perl
More information about the Pkg-perl-cvs-commits
mailing list