rpms/s3cmd/EL-5 s3cmd-0.9.9-hashlib.patch,1.1,1.2

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/s3cmd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17786

Modified Files:
	s3cmd-0.9.9-hashlib.patch 
Log Message:
Adjust the patch for 0.9.9

s3cmd-0.9.9-hashlib.patch:
 S3.py |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: s3cmd-0.9.9-hashlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/EL-5/s3cmd-0.9.9-hashlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- s3cmd-0.9.9-hashlib.patch	26 Aug 2009 15:47:43 -0000	1.1
+++ s3cmd-0.9.9-hashlib.patch	26 Aug 2009 16:08:40 -0000	1.2
@@ -1,4 +1,3 @@
-From fd4a3b619c44de792b2614cb2d91fee17f416d27 Mon Sep 17 00:00:00 2001
 From: Lubomir Rintel (Good Data) <lubo.rintel at goodddata.com>
 Date: Wed, 26 Aug 2009 15:48:53 +0200
 Subject: [PATCH] Use sha module for sha1 functionality on <= 2.4
@@ -6,19 +5,16 @@ Subject: [PATCH] Use sha module for sha1
 Hashlib's sha1 Won't work on python 2.4 (e.g. EL-5), reportedly because
 older python's hmac module reportedly requires sha module instead. Using
 it fixes the issue. Tested with Python 2.4 and 2.6.
----
- S3/Utils.py |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
 
-diff --git a/S3/Utils.py b/S3/Utils.py
-index ae91841..6e2af88 100644
---- a/S3/Utils.py
-+++ b/S3/Utils.py
-@@ -9,11 +9,17 @@ import re
- import string
- import random
- import rfc822
-+import sys
+diff -up s3cmd-0.9.9/S3/S3.py.hashlib s3cmd-0.9.9/S3/S3.py
+--- s3cmd-0.9.9/S3/S3.py.hashlib	2009-02-14 05:41:41.000000000 +0100
++++ s3cmd-0.9.9/S3/S3.py	2009-08-26 18:07:07.000000000 +0200
+@@ -12,9 +12,14 @@ import logging
+ import mimetypes
+ from logging import debug, info, warning, error
+ from stat import ST_SIZE
++import sys;
+ 
  try:
 -	from hashlib import md5, sha1
 +	if sys.version_info[0:2] <= (2,4):
@@ -29,10 +25,3 @@ index ae91841..6e2af88 100644
  except ImportError:
  	from md5 import md5
  	import sha as sha1
-+
- import hmac
- import base64
- import errno
--- 
-1.6.2.5
-