update to websockify-0.9.0 and switch to py3
This commit is contained in:
sthen
parent
630bc609da
commit
277cf059a2
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.6 2019/08/21 14:26:56 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 2020/03/09 12:43:16 sthen Exp $
|
||||
|
||||
COMMENT= WebSocket to TCP proxy
|
||||
|
||||
MODPY_EGG_VERSION= 0.8.0
|
||||
GH_ACCOUNT= kanaka
|
||||
MODPY_EGG_VERSION= 0.9.0
|
||||
GH_ACCOUNT= novnc
|
||||
GH_PROJECT= websockify
|
||||
GH_TAGNAME= v${MODPY_EGG_VERSION}
|
||||
REVISION= 0
|
||||
|
||||
CATEGORIES= net
|
||||
|
||||
@ -15,11 +14,12 @@ PERMIT_PACKAGE= Yes
|
||||
|
||||
MODULES= lang/python
|
||||
MODPY_SETUPTOOLS= Yes
|
||||
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
|
||||
|
||||
RUN_DEPENDS= math/py-numpy
|
||||
TEST_DEPENDS= devel/py-test \
|
||||
devel/py-mox \
|
||||
${BUILD_PKGPATH}-=${MODPY_EGG_VERSION}
|
||||
RUN_DEPENDS= math/py-numpy${MODPY_FLAVOR}
|
||||
|
||||
# needs mox3 and jwcrypto for tests
|
||||
NO_TEST= Yes
|
||||
|
||||
post-build:
|
||||
cd ${WRKSRC}; env ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
|
||||
@ -29,7 +29,4 @@ post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/lib/websockify
|
||||
${INSTALL_DATA} ${WRKSRC}/rebind.so ${PREFIX}/lib/websockify/
|
||||
|
||||
do-test:
|
||||
cd ${WRKSRC}/tests; py.test
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (websockify-0.8.0.tar.gz) = 8IDkCz9CnzncVXxixtcVpoMQDnwQxVf6N2ttveIzWM4=
|
||||
SIZE (websockify-0.8.0.tar.gz) = 288359
|
||||
SHA256 (websockify-0.9.0.tar.gz) = br/seR3Xi+ZYT7X+O8J/Aq9UUBvt34RXNoaZ9XHeE64=
|
||||
SIZE (websockify-0.9.0.tar.gz) = 58493
|
||||
|
||||
@ -1,10 +1,13 @@
|
||||
$OpenBSD: patch-tests_test_websocket_py,v 1.1.1.1 2015/12/18 13:18:39 sthen Exp $
|
||||
--- tests/test_websocket.py.orig Fri Jul 24 02:02:37 2015
|
||||
+++ tests/test_websocket.py Fri Dec 18 12:33:34 2015
|
||||
@@ -313,38 +313,6 @@ class WebSocketServerTestCase(unittest.TestCase):
|
||||
$OpenBSD: patch-tests_test_websockifyserver_py,v 1.1 2020/03/09 12:43:16 sthen Exp $
|
||||
|
||||
Index: tests/test_websockifyserver.py
|
||||
--- tests/test_websockifyserver.py.orig
|
||||
+++ tests/test_websockifyserver.py
|
||||
@@ -421,36 +421,3 @@ class WebSockifyServerTestCase(unittest.TestCase):
|
||||
lambda *args, **kwargs: None)
|
||||
self.stubs.Set(select, 'select', fake_select)
|
||||
server.start_server()
|
||||
|
||||
-
|
||||
- def test_socket_set_keepalive_options(self):
|
||||
- keepcnt = 12
|
||||
- keepidle = 34
|
||||
@ -16,8 +19,9 @@ $OpenBSD: patch-tests_test_websocket_py,v 1.1.1.1 2015/12/18 13:18:39 sthen Exp
|
||||
- tcp_keepidle=keepidle,
|
||||
- tcp_keepintvl=keepintvl)
|
||||
-
|
||||
- self.assertEqual(sock.getsockopt(socket.SOL_TCP,
|
||||
- socket.TCP_KEEPCNT), keepcnt)
|
||||
- if hasattr(socket, 'TCP_KEEPCNT'):
|
||||
- self.assertEqual(sock.getsockopt(socket.SOL_TCP,
|
||||
- socket.TCP_KEEPCNT), keepcnt)
|
||||
- self.assertEqual(sock.getsockopt(socket.SOL_TCP,
|
||||
- socket.TCP_KEEPIDLE), keepidle)
|
||||
- self.assertEqual(sock.getsockopt(socket.SOL_TCP,
|
||||
@ -29,14 +33,10 @@ $OpenBSD: patch-tests_test_websocket_py,v 1.1.1.1 2015/12/18 13:18:39 sthen Exp
|
||||
- tcp_keepidle=keepidle,
|
||||
- tcp_keepintvl=keepintvl)
|
||||
-
|
||||
- self.assertNotEqual(sock.getsockopt(socket.SOL_TCP,
|
||||
- socket.TCP_KEEPCNT), keepcnt)
|
||||
- if hasattr(socket, 'TCP_KEEPCNT'):
|
||||
- self.assertNotEqual(sock.getsockopt(socket.SOL_TCP,
|
||||
- socket.TCP_KEEPCNT), keepcnt)
|
||||
- self.assertNotEqual(sock.getsockopt(socket.SOL_TCP,
|
||||
- socket.TCP_KEEPIDLE), keepidle)
|
||||
- self.assertNotEqual(sock.getsockopt(socket.SOL_TCP,
|
||||
- socket.TCP_KEEPINTVL), keepintvl)
|
||||
-
|
||||
-
|
||||
class HyBiEncodeDecodeTestCase(unittest.TestCase):
|
||||
def test_decode_hybi_text(self):
|
||||
buf = b'\x81\x85\x37\xfa\x21\x3d\x7f\x9f\x4d\x51\x58'
|
||||
@ -1,7 +1,9 @@
|
||||
$OpenBSD: patch-websockify_websocket_py,v 1.2 2016/06/04 22:52:24 gsoares Exp $
|
||||
--- websockify/websocket.py.orig Thu Feb 18 16:11:15 2016
|
||||
+++ websockify/websocket.py Sat Jun 4 19:47:55 2016
|
||||
@@ -722,15 +722,6 @@ class WebSocketServer(object):
|
||||
$OpenBSD: patch-websockify_websockifyserver_py,v 1.1 2020/03/09 12:43:16 sthen Exp $
|
||||
|
||||
Index: websockify/websockifyserver.py
|
||||
--- websockify/websockifyserver.py.orig
|
||||
+++ websockify/websockifyserver.py
|
||||
@@ -469,15 +469,6 @@ class WebSockifyServer(object):
|
||||
|
||||
if tcp_keepalive:
|
||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2015/12/22 14:41:52 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2020/03/09 12:43:16 sthen Exp $
|
||||
bin/websockify
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
|
||||
@ -10,24 +10,24 @@ lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MOD
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/__main__.py
|
||||
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}/
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}auth_plugins.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}sysloghandler.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}token_plugins.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websocketproxy.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websocketserver.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/${MODPY_PYCACHE}websockifyserver.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/auth_plugins.py
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/auth_plugins.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/sysloghandler.py
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/token_plugins.py
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/token_plugins.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/websocket.py
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/websocket.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/websocketproxy.py
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/websocketproxy.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/websocketserver.py
|
||||
lib/python${MODPY_VERSION}/site-packages/websockify/websockifyserver.py
|
||||
lib/websockify/
|
||||
lib/websockify/rebind.so
|
||||
@so lib/websockify/rebind.so
|
||||
@man man/man1/websockify.1
|
||||
share/websockify/
|
||||
share/websockify/include/
|
||||
share/websockify/include/base64.js
|
||||
share/websockify/include/util.js
|
||||
share/websockify/include/web-socket-js/
|
||||
share/websockify/include/web-socket-js/WebSocketMain.swf
|
||||
share/websockify/include/web-socket-js/swfobject.js
|
||||
share/websockify/include/web-socket-js/web_socket.js
|
||||
share/websockify/include/websock.js
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user