From 9be9eac2e1790239550c627c3c692f34cbfbfd4352cdd83ec4c6bbd2b763eb82 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 1 Apr 2015 13:28:16 +0000 Subject: [PATCH] Accepting request 293986 from home:michalsrb:branches:X11:XOrg - u_terminate_instead_of_ignoring_restart.patch * Terminate instead of ignoring restart. (bnc#920969) OBS-URL: https://build.opensuse.org/request/show/293986 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=51 --- tigervnc.changes | 6 +++++ tigervnc.spec | 4 +++- u_terminate_instead_of_ignoring_restart.patch | 23 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 u_terminate_instead_of_ignoring_restart.patch diff --git a/tigervnc.changes b/tigervnc.changes index 741744c..3061ab5 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 1 12:44:09 UTC 2015 - msrb@suse.com + +- u_terminate_instead_of_ignoring_restart.patch + * Terminate instead of ignoring restart. (bnc#920969) + ------------------------------------------------------------------- Tue Feb 24 13:00:22 UTC 2015 - msrb@suse.com diff --git a/tigervnc.spec b/tigervnc.spec index 84a9ee7..f3d3b28 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -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 @@ Patch7: U_include-vencrypt-only-if-any-subtype-present.patch 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 @@ cp -r /usr/src/xserver/* unix/xserver/ %patch8 -p0 %patch9 -p1 %patch10 -p1 +%patch11 -p1 pushd unix/xserver patch -p1 < ../xserver116.patch diff --git a/u_terminate_instead_of_ignoring_restart.patch b/u_terminate_instead_of_ignoring_restart.patch new file mode 100644 index 0000000..d15e0db --- /dev/null +++ b/u_terminate_instead_of_ignoring_restart.patch @@ -0,0 +1,23 @@ +Author: Michal Srb +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