diff --git a/xorg-server-xf4vnc-clientTimeout.diff b/xorg-server-xf4vnc-clientTimeout.diff new file mode 100644 index 0000000..167e28f --- /dev/null +++ b/xorg-server-xf4vnc-clientTimeout.diff @@ -0,0 +1,15 @@ +--- a/hw/vnc/sockets.c 2008-12-11 20:30:21.000000000 +0100 ++++ b/hw/vnc/sockets.c 2008-12-17 14:09:17.539288000 +0100 +@@ -490,8 +490,10 @@ + n = select(sock+1, NULL, &fds, NULL, &tv); + #if 1 + if (n < 0) { +- rfbLogPerror("WriteExact: select"); +- return n; ++ if (errno != EINTR) { ++ rfbLogPerror("WriteExact: select"); ++ return n; ++ } + } + if (n == 0) { + totalTimeWaited += 5000; diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index c5b46a6..1daa6ab 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 20 02:53:00 CET 2008 - sndirsch@suse.de + +- xorg-server-xf4vnc-clientTimeout.diff + * fixes vnc client timeout handling (bnc #441935) + ------------------------------------------------------------------- Fri Nov 28 03:56:16 CET 2008 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 191edb1..e7c2f22 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-server (Version 7.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 17 +Release: 18 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -77,6 +77,7 @@ Patch42: xorg-server-xf4vnc-TranslateNone.diff Patch43: xorg-server-xf4vnc-abi-version.diff Patch44: xorg-server-xf4vnc-cutpaste.diff Patch46: xorg-server-xf4vnc-busyloop.diff +Patch47: xorg-server-xf4vnc-clientTimeout.diff %endif Patch41: loadmod-bug197195.diff Patch45: bug-197858_dpms.diff @@ -192,6 +193,7 @@ popd %patch43 -p0 %patch44 %patch46 -p1 +%patch47 -p1 chmod 755 hw/vnc/symlink-vnc.sh %endif %patch41 -p1 @@ -546,6 +548,9 @@ exit 0 %endif %changelog +* Sat Dec 20 2008 sndirsch@suse.de +- xorg-server-xf4vnc-clientTimeout.diff + * fixes vnc client timeout handling (bnc #441935) * Fri Nov 28 2008 sndirsch@suse.de - dpms_screensaver.diff * DMPS calls dixSaveScreens() when turned on but not when turned