[arch-commits] Commit in xmpppy/repos/community-any (PKGBUILD PKGBUILD ssl.patch)

[Sergej Pupykin]

    Date: Friday, May 8, 2015 @ 12:09:13
  Author: spupykin
Revision: 132949

archrelease: copy trunk to community-any

Added:
  xmpppy/repos/community-any/PKGBUILD
    (from rev 132948, xmpppy/trunk/PKGBUILD)
  xmpppy/repos/community-any/ssl.patch
    (from rev 132948, xmpppy/trunk/ssl.patch)
Deleted:
  xmpppy/repos/community-any/PKGBUILD

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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-08 10:09:06 UTC (rev 132948)
+++ PKGBUILD	2015-05-08 10:09:13 UTC (rev 132949)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Todd Harbour <lefallen at quadronyx.com.au>
-
-pkgname=xmpppy
-pkgver=0.5.0_rc1
-pkgrel=3
-pkgdesc="A Python library to provide easy scripting with Jabber"
-arch=('any')
-url="http://xmpppy.sourceforge.net/"
-license=('GPL')
-depends=('python2')
-makedepends=('python2-distribute')
-source=(http://downloads.sourceforge.net/project/xmpppy/xmpppy/${pkgver/_/-}/xmpppy-${pkgver/_/}.tar.gz)
-md5sums=('e0d2b3f9e4a278c163431e64adb0c861')
-
-build() {
-  cd $srcdir/$pkgname-${pkgver/_/}
-  python2 setup.py build
-}
-
-package() {
-  cd $srcdir/$pkgname-${pkgver/_/}
-  python2 setup.py install --prefix=/usr --root=$pkgdir install
-}

Copied: xmpppy/repos/community-any/PKGBUILD (from rev 132948, xmpppy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-05-08 10:09:13 UTC (rev 132949)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Todd Harbour <lefallen at quadronyx.com.au>
+
+pkgname=xmpppy
+pkgver=0.5.0_rc1
+pkgrel=4
+pkgdesc="A Python library to provide easy scripting with Jabber"
+arch=('any')
+url="http://xmpppy.sourceforge.net/"
+license=('GPL')
+depends=('python2')
+makedepends=('python2-distribute')
+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
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgver/_/}
+  python2 setup.py install --prefix=/usr --root=$pkgdir install
+}

Copied: xmpppy/repos/community-any/ssl.patch (from rev 132948, xmpppy/trunk/ssl.patch)
===================================================================
--- ssl.patch	                        (rev 0)
+++ ssl.patch	2015-05-08 10:09:13 UTC (rev 132949)
@@ -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
+