rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=9

Browse Source
This commit is contained in:
OBS User unknown 2007-01-24 01:22:19 +00:00 committed by Git OBS Bridge
parent 758c43a790
commit 4f4e76f308
8 changed files with 105 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mesa-6.5.2.diff
View File

@ -1,10 +0,0 @@
--- GL/mesa/main/Makefile.am.orig 2006-12-03 03:20:15.697973056 +0100
+++ GL/mesa/main/Makefile.am 2006-12-03 03:20:35.293300149 +0100
@@ -60,6 +60,7 @@
light.c \
lines.c \
matrix.c \
+ mipmap.c \
mm.c \
occlude.c \
pixel.c \

183
cve-2006-6101_6102_6103.diff
View File

@ -1,183 +0,0 @@
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 5b43dd1..6a2ed6a 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -42,6 +42,11 @@
#include <dix-config.h>
#endif
+#if HAVE_STDINT_H
+#include <stdint.h>
+#elif !defined(UINT32_MAX)
+#define UINT32_MAX 0xffffffffU
+#endif
#include <X11/X.h>
#include <X11/Xproto.h>
#include "scrnintstr.h"
@@ -713,11 +718,14 @@ ProcDbeSwapBuffers(ClientPtr client)
return(Success);
}
+ if (nStuff > UINT32_MAX / sizeof(DbeSwapInfoRec))
+ return BadAlloc;
+
/* Get to the swap info appended to the end of the request. */
dbeSwapInfo = (xDbeSwapInfo *)&stuff[1];
/* Allocate array to record swap information. */
- swapInfo = (DbeSwapInfoPtr)ALLOCATE_LOCAL(nStuff * sizeof(DbeSwapInfoRec));
+ swapInfo = (DbeSwapInfoPtr)Xalloc(nStuff * sizeof(DbeSwapInfoRec));
if (swapInfo == NULL)
{
return(BadAlloc);
@@ -732,14 +740,14 @@ ProcDbeSwapBuffers(ClientPtr client)
if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client,
SecurityWriteAccess)))
{
- DEALLOCATE_LOCAL(swapInfo);
+ Xfree(swapInfo);
return(BadWindow);
}
/* Each window must be double-buffered - BadMatch. */
if (DBE_WINDOW_PRIV(pWin) == NULL)
{
- DEALLOCATE_LOCAL(swapInfo);
+ Xfree(swapInfo);
return(BadMatch);
}
@@ -748,7 +756,7 @@ ProcDbeSwapBuffers(ClientPtr client)
{
if (dbeSwapInfo[i].window == dbeSwapInfo[j].window)
{
- DEALLOCATE_LOCAL(swapInfo);
+ Xfree(swapInfo);
return(BadMatch);
}
}
@@ -759,7 +767,7 @@ ProcDbeSwapBuffers(ClientPtr client)
(dbeSwapInfo[i].swapAction != XdbeUntouched ) &&
(dbeSwapInfo[i].swapAction != XdbeCopied ))
{
- DEALLOCATE_LOCAL(swapInfo);
+ Xfree(swapInfo);
return(BadValue);
}
@@ -789,12 +797,12 @@ ProcDbeSwapBuffers(ClientPtr client)
error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff, swapInfo);
if (error != Success)
{
- DEALLOCATE_LOCAL(swapInfo);
+ Xfree(swapInfo);
return(error);
}
}
- DEALLOCATE_LOCAL(swapInfo);
+ Xfree(swapInfo);
return(Success);
} /* ProcDbeSwapBuffers() */
@@ -876,10 +884,12 @@ ProcDbeGetVisualInfo(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xDbeGetVisualInfoReq);
+ if (stuff->n > UINT32_MAX / sizeof(DrawablePtr))
+ return BadAlloc;
/* Make sure any specified drawables are valid. */
if (stuff->n != 0)
{
- if (!(pDrawables = (DrawablePtr *)ALLOCATE_LOCAL(stuff->n *
+ if (!(pDrawables = (DrawablePtr *)Xalloc(stuff->n *
sizeof(DrawablePtr))))
{
return(BadAlloc);
@@ -892,7 +902,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable(
drawables[i], client, SecurityReadAccess)))
{
- DEALLOCATE_LOCAL(pDrawables);
+ Xfree(pDrawables);
return(BadDrawable);
}
}
@@ -904,7 +914,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
{
if (pDrawables)
{
- DEALLOCATE_LOCAL(pDrawables);
+ Xfree(pDrawables);
}
return(BadAlloc);
@@ -931,7 +941,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
/* Free pDrawables if we needed to allocate it above. */
if (pDrawables)
{
- DEALLOCATE_LOCAL(pDrawables);
+ Xfree(pDrawables);
}
return(BadAlloc);
@@ -1012,7 +1022,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
if (pDrawables)
{
- DEALLOCATE_LOCAL(pDrawables);
+ Xfree(pDrawables);
}
return(client->noClientException);
diff --git a/render/render.c b/render/render.c
index e4d8d6b..55f360a 100644
--- a/render/render.c
+++ b/render/render.c
@@ -47,6 +47,12 @@
#include <X11/Xfuncproto.h>
#include "cursorstr.h"
+#if HAVE_STDINT_H
+#include <stdint.h>
+#elif !defined(UINT32_MAX)
+#define UINT32_MAX 0xffffffffU
+#endif
+
static int ProcRenderQueryVersion (ClientPtr pClient);
static int ProcRenderQueryPictFormats (ClientPtr pClient);
static int ProcRenderQueryPictIndexValues (ClientPtr pClient);
@@ -1103,11 +1109,14 @@ ProcRenderAddGlyphs (ClientPtr client)
}
nglyphs = stuff->nglyphs;
+ if (nglyphs > UINT32_MAX / sizeof(GlyphNewRec))
+ return BadAlloc;
+
if (nglyphs <= NLOCALGLYPH)
glyphsBase = glyphsLocal;
else
{
- glyphsBase = (GlyphNewPtr) ALLOCATE_LOCAL (nglyphs * sizeof (GlyphNewRec));
+ glyphsBase = (GlyphNewPtr) Xalloc (nglyphs * sizeof (GlyphNewRec));
if (!glyphsBase)
return BadAlloc;
}
@@ -1164,7 +1173,7 @@ ProcRenderAddGlyphs (ClientPtr client)
}
if (glyphsBase != glyphsLocal)
- DEALLOCATE_LOCAL (glyphsBase);
+ Xfree (glyphsBase);
return client->noClientException;
bail:
while (glyphs != glyphsBase)
@@ -1173,7 +1182,7 @@ bail:
xfree (glyphs->glyph);
}
if (glyphsBase != glyphsLocal)
- DEALLOCATE_LOCAL (glyphsBase);
+ Xfree (glyphsBase);
return err;
}

