From 5845b544adeeeebc832bbbc81dd7b136fd1c0187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
Date: Fri, 9 Jun 2017 22:45:11 +0200
Subject: [PATCH] main/py-cryptography: upgrade to 1.9
---
main/py-cryptography/APKBUILD | 11 ++++-------
main/py-cryptography/fix-libressl-2.5.3.patch | 15 ---------------
2 files changed, 4 insertions(+), 22 deletions(-)
delete mode 100644 main/py-cryptography/fix-libressl-2.5.3.patch
diff --git a/main/py-cryptography/APKBUILD b/main/py-cryptography/APKBUILD
index d703c0bb996e..583581226a17 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=1.8.1
-pkgrel=1
+pkgver=1.9
+pkgrel=0
pkgdesc="A package which provides cryptographic recipes and primitives"
url="http://pypi.python.org/pypi/cryptography"
arch="all"
@@ -11,9 +11,7 @@ license="ASL-2.0"
depends="py-cffi py-idna py-asn1crypto py-six"
makedepends="python2-dev python3-dev py-setuptools libffi-dev libressl-dev"
subpackages="py3-$_pkgname:_py3 py2-$_pkgname:_py2"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
- fix-libressl-2.5.3.patch
- "
+source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
@@ -47,5 +45,4 @@ _py3() {
_py python3
}
-sha512sums="273c8ca4ad6c9d1151a8a731d148d02e619e14e37df25dc26030b0a90f895b88fbf4d3e320aec5ea7af4a8fcc58f720c61f48968f912c69156d4e0e794743345 cryptography-1.8.1.tar.gz
-956cd77a99f9863a25f8b318c69b9fc14cebbbef544ba378b10654d41cd3b1094a735b328a35ca16186c1e8fb71837d6ffbfdadc910c566fade4afb5c4014508 fix-libressl-2.5.3.patch"
+sha512sums="815e9c09366935f8603a3e6e74c28ce79175596d00dbcd19d3792505237bd1cf953a4f401c2b97e4beaa7f2bbdcf9d7f95c4753d001a07fa816830af97cdd24e cryptography-1.9.tar.gz"
diff --git a/main/py-cryptography/fix-libressl-2.5.3.patch b/main/py-cryptography/fix-libressl-2.5.3.patch
deleted file mode 100644
index ac51c9ce0713..000000000000
--- a/main/py-cryptography/fix-libressl-2.5.3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/_cffi_src/openssl/x509_vfy.py.orig 2017-04-11 19:49:14.765073278 +0200
-+++ b/src/_cffi_src/openssl/x509_vfy.py 2017-04-11 19:48:51.541130712 +0200
-@@ -221,10 +221,12 @@ static const long X509_V_ERR_SUITE_B_INV
- static const long X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM = 0;
- static const long X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED = 0;
- static const long X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 = 0;
-+#if LIBRESSL_VERSION_NUMBER < 0x2050300fL
- static const long X509_V_ERR_HOSTNAME_MISMATCH = 0;
- static const long X509_V_ERR_EMAIL_MISMATCH = 0;
- static const long X509_V_ERR_IP_ADDRESS_MISMATCH = 0;
- #endif
-+#endif
-
- /* OpenSSL 1.0.2beta2+ verification parameters */
- #if CRYPTOGRAPHY_OPENSSL_102BETA2_OR_GREATER && \
--
GitLab