head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.2 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.7.0.10 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.8 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.6 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.4 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.2 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.6.0.10 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.8 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.6 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.4 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.2 pkgsrc-2010Q4-base:1.6 pkgsrc-2009Q4:1.5.0.2 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q1:1.4.0.6 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.4 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.2 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.3.0.6 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.4 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.2 pkgsrc-2008Q1:1.2.0.10 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.8 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.6 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.1.1.0.2 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2013.05.16.05.38.31; author richard; state dead; branches; next 1.7; commitid B45ARZAzCLIBGOPw; 1.7 date 2012.03.13.14.13.52; author fhajny; state Exp; branches; next 1.6; 1.6 date 2010.10.31.23.43.08; author wiz; state Exp; branches; next 1.5; 1.5 date 2009.06.07.11.23.47; author wiz; state dead; branches; next 1.4; 1.4 date 2008.09.18.20.56.01; author bjs; state Exp; branches; next 1.3; 1.3 date 2008.06.20.13.34.40; author joerg; state Exp; branches; next 1.2; 1.2 date 2007.01.26.17.38.31; author joerg; state dead; branches 1.2.10.1; next 1.1; 1.1 date 2006.11.14.16.59.30; author joerg; state Exp; branches 1.1.1.1; next ; 1.2.10.1 date 2008.06.25.10.20.58; author tron; state Exp; branches; next ; 1.1.1.1 date 2006.11.14.16.59.30; author joerg; state Exp; branches; next ; desc @@ 1.8 log @xorg-server 1.12.4 is a maintenance release of the X.org X server. There are only a handful of changes in this dot release, and with the pending release of 1.13 next month, it's likely that this may be the final scheduled release from the 1.12 branch; we will likely put out additional releases from this branch, but they will no longer follow the standard 6-week development cycle. This version is identical to the previous release candidate except for version numbers. == Known Issues == Currently open bugs the 1.12 Tracker: https://bugs.freedesktop.org/show_bug.cgi?id=xserver-1.12 23938: keys occasionally get stuck with xorg-server 1.6.99.901 http://bugs.freedesktop.org/23938 31501: crash accessing font info with xfs in fontpath http://bugs.freedesktop.org/31501 39094: WaitFor does not handle EIO (causes 100% cpu load) http://bugs.freedesktop.org/39094 39383: X server crashes when restarting KDE from Alt+F2 http://bugs.freedesktop.org/39383 39949: RandR panning & scaling don't work http://bugs.freedesktop.org/39949 43988: crtc->desiredMode.name can point to freed memory. http://bugs.freedesktop.org/43988 44038: some 3D wine apps no longer work (bisected) http://bugs.freedesktop.org/44038 45445: Key press crashes the xserver when kdm is running http://bugs.freedesktop.org/45445 49170: crash when starting or after some time of using psi http://bugs.freedesktop.org/49170 50641: xorg-server-1.12.0 - When SELinux is enabled the xserver fails http://bugs.freedesktop.org/50641 == New Issues == If you encounter an issue that you think should block a future 1.12 release, please follow the instructions listed in the wiki to raise this to our attention. http://www.x.org/wiki/Server112Branch == Changes since 1.12.3 == Aaron Plattner (1): randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch Adam Jackson (3): ephyr: Fix up some bizarre formatting randr: Fix up yet another corner case in preferred mode selection sync: Fix logic error from b55bf248581dc66321b24b29f199f6dc8d02db1b Alan Coopersmith (10): OtherClientGone: Remove unreachable return statement Fix some overly indented/poorly line wrapped comments in dix/events.c Remove obsolete tab stop comments from hw/xfree86/parser/*.c ProcRRGetScreenInfo: swap configTimestamp as well xf86dga2.c & xf86vmode.c: Move REQUEST_SIZE_MATCH checks before using stuff Use calloc to zero fill buffers being allocated for replies & events Set padding bytes to 0 in WriteToClient Initialize padding bits to 0 in ErrorConnMax() Fix up formatting of initializers for arrays of structs Make indentation of dix/tables.c much more consistent and readable Daniel Stone (5): DRI2: Remove prototype for DRI2DestroyDrawable Don't make failure to -nolisten fatal Xorg: Link XKB DDX library after core server libs Xinerama: Fix ExtensionInit prototype AllocDevicePair: Ensure XKB privates are initialised Dave Airlie (2): xf86: cursor code got mangled by indenting kinput: allocate enough space for null character. Jaroslav Šmíd (1): Bug 51375: Xorg doesn't set status for RRGetOutputInfo Jeremy Huddleston (3): XQuartz: Silence an unused-variable warning XQuartz: Fix incorrect PseudoramiXExtensionInit prototype XQuartz: Call xp_window_bring_all_to_front if available in libXplugin Jeremy Huddleston Sequoia (7): XQuartz: Fix xp_window_bring_all_to_front linking on OS versions with older libXplugin configure.ac: Version bump to 1.12.3.901 (1.12.4 RC1) XQuartz: console_redirect: Set the correct location for reading into the buffer XQuartz: console_redirect: Properly zero-out the tail of the array on realloc() configure.ac: Version bump to 1.12.3.902 (1.12.4 RC2) XQuartz: Bump version to 2.7.3 configure.ac: Version bump to 1.12.4 Jon TURNEY (1): hw/xquartz: Various fixes for pseudoramiX.c Julien Cristau (1): Bump video ABI version to 12.1 Keith Packard (4): randr: Clean up compiler warnings about unused and shadowing variables randr: Catch two more potential unset rrScrPriv uses Add 'install-headers' target in the top-level Makefile Only free Render filter names on last screen close Michal Srb (1): Look for ModuleData only in appropriate library Michel Dänzer (2): dri2: Add DRI2CreateDrawable2. glx: Free DRI2 drawable reference to destroyed GLX drawable. Peter Hutterer (4): xkb: use local variable instead of casting arg dix: fix dereference before null check list.h: don't crash when removing an element from a NULL list dix: make sure the mask is set for emulated scroll events (#52508) Ricardo Salveti de Araujo (1): randr: first check pScrPriv before using the pointer at RRFirstOutput Simon Schubert (1): fb: reorder Bresenham error correction to avoid overshoot. Vic Lee (1): ephyr: Resize screen automatically when parent window is resized git tag: xorg-server-1.12.4 @ text @$NetBSD: patch-ac,v 1.7 2012/03/13 14:13:52 fhajny Exp $ Fix build on DragonFly after header moved. Do not set HAS_USL_VTS on any SunOS platform. --- hw/xfree86/os-support/xf86_OSlib.h.orig 2011-10-28 15:02:52.128328912 +0000 +++ hw/xfree86/os-support/xf86_OSlib.h @@@@ -140,7 +140,7 @@@@ # include /* MMAP driver header */ # endif -# if !defined(sun) || (!defined(sparc) && !defined(__SOL8__)) +# if !defined(sun) # define HAS_USL_VTS # endif # if !defined(sun) @@@@ -346,7 +346,7 @@@@ # include # endif /* WSCONS_SUPPORT */ # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -# if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013) +# if (defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)) || (defined(__DragonFly_version) && (__DragonFly_version >= 200900)) # include # else # undef MOUSE_GETINFO @ 1.7 log @Fix build on SunOS, allow x86_64 as an SunOS platform (if set so in pkgsrc). Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Fix build on DragonFly, from Antonio Huete Jimenez in PR 44015. @ text @d4 1 d6 11 a16 2 --- hw/xfree86/os-support/xf86_OSlib.h.orig 2010-10-30 02:24:29 +0200 +++ hw/xfree86/os-support/xf86_OSlib.h 2010-10-30 02:25:03 +0200 @ 1.5 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 @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2008/09/18 20:56:01 bjs Exp $ d3 13 a15 13 --- hw/xfree86/common/Makefile.am.orig 2008-08-02 04:52:04.000000000 -0400 +++ hw/xfree86/common/Makefile.am @@@@ -23,8 +23,8 @@@@ BUSSOURCES = xf86isaBus.c xf86pciBus.c x MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes -xf86DefModeSet.c: $(srcdir)/modeline2c.pl $(MODEDEFSOURCES) - cat $(MODEDEFSOURCES) | $(PERL) $(srcdir)/modeline2c.pl > $@@ +xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES) + cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@@ BUILT_SOURCES = xf86DefModeSet.c @ 1.4 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-ag,v 1.3 2007/08/14 21:34:37 joerg Exp $ @ 1.3 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$ d3 12 a14 7 CVE-2008-2360 --- render/glyph.c.orig 2006-09-18 08:04:18.000000000 +0200 +++ render/glyph.c @@@@ -42,6 +42,12 @@@@ #include "picturestr.h" #include "glyphstr.h" a15 24 +#if HAVE_STDINT_H +#include +#elif !defined(UINT32_MAX) +#define UINT32_MAX 0xffffffffU +#endif + /* * From Knuth -- a good choice for hash/rehash values is p, p-2 where * p and p-2 are both prime. These tables are sized to have an extra 10% @@@@ -626,8 +632,12 @@@@ AllocateGlyph (xGlyphInfo *gi, int fdept int size; GlyphPtr glyph; int i; - - size = gi->height * PixmapBytePad (gi->width, glyphDepths[fdepth]); + size_t padded_width; + + padded_width = PixmapBytePad (gi->width, glyphDepths[fdepth]); + if (gi->height && padded_width > (UINT32_MAX - sizeof(GlyphRec))/gi->height) + return 0; + size = gi->height * padded_width; glyph = (GlyphPtr) xalloc (size + sizeof (GlyphRec)); if (!glyph) return 0; @ 1.2 log @Remove patch-ac. Curse the developers who thought about expanding SYS_LIBS in configure and not the actual Makefiles. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2006/11/14 16:59:30 joerg Exp $ d3 7 a9 8 --- hw/xfree86/os-support/Makefile.in.orig 2006-11-06 21:29:12.000000000 +0000 +++ hw/xfree86/os-support/Makefile.in @@@@ -560,7 +560,7 @@@@ noinst_LTLIBRARIES = libxorgos.la libxorgos_la_SOURCES = xorgos.c libxorgos_la_LIBADD = @@XORG_OS_SUBDIR@@/lib@@XORG_OS_SUBDIR@@.la \ bus/libbus.la \ - misc/libmisc.la + misc/libmisc.la -li386 d11 24 a34 2 DISTCLEANFILES = xorgos.c all: all-recursive @ 1.2.10.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 8 a10 7 CVE-2008-2360 --- render/glyph.c.orig 2006-09-18 08:04:18.000000000 +0200 +++ render/glyph.c @@@@ -42,6 +42,12 @@@@ #include "picturestr.h" #include "glyphstr.h" d12 2 a13 24 +#if HAVE_STDINT_H +#include +#elif !defined(UINT32_MAX) +#define UINT32_MAX 0xffffffffU +#endif + /* * From Knuth -- a good choice for hash/rehash values is p, p-2 where * p and p-2 are both prime. These tables are sized to have an extra 10% @@@@ -626,8 +632,12 @@@@ AllocateGlyph (xGlyphInfo *gi, int fdept int size; GlyphPtr glyph; int i; - - size = gi->height * PixmapBytePad (gi->width, glyphDepths[fdepth]); + size_t padded_width; + + padded_width = PixmapBytePad (gi->width, glyphDepths[fdepth]); + if (gi->height && padded_width > (UINT32_MAX - sizeof(GlyphRec))/gi->height) + return 0; + size = gi->height * padded_width; glyph = (GlyphPtr) xalloc (size + sizeof (GlyphRec)); if (!glyph) return 0; @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Import modular-xorg-server-1.1.1 based on xorg-server from pkgsrc-wip. The X.org X11 Server from the modularized source tree of X.org X11. Note that this most likely does not work on anything but NetBSD/i386 right now. @ text @@