40
int10-fix.diff
View File

@ -1,40 +0,0 @@
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed, 13 Dec 2006 12:13:11 +0000 (+0000)
Subject: Set Int10Current->Tag for the linux native int10 module
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=b88ad820fac81d0dfd557a384bf0406e8893e7af
Set Int10Current->Tag for the linux native int10 module
Fixes bug #9296
(cherry picked from 731952c561a3972d09d1315f4fd31466e459ccb9 commit)
---
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -98,7 +98,7 @@ xf86ExtendedInitInt10(int entityIndex, i
base = INTPriv(pInt)->base = xnfalloc(SYS_BIOS);
pvp = xf86GetPciInfoForEntity(entityIndex);
- if (pvp) pInt->Tag = ((pciConfigPtr)(pvp->thisCard))->tag;
+ if (pvp) pInt->Tag = pciTag(pvp->bus, pvp->device, pvp->func);
/*
* we need to map video RAM MMIO as some chipsets map mmio
--- a/hw/xfree86/os-support/linux/int10/linux.c
+++ b/hw/xfree86/os-support/linux/int10/linux.c
@@ -90,6 +90,7 @@ xf86ExtendedInitInt10(int entityIndex, i
legacyVGARec vga;
xf86int10BiosLocation bios;
Bool videoBiosMapped = FALSE;
+ pciVideoPtr pvp;
if (int10Generation != serverGeneration) {
counter = 0;
@@ -151,6 +152,8 @@ xf86ExtendedInitInt10(int entityIndex, i
pInt = (xf86Int10InfoPtr)xnfcalloc(1, sizeof(xf86Int10InfoRec));
pInt->scrnIndex = screen;
pInt->entityIndex = entityIndex;
+ pvp = xf86GetPciInfoForEntity(entityIndex);
+ if (pvp) pInt->Tag = pciTag(pvp->bus, pvp->device, pvp->func);
if (!xf86Int10ExecSetup(pInt))
goto error0;
pInt->mem = &linuxMem;

39
xorg-server-1.1.99.901-GetDrawableAttributes.patch
View File

@ -1,39 +0,0 @@
--- xorg-server-9999/GL/glx/indirect_table.c.orig 2006-10-12 16:02:06.000000000 +0800
+++ xorg-server-9999/GL/glx/indirect_table.c 2006-10-12 16:15:35.000000000 +0800
@@ -1232,7 +1232,7 @@ const struct __glXDispatchInfo Render_di
/*****************************************************************/
/* tree depth = 13 */
-static const int_fast16_t VendorPriv_dispatch_tree[155] = {
+static const int_fast16_t VendorPriv_dispatch_tree[159] = {
/* [0] -> opcode range [0, 131072], node depth 1 */
2,
5,
@@ -1480,11 +1480,16 @@ static const int_fast16_t VendorPriv_dis
/* [152] -> opcode range [65536, 65552], node depth 13 */
1,
LEAF(88),
+ 156,
EMPTY_LEAF,
+ /* [156] -> opcode range [65544, 65552], node depth 13 */
+ 1,
+ LEAF(96),
+ EMPTY_LEAF,
};
-static const void *VendorPriv_function_table[96][2] = {
+static const void *VendorPriv_function_table[99][2] = {
/* [ 0] = 0 */ {NULL, NULL},
/* [ 1] = 1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT},
/* [ 2] = 2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT},
@@ -1581,6 +1586,9 @@ static const void *VendorPriv_function_t
/* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX},
/* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX},
/* [ 95] = 65543 */ {NULL, NULL},
+ /* [ 96] = 65544 */ {NULL, NULL},
+ /* [ 97] = 65545 */ {NULL, NULL},
+ /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX},
};
const struct __glXDispatchInfo VendorPriv_dispatch_info = {

3
xorg-server-1.1.99.903.tar.bz2
View File

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

3
xorg-server-1.2.0.tar.bz2 Normal file
View File

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

51
xorg-x11-server.changes
View File

@ -1,3 +1,54 @@
-------------------------------------------------------------------
Tue Jan 23 11:45:28 CET 2007 - sndirsch@suse.de
- xserver 1.2.0 release
* Bug #9219: Return BadMatch when trying to name the backing
pixmap of an unrealized window.
* Bug #9219: Use pWin->viewable instead of pWin->realized to
catch InputOnly windows too.
* Fix BSF and BSR instructions in the x86 emulator.
* Bug #9555: Always define _GNU_SOURCE in glibc environments.
* Bug #8991: Add glXGetDrawableAttributes dispatch; fix texture
format therein.
* Bump video and input ABI minors.
* Fix release date.
* Fix syntax error in configure check for SYSV_IPC that broke
with Sun cc
* Map missing keycodes for Sun Type 5 keyboard on Solaris SPARC
* Update pci.ids to 2006-12-06 from pciids.sf.net
* Xorg & Xserver man page updates for 1.2 release
* xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA"
* Xserver man page: remove bc, add -wr
* Update pci.ids to 2007-01-18 snapshot
* Update Xserver man page to match commit
ed33c7c98ad0c542e9e2dd6caa3f84879c21dd61
* Fix Tooltip from minimized clients
* Fix Xming fails to use xkb bug
* Fix bad commit
* Set Int10Current->Tag for the linux native int10 module
* added mipmap.c
* configure.ac: prepare for 1.2.0 (X11R7.2)
* sparc: don't include asm/kbio.h -- it no longer exists in
current headers.
* Minor typos in Xserver man page.
* Fix several cases where optimized paths were hit when they
shouldn't be.
* Try dlsym(RTLD_DEFAULT) first when finding symbols.
* Fix RENDER issues (bug #7555) and implement RENDER add/remove
screen
* For Xvfb, Xnest and Xprt, compile fbcmap.c with -DXFree86Server
* Multiple integer overflows in dbe and render extensions
* Require glproto >= 1.4.8 for GLX.
* __glXDRIscreenProbe: Use drmOpen/CloseOnce.
* xfree86/hurd: re-add missing keyboard support (bug #5613)
* remove last remaning 'linux'isms (bug #5613)
- obsoletes
* Mesa-6.5.2.diff
* xorg-server-1.1.99.901-GetDrawableAttributes.patch
* int10-fix.diff
* cve-2006-6101_6102_6103.diff
- disabled build of VNC server/module
-------------------------------------------------------------------
Wed Jan 17 20:21:04 CET 2007 - sndirsch@suse.de

62
xorg-x11-server.spec
View File

@ -11,9 +11,9 @@
# norootforbuild
Name: xorg-x11-server
%define dirsuffix 1.1.99.903
%define dirsuffix 1.2.0
%define fglrx_driver_hack 0
%define vnc 1
%define vnc 0
BuildRequires: Mesa-devel fontconfig-devel freetype2-devel ghostscript-library glitz-devel libdrm-devel pkgconfig xorg-x11 xorg-x11-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
%if %vnc
BuildRequires: libjpeg-devel
@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel
URL: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.2
Release: 44
Release: 45
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@ -72,11 +72,7 @@ Patch29: xephyr.diff
Patch30: p_ppc_domain_workaround.diff
Patch32: acpi_events.diff
Patch33: p_pci-off-by-one.diff
Patch34: Mesa-6.5.2.diff
Patch35: xorg-server-1.1.99.901-GetDrawableAttributes.patch
Patch36: libdrm.diff
Patch37: int10-fix.diff
Patch38: cve-2006-6101_6102_6103.diff
%if %vnc
Patch39: 0018-vnc-support.txt
Patch40: 0018-vnc-support.txt.diff
@ -167,11 +163,7 @@ popd
%patch30
%patch32 -p1
%patch33 -p0
%patch34 -p0
%patch35 -p1
%patch36 -p0
%patch37 -p1
%patch38 -p1
%if %vnc
%patch39 -p1
%patch40 -p0
@ -504,6 +496,54 @@ exit 0
%endif
%changelog -n xorg-x11-server
* Tue Jan 23 2007 - sndirsch@suse.de
- xserver 1.2.0 release
* Bug #9219: Return BadMatch when trying to name the backing
pixmap of an unrealized window.
* Bug #9219: Use pWin->viewable instead of pWin->realized to
catch InputOnly windows too.
* Fix BSF and BSR instructions in the x86 emulator.
* Bug #9555: Always define _GNU_SOURCE in glibc environments.
* Bug #8991: Add glXGetDrawableAttributes dispatch; fix texture
format therein.
* Bump video and input ABI minors.
* Fix release date.
* Fix syntax error in configure check for SYSV_IPC that broke
with Sun cc
* Map missing keycodes for Sun Type 5 keyboard on Solaris SPARC
* Update pci.ids to 2006-12-06 from pciids.sf.net
* Xorg & Xserver man page updates for 1.2 release
* xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA"
* Xserver man page: remove bc, add -wr
* Update pci.ids to 2007-01-18 snapshot
* Update Xserver man page to match commit
ed33c7c98ad0c542e9e2dd6caa3f84879c21dd61
* Fix Tooltip from minimized clients
* Fix Xming fails to use xkb bug
* Fix bad commit
* Set Int10Current->Tag for the linux native int10 module
* added mipmap.c
* configure.ac: prepare for 1.2.0 (X11R7.2)
* sparc: don't include asm/kbio.h -- it no longer exists in
current headers.
* Minor typos in Xserver man page.
* Fix several cases where optimized paths were hit when they
shouldn't be.
* Try dlsym(RTLD_DEFAULT) first when finding symbols.
* Fix RENDER issues (bug #7555) and implement RENDER add/remove
screen
* For Xvfb, Xnest and Xprt, compile fbcmap.c with -DXFree86Server
* Multiple integer overflows in dbe and render extensions
* Require glproto >= 1.4.8 for GLX.
* __glXDRIscreenProbe: Use drmOpen/CloseOnce.
* xfree86/hurd: re-add missing keyboard support (bug #5613)
* remove last remaning 'linux'isms (bug #5613)
- obsoletes
* Mesa-6.5.2.diff
* xorg-server-1.1.99.901-GetDrawableAttributes.patch
* int10-fix.diff
* cve-2006-6101_6102_6103.diff
- disabled build of VNC server/module
* Wed Jan 17 2007 - sndirsch@suse.de
- bug-211314_mesa-context.diff:
* fixes Xserver crash in software rendering fallback (Bug #211314)