[Python-modules-commits] [pyopenssl] 05/09: merge patched into master
Sandro Tosi
morph at moszumanska.debian.org
Sat Sep 3 18:21:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository pyopenssl.
commit 7dd5eb4f150560dcdf451201d2bd40e204657a20
Merge: 576c230 70b30a3
Author: Sandro Tosi <morph at debian.org>
Date: Sat Sep 3 19:10:02 2016 +0100
merge patched into master
.coveragerc | 4 +-
CHANGELOG.rst | 32 +-
MANIFEST.in | 1 +
PKG-INFO | 66 +--
README.rst | 4 +-
debian/.git-dpm | 6 +-
...t_set_default_verify_paths-since-it-tries.patch | 8 +-
...02-pass-PYTHONPATH-when-building-HTML-doc.patch | 2 +-
doc/ChangeLog_old.txt | 2 +-
doc/api/crypto.rst | 28 +-
examples/simple/CA.cert | 17 -
examples/simple/CA.pkey | 28 -
examples/simple/client.cert | 17 -
examples/simple/client.pkey | 28 -
examples/simple/server.cert | 17 -
examples/simple/server.pkey | 28 -
setup.cfg | 6 +-
setup.py | 2 +-
src/OpenSSL/SSL.py | 148 +++--
src/OpenSSL/crypto.py | 646 ++++++++++++---------
src/OpenSSL/version.py | 4 +-
src/pyOpenSSL.egg-info/PKG-INFO | 66 +--
src/pyOpenSSL.egg-info/SOURCES.txt | 6 -
src/pyOpenSSL.egg-info/requires.txt | 2 +-
tests/test_crypto.py | 314 ++++++++--
tests/test_ssl.py | 121 ++--
tox.ini | 15 +-
27 files changed, 871 insertions(+), 747 deletions(-)
diff --cc debian/.git-dpm
index 3d2d2aa,0000000..76331a6
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
- 092f408ee501261a75366b93e2cef40c37d5fe1f
- 092f408ee501261a75366b93e2cef40c37d5fe1f
- 55b388fba7df6f783cc8d85fcf5ff17c32d3c78b
++70b30a3cb248b4435553ff3be547c2ca7a92d707
++70b30a3cb248b4435553ff3be547c2ca7a92d707
++dbefbd4ee7b71855ac350dcdb98bd582f0c6529a
+dbefbd4ee7b71855ac350dcdb98bd582f0c6529a
+pyopenssl_16.1.0.orig.tar.gz
+e0005e65961fba6f8a38ef4784342d50bdd31c19
+166917
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable-test_set_default_verify_paths-since-it-tries.patch
index ff68c2a,0000000..82e6c48
mode 100644,000000..100644
--- a/debian/patches/0001-disable-test_set_default_verify_paths-since-it-tries.patch
+++ b/debian/patches/0001-disable-test_set_default_verify_paths-since-it-tries.patch
@@@ -1,58 -1,0 +1,58 @@@
- From 39fa2cb8cab66da9c6f2f2d425dc61f44aab76ed Mon Sep 17 00:00:00 2001
++From 2fdf36ad41dc89a7edf95f21413bd3d7a19635c7 Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 10:47:52 -0700
+Subject: disable test_set_default_verify_paths since it tries to access the
+ web
+
+---
+ tests/test_ssl.py | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/tests/test_ssl.py b/tests/test_ssl.py
- index ab316fc..3446c6e 100644
++index eb000aa..b8a499d 100644
+--- a/tests/test_ssl.py
++++ b/tests/test_ssl.py
- @@ -1197,6 +1197,7 @@ class ContextTests(TestCase, _LoopbackMixin):
++@@ -1175,6 +1175,7 @@ class ContextTests(TestCase, _LoopbackMixin):
+ platform == "win32",
+ reason="set_default_verify_paths appears not to work on Windows. "
+ "See LP#404343 and LP#404344."
++
+ )
+ def test_set_default_verify_paths(self):
+ """
- @@ -1211,21 +1212,22 @@ class ContextTests(TestCase, _LoopbackMixin):
++@@ -1189,21 +1190,22 @@ class ContextTests(TestCase, _LoopbackMixin):
+ # internet which has such a certificate. Connecting to the network
+ # in a unit test is bad, but it's the only way I can think of to
+ # really test this. -exarkun
++ pass
+
+ # Arg, verisign.com doesn't speak anything newer than TLS 1.0
+- context = Context(SSLv23_METHOD)
+- context.set_default_verify_paths()
+- context.set_verify(
+- VERIFY_PEER,
+- lambda conn, cert, errno, depth, preverify_ok: preverify_ok)
+-
+- client = socket()
+- client.connect(("encrypted.google.com", 443))
+- clientSSL = Connection(context, client)
+- clientSSL.set_connect_state()
+- clientSSL.do_handshake()
+- clientSSL.send(b"GET / HTTP/1.0\r\n\r\n")
+- self.assertTrue(clientSSL.recv(1024))
++ #context = Context(SSLv23_METHOD)
++ #context.set_default_verify_paths()
++ #context.set_verify(
++ # VERIFY_PEER,
++ # lambda conn, cert, errno, depth, preverify_ok: preverify_ok)
++
++ #client = socket()
++ #client.connect(("encrypted.google.com", 443))
++ #clientSSL = Connection(context, client)
++ #clientSSL.set_connect_state()
++ #clientSSL.do_handshake()
++ #clientSSL.send(b"GET / HTTP/1.0\r\n\r\n")
++ #self.assertTrue(clientSSL.recv(1024))
+
+ def test_set_default_verify_paths_signature(self):
+ """
diff --cc debian/patches/0002-pass-PYTHONPATH-when-building-HTML-doc.patch
index bcca9b0,0000000..218e492
mode 100644,000000..100644
--- a/debian/patches/0002-pass-PYTHONPATH-when-building-HTML-doc.patch
+++ b/debian/patches/0002-pass-PYTHONPATH-when-building-HTML-doc.patch
@@@ -1,30 -1,0 +1,30 @@@
- From 092f408ee501261a75366b93e2cef40c37d5fe1f Mon Sep 17 00:00:00 2001
++From 70b30a3cb248b4435553ff3be547c2ca7a92d707 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Wed, 13 Apr 2016 21:03:53 +0100
+Subject: pass PYTHONPATH when building HTML doc
+
+---
+ doc/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 4202bee..5fec498 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -6,6 +6,7 @@ SPHINXOPTS =
+ SPHINXBUILD = sphinx-build
+ PAPER =
+ BUILDDIR = _build
++PYTHONPATH = .
+
+ # Internal variables.
+ PAPEROPT_a4 = -D latex_paper_size=a4
+@@ -37,7 +38,7 @@ clean:
+ -rm -rf $(BUILDDIR)/*
+
+ html:
+- $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
++ PYTHONPATH=$(PYTHONPATH) $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyopenssl.git
More information about the Python-modules-commits
mailing list