diff options
| author | André Klitzing <aklitzing@gmail.com> | 2019-01-22 20:46:20 +0100 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-02-06 10:53:46 +0000 |
| commit | 8c130516e3fe7889824b9eea6de8fe9d56a9c842 (patch) | |
| tree | b5359389324d5b46cb04fac42074d148ec1b2a4a | |
| parent | 30275f31cdcf376e1be5fcc05c56b93ad8642719 (diff) | |
| download | aports-8c130516e3fe7889824b9eea6de8fe9d56a9c842.tar.bz2 aports-8c130516e3fe7889824b9eea6de8fe9d56a9c842.tar.xz | |
main/py-cryptography: upgrade to 2.5
| -rw-r--r-- | main/py-cryptography/0001-reuse-the-libressl-branch-for-OpenSSL-built-with-OPENSSL_NO_PSK.patch | 23 | ||||
| -rw-r--r-- | main/py-cryptography/APKBUILD | 8 |
2 files changed, 3 insertions, 28 deletions
diff --git a/main/py-cryptography/0001-reuse-the-libressl-branch-for-OpenSSL-built-with-OPENSSL_NO_PSK.patch b/main/py-cryptography/0001-reuse-the-libressl-branch-for-OpenSSL-built-with-OPENSSL_NO_PSK.patch deleted file mode 100644 index 9d7cc8479f..0000000000 --- a/main/py-cryptography/0001-reuse-the-libressl-branch-for-OpenSSL-built-with-OPENSSL_NO_PSK.patch +++ /dev/null @@ -1,23 +0,0 @@ -From eb4e7b103530907311af4027280a48231a2f17be Mon Sep 17 00:00:00 2001 -From: Paul Kehrer <paul.l.kehrer@gmail.com> -Date: Sun, 2 Dec 2018 12:29:00 +0800 -Subject: [PATCH] reuse the libressl branch for OpenSSL built with - OPENSSL_NO_PSK (#4619) - ---- - src/_cffi_src/openssl/ssl.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py -index f0b8939cb..82639a5d6 100644 ---- a/src/_cffi_src/openssl/ssl.py -+++ b/src/_cffi_src/openssl/ssl.py -@@ -756,7 +756,7 @@ - static const long Cryptography_HAS_SIGALGS = 1; - #endif - --#if CRYPTOGRAPHY_IS_LIBRESSL -+#if CRYPTOGRAPHY_IS_LIBRESSL || defined(OPENSSL_NO_PSK) - static const long Cryptography_HAS_PSK = 0; - int (*SSL_CTX_use_psk_identity_hint)(SSL_CTX *, const char *) = NULL; - void (*SSL_CTX_set_psk_server_callback)(SSL_CTX *, diff --git a/main/py-cryptography/APKBUILD b/main/py-cryptography/APKBUILD index b9afa60ef0..52f02c9922 100644 --- a/main/py-cryptography/APKBUILD +++ b/main/py-cryptography/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: August Klein <amatcoder@gmail.com> pkgname=py-cryptography _pkgname=${pkgname#py-} -pkgver=2.4.2 -pkgrel=2 +pkgver=2.5 +pkgrel=0 pkgdesc="A package which provides cryptographic recipes and primitives" url="https://pypi.python.org/pypi/cryptography" arch="all" @@ -13,7 +13,6 @@ makedepends="python2-dev python3-dev py-setuptools libffi-dev openssl-dev" subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2" source=" https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz - 0001-reuse-the-libressl-branch-for-OpenSSL-built-with-OPENSSL_NO_PSK.patch " builddir="$srcdir/$_pkgname-$pkgver" @@ -54,5 +53,4 @@ _py3() { _py python3 } -sha512sums="800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28 cryptography-2.4.2.tar.gz -949f3abd2e5935fa86a375c062c8856b06b6ffdb2f31f4dfaf0ea20682352506f0942e798efb710cef1bcbbc3fe9e9995e34693d42ff6710bf3dc2360762c8d1 0001-reuse-the-libressl-branch-for-OpenSSL-built-with-OPENSSL_NO_PSK.patch" +sha512sums="5e8f8818fcaa8143526006b027107b8afbdc925d40c846701e65b2c7ee02235b7e0918246515520ef2030b1c87bb157d0d403c28ad68c31459d677af7e2d0b3f cryptography-2.5.tar.gz" |