upgrade to 0.13

prodded by and ok rpointel@
This commit is contained in:
eric 2011-11-25 20:19:30 +00:00
parent 990f030f34
commit 04c2d8718b
5 changed files with 41 additions and 34 deletions

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.17 2011/11/04 08:43:32 jasper Exp $
# $OpenBSD: Makefile,v 1.18 2011/11/25 20:19:30 eric Exp $
COMMENT= Python interface to the OpenSSL library
MODPY_EGG_VERSION= 0.9
MODPY_EGG_VERSION= 0.13
DISTNAME= pyOpenSSL-${MODPY_EGG_VERSION}
PKGNAME= py-openssl-${MODPY_EGG_VERSION}
REVISION= 3
CATEGORIES= security devel
HOMEPAGE= http://www.sourceforge.net/projects/pyopenssl/
HOMEPAGE= https://launchpad.net/pyopenssl/
MAINTAINER= Eric Faurot <eric@openbsd.org>
@ -20,11 +19,11 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= crypto ssl ${MODPY_WANTLIB}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pyopenssl/}
MASTER_SITES= ${MASTER_SITE_PYPI:=p/pyOpenSSL/}
MODULES= lang/python
REGRESS_DEPENDS=devel/py-twisted/core
REGRESS_DEPENDS=${FULLPKGNAME}:${BUILD_PKGPATH}
EXAMPLESDIR= ${PREFIX}/share/examples/py-openssl
@ -34,7 +33,12 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/simple/* ${EXAMPLESDIR}/simple
do-regress: install
${LOCALBASE}/bin/trial --temp-directory=${WRKBUILD} OpenSSL.test
REGRESSDIR=${WRKSRC}/regress
do-regress:
mkdir ${REGRESSDIR}
cd ${REGRESSDIR} && ${MODPY_BIN} ${WRKSRC}/OpenSSL/test/test_crypto.py
cd ${REGRESSDIR} && ${MODPY_BIN} ${WRKSRC}/OpenSSL/test/test_rand.py
cd ${REGRESSDIR} && ${MODPY_BIN} ${WRKSRC}/OpenSSL/test/test_ssl.py
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (pyOpenSSL-0.9.tar.gz) = W/KCstagOvkhkgw0B5WA8g==
RMD160 (pyOpenSSL-0.9.tar.gz) = /scuAqki/7N6nGbtgJxXO3eBONs=
SHA1 (pyOpenSSL-0.9.tar.gz) = 057rJsc+S5aATh5APiE2BikQtsI=
SHA256 (pyOpenSSL-0.9.tar.gz) = cInx1HznRIAyVBHTSjHjdHF1mAiJ2Z0uEYDxbRIyUas=
SIZE (pyOpenSSL-0.9.tar.gz) = 197981
MD5 (pyOpenSSL-0.13.tar.gz) = dnvKGKcReMo1Pf+eEJQZKQ==
RMD160 (pyOpenSSL-0.13.tar.gz) = hdaopcpD7hLEBU+PSD2yDhPdZVE=
SHA1 (pyOpenSSL-0.13.tar.gz) = tN4lxeTp2bw3XEGQce/EX6ltVZc=
SHA256 (pyOpenSSL-0.13.tar.gz) = IeErA6uqDgTsyM2cJRWY9xuuEcnzhTBCNOTqVhjGFjs=
SIZE (pyOpenSSL-0.13.tar.gz) = 250489

View File

@ -0,0 +1,19 @@
$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):
errno instead of raising an exception.
"""
port = socket()
- port.bind(('', 0))
+ port.bind(('127.0.0.1', 0))
port.listen(3)
clientSSL = Connection(Context(TLSv1_METHOD), socket())
clientSSL.setblocking(False)
result = clientSSL.connect_ex(port.getsockname())
- expected = (EINPROGRESS, EWOULDBLOCK)
+ expected = (0, EINPROGRESS, EWOULDBLOCK)
self.assertTrue(
result in expected, "%r not in %r" % (result, expected))

View File

@ -1,20 +0,0 @@
--- test/test_ssl.py.orig Sat Apr 25 14:47:06 2009
+++ test/test_ssl.py Fri May 22 17:04:34 2009
@@ -101,7 +101,7 @@
when certain information about an SSL connection is available.
"""
port = socket()
- port.bind(('', 0))
+ port.bind(('127.0.0.1', 0))
port.listen(1)
client = socket()
@@ -140,7 +140,7 @@
def _load_verify_locations_test(self, *args):
port = socket()
- port.bind(('', 0))
+ port.bind(('127.0.0.1', 0))
port.listen(1)
client = socket()

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2008/04/15 11:00:52 eric Exp $
@comment $OpenBSD: PLIST,v 1.5 2011/11/25 20:19:30 eric Exp $
lib/python${MODPY_VERSION}/site-packages/OpenSSL/
lib/python${MODPY_VERSION}/site-packages/OpenSSL/SSL.so
lib/python${MODPY_VERSION}/site-packages/OpenSSL/__init__.py
@ -10,8 +10,12 @@ lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/__init__.py
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/test_crypto.py
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/test_crypto.pyc
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/test_rand.py
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/test_rand.pyc
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/test_ssl.py
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/test_ssl.pyc
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/util.py
lib/python${MODPY_VERSION}/site-packages/OpenSSL/test/util.pyc
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