23209257 Upgrade Websockify to 0.8.0
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:40 -0700
changeset 6845 878a6cd0d0f9
parent 6844 5800d36b7861
child 6846 a73020a7fe4c
23209257 Upgrade Websockify to 0.8.0
components/python/websockify/Makefile
components/python/websockify/patches/websockify-byte-order.patch
components/python/websockify/websockify-PYVER.p5m
--- a/components/python/websockify/Makefile	Wed Sep 07 14:48:40 2016 -0700
+++ b/components/python/websockify/Makefile	Wed Sep 07 14:48:40 2016 -0700
@@ -20,21 +20,21 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		websockify
-COMPONENT_VERSION=	0.6.0
+COMPONENT_VERSION=	0.8.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	v$(COMPONENT_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:aeb1bb0079696611045d2f188f38b68c8a4cc50e3c229db9156806c0078d608e
+    sha256:f080e40b3f429f39dc557c62c6d715a683100e7c10c557fa376b6dbde23358ce
 COMPONENT_PROJECT_URL=	https://github.com/kanaka/websockify
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/archive/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	python-mod/websockify
 
-TPNO=			21745
+TPNO=			27984
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
@@ -57,3 +57,4 @@
 
 REQUIRED_PACKAGES += library/python/setuptools-27
 REQUIRED_PACKAGES += library/python/setuptools-34
+REQUIRED_PACKAGES += library/python/setuptools-35
--- a/components/python/websockify/patches/websockify-byte-order.patch	Wed Sep 07 14:48:40 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-In-house developed patch.
-Internal bugdb id# 20202461
-Prevents inappropriate byte swapping of WebSocket frame data and
-and mask on big endian ISAs (like SPARC).
-Not Solaris specific. Suitable for upstream contribution.
-Bug and patch submitted upstream, waiting review:
-https://github.com/kanaka/websockify/issues/150
-
---- websockify-0.6.0/websockify/websocket.py.~1~	2014-02-18 14:03:09.000000000 -0800
-+++ websockify-0.6.0/websockify/websocket.py	2015-02-25 02:02:30.561296598 -0800
[email protected]@ -118,9 +118,9 @@ class WebSocketRequestHandler(SimpleHTTP
-         if numpy:
-             b = c = s2b('')
-             if plen >= 4:
--                mask = numpy.frombuffer(buf, dtype=numpy.dtype('<u4'),
-+                mask = numpy.frombuffer(buf, dtype=numpy.dtype('u4'),
-                         offset=hlen, count=1)
--                data = numpy.frombuffer(buf, dtype=numpy.dtype('<u4'),
-+                data = numpy.frombuffer(buf, dtype=numpy.dtype('u4'),
-                         offset=pstart, count=int(plen / 4))
-                 #b = numpy.bitwise_xor(data, mask).data
-                 b = numpy.bitwise_xor(data, mask).tostring()
--- a/components/python/websockify/websockify-PYVER.p5m	Wed Sep 07 14:48:40 2016 -0700
+++ b/components/python/websockify/websockify-PYVER.p5m	Wed Sep 07 14:48:40 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -43,6 +43,12 @@
 link path=usr/bin/websockify target=websockify-$(PYVER) mediator=python \
     mediator-version=$(PYVER)
 file path=usr/bin/websockify-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/share/websockify/include/base64.js
+file path=usr/lib/python$(PYVER)/vendor-packages/share/websockify/include/util.js
+file path=usr/lib/python$(PYVER)/vendor-packages/share/websockify/include/web-socket-js/WebSocketMain.swf
+file path=usr/lib/python$(PYVER)/vendor-packages/share/websockify/include/web-socket-js/swfobject.js
+file path=usr/lib/python$(PYVER)/vendor-packages/share/websockify/include/web-socket-js/web_socket.js
+file path=usr/lib/python$(PYVER)/vendor-packages/share/websockify/include/websock.js
 file path=usr/lib/python$(PYVER)/vendor-packages/websockify-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/websockify-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/websockify-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
@@ -51,35 +57,28 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/websockify-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/websockify-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/websockify/__init__.py
-# The bypasses for array, select & time are temporary until pkgdepend learns
-# about PEP 3149, new in Python 3.x; see 19510349.
+file path=usr/lib/python$(PYVER)/vendor-packages/websockify/auth_plugins.py
+file path=usr/lib/python$(PYVER)/vendor-packages/websockify/token_plugins.py
 file path=usr/lib/python$(PYVER)/vendor-packages/websockify/websocket.py \
     pkg.depend.bypass-generate=.*/SimpleHTTPServer.* \
-    pkg.depend.bypass-generate=.*/array.* \
     pkg.depend.bypass-generate=.*/cStringIO.* \
-    pkg.depend.bypass-generate=.*/http.* pkg.depend.bypass-generate=.*/md5.* \
-    pkg.depend.bypass-generate=.*/select.* \
-    pkg.depend.bypass-generate=.*/sha.* pkg.depend.bypass-generate=.*/time.*
+    pkg.depend.bypass-generate=.*/http.* pkg.depend.bypass-generate=.*/sha.*
 file path=usr/lib/python$(PYVER)/vendor-packages/websockify/websocketproxy.py \
     pkg.depend.bypass-generate=.*/BaseHTTPServer.* \
-    pkg.depend.bypass-generate=.*/SocketServer.* \
+    pkg.depend.bypass-generate=.*/[Ss]ocket[Ss]erver.* \
     pkg.depend.bypass-generate=.*/http.* \
-    pkg.depend.bypass-generate=.*/select.* \
-    pkg.depend.bypass-generate=.*/socketserver.* \
-    pkg.depend.bypass-generate=.*/time.* \
     pkg.depend.bypass-generate=.*/urllib.* \
     pkg.depend.bypass-generate=.*/urlparse.*
 #
 license websockify.license license="LGPL3, BSD, MIT"
 
-# force a group dependency on the optional python-extra; pkgdepend work is
-# needed to flush this out.
-$(PYTHON_2.7_ONLY)depend type=group fmri=library/python/python-extra-$(PYV)
-
 # force the rename with an optional dependency on the old name
 depend type=optional \
     fmri=library/python-2/websockify-$(PYV)@0.3.0,5.12-5.12.0.0.0.44.0
 
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
 # force a dependency on the websockify package
 depend type=require \
     fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)