Accepting request 50847 from X11:XOrg

checked in (request 50847)

OBS-URL: https://build.opensuse.org/request/show/50847
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=291
This commit is contained in:
OBS User autobuild 2010-10-16 10:25:22 +00:00 committed by Git OBS Bridge
parent a95beda750
commit 848c029a4a
5 changed files with 22 additions and 13 deletions

15
vbe-bufferoverflow.diff Normal file
View File

@ -0,0 +1,15 @@
--- xorg-server-1.9.0/hw/xfree86/vbe/vbe.c.orig 2010-08-23 15:55:52.000000000 +0000
+++ xorg-server-1.9.0/hw/xfree86/vbe/vbe.c 2010-08-23 15:56:40.000000000 +0000
@@ -586,10 +586,10 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode
memcpy(&block->Reserved2, ((char*)pVbe->memory) + 66, 188);
}
else
- memcpy(&block->LinBytesPerScanLine, ((char*)pVbe->memory) + 50, 206);
+ memcpy(&block->LinBytesPerScanLine, ((char*)pVbe->memory) + 50, 205);
}
else
- memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216);
+ memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 215);
return block;
}

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b503f6e7fffbd5012b9beb76421189da109c37a362052a262890a69eb5c773a3
size 5218976

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bbb48daf562f6b046b649a592490de86ea2d5c7608c792a8d6103ddf950d753a
size 5220109

View File

@ -1,11 +1,3 @@
-------------------------------------------------------------------
Fri Oct 15 18:59:14 UTC 2010 - sndirsch@novell.com
- xorg-server 1.9.0.902
* This release fixes an input regression introduced in 1.9.1 as
well as some additional memory management issues.
- obsoletes vbe-bufferoverflow.diff
-------------------------------------------------------------------
Fri Oct 15 12:15:50 UTC 2010 - coolo@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package xorg-x11-server (Version 7.5_1.9.0.902)
# spec file for package xorg-x11-server (Version 7.5_1.9.0.901)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -20,7 +20,7 @@
%define moblin 0
Name: xorg-x11-server
%define dirsuffix 1.9.0.902
%define dirsuffix 1.9.0.901
%define vnc 0
BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-fonts-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
### udev support (broken on openSUSE 11.2, see also bnc #589997)
@ -114,6 +114,7 @@ Patch211: 0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
Patch213: xorg-server-xdmcp.patch
Patch217: CVE-2010-2240-address_space_limit.patch
Patch218: CVE-2010-2240-tree_depth_limit.patch
Patch219: vbe-bufferoverflow.diff
Patch220: Use-external-tool-for-creating-backtraces-on-crashes.patch
%if %moblin
Patch300: moblin-use_preferred_mode_for_all_outputs.diff
@ -239,6 +240,7 @@ popd
%patch213 -p1
%patch217 -p1
%patch218 -p1
%patch219 -p1
%patch220 -p1
%if %moblin
%patch300 -p1