head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.24 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.22 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.20 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.18 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.16 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.14 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.12 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.10 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.8 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.6 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.4 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.2 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.4.0.12 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.10 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.8 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.6 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.3.0.10 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.8 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.6 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.4 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.2 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.1.0.2 pkgsrc-2004Q3-base:1.1; locks; strict; comment @# @; 1.5 date 2007.08.17.20.25.26; author joerg; state dead; branches; next 1.4; 1.4 date 2006.01.18.23.53.06; author xtraeme; state Exp; branches; next 1.3; 1.3 date 2004.10.20.14.33.30; author reed; state Exp; branches; next 1.2; 1.2 date 2004.09.21.17.38.53; author xtraeme; state dead; branches; next 1.1; 1.1 date 2004.09.16.19.36.10; author minskim; state Exp; branches; next ; desc @@ 1.5 log @To quote Johnny Lam: "In modular-xorg we trust" Remove xorg 6.9 packages from pkgsrc. @ text @$NetBSD: patch-an,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ --- programs/Xserver/hw/xfree86/loader/Imakefile.orig 2004-08-13 12:39:57.000000000 +0900 +++ programs/Xserver/hw/xfree86/loader/Imakefile 2005-02-21 10:38:49.000000000 +0900 @@@@ -40,6 +40,11 @@@@ ARCHDEFINES = -DDoMMAPedMerge -DMmapPageAlign #endif +#if defined(NetBSDArchitecture) && defined(AMD64Architecture) && \ + defined(PassHintToMMAP) +ARCHDEFINES = -DUseMMAP -DPassHintToMMAP +#endif + DEFINES = $(DBMALLOCDEFINE) $(DLOPENDEFINES) $(OS_DEFINES) $(COMPAT_DEFINES) \ $(SHM_DEFINES) $(FONTCACHE_DEFINES) $(ARCHDEFINES) @ 1.4 log @Update meta-pkgs/xorg to 6.9.0. The full list of changes: http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html Thanks to joerg@@ and reed@@ for testing on DragonFlyBSD. Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386. @ text @d1 1 a1 1 $NetBSD: patch-ar,v 1.2 2005/02/21 16:45:40 hira Exp $ @ 1.3 log @Make xdm use configs from under PKG_SYSCONFDIR. Some ideas came from NetBSD's XFree86 customizations. Use USE_PKGINSTALL and CONF_FILES for xorg-clients. Installs xdm configs (and shell scripts) to examples directory. Create OWN_DIRS for the authDir. PLIST changes are for chooser is now in bin directory. And pixmaps moved to include/X11/pixmaps directory. xdm configs are no longer in lib/X11/xdm (so they are no longer lost on reinstall). (Anyone want to do twm and other configs?) @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 48 --- programs/xdm/xdm.man.orig 2004-07-26 15:56:33.000000000 -0700 +++ programs/xdm/xdm.man @@@@ -164,7 +164,7 @@@@ as resources. Names the configuration file, which specifies resources to control the behavior of .I xdm. -.I __projectroot__/lib/X11/xdm/xdm-config +.I XDMDIR/xdm-config is the default. See the section \fBConfiguration File\fP. .IP "\fB\-nodaemon\fP" @@@@ -306,7 +306,7 @@@@ uses the \fIlockf\fP library call, while This names a directory under which .I xdm stores authorization files while initializing the session. The -default value is \fI __projectroot__/lib/X11/xdm.\fP +default value is \fI\&XDMAUTHDIR\fP. Can be overridden for specific displays by DisplayManager.\fIDISPLAY\fP.authFile. .IP \fBDisplayManager.autoRescan\fP @@@@ -374,7 +374,7 @@@@ algorithm is used instead. .IP \fBDisplayManager.greeterLib\fP On systems that support a dynamically-loadable greeter library, the name of the library. The default is -\fI __projectroot__/lib/X11/xdm/libXdmGreet.so\fP. +\fI\&GREETERLIBPATH\fP. .IP \fBDisplayManager.choiceTimeout\fP Number of seconds to wait for display to respond after user has selected a host from the chooser. If the display sends an XDMCP @@@@ -406,7 +406,7 @@@@ section which describes the various resources that are appropriate to place in this file. There is no default value for this resource, but -\fI __projectroot__/lib/X11/xdm/Xresources\fP +\fI\&XDMDIR/Xresources\fP is the conventional name. .IP "\fBDisplayManager.\fP\fIDISPLAY\fP\fB.chooser\fP" Specifies the program run to offer a host menu for Indirect queries @@@@ -599,7 +599,7 @@@@ variable XAUTHORITY at the created file. First, the .I xdm configuration file should be set up. -Make a directory (usually \fI __projectroot__/lib/X11/xdm\fP) to contain all +Make a directory (usually \fI\&XDMDIR\fP) to contain all of the relevant files. .LP Here is a reasonable configuration file, which could be @@@@ -608,12 +608,12 @@@@ named \fIxdm-config\fP: d9 7 a15 1 .ta .5i 4i a16 54 - DisplayManager.servers: __projectroot__/lib/X11/xdm/Xservers + DisplayManager.servers: XDMDIR/Xservers DisplayManager.errorLogFile: XDMLOGDIR/xdm.log - DisplayManager*resources: __projectroot__/lib/X11/xdm/Xresources - DisplayManager*startup: __projectroot__/lib/X11/xdm/Xstartup - DisplayManager*session: __projectroot__/lib/X11/xdm/Xsession - DisplayManager.pidFile: __projectroot__/lib/X11/xdm/xdm-pid + DisplayManager*resources: XDMDIR/Xresources + DisplayManager*startup: XDMDIR/Xstartup + DisplayManager*session: XDMDIR/Xsession + DisplayManager.pidFile: XDMPIDDIR/xdm-pid DisplayManager._0.authorize: true DisplayManager*authorize: false @@@@ -1123,8 +1123,8 @@@@ Here is a sample \fIXstartup\fP script: xmessage\0\-file /etc/nologin\0\-timeout 30\0\-center exit 1 fi - sessreg\0\-a\0\-l $DISPLAY\0\-x __projectroot__/lib/xdm/Xservers $LOGNAME - __projectroot__/lib/xdm/GiveConsole + sessreg\0\-a\0\-l $DISPLAY\0\-x XDMDIR/Xservers $LOGNAME + XDMDIR/GiveConsole exit 0 .fi .SH "SESSION PROGRAM" @@@@ -1237,8 +1237,8 @@@@ A sample \fIXreset\fP script: \& # \& # This program is run as root after the session ends \& # - sessreg\0\-d\0\-l $DISPLAY\0\-x __projectroot__/lib/xdm/Xservers $LOGNAME - __projectroot__/lib/xdm/TakeConsole + sessreg\0\-d\0\-l $DISPLAY\0\-x XDMDIR/Xservers $LOGNAME + XDMDIR/TakeConsole exit 0 .fi .SH "CONTROLLING THE SERVER" @@@@ -1341,7 +1341,7 @@@@ interested in .I xinit. .SH FILES .TP 20 -.I __projectroot__/lib/X11/xdm/xdm-config +.I XDMDIR/xdm-config the default configuration file .TP 20 .I $HOME/.Xauthority @@@@ -1359,7 +1359,7 @@@@ the default server .I __projectroot__/bin/xterm the default session program and failsafe client .TP 20 -.I __projectroot__/lib/X11/xdm/A\- +.I XDMAUTHDIR/authdir/authfiles/A\- the default place for authorization files .TP 20 .I /tmp/K5C @ 1.2 log @Update X.org packages to 6.8.1. To see the changes about this release, please review the "RELNOTES" file, which is available via www or in the distribution tarballs. These packages were tested on: * NetBSD 2.0/-current * Bluewall GNU/Linux * Slackware 10 GNU/Linux I'm currently testing them on FreeBSD 5.3BETA4. @ text @d1 1 a1 1 $NetBSD: patch-an,v 1.1 2004/09/16 19:36:10 minskim Exp $ d3 105 a107 66 --- extras/Xpm/lib/scan.c.orig 2004-03-04 11:46:10.000000000 -0600 +++ extras/Xpm/lib/scan.c @@@@ -107,7 +107,8 @@@@ LFUNC(MSWGetImagePixels, int, (Display * LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp, XpmAttributes *attributes)); -LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors, +LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, + unsigned int ncolors, Pixel *pixels, unsigned int mask, unsigned int cpp, XpmAttributes *attributes)); @@@@ -232,11 +233,17 @@@@ XpmCreateXpmImageFromImage(display, imag else cpp = 0; + if ((height > 0 && width >= SIZE_MAX / height) || + width * height >= SIZE_MAX / sizeof(unsigned int)) + RETURN(XpmNoMemory); pmap.pixelindex = (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int)); if (!pmap.pixelindex) RETURN(XpmNoMemory); + if (pmap.size >= SIZE_MAX / sizeof(Pixel)) + RETURN(XpmNoMemory); + pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); if (!pmap.pixels) RETURN(XpmNoMemory); @@@@ -302,6 +309,8 @@@@ XpmCreateXpmImageFromImage(display, imag * color */ + if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) + RETURN(XpmNoMemory); colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); if (!colorTable) RETURN(XpmNoMemory); @@@@ -360,6 +369,8 @@@@ ScanTransparentColor(color, cpp, attribu /* first get a character string */ a = 0; + if (cpp >= SIZE_MAX - 1) + return (XpmNoMemory); if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) return (XpmNoMemory); *s++ = printable[c = a % MAXPRINTABLE]; @@@@ -407,7 +418,7 @@@@ static int ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes) Display *display; XpmColor *colors; - int ncolors; + unsigned int ncolors; Pixel *pixels; unsigned int mask; unsigned int cpp; @@@@ -451,6 +462,8 @@@@ ScanOtherColors(display, colors, ncolors } /* first get character strings and rgb values */ + if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) + return (XpmNoMemory); xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); if (!xcolors) return (XpmNoMemory); @ 1.1 log @Incorporate libXpm security fixes of X.Org X11R6.8.1. Bump PKGREVISION and BUILDLINK_RECOMMENDED. @ text @d1 1 a1 1 $NetBSD$ @