diff options
Diffstat (limited to 'x11-servers/XFree86-4-Server-snap/files')
6 files changed, 0 insertions, 321 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf b/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf deleted file mode 100644 index bcbd69901253..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf +++ /dev/null @@ -1,39 +0,0 @@ ---- config/cf/FreeBSD.cf.orig Sat Nov 1 20:38:01 2003 -+++ config/cf/FreeBSD.cf Tue Nov 11 20:47:11 2003 -@@ -172,11 +172,11 @@ - * ld: warning: libXThrStub.so.6, needed by libX11.so, not found - */ - #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) --# define CcCmd $(CLIENTENVSETUP) cc --# define CplusplusCmd $(CLIENTENVSETUP) c++ -+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC -+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX - #else --# define CcCmd cc --# define CplusplusCmd c++ -+# define CcCmd FreeBSDCC -+# define CplusplusCmd FreeBSDCXX - #endif - - #define CppCmd /usr/bin/cpp -@@ -393,18 +393,8 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 GccAliasingArgs --#endif --#endif -- --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags FreeBSDCFLAGS - - #ifndef PreIncDir - # define PreIncDir /usr/include diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-GL-Imakefile b/x11-servers/XFree86-4-Server-snap/files/patch-GL-Imakefile deleted file mode 100644 index 40560c382274..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-GL-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/GL/Imakefile.orig Thu Oct 23 00:33:15 2003 -+++ lib/GL/Imakefile Thu Oct 23 00:35:49 2003 -@@ -110,7 +110,7 @@ - #if BuildXF86DRI && GlxUseBuiltInDRIDriver - SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) - #else --SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS) -+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) /*$(LIBGLBUILDDIR) $(OSMESADIRS) */ $(DRIVERDIRS) - #endif - - MakeSubdirs($(SUBDIRS)) diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c b/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c deleted file mode 100644 index e5007f851932..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Wed Feb 25 11:04:10 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Wed Feb 25 11:04:50 2004 -@@ -483,7 +483,7 @@ - writeSparse32(int Value, pointer Base, register unsigned long Offset); - - #ifdef __FreeBSD__ --extern int sysarch(int, char *); -+extern int sysarch(int, void *); - #endif - - struct parms { diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::FreeType b/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::FreeType deleted file mode 100644 index 37fe46add21b..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::FreeType +++ /dev/null @@ -1,62 +0,0 @@ ---- lib/font/FreeType/ftenc.c.orig Mon Mar 22 11:30:03 2004 -+++ lib/font/FreeType/ftenc.c Mon Mar 22 11:30:20 2004 -@@ -35,7 +35,8 @@ - - #include "fontmisc.h" - #include "fontenc.h" --#include "freetype/freetype.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include "freetype/ttnameid.h" - #include "freetype/tttables.h" - #include "freetype/t1tables.h" ---- lib/font/FreeType/ftfuncs.c.orig Sat Nov 1 23:43:24 2003 -+++ lib/font/FreeType/ftfuncs.c Mon Mar 22 12:53:58 2004 -@@ -42,7 +42,8 @@ - #include "fntfilst.h" - #include "fontutil.h" - #include "FSproto.h" --#include "freetype/freetype.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include "freetype/ftsizes.h" - #include "freetype/ttnameid.h" - #include "freetype/tttables.h" -@@ -50,7 +51,7 @@ - #include "freetype/ftxf86.h" - #include "freetype/ftbbox.h" - #include "freetype/internal/tttypes.h" --#include "extras/freetype2/src/truetype/ttobjs.h" -+#include "ttobjs.h" - /* - * If you want to use FT_Outline_Get_CBox instead of - * FT_Outline_Get_BBox, define here. ---- lib/font/FreeType/fttools.c.orig Mon Mar 22 11:37:36 2004 -+++ lib/font/FreeType/fttools.c Mon Mar 22 11:37:53 2004 -@@ -34,7 +34,8 @@ - #endif - - #include "font.h" --#include "freetype/freetype.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H - #include "freetype/ftsnames.h" - #include "freetype/ttnameid.h" - #include "ft.h" ---- lib/font/FreeType/Imakefile.orig Mon Mar 22 13:01:24 2004 -+++ lib/font/FreeType/Imakefile Mon Mar 22 13:02:44 2004 -@@ -9,10 +9,11 @@ - - DEFINES = ServerExtraDefines StrcasecmpDefines Freetype2BuildDefines - --FT2INCS = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/include -+FT2SOURCEDIR = $(TOP)/extras/freetype2/src -+FT2INCS = $(FREETYPE2INCLUDES) - --INCLUDES = -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ -- -I$(SERVERSRC)/include $(FT2INCS) -I$(INCLUDESRC) -+INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ -+ -I$(SERVERSRC)/include $(FT2INCS) -I$(FT2SOURCEDIR)/truetype -I$(INCLUDESRC) - - SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c - OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::fontfile b/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::fontfile deleted file mode 100644 index def6a519f7c1..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-xc::lib::font::fontfile +++ /dev/null @@ -1,185 +0,0 @@ -Index: lib/font/fontfile/dirfile.c -=================================================================== -RCS file: /home/x-cvs/xc/lib/font/fontfile/dirfile.c,v -retrieving revision 3.15 -diff -u -r3.15 dirfile.c ---- dirfile.c 31 May 2002 18:45:50 -0000 3.15 -+++ dirfile.c 11 Feb 2004 21:17:20 -0000 -@@ -68,6 +68,9 @@ - - FontDirectoryPtr dir = NullFontDirectory; - -+ if (strlen(directory) + 1 + sizeof(FontDirFile) > sizeof(dir_file)) -+ return BadFontPath; -+ - #ifdef FONTDIRATTRIB - /* Check for font directory attributes */ - #ifndef __UNIXOS2__ -@@ -154,6 +157,9 @@ - char dir_file[MAXFONTFILENAMELEN]; - struct stat statb; - -+ if (strlen(dir->directory) + sizeof(FontDirFile) > sizeof(dir_file)) -+ return FALSE; -+ - strcpy (dir_file, dir->directory); - strcat (dir_file, FontDirFile); - if (stat (dir_file, &statb) == -1) -@@ -202,6 +208,8 @@ - continue; - - len = strlen (fileName) - renderer->fileSuffixLen; -+ if (len >= sizeof(copy)) -+ continue; - CopyISOLatin1Lowered (copy, fileName, len); - copy[len] = '\0'; - name.name = copy; -@@ -251,9 +259,13 @@ - int status = Successful; - struct stat statb; - -+ if (strlen(directory) >= sizeof(alias_file)) -+ return BadFontPath; - dir = *pdir; - strcpy(alias_file, directory); - if (!isFile) { -+ if (strlen(directory) + 1 + sizeof(FontAliasFile) > sizeof(alias_file)) -+ return BadFontPath; - if (directory[strlen(directory) - 1] != '/') - strcat(alias_file, "/"); - strcat(alias_file, FontAliasFile); -@@ -286,6 +298,10 @@ - status = AllocError; - break; - case NAME: -+ if (strlen(lexToken) >= sizeof(alias)) { -+ status = BadFontPath; -+ break; -+ } - strcpy(alias, lexToken); - token = lexAlias(file, &lexToken); - switch (token) { -@@ -302,6 +318,10 @@ - status = AllocError; - break; - case NAME: -+ if (strlen(lexToken) >= sizeof(font_name)) { -+ status = BadFontPath; -+ break; -+ } - CopyISOLatin1Lowered(alias, alias, strlen(alias)); - CopyISOLatin1Lowered(font_name, lexToken, strlen(lexToken)); - if (!FontFileAddFontAlias (dir, alias, font_name)) -Index: lib/font/fontfile/encparse.c -=================================================================== -RCS file: /home/x-cvs/xc/lib/font/fontfile/encparse.c,v -retrieving revision 1.18 -diff -u -r1.18 encparse.c ---- encparse.c 2 Nov 2001 03:06:40 -0000 1.18 -+++ encparse.c 11 Feb 2004 21:17:20 -0000 -@@ -833,6 +833,7 @@ - char file_name[MAXFONTFILENAMELEN], encoding_name[MAXFONTNAMELEN], - buf[MAXFONTFILENAMELEN]; - int count, n; -+ static char format[24] = ""; - - /* As we don't really expect to open encodings that often, we don't - take the trouble of caching encodings directories. */ -@@ -848,8 +849,12 @@ - } - - encoding = NULL; -+ if (!format[0]) { -+ sprintf(format, "%%%ds %%%d[^\n]\n", sizeof(encoding_name) - 1, -+ sizeof(file_name) - 1); -+ } - for(;;) { -- count = fscanf(file, "%s %[^\n]\n", encoding_name, file_name); -+ count = fscanf(file, format, encoding_name, file_name); - if(count == EOF) - break; - if(count != 2) -Index: lib/font/fontfile/fontfile.c -=================================================================== -RCS file: /home/x-cvs/xc/lib/font/fontfile/fontfile.c,v -retrieving revision 3.16 -diff -u -r3.16 fontfile.c ---- fontfile.c 31 May 2002 18:45:50 -0000 3.16 -+++ fontfile.c 11 Feb 2004 21:17:20 -0000 -@@ -424,11 +424,16 @@ - vals.ranges = ranges; - vals.nranges = nranges; - -- strcpy (fileName, dir->directory); -- strcat (fileName, scalable->fileName); -- ret = (*scalable->renderer->OpenScalable) (fpe, pFont, -+ if (strlen(dir->directory) + strlen(scalable->fileName) >= -+ sizeof(fileName)) { -+ ret = BadFontName; -+ } else { -+ strcpy (fileName, dir->directory); -+ strcat (fileName, scalable->fileName); -+ ret = (*scalable->renderer->OpenScalable) (fpe, pFont, - flags, entry, fileName, &vals, format, fmask, - non_cachable_font); -+ } - - /* In case rasterizer does something bad because of - charset subsetting... */ -@@ -497,6 +502,8 @@ - - dir = (FontDirectoryPtr) fpe->private; - bitmap = &entry->u.bitmap; -+ if (strlen(dir->directory) + strlen(bitmap->fileName) >= sizeof(fileName)) -+ return BadFontName; - strcpy (fileName, dir->directory); - strcat (fileName, bitmap->fileName); - ret = (*bitmap->renderer->OpenBitmap) -@@ -530,6 +537,8 @@ - - dir = (FontDirectoryPtr) fpe->private; - bitmap = &entry->u.bitmap; -+ if (strlen(dir->directory) + strlen(bitmap->fileName) >= sizeof(fileName)) -+ return BadFontName; - strcpy (fileName, dir->directory); - strcat (fileName, bitmap->fileName); - ret = (*bitmap->renderer->GetInfoBitmap) (fpe, pFontInfo, entry, fileName); -@@ -891,10 +900,15 @@ - vals.ranges = FontParseRanges(origName, &vals.nranges); - ranges = vals.ranges; - /* Make a new scaled instance */ -- strcpy (fileName, dir->directory); -- strcat (fileName, scalable->fileName); -- ret = (*scalable->renderer->GetInfoScalable) -- (fpe, *pFontInfo, entry, &tmpName, fileName, &vals); -+ if (strlen(dir->directory) + strlen(scalable->fileName) >= -+ sizeof(fileName)) { -+ ret = BadFontName; -+ } else { -+ strcpy (fileName, dir->directory); -+ strcat (fileName, scalable->fileName); -+ ret = (*scalable->renderer->GetInfoScalable) -+ (fpe, *pFontInfo, entry, &tmpName, fileName, &vals); -+ } - if (ranges) xfree(ranges); - } - } -@@ -931,10 +945,15 @@ - bc = &entry->u.bc; - entry = bc->entry; - /* Make a new scaled instance */ -- strcpy (fileName, dir->directory); -- strcat (fileName, scalable->fileName); -- ret = (*scalable->renderer->GetInfoScalable) -+ if (strlen(dir->directory) + strlen(scalable->fileName) >= -+ sizeof(fileName)) { -+ ret = BadFontName; -+ } else { -+ strcpy (fileName, dir->directory); -+ strcat (fileName, scalable->fileName); -+ ret = (*scalable->renderer->GetInfoScalable) - (fpe, *pFontInfo, entry, tmpName, fileName, &bc->vals); -+ } - break; - #endif - default: diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xfree86.cf b/x11-servers/XFree86-4-Server-snap/files/patch-xfree86.cf deleted file mode 100644 index 063d04517c7d..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-xfree86.cf +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/xfree86.cf.orig Sat Nov 1 20:38:05 2003 -+++ config/cf/xfree86.cf Fri Nov 21 11:33:46 2003 -@@ -1748,6 +1748,8 @@ - #ifndef XFree86ConsoleDefines - # if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) - # define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT -+# elif defined(FreeBSDArchitecture) -+# define XFree86ConsoleDefines -DSYSCONS_SUPPORT - # else - # define XFree86ConsoleDefines /**/ - # endif |