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

- U_tigervnc-fix-inetd-not-working-with-xserver-1-19.patch

Browse Source 
* Fixes inetd mode with x server 1.19 (bnc#1025759)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=103
This commit is contained in:
Michal Srb 2017-02-20 17:45:48 +00:00 committed by Git OBS Bridge
parent 039ea87025
commit f9286f1e21
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
U_tigervnc-fix-inetd-not-working-with-xserver-1-19.patch Normal file
View File

@ -0,0 +1,42 @@
From 712cf8673d6e57442f41636e44020f5e1839c7f8 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 9 Jan 2017 16:03:30 +0100
Subject: [PATCH] Fix -inetd not working with xserver >= 1.19
xserver 1.19's OsInit will create a pollfd, followed by checking if fd 2 /
stderr is writable and if it is not, replacing fd 2 with /dev/null.
Since we close stderr in inetd mode to avoid xserver messages being send
to the client as vnc data, the pollfd becomes fd 2, only to be replaced
by /dev/null since a pollfd is not writable.
This commit fixes this by opening /dev/null directly after the close(2),
avoiding that the pollfd becomes fd 2.
Alan Coopersmith: Change to use dup2() for atomic switch of fd
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c
index c5b684d..ef30d69 100644
--- a/unix/xserver/hw/vnc/xvnc.c
+++ b/unix/xserver/hw/vnc/xvnc.c
@@ -572,9 +572,17 @@ ddxProcessArgument(int argc, char *argv[], int i)
if (strcmp(argv[i], "-inetd") == 0)
{
+ int nullfd;
+
dup2(0,3);
vncInetdSock = 3;
- close(2);
+
+ /* Avoid xserver >= 1.19's epoll-fd becoming fd 2 / stderr only to be
+ replaced by /dev/null by OsInit() because the pollfd is not
+ writable, breaking ospoll_wait(). */
+ nullfd = open("/dev/null", O_WRONLY);
+ dup2(nullfd, 2);
+ close(nullfd);
if (!displaySpecified) {
int port = vncGetSocketPort(vncInetdSock);

6
tigervnc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 20 17:43:56 UTC 2017 - msrb@suse.com
- U_tigervnc-fix-inetd-not-working-with-xserver-1-19.patch
* Fixes inetd mode with x server 1.19 (bnc#1025759)
-------------------------------------------------------------------
Wed Jan 25 14:52:21 UTC 2017 - msrb@suse.com

2
tigervnc.spec
View File

@ -120,6 +120,7 @@ Patch7: u_tigervnc_update_default_vncxstartup.patch
Patch8: u_build_libXvnc_as_separate_library.patch
Patch9: u_tigervnc-show-unencrypted-warning.patch
Patch10: U_Add-xorg-xserver-1.19-support.patch
Patch11: U_tigervnc-fix-inetd-not-working-with-xserver-1-19.patch
%description
TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing),
@ -179,6 +180,7 @@ cp -r /usr/src/xserver/* unix/xserver/
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
pushd unix/xserver
patch -p1 < ../xserver119.patch