[Python-modules-commits] [python-cryptography] 03/04: merge patched into master

[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 49270e483a59fdfe0f7a9ee7ebe85508af194f14
Merge: b3a2f76 6fee9ab
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sun May 28 04:27:45 2017 +0200

    merge patched into master

 debian/.git-dpm                                         |  4 ++--
 ....patch => 0002-fix-compilation-on-1.1.0f-3603.patch} | 17 ++++++++++-------
 debian/patches/series                                   |  2 +-
 src/_cffi_src/openssl/asn1.py                           |  6 ++++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --cc debian/.git-dpm
index f6fc077,0000000..377fc85
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- ced38e7dcb84cd11039fe6b7c078593c2a4968ff
- ced38e7dcb84cd11039fe6b7c078593c2a4968ff
++6fee9abaaa16550faaacf10e51053f36614a804b
++6fee9abaaa16550faaacf10e51053f36614a804b
 +55816224b8c57c07982677ad261a11520141b97e
 +55816224b8c57c07982677ad261a11520141b97e
 +python-cryptography_1.7.1.orig.tar.gz
 +6ef868de80378546a42b3b49995d7017d33f03e5
 +420673
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-fix-compilation-on-1.1.0f-3603.patch
index 08fe9f2,0000000..450ea37
mode 100644,000000..100644
--- a/debian/patches/0002-fix-compilation-on-1.1.0f-3603.patch
+++ b/debian/patches/0002-fix-compilation-on-1.1.0f-3603.patch
@@@ -1,30 -1,0 +1,33 @@@
- commit 6e7ea2e73e3baf31541c9533dc621d8913152848
- Author: Paul Kehrer <paul.l.kehrer at gmail.com>
- Date:   Thu May 25 12:26:08 2017 -0500
++From 6fee9abaaa16550faaacf10e51053f36614a804b Mon Sep 17 00:00:00 2001
++From: Paul Kehrer <paul.l.kehrer at gmail.com>
++Date: Thu, 25 May 2017 12:26:08 -0500
++Subject: fix compilation on 1.1.0f (#3603)
 +
-     fix compilation on 1.1.0f (#3603)
++---
++ src/_cffi_src/openssl/asn1.py | 6 ++++--
++ 1 file changed, 4 insertions(+), 2 deletions(-)
 +
 +diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py
- index 5034c398..fd8c5a4e 100644
++index 4afca3d..5074248 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 *);
++ /*  ASN1 UTCTIME */
++@@ -112,6 +110,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 --cc debian/patches/series
index f743ff6,0000000..5264b4c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
 +0001-add-memory-limit-check-for-scrypt.patch
- 0002-fix-1.1.0f-compilation
++0002-fix-compilation-on-1.1.0f-3603.patch

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