Hello community, here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2015-04-07 09:28:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-02-27 11:06:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2015-04-07 09:28:29.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 1 12:44:09 UTC 2015 - [email protected] + +- u_terminate_instead_of_ignoring_restart.patch + * Terminate instead of ignoring restart. (bnc#920969) + +------------------------------------------------------------------- New: ---- u_terminate_instead_of_ignoring_restart.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tigervnc.spec ++++++ --- /var/tmp/diff_new_pack.Kvqixr/_old 2015-04-07 09:28:30.000000000 +0200 +++ /var/tmp/diff_new_pack.Kvqixr/_new 2015-04-07 09:28:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tigervnc # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -110,6 +110,7 @@ Patch8: u_tigervnc-use_preferred_mode.patch Patch9: u_tigervnc-cve-2014-8240.patch Patch10: u_tigervnc-build-with-xserver-1.17.patch +Patch11: u_terminate_instead_of_ignoring_restart.patch %description TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), @@ -141,6 +142,7 @@ %patch8 -p0 %patch9 -p1 %patch10 -p1 +%patch11 -p1 pushd unix/xserver patch -p1 < ../xserver116.patch ++++++ u_terminate_instead_of_ignoring_restart.patch ++++++ Author: Michal Srb <[email protected]> Subject: Terminate instead of ignoring reset Patch-Mainline: To be upstreamed References: bnc#920969 Index: tigervnc-1.3.0/unix/xserver/hw/vnc/xvnc.cc =================================================================== --- tigervnc-1.3.0.orig/unix/xserver/hw/vnc/xvnc.cc +++ tigervnc-1.3.0/unix/xserver/hw/vnc/xvnc.cc @@ -1607,7 +1607,12 @@ vfbScreenInit(ScreenPtr pScreen, int arg static void vfbClientStateChange(CallbackListPtr*, void *, void *) { - dispatchException &= ~DE_RESET; + if (dispatchException & DE_RESET) { + ErrorF("Warning: VNC extension does not support -reset, terminating instead. Use -noreset to prevent termination.\n"); + + dispatchException |= DE_TERMINATE; + dispatchException &= ~DE_RESET; + } } #if XORG >= 113
