From a64783e77b8ee9ee44825c551e09f89eab4ac2211d72fe4651b59110510fdeac Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Sun, 13 Sep 2015 16:14:36 +0000 Subject: [PATCH] Accepting request 330790 from home:michalsrb:branches:X11:XOrg - 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 --- ...x-reversed-logic-in-vncIsTCPPortUsed.patch | 23 +++++++++++++++++++ tigervnc.changes | 6 +++++ tigervnc.spec | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch diff --git a/U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch b/U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch new file mode 100644 index 0000000..5303cf3 --- /dev/null +++ b/U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch @@ -0,0 +1,23 @@ +Subject: [PATCH] Fix reversed logic in vncIsTCPPortUsed() +Author: Pierre Ossman +Patch-mainline: Upstream +Git-commit: 6bb08082956334711de44dad49b95f90a7b02700 +Signed-off-by: Michal Srb + +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 dummy; + network::createTcpListeners (&dummy, 0, port); + } catch (rdr::Exception& e) { +- return 0; ++ return 1; + } +- return 1; ++ return 0; + } diff --git a/tigervnc.changes b/tigervnc.changes index ec8aa23..cdd193f 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -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 diff --git a/tigervnc.spec b/tigervnc.spec index ba8f8fc..6db3965 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -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 Patch10: u_tigervnc-add-autoaccept-parameter.patch Patch11: N_tigervnc_revert_fltk_1_3_3_requirements.patch +Patch12: U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch %description 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 %patch10 -p1 %patch11 -p1 +%patch12 -p1 pushd unix/xserver patch -p1 < ../xserver117.patch