head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.24 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.22 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.20 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.18 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.16 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.14 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.12 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.10 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.8 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.6 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.4 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.2 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.5.0.12 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.10 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.8 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.6 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.4 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.2 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.2.0.10 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.8 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.1.0.2 pkgsrc-2004Q3-base:1.1; locks; strict; comment @# @; 1.6 date 2007.08.17.20.25.25; author joerg; state dead; branches; next 1.5; 1.5 date 2006.02.14.15.54.55; author joerg; state Exp; branches; next 1.4; 1.4 date 2006.01.20.17.53.32; author xtraeme; state Exp; branches; next 1.3; 1.3 date 2006.01.18.23.53.06; author xtraeme; state Exp; branches; next 1.2; 1.2 date 2004.09.21.17.38.53; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2004.09.16.19.36.10; author minskim; state Exp; branches; next ; desc @@ 1.6 log @To quote Johnny Lam: "In modular-xorg we trust" Remove xorg 6.9 packages from pkgsrc. @ text @$NetBSD: patch-aj,v 1.5 2006/02/14 15:54:55 joerg Exp $ --- programs/xdm/Imakefile.orig 2005-12-06 12:35:11.000000000 +0100 +++ programs/xdm/Imakefile 2005-12-06 12:38:07.000000000 +0100 @@@@ -107,7 +107,7 @@@@ PWD_DEFINES = -DUSESHADOW -DSHADOWSUITE #endif #endif -#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) && !defined(AIXArchitecture) +#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) && !defined(AIXArchitecture) && !defined(DragonFlyArchitecture) && !defined(FreeBSDArchitecture) SYS_LIBRARIES3 = -lresolv #endif #if SystemV || defined(SequentArchitecture) @@@@ -208,6 +208,13 @@@@ LIFREQ_FLAGS = -Xa #endif #endif +XDMLOGDIR = $(LOGDIRECTORY) +#ifdef VarRunDirectory +XDMPIDDIR = $(VARRUNDIR) +#else +XDMPIDDIR = $(XDMDIR) +#endif + SYS_LIBRARIES = $(SYS_LIBRARIES1) $(SYS_LIBRARIES2) $(SYS_LIBRARIES3) XDMCONFIGDIR = XdmConfigurationSubdirectory @@@@ -265,7 +272,8 @@@@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB) #endif PROGRAMS = ProgramTargetName(xdm) ProgramTargetName(xdmshell) ProgramTargetName(sessreg) $(CHOOSER) $(XDM_SHADOW) - CHOOSERPATH = $(XDMDIR)/chooser + CHOOSERPATH = $(BINDIR)/chooser + GREETERLIBPATH = $(USRLIBDIR)/libXdmGreet.so OSMAJORVERSION = OSMajorVersion OSMINORVERSION = OSMinorVersion CONN_DEFINES = $(CONNECTION_FLAGS) @@@@ -282,7 +290,8 @@@@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB) EXTRAMANDEFS = $(RANDOM_DEFINES) -DCHOOSERPATH=$(CHOOSERPATH) \ -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \ -DXDMDIR=$(XDMDIR) -DBINDIR=$(BINDIR) \ - + -DGREETERLIBPATH=$(GREETERLIBPATH) \ + -DXDMAUTHDIR=$(XDMVARDIR) XCOMM XCOMM Special definitions for compiling default resources; these parameters @@@@ -298,11 +307,11 @@@@ DEF_SYSTEM_PATH = DefaultSystemPath /* i BOURNE_SHELL = DefaultSystemShell RES_DEFINES = '-DDEF_SERVER_LINE=":0 local $(DEF_SERVER) :0"' \ '-DXRDB_PROGRAM="$(BINDIR)/xrdb"' \ - '-DDEF_SESSION="$(BINDIR)/xterm -ls"' \ + '-DDEF_SESSION="xterm -ls"' \ '-DDEF_USER_PATH="$(DEF_USER_PATH)"' \ '-DDEF_SYSTEM_PATH="$(DEF_SYSTEM_PATH)"' \ '-DDEF_SYSTEM_SHELL="$(BOURNE_SHELL)"' \ - '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \ + '-DDEF_FAILSAFE_CLIENT="xterm"' \ '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \ '-DDEF_CHOOSER="$(CHOOSERPATH)"' \ '-DDEF_AUTH_DIR="$(XDMDIR)"' \ @@@@ -331,7 +340,7 @@@@ SpecialCObjectRule(daemon,$(ICONFIGFILES #if BuildChooser SpecialCObjectRule(chooser, $(ICONFIGFILES), $(SOCK_DEFINES) $(LIFREQ_FLAGS)) NormalProgramTarget(chooser,$(OBJS3),$(DEPLIBS3),$(LIBS3),NullParameter) -InstallProgram(chooser,$(XDMDIR)) +InstallProgram(chooser,$(BINDIR)) InstallAppDefaults(Chooser) #endif #if BuildBoth @ 1.5 log @Don't hard code path to xorg/bin/xterm, just expect it in PATH. This affects startx, xinitrc and xdm. Bump revision. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.4 2006/01/20 17:53:32 xtraeme Exp $ @ 1.4 log @Make xorg-clients build on FreeBSD. Patch sent by Anders Nor Berle. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.3 2006/01/18 23:53:06 xtraeme Exp $ d48 14 @ 1.3 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$ d10 1 a10 1 +#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) && !defined(AIXArchitecture) && !defined(DragonFlyArchitecture) @ 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 @d3 54 a56 11 --- programs/x11perf/Imakefile.orig 2004-09-10 09:44:07.000000000 +0200 +++ programs/x11perf/Imakefile 2004-09-10 09:44:19.000000000 +0200 @@@@ -12,7 +12,7 @@@@ #if HasShm SHMDEFS = -DMITSHM #endif -#if BuildRenderLibrary +#if 0 XRENDERDEFS = -DXRENDER XRENDERDEPS = $(DEPXRENDERLIB) XRENDERLIBS = $(XRENDERLIB) @ 1.1 log @Incorporate libXpm security fixes of X.Org X11R6.8.1. Bump PKGREVISION and BUILDLINK_RECOMMENDED. @ text @d3 5 a7 34 --- extras/Xpm/lib/create.c.orig 2004-03-04 11:46:10.000000000 -0600 +++ extras/Xpm/lib/create.c @@@@ -816,6 +816,9 @@@@ XpmCreateImageFromXpmImage(display, imag ErrorStatus = XpmSuccess; + if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) + return (XpmNoMemory); + /* malloc pixels index tables */ image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors); if (!image_pixels) @@@@ -988,6 +991,8 @@@@ CreateXImage(display, visual, depth, for return (XpmNoMemory); #if !defined(FOR_MSW) && !defined(AMIGA) + if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) + return XpmNoMemory; /* now that bytes_per_line must have been set properly alloc data */ (*image_return)->data = (char *) XpmMalloc((*image_return)->bytes_per_line * height); @@@@ -2055,6 +2060,9 @@@@ xpmParseDataAndCreate(display, data, ima xpmGetCmt(data, &colors_cmt); /* malloc pixels index tables */ + if (ncolors >= SIZE_MAX / sizeof(Pixel)) + return XpmNoMemory; + image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); if (!image_pixels) RETURN(XpmNoMemory); @@@@ -2309,7 +2317,8 @@@@ ParseAndPutPixels( } obm = SelectObject(*dc, image->bitmap); d9 5 a13 16 - + if (ncolors > 256) + return (XpmFileInvalid); bzero((char *)colidx, 256 * sizeof(short)); for (a = 0; a < ncolors; a++) @@@@ -2415,6 +2424,9 @@@@ if (cidx[f]) XpmFree(cidx[f]);} char *s; char buf[BUFSIZ]; + if (cpp >= sizeof(buf)) + return (XpmFileInvalid); + buf[cpp] = '\0'; if (USE_HASHTABLE) { xpmHashAtom *slot; @