[Python-modules-commits] [python-cryptography] 01/04: Apply patch 6e7ea2e7 from upstream to fix compilation against OpenSSL 1.1.0f.

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository python-cryptography.

commit b3a2f7678ac5527792adcc5d924f4703aba6f23e
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sun May 28 04:20:44 2017 +0200

    Apply patch 6e7ea2e7 from upstream to fix compilation against OpenSSL 1.1.0f.
---
 debian/changelog                                 |  7 ++++++
 debian/patches/0002-fix-1.1.0f-compilation.patch | 30 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index aa10474..749f6b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-cryptography (1.7.1-3) unstable; urgency=medium
+
+  * Apply patch 6e7ea2e7 from upstream to fix compilation against OpenSSL
+    1.1.0f.
+
+ -- Tristan Seligmann <mithrandi at debian.org>  Sun, 28 May 2017 04:20:33 +0200
+
 python-cryptography (1.7.1-2) unstable; urgency=medium
 
   * Apply upstream patch from #3328 to fix test suite on 32-bit arches.
diff --git a/debian/patches/0002-fix-1.1.0f-compilation.patch b/debian/patches/0002-fix-1.1.0f-compilation.patch
new file mode 100644
index 0000000..08fe9f2
--- /dev/null
+++ b/debian/patches/0002-fix-1.1.0f-compilation.patch
@@ -0,0 +1,30 @@
+commit 6e7ea2e73e3baf31541c9533dc621d8913152848
+Author: Paul Kehrer <paul.l.kehrer at gmail.com>
+Date:   Thu May 25 12:26:08 2017 -0500
+
+    fix compilation on 1.1.0f (#3603)
+
+diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py
+index 5034c398..fd8c5a4e 100644
+--- a/src/_cffi_src/openssl/asn1.py
++++ b/src/_cffi_src/openssl/asn1.py
+@@ -77,8 +77,6 @@ int ASN1_INTEGER_set(ASN1_INTEGER *, long);
+ /*  ASN1 TIME */
+ ASN1_TIME *ASN1_TIME_new(void);
+ void ASN1_TIME_free(ASN1_TIME *);
+-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *,
+-                                                   ASN1_GENERALIZEDTIME **);
+ ASN1_TIME *ASN1_TIME_set(ASN1_TIME *, time_t);
+ int ASN1_TIME_set_string(ASN1_TIME *, const char *);
+ 
+@@ -113,6 +111,10 @@ int ASN1_STRING_to_UTF8(unsigned char **, ASN1_STRING *);
+ long ASN1_ENUMERATED_get(ASN1_ENUMERATED *);
+ int i2a_ASN1_INTEGER(BIO *, ASN1_INTEGER *);
+ 
++/* This became const ASN1_TIME in 1.1.0f */
++ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *,
++                                                   ASN1_GENERALIZEDTIME **);
++
+ ASN1_UTF8STRING *ASN1_UTF8STRING_new(void);
+ void ASN1_UTF8STRING_free(ASN1_UTF8STRING *);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8596aca..f743ff6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-add-memory-limit-check-for-scrypt.patch
+0002-fix-1.1.0f-compilation

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-cryptography.git