rpms/s3cmd/EL-5 s3cmd-0.9.9-hashlib.patch, NONE, 1.1 s3cmd.spec, 1.4, 1.5

[Lubomir Rintel]

Author: lkundrak

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

Modified Files:
	s3cmd.spec 
Added Files:
	s3cmd-0.9.9-hashlib.patch 
Log Message:
* Wed Aug 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.9-1.1
- Fix for 2.5-ish hashlib with 2.4


s3cmd-0.9.9-hashlib.patch:
 Utils.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- NEW FILE s3cmd-0.9.9-hashlib.patch ---
>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

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
 try:
-	from hashlib import md5, sha1
+	if sys.version_info[0:2] <= (2,4):
+		from hashlib import md5;
+		import sha as sha1
+	else:
+		from hashlib import md5, sha1
 except ImportError:
 	from md5 import md5
 	import sha as sha1
+
 import hmac
 import base64
 import errno
-- 
1.6.2.5



Index: s3cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/EL-5/s3cmd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- s3cmd.spec	24 Feb 2009 09:21:43 -0000	1.4
+++ s3cmd.spec	26 Aug 2009 15:47:43 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           s3cmd
 Version:        0.9.9
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Tool for accessing Amazon Simple Storage Service
 
 Group:          Applications/Internet
@@ -10,6 +10,8 @@ License:        GPLv2
 URL:            http://s3tools.logix.cz/s3cmd
 Source0:        http://download.sourceforge.net/s3tools/%{name}-%{version}.tar.gz
 Patch0:         s3cmd-0.9.8.1-noet.patch
+# Sent upstream
+Patch1:         s3cmd-0.9.9-hashlib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -18,6 +20,7 @@ BuildRequires:  python-devel
 # This is in standard library since 2.5
 Requires:       python-elementtree
 %endif
+Requires:       python-hashlib
 
 %description
 S3cmd lets you copy files from/to Amazon S3
@@ -56,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 26 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.9-1.1
+- Fix for 2.5-ish hashlib with 2.4
+
 * Tue Feb 24 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.9-1
 - New upstream release