[halberd] Added missing patch

Fabian Affolter fab at fedoraproject.org
Sat Jun 25 22:02:44 UTC 2011


commit 1bb3d7df36f5ea2e715726d5d86da21dc19ba6bd
Author: Fabian Affolter <fabian at bernewireless.net>
Date:   Sun Jun 26 00:02:03 2011 +0200

    Added missing patch

 halberd-sslwrap.patch |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/halberd-sslwrap.patch b/halberd-sslwrap.patch
new file mode 100644
index 0000000..86065e8
--- /dev/null
+++ b/halberd-sslwrap.patch
@@ -0,0 +1,30 @@
+--- halberd-0.2.4/Halberd/clientlib.py.orig	2010-08-14 15:07:24.000000000 +0200
++++ halberd-0.2.4/Halberd/clientlib.py	2010-08-29 21:17:17.138441225 +0200
+@@ -30,6 +30,7 @@
+ 
+ 
+ import time
++import ssl
+ import socket
+ import urlparse
+ 
+@@ -310,7 +311,7 @@
+ 
+         self._recv = None
+         self._sslsock = None
+-        self._timeout_exceptions.append(socket.sslerror)
++        self._timeout_exceptions.append(ssl.SSLError)
+ 
+         # Path to an SSL key file and certificate.
+         self.keyfile = None
+@@ -327,8 +328,8 @@
+         """
+         HTTPClient._connect(self, addr)
+         try:
+-            self._sslsock = socket.ssl(self._sock, self.keyfile, self.certfile)
+-        except socket.sslerror, msg:
++            self._sslsock = ssl.wrap_socket(self._sock, self.keyfile, self.certfile)
++        except ssl.SSLError, msg:
+             raise HTTPSError, msg
+ 
+         self._recv = self._sslsock.read


More information about the scm-commits mailing list