Hello community,
here is the log from the commit of package tigervnc for openSUSE:Factory
checked in at 2015-10-12 10:00:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tigervnc (Old)
and /work/SRC/openSUSE:Factory/.tigervnc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2015-09-24
06:12:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2015-10-12
10:00:30.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Oct 1 23:16:52 UTC 2015 - m...@suse.com
+
+- u_tigervnc-vncserver-clean-pid-files.patch
+ * vncserver: Clean pid files of dead processes. (bnc#948392)
+
+-------------------------------------------------------------------
New:
----
u_tigervnc-vncserver-clean-pid-files.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tigervnc.spec ++++++
--- /var/tmp/diff_new_pack.nIxL5W/_old 2015-10-12 10:00:31.000000000 +0200
+++ /var/tmp/diff_new_pack.nIxL5W/_new 2015-10-12 10:00:31.000000000 +0200
@@ -119,6 +119,7 @@
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
+Patch13: u_tigervnc-vncserver-clean-pid-files.patch
%description
TigerVNC is a high-performance, platform-neutral implementation of VNC
(Virtual Network Computing),
@@ -161,6 +162,7 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
pushd unix/xserver
patch -p1 < ../xserver117.patch
++++++ u_tigervnc-vncserver-clean-pid-files.patch ++++++
Author: Egbert Eich <e...@suse.com>
Subject: Clean pid files of dead processes.
Patch-Mainline: To be upstreamed
References: bnc#948392
Signed-off-by: Michal Srb <m...@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;
