[arch-commits] Commit in python-m2crypto/trunk (PKGBUILD socketio.patch)

[Morten Linderud]

    Date: Saturday, June 6, 2020 @ 14:31:42
  Author: foxboron
Revision: 639492

upgpkg: python-m2crypto 0.35.2-3

Added:
  python-m2crypto/trunk/socketio.patch
Modified:
  python-m2crypto/trunk/PKGBUILD

----------------+
 PKGBUILD       |   13 ++++++++++---
 socketio.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-06 14:17:08 UTC (rev 639491)
+++ PKGBUILD	2020-06-06 14:31:42 UTC (rev 639492)
@@ -6,7 +6,7 @@
 pkgbase=python-m2crypto
 pkgname=(python2-m2crypto python-m2crypto)
 pkgver=0.35.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A crypto and SSL toolkit for Python"
 arch=('x86_64')
 url="https://pypi.python.org/pypi/M2Crypto"
@@ -13,14 +13,21 @@
 license=('BSD')
 makedepends=('python' 'python-setuptools'
              'python2' 'python2-setuptools'
-	     'swig')
+             'swig')
 source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz"
-	"LICENSE")
+    "socketio.patch"
+    "LICENSE")
 sha256sums=('57220b06de0622d0fad464ec2f16abe6f7aaa6d8ab5ab11372e6a17d7b52550b'
+            'd4937399c15c00986088f35c3a813584c4b171bea631ffe1a71e483c8236c304'
             '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0')
 
 prepare() {
   mv m2crypto-${pkgver}-* m2crypto-${pkgver}
+
+  cd "m2crypto-$pkgver"
+  patch -Np1 < "$srcdir/socketio.patch"
+  cd ..
+
   cp -a m2crypto-$pkgver{,-py2}
 }
 

Added: socketio.patch
===================================================================
--- socketio.patch	                        (rev 0)
+++ socketio.patch	2020-06-06 14:31:42 UTC (rev 639492)
@@ -0,0 +1,47 @@
+From d3a43ffe1bfe4c128d6ab7c390419dee68f4ca5a Mon Sep 17 00:00:00 2001
+From: lethliel <mstrigl at suse.de>
+Date: Wed, 19 Feb 2020 11:53:05 +0100
+Subject: [PATCH] wrap SocketIO in io.Buffered* for makefile
+
+In python3.8 the fp is wrapped in a Buffer.
+SSL.Connection.makefile returns a socketIO which is no buffer.
+
+SocketIO in 'r' mode:
+use io.BufferedReader
+
+SocketIO in 'rw' mode:
+use io.BufferedRWPair
+---
+ M2Crypto/SSL/Connection.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/M2Crypto/SSL/Connection.py b/M2Crypto/SSL/Connection.py
+index 7053aa6b..01bb61c5 100644
+--- a/M2Crypto/SSL/Connection.py
++++ b/M2Crypto/SSL/Connection.py
+@@ -12,6 +12,7 @@ Copyright 2008 Heikki Toivonen. All rights reserved.
+ 
+ import logging
+ import socket
++import io
+ 
+ from M2Crypto import BIO, Err, X509, m2, py27plus, six, util  # noqa
+ from M2Crypto.SSL import Checker, Context, timeout  # noqa
+@@ -582,9 +583,12 @@ class Connection(object):
+         return m2.ssl_set_cipher_list(self.ssl, cipher_list)
+ 
+     def makefile(self, mode='rb', bufsize=-1):
+-        # type: (AnyStr, int) -> socket._fileobject
++        # type: (AnyStr, int) -> Union[io.BufferedRWPair,io.BufferedReader]
+         if six.PY3:
+-            return socket.SocketIO(self, mode)
++            raw = socket.SocketIO(self, mode)
++            if 'rw' in mode:
++                return io.BufferedRWPair(raw, raw)
++            return io.BufferedReader(raw, io.DEFAULT_BUFFER_SIZE)
+         else:
+             return socket._fileobject(self, mode, bufsize)
+ 
+-- 
+2.26.2
+