pool/tigervnc
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 293987 from X11:XOrg

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/293987
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger 2015-04-07 07:28:28 +00:00 committed by Git OBS Bridge
commit 994952e544
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tigervnc.changes
View File

@ -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

4
tigervnc.spec
View File

@ -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

23
u_terminate_instead_of_ignoring_restart.patch Normal file
View File

@ -0,0 +1,23 @@
Author: Michal Srb <msrb@suse.com>
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