Date: Wednesday, March 30, 2016 @ 18:43:16 Author: fyan Revision: 263347
upgpkg: pyopenssl 16.0.0-1 Modified: pyopenssl/trunk/PKGBUILD Deleted: pyopenssl/trunk/new-cryptography.patch ------------------------+ PKGBUILD | 37 +++++++++++++++++++------------------ new-cryptography.patch | 27 --------------------------- 2 files changed, 19 insertions(+), 45 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-03-30 16:19:25 UTC (rev 263346) +++ PKGBUILD 2016-03-30 16:43:16 UTC (rev 263347) @@ -1,25 +1,24 @@ # $Id$ -# Maintainer : Ionut Biru<[email protected]> # Maintainer : Felix Yan <[email protected]> +# Contributor: Ionut Biru <[email protected]> # Contributor: Sergej Pupykin <[email protected]> pkgbase=pyopenssl pkgname=('python-pyopenssl' 'python2-pyopenssl') -pkgver=0.15.1 -pkgrel=3 +pkgver=16.0.0 +pkgrel=1 arch=('any') url="http://pypi.python.org/pypi/pyOpenSSL"; license=('LGPL2.1') -makedepends=('python-setuptools' 'python2-setuptools' 'openssl' 'python-six' 'python2-six' 'python-cryptography' 'python2-cryptography') -checkdepends=('python-pytest' 'python2-pytest') -source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-$pkgver.tar.gz - new-cryptography.patch) -md5sums=('f447644afcbd5f0a1f47350fec63a4c6' - '100c9ebada71e6d88d7da3941f498bd2') +makedepends=('openssl' 'python-setuptools' 'python2-setuptools' 'python-cryptography' 'python2-cryptography') +checkdepends=('python-pytest-runner' 'python2-pytest-runner') +source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-$pkgver.tar.gz) +md5sums=('9587d813dcf656e9f2760e41a3682dc3') prepare() { - (cd pyOpenSSL-$pkgver; patch -p2 -i ../new-cryptography.patch) cp -a pyOpenSSL-$pkgver{,-py2} + + export LC_CTYPE=en_US.UTF-8 } build () { @@ -31,28 +30,30 @@ } check () { - cd "$srcdir"/pyOpenSSL-$pkgver - LC_CTYPE=en_US.utf8 python setup.py test || warning "Python 3 tests failed" + ( + cd "$srcdir"/pyOpenSSL-$pkgver + python setup.py ptr - cd "$srcdir"/pyOpenSSL-$pkgver-py2 - LC_CTYPE=en_US.utf8 python2 setup.py test || warning "Python 2 tests failed" + cd "$srcdir"/pyOpenSSL-$pkgver-py2 + python2 setup.py ptr + ) || warning "Tests failed due to missing SSLv3_METHOD" } package_python-pyopenssl(){ pkgdesc="Python3 wrapper module around the OpenSSL library" - depends=('python>=3.4' 'openssl' 'python-six' 'python-cryptography') + depends=('openssl' 'python-six' 'python-cryptography') replaces=('pyopenssl') provides=('pyopenssl') conflicts=('pyopenssl') cd "$srcdir"/pyOpenSSL-$pkgver - python setup.py install --root "$pkgdir" --optimize=1 + python setup.py install --root="$pkgdir" --optimize=1 } package_python2-pyopenssl(){ pkgdesc="Python2 wrapper module around the OpenSSL library" - depends=('python2>=2.7' 'openssl' 'python2-six' 'python2-cryptography') + depends=('openssl' 'python2-six' 'python2-cryptography') cd "$srcdir"/pyOpenSSL-$pkgver-py2 - python2 setup.py install --root "$pkgdir" --optimize=1 + python2 setup.py install --root="$pkgdir" --optimize=1 } Deleted: new-cryptography.patch =================================================================== --- new-cryptography.patch 2016-03-30 16:19:25 UTC (rev 263346) +++ new-cryptography.patch 2016-03-30 16:43:16 UTC (rev 263347) @@ -1,27 +0,0 @@ -diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py -index a00b5c0..6d78bd7 100644 ---- a/src/OpenSSL/crypto.py -+++ b/src/OpenSSL/crypto.py -@@ -247,7 +247,7 @@ def check(self): - if self._only_public: - raise TypeError("public key only") - -- if _lib.EVP_PKEY_type(self._pkey.type) != _lib.EVP_PKEY_RSA: -+ if _lib.EVP_PKEY_type(self.type()) != _lib.EVP_PKEY_RSA: - raise TypeError("key type unsupported") - - rsa = _lib.EVP_PKEY_get1_RSA(self._pkey) -@@ -263,7 +263,12 @@ def type(self): - - :return: The type of the key. - """ -- return self._pkey.type -+ try: -+ # cryptography 1.2+ -+ return _lib.Cryptography_EVP_PKEY_id(self._pkey) -+ except AttributeError: -+ # Older releases of cryptography. -+ return self._pkey.type - - def bits(self): - """
