summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Polatel <hawking@gentoo.org>2008-06-27 11:04:47 +0000
committerAli Polatel <hawking@gentoo.org>2008-06-27 11:04:47 +0000
commit452dcfd2f9dafa2394a8c31f3c8a30ff74368d60 (patch)
tree1e9fa984b31149f10d7b6be5ede8fef21171695b /dev-python/m2crypto
parentChange dependency from virtual/motif to x11-libs/openmotif, bug 224749. (diff)
downloadgentoo-2-452dcfd2f9dafa2394a8c31f3c8a30ff74368d60.tar.gz
gentoo-2-452dcfd2f9dafa2394a8c31f3c8a30ff74368d60.tar.bz2
gentoo-2-452dcfd2f9dafa2394a8c31f3c8a30ff74368d60.zip
Fixed resume_session test.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r1 x86_64)
Diffstat (limited to 'dev-python/m2crypto')
-rw-r--r--dev-python/m2crypto/ChangeLog6
-rw-r--r--dev-python/m2crypto/files/m2crypto-0.18.2-resume_session.patch31
-rw-r--r--dev-python/m2crypto/m2crypto-0.18.2.ebuild3
3 files changed, 38 insertions, 2 deletions
diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index bb9a78b957af..ad00aae08712 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/m2crypto
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.33 2008/06/21 15:04:19 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.34 2008/06/27 11:04:46 hawking Exp $
+
+ 27 Jun 2008; Ali Polatel <hawking@gentoo.org>
+ +files/m2crypto-0.18.2-resume_session.patch, m2crypto-0.18.2.ebuild:
+ Fixed resume_session test.
21 Jun 2008; nixnut <nixnut@gentoo.org> m2crypto-0.16.ebuild:
Stable on ppc wrt bug 228535
diff --git a/dev-python/m2crypto/files/m2crypto-0.18.2-resume_session.patch b/dev-python/m2crypto/files/m2crypto-0.18.2-resume_session.patch
new file mode 100644
index 000000000000..6c9ad472bc24
--- /dev/null
+++ b/dev-python/m2crypto/files/m2crypto-0.18.2-resume_session.patch
@@ -0,0 +1,31 @@
+--- tests/test_ssl.py 2008-06-27 13:09:26.000000000 +0300
++++ tests/test_ssl.py 2008-06-27 13:38:33.000000000 +0300
+@@ -131,20 +131,22 @@
+ ses = c.get_session()
+ t = ses.as_text()
+ data = c.getresponse().read()
+- c.close()
++ # Appearently closing connection here screws session
++ # c.close()
+
+ ctx2 = SSL.Context()
+ ctx2.load_verify_locations(cafile='tests/ca.pem')
+ ctx2.load_cert('tests/x509.pem')
+ ctx2.set_verify(SSL.verify_peer | SSL.verify_fail_if_no_peer_cert, 1)
+ ctx2.set_session_cache_mode(m2.SSL_SESS_CACHE_CLIENT)
+- c = httpslib.HTTPSConnection(srv_host, srv_port, ssl_context=ctx2)
+- c.set_session(ses)
+- c.request('GET', '/')
+- ses2 = c.get_session()
++ c2 = httpslib.HTTPSConnection(srv_host, srv_port, ssl_context=ctx2)
++ c2.set_session(ses)
++ c2.request('GET', '/')
++ ses2 = c2.get_session()
+ t2 = ses2.as_text()
+- data = c.getresponse().read()
++ data = c2.getresponse().read()
+ c.close()
++ c2.close()
+ assert t == t2, "Sessions did not match"
+ finally:
+ self.stop_server(pid)
diff --git a/dev-python/m2crypto/m2crypto-0.18.2.ebuild b/dev-python/m2crypto/m2crypto-0.18.2.ebuild
index 3e33ae34cfae..01943140d454 100644
--- a/dev-python/m2crypto/m2crypto-0.18.2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.18.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.18.2.ebuild,v 1.1 2008/02/24 11:34:25 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.18.2.ebuild,v 1.2 2008/06/27 11:04:46 hawking Exp $
inherit distutils portability eutils multilib
@@ -28,6 +28,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}/${P}-timeval_struct_size.patch"
+ epatch "${FILESDIR}/${P}-resume_session.patch"
}
src_install() {