head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.10 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.8 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.6 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.4 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.2 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q1:1.7.0.6 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.4 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.2 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.5.0.6 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.4 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.2 pkgsrc-2008Q1:1.4.0.6 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.4 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.2 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.3.0.4 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.2 pkgsrc-2007Q1-base:1.3; locks; strict; comment @# @; 1.8 date 2009.06.07.11.23.47; author wiz; state dead; branches; next 1.7; 1.7 date 2008.09.23.11.23.56; author joerg; state Exp; branches; next 1.6; 1.6 date 2008.09.18.20.56.01; author bjs; state dead; branches; next 1.5; 1.5 date 2008.06.20.13.34.40; author joerg; state Exp; branches; next 1.4; 1.4 date 2007.08.05.23.30.21; author joerg; state dead; branches 1.4.6.1; next 1.3; 1.3 date 2007.02.26.17.51.16; author drochner; state Exp; branches; next 1.2; 1.2 date 2007.01.24.13.34.40; author joerg; state dead; branches; next 1.1; 1.1 date 2007.01.14.11.06.02; author joerg; state Exp; branches; next ; 1.4.6.1 date 2008.06.25.10.20.58; author tron; state Exp; branches; next ; desc @@ 1.8 log @Update to 1.6.1.901, first 1.6.2 prerelease. Lots of changes since last pkgsrc version 1.4.x. Based on patches provided by Hasso Tepper on pkgsrc-users. Enable dri by default. NOTE: You must install new versions of all dependencies, old ones won't work! @ text @$NetBSD: patch-ae,v 1.7 2008/09/23 11:23:56 joerg Exp $ --- hw/xfree86/modes/Makefile.in.orig 2008-09-23 13:06:26.000000000 +0200 +++ hw/xfree86/modes/Makefile.in @@@@ -56,7 +56,7 @@@@ ARFLAGS = cru libxf86modes_a_AR = $(AR) $(ARFLAGS) libxf86modes_a_LIBADD = am_libxf86modes_a_OBJECTS = xf86Crtc.$(OBJEXT) xf86Cursors.$(OBJEXT) \ - xf86cvt.$(OBJEXT) xf86DiDGA.$(OBJEXT) xf86EdidModes.$(OBJEXT) \ + xf86cvt.$(OBJEXT) xf86gtf.${OBJEXT} xf86DiDGA.$(OBJEXT) xf86EdidModes.$(OBJEXT) \ xf86Modes.$(OBJEXT) xf86RandR12.$(OBJEXT) xf86Rotate.$(OBJEXT) libxf86modes_a_OBJECTS = $(am_libxf86modes_a_OBJECTS) DEFAULT_INCLUDES = -I.@@am__isrc@@ -I$(top_builddir)/include @@@@ -379,6 +379,7 @@@@ libxf86modes_a_SOURCES = \ xf86Crtc.h \ xf86Cursors.c \ xf86cvt.c \ + xf86gtf.c \ xf86DiDGA.c \ xf86EdidModes.c \ xf86Modes.c \ @ 1.7 log @Add one small patch and drop the autoconf dependency. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 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-ae,v 1.5 2008/06/20 13:34:40 joerg Exp $ d3 19 a21 61 CVE-2008-1377 --- record/record.c.orig 2006-09-18 08:04:18.000000000 +0200 +++ record/record.c @@@@ -2656,7 +2656,7 @@@@ SProcRecordQueryVersion(ClientPtr client } /* SProcRecordQueryVersion */ -static void +static int SwapCreateRegister(xRecordRegisterClientsReq *stuff) { register char n; @@@@ -2667,11 +2667,17 @@@@ SwapCreateRegister(xRecordRegisterClient swapl(&stuff->nClients, n); swapl(&stuff->nRanges, n); pClientID = (XID *)&stuff[1]; + if (stuff->nClients > stuff->length - (sz_xRecordRegisterClientsReq >> 2)) + return BadLength; for (i = 0; i < stuff->nClients; i++, pClientID++) { swapl(pClientID, n); } + if (stuff->nRanges > stuff->length - (sz_xRecordRegisterClientsReq >> 2) + - stuff->nClients) + return BadLength; RecordSwapRanges((xRecordRange *)pClientID, stuff->nRanges); + return Success; } /* SwapCreateRegister */ @@@@ -2679,11 +2685,13 @@@@ static int SProcRecordCreateContext(ClientPtr client) { REQUEST(xRecordCreateContextReq); + int status; register char n; swaps(&stuff->length, n); REQUEST_AT_LEAST_SIZE(xRecordCreateContextReq); - SwapCreateRegister((pointer)stuff); + if ((status = SwapCreateRegister((pointer)stuff)) != Success) + return status; return ProcRecordCreateContext(client); } /* SProcRecordCreateContext */ @@@@ -2692,11 +2700,13 @@@@ static int SProcRecordRegisterClients(ClientPtr client) { REQUEST(xRecordRegisterClientsReq); + int status; register char n; swaps(&stuff->length, n); REQUEST_AT_LEAST_SIZE(xRecordRegisterClientsReq); - SwapCreateRegister((pointer)stuff); + if ((status = SwapCreateRegister((pointer)stuff)) != Success) + return status; return ProcRecordRegisterClients(client); } /* SProcRecordRegisterClients */ @ 1.5 log @modular-xorg-server-1.3.0.0nb9: Fix CVE-2008-1377, CVE-2008-1379, CVE-2008-2360, CVE-2008-2361 and CVE-2008-2362 based on upstream patches. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update to modular xorg-server 1.3.0: - RandR 1.2 support in the server (drivers must support it as well) - many bug fixes, improvements for AIGLX and EXA etc pp @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2007/02/26 17:51:16 drochner Exp $ d3 61 a63 13 --- randr/randr.c.orig 2007-02-26 18:21:23.000000000 +0100 +++ randr/randr.c @@@@ -472,8 +472,8 @@@@ ProcRRQueryVersion (ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - rep.majorVersion = RANDR_MAJOR; - rep.minorVersion = RANDR_MINOR; + rep.majorVersion = 1; + rep.minorVersion = 1; if (client->swapped) { swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); @ 1.4.6.1 log @Pullup ticket #2433 - requested by joerg Security patch for modular-xorg-server Revisions pulled up: - x11/modular-xorg-server/Makefile 1.30 via patch - x11/modular-xorg-server/distinfo 1.21 - x11/modular-xorg-server/patches/patch-ac 1.3 - x11/modular-xorg-server/patches/patch-ae 1.5 - x11/modular-xorg-server/patches/patch-da delete - x11/modular-xorg-server/patches/patch-ed 1.2 - x11/modular-xorg-server/patches/patch-ef 1.2 --- Module Name: pkgsrc Committed By: joerg Date: Fri Jun 20 13:34:40 UTC 2008 Modified Files: pkgsrc/x11/modular-xorg-server: Makefile distinfo pkgsrc/x11/modular-xorg-server/patches: patch-ed patch-ef Added Files: pkgsrc/x11/modular-xorg-server/patches: patch-ac patch-ae Removed Files: pkgsrc/x11/modular-xorg-server/patches: patch-da Log Message: modular-xorg-server-1.3.0.0nb9: Fix CVE-2008-1377, CVE-2008-1379, CVE-2008-2360, CVE-2008-2361 and CVE-2008-2362 based on upstream patches. @ text @d1 1 a1 1 $NetBSD$ d3 13 a15 61 CVE-2008-1377 --- record/record.c.orig 2006-09-18 08:04:18.000000000 +0200 +++ record/record.c @@@@ -2656,7 +2656,7 @@@@ SProcRecordQueryVersion(ClientPtr client } /* SProcRecordQueryVersion */ -static void +static int SwapCreateRegister(xRecordRegisterClientsReq *stuff) { register char n; @@@@ -2667,11 +2667,17 @@@@ SwapCreateRegister(xRecordRegisterClient swapl(&stuff->nClients, n); swapl(&stuff->nRanges, n); pClientID = (XID *)&stuff[1]; + if (stuff->nClients > stuff->length - (sz_xRecordRegisterClientsReq >> 2)) + return BadLength; for (i = 0; i < stuff->nClients; i++, pClientID++) { swapl(pClientID, n); } + if (stuff->nRanges > stuff->length - (sz_xRecordRegisterClientsReq >> 2) + - stuff->nClients) + return BadLength; RecordSwapRanges((xRecordRange *)pClientID, stuff->nRanges); + return Success; } /* SwapCreateRegister */ @@@@ -2679,11 +2685,13 @@@@ static int SProcRecordCreateContext(ClientPtr client) { REQUEST(xRecordCreateContextReq); + int status; register char n; swaps(&stuff->length, n); REQUEST_AT_LEAST_SIZE(xRecordCreateContextReq); - SwapCreateRegister((pointer)stuff); + if ((status = SwapCreateRegister((pointer)stuff)) != Success) + return status; return ProcRecordCreateContext(client); } /* SProcRecordCreateContext */ @@@@ -2692,11 +2700,13 @@@@ static int SProcRecordRegisterClients(ClientPtr client) { REQUEST(xRecordRegisterClientsReq); + int status; register char n; swaps(&stuff->length, n); REQUEST_AT_LEAST_SIZE(xRecordRegisterClientsReq); - SwapCreateRegister((pointer)stuff); + if ((status = SwapCreateRegister((pointer)stuff)) != Success) + return status; return ProcRecordRegisterClients(client); } /* SProcRecordRegisterClients */ @ 1.3 log @-don't use the Xrandr version from randrproto for RRQueryVersion but hardwire it to 1.1, otherwise we announce more than we can support -add a "glx" option to build the "glx" extension -- this is work in progress (might need sone CFLAGS, see pkgsrc-wip) -bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update to the modualar Xorg server to 1.2.0. Too many bugfixes and other improvements to list here. Hard to find the details as the accumulated ChangeLog is gone. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2007/01/14 11:06:02 joerg Exp $ d3 13 a15 42 --- hw/xfree86/os-support/drm/xf86drm.c.orig 2007-01-14 11:59:30.000000000 +0100 +++ hw/xfree86/os-support/drm/xf86drm.c @@@@ -141,12 +141,6 @@@@ drmMsg(const char *format, ...) static void *drmHashTable = NULL; /* Context switch callbacks */ -typedef struct drmHashEntry { - int fd; - void (*f)(int, void *, void *); - void *tagTable; -} drmHashEntry; - void *drmMalloc(int size) { void *pt; @@@@ -181,26 +175,6 @@@@ static unsigned long drmGetKeyFromFd(int return st.st_rdev; } -static drmHashEntry *drmGetEntry(int fd) -{ - unsigned long key = drmGetKeyFromFd(fd); - void *value; - drmHashEntry *entry; - - if (!drmHashTable) drmHashTable = drmHashCreate(); - - if (drmHashLookup(drmHashTable, key, &value)) { - entry = drmMalloc(sizeof(*entry)); - entry->fd = fd; - entry->f = NULL; - entry->tagTable = drmHashCreate(); - drmHashInsert(drmHashTable, key, entry); - } else { - entry = value; - } - return entry; -} - /** * Compare two busid strings * @ 1.1 log @Fix build with libdrm-2.3.0. @ text @d1 1 a1 1 $NetBSD$ @