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-am,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ --- programs/Xserver/GL/apple/Imakefile.orig Mon Mar 14 23:25:00 2005 +++ programs/Xserver/GL/apple/Imakefile @@@@ -36,7 +36,7 @@@@ LinkSourceFile(compsize.c,$(LIBSRC)/GL/g -I$(SERVERSRC)/GL/glx -I$(SERVERSRC)/hw/darwin/quartz/cr \ -I$(SERVERSRC)/hw/darwin/quartz $(GL_INCLUDES) \ -I$(MESASRCDIR)/include -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(XF86OSSRC) + -I$(XF86OSSRC) -I$(DRMSRCDIR)/shared DEFINES = $(GLX_DEFINES) @ 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-aq,v 1.3 2005/03/22 09:49:14 adam 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 8 a10 5 --- programs/xdm/Imakefile.orig 2004-07-26 15:56:33.000000000 -0700 +++ programs/xdm/Imakefile @@@@ -195,6 +195,13 @@@@ LIFREQ_FLAGS = -Xa #endif #endif d12 1 a12 8 +XDMLOGDIR = $(LOGDIRECTORY) +#ifdef VarRunDirectory +XDMPIDDIR = $(VARRUNDIR) +#else +XDMPIDDIR = $(XDMDIR) +#endif + SYS_LIBRARIES = $(SYS_LIBRARIES1) $(SYS_LIBRARIES2) $(SYS_LIBRARIES3) a13 42 XDMCONFIGDIR = XdmConfigurationSubdirectory @@@@ -252,7 +259,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) @@@@ -267,6 +275,10 @@@@ LOCAL_LIBRARIES = $(GREETLIBS) $(XMULIB) $(XPM_DEFINES) $(XINERAMA_DEFINES) $(PROCTITLE_DEFINES) \ $(IFADDRS_DEFINES) $(IPV6_DEFINES) $(MKSTEMP_DEFINES) EXTRAMANDEFS = $(RANDOM_DEFINES) -DCHOOSERPATH=$(CHOOSERPATH) \ + -DGREETERLIBPATH=$(GREETERLIBPATH) \ + -DXDMDIR=$(XDMDIR) \ + -DXDMAUTHDIR=$(XDMVARDIR) \ + -DXDMPIDDIR=$(XDMPIDDIR) \ -DXDMLOGDIR=$(XDMLOGDIR) XCOMM @@@@ -290,8 +302,8 @@@@ RES_DEFINES = '-DDEF_SERVER_LINE=":0 loc '-DDEF_FAILSAFE_CLIENT="$(BINDIR)/xterm"' \ '-DDEF_XDM_CONFIG="$(XDMDIR)/xdm-config"' \ '-DDEF_CHOOSER="$(CHOOSERPATH)"' \ - '-DDEF_AUTH_DIR="$(XDMDIR)"' \ - '-DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"' + '-DDEF_AUTH_DIR="$(XDMVARDIR)"' \ + '-DDEF_GREETER_LIB="$(GREETERLIBPATH)"' ComplexProgramTarget_1(xdm,$(LOCAL_LIBRARIES),NullParameter) #ifdef LinkConfDirectory @@@@ -316,7 +328,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.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-am,v 1.1 2004/09/16 19:36:10 minskim Exp $ d3 9 a11 13 --- extras/Xpm/lib/parse.c.orig 2004-03-04 11:46:10.000000000 -0600 +++ extras/Xpm/lib/parse.c @@@@ -44,6 +44,24 @@@@ #include #include +#ifdef HAS_STRLCAT +# define STRLCAT(dst, src, dstsize) { \ + if (strlcat(dst, src, dstsize) >= (dstsize)) \ + return (XpmFileInvalid); } +# define STRLCPY(dst, src, dstsize) { \ + if (strlcpy(dst, src, dstsize) >= (dstsize)) \ + return (XpmFileInvalid); } d13 1 a13 8 +# define STRLCAT(dst, src, dstsize) { \ + if ((strlen(dst) + strlen(src)) < (dstsize)) \ + strcat(dst, src); \ + else return (XpmFileInvalid); } +# define STRLCPY(dst, src, dstsize) { \ + if (strlen(src) < (dstsize)) \ + strcpy(dst, src); \ + else return (XpmFileInvalid); } d16 1 a16 146 LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, unsigned int height, unsigned int ncolors, unsigned int cpp, XpmColor *colorTable, @@@@ -66,7 +84,7 @@@@ xpmParseValues(data, width, height, ncol unsigned int *extensions; { unsigned int l; - char buf[BUFSIZ]; + char buf[BUFSIZ + 1]; if (!data->format) { /* XPM 2 or 3 */ @@@@ -175,10 +193,10 @@@@ xpmParseColors(data, ncolors, cpp, color XpmColor **colorTablePtr; xpmHashTable *hashtable; { - unsigned int key = 0, l, a, b; + unsigned int key = 0, l, a, b, len; unsigned int curkey; /* current color key */ unsigned int lastwaskey; /* key read */ - char buf[BUFSIZ]; + char buf[BUFSIZ+1]; char curbuf[BUFSIZ]; /* current buffer */ char **sptr, *s; XpmColor *color; @@@@ -186,6 +204,8 @@@@ xpmParseColors(data, ncolors, cpp, color char **defaults; int ErrorStatus; + if (ncolors >= SIZE_MAX / sizeof(XpmColor)) + return (XpmNoMemory); colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); if (!colorTable) return (XpmNoMemory); @@@@ -197,6 +217,10 @@@@ xpmParseColors(data, ncolors, cpp, color /* * read pixel value */ + if (cpp >= SIZE_MAX - 1) { + xpmFreeColorTable(colorTable, ncolors); + return (XpmNoMemory); + } color->string = (char *) XpmMalloc(cpp + 1); if (!color->string) { xpmFreeColorTable(colorTable, ncolors); @@@@ -234,13 +258,14 @@@@ xpmParseColors(data, ncolors, cpp, color } if (!lastwaskey && key < NKEYS) { /* open new key */ if (curkey) { /* flush string */ - s = (char *) XpmMalloc(strlen(curbuf) + 1); + len = strlen(curbuf) + 1; + s = (char *) XpmMalloc(len); if (!s) { xpmFreeColorTable(colorTable, ncolors); return (XpmNoMemory); } defaults[curkey] = s; - strcpy(s, curbuf); + memcpy(s, curbuf, len); } curkey = key + 1; /* set new key */ *curbuf = '\0'; /* reset curbuf */ @@@@ -251,9 +276,9 @@@@ xpmParseColors(data, ncolors, cpp, color return (XpmFileInvalid); } if (!lastwaskey) - strcat(curbuf, " "); /* append space */ + STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ buf[l] = '\0'; - strcat(curbuf, buf);/* append buf */ + STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ lastwaskey = 0; } } @@@@ -261,12 +286,13 @@@@ xpmParseColors(data, ncolors, cpp, color xpmFreeColorTable(colorTable, ncolors); return (XpmFileInvalid); } - s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1); + len = strlen(curbuf) + 1; + s = defaults[curkey] = (char *) XpmMalloc(len); if (!s) { xpmFreeColorTable(colorTable, ncolors); return (XpmNoMemory); } - strcpy(s, curbuf); + memcpy(s, curbuf, len); } } else { /* XPM 1 */ /* get to the beginning of the first string */ @@@@ -279,6 +305,10 @@@@ xpmParseColors(data, ncolors, cpp, color /* * read pixel value */ + if (cpp >= SIZE_MAX - 1) { + xpmFreeColorTable(colorTable, ncolors); + return (XpmNoMemory); + } color->string = (char *) XpmMalloc(cpp + 1); if (!color->string) { xpmFreeColorTable(colorTable, ncolors); @@@@ -307,16 +337,17 @@@@ xpmParseColors(data, ncolors, cpp, color *curbuf = '\0'; /* init curbuf */ while ((l = xpmNextWord(data, buf, BUFSIZ))) { if (*curbuf != '\0') - strcat(curbuf, " ");/* append space */ + STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ buf[l] = '\0'; - strcat(curbuf, buf); /* append buf */ + STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ } - s = (char *) XpmMalloc(strlen(curbuf) + 1); + len = strlen(curbuf) + 1; + s = (char *) XpmMalloc(len); if (!s) { xpmFreeColorTable(colorTable, ncolors); return (XpmNoMemory); } - strcpy(s, curbuf); + memcpy(s, curbuf, len); color->c_color = s; *curbuf = '\0'; /* reset curbuf */ if (a < ncolors - 1) @@@@ -341,6 +372,9 @@@@ ParsePixels(data, width, height, ncolors unsigned int *iptr, *iptr2; unsigned int a, x, y; + if ((height > 0 && width >= SIZE_MAX / height) || + width * height >= SIZE_MAX / sizeof(unsigned int)) + return XpmNoMemory; #ifndef FOR_MSW iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); #else @@@@ -364,6 +398,9 @@@@ ParsePixels(data, width, height, ncolors { unsigned short colidx[256]; + if (ncolors > 256) + return (XpmFileInvalid); + bzero((char *)colidx, 256 * sizeof(short)); for (a = 0; a < ncolors; a++) colidx[(unsigned char)colorTable[a].string[0]] = a + 1; @@@@ -442,6 +479,9 @@@@ if (cidx[f]) XpmFree(cidx[f]);} char *s; char buf[BUFSIZ]; d18 42 a59 6 + if (cpp >= sizeof(buf)) + return (XpmFileInvalid); + buf[cpp] = '\0'; if (USE_HASHTABLE) { xpmHashAtom *slot; @ 1.1 log @Incorporate libXpm security fixes of X.Org X11R6.8.1. Bump PKGREVISION and BUILDLINK_RECOMMENDED. @ text @d1 1 a1 1 $NetBSD$ @