diff --git a/xorg-server-xf4vnc-cutpaste.diff b/xorg-server-xf4vnc-cutpaste.diff new file mode 100644 index 0000000..b80b63f --- /dev/null +++ b/xorg-server-xf4vnc-cutpaste.diff @@ -0,0 +1,11 @@ +--- hw/vnc/cutpaste.c ++++ hw/vnc/cutpaste.c +@@ -58,7 +58,7 @@ rfbSetXCutText(char *str, int len) + 8, PropModeReplace, len, + (pointer)str, TRUE); + +- if (dixLookupSelection(&pSel, XA_PRIMARY, serverClient, DixSetAttrAccess)) { ++ if (dixLookupSelection(&pSel, XA_PRIMARY, serverClient, DixSetAttrAccess) == Success) { + xEvent event; + + if (pSel->client) { diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 027a6e0..cec98eb 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 6 17:24:40 CEST 2008 - schwab@suse.de + +- Fix crash in Xvnc when handling selections. + ------------------------------------------------------------------- Tue Aug 5 10:29:46 CEST 2008 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 10f5b1d..d87e4cb 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -29,7 +29,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 137 +Release: 139 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -76,6 +76,7 @@ Patch39: xorg-server-xf4vnc.patch Patch40: xorg-server-xf4vnc-disable-dmxvnc.diff Patch42: xorg-server-xf4vnc-TranslateNone.diff Patch43: xorg-server-xf4vnc-abi-version.diff +Patch44: xorg-server-xf4vnc-cutpaste.diff %endif Patch41: loadmod-bug197195.diff Patch45: bug-197858_dpms.diff @@ -188,6 +189,7 @@ popd %patch40 -p0 %patch42 -p1 %patch43 -p0 +%patch44 chmod 755 hw/vnc/symlink-vnc.sh %endif %patch41 -p1 @@ -532,6 +534,8 @@ exit 0 %endif %changelog +* Wed Aug 06 2008 schwab@suse.de +- Fix crash in Xvnc when handling selections. * Tue Aug 05 2008 sndirsch@suse.de - enabled build of record extension, which has been disabled upstream for whatever reason