diff options
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r3 | 13 | ||||
| -rw-r--r-- | x11-base/xorg-x11/files/xpm-secfix-thomas.diff | 1948 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild | 1367 |
4 files changed, 5 insertions, 3329 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 0bba7bcf1a64..5ed5b5ebfdc6 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.365 2005/04/15 19:42:58 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.366 2005/04/15 21:14:05 spyderous Exp $ + + 15 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; + -files/xpm-secfix-thomas.diff, -xorg-x11-6.8.0-r3.ebuild: + Everyone seems to have newer stable versions, so pull this and its 55K patch. 15 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild: diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r3 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r3 deleted file mode 100644 index aa62553b37f6..000000000000 --- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r3 +++ /dev/null @@ -1,13 +0,0 @@ -MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811 -MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892 -MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991 -MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173 -MD5 2f0a7db15809d4c2e41b8666a5a8a04f xorg-x11-6.8.0-files-0.4.tar.bz2 9964 -MD5 dd26b5883a0f755d3357be302ddf88fe xorg-x11-6.8.0-patches-0.2.2.1.tar.bz2 62194 -MD5 c31a2e1c226e659c2ff29abfe55386e3 X11R6.8.0-src1.tar.gz 30560275 -MD5 4089bb6efb6c5bc73fbcfc23fafcb0c8 X11R6.8.0-src2.tar.gz 5808901 -MD5 488a5ebbbdf48d974efbc3a0bde92bf4 X11R6.8.0-src3.tar.gz 10014266 -MD5 0ffaef789784ae16ca263e7ae60db656 X11R6.8.0-src4.tar.gz 13166526 -MD5 af129720efbe82a1a82505c23227f70b X11R6.8.0-src5.tar.gz 4386145 -MD5 4be7648c1512d5da7e738e500dd5ba30 X11R6.8.0-src6.tar.gz 3181068 -MD5 888ced8bc85fbd2bd4880dba23a7f44a X11R6.8.0-src7.tar.gz 5052439 diff --git a/x11-base/xorg-x11/files/xpm-secfix-thomas.diff b/x11-base/xorg-x11/files/xpm-secfix-thomas.diff deleted file mode 100644 index 035903dd4fe0..000000000000 --- a/x11-base/xorg-x11/files/xpm-secfix-thomas.diff +++ /dev/null @@ -1,1948 +0,0 @@ -Index: extras/Xpm/lib/Attrib.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/Attrib.c,v -retrieving revision 1.2 -diff -u -r1.2 Attrib.c ---- xc/extras/Xpm/lib/Attrib.c 2004/09/01 21:01:32 1.2 -+++ xc/extras/Xpm/lib/Attrib.c 2004/11/01 15:48:58 -@@ -32,13 +32,15 @@ - * Developed by Arnaud Le Hors * - \*****************************************************************************/ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - - /* 3.2 backward compatibility code */ - LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, - XpmColor ***oldct)); - --LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); -+LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, unsigned int ncolors)); - - /* - * Create a colortable compatible with the old style colortable -@@ -50,9 +52,9 @@ - XpmColor ***oldct; - { - XpmColor **colorTable, **color; -- int a; -+ unsigned int a; - -- if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) -+ if (ncolors >= UINT_MAX / sizeof(XpmColor *)) - return XpmNoMemory; - - colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); -@@ -69,9 +71,9 @@ - static void - FreeOldColorTable(colorTable, ncolors) - XpmColor **colorTable; -- int ncolors; -+ unsigned int ncolors; - { -- int a, b; -+ unsigned int a, b; - XpmColor **color; - char **sptr; - -@@ -116,7 +118,7 @@ - void - XpmFreeExtensions(extensions, nextensions) - XpmExtension *extensions; -- int nextensions; -+ unsigned int nextensions; - { - unsigned int i, j, nlines; - XpmExtension *ext; -Index: extras/Xpm/lib/CrBufFrI.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/CrBufFrI.c,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 CrBufFrI.c ---- xc/extras/Xpm/lib/CrBufFrI.c 2002/01/19 11:08:43 1.1.1.2 -+++ xc/extras/Xpm/lib/CrBufFrI.c 2004/11/01 15:49:03 -@@ -39,15 +42,17 @@ - unsigned int *used_size, XpmColor *colors, - unsigned int ncolors, unsigned int cpp)); - --LFUNC(WritePixels, void, (char *dataptr, unsigned int *used_size, -+LFUNC(WritePixels, void, (char *dataptr, unsigned int data_size, -+ unsigned int *used_size, - unsigned int width, unsigned int height, - unsigned int cpp, unsigned int *pixels, - XpmColor *colors)); - --LFUNC(WriteExtensions, void, (char *dataptr, unsigned int *used_size, -+LFUNC(WriteExtensions, void, (char *dataptr, unsigned int data_size, -+ unsigned int *used_size, - XpmExtension *ext, unsigned int num)); - --LFUNC(ExtensionsSize, int, (XpmExtension *ext, unsigned int num)); -+LFUNC(ExtensionsSize, unsigned int, (XpmExtension *ext, unsigned int num)); - LFUNC(CommentsSize, int, (XpmInfo *info)); - - int -@@ -90,10 +95,11 @@ - - #undef RETURN - #define RETURN(status) \ -+do \ - { \ - ErrorStatus = status; \ - goto error; \ --} -+}while(0) - - int - XpmCreateBufferFromXpmImage(buffer_return, image, info) -@@ -107,7 +113,7 @@ - unsigned int cmts, extensions, ext_size = 0; - unsigned int l, cmt_size = 0; - char *ptr = NULL, *p; -- unsigned int ptr_size, used_size; -+ unsigned int ptr_size, used_size, tmp; - - *buffer_return = NULL; - -@@ -129,7 +135,13 @@ - #ifdef VOID_SPRINTF - used_size = strlen(buf); - #endif -- ptr_size = used_size + ext_size + cmt_size + 1; -+ ptr_size = used_size + ext_size + cmt_size + 1; /* ptr_size can't be 0 */ -+ if(ptr_size <= used_size || -+ ptr_size <= ext_size || -+ ptr_size <= cmt_size) -+ { -+ return XpmNoMemory; -+ } - ptr = (char *) XpmMalloc(ptr_size); - if (!ptr) - return XpmNoMemory; -@@ -140,7 +152,7 @@ - #ifndef VOID_SPRINTF - used_size += - #endif -- sprintf(ptr + used_size, "/*%s*/\n", info->hints_cmt); -+ snprintf(ptr + used_size, ptr_size-used_size, "/*%s*/\n", info->hints_cmt); - #ifdef VOID_SPRINTF - used_size += strlen(info->hints_cmt) + 5; - #endif -@@ -158,7 +170,7 @@ - #ifndef VOID_SPRINTF - l += - #endif -- sprintf(buf + l, " %d %d", info->x_hotspot, info->y_hotspot); -+ snprintf(buf + l, sizeof(buf)-l, " %d %d", info->x_hotspot, info->y_hotspot); - #ifdef VOID_SPRINTF - l = strlen(buf); - #endif -@@ -180,6 +192,8 @@ - l = strlen(buf); - #endif - ptr_size += l; -+ if(ptr_size <= l) -+ RETURN(XpmNoMemory); - p = (char *) XpmRealloc(ptr, ptr_size); - if (!p) - RETURN(XpmNoMemory); -@@ -192,7 +206,7 @@ - #ifndef VOID_SPRINTF - used_size += - #endif -- sprintf(ptr + used_size, "/*%s*/\n", info->colors_cmt); -+ snprintf(ptr + used_size, ptr_size-used_size, "/*%s*/\n", info->colors_cmt); - #ifdef VOID_SPRINTF - used_size += strlen(info->colors_cmt) + 5; - #endif -@@ -208,7 +222,12 @@ - * 4 = 1 (for '"') + 3 (for '",\n') - * 1 = - 2 (because the last line does not end with ',\n') + 3 (for '};\n') - */ -- ptr_size += image->height * (image->width * image->cpp + 4) + 1; -+ if(image->width > UINT_MAX / image->cpp || -+ (tmp = image->width * image->cpp + 4) <= 4 || -+ image->height > UINT_MAX / tmp || -+ (tmp = image->height * tmp + 1) <= 1 || -+ (ptr_size += tmp) <= tmp) -+ RETURN(XpmNoMemory); - - p = (char *) XpmRealloc(ptr, ptr_size); - if (!p) -@@ -220,17 +239,17 @@ - #ifndef VOID_SPRINTF - used_size += - #endif -- sprintf(ptr + used_size, "/*%s*/\n", info->pixels_cmt); -+ snprintf(ptr + used_size, ptr_size-used_size, "/*%s*/\n", info->pixels_cmt); - #ifdef VOID_SPRINTF - used_size += strlen(info->pixels_cmt) + 5; - #endif - } -- WritePixels(ptr + used_size, &used_size, image->width, image->height, -+ WritePixels(ptr + used_size, ptr_size - used_size, &used_size, image->width, image->height, - image->cpp, image->data, image->colorTable); - - /* print extensions */ - if (extensions) -- WriteExtensions(ptr + used_size, &used_size, -+ WriteExtensions(ptr + used_size, ptr_size-used_size, &used_size, - info->extensions, info->nextensions); - - /* close the array */ -@@ -247,6 +266,7 @@ - return (ErrorStatus); - } - -+ - static int - WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) - char **dataptr; -@@ -256,7 +276,7 @@ - unsigned int ncolors; - unsigned int cpp; - { -- char buf[BUFSIZ]; -+ char buf[BUFSIZ] = {0}; - unsigned int a, key, l; - char *s, *s2; - char **defaults; -@@ -266,6 +286,8 @@ - - defaults = (char **) colors; - s = buf + 1; -+ if(cpp > (sizeof(buf) - (s-buf))) -+ return(XpmNoMemory); - strncpy(s, *defaults++, cpp); - s += cpp; - -@@ -274,14 +296,24 @@ - #ifndef VOID_SPRINTF - s += - #endif -- sprintf(s, "\t%s %s", xpmColorKeys[key - 1], s2); -+ /* assume C99 compliance */ -+ snprintf(s, sizeof(buf) - (s-buf), "\t%s %s", xpmColorKeys[key - 1], s2); - #ifdef VOID_SPRINTF - s += strlen(s); - #endif -+ /* now let's check if s points out-of-bounds */ -+ if((s-buf) > sizeof(buf)) -+ return(XpmNoMemory); - } - } -+ if(sizeof(buf) - (s-buf) < 4) -+ return(XpmNoMemory); - strcpy(s, "\",\n"); - l = s + 3 - buf; -+ if( *data_size >= UINT_MAX-l || -+ *data_size + l <= *used_size || -+ (*data_size + l - *used_size) <= sizeof(buf)) -+ return(XpmNoMemory); - s = (char *) XpmRealloc(*dataptr, *data_size + l); - if (!s) - return (XpmNoMemory); -@@ -294,8 +326,9 @@ - } - - static void --WritePixels(dataptr, used_size, width, height, cpp, pixels, colors) -+WritePixels(dataptr, data_size, used_size, width, height, cpp, pixels, colors) - char *dataptr; -+ unsigned int data_size; - unsigned int *used_size; - unsigned int width; - unsigned int height; -@@ -306,27 +339,36 @@ - char *s = dataptr; - unsigned int x, y, h; - -+ if(height <= 1) -+ return; -+ - h = height - 1; - for (y = 0; y < h; y++) { - *s++ = '"'; - for (x = 0; x < width; x++, pixels++) { -- strncpy(s, colors[*pixels].string, cpp); -+ if(cpp >= (data_size - (s-dataptr))) -+ return; -+ strncpy(s, colors[*pixels].string, cpp); /* how can we trust *pixels? :-\ */ - s += cpp; - } -+ if((data_size - (s-dataptr)) < 4) -+ return; - strcpy(s, "\",\n"); - s += 3; - } - /* duplicate some code to avoid a test in the loop */ - *s++ = '"'; - for (x = 0; x < width; x++, pixels++) { -- strncpy(s, colors[*pixels].string, cpp); -+ if(cpp >= (data_size - (s-dataptr))) -+ return; -+ strncpy(s, colors[*pixels].string, cpp); /* how can we trust *pixels? */ - s += cpp; - } - *s++ = '"'; - *used_size += s - dataptr; - } - --static int -+static unsigned int - ExtensionsSize(ext, num) - XpmExtension *ext; - unsigned int num; -@@ -335,21 +377,26 @@ - char **line; - - size = 0; -+ if(num == 0) -+ return(0); /* ok? */ - for (x = 0; x < num; x++, ext++) { - /* 11 = 10 (for ',\n"XPMEXT ') + 1 (for '"') */ - size += strlen(ext->name) + 11; -- a = ext->nlines; -+ a = ext->nlines; /* how can we trust ext->nlines to be not out-of-bounds? */ - for (y = 0, line = ext->lines; y < a; y++, line++) - /* 4 = 3 (for ',\n"') + 1 (for '"') */ - size += strlen(*line) + 4; - } - /* 13 is for ',\n"XPMENDEXT"' */ -+ if(size > UINT_MAX - 13) /* unlikely */ -+ return(0); - return size + 13; - } - - static void --WriteExtensions(dataptr, used_size, ext, num) -+WriteExtensions(dataptr, data_size, used_size, ext, num) - char *dataptr; -+ unsigned int data_size; - unsigned int *used_size; - XpmExtension *ext; - unsigned int num; -@@ -362,7 +409,7 @@ - #ifndef VOID_SPRINTF - s += - #endif -- sprintf(s, ",\n\"XPMEXT %s\"", ext->name); -+ snprintf(s, data_size - (s-dataptr), ",\n\"XPMEXT %s\"", ext->name); - #ifdef VOID_SPRINTF - s += strlen(ext->name) + 11; - #endif -@@ -371,13 +418,13 @@ - #ifndef VOID_SPRINTF - s += - #endif -- sprintf(s, ",\n\"%s\"", *line); -+ snprintf(s, data_size - (s-dataptr), ",\n\"%s\"", *line); - #ifdef VOID_SPRINTF - s += strlen(*line) + 4; - #endif - } - } -- strcpy(s, ",\n\"XPMENDEXT\""); -+ strncpy(s, ",\n\"XPMENDEXT\"", data_size - (s-dataptr)-1); - *used_size += s - dataptr + 13; - } - -@@ -388,6 +435,7 @@ - int size = 0; - - /* 5 = 2 (for "/_*") + 3 (for "*_/\n") */ -+ /* wrap possible but *very* unlikely */ - if (info->hints_cmt) - size += 5 + strlen(info->hints_cmt); - -Index: extras/Xpm/lib/CrDatFrI.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/CrDatFrI.c,v -retrieving revision 1.2 -diff -u -r1.2 CrDatFrI.c ---- xc/extras/Xpm/lib/CrDatFrI.c 2004/09/01 21:01:32 1.2 -+++ xc/extras/Xpm/lib/CrDatFrI.c 2004/11/01 15:49:11 -@@ -33,13 +33,16 @@ - \*****************************************************************************/ - /* $XFree86: xc/extras/Xpm/lib/CrDatFrI.c,v 1.2 2001/10/28 03:32:09 tsi Exp $ */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - - LFUNC(CreateColors, int, (char **dataptr, unsigned int *data_size, - XpmColor *colors, unsigned int ncolors, - unsigned int cpp)); - --LFUNC(CreatePixels, void, (char **dataptr, unsigned int width, -+LFUNC(CreatePixels, void, (char **dataptr, unsigned int data_size, -+ unsigned int width, - unsigned int height, unsigned int cpp, - unsigned int *pixels, XpmColor *colors)); - -@@ -47,7 +50,8 @@ - unsigned int *ext_size, - unsigned int *ext_nlines)); - --LFUNC(CreateExtensions, void, (char **dataptr, unsigned int offset, -+LFUNC(CreateExtensions, void, (char **dataptr, unsigned int data_size, -+ unsigned int offset, - XpmExtension *ext, unsigned int num, - unsigned int ext_nlines)); - -@@ -88,10 +92,11 @@ - - #undef RETURN - #define RETURN(status) \ -+do \ - { \ - ErrorStatus = status; \ - goto exit; \ --} -+} while(0) - - int - XpmCreateDataFromXpmImage(data_return, image, info) -@@ -122,11 +127,17 @@ - * alloc a temporary array of char pointer for the header section which - * is the hints line + the color table lines - */ -- header_nlines = 1 + image->ncolors; -+ header_nlines = 1 + image->ncolors; /* this may wrap and/or become 0 */ -+ -+ /* 2nd check superfluous if we do not need header_nlines any further */ -+ if(header_nlines <= image->ncolors || -+ header_nlines >= UINT_MAX / sizeof(char *)) -+ return(XpmNoMemory); -+ - header_size = sizeof(char *) * header_nlines; -- if (header_size >= SIZE_MAX / sizeof(char *)) -+ if (header_size >= UINT_MAX / sizeof(char *)) - return (XpmNoMemory); -- header = (char **) XpmCalloc(header_size, sizeof(char *)); -+ header = (char **) XpmCalloc(header_size, sizeof(char *)); /* can we trust image->ncolors */ - if (!header) - return (XpmNoMemory); - -@@ -170,8 +181,22 @@ - - /* now we know the size needed, alloc the data and copy the header lines */ - offset = image->width * image->cpp + 1; -- data_size = header_size + (image->height + ext_nlines) * sizeof(char *) -- + image->height * offset + ext_size; -+ -+ if(offset <= image->width || offset <= image->cpp) -+ RETURN(XpmNoMemory); -+ -+ if( (image->height + ext_nlines) >= UINT_MAX / sizeof(char *)) -+ RETURN(XpmNoMemory); -+ data_size = (image->height + ext_nlines) * sizeof(char *); -+ -+ if (image->height > UINT_MAX / offset || -+ image->height * offset > UINT_MAX - data_size) -+ RETURN(XpmNoMemory); -+ data_size += image->height * offset; -+ -+ if( (header_size + ext_size) >= (UINT_MAX - data_size) ) -+ RETURN(XpmNoMemory); -+ data_size += header_size + ext_size; - - data = (char **) XpmMalloc(data_size); - if (!data) -@@ -179,8 +204,10 @@ - - data_nlines = header_nlines + image->height + ext_nlines; - *data = (char *) (data + data_nlines); -+ -+ /* can header have less elements then n suggests? */ - n = image->ncolors; -- for (l = 0, sptr = data, sptr2 = header; l <= n; l++, sptr++, sptr2++) { -+ for (l = 0, sptr = data, sptr2 = header; l <= n && sptr && sptr2; l++, sptr++, sptr2++) { - strcpy(*sptr, *sptr2); - *(sptr + 1) = *sptr + strlen(*sptr2) + 1; - } -@@ -189,12 +216,13 @@ - data[header_nlines] = (char *) data + header_size - + (image->height + ext_nlines) * sizeof(char *); - -- CreatePixels(data + header_nlines, image->width, image->height, -+ CreatePixels(data + header_nlines, data_size-header_nlines, image->width, image->height, - image->cpp, image->data, image->colorTable); - - /* print extensions */ - if (extensions) -- CreateExtensions(data + header_nlines + image->height - 1, offset, -+ CreateExtensions(data + header_nlines + image->height - 1, -+ data_size - header_nlines - image->height + 1, offset, - info->extensions, info->nextensions, - ext_nlines); - -@@ -225,23 +253,34 @@ - char *s, *s2; - char **defaults; - -+ /* can ncolors be trusted here? */ - for (a = 0; a < ncolors; a++, colors++, dataptr++) { - - defaults = (char **) colors; -+ if(sizeof(buf) <= cpp) -+ return(XpmNoMemory); - strncpy(buf, *defaults++, cpp); - s = buf + cpp; - -+ if(sizeof(buf) <= (s-buf)) -+ return XpmNoMemory; -+ - for (key = 1; key <= NKEYS; key++, defaults++) { - if ((s2 = *defaults)) { - #ifndef VOID_SPRINTF - s += - #endif -- sprintf(s, "\t%s %s", xpmColorKeys[key - 1], s2); -+ /* assume C99 compliance */ -+ snprintf(s, sizeof(buf)-(s-buf), "\t%s %s", xpmColorKeys[key - 1], s2); - #ifdef VOID_SPRINTF - s += strlen(s); - #endif -+ /* does s point out-of-bounds? */ -+ if(sizeof(buf) < (s-buf)) -+ return XpmNoMemory; - } - } -+ /* what about using strdup()? */ - l = s - buf + 1; - s = (char *) XpmMalloc(l); - if (!s) -@@ -253,8 +292,9 @@ - } - - static void --CreatePixels(dataptr, width, height, cpp, pixels, colors) -+CreatePixels(dataptr, data_size, width, height, cpp, pixels, colors) - char **dataptr; -+ unsigned int data_size; - unsigned int width; - unsigned int height; - unsigned int cpp; -@@ -264,21 +304,38 @@ - char *s; - unsigned int x, y, h, offset; - -+ if(height <= 1) -+ return; -+ - h = height - 1; -+ - offset = width * cpp + 1; -+ -+ if(offset <= width || offset <= cpp) -+ return; -+ -+ /* why trust h? */ - for (y = 0; y < h; y++, dataptr++) { - s = *dataptr; -+ /* why trust width? */ - for (x = 0; x < width; x++, pixels++) { -- strncpy(s, colors[*pixels].string, cpp); -+ if(cpp > (data_size - (s - *dataptr))) -+ return; -+ strncpy(s, colors[*pixels].string, cpp); /* why trust pixel? */ - s += cpp; - } - *s = '\0'; -+ if(offset > data_size) -+ return; - *(dataptr + 1) = *dataptr + offset; - } - /* duplicate some code to avoid a test in the loop */ - s = *dataptr; -+ /* why trust width? */ - for (x = 0; x < width; x++, pixels++) { -- strncpy(s, colors[*pixels].string, cpp); -+ if(cpp > data_size - (s - *dataptr)) -+ return; -+ strncpy(s, colors[*pixels].string, cpp); /* why should we trust *pixel? */ - s += cpp; - } - *s = '\0'; -@@ -311,8 +368,9 @@ - } - - static void --CreateExtensions(dataptr, offset, ext, num, ext_nlines) -+CreateExtensions(dataptr, data_size, offset, ext, num, ext_nlines) - char **dataptr; -+ unsigned int data_size; - unsigned int offset; - XpmExtension *ext; - unsigned int num; -@@ -325,12 +383,12 @@ - dataptr++; - a = 0; - for (x = 0; x < num; x++, ext++) { -- sprintf(*dataptr, "XPMEXT %s", ext->name); -+ snprintf(*dataptr, data_size, "XPMEXT %s", ext->name); - a++; - if (a < ext_nlines) - *(dataptr + 1) = *dataptr + strlen(ext->name) + 8; - dataptr++; -- b = ext->nlines; -+ b = ext->nlines; /* can we trust these values? */ - for (y = 0, line = ext->lines; y < b; y++, line++) { - strcpy(*dataptr, *line); - a++; -Index: extras/Xpm/lib/Imakefile -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/Imakefile,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 Imakefile ---- xc/extras/Xpm/lib/Imakefile 2001/02/15 07:59:10 1.1.1.1 -+++ xc/extras/Xpm/lib/Imakefile 2004/11/01 15:49:11 -@@ -104,13 +104,15 @@ - CrBufFrI.c CrDatFrP.c CrPFrBuf.c RdFToI.c WrFFrI.c \ - CrBufFrP.c CrIFrBuf.c CrPFrDat.c RdFToP.c WrFFrP.c \ - CrDatFrI.c CrIFrDat.c RdFToDat.c WrFFrDat.c \ -- Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c -+ Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c \ -+ s_popen.c - - OBJS = data.o create.o misc.o rgb.o scan.o parse.o hashtab.o \ - CrBufFrI.o CrDatFrP.o CrPFrBuf.o RdFToI.o WrFFrI.o \ - CrBufFrP.o CrIFrBuf.o CrPFrDat.o RdFToP.o WrFFrP.o \ - CrDatFrI.o CrIFrDat.o RdFToDat.o WrFFrDat.o \ -- Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o -+ Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o \ -+ s_popen.o - - INCLUDES = -I. - LINTLIBS = $(LINTXTOLL) $(LINTXLIB) -Index: extras/Xpm/lib/RdFToBuf.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/RdFToBuf.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 RdFToBuf.c ---- xc/extras/Xpm/lib/RdFToBuf.c 2001/02/15 07:59:10 1.1.1.1 -+++ xc/extras/Xpm/lib/RdFToBuf.c 2004/11/01 15:49:16 -@@ -37,6 +37,8 @@ - * HeDu (hedu@cul-ipn.uni-kiel.de) 4/94 - */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - #include <sys/stat.h> - #if !defined(FOR_MSW) && !defined(WIN32) -@@ -58,7 +60,8 @@ - char *filename; - char **buffer_return; - { -- int fd, fcheck, len; -+ int fd, fcheck; -+ off_t len; - char *ptr; - struct stat stats; - FILE *fp; -@@ -82,7 +85,7 @@ - close(fd); - return XpmOpenFailed; - } -- len = (int) stats.st_size; -+ len = stats.st_size; - ptr = (char *) XpmMalloc(len + 1); - if (!ptr) { - fclose(fp); -Index: extras/Xpm/lib/RdFToI.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/RdFToI.c,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 RdFToI.c ---- xc/extras/Xpm/lib/RdFToI.c 2002/01/19 11:08:43 1.1.1.2 -+++ xc/extras/Xpm/lib/RdFToI.c 2004/11/01 15:49:20 -@@ -33,6 +33,8 @@ - \*****************************************************************************/ - /* $XFree86: xc/extras/Xpm/lib/RdFToI.c,v 1.2 2001/10/28 03:32:09 tsi Exp $ */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - #include <sys/stat.h> - #if !defined(NO_ZPIPE) && defined(WIN32) -@@ -123,6 +125,12 @@ - /* - * open the given file to be read as an xpmData which is returned. - */ -+#ifndef NO_ZPIPE -+ FILE *s_popen(char *cmd, const char *type); -+#else -+# define s_popen popen -+#endif -+ - static int - OpenReadFile(filename, mdata) - char *filename; -@@ -141,17 +149,21 @@ - mdata->type = XPMFILE; - } else { - #ifndef NO_ZPIPE -- int len = strlen(filename); -+ size_t len = strlen(filename); -+ -+ if(len == 0 || -+ filename[len-1] == '/') -+ return(XpmOpenFailed); - if ((len > 2) && !strcmp(".Z", filename + (len - 2))) { - mdata->type = XPMPIPE; -- sprintf(buf, "uncompress -c \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "r"))) -+ snprintf(buf, sizeof(buf), "uncompress -c \"%s\"", filename); -+ if (!(mdata->stream.file = s_popen(buf, "r"))) - return (XpmOpenFailed); - - } else if ((len > 3) && !strcmp(".gz", filename + (len - 3))) { - mdata->type = XPMPIPE; -- sprintf(buf, "gunzip -qc \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "r"))) -+ snprintf(buf, sizeof(buf), "gunzip -qc \"%s\"", filename); -+ if (!(mdata->stream.file = s_popen(buf, "r"))) - return (XpmOpenFailed); - - } else { -@@ -159,19 +171,19 @@ - if (!(compressfile = (char *) XpmMalloc(len + 4))) - return (XpmNoMemory); - -- sprintf(compressfile, "%s.Z", filename); -+ snprintf(compressfile, len+4, "%s.Z", filename); - if (!stat(compressfile, &status)) { -- sprintf(buf, "uncompress -c \"%s\"", compressfile); -- if (!(mdata->stream.file = popen(buf, "r"))) { -+ snprintf(buf, sizeof(buf), "uncompress -c \"%s\"", compressfile); -+ if (!(mdata->stream.file = s_popen(buf, "r"))) { - XpmFree(compressfile); - return (XpmOpenFailed); - } - mdata->type = XPMPIPE; - } else { -- sprintf(compressfile, "%s.gz", filename); -+ snprintf(compressfile, len+4, "%s.gz", filename); - if (!stat(compressfile, &status)) { -- sprintf(buf, "gunzip -c \"%s\"", compressfile); -- if (!(mdata->stream.file = popen(buf, "r"))) { -+ snprintf(buf, sizeof(buf), "gunzip -c \"%s\"", compressfile); -+ if (!(mdata->stream.file = s_popen(buf, "r"))) { - XpmFree(compressfile); - return (XpmOpenFailed); - } -@@ -217,7 +229,7 @@ - break; - #ifndef NO_ZPIPE - case XPMPIPE: -- pclose(mdata->stream.file); -+ fclose(mdata->stream.file); - break; - #endif - } -Index: extras/Xpm/lib/WrFFrBuf.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/WrFFrBuf.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 WrFFrBuf.c ---- xc/extras/Xpm/lib/WrFFrBuf.c 2001/02/15 07:59:10 1.1.1.1 -+++ xc/extras/Xpm/lib/WrFFrBuf.c 2004/11/01 15:49:20 -@@ -32,6 +32,8 @@ - * Developed by Arnaud Le Hors * - \*****************************************************************************/ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - - int -@@ -49,7 +51,7 @@ - fcheck = fwrite(buffer, len, 1, fp); - fclose(fp); - if (fcheck != 1) -- return XpmOpenFailed; -+ return XpmOpenFailed; /* maybe use a better return value */ - - return XpmSuccess; - } -Index: extras/Xpm/lib/WrFFrI.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/WrFFrI.c,v -retrieving revision 1.2 -diff -u -r1.2 WrFFrI.c ---- xc/extras/Xpm/lib/WrFFrI.c 2004/09/01 21:01:33 1.2 -+++ xc/extras/Xpm/lib/WrFFrI.c 2004/11/01 15:49:24 -@@ -38,6 +38,8 @@ - * Lorens Younes (d93-hyo@nada.kth.se) 4/96 - */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - #if !defined(NO_ZPIPE) && defined(WIN32) - # define popen _popen -@@ -98,7 +100,7 @@ - XpmInfo *info; - { - xpmData mdata; -- char *name, *dot, *s, new_name[BUFSIZ]; -+ char *name, *dot, *s, new_name[BUFSIZ] = {0}; - int ErrorStatus; - - /* open file to write */ -@@ -121,7 +123,8 @@ - #endif - /* let's try to make a valid C syntax name */ - if (index(name, '.')) { -- strcpy(new_name, name); -+ strncpy(new_name, name, sizeof(new_name)); -+ new_name[sizeof(new_name)-1] = 0; - /* change '.' to '_' */ - name = s = new_name; - while ((dot = index(s, '.'))) { -@@ -131,7 +134,8 @@ - } - if (index(name, '-')) { - if (name != new_name) { -- strcpy(new_name, name); -+ strncpy(new_name, name, sizeof(new_name)); -+ new_name[sizeof(new_name)-1] = 0; - name = new_name; - } - /* change '-' to '_' */ -@@ -248,7 +252,7 @@ - unsigned int x, y, h; - - h = height - 1; -- if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) -+ if (cpp != 0 && width >= (UINT_MAX - 3)/cpp) - return XpmNoMemory; - p = buf = (char *) XpmMalloc(width * cpp + 3); - if (!buf) -@@ -300,6 +304,11 @@ - /* - * open the given file to be written as an xpmData which is returned - */ -+#ifndef NO_ZPIPE -+ FILE *s_popen(char *cmd, const char *type); -+#else -+# define s_popen popen -+#endif - static int - OpenWriteFile(filename, mdata) - char *filename; -@@ -315,16 +324,23 @@ - mdata->type = XPMFILE; - } else { - #ifndef NO_ZPIPE -- int len = strlen(filename); -+ size_t len = strlen(filename); -+ -+ if(len == 0 || -+ filename[0] == '/' || -+ strstr(filename, "../") != NULL || -+ filename[len-1] == '/') -+ return(XpmOpenFailed); -+ - if (len > 2 && !strcmp(".Z", filename + (len - 2))) { -- sprintf(buf, "compress > \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "w"))) -+ snprintf(buf, sizeof(buf), "compress > \"%s\"", filename); -+ if (!(mdata->stream.file = s_popen(buf, "w"))) - return (XpmOpenFailed); - - mdata->type = XPMPIPE; - } else if (len > 3 && !strcmp(".gz", filename + (len - 3))) { -- sprintf(buf, "gzip -q > \"%s\"", filename); -- if (!(mdata->stream.file = popen(buf, "w"))) -+ snprintf(buf, sizeof(buf), "gzip -q > \"%s\"", filename); -+ if (!(mdata->stream.file = s_popen(buf, "w"))) - return (XpmOpenFailed); - - mdata->type = XPMPIPE; -@@ -355,7 +371,7 @@ - break; - #ifndef NO_ZPIPE - case XPMPIPE: -- pclose(mdata->stream.file); -+ fclose(mdata->stream.file); - break; - #endif - } -Index: extras/Xpm/lib/XpmI.h -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/XpmI.h,v -retrieving revision 1.7 -diff -u -r1.7 XpmI.h ---- xc/extras/Xpm/lib/XpmI.h 2004/09/01 21:01:33 1.7 -+++ xc/extras/Xpm/lib/XpmI.h 2004/11/01 15:49:28 -@@ -49,8 +49,10 @@ - * lets try to solve include files - */ - -+#include <sys/types.h> - #include <stdio.h> - #include <stdlib.h> -+#include <limits.h> - /* stdio.h doesn't declare popen on a Sequent DYNIX OS */ - #ifdef sequent - extern FILE *popen(); -Index: extras/Xpm/lib/create.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/create.c,v -retrieving revision 1.4 -diff -u -r1.4 create.c ---- xc/extras/Xpm/lib/create.c 2004/09/01 21:01:33 1.4 -+++ xc/extras/Xpm/lib/create.c 2004/11/01 15:50:06 -@@ -45,6 +45,8 @@ - * Lorens Younes (d93-hyo@nada.kth.se) 4/96 - */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - #include <ctype.h> - -@@ -586,7 +588,7 @@ - */ - } else { - #endif -- int i; -+ unsigned int i; - - #ifndef AMIGA - ncols = visual->map_entries; -@@ -746,12 +748,14 @@ - - - /* function call in case of error */ -+ - #undef RETURN - #define RETURN(status) \ -+do \ - { \ - ErrorStatus = status; \ - goto error; \ --} -+} while(0) - - int - XpmCreateImageFromXpmImage(display, image, -@@ -817,7 +821,7 @@ - - ErrorStatus = XpmSuccess; - -- if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) -+ if (image->ncolors >= UINT_MAX / sizeof(Pixel)) - return (XpmNoMemory); - - /* malloc pixels index tables */ -@@ -992,9 +996,13 @@ - return (XpmNoMemory); - - #if !defined(FOR_MSW) && !defined(AMIGA) -- if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height) -+ if (height != 0 && (*image_return)->bytes_per_line >= INT_MAX / height) { -+ XDestroyImage(*image_return); - return XpmNoMemory; -+ } - /* now that bytes_per_line must have been set properly alloc data */ -+ if((*image_return)->bytes_per_line == 0 || height == 0) -+ return XpmNoMemory; - (*image_return)->data = - (char *) XpmMalloc((*image_return)->bytes_per_line * height); - -@@ -1023,7 +1031,7 @@ - LFUNC(_putbits, void, (register char *src, int dstoffset, - register int numbits, register char *dst)); - --LFUNC(_XReverse_Bytes, int, (register unsigned char *bpt, register int nb)); -+LFUNC(_XReverse_Bytes, int, (register unsigned char *bpt, register unsigned int nb)); - - static unsigned char Const _reverse_byte[0x100] = { - 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, -@@ -1063,12 +1071,12 @@ - static int - _XReverse_Bytes(bpt, nb) - register unsigned char *bpt; -- register int nb; -+ register unsigned int nb; - { - do { - *bpt = _reverse_byte[*bpt]; - bpt++; -- } while (--nb > 0); -+ } while (--nb > 0); /* is nb user-controled? */ - return 0; - } - -@@ -1207,7 +1215,7 @@ - register char *src; - register char *dst; - register unsigned int *iptr; -- register int x, y, i; -+ register unsigned int x, y, i; - register char *data; - Pixel pixel, px; - int nbytes, depth, ibu, ibpp; -@@ -1217,8 +1225,8 @@ - depth = image->depth; - if (depth == 1) { - ibu = image->bitmap_unit; -- for (y = 0; y < height; y++) -- for (x = 0; x < width; x++, iptr++) { -+ for (y = 0; y < height; y++) /* how can we trust height */ -+ for (x = 0; x < width; x++, iptr++) { /* how can we trust width */ - pixel = pixels[*iptr]; - for (i = 0, px = pixel; i < sizeof(unsigned long); - i++, px >>= 8) -@@ -1293,12 +1301,12 @@ - { - unsigned char *data; - unsigned int *iptr; -- int y; -+ unsigned int y; - Pixel pixel; - - #ifdef WITHOUT_SPEEDUPS - -- int x; -+ unsigned int x; - unsigned char *addr; - - data = (unsigned char *) image->data; -@@ -1335,7 +1343,7 @@ - - #else /* WITHOUT_SPEEDUPS */ - -- int bpl = image->bytes_per_line; -+ unsigned int bpl = image->bytes_per_line; - unsigned char *data_ptr, *max_data; - - data = (unsigned char *) image->data; -@@ -1403,11 +1411,11 @@ - { - unsigned char *data; - unsigned int *iptr; -- int y; -+ unsigned int y; - - #ifdef WITHOUT_SPEEDUPS - -- int x; -+ unsigned int x; - unsigned char *addr; - - data = (unsigned char *) image->data; -@@ -1431,7 +1439,7 @@ - - Pixel pixel; - -- int bpl = image->bytes_per_line; -+ unsigned int bpl = image->bytes_per_line; - unsigned char *data_ptr, *max_data; - - data = (unsigned char *) image->data; -@@ -1484,11 +1492,11 @@ - { - char *data; - unsigned int *iptr; -- int y; -+ unsigned int y; - - #ifdef WITHOUT_SPEEDUPS - -- int x; -+ unsigned int x; - - data = image->data; - iptr = pixelindex; -@@ -1498,7 +1506,7 @@ - - #else /* WITHOUT_SPEEDUPS */ - -- int bpl = image->bytes_per_line; -+ unsigned int bpl = image->bytes_per_line; - char *data_ptr, *max_data; - - data = image->data; -@@ -1533,12 +1541,12 @@ - PutImagePixels(image, width, height, pixelindex, pixels); - else { - unsigned int *iptr; -- int y; -+ unsigned int y; - char *data; - - #ifdef WITHOUT_SPEEDUPS - -- int x; -+ unsigned int x; - - data = image->data; - iptr = pixelindex; -@@ -1761,6 +1769,9 @@ - Pixel px; - int nbytes; - -+ if(x < 0 || y < 0) -+ return 0; -+ - for (i=0, px=pixel; i<sizeof(unsigned long); i++, px>>=8) - ((unsigned char *)&pixel)[i] = px; - src = &ximage->data[XYINDEX(x, y, ximage)]; -@@ -1791,7 +1802,10 @@ - register char *dst; - register int i; - Pixel px; -- int nbytes, ibpp; -+ unsigned int nbytes, ibpp; -+ -+ if(x < 0 || y < 0) -+ return 0; - - ibpp = ximage->bits_per_pixel; - if (ximage->depth == 4) -@@ -1825,6 +1839,9 @@ - { - unsigned char *addr; - -+ if(x < 0 || y < 0) -+ return 0; -+ - addr = &((unsigned char *)ximage->data) [ZINDEX32(x, y, ximage)]; - *((unsigned long *)addr) = pixel; - return 1; -@@ -1840,6 +1857,9 @@ - { - unsigned char *addr; - -+ if(x < 0 || y < 0) -+ return 0; -+ - addr = &((unsigned char *)ximage->data) [ZINDEX32(x, y, ximage)]; - addr[0] = pixel >> 24; - addr[1] = pixel >> 16; -@@ -1857,6 +1877,9 @@ - { - unsigned char *addr; - -+ if(x < 0 || y < 0) -+ return 0; -+ - addr = &((unsigned char *)ximage->data) [ZINDEX32(x, y, ximage)]; - addr[3] = pixel >> 24; - addr[2] = pixel >> 16; -@@ -1874,6 +1897,9 @@ - { - unsigned char *addr; - -+ if(x < 0 || y < 0) -+ return 0; -+ - addr = &((unsigned char *)ximage->data) [ZINDEX16(x, y, ximage)]; - addr[0] = pixel >> 8; - addr[1] = pixel; -@@ -1889,6 +1915,9 @@ - { - unsigned char *addr; - -+ if(x < 0 || y < 0) -+ return 0; -+ - addr = &((unsigned char *)ximage->data) [ZINDEX16(x, y, ximage)]; - addr[1] = pixel >> 8; - addr[0] = pixel; -@@ -1902,6 +1931,9 @@ - int y; - unsigned long pixel; - { -+ if(x < 0 || y < 0) -+ return 0; -+ - ximage->data[ZINDEX8(x, y, ximage)] = pixel; - return 1; - } -@@ -1913,6 +1945,9 @@ - int y; - unsigned long pixel; - { -+ if(x < 0 || y < 0) -+ return 0; -+ - if (pixel & 1) - ximage->data[ZINDEX1(x, y, ximage)] |= 0x80 >> (x & 7); - else -@@ -1927,6 +1962,9 @@ - int y; - unsigned long pixel; - { -+ if(x < 0 || y < 0) -+ return 0; -+ - if (pixel & 1) - ximage->data[ZINDEX1(x, y, ximage)] |= 1 << (x & 7); - else -@@ -2061,8 +2099,8 @@ - xpmGetCmt(data, &colors_cmt); - - /* malloc pixels index tables */ -- if (ncolors >= SIZE_MAX / sizeof(Pixel)) -- return XpmNoMemory; -+ if (ncolors >= UINT_MAX / sizeof(Pixel)) -+ RETURN(XpmNoMemory); - - image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors); - if (!image_pixels) -@@ -2174,7 +2212,7 @@ - * free the hastable - */ - if (ErrorStatus != XpmSuccess) -- RETURN(ErrorStatus) -+ RETURN(ErrorStatus); - else if (USE_HASHTABLE) - xpmHashTableFree(&hashtable); - -@@ -2366,11 +2404,11 @@ - - /* array of pointers malloced by need */ - unsigned short *cidx[256]; -- int char1; -+ unsigned int char1; - - bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ - for (a = 0; a < ncolors; a++) { -- char1 = colorTable[a].string[0]; -+ char1 = (unsigned char) colorTable[a].string[0]; - if (cidx[char1] == NULL) { /* get new memory */ - cidx[char1] = (unsigned short *) - XpmCalloc(256, sizeof(unsigned short)); -Index: extras/Xpm/lib/data.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/data.c,v -retrieving revision 1.2 -diff -u -r1.2 data.c ---- xc/extras/Xpm/lib/data.c 2004/09/01 21:01:33 1.2 -+++ xc/extras/Xpm/lib/data.c 2004/11/01 15:50:10 -@@ -33,6 +33,8 @@ - \*****************************************************************************/ - /* $XFree86: xc/extras/Xpm/lib/data.c,v 1.4 2002/01/07 19:40:49 dawes Exp $ */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #ifndef CXPMPROG - #if 0 - /* Official version number */ -@@ -262,7 +264,7 @@ - } - Ungetc(data, c, file); - } -- return (n); -+ return (n); /* this returns bytes read + 1 */ - } - - /* -@@ -375,8 +377,9 @@ - { - if (!data->type) - *cmt = NULL; -- else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) { -- *cmt = (char *) XpmMalloc(data->CommentLength + 1); -+ else if (data->CommentLength != 0 && data->CommentLength < UINT_MAX - 1) { -+ if( (*cmt = (char *) XpmMalloc(data->CommentLength + 1)) == NULL) -+ return XpmNoMemory; - strncpy(*cmt, data->Comment, data->CommentLength); - (*cmt)[data->CommentLength] = '\0'; - data->CommentLength = 0; -@@ -400,7 +403,7 @@ - xpmParseHeader(data) - xpmData *data; - { -- char buf[BUFSIZ]; -+ char buf[BUFSIZ+1] = {0}; - int l, n = 0; - - if (data->type) { -Index: extras/Xpm/lib/hashtab.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/hashtab.c,v -retrieving revision 1.2 -diff -u -r1.2 hashtab.c ---- xc/extras/Xpm/lib/hashtab.c 2004/09/01 21:01:33 1.2 -+++ xc/extras/Xpm/lib/hashtab.c 2004/11/01 15:50:14 -@@ -138,13 +138,13 @@ - unsigned int size = table->size; - xpmHashAtom *t, *p; - int i; -- int oldSize = size; -+ unsigned int oldSize = size; - - t = atomTable; - HASH_TABLE_GROWS - table->size = size; - table->limit = size / 3; -- if (size >= SIZE_MAX / sizeof(*atomTable)) -+ if (size >= UINT_MAX / sizeof(*atomTable)) - return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable)); - if (!atomTable) -@@ -206,7 +206,7 @@ - table->size = INITIAL_HASH_SIZE; - table->limit = table->size / 3; - table->used = 0; -- if (table->size >= SIZE_MAX / sizeof(*atomTable)) -+ if (table->size >= UINT_MAX / sizeof(*atomTable)) - return (XpmNoMemory); - atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable)); - if (!atomTable) -Index: extras/Xpm/lib/misc.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/misc.c,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 misc.c ---- xc/extras/Xpm/lib/misc.c 2001/02/15 07:59:10 1.1.1.1 -+++ xc/extras/Xpm/lib/misc.c 2004/11/01 15:50:14 -@@ -44,7 +44,7 @@ - char *s1; - { - char *s2; -- int l = strlen(s1) + 1; -+ size_t l = strlen(s1) + 1; - - if (s2 = (char *) XpmMalloc(l)) - strcpy(s2, s1); -Index: extras/Xpm/lib/parse.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/parse.c,v -retrieving revision 1.2 -diff -u -r1.2 parse.c ---- xc/extras/Xpm/lib/parse.c 2004/09/01 21:01:33 1.2 -+++ xc/extras/Xpm/lib/parse.c 2004/11/01 15:50:28 -@@ -41,26 +41,28 @@ - * HeDu (hedu@cul-ipn.uni-kiel.de) 4/94 - */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - #include <ctype.h> - #include <string.h> - - #ifdef HAS_STRLCAT --# define STRLCAT(dst, src, dstsize) { \ -+# define STRLCAT(dst, src, dstsize) do { \ - if (strlcat(dst, src, dstsize) >= (dstsize)) \ -- return (XpmFileInvalid); } --# define STRLCPY(dst, src, dstsize) { \ -+ return (XpmFileInvalid); } while(0) -+# define STRLCPY(dst, src, dstsize) do { \ - if (strlcpy(dst, src, dstsize) >= (dstsize)) \ -- return (XpmFileInvalid); } -+ return (XpmFileInvalid); } while(0) - #else --# define STRLCAT(dst, src, dstsize) { \ -+# define STRLCAT(dst, src, dstsize) do { \ - if ((strlen(dst) + strlen(src)) < (dstsize)) \ - strcat(dst, src); \ -- else return (XpmFileInvalid); } --# define STRLCPY(dst, src, dstsize) { \ -+ else return (XpmFileInvalid); } while(0) -+# define STRLCPY(dst, src, dstsize) do { \ - if (strlen(src) < (dstsize)) \ - strcpy(dst, src); \ -- else return (XpmFileInvalid); } -+ else return (XpmFileInvalid); } while(0) - #endif - - LFUNC(ParsePixels, int, (xpmData *data, unsigned int width, -@@ -205,7 +207,7 @@ - char **defaults; - int ErrorStatus; - -- if (ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ if (ncolors >= UINT_MAX / sizeof(XpmColor)) - return (XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor)); - if (!colorTable) -@@ -218,7 +220,7 @@ - /* - * read pixel value - */ -- if (cpp >= SIZE_MAX - 1) { -+ if (cpp >= UINT_MAX - 1) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -@@ -277,9 +279,9 @@ - return (XpmFileInvalid); - } - if (!lastwaskey) -- STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */ -+ STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */ - buf[l] = '\0'; -- STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */ -+ STRLCAT(curbuf, buf, sizeof(curbuf)); /* append buf */ - lastwaskey = 0; - } - } -@@ -287,7 +289,7 @@ - xpmFreeColorTable(colorTable, ncolors); - return (XpmFileInvalid); - } -- len = strlen(curbuf) + 1; -+ len = strlen(curbuf) + 1; /* integer overflow just theoretically possible */ - s = defaults[curkey] = (char *) XpmMalloc(len); - if (!s) { - xpmFreeColorTable(colorTable, ncolors); -@@ -306,7 +308,7 @@ - /* - * read pixel value - */ -- if (cpp >= SIZE_MAX - 1) { -+ if (cpp >= UINT_MAX - 1) { - xpmFreeColorTable(colorTable, ncolors); - return (XpmNoMemory); - } -@@ -351,7 +353,7 @@ - memcpy(s, curbuf, len); - color->c_color = s; - *curbuf = '\0'; /* reset curbuf */ -- if (a < ncolors - 1) -+ if (a < ncolors - 1) /* can we trust ncolors -> leave data's bounds */ - xpmNextString(data); /* get to the next string */ - } - } -@@ -370,11 +372,11 @@ - xpmHashTable *hashtable; - unsigned int **pixels; - { -- unsigned int *iptr, *iptr2; -+ unsigned int *iptr, *iptr2 = NULL; /* found by Egbert Eich */ - unsigned int a, x, y; - -- if ((height > 0 && width >= SIZE_MAX / height) || -- width * height >= SIZE_MAX / sizeof(unsigned int)) -+ if ((height > 0 && width >= UINT_MAX / height) || -+ width * height >= UINT_MAX / sizeof(unsigned int)) - return XpmNoMemory; - #ifndef FOR_MSW - iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height); -@@ -399,8 +401,10 @@ - { - unsigned short colidx[256]; - -- if (ncolors > 256) -+ if (ncolors > 256) { -+ XpmFree(iptr2); /* found by Egbert Eich */ - return (XpmFileInvalid); -+ } - - bzero((char *)colidx, 256 * sizeof(short)); - for (a = 0; a < ncolors; a++) -@@ -427,16 +431,20 @@ - { - - /* free all allocated pointers at all exits */ --#define FREE_CIDX {int f; for (f = 0; f < 256; f++) \ --if (cidx[f]) XpmFree(cidx[f]);} -+#define FREE_CIDX \ -+do \ -+{ \ -+ int f; for (f = 0; f < 256; f++) \ -+ if (cidx[f]) XpmFree(cidx[f]); \ -+} while(0) - - /* array of pointers malloced by need */ - unsigned short *cidx[256]; -- int char1; -+ unsigned int char1; - - bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */ - for (a = 0; a < ncolors; a++) { -- char1 = colorTable[a].string[0]; -+ char1 = (unsigned char) colorTable[a].string[0]; - if (cidx[char1] == NULL) { /* get new memory */ - cidx[char1] = (unsigned short *) - XpmCalloc(256, sizeof(unsigned short)); -@@ -480,8 +488,10 @@ - char *s; - char buf[BUFSIZ]; - -- if (cpp >= sizeof(buf)) -+ if (cpp >= sizeof(buf)) { -+ XpmFree(iptr2); /* found by Egbert Eich */ - return (XpmFileInvalid); -+ } - - buf[cpp] = '\0'; - if (USE_HASHTABLE) { -@@ -491,7 +501,7 @@ - xpmNextString(data); - for (x = 0; x < width; x++, iptr++) { - for (a = 0, s = buf; a < cpp; a++, s++) -- *s = xpmGetC(data); -+ *s = xpmGetC(data); /* int assigned to char, not a problem here */ - slot = xpmHashSlot(hashtable, buf); - if (!*slot) { /* no color matches */ - XpmFree(iptr2); -@@ -505,7 +515,7 @@ - xpmNextString(data); - for (x = 0; x < width; x++, iptr++) { - for (a = 0, s = buf; a < cpp; a++, s++) -- *s = xpmGetC(data); -+ *s = xpmGetC(data); /* int assigned to char, not a problem here */ - for (a = 0; a < ncolors; a++) - if (!strcmp(colorTable[a].string, buf)) - break; -@@ -560,7 +570,7 @@ - while (!notstart && notend) { - /* there starts an extension */ - ext = (XpmExtension *) -- XpmRealloc(exts, (num + 1) * sizeof(XpmExtension)); -+ XpmRealloc(exts, (num + 1) * sizeof(XpmExtension)); /* can the loop be forced to iterate often enough to make "(num + 1) * sizeof(XpmExtension)" wrapping? */ - if (!ext) { - XpmFree(string); - XpmFreeExtensions(exts, num); -@@ -597,7 +607,7 @@ - while ((notstart = strncmp("XPMEXT", string, 6)) - && (notend = strncmp("XPMENDEXT", string, 9))) { - sp = (char **) -- XpmRealloc(ext->lines, (nlines + 1) * sizeof(char *)); -+ XpmRealloc(ext->lines, (nlines + 1) * sizeof(char *)); /* can we iterate enough for a wrapping? */ - if (!sp) { - XpmFree(string); - ext->nlines = nlines; -@@ -637,9 +647,9 @@ - /* function call in case of error */ - #undef RETURN - #define RETURN(status) \ --{ \ -+do { \ - goto error; \ --} -+} while(0) - - /* - * This function parses an Xpm file or data and store the found informations -Index: extras/Xpm/lib/s_popen.c -=================================================================== -RCS file: s_popen.c -diff -N s_popen.c ---- /dev/null Sat Aug 30 18:16:59 1997 -+++ xc/extras/Xpm/lib/s_popen.c Mon Nov 1 15:50:32 2004 -@@ -0,0 +1,181 @@ -+/* -+ * Copyright (C) 2004 The X.Org fundation -+ * -+ * Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, copy, -+ * modify, merge, publish, distribute, sublicense, and/or sell copies -+ * of the Software, and to permit persons to whom the Software is fur- -+ * nished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR -+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ * -+ * Except as contained in this notice, the name of the X.Org fundation -+ * shall not be used in advertising or otherwise to promote the sale, -+ * use or other dealings in this Software without prior written -+ * authorization from the X.Org fundation. -+ */ -+ -+/* -+** This is a secure but NOT 100% compatible replacement for popen() -+** Note: - don't use pclose() use fclose() for closing the returned -+** filedesc.!!! -+** -+** Known Bugs: - unable to use i/o-redirection like > or < -+** Author: - Thomas Biege <thomas@suse.de> -+** Credits: - Andreas Pfaller <a.pfaller@pop.gun.de> for fixing a SEGV when -+** calling strtok() -+*/ -+ -+#include <sys/types.h> -+#include <sys/wait.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <string.h> -+ -+#define __SEC_POPEN_TOKEN " " -+ -+FILE *s_popen(char *cmd, const char *type) -+{ -+ pid_t pid; -+ int pfd[2]; -+ int rpipe = 0, wpipe = 0, i; -+ char **argv; -+ char *ptr; -+ char *cmdcpy; -+ -+ -+ if(cmd == NULL || cmd == "") -+ return(NULL); -+ -+ if(type[0] != 'r' && type[0] != 'w') -+ return(NULL); -+ -+ if ((cmdcpy = strdup(cmd)) == NULL) -+ return(NULL); -+ -+ argv = NULL; -+ if( (ptr = strtok(cmdcpy, __SEC_POPEN_TOKEN)) == NULL) -+ { -+ free(cmdcpy); -+ return(NULL); -+ } -+ -+ for(i = 0;; i++) -+ { -+ if( ( argv = (char **) realloc(argv, (i+1) * sizeof(char *)) ) == NULL) -+ { -+ free(cmdcpy); -+ return(NULL); -+ } -+ -+ if( (*(argv+i) = (char *) malloc((strlen(ptr)+1) * sizeof(char))) == NULL) -+ { -+ free(cmdcpy); -+ return(NULL); -+ } -+ -+ strcpy(argv[i], ptr); -+ -+ if( (ptr = strtok(NULL, __SEC_POPEN_TOKEN)) == NULL) -+ { -+ if( ( argv = (char **) realloc(argv, (i+2) * sizeof(char *))) == NULL) -+ { -+ free(cmdcpy); -+ return(NULL); -+ } -+ argv[i+1] = NULL; -+ break; -+ } -+ } -+ -+ -+ if(type[0] == 'r') -+ rpipe = 1; -+ else -+ wpipe = 1; -+ -+ if (pipe(pfd) < 0) -+ { -+ free(cmdcpy); -+ return(NULL); -+ } -+ -+ if((pid = fork()) < 0) -+ { -+ close(pfd[0]); -+ close(pfd[1]); -+ free(cmdcpy); -+ return(NULL); -+ } -+ -+ if(pid == 0) /* child */ -+ { -+ if((pid = fork()) < 0) -+ { -+ close(pfd[0]); -+ close(pfd[1]); -+ free(cmdcpy); -+ return(NULL); -+ } -+ if(pid > 0) -+ { -+ exit(0); /* child nr. 1 exits */ -+ } -+ -+ /* child nr. 2 */ -+ if(rpipe) -+ { -+ close(pfd[0]); /* close reading end, we don't need it */ -+ dup2(STDOUT_FILENO, STDERR_FILENO); -+ if (pfd[1] != STDOUT_FILENO) -+ dup2(pfd[1], STDOUT_FILENO); /* redirect stdout to writing end of pipe */ -+ } -+ else -+ { -+ close(pfd[1]); /* close writing end, we don't need it */ -+ if (pfd[0] != STDIN_FILENO) -+ dup2(pfd[0], STDIN_FILENO); /* redirect stdin to reading end of pipe */ -+ } -+ -+ if(strchr(argv[0], '/') == NULL) -+ execvp(argv[0], argv); /* search in $PATH */ -+ else -+ execv(argv[0], argv); -+ -+ close(pfd[0]); -+ close(pfd[1]); -+ free(cmdcpy); -+ return(NULL); /* exec failed.. ooops! */ -+ } -+ else /* parent */ -+ { -+ waitpid(pid, NULL, 0); /* wait for child nr. 1 */ -+ -+ if(rpipe) -+ { -+ close(pfd[1]); -+ free(cmdcpy); -+ return(fdopen(pfd[0], "r")); -+ } -+ else -+ { -+ close(pfd[0]); -+ free(cmdcpy); -+ return(fdopen(pfd[1], "w")); -+ } -+ -+ } -+} -+ -Index: extras/Xpm/lib/scan.c -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/scan.c,v -retrieving revision 1.2 -diff -u -r1.2 scan.c ---- xc/extras/Xpm/lib/scan.c 2004/09/01 21:01:33 1.2 -+++ xc/extras/Xpm/lib/scan.c 2004/11/01 15:50:44 -@@ -43,6 +43,8 @@ - * Lorens Younes (d93-hyo@nada.kth.se) 4/96 - */ - -+/* October 2004, source code review by Thomas Biege <thomas@suse.de> */ -+ - #include "XpmI.h" - - #define MAXPRINTABLE 92 /* number of printable ascii chars -@@ -172,10 +174,10 @@ - /* function call in case of error */ - #undef RETURN - #define RETURN(status) \ --{ \ -+do { \ - ErrorStatus = status; \ - goto error; \ --} -+} while(0) - - /* - * This function scans the given image and stores the found informations in -@@ -233,15 +235,15 @@ - else - cpp = 0; - -- if ((height > 0 && width >= SIZE_MAX / height) || -- width * height >= SIZE_MAX / sizeof(unsigned int)) -+ if ((height > 0 && width >= UINT_MAX / height) || -+ width * height >= UINT_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)) -+ if (pmap.size >= UINT_MAX / sizeof(Pixel)) - RETURN(XpmNoMemory); - - pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size); -@@ -308,7 +310,7 @@ - * get rgb values and a string of char, and possibly a name for each - * color - */ -- if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor)) -+ if (pmap.ncolors >= UINT_MAX / sizeof(XpmColor)) - RETURN(XpmNoMemory); - colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor)); - if (!colorTable) -@@ -368,7 +370,7 @@ - - /* first get a character string */ - a = 0; -- if (cpp >= SIZE_MAX - 1) -+ if (cpp >= UINT_MAX - 1) - return (XpmNoMemory); - if (!(s = color->string = (char *) XpmMalloc(cpp + 1))) - return (XpmNoMemory); -@@ -461,7 +463,7 @@ - } - - /* first get character strings and rgb values */ -- if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1) -+ if (ncolors >= UINT_MAX / sizeof(XColor) || cpp >= UINT_MAX - 1) - return (XpmNoMemory); - xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors); - if (!xcolors) -@@ -619,7 +621,7 @@ - char *dst; - unsigned int *iptr; - char *data; -- int x, y, i; -+ unsigned int x, y, i; - int bits, depth, ibu, ibpp, offset; - unsigned long lbt; - Pixel pixel, px; -@@ -721,7 +723,7 @@ - unsigned char *addr; - unsigned char *data; - unsigned int *iptr; -- int x, y; -+ unsigned int x, y; - unsigned long lbt; - Pixel pixel; - int depth; -@@ -786,7 +788,7 @@ - unsigned char *addr; - unsigned char *data; - unsigned int *iptr; -- int x, y; -+ unsigned int x, y; - unsigned long lbt; - Pixel pixel; - int depth; -@@ -831,7 +833,7 @@ - { - unsigned int *iptr; - unsigned char *data; -- int x, y; -+ unsigned int x, y; - unsigned long lbt; - Pixel pixel; - int depth; -@@ -864,7 +866,7 @@ - storeFuncPtr storeFunc; - { - unsigned int *iptr; -- int x, y; -+ unsigned int x, y; - char *data; - Pixel pixel; - int xoff, yoff, offset, bpl; -@@ -900,11 +902,11 @@ - # else /* AMIGA */ - - #define CLEAN_UP(status) \ --{\ -+do {\ - if (pixels) XpmFree (pixels);\ - if (tmp_img) FreeXImage (tmp_img);\ - return (status);\ --} -+} while(0) - - static int - AGetImagePixels ( -@@ -925,7 +927,7 @@ - - tmp_img = AllocXImage ((((width+15)>>4)<<4), 1, image->rp->BitMap->Depth); - if (tmp_img == NULL) -- CLEAN_UP (XpmNoMemory) -+ CLEAN_UP (XpmNoMemory); - - iptr = pmap->pixelindex; - for (y = 0; y < height; ++y) -@@ -934,11 +936,11 @@ - for (x = 0; x < width; ++x, ++iptr) - { - if ((*storeFunc) (pixels[x], pmap, iptr)) -- CLEAN_UP (XpmNoMemory) -+ CLEAN_UP (XpmNoMemory); - } - } - -- CLEAN_UP (XpmSuccess) -+ CLEAN_UP (XpmSuccess); - } - - #undef CLEAN_UP -Index: extras/Xpm/lib/xpm.h -=================================================================== -RCS file: /cvs/XF4/xc/extras/Xpm/lib/xpm.h,v -retrieving revision 1.1.1.3 -diff -u -r1.1.1.3 xpm.h ---- xc/extras/Xpm/lib/xpm.h 2004/02/13 21:41:55 1.1.1.3 -+++ xc/extras/Xpm/lib/xpm.h 2004/11/01 15:51:02 -@@ -377,7 +377,7 @@ - FUNC(XpmAttributesSize, int, (void)); - FUNC(XpmFreeAttributes, void, (XpmAttributes *attributes)); - FUNC(XpmFreeExtensions, void, (XpmExtension *extensions, -- int nextensions)); -+ unsigned int nextensions)); - - FUNC(XpmFreeXpmImage, void, (XpmImage *image)); - FUNC(XpmFreeXpmInfo, void, (XpmInfo *info)); -Index: lib/Xpm/Imakefile -=================================================================== -RCS file: /cvs/XF4/xc/lib/Xpm/Imakefile,v -retrieving revision 1.2 -diff -u -r1.2 Imakefile ---- xc/lib/Xpm/Imakefile 2004/09/01 21:01:42 1.2 -+++ xc/lib/Xpm/Imakefile 2004/11/01 15:51:02 -@@ -46,12 +46,20 @@ - STRLCATDEF = -DHAS_STRLCAT - #endif - -+#if HasSnprintf -+SNPRINTFDEF = -DHAS_SNPRINTF -+#else -+SNPRINTFDEF = -Dsnprintf=_XpmSnprintf -+SNPRINTFSRCS = snprintf.c -+SNPRINTFOBJS = snprintf.o -+#endif -+ - #if defined(Win32Architecture) - ZPIPEDEF = -DNO_ZPIPE - #endif - - DEFINES = $(STRDUPDEF) $(STRCASECMPDEF) $(SPRINTFDEF) $(STRLCATDEF) \ -- $(ZPIPEDEF) $(ZFILEDEF) -+ $(SNPRINTFDEF) $(ZPIPEDEF) $(ZFILEDEF) - - HEADERS = xpm.h - -@@ -59,13 +67,15 @@ - CrBufFrI.c CrDatFrP.c CrPFrBuf.c RdFToI.c WrFFrI.c \ - CrBufFrP.c CrIFrBuf.c CrPFrDat.c RdFToP.c WrFFrP.c \ - CrDatFrI.c CrIFrDat.c RdFToDat.c WrFFrDat.c \ -- Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c -+ Attrib.c CrIFrP.c CrPFrI.c Image.c Info.c RdFToBuf.c WrFFrBuf.c \ -+ s_popen.c $(SNPRINTFSRCS) - - OBJS = data.o create.o misc.o rgb.o scan.o parse.o hashtab.o \ - CrBufFrI.o CrDatFrP.o CrPFrBuf.o RdFToI.o WrFFrI.o \ - CrBufFrP.o CrIFrBuf.o CrPFrDat.o RdFToP.o WrFFrP.o \ - CrDatFrI.o CrIFrDat.o RdFToDat.o WrFFrDat.o \ -- Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o -+ Attrib.o CrIFrP.o CrPFrI.o Image.o Info.o RdFToBuf.o WrFFrBuf.o \ -+ s_popen.o $(SNPRINTFOBJS) - - XPMDIR = $(TOP)/extras/Xpm - XPMLIBDIR = $(TOP)/extras/Xpm/lib -@@ -104,5 +114,10 @@ - LinkSourceFile(RdFToBuf.c,$(XPMLIBDIR)) - LinkSourceFile(WrFFrBuf.c,$(XPMLIBDIR)) - LinkSourceFile(xpm.h,$(XPMLIBDIR)) -+LinkSourceFile(s_popen.c,$(XPMLIBDIR)) -+ -+#if !HasSnprintf -+LinkSourceFile(snprintf.c,$(LIBSRC)/misc) -+#endif - - DependTarget() diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild deleted file mode 100644 index be187c9dca82..000000000000 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild +++ /dev/null @@ -1,1367 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild,v 1.14 2005/01/21 17:31:49 spyderous Exp $ - -# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory -# voodoo3 cards. - -# Libraries which are now supplied in shared form that were not in the past -# include: libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so, -# libXinerama.so, libXss.so, libXvMC.so, libXxf86rush.so, libfontenc.so, -# libxkbfile.so, libxkbui.so - -# TODO -# 11 August 2004 <spyderous@gentoo.org> -# TARGET: patchset 0.2 -# Nothing yet =) - -inherit eutils flag-o-matic toolchain-funcs x11 linux-info - -# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure -# that only we only strip stuff that are safe to strip ... -RESTRICT="nostrip" - -# IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004) -IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc hardened - insecure-drivers ipv6 mmx nls pam sdk sse static xprint" -# IUSE_INPUT_DEVICES="synaptics wacom" - -FILES_VER="0.4" -PATCH_VER="0.2.2.1" -XCUR_VER="0.3.1" -#MGADRV_VER="1_3_0beta" -#VIADRV_VER="0.1" -XFSFT_ENC_VER="0.1" - -S=${WORKDIR}/xc - -HOMEPAGE="http://xorg.freedesktop.org/" - -# Misc patches we may need to fetch .. -X_PATCHES="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2 - http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-patches-${PATCH_VER}.tar.bz2 - http://dev.gentoo.org/~cyfred/distfiles/${P}-patches-${PATCH_VER}.tar.bz2" - -X_DRIVERS="" -# mirror://gentoo/${P}-drivers-via-${VIADRV_VER}.tar.bz2" -# Latest Savage drivers: http://www.probo.com/timr/savage40.html -# Latest SIS drivers: http://www.winischhofer.net/ - -GENTOO_FILES="mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2 - http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-files-${FILES_VER}.tar.bz2 - http://dev.gentoo.org/~cyfred/distfiles/${P}-files-${FILES_VER}.tar.bz2" - -SRC_URI="mirror://gentoo/eurofonts-X11.tar.bz2 - http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 - mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 - nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 ) - ${GENTOO_FILES} - ${X_DRIVERS} - ${X_PATCHES} - http://freedesktop.org/~xorg/X11R${PV}/src/X11R${PV}-src1.tar.gz - http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src2.tar.gz - http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src3.tar.gz - http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src4.tar.gz - http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src5.tar.gz - doc? ( - http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src6.tar.gz - http://freedesktop.org/~xorg/X11R${PV}/src//X11R${PV}-src7.tar.gz - )" - -LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2 - bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor - nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0 - MIT SGI-B BSD || ( FTL GPL-2 )" -SLOT="0" -KEYWORDS="x86 ~ppc sparc ~ppc64 alpha amd64 hppa arm mips ia64" - -# Need portage-2.0.50_pre9 for `use !foo` -DEPEND=">=sys-libs/ncurses-5.1 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r5 - >=dev-libs/expat-1.95.3 - >=media-libs/freetype-2.1.4 - >=media-libs/fontconfig-2.1-r1 - >=x11-base/opengl-update-1.7.2 - >=x11-misc/ttmkfdir-3.0.9-r2 - >=sys-apps/sed-4 - sys-apps/util-linux - dev-lang/perl - media-libs/libpng - >=sys-apps/portage-2.0.50_pre9 - !virtual/xft - !virtual/x11" -# x11-libs/xft -- blocked because of interference with xorg's - -PDEPEND="x86? ( - 3dfx? ( >=media-libs/glide-v3-3.10 ) - input_devices_synaptics? ( x11-misc/synaptics ) - input_devices_wacom? ( x11-misc/linuxwacom ) - ) - alpha? ( - 3dfx? ( >=media-libs/glide-v3-3.10 ) - ) - x11-terms/xterm" - -PROVIDE="virtual/x11 - virtual/opengl - virtual/glu - virtual/xft" - -DESCRIPTION="An X11 implementation maintained by the X.Org Foundation" - -HOSTCONF="config/cf/host.def" - -cflag_setup() { - # Set up CFLAGS - filter-flags "-funroll-loops" - - ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O1 -O2 -O3 -pipe -fomit-frame-pointer -g -gstabs+ -gstabs -ggdb" - # arch-specific section added by popular demand - case "${ARCH}" in - mips) ALLOWED_FLAGS="${ALLOWED_FLAGS} -mtune -mips1 -mips2 -mips3 -mips4 -mabi" ;; - # -fomit-frame-pointer known to break things and is pointless - # according to ciaranm - # And hardened compiler must be softened. -- fmccor, 20.viii.04 - sparc) filter-flags "-fomit-frame-pointer" - if use hardened - then - einfo "Softening gcc for sparc" - ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE" - append-flags "-fno-pie -fno-PIE" - fi - ;; - # gcc-3.3.2 causes invalid insn error - hppa ) replace-cpu-flags 2.0 1.0 ;; - esac - - # Recently there has been a lot of stability problem in Gentoo-land. Many - # things can be the cause to this, but I believe that it is due to gcc3 - # still having issues with optimizations, or with it not filtering bad - # combinations (protecting the user maybe from themselves) yet. - # - # This can clearly be seen in large builds like glibc, where too aggressive - # CFLAGS cause the tests to fail miserbly. - # - # Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion - # knows what he is talking about: - # - # People really shouldn't force code-specific options on... It's a - # bad idea. The -march options aren't just to look pretty. They enable - # options that are sensible (and include sse,mmx,3dnow when appropriate). - # - # The next command strips CFLAGS and CXXFLAGS from nearly all flags. If - # you do not like it, comment it, but do not bugreport if you run into - # problems. - # - # <azarah@gentoo.org> (13 Oct 2002) - strip-flags -} - -pkg_setup() { - FILES_DIR="${WORKDIR}/files" - PATCHDIR="${WORKDIR}/patch" - EXCLUDED="${PATCHDIR}/excluded" - - # Set up CFLAG-related things - cflag_setup - - # See bug #35468, circular pam-X11 dep - if use pam && best_version x11-base/${PN} - then - einfo "Previous ${PN} installation detected" - einfo "Enabling PAM features in ${PN}..." - else - einfo "Previous ${PN} installation NOT detected" - einfo "Disabling PAM features in ${PN}..." - einfo "You must remerge ${PN} to enable pam." - einfo "See http://bugs.gentoo.org/show_bug.cgi?id=35468." - fi - - if use static || use dlloader - then - # A static build disallows building the SDK. - # See config/xf86.rules. - # So does a DllModules YES (use dlloader) build (#50562) - # The latter is pending a potential patch. - if use sdk - then - die "The static and dlloader USE flags are currently incompatible with the sdk USE flag." - fi - fi - - if use dmx && use doc - then - die "The dmx and doc USE flags are temporarily incompatible and result in a dead build." - fi - - # on amd64 we need /usr/X11R6/lib64/X11/locale/lib to be a symlink - # created by the emul lib ebuild in order for adobe acrobat, staroffice, - # and a few other apps to work. - if [ -z "${MULTILIB_ABIS}" ]; then - use amd64 && get_libdir_override lib64 - # lib32 isnt a supported configuration (yet?) - [ "$(get_libdir)" == "lib32" ] && get_libdir_override lib - fi - - # Echo a message to the user about bitmap-fonts - if ! use bitmap-fonts - then - ewarn "Please emerge this with USE=\"bitmap-fonts\" to enable" - ewarn "75dpi and 100dpi fonts. Your GTK+-1.2 fonts may look" - ewarn "screwy otherwise" - - ebeep 5 - epause 10 - fi -} - -host_def_setup() { - HOSTCONF=config/cf/host.def - - ebegin "Setting up ${HOSTCONF}" - cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} || die - echo "#define XVendorString \"Gentoo Linux (The X.Org Foundation ${PV}, revision ${PR}-${PATCH_VER})\"" \ - >> ${HOSTCONF} - - # Pending http://bugs.gentoo.org/show_bug.cgi?id=49038 and - # http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=600 - # - # Makes ld bail at link time on undefined symbols - # Suggested by Mike Harris <mharris@redhat.com> - #echo "#define SharedLibraryLoadFlags -shared -Wl,-z,defs" \ - # >> ${HOSTCONF} - - # Enable i810 on x86_64 (RH #126687) - echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF} - - # FHS install locations for docs - echo "#define ManDirectoryRoot /usr/share/man" >> ${HOSTCONF} - echo "#define DocDir /usr/share/doc/${PF}" >> ${HOSTCONF} - echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF} - - # Make man4 and man7 stuff get 'x' suffix like everything else - # Necessary so we can install to /usr/share/man without overwriting - echo "#define DriverManDir \$(MANSOURCEPATH)4" >> ${HOSTCONF} - echo "#define DriverManSuffix 4x /* use just one tab or cpp will die */" \ - >> ${HOSTCONF} - echo "#define MiscManDir \$(MANSOURCEPATH)7" >> ${HOSTCONF} - echo "#define MiscManSuffix 7x /* use just one tab or cpp will die */" \ - >> ${HOSTCONF} - - # Don't build xterm -- use external (#54051) - echo "#define BuildXterm NO" >> ${HOSTCONF} - - # Xwrapper has been removed so we now need to use the set uid server - # again, this mustve happened somewhere after 4.3.0 in the development. - echo "#define InstallXserverSetUID YES" >> ${HOSTCONF} - echo "#define BuildServersOnly NO" >> ${HOSTCONF} - - # Don't use /lib64 if $(get_libdir) != lib64 - # Replaces 0181_all_4.3.0-amd64-nolib64.patch - if [ "$(get_libdir)" == "lib64" ] ; then - echo "#define HaveLib64 YES" >> ${HOSTCONF} - else - echo "#define HaveLib64 NO" >> ${HOSTCONF} - fi - - # Set location of DRM source to be installed - echo "#define InstSrcDir ${ROOT}/usr/src/${PF}" >> ${HOSTCONF} - - # Bug #12775 .. fails with -Os. - replace-flags "-Os" "-O2" - - if [ "`gcc-version`" != "2.95" ] - then - # Should fix bug #4189. gcc 3.x have problems with -march=pentium4 - # and -march=athlon-tbird - # Seems fixed on 3.3 and higher - - if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -le "2" ] - then - replace-cpu-flags pentium4 pentium3 - replace-cpu-flags athlon athlon-tbird - fi - - #to fix #56702 for now, thanks Spanky (sse2 broken) - [ "$(gcc-version)" == "3.4" ] && use x86 && test_flag -mno-sse2 && append-flags -mno-sse2 - # (#75067), sse3 also broken - [ "$(gcc-version)" == "3.4" ] && use x86 && test_flag -mno-sse3 && append-flags -mno-sse3 - - - # Try a fix for #49310, see #50931 for more info. <spyderous> - if [ "`is-flag -fomit-frame-pointer`" ] - then - replace-cpu-flags k6 k6-2 k6-3 i586 - fi - - # Without this, modules breaks with gcc3 - if [ "`gcc-version`" = "3.1" ] - then - append-flags "-fno-merge-constants" - append-flags "-fno-merge-constants" - fi - fi - - if ( [ -e "${ROOT}/usr/src/linux" ] && \ - ! kernel_is "2" "2" ) || \ - [ "`uname -r | cut -d. -f1,2`" != "2.2" ] - then - echo "#define HasLinuxInput YES" >> ${HOSTCONF} - fi - - echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF} - echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF} - echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF} - - if use static - then - echo "#define DoLoadableServer NO" >>${HOSTCONF} - else - if use dlloader ; then - einfo "Setting DoLoadableServer/MakeDllModules to YES." - echo "#define DoLoadableServer YES" >> ${HOSTCONF} - echo "#define MakeDllModules YES" >> ${HOSTCONF} - fi - fi - - use_build debug XFree86Devel - use_build debug BuildDebug - use_build debug DebuggableLibraries - - if use !debug - then - echo "#define ExtraXInputDrivers acecad" >> ${HOSTCONF} - - # use less ram .. got this from Spider's makeedit.eclass :) - echo "#define GccWarningOptions -Wno-return-type -w" \ - >> ${HOSTCONF} - fi - - # Remove circular dep between pam and X11, bug #35468 - # If pam is in USE and we have X11, then we can enable PAM -# if use pam && [ "`best_version x11-base/xorg-x11`" ] - if [ "`best_version x11-base/xorg-x11`" ] - then - # If you want to have optional pam support, do it properly ... - use_build pam HasPam - use_build pam HasPamMisc - fi - - if use x86 || use alpha - then - # build with glide3 support? (build the tdfx_dri.o module) - if use 3dfx - then - echo "#define HasGlide3 YES" >> ${HOSTCONF} - fi -# This won't work unless we can disable building the tdfx stuff -# entirely :/ -# use_build 3dfx HasGlide3 - fi - - if use x86 - then - # optimize Mesa for architecture - use_build mmx HasMMXSupport - use_build mmx MesaUseMMX - - use_build 3dnow Has3DNowSupport - use_build 3dnow MesaUse3DNow - - use_build sse HasKatmaiSupport - use_build sse MesaUseKatmai - use_build sse HasSSESupport - use_build sse MesaUseSSE - - # Compile the VIA driver - # echo "#define XF86ExtraCardDrivers via" >> ${HOSTCONF} - fi - - if use mips - then - echo "#define XF86CardDrivers fbdev newport" >> ${HOSTCONF} - fi - - if use hppa - then - echo "#define DoLoadableServer NO" >> ${HOSTCONF} - echo "#define BuildXF86DRI NO" >> config/cf/host.def - echo "#undef DriDrivers" >> config/cf/host.def - echo "#define XF86CardDrivers fbdev" >> config/cf/host.def - fi - - if use alpha - then - echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \ - i740 tdfx cirrus tseng fbdev \ - ati vga v4l glint" >> ${HOSTCONF} - fi - - if use ppc - then - echo "#define XF86CardDrivers mga glint s3virge sis savage trident \ - chips tdfx fbdev ati DevelDrivers vga nv imstt \ - XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF} - fi - - if use ppc64 - then - echo "#define MakeDllModules YES" >> ${HOSTCONF} - echo "#define XF86VgaHw YES" >> ${HOSTCONF} - echo "#define XF86FBDevHw YES" >> ${HOSTCONF} - echo "#define XF86CardDrivers fbdev v4l ati vga nv" >> ${HOSTCONF} - fi - - if use sparc - then - echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \ - suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers" >> ${HOSTCONF} - if use hardened - then - einfo "Softening the assembler so cfb modules will play nice with sunffb" - echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF} - echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF} - fi - if ( [ -e "${ROOT}/usr/src/linux" ] && \ - ! kernel_is "2" "6" ) || \ - [ "`uname -r | cut -d. -f1,2`" != "2.6" ] - then - einfo "Building for kernels less than 2.6 requires special treatment" - echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF} - einfo "Avoid bug #46593 for sparc32-SMP with kernel 2.4.xx" - echo "/* Add a line to avoid bug #56593 on sparc32 */" >> \ - programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c - fi - fi - - # The definitions for fontconfig - echo "#define UseFontconfig YES" >> ${HOSTCONF} - echo "#define HasFontconfig YES" >> ${HOSTCONF} - - # Use the xorg Xft2 lib - echo "#define SharedLibXft YES" >> ${HOSTCONF} - - # with USE="X doc' circular dep w/ virtual/ghostscript - # echo "#define HasGhostScript ${DOC}" >> ${HOSTCONF} - # Caused issues, basic docs aren't installed - use_build doc BuildLinuxDocText - use_build doc BuildLinuxDocPS - use_build doc BuildSpecsDocs - use_build doc BuildHtmlManPages - use_build doc InstallHardcopyDocs - - # enable Japanese docs, optionally - use doc && use_build cjk InstallJapaneseDocs - - # Native Language Support Fonts - use_build nls BuildCyrillicFonts - use_build nls BuildArabicFonts - use_build nls BuildGreekFonts - use_build nls BuildHebrewFonts - use_build nls BuildThaiFonts - - if use nls - then - use_build cjk BuildCIDFonts - use_build cjk BuildJapaneseFonts - use_build cjk BuildKoreanFonts - use_build cjk BuildChineseFonts - fi - - # Crappy bitmap fonts - use_build bitmap-fonts Build75DpiFonts - use_build bitmap-fonts Build100DpiFonts - - use_build dmx BuildDmx - - use_build insecure-drivers BuildDevelDRIDrivers - - if use ipv6 - then - # In case Gentoo ever works on a system with IPv6 sockets that don't - # also listen on IPv4 (see config/cf/X11.tmpl) - echo "#define PreferXdmcpIPv6 YES" >> ${HOSTCONF} - fi - - use_build ipv6 BuildIPv6 - - # Ajax is the man for getting this going for us - echo "#define ProPoliceSupport YES" >> ${HOSTCONF} - - # Make xprint optional - use_build xprint BuildXprint - # Build libXp even when xprint is off. It's just for clients, server - if ! use xprint - then - echo "#define BuildXprintLib YES" >> ${HOSTCONF} - fi - - # End the host.def definitions here - eend 0 -} - -patch_setup() { - einfo "Excluding patches..." - # These have been applied upstream - patch_exclude 1770 1771 1772 1773 - - # This patch is just plain broken. Results in random failures. - patch_exclude 0120*parallel-make - - # Hardened patches (both broken) - patch_exclude 9960_all_4.3.0-exec-shield-GNU - patch_exclude 9961_all_4.3.0-libGL-exec-shield - - # this patch comments out the Xserver line in xdm's config - # We only want it here - if use !s390 - then - patch_exclude 7500 - fi - - # if use !gatos - # then - patch_exclude 9841_all_4.3.0-gatos-mesa - # fi - - if use debug - then - patch_exclude 5901*acecad-debug - fi - - # TDFX_RISKY - 16-bit, 1024x768 or higher on low-memory voodoo3's - if use 3dfx && [ "${TDFX_RISKY}" = "yes" ] - then - patch_exclude 5850 - else - patch_exclude 5851 - fi - einfo "Done excluding patches" -} - -src_unpack() { - - # Unpack source and patches - ebegin "Unpacking source" -# unpack ${P}.tar.bz2 - unpack X11R${PV}-src{1,2,3,4,5}.tar.gz - eend 0 - - if use doc - then - ebegin "Unpacking documentation" - unpack X11R${PV}-src{6,7}.tar.gz - eend 0 - fi - - ebegin "Unpacking Gentoo files and patches" - unpack ${P}-files-${FILES_VER}.tar.bz2 > /dev/null - unpack ${P}-patches-${PATCH_VER}.tar.bz2 > /dev/null - eend 0 - - # Unpack TaD's gentoo cursors - ebegin "Unpacking Gentoo cursors" - unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2 > /dev/null - eend 0 - - # Unpack extra fonts stuff from Mandrake - ebegin "Unpacking fonts" - if use nls - then - unpack gemini-koi8-u.tar.bz2 > /dev/null - fi - unpack eurofonts-X11.tar.bz2 > /dev/null - unpack xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 > /dev/null - eend 0 - - # Remove bum encoding - rm -f ${WORKDIR}/usr/share/fonts/encodings/urdunaqsh-0.enc - - patch_setup - - # Bulk patching - based on patch name - # Will create excluded stuff once it's needed - cd ${WORKDIR} - EPATCH_SUFFIX="patch" \ - epatch ${PATCHDIR} - cd ${S} - - epatch ${FILESDIR}/xpm-secfix-thomas.diff - - host_def_setup - - cd ${S} - if use doc - then - # These are not included anymore as they are obsolete - for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config} - do - if [ -f ${x} ] - then - cp ${x} ${x}.orig - grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x} - rm -f ${x}.orig - fi - done - fi - -} - -src_compile() { - - # Set MAKEOPTS to have proper -j? option .. - get_number_of_jobs - - # If a user defines the MAKE_OPTS variable in /etc/make.conf instead of - # MAKEOPTS, they'll redefine an internal xorg Makefile variable and the - # xorg build will silently die. This is tricky to track down, so I'm - # adding a preemptive fix for this issue by making sure that MAKE_OPTS is - # unset. (drobbins, 08 Mar 2003) - unset MAKE_OPTS - - einfo "Building xorg-x11..." - if use debug - then - chmod u+x ${S}/config/util/makeg.sh - FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" || die - else - FAST=1 emake World WORLDOPTS="" || die - fi - - if use nls - then - cd ${S}/nls - make || die - cd ${S} - fi - -} - -pkgconfig_install() { - # This one needs to be in /usr/lib - insinto /usr/$(get_libdir)/pkgconfig - doins ${D}/usr/X11R6/$(get_libdir)/pkgconfig/*.pc - # Now remove the invalid xft.pc, and co ... - rm -rf ${D}/usr/X11R6/$(get_libdir)/pkgconfig -} - -backward_compat_setup() { - # Backwards compatibility for /usr/share move - G_FONTDIRS="CID Speedo TTF Type1 encodings local misc util" - if use bitmap-fonts - then - G_FONTDIRS="${G_FONTDIRS} 75dpi 100dpi" - fi - - dodir /usr/X11R6/$(get_libdir)/X11/fonts/ - for G_FONTDIR in ${G_FONTDIRS} - do - dosym ${ROOT}/usr/share/fonts/${G_FONTDIR} /usr/X11R6/$(get_libdir)/X11/fonts/${G_FONTDIR} - done - - dosym ${ROOT}/usr/share/man /usr/X11R6/man - dosym ${ROOT}/usr/share/doc/${PF} /usr/X11R6/$(get_libdir)/X11/doc -} - -compose_files_setup() { - # Hack from Mandrake (update ours that just created Compose files for - # all locales) - for x in $(find ${D}/usr/X11R6/$(get_libdir)/X11/locale/ -mindepth 1 -type d) - do - # make empty Compose files for some locales - # CJK must not have that file (otherwise XIM don't works some times) - case `basename ${x}` in - C|microsoft-*|iso8859-*|koi8-*) - if [ ! -f ${x}/Compose ] - then - touch ${x}/Compose - fi - ;; - ja*|ko*|zh*) - if [ -r ${x}/Compose ] - then - rm -f ${x}/Compose - fi - ;; - esac - done - - # Another hack from Mandrake -- to fix dead + space for the us - # international keyboard - for i in ${D}/usr/X11R6/$(get_libdir)/X11/locale/*/Compose - do - sed -i \ - -e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \ - -e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" \ - ${i} - done -} - -etc_files_install() { - insinto /etc/X11 - - # Install example config file - newins ${S}/programs/Xserver/hw/xfree86/xorg.conf xorg.conf.example - - exeinto /etc/X11 - # new session management script - doexe ${FILES_DIR}/chooser.sh - # new display manager script - doexe ${FILES_DIR}/startDM.sh - exeinto /etc/X11/Sessions - for x in ${FILES_DIR}/Sessions/* - do - [ -f ${x} ] && doexe ${x} - done - insinto /etc/env.d - doins ${FILES_DIR}/10xorg - insinto /etc/X11/xinit - doins ${FILES_DIR}/xinitrc - exeinto /etc/X11/xdm - doexe ${FILES_DIR}/Xsession ${FILES_DIR}/Xsetup_0 - insinto /etc/X11/fs - newins ${FILES_DIR}/xfs.config config - if use pam - then - insinto /etc/pam.d - newins ${FILES_DIR}/xdm.pamd xdm - # Need to fix console permissions first - newins ${FILES_DIR}/xserver.pamd xserver - fi - exeinto /etc/init.d - newexe ${FILES_DIR}/xdm.start xdm - newexe ${FILES_DIR}/xfs.start xfs - insinto /etc/conf.d - newins ${FILES_DIR}/xfs.conf.d xfs -} - -setup_dynamic_libgl() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${PN}/{$(get_libdir),extensions,include} - local x="" - for x in ${D}/usr/X11R6/$(get_libdir)/libGL.so* \ - ${D}/usr/X11R6/$(get_libdir)/libGL.la \ - ${D}/usr/X11R6/$(get_libdir)/libGL.a \ - ${D}/usr/X11R6/$(get_libdir)/libMesaGL.so - do - if [ -f ${x} -o -L ${x} ] - then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/$(get_libdir) - fi - done - for x in ${D}/usr/X11R6/$(get_libdir)/modules/extensions/libglx* - do - if [ -f ${x} -o -L ${x} ] - then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/extensions - fi - done - # glext.h added for #54984 - for x in ${D}/usr/X11R6/include/GL/{gl.h,glx.h,glxtokens.h,glext.h} - do - if [ -f ${x} -o -L ${x} ] - then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${PN}/include - fi - done - # Since we added glext.h and don't have new opengl-update yet, do this - # Avoids circular opengl-update/xorg-x11 dependency - dosym /usr/$(get_libdir)/opengl/${PN}/include/glext.h /usr/X11R6/include/GL/ - # Even if libdir isnt lib, we need a lib symlink for opengl-update and - # friends. See bug 62990 for more info. - if [ "$(get_libdir)" != "lib" ] - then - dosym $(get_libdir) /usr/$(get_libdir)/opengl/${PN}/lib - fi - eend 0 -} - -strip_execs() { - if use debug - then - ewarn "Debug build turned on by USE=debug" - ewarn "NOT stripping binaries and libraries" - else - einfo "Stripping binaries and libraries..." - # This bit I got from Redhat ... strip binaries and drivers .. - # NOTE: We do NOT want to strip the drivers, modules or DRI modules! - for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \ - grep -v ' shared object,' | \ - sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p') - do - if [ -f ${x} ] - then - # Dont do the modules ... - if [ "${x/\/usr\/X11R6\/$(get_libdir)\/modules}" = "${x}" ] - then - echo "`echo ${x} | sed -e "s|${D}||"`" - strip ${x} || : - fi - fi - done - # Now do the libraries ... - for x in ${D}/usr/{$(get_libdir),$(get_libdir)/opengl/${PN}/$(get_libdir)}/*.so.* \ - ${D}/usr/X11R6/{$(get_libdir),$(get_libdir)/X11/locale/$(get_libdir)/common}/*.so.* - do - if [ -f ${x} ] - then - echo "`echo ${x} | sed -e "s|${D}||"`" - strip --strip-debug ${x} || : - fi - done - fi -} - -setup_config_files() { - - # Fix default config files after installing fonts to /usr/share/fonts - sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:${ROOT}usr/share/fonts:g" \ - ${D}/etc/X11/xorg.conf.example - sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:${ROOT}usr/share/fonts:g" \ - ${D}/etc/X11/fs/config - - # Work around upgrade problem where people have - # Option "XkbRules" "xfree86" in their config file - sed -i "s:^.*Option.*"XkbRules".*$::g" ${D}/etc/X11/xorg.conf.example -} - -update_config_files() { - # Fix any installed config files for installing fonts to /usr/share/fonts - # This *needs* to be after all other installation so files aren't - # overwritten. - - if [ "${ROOT}" = "/" ] - then - einfo "Preparing any installed configuration files for font move..." - FILES="/etc/X11/xorg.conf - /etc/X11/XF86Config-4 - /etc/X11/XF86Config - /etc/X11/fs/config" - # /etc/fonts/fonts.conf - # /etc/fonts/local.conf - - for FILE in ${FILES} - do - if [ -e ${FILE} ] - then - # New font paths - sed "s,/usr/X11R6/$(get_libdir)/X11/fonts,/usr/share/fonts,g" \ - ${ROOT}${FILE} > ${IMAGE}${FILE} - - if [ "${FILE}" = "/etc/X11/xorg.conf" ] || [ "${FILE}" = "/etc/X11/XF86Config" ] || [ "${FILE}" = "/etc/X11/XF86Config-4" ] - then - # "keyboard" driver is deprecated and will be removed, - # switch to "kbd" - sed -i 's~^\([ \t]*Driver[ \t]\+\)"[kK]eyboard"~\1"kbd"~' \ - ${IMAGE}${FILE} - - # Work around upgrade problem where people have - # Option "XkbRules" "xfree86" in their config file - sed -i "s:^.*Option.*\"XkbRules\".*$::g" \ - ${IMAGE}${FILE} - fi - fi - done - fi -} - -src_install() { - - unset MAKE_OPTS - - einfo "Installing X.org X11..." - # gcc3 related fix. Do this during install, so that our - # whole build will not be compiled without mmx instructions. - if [ "`gcc-version`" != "2.95" ] && use x86 - then - make install DESTDIR=${D} || \ - make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \ - CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \ - install DESTDIR=${D} || die - else - make install DESTDIR=${D} || die - fi - - if use sdk - then - einfo "Installing X.org X11 SDK..." - make install.sdk DESTDIR=${D} || die - fi - - pkgconfig_install - - einfo "Installing man pages..." - make install.man DESTDIR=${D} || die - einfo "Compressing man pages..." - prepman /usr/X11R6 - - if use nls - then - cd ${S}/nls - make DESTDIR=${D} install || die - fi - - backward_compat_setup - - # Fix permissions on locale/common/*.so - for x in ${D}/usr/X11R6/$(get_libdir)/X11/locale/$(get_libdir)/common/*.so* - do - if [ -f ${x} ] - then - fperms 0755 `echo ${x} | sed -e "s|${D}||"` - fi - done - - # Fix permissions on modules ... - for x in $(find ${D}/usr/X11R6/$(get_libdir)/modules -name '*.o') \ - $(find ${D}/usr/X11R6/$(get_libdir)/modules -name '*.so') - do - if [ -f ${x} ] - then - fperms 0755 `echo ${x} | sed -e "s|${D}||"` - fi - done - - # We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can - # mess up other things that use xmkmf - ebegin "Fixing $(get_libdir)/X11/config/host.def" - cp ${D}/usr/X11R6/$(get_libdir)/X11/config/host.def ${T} - awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \ - ${T}/host.def > ${D}/usr/X11R6/$(get_libdir)/X11/config/host.def - # theoretically, /usr/X11R6/lib/X11/config is a possible candidate for - # config file management. If we find that people really worry about imake - # stuff, we may add it. But for now, we leave the dir unprotected. - eend 0 - - # EURO support - ebegin "Euro Support..." - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/$(get_libdir)" \ - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \ - gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-8x14-lat9.pcf.gz - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/$(get_libdir)" \ - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \ - gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-9x16-lat9.pcf.gz - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${D}/usr/X11R6/$(get_libdir)" \ - ${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-10x20.bdf | \ - gzip -9 > ${D}/usr/share/fonts/misc/Xlat9-10x20-lat9.pcf.gz - eend 0 - - # Standard symlinks - dodir /usr/{bin,include,$(get_libdir)} - dosym ../X11R6/bin /usr/bin/X11 - dosym ../X11R6/include/X11 /usr/include/X11 - dosym ../X11R6/include/DPS /usr/include/DPS - dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/$(get_libdir)/X11 /usr/$(get_libdir)/X11 - dosym ../../usr/X11R6/$(get_libdir)/X11/xkb /etc/X11/xkb - - # Some critical directories - keepdir /var/lib/xdm - dosym ../../../var/lib/xdm /etc/X11/xdm/authdir - - # Remove invalid symlinks - rm -f ${D}/usr/$(get_libdir)/libGL.* - # Create required symlinks - dosym libGL.so.1.2 /usr/X11R6/$(get_libdir)/libGL.so - dosym libGL.so.1.2 /usr/X11R6/$(get_libdir)/libGL.so.1 - dosym libGL.so.1.2 /usr/X11R6/$(get_libdir)/libMesaGL.so - # We move libGLU to /usr/lib now - dosym libGLU.so.1.3 /usr/$(get_libdir)/libMesaGLU.so - - # .la files for libtool support - insinto /usr/X11R6/$(get_libdir) - # (#67729) Needs to be lib, not $(get_libdir) - doins ${FILES_DIR}/lib/*.la - - # Backwards compat, FHS, etc. - dosym ../../usr/X11R6/bin/Xorg /etc/X11/X - - # Fix perms - fperms 755 /usr/X11R6/$(get_libdir)/X11/xkb/geometry/sgi - fperms 755 /usr/X11R6/bin/dga - - compose_files_setup - - # Yet more Mandrake - ebegin "Encoding files for xfsft font server..." - dodir /usr/share/fonts/encodings - cp -a ${WORKDIR}/usr/share/fonts/encodings/* \ - ${D}/usr/share/fonts/encodings - - for x in ${D}/usr/share/fonts/encodings/{.,large}/*.enc - do - [ -f "${x}" ] && gzip -9 -f ${x} - done - eend 0 - - if use nls - then - ebegin "gemini-koi8 fonts..." - cd ${WORKDIR}/ukr - gunzip *.Z - gzip -9 *.pcf - cd ${S} - cp -a ${WORKDIR}/ukr ${D}/usr/share/fonts - eend 0 - fi - - etc_files_install - - # we want libGLU.so* in /usr/lib - mv ${D}/usr/X11R6/$(get_libdir)/libGLU.* ${D}/usr/$(get_libdir) - - setup_dynamic_libgl - - # Make the core cursor the default. People seem not to like whiteglass - # for some reason. - dosed 's:whiteglass:core:' /usr/share/cursors/${PN}/default/index.theme - - strip_execs - - # Install TaD's gentoo cursors - insinto /usr/share/cursors/${PN}/gentoo/cursors - doins ${WORKDIR}/cursors/gentoo/cursors/* - insinto /usr/share/cursors/${PN}/gentoo-blue/cursors - doins ${WORKDIR}/cursors/gentoo-blue/cursors/* - insinto /usr/share/cursors/${PN}/gentoo-silver/cursors - doins ${WORKDIR}/cursors/gentoo-silver/cursors/* - - # Remove xterm app-defaults, since we don't install xterm -# rm ${D}/etc/X11/app-defaults/{UXTerm,XTerm,XTerm-color} - - # For Battoussai's gatos stuffs: - if use sdk - then - insinto /usr/X11R6/$(get_libdir)/Server/include - doins ${S}/extras/drm/shared/drm.h - fi - - # Remove the /etc/rc.d nonsense -- not everyone is RedHat - rm -rf ${D}/etc/rc.d - - setup_config_files - -} - -pkg_preinst() { - - update_config_files - for G_FONTDIR in ${G_FONTDIRS} - do - # Get rid of deprecated directories so our symlinks in the same location - # work -- users shouldn't be placing fonts here so that should be fine, - # they should be using ~/.fonts or /usr/share/fonts. <spyderous> - if [ -d ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/${G_FONTDIR} ] - then - # local directory is for sysadmin-added fonts, so save it - # Note: if we did this in src_install(), we would bring fonts from - # the build machine to the install machine rather than just moving - # fonts on the install machine. - if [ "${G_FONTDIR}" = "local" ] - then - mv ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/${G_FONTDIR} \ - ${ROOT}/usr/share/fonts/ - else - rm -rf ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/${G_FONTDIR} - fi - fi - - # clean out old fonts.* and encodings.dir files, as we - # will regenerate them - # Not Speedo or CID, as their fonts.scale files are "real" - if [ "${G_FONTDIR}" != "CID" -a "${G_FONTDIR}" != "Speedo" ] - then - find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \ - -exec rm -f {} \; - find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'encodings.dir' \ - -exec rm -f {} \; - fi - done - - # No longer used by xorg-x11 - if [ -d ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/truetype ] - then - rm -rf ${ROOT}/usr/X11R6/$(get_libdir)/X11/fonts/truetype - fi - - if [ -L ${ROOT}/etc/X11/app-defaults ] - then - rm -f ${ROOT}/etc/X11/app-defaults - fi - - if [ ! -L ${ROOT}/usr/X11R6/$(get_libdir)/X11/app-defaults ] && \ - [ -d ${ROOT}/usr/X11R6/$(get_libdir)/X11/app-defaults ] - then - if [ ! -d ${ROOT}/etc/X11/app-defaults ] - then - mkdir -p ${ROOT}/etc/X11/app-defaults - fi - - mv -f ${ROOT}/usr/X11R6/$(get_libdir)/X11/app-defaults ${ROOT}/etc/X11 - fi - - if [ -L ${ROOT}/usr/X11R6/$(get_libdir)/X11/xkb ] - then - rm -f ${ROOT}/usr/X11R6/$(get_libdir)/X11/xkb - fi - - if [ ! -L ${ROOT}/etc/X11/xkb ] && \ - [ -d ${ROOT}/etc/X11/xkb ] - then - if [ ! -d ${ROOT}/usr/X11R6/$(get_libdir)/X11/xkb ] - then - mkdir -p ${ROOT}/usr/X11R6/$(get_libdir)/X11 - fi - - mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/$(get_libdir)/X11 - fi - - # clean the dynamic libGL stuff's home to ensure - # we don't have stale libs floating around - if [ -d ${ROOT}/usr/$(get_libdir)/opengl/${PN} ] - then - rm -rf ${ROOT}/usr/$(get_libdir)/opengl/${PN}/* - fi - - # make sure we do not have any stale files lying around - # that could break things. - rm -f ${ROOT}/usr/X11R6/$(get_libdir)/libGL* -} - -font_setup() { - # These cause ttmkfdir to segfault :/ - rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.8x.enc.gz - rm -f ${ROOT}/usr/share/fonts/encodings/iso8859-6.16.enc.gz -# rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-1.enc -# rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-2.enc -# rm -f ${ROOT}/usr/share/fonts/encodings/large/cns11643-3.enc -# rm -f ${ROOT}/usr/share/fonts/encodings/suneu-greek.enc - - # ******************************************************************** - # A note about fonts and needed files: - # - # 1) Create /usr/share/fonts/encodings/encodings.dir - # - # 2) Create fonts.scale for TrueType fonts (need to do this before - # we create fonts.dir files, else fonts.dir files will be - # invalid for TrueType fonts...) - # - # 3) Now Generate fonts.dir files. - # - # CID fonts is a bit more involved, but as we do not install any, - # thus I am not going to bother. - # - # <azarah@gentoo.org> (20 Oct 2002) - # - # ******************************************************************** - - ebegin "Generating encodings.dir..." - # Create the encodings.dir in /usr/share/fonts/encodings - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/$(get_libdir)" \ - ${ROOT}/usr/X11R6/bin/mkfontdir -n \ - -e ${ROOT}/usr/share/fonts/encodings \ - -e ${ROOT}/usr/share/fonts/encodings/large \ - -- ${ROOT}/usr/share/fonts/encodings - - eend 0 - - if [ -x ${ROOT}/usr/X11R6/bin/ttmkfdir ] - then - ebegin "Creating fonts.scale files..." - for x in $(find ${ROOT}/usr/share/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate .scale files if truetype, opentype or type1 - # fonts are present ... - - # First truetype (ttf,ttc) - # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) - # Also, there is no way to regenerate Speedo/CID fonts.scale - # <spyderous@gentoo.org> 2 August 2004 - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.tt[cf]' -print)" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/$(get_libdir)" \ - ${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \ - -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ - -o ${x}/fonts.scale -d ${x} - # Next type1 and opentype (pfa,pfb,otf,otc) - elif [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/$(get_libdir)" \ - ${ROOT}/usr/X11R6/bin/mkfontscale \ - -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ - -- ${x} - fi - done - eend 0 - fi - - ebegin "Generating fonts.dir files..." - for x in $(find ${ROOT}/usr/share/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - if [ "${x/encodings}" = "${x}" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/$(get_libdir)" \ - ${ROOT}/usr/X11R6/bin/mkfontdir \ - -e ${ROOT}/usr/share/fonts/encodings \ - -e ${ROOT}/usr/share/fonts/encodings/large \ - -- ${x} - fi - done - eend 0 - - ebegin "Generating Xft cache..." - for x in $(find ${ROOT}/usr/share/fonts/* -type d -maxdepth 1) - do - [ -z "$(ls ${x}/)" ] && continue - [ "$(ls ${x}/)" = "fonts.cache-1" ] && continue - - # Only generate XftCache files if there are truetype - # fonts present ... - if [ "${x/encodings}" = "${x}" -a \ - -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] - then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/$(get_libdir)" \ - ${ROOT}/usr/X11R6/bin/xftcache ${x} &> /dev/null - fi - done - eend 0 - - ebegin "Fixing permissions..." - find ${ROOT}/usr/share/fonts/ -type f -name 'font.*' \ - -exec chmod 0644 {} \; - eend 0 - - # danarmak found out that fc-cache should be run AFTER all the above - # stuff, as otherwise the cache is invalid, and has to be run again - # as root anyway - if [ -x ${ROOT}/usr/bin/fc-cache ] - then - ebegin "Creating FC font cache..." - HOME="/root" ${ROOT}/usr/bin/fc-cache - eend 0 - fi -} - -print_info() { - if use 3dfx - then - echo - einfo "If using a 3DFX card, and you had \"3dfx\" in your USE flags," - einfo "please merge media-libs/glide-v3 if you have not done so yet" - einfo "by doing:" - einfo - einfo " # emerge media-libs/glide-v3" - echo - fi - - echo - einfo "Please note that the xcursors are in /usr/share/cursors/${PN}" - einfo "Any custom cursor sets should be placed in that directory" - echo - einfo "If you wish to set system-wide default cursors, please set" - einfo "them in /usr/local/share/cursors/${PN} so that future" - einfo "emerges will not overwrite those settings" - echo - einfo "Listening on TCP is disabled by default with startx." - einfo "To enable it, edit /usr/X11R6/bin/startx." - echo - - echo - ewarn "BEWARE:" - ewarn "Font installation location has MOVED to:" - ewarn "/usr/share/fonts" - ewarn "Run etc-update to update your config files." - ewarn "Old locations for fonts, docs and man pages" - ewarn "are deprecated." - echo - ewarn "The configuration file has changed from that in XFree86." - ewarn "It is xorg.conf instead of XF86Config." - einfo "You may use xorgcfg, X -configure, or xorgconfig" - einfo "to create xorg.conf." - einfo "If XF86Config exists and xorg.conf does not, it will still" - einfo "read XF86Config." - - # Try to get people to read /usr/share/fonts move - ebeep 5 - epause 10 -} - -pkg_postinst() { - - env-update - - if [ "${ROOT}" = "/" ] - then - local x="" - - umask 022 - - font_setup - - # Switch to the xorg implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo - if [ "`${ROOT}/usr/sbin/opengl-update --get-implementation`" = "xfree" ] - then - ${ROOT}/usr/sbin/opengl-update ${PN} - else - ${ROOT}/usr/sbin/opengl-update --use-old ${PN} - fi - fi - - for x in $(find ${ROOT}/usr/X11R6/$(get_libdir)/X11/locale/ -mindepth 1 -type d) - do - # Remove old compose files we might have created incorrectly - # CJK must not have that file (otherwise XIM don't works some times) - case `basename ${x}` in - ja*|ko*|zh*) - if [ -r "${x}/Compose" ] - then - rm -f ${x}/Compose - fi - ;; - esac - done - - # These need to be owned by root and the correct permissions - # (bug #8281) - for x in ${ROOT}/tmp/.{ICE,X11}-unix - do - if [ ! -d ${x} ] - then - mkdir -p ${x} - fi - - chown root:root ${x} - chmod 1777 ${x} - done - - print_info -} - -pkg_postrm() { - - # Fix problematic links - if [ -x ${ROOT}/usr/X11R6/bin/Xorg ] - then - ln -snf ../X11R6/bin ${ROOT}/usr/bin/X11 - ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11 - ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS - ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL - ln -snf ../X11R6/$(get_libdir)/X11 ${ROOT}/usr/$(get_libdir)/X11 - fi -} |