[arch-commits] Commit in python-m2crypto/repos/community-x86_64 (5 files)

Morten Linderud foxboron at archlinux.org
Thu Jul 16 11:24:19 UTC 2020


    Date: Thursday, July 16, 2020 @ 11:24:18
  Author: foxboron
Revision: 664114

archrelease: copy trunk to community-x86_64

Added:
  python-m2crypto/repos/community-x86_64/LICENSE
    (from rev 664113, python-m2crypto/trunk/LICENSE)
  python-m2crypto/repos/community-x86_64/PKGBUILD
    (from rev 664113, python-m2crypto/trunk/PKGBUILD)
Deleted:
  python-m2crypto/repos/community-x86_64/LICENSE
  python-m2crypto/repos/community-x86_64/PKGBUILD
  python-m2crypto/repos/community-x86_64/socketio.patch

----------------+
 LICENSE        |   52 +++++++++++++--------------
 PKGBUILD       |  103 +++++++++++++++++++++++++------------------------------
 socketio.patch |   47 -------------------------
 3 files changed, 74 insertions(+), 128 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2020-07-16 11:15:54 UTC (rev 664113)
+++ LICENSE	2020-07-16 11:24:18 UTC (rev 664114)
@@ -1,26 +0,0 @@
-Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved.
-
-Portions copyright (c) 2004-2006 Open Source Applications Foundation. 
-All rights reserved.
-
-Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. 
-All rights reserved.
-
-Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation.
-
-THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR 
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Copied: python-m2crypto/repos/community-x86_64/LICENSE (from rev 664113, python-m2crypto/trunk/LICENSE)
===================================================================
--- LICENSE	                        (rev 0)
+++ LICENSE	2020-07-16 11:24:18 UTC (rev 664114)
@@ -0,0 +1,26 @@
+Copyright (c) 1999-2004 Ng Pheng Siong. All rights reserved.
+
+Portions copyright (c) 2004-2006 Open Source Applications Foundation. 
+All rights reserved.
+
+Portions copyright (c) 2005-2006 Vrije Universiteit Amsterdam. 
+All rights reserved.
+
+Copyright (c) 2008-2010 Heikki Toivonen. All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation.
+
+THE AUTHOR PROVIDES THIS SOFTWARE ``AS IS'' AND ANY EXPRESSED OR 
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-16 11:15:54 UTC (rev 664113)
+++ PKGBUILD	2020-07-16 11:24:18 UTC (rev 664114)
@@ -1,55 +0,0 @@
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org> 
-# Contributor: Sergej Pupykin <sergej at aur.archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgbase=python-m2crypto
-pkgname=(python2-m2crypto python-m2crypto)
-pkgver=0.35.2
-pkgrel=3
-pkgdesc="A crypto and SSL toolkit for Python"
-arch=('x86_64')
-url="https://pypi.python.org/pypi/M2Crypto"
-license=('BSD')
-makedepends=('python' 'python-setuptools'
-             'python2' 'python2-setuptools'
-             'swig')
-source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz"
-    "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}
-}
-
-build(){
-  cd "$srcdir/m2crypto-$pkgver-py2"
-  python2 setup.py build
-
-  cd "$srcdir/m2crypto-$pkgver"
-  python setup.py build
-
-}
-
-package_python2-m2crypto() {
-  depends=('python2' 'openssl' 'python2-typing')
-  cd "${srcdir}/m2crypto-${pkgver}-py2"
-  python2 setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
-  install -D -m644 "$srcdir"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python-m2crypto() {
-  depends=('python' 'openssl')
-  cd "${srcdir}/m2crypto-${pkgver}"
-  python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
-  install -D -m644 "$srcdir"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: python-m2crypto/repos/community-x86_64/PKGBUILD (from rev 664113, python-m2crypto/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-16 11:24:18 UTC (rev 664114)
@@ -0,0 +1,48 @@
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org> 
+# Contributor: Sergej Pupykin <sergej at aur.archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgbase=python-m2crypto
+pkgname=(python2-m2crypto python-m2crypto)
+pkgver=0.36.0
+pkgrel=1
+pkgdesc="A crypto and SSL toolkit for Python"
+arch=('x86_64')
+url="https://pypi.python.org/pypi/M2Crypto"
+license=('BSD')
+makedepends=('python' 'python-setuptools'
+             'python2' 'python2-setuptools'
+             'swig')
+source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/m2crypto/m2crypto/repository/${pkgver}/archive.tar.gz"
+        "LICENSE")
+sha256sums=('18e23c5a4d5962a5bd44feba00a521f662c4f7a391b27b8464df095494f21eda'
+            '4eca478396f4b2b020729a111fce3f096456d74500bfd8f2b0388c3c69f997c0')
+
+prepare() {
+  mv m2crypto-${pkgver}-* m2crypto-${pkgver}
+  cp -a m2crypto-$pkgver{,-py2}
+}
+
+build(){
+  cd "$srcdir/m2crypto-$pkgver-py2"
+  python2 setup.py build
+
+  cd "$srcdir/m2crypto-$pkgver"
+  python setup.py build
+
+}
+
+package_python2-m2crypto() {
+  depends=('python2' 'openssl' 'python2-typing')
+  cd "${srcdir}/m2crypto-${pkgver}-py2"
+  python2 setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
+  install -D -m644 "$srcdir"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python-m2crypto() {
+  depends=('python' 'openssl')
+  cd "${srcdir}/m2crypto-${pkgver}"
+  python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
+  install -D -m644 "$srcdir"/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: socketio.patch
===================================================================
--- socketio.patch	2020-07-16 11:15:54 UTC (rev 664113)
+++ socketio.patch	2020-07-16 11:24:18 UTC (rev 664114)
@@ -1,47 +0,0 @@
-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
-


More information about the arch-commits mailing list