[Python-modules-commits] [python-asyncssh] 08/09: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository python-asyncssh.

commit 6c7813dd63fe345cc1adbd686fc21f12da2ac0ef
Merge: 6cfde6a 3a33863
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Oct 31 23:30:08 2015 +0100

    merge patched into master

 debian/.git-dpm                                  |  4 ++--
 debian/patches/do-not-test-chacha20-cipher.patch | 29 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 tests/test_public_key.py                         |  3 +--
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 1aa0508,0000000..3a9f258
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
- ded4f917f6660caffa2af6c83fdd13ce43628198
- ded4f917f6660caffa2af6c83fdd13ce43628198
++3a3386304535a71291f4f0b7c4f73b68c8bb9c2e
++3a3386304535a71291f4f0b7c4f73b68c8bb9c2e
 +142bd9768421394f9f6880fb63c8de0932182c5b
 +142bd9768421394f9f6880fb63c8de0932182c5b
 +python-asyncssh_1.3.0.orig.tar.gz
 +a29e90c15f00bc5ac5c68dadc7dc295fa7e68e7a
 +166641
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/do-not-test-chacha20-cipher.patch
index 0000000,0000000..b1b29c5
new file mode 100644
--- /dev/null
+++ b/debian/patches/do-not-test-chacha20-cipher.patch
@@@ -1,0 -1,0 +1,29 @@@
++From 3a3386304535a71291f4f0b7c4f73b68c8bb9c2e Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Sat, 31 Oct 2015 23:28:40 +0100
++Subject: Don't run chacha20 tests as OpenSSL doesn't support this cipher.
++
++Forwarded: not-needed
++
++OpenSSL as shipped in Debian doesn't support the Chacha20-Poly1305
++cipher. This cipher will be introduced in OpenSSL 1.1.0.
++
++Patch-Name: do-not-test-chacha20-cipher.patch
++---
++ tests/test_public_key.py | 3 +--
++ 1 file changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/tests/test_public_key.py b/tests/test_public_key.py
++index 8cd8c13ed305..6a370c75af7c 100644
++--- a/tests/test_public_key.py
+++++ b/tests/test_public_key.py
++@@ -102,8 +102,7 @@ if run('ssh -V') >= b'OpenSSH_6.9': # pragma: no branch
++     # GCM & Chacha tests require OpenSSH 6.9 due to a bug in earlier versions:
++     #     https://bugzilla.mindrot.org/show_bug.cgi?id=2366
++     openssh_ciphers = openssh_ciphers + ('aes128-gcm at openssh.com',
++-                                         'aes256-gcm at openssh.com',
++-                                         'chacha20-poly1305 at openssh.com')
+++                                         'aes256-gcm at openssh.com')
++ 
++ 
++ class _TestPublicKey(TempDirTestCase):
diff --cc debian/patches/series
index 5baf5a8,0000000..bf9e675
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +sphinx-use-default-theme.patch
++do-not-test-chacha20-cipher.patch

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