rpms/plague/devel plague-0.4.5.7-cvs20090612.patch, NONE, 1.1 plague.spec, 1.46, 1.47

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	plague.spec 
Added Files:
	plague-0.4.5.7-cvs20090612.patch 
Log Message:
* Fri Jul 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.7-5.20090612cvs
- patch with fix from cvs (SSLConnection.py shutdown)


plague-0.4.5.7-cvs20090612.patch:
 ChangeLog               |    8 ++++++++
 common/SSLConnection.py |    4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE plague-0.4.5.7-cvs20090612.patch ---

diff -Nur plague-0.4.5.7-20081216/common/SSLConnection.py plague-0.4.5.7-20090612/common/SSLConnection.py

--- plague-0.4.5.7-20081216/common/SSLConnection.py	2009-07-17 15:40:04.000000000 +0200

+++ plague-0.4.5.7-20090612/common/SSLConnection.py	2009-06-12 19:06:38.000000000 +0200

@@ -81,7 +81,6 @@

             return

         self.__dict__["close_refcount"] = self.__dict__["close_refcount"] - 1

         if self.__dict__["close_refcount"] == 0:

-            self.shutdown()

             self.__dict__["conn"].close()

             self.__dict__["closed"] = True

 

@@ -144,6 +143,9 @@

                 return None

             except SSL.WantReadError:

                 time.sleep(0.2)

+            except SSL.SysCallError, (e, err):

+                time.sleep(0.2)

+                return None

         return None

 

 class PlgFileObject(socket._fileobject):

diff -Nur plague-0.4.5.7-20081216/ChangeLog plague-0.4.5.7-20090612/ChangeLog

--- plague-0.4.5.7-20081216/ChangeLog	2009-07-17 15:40:04.000000000 +0200

+++ plague-0.4.5.7-20090612/ChangeLog	2009-06-12 19:28:26.000000000 +0200

@@ -1,3 +1,11 @@

+2009-06-12  Michael Schwendt <mschwendt at fedoraproject.org>

+

+	* common/SSLConnection.py

+	  - Catch SSL.SysCallError exceptions for unexpected EOF.

+	  - Remove superfluous connection shutdown() call in close()

+	    because it results in an SSL.Error "uninitialized" exception

+	    with pyOpenSSL 0.7 and Python 2.6

+

 2008-12-16  Michael Schwendt <mschwendt at fedoraproject.org>

 

 	* common/SSLCommon.py


Index: plague.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plague/devel/plague.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- plague.spec	27 Feb 2009 00:42:49 -0000	1.46
+++ plague.spec	17 Jul 2009 13:43:11 -0000	1.47
@@ -3,12 +3,13 @@ BuildArch: noarch
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.5.7
-Release: 4.20081216cvs%{?dist}
+Release: 5.20090612cvs%{?dist}
 License: GPLv2+
 Group: Development/Tools
 #Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
 Source: %{name}-%{version}.tar.bz2
 Patch0: plague-0.4.5.7-cvs20081216.patch
+Patch1: plague-0.4.5.7-cvs20090612.patch
 URL: http://www.fedoraproject.org/wiki/Projects/Plague
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python
@@ -81,6 +82,7 @@ the interface to the build server.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -167,6 +169,9 @@ fi
 
 
 %changelog
+* Fri Jul 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 0.4.5.7-5.20090612cvs
+- patch with fix from cvs (SSLConnection.py shutdown)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5.7-4.20081216cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild