rpm/tigervnc
SHA256
1
0
Fork 0
forked from pool/tigervnc
Code Pull Requests Activity

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

Browse Source 
- u_tigervnc-vncserver-clean-pid-files.patch
  * vncserver: Clean pid files of dead processes. (bnc#948392)

OBS-URL: https://build.opensuse.org/request/show/335639
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=72
This commit is contained in:
Michal Srb 2015-10-01 23:32:55 +00:00 committed by Git OBS Bridge
parent a64783e77b
commit c4c5a22bfb
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tigervnc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Oct 1 23:16:52 UTC 2015 - msrb@suse.com
- u_tigervnc-vncserver-clean-pid-files.patch
* vncserver: Clean pid files of dead processes. (bnc#948392)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 13 14:57:35 UTC 2015 - msrb@suse.com Sun Sep 13 14:57:35 UTC 2015 - msrb@suse.com

2
tigervnc.spec
View File

@ -119,6 +119,7 @@ Patch9: u_tigervnc-display-SHA-1-fingerprint-of-untrusted-certificate.pa
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 Patch12: U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
Patch13: u_tigervnc-vncserver-clean-pid-files.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),
@ -161,6 +162,7 @@ cp -r /usr/src/xserver/* unix/xserver/
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1
pushd unix/xserver pushd unix/xserver
patch -p1 < ../xserver117.patch patch -p1 < ../xserver117.patch

30
u_tigervnc-vncserver-clean-pid-files.patch Normal file
View File

@ -0,0 +1,30 @@
Author: Egbert Eich <eich@suse.com>
Subject: Clean pid files of dead processes.
Patch-Mainline: To be upstreamed
References: bnc#948392
Signed-off-by: Michal Srb <msrb@suse.com>
--- a/unix/vncserver 2015-05-19 18:01:12.000000000 +0200
+++ b/unix/vncserver 2015-10-01 15:52:50.920363305 +0200
@@ -302,6 +302,7 @@
}
unless (kill 0, `cat $pidFile`) {
warn "Could not start Xvnc.\n\n";
+ unlink $pidFile;
open(LOG, "<$desktopLog");
while (<LOG>) { print; }
close(LOG);
@@ -587,7 +588,12 @@
print "X DISPLAY #\tPROCESS ID\n";
foreach my $file (@filelist) {
if ($file =~ /$host:(\d+)$\.pid/) {
- print ":".$1."\t\t".`cat $vncUserDir/$file`;
+ chop($tmp_pid = `cat $vncUserDir/$file`);
+ if (kill 0, $tmp_pid) {
+ print ":".$1."\t\t".`cat $vncUserDir/$file`;
+ } else {
+ unlink ($vncUserDir . "/" . $file);
+ }
}
}
exit 1;