Hello community, here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2014-03-18 14:52:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tigervnc (Old) and /work/SRC/openSUSE:Factory/.tigervnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc" Changes: -------- --- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2014-02-24 18:25:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2014-03-18 14:52:31.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 17 13:47:18 UTC 2014 - [email protected] + +- Update HTML page that serves vnc client applet. (bnc#867273) +- u_tigervnc-dont-send-ascii-control-characters.patch + * Send CTRL+[A-Z] combinations instead of ascii control characters. + (bnc#864666) + +------------------------------------------------------------------- New: ---- index.vnc u_tigervnc-dont-send-ascii-control-characters.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tigervnc.spec ++++++ --- /var/tmp/diff_new_pack.YJtwCv/_old 2014-03-18 14:52:32.000000000 +0100 +++ /var/tmp/diff_new_pack.YJtwCv/_new 2014-03-18 14:52:32.000000000 +0100 @@ -92,6 +92,7 @@ Source7: vnc_inetd_httpd Source8: vnc.reg Source9: vncpasswd.arg +Source10: index.vnc # Tiger vnc patches Patch1: u_tigervnc-1.3.0-fix-use-after-free.patch @@ -99,6 +100,7 @@ Patch3: tigervnc-clean-pressed-key-on-exit.patch Patch4: tigervnc-sf3492352.diff Patch5: tigervnc-sf3495623.patch +Patch6: u_tigervnc-dont-send-ascii-control-characters.patch # Xserver patches Patch10: tigervnc-1.2.80-fix-int-to-pointer.patch @@ -136,6 +138,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p0 pushd unix/xserver patch -p1 < ../xserver113.patch @@ -189,7 +192,6 @@ pushd java mkdir -p $RPM_BUILD_ROOT%{_datadir}/vnc/classes install -m755 VncViewer.jar $RPM_BUILD_ROOT%{_datadir}/vnc/classes -install -m644 com/tigervnc/vncviewer/index.vnc $RPM_BUILD_ROOT%{_datadir}/vnc/classes popd install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/xinetd.d/vnc @@ -201,6 +203,7 @@ install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg install -D -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg +install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vnc/classes %find_lang '%{name}' ++++++ index.vnc ++++++ <!-- index.vnc - default HTML page for TigerVNC Java viewer applet, to be used with Xvnc. On any file ending in .vnc, the HTTP server embedded in Xvnc will substitute the following variables when preceded by a dollar: USER, DESKTOP, DISPLAY, APPLETWIDTH, APPLETHEIGHT, WIDTH, HEIGHT, PORT, Use two dollar signs ($$) to get a dollar sign in the generated HTML page. --> <HTML> <TITLE> $USER's $DESKTOP desktop ($DISPLAY) </TITLE> <APPLET CODE="com.tigervnc.vncviewer.VncViewer" ARCHIVE="VncViewer.jar" WIDTH="$APPLETWIDTH" HEIGHT="$APPLETHEIGHT"> <PARAM NAME="Port" VALUE="$PORT"> <PARAM NAME="Embed" VALUE="true"> <PARAM NAME="AlwaysShowServerDialog" VALUE="false"> </APPLET> <BR> <A href="http://www.tigervnc.org/";>TigerVNC site</A> </HTML> ++++++ u_tigervnc-dont-send-ascii-control-characters.patch ++++++ Author: Michal Srb <[email protected]> Subject: Do not send ascii control characters for CTRL+[A-Z] combinations. Patch-Mainline: To be upstreamed References: bnc#864666 Index: vncviewer/Viewport.cxx =================================================================== --- vncviewer/Viewport.cxx (revision 5162) +++ vncviewer/Viewport.cxx (working copy) @@ -753,7 +753,13 @@ return XK_VoidSymbol; } - ucs = fl_utf8decode(keyText, NULL, NULL); + if (keyCode >= 'a' && keyCode <= 'z' && keyText[0] < 0x20) { + // Do not send ascii control characters - send the original key combination that caused them. + ucs = keyCode; + } else { + ucs = fl_utf8decode(keyText, NULL, NULL); + } + return ucs2keysym(ucs); } ++++++ vnc_inetd_httpd ++++++ --- /var/tmp/diff_new_pack.YJtwCv/_old 2014-03-18 14:52:32.000000000 +0100 +++ /var/tmp/diff_new_pack.YJtwCv/_new 2014-03-18 14:52:32.000000000 +0100 @@ -23,8 +23,10 @@ content=" <HTML><HEAD><TITLE>Remote Desktop</TITLE></HEAD> <BODY> -<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=$width HEIGHT=$height> - <param name=PORT value=$port> +<APPLET CODE=\"com.tigervnc.vncviewer.VncViewer\" ARCHIVE=\"VncViewer.jar\" WIDTH=\"$width\" HEIGHT=\"$height\"> + <PARAM name=\"Port\" value=\"$port\"> + <param name=\"Embed\" value=\"true\"> + <param name=\"AlwaysShowServerDialog\" value=\"false\"> </APPLET> </BODY></HTML>" ;; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
