update to pyOpenSSL-0.14 (switch to py-cryptography as a backend), and take
maintainer, ok eric@
This commit is contained in:
sthen
parent
1f9004cf6c
commit
14209856eb
@ -1,24 +1,27 @@
|
||||
# $OpenBSD: Makefile,v 1.23 2015/06/22 22:40:59 jca Exp $
|
||||
# $OpenBSD: Makefile,v 1.24 2015/07/20 07:02:58 sthen Exp $
|
||||
|
||||
COMMENT= Python interface to the OpenSSL library
|
||||
|
||||
MODPY_EGG_VERSION= 0.13
|
||||
REVISION= 1
|
||||
MODPY_EGG_VERSION= 0.14
|
||||
DISTNAME= pyOpenSSL-${MODPY_EGG_VERSION}
|
||||
PKGNAME= py-openssl-${MODPY_EGG_VERSION}
|
||||
CATEGORIES= security devel
|
||||
|
||||
HOMEPAGE= https://launchpad.net/pyopenssl/
|
||||
HOMEPAGE= https://github.com/pyca/pyopenssl
|
||||
|
||||
MAINTAINER= Eric Faurot <eric@openbsd.org>
|
||||
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
|
||||
|
||||
# Apache 2
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
RUN_DEPENDS = security/py-cryptography
|
||||
BUILD_DEPENDS = ${RUN_DEPENDS}
|
||||
|
||||
WANTLIB += ${MODPY_WANTLIB}
|
||||
WANTLIB += crypto pthread ssl
|
||||
|
||||
MODPY_PI = Yes
|
||||
MODPY_SETUPTOOLS = Yes
|
||||
|
||||
MODULES= lang/python
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (pyOpenSSL-0.13.tar.gz) = IeErA6uqDgTsyM2cJRWY9xuuEcnzhTBCNOTqVhjGFjs=
|
||||
SIZE (pyOpenSSL-0.13.tar.gz) = 250489
|
||||
SHA256 (pyOpenSSL-0.14.tar.gz) = qZ245ZwSATitinLuztzCS0UQ0u7TzkghO34y8izE7m4=
|
||||
SIZE (pyOpenSSL-0.14.tar.gz) = 128005
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-OpenSSL_rand_rand_c,v 1.1 2014/04/21 19:17:50 jca Exp $
|
||||
Disable EGD support.
|
||||
--- OpenSSL/rand/rand.c.orig Fri Sep 2 17:46:13 2011
|
||||
+++ OpenSSL/rand/rand.c Mon Apr 21 18:57:05 2014
|
||||
@@ -111,6 +111,7 @@ rand_screen(PyObject *spam, PyObject *args)
|
||||
}
|
||||
#endif
|
||||
|
||||
+#if 0
|
||||
static char rand_egd_doc[] = "\n\
|
||||
Query an entropy gathering daemon (EGD) for random data and add it to the\n\
|
||||
PRNG. I haven't found any problems when the socket is missing, the function\n\
|
||||
@@ -133,6 +134,7 @@ rand_egd(PyObject *spam, PyObject *args)
|
||||
|
||||
return PyLong_FromLong((long)RAND_egd_bytes(path, bytes));
|
||||
}
|
||||
+#endif
|
||||
|
||||
static char rand_cleanup_doc[] = "\n\
|
||||
Erase the memory used by the PRNG.\n\
|
||||
@@ -245,7 +247,9 @@ static PyMethodDef rand_methods[] = {
|
||||
#ifdef MS_WINDOWS
|
||||
{ "screen", (PyCFunction)rand_screen, METH_VARARGS, rand_screen_doc },
|
||||
#endif
|
||||
+#if 0
|
||||
{ "egd", (PyCFunction)rand_egd, METH_VARARGS, rand_egd_doc },
|
||||
+#endif
|
||||
{ "cleanup", (PyCFunction)rand_cleanup, METH_VARARGS, rand_cleanup_doc },
|
||||
{ "load_file", (PyCFunction)rand_load_file, METH_VARARGS, rand_load_file_doc },
|
||||
{ "write_file",(PyCFunction)rand_write_file, METH_VARARGS, rand_write_file_doc },
|
||||
@ -1,34 +0,0 @@
|
||||
$OpenBSD: patch-OpenSSL_test_test_rand_py,v 1.1 2014/04/21 19:17:50 jca Exp $
|
||||
--- OpenSSL/test/test_rand.py.orig Mon Apr 21 20:27:18 2014
|
||||
+++ OpenSSL/test/test_rand.py Mon Apr 21 20:27:28 2014
|
||||
@@ -95,30 +95,6 @@ class RandTests(TestCase):
|
||||
self.assertTrue(rand.status() in (1, 2))
|
||||
|
||||
|
||||
- def test_egd_wrong_args(self):
|
||||
- """
|
||||
- L{OpenSSL.rand.egd} raises L{TypeError} when called with the wrong
|
||||
- number of arguments or with arguments not of type C{str} and C{int}.
|
||||
- """
|
||||
- self.assertRaises(TypeError, rand.egd)
|
||||
- self.assertRaises(TypeError, rand.egd, None)
|
||||
- self.assertRaises(TypeError, rand.egd, "foo", None)
|
||||
- self.assertRaises(TypeError, rand.egd, None, 3)
|
||||
- self.assertRaises(TypeError, rand.egd, "foo", 3, None)
|
||||
-
|
||||
-
|
||||
- def test_egd_missing(self):
|
||||
- """
|
||||
- L{OpenSSL.rand.egd} returns C{0} or C{-1} if the EGD socket passed
|
||||
- to it does not exist.
|
||||
- """
|
||||
- result = rand.egd(self.mktemp())
|
||||
- expected = (-1, 0)
|
||||
- self.assertTrue(
|
||||
- result in expected,
|
||||
- "%r not in %r" % (result, expected))
|
||||
-
|
||||
-
|
||||
def test_cleanup_wrong_args(self):
|
||||
"""
|
||||
L{OpenSSL.rand.cleanup} raises L{TypeError} when called with any
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-OpenSSL_test_test_ssl_py,v 1.1 2011/11/25 20:19:30 eric Exp $
|
||||
--- OpenSSL/test/test_ssl.py.orig Fri Sep 2 17:46:13 2011
|
||||
+++ OpenSSL/test/test_ssl.py Thu Nov 24 10:42:34 2011
|
||||
@@ -1153,13 +1153,13 @@ class ConnectionTests(TestCase, _LoopbackMixin):
|
||||
$OpenBSD: patch-OpenSSL_test_test_ssl_py,v 1.2 2015/07/20 07:02:58 sthen Exp $
|
||||
--- OpenSSL/test/test_ssl.py.orig Sun Feb 23 05:36:45 2014
|
||||
+++ OpenSSL/test/test_ssl.py Fri Jul 17 22:17:01 2015
|
||||
@@ -1576,13 +1576,13 @@ class ConnectionTests(TestCase, _LoopbackMixin):
|
||||
errno instead of raising an exception.
|
||||
"""
|
||||
port = socket()
|
||||
|
||||
@ -1,10 +1,15 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2011/11/25 20:19:30 eric Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.6 2015/07/20 07:02:58 sthen Exp $
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/SSL.so
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/SSL.py
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/SSL.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/crypto.so
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/rand.so
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/_util.py
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/_util.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/crypto.py
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/crypto.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/rand.py
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/rand.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/__init__.pyc
|
||||
@ -20,14 +25,19 @@ lib/python${MODPY_VERSION}/site-packages/OpenSSL/tsafe.py
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/tsafe.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/version.py
|
||||
lib/python${MODPY_VERSION}/site-packages/OpenSSL/version.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/pyOpenSSL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
|
||||
share/examples/py-openssl/
|
||||
share/examples/py-openssl/README
|
||||
share/examples/py-openssl/SecureXMLRPCServer.py
|
||||
share/examples/py-openssl/certgen.py
|
||||
share/examples/py-openssl/mk_simple_certs.py
|
||||
share/examples/py-openssl/proxy.py
|
||||
share/examples/py-openssl/simple/
|
||||
share/examples/py-openssl/simple/README
|
||||
share/examples/py-openssl/simple/client.py
|
||||
share/examples/py-openssl/simple/server.py
|
||||
lib/python${MODPY_VERSION}/site-packages/pyOpenSSL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/pyOpenSSL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
|
||||
lib/python${MODPY_VERSION}/site-packages/pyOpenSSL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pyOpenSSL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pyOpenSSL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/pyOpenSSL-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
|
||||
share/examples/${MODPY_PY_PREFIX}openssl/
|
||||
share/examples/${MODPY_PY_PREFIX}openssl/README
|
||||
share/examples/${MODPY_PY_PREFIX}openssl/SecureXMLRPCServer.py
|
||||
share/examples/${MODPY_PY_PREFIX}openssl/certgen.py
|
||||
share/examples/${MODPY_PY_PREFIX}openssl/mk_simple_certs.py
|
||||
share/examples/${MODPY_PY_PREFIX}openssl/proxy.py
|
||||
share/examples/${MODPY_PY_PREFIX}openssl/simple/
|
||||
share/examples/${MODPY_PY_PREFIX}openssl/simple/README
|
||||
share/examples/${MODPY_PY_PREFIX}openssl/simple/client.py
|
||||
share/examples/${MODPY_PY_PREFIX}openssl/simple/server.py
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user