From aad6864a51abe0d2a9b920c53213edd7cdc69fdd Mon Sep 17 00:00:00 2001 From: Nikola Dipanov Date: Oct 23 2012 11:30:02 +0000 Subject: Move to the upstream 0.2.0 version --- diff --git a/.gitignore b/.gitignore index cf7e1c8..6db5224 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /websockify-0.1.0.tar.gz +/websockify-0.2.0.tar.gz diff --git a/python-websockify.spec b/python-websockify.spec index 35e32a4..13fc357 100644 --- a/python-websockify.spec +++ b/python-websockify.spec @@ -1,12 +1,13 @@ Name: python-websockify -Version: 0.1.0 -Release: 6%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: WSGI based adapter for the Websockets protocol License: LGPLv3 URL: https://github.com/kanaka/websockify Source0: https://github.com/downloads/kanaka/websockify/websockify-%{version}.tar.gz -Patch0: websockify-0.1.1-manpage.patch +Patch0: websockify-0.2-fix-setup-py-version.patch +Patch1: websockify-0.2-handle-errors-when-popping-kwargs.patch BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools @@ -16,6 +17,7 @@ Python WSGI based adapter for the Websockets protocol %prep %setup -q -n websockify-%{version} %patch0 -p1 +%patch1 -p1 %build %{__python} setup.py build @@ -40,6 +42,9 @@ install -m 444 docs/websockify.1 %{buildroot}%{_mandir}/man1/ %changelog +* Mon Oct 22 2012 Nikola Đipanov - 0.2.0-1 +- Moving to the upstream version 0.2.0 + * Sat Jul 21 2012 Fedora Release Engineering - 0.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index cadeb08..8977219 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f6b48972abc7c7e1707f7bc41686a5f websockify-0.1.0.tar.gz +368efd3d536f8e2fd3a5c5cc9e26c73a websockify-0.2.0.tar.gz diff --git a/websockify-0.1.1-manpage.patch b/websockify-0.1.1-manpage.patch deleted file mode 100644 index bead4a9..0000000 --- a/websockify-0.1.1-manpage.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 8000318f10d7fc2d5f2f94a762efd917fd527c92 Mon Sep 17 00:00:00 2001 -From: Adam Young -Date: Thu, 7 Jun 2012 20:38:27 -0400 -Subject: [PATCH] Add Man page - ---- - docs/websockify.1 | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 111 insertions(+) - create mode 100644 docs/websockify.1 - -diff --git a/docs/websockify.1 b/docs/websockify.1 -new file mode 100644 -index 0000000..04a8d8f ---- /dev/null -+++ b/docs/websockify.1 -@@ -0,0 +1,111 @@ -+.TH websockify 1 "June 7, 2012" "version 0.3" "USER COMMANDS" -+ -+.B websockify -+Usage: -+ websockify [options] [source_addr:]source_port target_addr:target_port -+ websockify [options] [source_addr:]source_port \-\- WRAP_COMMAND_LINE -+ -+.SH Options: -+ -h, --help show this help message and exit -+ -v, --verbose verbose messages and per frame traffic -+ --record=FILE record sessions to FILE.[session_number] -+ -D, --daemon become a daemon (background process) -+ --run-once handle a single WebSocket connection and exit -+ --timeout=TIMEOUT after TIMEOUT seconds exit when not connected -+ --cert=CERT SSL certificate file -+ --key=KEY SSL key file (if separate from cert) -+ --ssl-only disallow non-encrypted connections -+ --web=DIR run webserver on same port. Serve files from DIR. -+ --wrap-mode=MODE action to take when the wrapped program exits or -+ daemonizes: exit (default), ignore, respawn -+ -+websockify: WebSockets support for any application/server -+ -+websockify was formerly named wsproxy and was part of the noVNC project. -+ -+At the most basic level, websockify just translates WebSockets traffic to normal socket traffic. Websockify accepts the WebSockets handshake, parses it, and then begins forwarding traffic between the client and the target in both directions. -+WebSockets binary data -+ -+Websockify supports all versions of the WebSockets protocol (Hixie and HyBI). The older Hixie versions of the protocol only support UTF-8 text payloads. In order to transport binary data over UTF-8 an encoding must used to encapsulate the data within UTF-8. Websockify uses base64 to encode all traffic to and from the client. This does not affect the data between websockify and the server. -+Encrypted WebSocket connections (wss://) -+ -+To encrypt the traffic using the WebSocket 'wss://' URI scheme you need to generate a certificate for websockify to load. By default websockify loads a certificate file name self.pem but the --cert=CERT option can override the file name. You can generate a self-signed certificate using openssl. When asked for the common name, use the hostname of the server where the proxy will be running: -+ -+openssl req -new -x509 -days 365 -nodes -out self.pem -keyout self.pem -+ -+Websock Javascript library -+ -+The include/websock.js Javascript library library provides a Websock object that is similar to the standard WebSocket object but Websock enables communication with raw TCP sockets (i.e. the binary stream) via websockify. This is accomplished by base64 encoding the data stream between Websock and websockify. -+ -+Websock has built-in receive queue buffering; the message event does not contain actual data but is simply a notification that there is new data available. Several rQ* methods are available to read binary data off of the receive queue. -+ -+The Websock API is documented on the websock.js API wiki page -+ -+See the "Wrap a Program" section below for an example of using Websock and websockify as a browser telnet client (wstelnet.html). -+Additional websockify features -+ -+These are not necessary for the basic operation. -+ -+ Daemonizing: When the -D option is specified, websockify runs in the background as a daemon process. -+ -+ SSL (the wss:// WebSockets URI): This is detected automatically by websockify by sniffing the first byte sent from the client and then wrapping the socket if the data starts with '\\x16' or '\\x80' (indicating SSL). -+ -+ Flash security policy: websockify detects flash security policy requests (again by sniffing the first packet) and answers with an appropriate flash security policy response (and then closes the port). This means no separate flash security policy server is needed for supporting the flash WebSockets fallback emulator. -+ -+ Session recording: This feature that allows recording of the traffic sent and received from the client to a file using the --record option. -+ -+ Mini-webserver: websockify can detect and respond to normal web requests on the same port as the WebSockets proxy and Flash security policy. This functionality is activate with the --web DIR option where DIR is the root of the web directory to serve. -+ -+ Wrap a program: see the "Wrap a Program" section below. -+ -+Implementations of websockify -+ -+The primary implementation of websockify is in python. There are several alternate implementations in other languages (C, Node.js, Clojure, Ruby) in the other/ subdirectory (with varying levels of functionality). -+ -+In addition there are several other external projects that implement the websockify "protocol". See the alternate implementation Feature Matrix for more information. -+Wrap a Program -+ -+In addition to proxying from a source address to a target address (which may be on a different system), websockify has the ability to launch a program on the local system and proxy WebSockets traffic to a normal TCP port owned/bound by the program. -+ -+The is accomplished with a small LD_PRELOAD library (rebind.so) which intercepts bind() system calls by the program. The specified port is moved to a new localhost/loopback free high port. websockify then proxies WebSockets traffic directed to the original port to the new (moved) port of the program. -+ -+The program wrap mode is invoked by replacing the target with -- followed by the program command line to wrap. -+ -+`./websockify 2023 -- PROGRAM ARGS` -+ -+The --wrap-mode option can be used to indicate what action to take when the wrapped program exits or daemonizes. -+ -+Here is an example of using websockify to wrap the vncserver command (which backgrounds itself) for use with noVNC: -+ -+`./websockify 5901 --wrap-mode=ignore -- vncserver -geometry 1024x768 :1` -+ -+Here is an example of wrapping telnetd (from krb5-telnetd).telnetd exits after the connection closes so the wrap mode is set to respawn the command: -+ -+`sudo ./websockify 2023 --wrap-mode=respawn -- telnetd -debug 2023` -+ -+The wstelnet.html page demonstrates a simple WebSockets based telnet client. -+Building the Python ssl module (for python 2.5 and older) -+ -+ Install the build dependencies. On Ubuntu use this command: -+ -+ sudo aptitude install python-dev bluetooth-dev -+ -+ Download, build the ssl module and symlink to it: -+ -+ cd websockify/ -+ -+ wget http://pypi.python.org/packages/source/s/ssl/ssl-1.15.tar.gz -+ -+ tar xvzf ssl-1.15.tar.gz -+ -+ cd ssl-1.15 -+ -+ make -+ -+ cd ../ -+ -+ ln -sf ssl-1.15/build/lib.linux-*/ssl ssl -+ -+ -+.SH AUTHOR -+Joel Martin (github@martintribe.org) --- -1.7.10.2 - diff --git a/websockify-0.2-fix-setup-py-version.patch b/websockify-0.2-fix-setup-py-version.patch new file mode 100644 index 0000000..dddb51e --- /dev/null +++ b/websockify-0.2-fix-setup-py-version.patch @@ -0,0 +1,26 @@ +From daa2d950df99ceaa5a0693570e8e6b6cb5da8ed0 Mon Sep 17 00:00:00 2001 +From: Nikola Dipanov +Date: Mon, 22 Oct 2012 15:09:53 +0200 +Subject: [PATCH] Fix the setup.py version + +Fixes the version in the setup script in order to be able to use +%{version} macro properly in the rpm spec file +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 947f0a5..a435465 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,6 +1,6 @@ + from setuptools import setup, find_packages + +-version = '0.1.0' ++version = '0.2.0' + name = 'websockify' + long_description = open("README.md").read() + "\n" + \ + open("CHANGES.txt").read() + "\n" +-- +1.7.9.5 + diff --git a/websockify-0.2-handle-errors-when-popping-kwargs.patch b/websockify-0.2-handle-errors-when-popping-kwargs.patch new file mode 100644 index 0000000..a3a1400 --- /dev/null +++ b/websockify-0.2-handle-errors-when-popping-kwargs.patch @@ -0,0 +1,37 @@ +From e6d8d8f242fb6c39867749aff8d8e20e9bbc11b8 Mon Sep 17 00:00:00 2001 +From: Joel Martin +Date: Fri, 21 Sep 2012 07:08:04 -0500 +Subject: [PATCH] Gracefully handle errors when popping kwargs. + +--- + websockify | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/websockify b/websockify +index 13f6582..c792dbf 100755 +--- a/websockify ++++ b/websockify +@@ -41,13 +41,13 @@ Traffic Legend: + + def __init__(self, *args, **kwargs): + # Save off proxy specific options +- self.target_host = kwargs.pop('target_host') +- self.target_port = kwargs.pop('target_port') +- self.wrap_cmd = kwargs.pop('wrap_cmd') +- self.wrap_mode = kwargs.pop('wrap_mode') +- self.unix_target = kwargs.pop('unix_target') +- self.ssl_target = kwargs.pop('ssl_target') +- self.target_cfg = kwargs.pop('target_cfg') ++ self.target_host = kwargs.pop('target_host', None) ++ self.target_port = kwargs.pop('target_port', None) ++ self.wrap_cmd = kwargs.pop('wrap_cmd', None) ++ self.wrap_mode = kwargs.pop('wrap_mode', None) ++ self.unix_target = kwargs.pop('unix_target', None) ++ self.ssl_target = kwargs.pop('ssl_target', None) ++ self.target_cfg = kwargs.pop('target_cfg', None) + # Last 3 timestamps command was run + self.wrap_times = [0, 0, 0] + +-- +1.7.9.5 +