[plague] * Wed Aug 4 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.7-9.20100505cvs - Fix Pytho

[Michael Schwendt]

commit 14a1115e2a59bfd23c5d28064f873e3e67fc86b7
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Aug 4 23:49:40 2010 +0200

    * Wed Aug  4 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.7-9.20100505cvs
    - Fix Python 2.7 xmlrpclib/httplib fall-out in SSLConnection.py and
      XMLRPCServerProxy.py (#621340).

 plague-0.4.5.7-python27.patch |   33 +++++++++++++++++++++++++++++++++
 plague.spec                   |   10 +++++++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/plague-0.4.5.7-python27.patch b/plague-0.4.5.7-python27.patch
new file mode 100644
index 0000000..e046c09
--- /dev/null
+++ b/plague-0.4.5.7-python27.patch
@@ -0,0 +1,33 @@
+diff -Nur plague-0.4.5.7-orig/common/SSLConnection.py plague-0.4.5.7/common/SSLConnection.py
+--- plague-0.4.5.7-orig/common/SSLConnection.py	2006-02-15 18:17:39.000000000 +0100
++++ plague-0.4.5.7/common/SSLConnection.py	2010-08-04 23:35:24.000000000 +0200
+@@ -63,7 +63,7 @@
+         c, a = self.__dict__["conn"].accept()
+         return (SSLConnection(c), a)
+ 
+-    def makefile(self, mode, bufsize):
++    def makefile(self, mode='r', bufsize=-1):
+         """
+         We need to use socket._fileobject Because SSL.Connection
+         doesn't have a 'dup'. Not exactly sure WHY this is, but
+@@ -98,6 +98,8 @@
+         if not con in write:
+             raise socket.timeout((110, "Operation timed out."))
+ 
++        if type(data) == memoryview:
++            data = data.tobytes()
+         starttime = time.time()
+         origlen = len(data)
+         sent = -1
+diff -Nur plague-0.4.5.7-orig/common/XMLRPCServerProxy.py plague-0.4.5.7/common/XMLRPCServerProxy.py
+--- plague-0.4.5.7-orig/common/XMLRPCServerProxy.py	2008-01-31 14:37:12.000000000 +0100
++++ plague-0.4.5.7/common/XMLRPCServerProxy.py	2010-08-04 23:35:09.000000000 +0200
+@@ -39,7 +39,7 @@
+             # Yay for Python 2.2
+             pass
+         _host, _port = urllib.splitport(host)
+-        return SSLCommon.PlgHTTPS(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout)
++        return SSLCommon.PlgHTTPSConnection(_host, int(_port), ssl_context=self.ssl_ctx, timeout=self._timeout)
+ 
+ 
+ class PlgXMLRPCServerProxy(xmlrpclib.ServerProxy):
diff --git a/plague.spec b/plague.spec
index 1fc11ac..08341f0 100644
--- a/plague.spec
+++ b/plague.spec
@@ -3,7 +3,7 @@ BuildArch: noarch
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5.7
-Release: 8.20100505cvs%{?dist}
+Release: 9.20100505cvs%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -11,6 +11,7 @@ Source: %{name}-%{version}.tar.bz2
 Patch0: plague-0.4.5.7-cvs20081216.patch
 Patch1: plague-0.4.5.7-cvs20090612.patch
 Patch2: plague-0.4.5.7-cvs20100505.patch
+Patch3: plague-0.4.5.7-python27.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -85,6 +86,9 @@ the interface to the build server.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%if 0%{?fedora} >= 14
+%patch3 -p1
+%endif
 
 
 %build
@@ -171,6 +175,10 @@ fi
 
 
 %changelog
+* Wed Aug  4 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.7-9.20100505cvs
+- Fix Python 2.7 xmlrpclib/httplib fall-out in SSLConnection.py and 
+  XMLRPCServerProxy.py (#621340).
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.4.5.7-8.20100505cvs
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild