tags 624579 + patch thanks Dear maintainer,
Please find attached propsed changes for the Digest::SHA1 to Digest::SHA switch. Are you fine with them? It is prepared as NMU for razor ((versioned as 1:2.85-3.1) but not uploaded. Regards. Salvatore
diff -u razor-2.85/debian/changelog razor-2.85/debian/changelog --- razor-2.85/debian/changelog +++ razor-2.85/debian/changelog @@ -1,3 +1,11 @@ +razor (1:2.85-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Add use-Digest-SHA.patch to use Digest::SHA instead of Digest::SHA1 and + drop libdigest-sha1-perl (Build-)Depends. (Closes: #624579). + + -- Salvatore Bonaccorso <[email protected]> Sat, 21 May 2011 09:00:10 +0200 + razor (1:2.85-3) unstable; urgency=low * [1ac1321] Adopting razor, thanks to Francois Marier and Corrin diff -u razor-2.85/debian/control razor-2.85/debian/control --- razor-2.85/debian/control +++ razor-2.85/debian/control @@ -2,7 +2,7 @@ Section: mail Priority: optional Maintainer: Giuseppe Iuculano <[email protected]> -Build-Depends: debhelper (>= 7), libnet-dns-perl, libtime-hires-perl | perl (>= 5.8), libdigest-sha1-perl, liburi-perl, quilt (>= 0.40) +Build-Depends: debhelper (>= 7), libnet-dns-perl, libtime-hires-perl | perl (>= 5.8), liburi-perl, quilt (>= 0.40) Standards-Version: 3.8.1 Homepage: http://razor.sourceforge.net Vcs-git: git://git.debian.org/git/users/derevko-guest/razor.git @@ -11,7 +11,7 @@ Package: razor Architecture: any -Depends: ${shlibs:Depends}, libdigest-sha1-perl, libdigest-hmac-perl, libdigest-md5-perl, libmime-base64-perl, libnet-dns-perl, libtime-hires-perl | perl (>= 5.8), libtest-simple-perl, liburi-perl, ${perl:Depends} +Depends: ${shlibs:Depends}, libdigest-hmac-perl, libdigest-md5-perl, libmime-base64-perl, libnet-dns-perl, libtime-hires-perl | perl (>= 5.8), libtest-simple-perl, liburi-perl, ${perl:Depends} Provides: librazor2-perl Description: spam-catcher using a collaborative filtering network Vipul's Razor is a distributed, collaborative, spam detection and diff -u razor-2.85/debian/patches/series razor-2.85/debian/patches/series --- razor-2.85/debian/patches/series +++ razor-2.85/debian/patches/series @@ -3,0 +4 @@ +use-Digest-SHA.patch only in patch2: unchanged: --- razor-2.85.orig/debian/patches/use-Digest-SHA.patch +++ razor-2.85/debian/patches/use-Digest-SHA.patch @@ -0,0 +1,105 @@ +Description: Use Digest::SHA instead of Digest::SHA1 +Origin: vendor +Bug: http://bugs.debian.org/624579 +Author: Salvatore Bonaccorso <[email protected]> +Last-Update: 2011-05-21 + +--- a/META.yml ++++ b/META.yml +@@ -5,7 +5,7 @@ + version_from: lib/Razor2/Client/Version.pm + installdirs: site + requires: +- Digest::SHA1: 0 ++ Digest::SHA: 0 + File::Copy: 0 + File::Spec: 0 + Getopt::Long: 0 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -18,7 +18,7 @@ + VERSION_FROM => 'lib/Razor2/Client/Version.pm', + EXE_FILES => [ qw( bin/razor-client bin/razor-admin bin/razor-check bin/razor-report bin/razor-revoke ) ], + PREREQ_PM => { +- 'Digest::SHA1' => 0, ++ 'Digest::SHA' => 0, + 'File::Copy' => 0, + 'File::Spec' => 0, + 'Getopt::Long' => 0, +--- a/lib/Razor2/String.pm ++++ b/lib/Razor2/String.pm +@@ -1,7 +1,7 @@ + # $Id: String.pm,v 1.48 2005/06/13 21:09:59 vipul Exp $ + package Razor2::String; + +-use Digest::SHA1 qw(sha1_hex); ++use Digest::SHA qw(sha1_hex); + use URI::Escape; + use Razor2::Preproc::enBase64; + use Data::Dumper; +@@ -69,12 +69,12 @@ + return unless $text && $iv1 && $iv2; + die "no ref's allowed" if ref($text); + +- my $ctx = Digest::SHA1->new; ++ my $ctx = Digest::SHA->new; + $ctx->add($iv2); + $ctx->add($text); + my $digest = $ctx->hexdigest; + +- $ctx = Digest::SHA1->new; ++ $ctx = Digest::SHA->new; + $ctx->add($iv1); + $ctx->add($digest); + $digest = $ctx->hexdigest; +--- a/lib/Razor2/Client/Engine.pm ++++ b/lib/Razor2/Client/Engine.pm +@@ -1,7 +1,7 @@ + package Razor2::Client::Engine; + + use strict; +-use Digest::SHA1 qw(sha1_hex); ++use Digest::SHA qw(sha1_hex); + use Data::Dumper; + use Razor2::Signature::Ephemeral; + use Razor2::Engine::VR8; +--- a/lib/Razor2/Signature/Ephemeral.pm ++++ b/lib/Razor2/Signature/Ephemeral.pm +@@ -2,7 +2,7 @@ + + package Razor2::Signature::Ephemeral; + use strict; +-use Digest::SHA1; ++use Digest::SHA; + use Data::Dumper; + + sub new { +@@ -86,7 +86,7 @@ + } + + my $digest; +- my $ctx = Digest::SHA1->new; ++ my $ctx = Digest::SHA->new; + + if ($seclength > 128) { + $ctx->add($section1); +--- a/lib/Razor2/Signature/Whiplash.pm ++++ b/lib/Razor2/Signature/Whiplash.pm +@@ -7,7 +7,7 @@ + + package Razor2::Signature::Whiplash; + +-use Digest::SHA1; ++use Digest::SHA; + + sub new { + +@@ -683,7 +683,7 @@ + # the value of length to the nearest multiple of ``length_error''. + # Take the first 20 hex chars from SHA1 and call it the signature. + +- my $sha1 = Digest::SHA1->new(); ++ my $sha1 = Digest::SHA->new(); + + $sha1->add($host); + $sig = substr $sha1->hexdigest, 0, 12;
signature.asc
Description: Digital signature
