rpms/s3cmd/EL-6 s3cmd-0.9.9.91-hashlib.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 import.log, 1.2, 1.3 s3cmd.spec, 1.11, 1.12 sources, 1.6, 1.7

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/s3cmd/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31229/EL-6

Modified Files:
	.cvsignore import.log s3cmd.spec sources 
Added Files:
	s3cmd-0.9.9.91-hashlib.patch 
Log Message:
Pull from devel


s3cmd-0.9.9.91-hashlib.patch:
 Utils.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE s3cmd-0.9.9.91-hashlib.patch ---
>From 2dd66515b6b1f1165d87b7e2414fc811623c9eaf Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Wed, 28 Apr 2010 17:46:31 +0200
Subject: [PATCH] Do not use sha1 from hashlib

Not capable enough on el5
---
 S3/Utils.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/S3/Utils.py b/S3/Utils.py
index ae91841..7cdf27a 100644
--- a/S3/Utils.py
+++ b/S3/Utils.py
@@ -10,10 +10,13 @@ import string
 import random
 import rfc822
 try:
-	from hashlib import md5, sha1
+	from hashlib import md5
 except ImportError:
 	from md5 import md5
+try:
 	import sha as sha1
+except ImportError:
+	from hashlib import sha1
 import hmac
 import base64
 import errno
-- 
1.7.0.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/EL-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	24 Feb 2009 09:06:33 -0000	1.6
+++ .cvsignore	8 Jul 2010 21:18:11 -0000	1.7
@@ -1 +1 @@
-s3cmd-0.9.9.tar.gz
+s3cmd-0.9.9.91.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/EL-6/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	4 Jul 2008 21:07:28 -0000	1.2
+++ import.log	8 Jul 2010 21:18:11 -0000	1.3
@@ -1,2 +1,3 @@
 s3cmd-0_9_8_1-3_fc9:HEAD:s3cmd-0.9.8.1-3.fc9.src.rpm:1215205339
 s3cmd-0_9_8_1-3_fc9:HEAD:s3cmd-0.9.8.1-3.fc9.src.rpm:1215205619
+s3cmd-0_9_9_91-1_fc14_1:EL-6:s3cmd-0.9.9.91-1.fc14.1.src.rpm:1278623786


Index: s3cmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/EL-6/s3cmd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- s3cmd.spec	27 Jul 2009 03:43:19 -0000	1.11
+++ s3cmd.spec	8 Jul 2010 21:18:11 -0000	1.12
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           s3cmd
-Version:        0.9.9
-Release:        2%{?dist}
+Version:        0.9.9.91
+Release:        1%{?dist}.1
 Summary:        Tool for accessing Amazon Simple Storage Service
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@ 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
+Patch1:         s3cmd-0.9.9.91-hashlib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -28,6 +29,7 @@ command line client.
 %prep
 %setup -q
 %patch0 -p1 -b .noet
+%patch1 -p1 -b .hashlib
 
 
 %build
@@ -56,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 28 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 0.9.9.91-1.1
+- Do not use sha1 from hashlib
+
+* Sun Feb 21 2010 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 0.9.9.91-1
+- New upstream release
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/s3cmd/EL-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	24 Feb 2009 09:06:33 -0000	1.6
+++ sources	8 Jul 2010 21:18:11 -0000	1.7
@@ -1 +1 @@
-2874d728cb09cd4734492ce47950f95b  s3cmd-0.9.9.tar.gz
+0b8334ab4ffb1e09d6964861dc001e0f  s3cmd-0.9.9.91.tar.gz