head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.10 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.8 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.6 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.4 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.2 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.3.0.4 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.2 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.2.0.4 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.2 pkgsrc-2008Q2-base:1.2; locks; strict; comment @# @; 1.5 date 2009.08.01.11.06.24; author hasso; state dead; branches; next 1.4; 1.4 date 2009.07.21.11.15.54; author drochner; state Exp; branches; next 1.3; 1.3 date 2008.09.18.20.56.01; author bjs; state dead; branches; next 1.2; 1.2 date 2008.07.13.20.41.46; author tonnerre; state Exp; branches; next 1.1; 1.1 date 2008.07.13.12.37.29; author tonnerre; state Exp; branches; next ; desc @@ 1.5 log @Update to 1.6.3. Changes in 1.6.3 since 1.6.2.901: Adam Jackson (1): selinux: Only activate if policy says to be an object manager Alan Coopersmith (2): Don't printf NULL pointers on HAL connection error Remove hardcoded gcc -Wall option from configure.ac Ben Skeggs (1): quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359) Keith Packard (1): Bump release number to 1.6.3 Rémi Cardona (1): config: add HAL error checks Changes in 1.6.2.901 since 1.6.2: Adam Jackson (1): xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675) Alan Coopersmith (1): Fix build of drivers with 1.6.2 when not using --install-libxf86config Benjamin Defnet (2): hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_major randr: fix operation order so that rotation+transform works Dave Airlie (1): xfree86: move didLock assignment down to where the function pointer is valid. Julien Cristau (1): randr: fix server crash in RRGetScreenInfo Keith Packard (2): Replace dixLookupResource by dixLookupResourceBy{Type,Class} Bump to version 1.6.2.901 (1.6.3 RC1) Kim Woelders (1): Fix key repeat problem. Matthias Hopf (1): randr: Nuke broken set_origin shortcut Michel Dänzer (1): EXA: Only pass CT_YXBANDED to RECTS_TO_REGION() if that is really true. Robert Noland (1): One = is more than adequate here. Make is sh safe. Rémi Cardona (1): configure: libXinerama isn't needed anymore @ text @$NetBSD: patch-an,v 1.4 2009/07/21 11:15:54 drochner Exp $ --- exa/exa_accel.c.orig 2009-07-07 19:48:58.000000000 +0200 +++ exa/exa_accel.c @@@@ -415,6 +415,7 @@@@ exaCopyNtoN (DrawablePtr pSrcDrawable if (rects) { int i; + int ordering; for (i = 0; i < nbox; i++) { rects[i].x = pbox[i].x1 + dx + src_off_x; @@@@ -423,7 +424,16 @@@@ exaCopyNtoN (DrawablePtr pSrcDrawable rects[i].height = pbox[i].y2 - pbox[i].y1; } - srcregion = RECTS_TO_REGION(pScreen, nbox, rects, CT_YXBANDED); + /* This must match the miRegionCopy() logic for reversing rect order */ + if (nbox == 1 || (dx > 0 && dy > 0) || + (pDstDrawable != pSrcDrawable && + (pDstDrawable->type != DRAWABLE_WINDOW || + pSrcDrawable->type != DRAWABLE_WINDOW))) + ordering = CT_YXBANDED; + else + ordering = CT_UNSORTED; + + srcregion = RECTS_TO_REGION(pScreen, nbox, rects, ordering); xfree(rects); if (!pGC || !exaGCReadsDestination(pDstDrawable, pGC->planemask, @ 1.4 log @add a patch from upstream to fix an assertion error with pixman-0.15.16 (see fdo bug #22642) bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Welcome to modular-xorg-server-1.4.2. This long-overdue update brings many improvements: - Many improvements to EXA - Input Hotplugging via HAL or dbus (not enabled yet) - Support for RandR 1.2. Users using a dual-head configuration are encouraged to see for more information. - The server now uses the same version of Mesa we have in pkgsrc; this likely will result in more reliable OpenGL/DRI operation. I realize that this server is still not the latest release (1.5.0); upgrading to that version will require an involved mesa update, libpciaccess, etc. I hope that by the next quarter, that work will be done. Please file a problem report and/or contact us via the usual means (mailing lists, etc.) should you encounter any issues. @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.2 2008/07/13 20:41:46 tonnerre Exp $ d3 26 a28 60 --- render/render.c.orig 2008-07-13 14:29:02.000000000 +0200 +++ render/render.c @@@@ -1917,6 +1917,8 @@@@ static int ProcRenderCreateLinearGradien LEGAL_NEW_RESOURCE(stuff->pid, client); len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq); + if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor))) + return BadLength; if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor))) return BadLength; @@@@ -2488,18 +2490,18 @@@@ SProcRenderCreateSolidFill(ClientPtr cli return (*ProcRenderVector[stuff->renderReqType]) (client); } -static void swapStops(void *stuff, int n) +static void swapStops(void *stuff, int num) { - int i; + int i, n; CARD32 *stops; CARD16 *colors; stops = (CARD32 *)(stuff); - for (i = 0; i < n; ++i) { + for (i = 0; i < num; ++i) { swapl(stops, n); ++stops; } colors = (CARD16 *)(stops); - for (i = 0; i < 4*n; ++i) { + for (i = 0; i < 4*num; ++i) { swaps(stops, n); ++stops; } @@@@ -2522,6 +2524,8 @@@@ SProcRenderCreateLinearGradient (ClientP swapl(&stuff->nStops, n); len = (client->req_len << 2) - sizeof(xRenderCreateLinearGradientReq); + if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor))) + return BadLength; if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor))) return BadLength; @@@@ -2549,6 +2553,8 @@@@ SProcRenderCreateRadialGradient (ClientP swapl(&stuff->nStops, n); len = (client->req_len << 2) - sizeof(xRenderCreateRadialGradientReq); + if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor))) + return BadLength; if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor))) return BadLength; @@@@ -2573,6 +2579,8 @@@@ SProcRenderCreateConicalGradient (Client swapl(&stuff->nStops, n); len = (client->req_len << 2) - sizeof(xRenderCreateConicalGradientReq); + if (stuff->nStops > UINT32_MAX/(sizeof(xFixed) + sizeof(xRenderColor))) + return BadLength; if (len != stuff->nStops*(sizeof(xFixed) + sizeof(xRenderColor))) return BadLength; d30 1 @ 1.2 log @modular-xorg-server patch-an has a broken path. @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.1 2008/07/13 12:37:29 tonnerre Exp $ @ 1.1 log @Add some patches for vulnerabilities in different X.Org server extensions (composite, render, record, etc). @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- work/xorg-server-1.3.0.0/render/render.c.orig 2008-07-13 14:29:02.000000000 +0200 +++ work/xorg-server-1.3.0.0/render/render.c @