Marked broken since 2004/04/21
ok ish@, sturm@
This commit is contained in:
alek
parent
cf3daf2f48
commit
a2ae98f3f8
@ -1,36 +0,0 @@
|
||||
# $OpenBSD: Makefile,v 1.23 2004/11/11 21:31:22 alek Exp $
|
||||
# $FreeBSD Id: Makefile,v 1.2 1999/06/28 02:22:43 billf Exp $
|
||||
|
||||
BROKEN= "security (DoS) issue"
|
||||
|
||||
COMMENT= "TrueType font server for X11"
|
||||
|
||||
DISTNAME= xfstt-1.1
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
CATEGORIES= x11
|
||||
MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/fonts/}
|
||||
|
||||
MAINTAINER= Jason Ish <ish@openbsd.org>
|
||||
|
||||
# LGPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
USE_X11= Yes
|
||||
MAKE_ENV= CXX="${CXX}"
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/xfstt ${PREFIX}/bin
|
||||
${INSTALL_MAN} ${WRKSRC}/xfstt.1x ${PREFIX}/man/man1/xfstt.1
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt
|
||||
${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/xfstt
|
||||
${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/xfstt
|
||||
${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/xfstt
|
||||
${INSTALL_DATA} ${WRKSRC}/THANKS.txt ${PREFIX}/share/doc/xfstt
|
||||
${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/xfstt
|
||||
|
||||
.include <bsd.port.mk>
|
||||
@ -1,4 +0,0 @@
|
||||
MD5 (xfstt-1.1.tar.gz) = e6588126aa49a5a50458591948424209
|
||||
RMD160 (xfstt-1.1.tar.gz) = ba427fadf6cd5ceb77f95a2f5759e9b448409dbc
|
||||
SHA1 (xfstt-1.1.tar.gz) = 3abf6d081ce85d6925b44d70470b6fc020d3a00e
|
||||
SIZE (xfstt-1.1.tar.gz) = 111034
|
||||
@ -1,2 +0,0 @@
|
||||
The font directory for OpenBSD has been changed from
|
||||
/usr/share/fonts/truetype to /usr/local/lib/X11/fonts/TrueType/.
|
||||
@ -1,26 +0,0 @@
|
||||
$OpenBSD: patch-Makefile,v 1.4 2002/09/30 14:47:24 naddy Exp $
|
||||
--- Makefile.orig Mon May 31 08:28:44 1999
|
||||
+++ Makefile Mon Sep 30 16:44:57 2002
|
||||
@@ -2,16 +2,16 @@
|
||||
MISCOPT =
|
||||
OPT = $(MISCOPT) $(MAXOPT)
|
||||
|
||||
-CFLAGS = $(OPT) -DMAGNIFY=0 -DNDEBUG
|
||||
+CFLAGS += -DMAGNIFY=0 -DNDEBUG
|
||||
#CFLAGS = -fprofile-arcs -ftest-coverage -DMAGNIFY=0
|
||||
-CFLAGS = -g -Wall -pedantic $(MISCOPT) -DMAGNIFY=0
|
||||
+#CFLAGS = -g -Wall -pedantic $(MISCOPT) -DMAGNIFY=0
|
||||
#CFLAGS = -O -Wall -pedantic -DDEBUG $(MISCOPT)
|
||||
|
||||
-LFLAGS = -L/usr/X11R6/lib -L/usr/openwin/lib/X11
|
||||
-LFLAGS = -g -L/usr/X11R6/lib
|
||||
+#LFLAGS = -L/usr/X11R6/lib -L/usr/openwin/lib/X11
|
||||
+LFLAGS = -L${X11BASE}/lib
|
||||
|
||||
-CC = c++
|
||||
-LD = c++
|
||||
+CC = ${CXX}
|
||||
+LD = ${CXX}
|
||||
|
||||
OBJS = RAFile.o \
|
||||
TTFont.o \
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-TTFont_cpp,v 1.2 2002/09/30 14:47:24 naddy Exp $
|
||||
--- TTFont.cpp.orig Mon Nov 8 04:35:13 1999
|
||||
+++ TTFont.cpp Mon Sep 30 16:44:57 2002
|
||||
@@ -344,7 +344,7 @@ int TTFont::getXLFDbase( char* result)
|
||||
|
||||
|
||||
// some fonts have only unicode names -> try to convert them to ascii
|
||||
- convbuf = malloc(sizeof(char) * 256);
|
||||
+ convbuf = (char*)malloc(sizeof(char) * 256);
|
||||
int lenFamily;
|
||||
char* strFamily = nameTable->getString( 1, 1, &lenFamily, convbuf);
|
||||
if( !strFamily) {
|
||||
@@ -353,7 +353,7 @@ int TTFont::getXLFDbase( char* result)
|
||||
}
|
||||
|
||||
if (strFamily == convbuf)
|
||||
- convbuf = malloc(sizeof(char) * 256);
|
||||
+ convbuf = (char*)malloc(sizeof(char) * 256);
|
||||
int lenSub;
|
||||
char* strSubFamily = nameTable->getString( 1, 2, &lenSub, convbuf);
|
||||
if( !strFamily) {
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-perftest_cpp,v 1.3 2002/09/30 14:47:24 naddy Exp $
|
||||
--- perftest.cpp.orig Sat Jan 9 03:11:04 1999
|
||||
+++ perftest.cpp Mon Sep 30 16:44:57 2002
|
||||
@@ -1,7 +1,7 @@
|
||||
// test ttf engine performance
|
||||
// (C) Copyright 1997-1998 Herbert Duerr
|
||||
|
||||
-#define TTFONTDIR "/usr/share/fonts/truetype"
|
||||
+#define TTFONTDIR "/usr/local/lib/X11/fonts/TrueType"
|
||||
#define MAXFONTBUFSIZE (2048*2048)
|
||||
|
||||
#include "ttf.h"
|
||||
@ -1,79 +0,0 @@
|
||||
$OpenBSD: patch-ttf_h,v 1.1 2002/09/30 14:47:24 naddy Exp $
|
||||
--- ttf.h.orig Thu May 6 07:26:10 1999
|
||||
+++ ttf.h Mon Sep 30 16:44:57 2002
|
||||
@@ -188,7 +188,7 @@ struct FontInfo
|
||||
class TTFont
|
||||
: public RandomAccessFile
|
||||
{
|
||||
-friend Rasterizer;
|
||||
+friend class Rasterizer;
|
||||
public: //### perftest needs maxpTable
|
||||
NameTable* nameTable;
|
||||
HeadTable* headTable;
|
||||
@@ -322,8 +322,8 @@ public:
|
||||
class MaxpTable
|
||||
: public RandomAccessFile
|
||||
{
|
||||
-friend TTFont;
|
||||
-friend Rasterizer;
|
||||
+friend class TTFont;
|
||||
+friend class Rasterizer;
|
||||
|
||||
U16 numGlyphs;
|
||||
U16 maxPoints;
|
||||
@@ -393,7 +393,7 @@ public:
|
||||
class GlyphTable
|
||||
: /*public*/ RandomAccessFile
|
||||
{
|
||||
-friend Rasterizer;
|
||||
+friend class Rasterizer;
|
||||
S16 xmin;
|
||||
//S16 xmin, ymin;
|
||||
//S16 xmax, ymax;
|
||||
@@ -441,8 +441,8 @@ private:
|
||||
class HheaTable
|
||||
: public RandomAccessFile
|
||||
{
|
||||
-friend TTFont;
|
||||
-friend Rasterizer;
|
||||
+friend class TTFont;
|
||||
+friend class Rasterizer;
|
||||
int yAscent;
|
||||
int yDescent;
|
||||
int advWidth;
|
||||
@@ -575,7 +575,7 @@ public:
|
||||
class FpgmTable
|
||||
: public RandomAccessFile
|
||||
{
|
||||
-friend TTFont;
|
||||
+friend class TTFont;
|
||||
FpgmTable( RandomAccessFile& f, int offset, int length);
|
||||
};
|
||||
|
||||
@@ -584,7 +584,7 @@ friend TTFont;
|
||||
class PrepTable
|
||||
: public RandomAccessFile
|
||||
{
|
||||
-friend TTFont;
|
||||
+friend class TTFont;
|
||||
PrepTable( RandomAccessFile& f, int offset, int length);
|
||||
};
|
||||
|
||||
@@ -692,7 +692,7 @@ public:
|
||||
|
||||
|
||||
class GraphicsState {
|
||||
-friend Rasterizer; // only Rasterizer needs this
|
||||
+friend class Rasterizer; // only Rasterizer needs this
|
||||
|
||||
GraphicsState() {}
|
||||
|
||||
@@ -824,7 +824,7 @@ public:
|
||||
void printOutline( void);
|
||||
|
||||
private:
|
||||
-friend GlyphTable;
|
||||
+friend class GlyphTable;
|
||||
void applyTransformation();
|
||||
void scaleGlyph();
|
||||
int scaleX( int x, int y) { return (((xx*x+xy*y) + 16) >> 5) << xxexp;}
|
||||
@ -1,47 +0,0 @@
|
||||
$OpenBSD: patch-xfstt_cpp,v 1.4 2003/03/03 06:54:11 ish Exp $
|
||||
--- xfstt.cpp.orig Sat Dec 11 12:23:45 1999
|
||||
+++ xfstt.cpp Mon Nov 25 16:32:38 2002
|
||||
@@ -11,8 +11,8 @@
|
||||
#define UNSTRAPLIMIT 10500U
|
||||
|
||||
// Change these if you don't lie being FHS complient
|
||||
-#define TTFONTDIR "/usr/share/fonts/truetype"
|
||||
-#define TTCACHEDIR "/var/cache/xfstt"
|
||||
+#define TTFONTDIR "/usr/local/lib/X11/fonts/TrueType"
|
||||
+#define TTCACHEDIR "/usr/local/lib/X11/fonts/TrueType"
|
||||
|
||||
#define TTINFO_LEAF "ttinfo.dir"
|
||||
#define TTNAME_LEAF "ttname.dir"
|
||||
@@ -470,10 +470,12 @@ static XFSFont* openFont( TTFont* ttFont
|
||||
raster->getFontExtent( &xfs->fe);
|
||||
|
||||
int used = (xfs->fe.bitmaps + xfs->fe.bmplen) - xfs->fe.buffer;
|
||||
+ int bmpoff = xfs->fe.bitmaps - xfs->fe.buffer;
|
||||
xfs->fe.buffer = (U8*)shrinkMem( xfs->fe.buffer, used);
|
||||
- if( xfs->fe.buffer)
|
||||
+ if( xfs->fe.buffer) {
|
||||
xfs->fe.buflen = used;
|
||||
- else {
|
||||
+ xfs->fe.bitmaps = xfs->fe.buffer + bmpoff;
|
||||
+ } else {
|
||||
xfs->fid = 0; //###
|
||||
xfs = 0;
|
||||
}
|
||||
@@ -642,7 +644,7 @@ static int prepare2connect( int portno)
|
||||
s_unix.sa_family = PF_UNIX;
|
||||
sprintf( s_unix.sa_data, "fs%d", portno);
|
||||
sockname = s_unix.sa_data;
|
||||
- mkdir( "/tmp/.font-unix", 0766);
|
||||
+ mkdir( "/tmp/.font-unix", 0755);
|
||||
chdir( "/tmp/.font-unix");
|
||||
unlink( s_unix.sa_data);
|
||||
if( bind( sd_unix, (struct sockaddr*)&s_unix, sizeof(s_unix))) {
|
||||
@@ -650,6 +652,8 @@ static int prepare2connect( int portno)
|
||||
fputs( "Please check permissions.\n", stderr);
|
||||
}
|
||||
listen( sd_unix, 1); // only one connection
|
||||
+ if (chmod(s_unix.sa_data, 0777) == -1)
|
||||
+ fprintf( stderr, "Couldn't set mode on /tmp/.font-unix/%s\n", s_unix.sa_data);
|
||||
}
|
||||
|
||||
if( !sd_inet) {
|
||||
@ -1 +0,0 @@
|
||||
This is Xfstt, a free TrueType font server for X11.
|
||||
@ -1,15 +0,0 @@
|
||||
To start the TrueType font server for X11 at boot time, put
|
||||
the following in /etc/rc.local:
|
||||
|
||||
if [ -x ${PREFIX}/bin/xfstt ]; then
|
||||
echo -n ' xfstt'; ${PREFIX}/bin/xfstt --user nobody --daemon
|
||||
fi
|
||||
|
||||
You should also add the following to your FontPath in /etc/X11/XF86Config:
|
||||
|
||||
FontPath "unix/:7101"
|
||||
|
||||
Note that previous versions used unix/:7100.
|
||||
|
||||
TrueType fonts should be placed in ${PREFIX}/lib/X11/fonts/TrueType.
|
||||
Additional documentation can be found in ${PREFIX}/share/doc/xfstt.
|
||||
@ -1,9 +0,0 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2004/09/18 09:54:10 espie Exp $
|
||||
bin/xfstt
|
||||
@man man/man1/xfstt.1
|
||||
share/doc/xfstt/
|
||||
share/doc/xfstt/CHANGES
|
||||
share/doc/xfstt/FAQ
|
||||
share/doc/xfstt/INSTALL
|
||||
share/doc/xfstt/README.OpenBSD
|
||||
share/doc/xfstt/THANKS.txt
|
||||
Loading…
Reference in New Issue
Block a user