[arch-commits] Commit in xmpppy/trunk (PKGBUILD ssl.patch)

[Sergej Pupykin]

    Date: Friday, May 8, 2015 @ 12:09:06
  Author: spupykin
Revision: 132948

upgpkg: xmpppy 0.5.0_rc1-4

upd

Added:
  xmpppy/trunk/ssl.patch
Modified:
  xmpppy/trunk/PKGBUILD

-----------+
 PKGBUILD  |   13 ++++++++++---
 ssl.patch |   25 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-08 09:59:05 UTC (rev 132947)
+++ PKGBUILD	2015-05-08 10:09:06 UTC (rev 132948)
@@ -4,7 +4,7 @@
 
 pkgname=xmpppy
 pkgver=0.5.0_rc1
-pkgrel=3
+pkgrel=4
 pkgdesc="A Python library to provide easy scripting with Jabber"
 arch=('any')
 url="http://xmpppy.sourceforge.net/"
@@ -11,9 +11,16 @@
 license=('GPL')
 depends=('python2')
 makedepends=('python2-distribute')
-source=(http://downloads.sourceforge.net/project/xmpppy/xmpppy/${pkgver/_/-}/xmpppy-${pkgver/_/}.tar.gz)
-md5sums=('e0d2b3f9e4a278c163431e64adb0c861')
+source=(http://downloads.sourceforge.net/project/xmpppy/xmpppy/${pkgver/_/-}/xmpppy-${pkgver/_/}.tar.gz
+	ssl.patch)
+md5sums=('e0d2b3f9e4a278c163431e64adb0c861'
+         '516cb530837016c719a1116a1d6ad199')
 
+prepare() {
+  cd $srcdir/$pkgname-${pkgver/_/}
+  patch -p1 <$srcdir/ssl.patch
+}
+
 build() {
   cd $srcdir/$pkgname-${pkgver/_/}
   python2 setup.py build

Added: ssl.patch
===================================================================
--- ssl.patch	                        (rev 0)
+++ ssl.patch	2015-05-08 10:09:06 UTC (rev 132948)
@@ -0,0 +1,25 @@
+diff -wbBur xmpppy-0.5.0rc1/xmpp/transports.py xmpppy-0.5.0rc1.q/xmpp/transports.py
+--- xmpppy-0.5.0rc1/xmpp/transports.py	2009-04-07 12:34:09.000000000 +0400
++++ xmpppy-0.5.0rc1.q/xmpp/transports.py	2015-05-08 13:06:03.049252065 +0300
+@@ -27,7 +27,7 @@
+ Also exception 'error' is defined to allow capture of this module specific exceptions.
+ """
+ 
+-import socket,select,base64,dispatcher,sys
++import socket,ssl,select,base64,dispatcher,sys
+ from simplexml import ustr
+ from client import PlugIn
+ from protocol import *
+@@ -312,9 +312,9 @@
+         """ Immidiatedly switch socket to TLS mode. Used internally."""
+         """ Here we should switch pending_data to hint mode."""
+         tcpsock=self._owner.Connection
+-        tcpsock._sslObj    = socket.ssl(tcpsock._sock, None, None)
+-        tcpsock._sslIssuer = tcpsock._sslObj.issuer()
+-        tcpsock._sslServer = tcpsock._sslObj.server()
++        tcpsock._sslObj    = ssl.wrap_socket(tcpsock._sock, None, None)
++        tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer')
++        tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server')
+         tcpsock._recv = tcpsock._sslObj.read
+         tcpsock._send = tcpsock._sslObj.write
+