rpms/offlineimap/devel fix-socket.ssl-deprecation-on-python-2.6.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 offlineimap.spec, 1.21, 1.22 sources, 1.8, 1.9

[Christoph Höger]

Author: choeger

Update of /cvs/pkgs/rpms/offlineimap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10083

Modified Files:
	.cvsignore offlineimap.spec sources 
Added Files:
	fix-socket.ssl-deprecation-on-python-2.6.patch 
Log Message:
update to latest version



fix-socket.ssl-deprecation-on-python-2.6.patch:

--- NEW FILE fix-socket.ssl-deprecation-on-python-2.6.patch ---
commit cc444fcc99d1521e4e4fa1fede27ea3c1c8ff4e2
Author: Christoph Höger <choeger at cs.tu-berlin.de>
Date:   Thu Jul 2 10:19:18 2009 +0200

    fix socket.ssl deprecation on python 2.6
    
    Signed-off-by: Christoph Höger <choeger at cs.tu-berlin.de>

diff --git a/offlineimap/imaplib2.py b/offlineimap/imaplib2.py
index 2426754..658c369 100644
--- a/offlineimap/imaplib2.py
+++ b/offlineimap/imaplib2.py
@@ -35,6 +35,9 @@ __author__ = "Piers Lauder <piers at janeelix.com>"
 
 import binascii, os, Queue, random, re, select, socket, sys, time, threading
 
+# python 2.6 has a new ssl module
+if sys.version_info >= (2,6): import ssl
+
 select_module = select
 
 #       Globals
@@ -1664,7 +1667,10 @@ class IMAP4_SSL(IMAP4):
         self.host = host is not None and host or ''
         self.port = port is not None and port or IMAP4_SSL_PORT
         self.sock = self.open_socket()
-        self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
+        if sys.version_info < (2,6):
+            self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
+        else:
+            self.sslobj = ssl.wrap_socket(self.sock, self.keyfile, self.certfile)
 
         self.read_fd = self.sock.fileno()
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	18 Dec 2008 12:37:59 -0000	1.8
+++ .cvsignore	2 Jul 2009 08:59:43 -0000	1.9
@@ -1 +1 @@
-offlineimap-6.0.3.tar.gz
+offlineimap-6.1.0.tar.gz


Index: offlineimap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/offlineimap.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- offlineimap.spec	26 Feb 2009 07:55:03 -0000	1.21
+++ offlineimap.spec	2 Jul 2009 08:59:43 -0000	1.22
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           offlineimap
-Version:        6.0.3
-Release:        3%{?dist}
+Version:        6.1.0
+Release:        1%{?dist}
 Summary:        Powerful IMAP/Maildir synchronization and reader support
 
 License:        GPLv2+
@@ -16,6 +16,8 @@ BuildRequires:  docbook-utils
 
 BuildArch:      noarch
 
+Patch0:		fix-socket.ssl-deprecation-on-python-2.6.patch
+
 
 %description
 OfflineIMAP is a tool to simplify your e-mail reading. With OfflineIMAP,
@@ -30,7 +32,7 @@ not provide disconnected operation.
 
 %prep
 %setup -q -n %name-%version
-
+%patch0 -p1
 
 %build
 python setup.py build
@@ -61,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 02 2009 Christoph Höger <choeger at cs.tu-berlin.de> - 6.1.0-1
+- Update to latest version
+- Add a temporary patch for socket.ssl deprecation
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/offlineimap/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	18 Dec 2008 12:37:59 -0000	1.8
+++ sources	2 Jul 2009 08:59:44 -0000	1.9
@@ -1 +1 @@
-e425174c935dd5f112201305c9e0fc47  offlineimap-6.0.3.tar.gz
+3b1e41d475ef73909d64489b3b2494dd  offlineimap-6.1.0.tar.gz