From 787199dca26ccbb9ffde1727b539a29eb616e66b0c40737a3c7b6166fe9f0f2d Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 23 Apr 2013 09:14:12 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/novnc?expand=0&rev=1 --- .gitattributes | 23 +++++++++ .gitignore | 1 + noVNC-0.3.tar.gz | 3 ++ novnc-0.3-call-websockify.patch | 25 ++++++++++ novnc-0.3-manpage.patch | 84 +++++++++++++++++++++++++++++++++ novnc-0.3-nova-wsproxy.patch | 26 ++++++++++ novnc.changes | 43 +++++++++++++++++ novnc.spec | 78 ++++++++++++++++++++++++++++++ 8 files changed, 283 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 noVNC-0.3.tar.gz create mode 100644 novnc-0.3-call-websockify.patch create mode 100644 novnc-0.3-manpage.patch create mode 100644 novnc-0.3-nova-wsproxy.patch create mode 100644 novnc.changes create mode 100644 novnc.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/noVNC-0.3.tar.gz b/noVNC-0.3.tar.gz new file mode 100644 index 0000000..69c89c9 --- /dev/null +++ b/noVNC-0.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0eac7d47c04f5a5e09f2992cbc99e393c62a52a644ffc9fed7ea42ffe5b3612a +size 703388 diff --git a/novnc-0.3-call-websockify.patch b/novnc-0.3-call-websockify.patch new file mode 100644 index 0000000..1c75d06 --- /dev/null +++ b/novnc-0.3-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.3-manpage.patch b/novnc-0.3-manpage.patch new file mode 100644 index 0000000..2471d14 --- /dev/null +++ b/novnc-0.3-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.3-nova-wsproxy.patch b/novnc-0.3-nova-wsproxy.patch new file mode 100644 index 0000000..011ceaa --- /dev/null +++ b/novnc-0.3-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.changes b/novnc.changes new file mode 100644 index 0000000..3fa3f9b --- /dev/null +++ b/novnc.changes @@ -0,0 +1,43 @@ +* Tue Mar 19 2013 Christian Berendt +- removed openstack-nova-novncproxy + +* Wed Oct 10 2012 Christian Berendt +- make it buildable for SLES11 SP2 + +* Fri Jul 20 2012 Fedora Release Engineering - 0.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 4 2012 Till Maas - 0.3-11 +- Add a dependency for novnc on python-websockify + +* Wed Jun 15 2012 Jose Castro Leon - 0.3-10 +- Add a dependency for openstack-nova-novncproxy on openstack-nova + +* Thu Jun 14 2012 Matthew Miller - 0.3-9 +- Remove a dependency for openstack-nova-novncproxy on numpy + +* Wed Jun 13 2012 Alan Pevec - 0.3-8 +- Add a dependency for openstack-nova-novncproxy on python-nova + +* Wed Jun 13 2012 Jose Castro Leon - 0.3-7 +- Add a dependency for openstack-nova-novncproxy on novnc + +* Mon Jun 11 2012 Adam Young - 0.3-6 +- systemd initialization for Nova Proxy +- system V init script +- remove Flash binary supporting older browsers + +* Tue Jun 8 2012 Adam Young - 0.3-3 +- Added man pages +- novnc_server usese the websockify executable, not wsproxy.py + +* Tue Jun 7 2012 Adam Young - 0.3-2 +- Make Javascript files non-executable, as they are not script files +- Patch Nova noVNC proxy to use websockify directly + +* Tue May 15 2012 Adam Young - 0.3-1 +- Added in support for the Nova noVNC proxy +- Added files for the images and inclues subdirectories + +* Thu May 10 2012 Adam Young - 0.2 +- Initial RPM release. diff --git a/novnc.spec b/novnc.spec new file mode 100644 index 0000000..6d3c9c8 --- /dev/null +++ b/novnc.spec @@ -0,0 +1,78 @@ +# +# spec file for package novnc +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: novnc +Version: 0.3 +Release: 0 +Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support +License: GPL-3.0 +Group: System/Daemons + +Url: https://github.com/kanaka/noVNC +Source0: noVNC-%{version}.tar.gz + +Patch0: novnc-0.3-nova-wsproxy.patch +Patch1: novnc-0.3-manpage.patch +Patch2: novnc-0.3-call-websockify.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python-devel + +Requires: python-websockify + +%description +Websocket implementation of VNC client + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build + +%install +mkdir -p %{buildroot}/%{_usr}/share/novnc/utils +install -m 444 *html %{buildroot}/%{_usr}/share/novnc +install -m 444 vnc.html %{buildroot}/%{_usr}/share/novnc/index.html + +mkdir -p %{buildroot}/%{_usr}/share/novnc/include/ +install -m 444 include/*.* %{buildroot}/%{_usr}/share/novnc/include +mkdir -p %{buildroot}/%{_usr}/share/novnc/images +install -m 444 images/*.* %{buildroot}/%{_usr}/share/novnc/images + +mkdir -p %{buildroot}/%{_bindir} +install utils/launch.sh %{buildroot}/%{_bindir}/novnc_server + +mkdir -p %{buildroot}%{_mandir}/man1/ +install -m 444 docs/novnc_server.1 %{buildroot}%{_mandir}/man1/ + +%files +%defattr(-,root,root,-) +%doc README.md LICENSE.txt + +%dir %{_usr}/share/novnc +%{_usr}/share/novnc/*.* +%dir %{_usr}/share/novnc/include +%{_usr}/share/novnc/include/* +%dir %{_usr}/share/novnc/images +%{_usr}/share/novnc/images/* +%{_bindir}/novnc_server +%{_mandir}/man1/novnc_server.1* + +%changelog