From 5a924f6c9689c3d9c661864d0a44b0a59ae551de Mon Sep 17 00:00:00 2001 From: Nikola Dipanov Date: Oct 23 2012 13:06:38 +0000 Subject: Moves to the 0.4.0 upstream version of the code Needed for this package to work with nova-folsom --- diff --git a/.gitignore b/.gitignore index cfd8481..4060696 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /noVNC-0.3.tar.gz +/novnc-0.4.tar.gz diff --git a/novnc-0.3-call-websockify.patch b/novnc-0.3-call-websockify.patch deleted file mode 100644 index 7662696..0000000 --- a/novnc-0.3-call-websockify.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9abeb6faf34c6413398559a203f82e1de459191c Mon Sep 17 00:00:00 2001 -From: Adam Young -Date: Fri, 8 Jun 2012 11:10:45 -0400 -Subject: [PATCH] call the websockify executable. - ---- - utils/launch.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/launch.sh b/utils/launch.sh -index 8afd6e4..baaa472 100755 ---- a/utils/launch.sh -+++ b/utils/launch.sh -@@ -92,7 +92,7 @@ else - fi - - echo "Starting webserver and WebSockets proxy on port ${PORT}" --${HERE}/wsproxy.py --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & -+${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & - proxy_pid="$!" - sleep 1 - if ! ps -p ${proxy_pid} >/dev/null; then --- -1.7.10.2 - diff --git a/novnc-0.3-manpage.patch b/novnc-0.3-manpage.patch deleted file mode 100644 index 0f93e38..0000000 --- a/novnc-0.3-manpage.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 42d5fa61a47fb156bf4e6bea7051c9198f8fb938 Mon Sep 17 00:00:00 2001 -From: Adam Young -Date: Fri, 8 Jun 2012 10:34:38 -0400 -Subject: [PATCH] added Man pages. - ---- - docs/nova-novncproxy.1 | 35 +++++++++++++++++++++++++++++++++++ - docs/novnc_server.1 | 22 ++++++++++++++++++++++ - 2 files changed, 57 insertions(+) - create mode 100644 docs/nova-novncproxy.1 - create mode 100644 docs/novnc_server.1 - -diff --git a/docs/nova-novncproxy.1 b/docs/nova-novncproxy.1 -new file mode 100644 -index 0000000..198b634 ---- /dev/null -+++ b/docs/nova-novncproxy.1 -@@ -0,0 +1,35 @@ -+.TH nova-novncproxy 1 "June 8, 2012" "version 0.3" "USER COMMANDS" -+ -+.SH NAME -+nova-novncproxy | noVNC proxy for Openstack Nova -+.SH SYNOPSIS -+.B nova-novncproxy [options] -+ -+.SH OPTIONS -+.TP -+record : Record sessions to FILE.[session_number] -+.TP -+daemon : Become a daemon (background process) -+.TP -+ssl_only : Disallow non-encrypted connections'), -+.TP -+source_is_ipv6 : Source is ipv6 -+.TP -+cert : SSL certificate file -+.TP -+key : SSL key file (if separate from cert) -+.TP -+web : Run webserver on same port. Serve files from DIR. -+.TP -+novncproxy_host : Host on which to listen for incoming requests. -+ defaults to ='0.0.0.0' -+.TP -+novncproxy_port: Port on which to listen for incoming requests -+ defaults to 6080 -+ -+ -+.SH AUTHOR -+Joel Martin (github@martintribe.org) -+ -+.SH SEE ALSO -+websockify(1) -diff --git a/docs/novnc_server.1 b/docs/novnc_server.1 -new file mode 100644 -index 0000000..5bcbd1b ---- /dev/null -+++ b/docs/novnc_server.1 -@@ -0,0 +1,22 @@ -+.TH novnc_server 1 "June 8, 2012" "version 0.3" "USER COMMANDS" -+ -+.SH NAME -+novnc_server | noVNC proxy server -+.SH SYNOPSIS -+.B novnc_server [--listen PORT] [--vnc VNC_HOST:PORT] [--cert CERT] -+ -+Starts the WebSockets proxy and a mini-webserver and -+provides a cut-and-paste URL to go to. -+ -+ --listen PORT Port for proxy/webserver to listen on -+ Default: 6080 -+ --vnc VNC_HOST:PORT VNC server host:port proxy target -+ Default: localhost:5900 -+ --cert CERT Path to combined cert/key file -+ Default: self.pem -+ -+.SH AUTHOR -+Joel Martin (github@martintribe.org) -+ -+.SH SEE ALSO -+websockify(1) --- -1.7.10.2 - diff --git a/novnc-0.3-nova-wsproxy.patch b/novnc-0.3-nova-wsproxy.patch deleted file mode 100644 index 4d00ece..0000000 --- a/novnc-0.3-nova-wsproxy.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dec9511e0008c28462d7a98df0629479ab0c103d Mon Sep 17 00:00:00 2001 -From: Adam Young -Date: Thu, 7 Jun 2012 10:10:41 -0400 -Subject: [PATCH] IN the final RPM, there is no wsproxy, but rather just - websockify. - ---- - utils/nova-novncproxy | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/nova-novncproxy b/utils/nova-novncproxy -index a920492..a172212 100755 ---- a/utils/nova-novncproxy -+++ b/utils/nova-novncproxy -@@ -26,7 +26,7 @@ import Cookie - import socket - import sys - --import wsproxy -+import websockify as wsproxy - - from nova import context - from nova import flags --- -1.7.10.2 - diff --git a/novnc-0.4-call-websockify.patch b/novnc-0.4-call-websockify.patch new file mode 100644 index 0000000..7662696 --- /dev/null +++ b/novnc-0.4-call-websockify.patch @@ -0,0 +1,25 @@ +From 9abeb6faf34c6413398559a203f82e1de459191c Mon Sep 17 00:00:00 2001 +From: Adam Young +Date: Fri, 8 Jun 2012 11:10:45 -0400 +Subject: [PATCH] call the websockify executable. + +--- + utils/launch.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/launch.sh b/utils/launch.sh +index 8afd6e4..baaa472 100755 +--- a/utils/launch.sh ++++ b/utils/launch.sh +@@ -92,7 +92,7 @@ else + fi + + echo "Starting webserver and WebSockets proxy on port ${PORT}" +-${HERE}/wsproxy.py --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & ++${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & + proxy_pid="$!" + sleep 1 + if ! ps -p ${proxy_pid} >/dev/null; then +-- +1.7.10.2 + diff --git a/novnc-0.4-manpage.patch b/novnc-0.4-manpage.patch new file mode 100644 index 0000000..0f93e38 --- /dev/null +++ b/novnc-0.4-manpage.patch @@ -0,0 +1,84 @@ +From 42d5fa61a47fb156bf4e6bea7051c9198f8fb938 Mon Sep 17 00:00:00 2001 +From: Adam Young +Date: Fri, 8 Jun 2012 10:34:38 -0400 +Subject: [PATCH] added Man pages. + +--- + docs/nova-novncproxy.1 | 35 +++++++++++++++++++++++++++++++++++ + docs/novnc_server.1 | 22 ++++++++++++++++++++++ + 2 files changed, 57 insertions(+) + create mode 100644 docs/nova-novncproxy.1 + create mode 100644 docs/novnc_server.1 + +diff --git a/docs/nova-novncproxy.1 b/docs/nova-novncproxy.1 +new file mode 100644 +index 0000000..198b634 +--- /dev/null ++++ b/docs/nova-novncproxy.1 +@@ -0,0 +1,35 @@ ++.TH nova-novncproxy 1 "June 8, 2012" "version 0.3" "USER COMMANDS" ++ ++.SH NAME ++nova-novncproxy | noVNC proxy for Openstack Nova ++.SH SYNOPSIS ++.B nova-novncproxy [options] ++ ++.SH OPTIONS ++.TP ++record : Record sessions to FILE.[session_number] ++.TP ++daemon : Become a daemon (background process) ++.TP ++ssl_only : Disallow non-encrypted connections'), ++.TP ++source_is_ipv6 : Source is ipv6 ++.TP ++cert : SSL certificate file ++.TP ++key : SSL key file (if separate from cert) ++.TP ++web : Run webserver on same port. Serve files from DIR. ++.TP ++novncproxy_host : Host on which to listen for incoming requests. ++ defaults to ='0.0.0.0' ++.TP ++novncproxy_port: Port on which to listen for incoming requests ++ defaults to 6080 ++ ++ ++.SH AUTHOR ++Joel Martin (github@martintribe.org) ++ ++.SH SEE ALSO ++websockify(1) +diff --git a/docs/novnc_server.1 b/docs/novnc_server.1 +new file mode 100644 +index 0000000..5bcbd1b +--- /dev/null ++++ b/docs/novnc_server.1 +@@ -0,0 +1,22 @@ ++.TH novnc_server 1 "June 8, 2012" "version 0.3" "USER COMMANDS" ++ ++.SH NAME ++novnc_server | noVNC proxy server ++.SH SYNOPSIS ++.B novnc_server [--listen PORT] [--vnc VNC_HOST:PORT] [--cert CERT] ++ ++Starts the WebSockets proxy and a mini-webserver and ++provides a cut-and-paste URL to go to. ++ ++ --listen PORT Port for proxy/webserver to listen on ++ Default: 6080 ++ --vnc VNC_HOST:PORT VNC server host:port proxy target ++ Default: localhost:5900 ++ --cert CERT Path to combined cert/key file ++ Default: self.pem ++ ++.SH AUTHOR ++Joel Martin (github@martintribe.org) ++ ++.SH SEE ALSO ++websockify(1) +-- +1.7.10.2 + diff --git a/novnc-0.4-nova-wsproxy.patch b/novnc-0.4-nova-wsproxy.patch new file mode 100644 index 0000000..4d00ece --- /dev/null +++ b/novnc-0.4-nova-wsproxy.patch @@ -0,0 +1,26 @@ +From dec9511e0008c28462d7a98df0629479ab0c103d Mon Sep 17 00:00:00 2001 +From: Adam Young +Date: Thu, 7 Jun 2012 10:10:41 -0400 +Subject: [PATCH] IN the final RPM, there is no wsproxy, but rather just + websockify. + +--- + utils/nova-novncproxy | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/nova-novncproxy b/utils/nova-novncproxy +index a920492..a172212 100755 +--- a/utils/nova-novncproxy ++++ b/utils/nova-novncproxy +@@ -26,7 +26,7 @@ import Cookie + import socket + import sys + +-import wsproxy ++import websockify as wsproxy + + from nova import context + from nova import flags +-- +1.7.10.2 + diff --git a/novnc.spec b/novnc.spec index 19dce18..4833835 100644 --- a/novnc.spec +++ b/novnc.spec @@ -14,21 +14,21 @@ %endif Name: novnc -Version: 0.3 -Release: 12%{?dist} +Version: 0.4 +Release: 1%{?dist} Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support Requires: python-websockify License: GPLv3 URL: https://github.com/kanaka/noVNC -Source0: https://github.com/downloads/kanaka/noVNC/noVNC-%{version}.tar.gz +Source0: https://github.com/downloads/kanaka/noVNC/novnc-%{version}.tar.gz Source1: openstack-nova-novncproxy.service Source2: openstack-nova-novncproxy.init -Patch0: novnc-0.3-nova-wsproxy.patch -Patch1: novnc-0.3-manpage.patch -Patch2: novnc-0.3-call-websockify.patch +Patch0: novnc-0.4-nova-wsproxy.patch +Patch1: novnc-0.4-manpage.patch +Patch2: novnc-0.4-call-websockify.patch BuildArch: noarch BuildRequires: python2-devel @@ -82,7 +82,6 @@ install utils/launch.sh %{buildroot}/%{_bindir}/novnc_server install utils/nova-novncproxy %{buildroot}/%{_bindir} mkdir -p %{buildroot}%{_mandir}/man1/ -install -m 444 docs/nova-novncproxy.1 %{buildroot}%{_mandir}/man1/ install -m 444 docs/novnc_server.1 %{buildroot}%{_mandir}/man1/ %if %{with_systemd} @@ -126,7 +125,6 @@ fi %files -n openstack-nova-novncproxy %{_bindir}/nova-novncproxy -%{_mandir}/man1/nova-novncproxy.1* %if %{with_systemd} %{_unitdir}/openstack-nova-novncproxy.service %else @@ -134,6 +132,9 @@ fi %endif %changelog +* Mon Oct 22 2012 Nikola Đipanoov - 0.4-1 +- Moves to upstream version 0.4.0 + * Fri Jul 20 2012 Fedora Release Engineering - 0.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/openstack-nova-novncproxy.service b/openstack-nova-novncproxy.service index 04464b5..cac8aad 100644 --- a/openstack-nova-novncproxy.service +++ b/openstack-nova-novncproxy.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=simple User=nova -ExecStart=/usr/bin/nova-novncproxy --flagfile=/etc/nova/nova.conf --web /usr/share/novnc/ +ExecStart=/usr/bin/nova-novncproxy --web /usr/share/novnc/ [Install] WantedBy=multi-user.target diff --git a/sources b/sources index aac5588..3fb4a4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95d3c58921fa188c179491e8ef2acc12 noVNC-0.3.tar.gz +5703d5d46022d8723796dcbbf821ee7f novnc-0.4.tar.gz