commit 9c2f0d6408c4db22835b3ac3f8161a7b7f1206ce Author: Marcela MaÅlÃÅovà <mmaslano@xxxxxxxxxx> Date: Wed Dec 22 09:16:44 2010 +0100 Change patch to work with fuzz 0 perl-Razor-Agent.spec | 2 +- razor-agents-2.85-use-sha-not-sha1.patch | 32 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) --- diff --git a/perl-Razor-Agent.spec b/perl-Razor-Agent.spec index a883247..6a16535 100644 --- a/perl-Razor-Agent.spec +++ b/perl-Razor-Agent.spec @@ -29,7 +29,7 @@ Agents on the network. %prep %setup -q -n razor-agents-%{version} -%patch0 -p1 +%patch0 -p1 -b .old %build export CFLAGS="$RPM_OPT_FLAGS" diff --git a/razor-agents-2.85-use-sha-not-sha1.patch b/razor-agents-2.85-use-sha-not-sha1.patch index 9bb8d6c..57eec26 100644 --- a/razor-agents-2.85-use-sha-not-sha1.patch +++ b/razor-agents-2.85-use-sha-not-sha1.patch @@ -1,6 +1,6 @@ -diff -urN razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm razor-agents-2.85/lib/Razor2/Client/Engine.pm ---- razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm 2005-06-13 19:42:25.000000000 -0400 -+++ razor-agents-2.85/lib/Razor2/Client/Engine.pm 2009-11-01 13:45:08.125369192 -0500 +diff -up razor-agents-2.85/lib/Razor2/Client/Engine.pm.old razor-agents-2.85/lib/Razor2/Client/Engine.pm +--- razor-agents-2.85/lib/Razor2/Client/Engine.pm.old 2005-06-14 01:42:25.000000000 +0200 ++++ razor-agents-2.85/lib/Razor2/Client/Engine.pm 2010-12-22 09:14:57.644814001 +0100 @@ -1,7 +1,6 @@ package Razor2::Client::Engine; @@ -9,9 +9,9 @@ diff -urN razor-agents-2.85.orig/lib/Razor2/Client/Engine.pm razor-agents-2.85/l use Data::Dumper; use Razor2::Signature::Ephemeral; use Razor2::Engine::VR8; -diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm ---- razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm 2003-03-03 18:09:50.000000000 -0500 -+++ razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm 2009-11-01 13:45:08.125369192 -0500 +diff -up razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm.old razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm +--- razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm.old 2003-03-04 00:09:50.000000000 +0100 ++++ razor-agents-2.85/lib/Razor2/Signature/Ephemeral.pm 2010-12-22 09:14:57.646814001 +0100 @@ -2,9 +2,13 @@ package Razor2::Signature::Ephemeral; @@ -27,7 +27,7 @@ diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm razor-agents- sub new { my ($class, %args) = @_; -@@ -86,16 +90,12 @@ +@@ -86,16 +90,12 @@ sub hexdigest { } my $digest; @@ -46,9 +46,9 @@ diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Ephemeral.pm razor-agents- } debug("Computed e-hash is $digest"); -diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm ---- razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm 2007-05-08 18:22:36.000000000 -0400 -+++ razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm 2009-11-01 13:45:08.124368017 -0500 +diff -up razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm.old razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm +--- razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm.old 2007-05-09 00:22:36.000000000 +0200 ++++ razor-agents-2.85/lib/Razor2/Signature/Whiplash.pm 2010-12-22 09:14:57.648814001 +0100 @@ -7,7 +7,10 @@ package Razor2::Signature::Whiplash; @@ -61,7 +61,7 @@ diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm razor-agents-2 sub new { -@@ -683,13 +686,8 @@ +@@ -683,13 +686,8 @@ sub whiplash { # the value of length to the nearest multiple of ``length_error''. # Take the first 20 hex chars from SHA1 and call it the signature. @@ -77,11 +77,11 @@ diff -urN razor-agents-2.85.orig/lib/Razor2/Signature/Whiplash.pm razor-agents-2 push @sigs, $sig; $sig_meta{$sig} = [$host, $corrected_length]; -diff -urN razor-agents-2.85.orig/lib/Razor2/String.pm razor-agents-2.85/lib/Razor2/String.pm ---- razor-agents-2.85.orig/lib/Razor2/String.pm 2005-06-13 17:09:59.000000000 -0400 -+++ razor-agents-2.85/lib/Razor2/String.pm 2009-11-01 13:45:08.123368518 -0500 +diff -up razor-agents-2.85/lib/Razor2/String.pm.old razor-agents-2.85/lib/Razor2/String.pm +--- razor-agents-2.85/lib/Razor2/String.pm.old 2005-06-13 23:09:59.000000000 +0200 ++++ razor-agents-2.85/lib/Razor2/String.pm 2010-12-22 09:14:57.651814001 +0100 @@ -1,11 +1,15 @@ - # $Id: razor-agents-2.85-use-sha-not-sha1.patch,v 1.1 2009/11/02 03:37:20 wtogami Exp $ + # $Id: String.pm,v 1.48 2005/06/13 21:09:59 vipul Exp $ package Razor2::String; -use Digest::SHA1 qw(sha1_hex); @@ -97,7 +97,7 @@ diff -urN razor-agents-2.85.orig/lib/Razor2/String.pm razor-agents-2.85/lib/Razo #use MIME::Parser; require Exporter; -@@ -69,15 +73,8 @@ +@@ -69,15 +73,8 @@ sub hmac2_sha1 { return unless $text && $iv1 && $iv2; die "no ref's allowed" if ref($text); -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel