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

Accepting request 330790 from home:michalsrb:branches:X11:XOrg

Browse Source 
- U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
  * Fixes Xvnc with -inetd parameter. (bnc#945600)

OBS-URL: https://build.opensuse.org/request/show/330790
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=70
This commit is contained in:
Michal Srb 2015-09-13 16:14:36 +00:00 committed by Git OBS Bridge
parent 533526172c
commit a64783e77b
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch Normal file
View File

@ -0,0 +1,23 @@
Subject: [PATCH] Fix reversed logic in vncIsTCPPortUsed()
Author: Pierre Ossman <ossman@cendio.se>
Patch-mainline: Upstream
Git-commit: 6bb08082956334711de44dad49b95f90a7b02700
Signed-off-by: Michal Srb <msrb@suse.com>
Patch by Jay Kulpinski. Prevents -inetd mode from automatically
finding a free X11 display number.
diff --git a/unix/xserver/hw/vnc/RFBGlue.cc b/unix/xserver/hw/vnc/RFBGlue.cc
index 09832ab..a150792 100644
--- a/unix/xserver/hw/vnc/RFBGlue.cc
+++ b/unix/xserver/hw/vnc/RFBGlue.cc
@@ -194,7 +194,7 @@ int vncIsTCPPortUsed(int port)
std::list<network::TcpListener> dummy;
network::createTcpListeners (&dummy, 0, port);
} catch (rdr::Exception& e) {
- return 0;
+ return 1;
}
- return 1;
+ return 0;
}

6
tigervnc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Sep 13 14:57:35 UTC 2015 - msrb@suse.com
- U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
* Fixes Xvnc with -inetd parameter. (bnc#945600)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 27 14:14:46 UTC 2015 - hguo@suse.com Thu Aug 27 14:14:46 UTC 2015 - hguo@suse.com

2
tigervnc.spec
View File

@ -118,6 +118,7 @@ Patch8: u_tigervnc-use-default-trust-manager-in-java-viewer-if-custom.pa
Patch9: u_tigervnc-display-SHA-1-fingerprint-of-untrusted-certificate.patch Patch9: u_tigervnc-display-SHA-1-fingerprint-of-untrusted-certificate.patch
Patch10: u_tigervnc-add-autoaccept-parameter.patch Patch10: u_tigervnc-add-autoaccept-parameter.patch
Patch11: N_tigervnc_revert_fltk_1_3_3_requirements.patch Patch11: N_tigervnc_revert_fltk_1_3_3_requirements.patch
Patch12: U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
%description %description
TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing),
@ -159,6 +160,7 @@ cp -r /usr/src/xserver/* unix/xserver/
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1
pushd unix/xserver pushd unix/xserver
patch -p1 < ../xserver117.patch patch -p1 < ../xserver117.patch