Pull up security fix to the pkgsrc-2003Q4 branch, requested by Lubomir

Sedlacik.

	Module Name:    pkgsrc
	Committed By:   salo
	Date:           Thu Jan  1 20:06:11 UTC 2004

	Modified Files:
		pkgsrc/x11/xfstt: MESSAGE Makefile PLIST distinfo
		pkgsrc/x11/xfstt/patches: patch-aa patch-ab patch-ac

	Log Message:
	Update to version 1.6.

	- correct usage of PREFIX in MESSAGE
	- sort PLIST

	Changes:

	1.6:
	====
	- Fixed ttSyncAll only looking at fontdir subdirectories
	- Added more robust checking for cachedir
	- Removed a constant path size limitation (for the Hurd)
	- Fixed a typo in "syncing"
	- Minor indentation fixes
	- Started the transition to using C++ strings
	- Changed the libfstt API:
	    Fixed multiple memory leakages
	    The member getString doesn't need the conversion buffer anymore
	- Fixed the output format of --gslist

	1.5.1:
	======
	- Fixed a possible security problem by checking the byteorder magic in
	  the connection handshake:
	    bugtraq id 8255

	1.5:
	====
	- Fixed multiple buffer overflows in the network packet handling code:
	   CAN-2003-0581
	- New encoding: iso8859-14
	- Moved hardcoded dir locations to configure space
	- Mkdir the fontdir and cachedir in the make install target
	- Improve error messages when cachedir does not exist
	- Remove --gslist dependency on order of arguments
	- Replaced dprintfN with a debug function
	- Cleaned the debugging output
	- Indentation and minor source cosmetic changes
	- Updated to gettext 0.12.1, version 0.11.5 was buggy
	- Added a System V init file example
	- Cleaned the examples in doc/examples: font.properties, test.sh
	- Updated the documentation: doc/FAQ, INSTALL, THANKS, TODO, xfstt.1x

7 files changed, 49 insertions, 46 deletions

diff --git a/x11/xfstt/MESSAGE b/x11/xfstt/MESSAGE
index 8274fa8cb46..ce2f1c206df 100644
--- a/x11/xfstt/MESSAGE
+++ b/x11/xfstt/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/05/06 17:43:13 jmmv Exp $
+$NetBSD: MESSAGE,v 1.2.2.1 2004/01/01 22:56:24 agc Exp $
 
 To use xfstt, you will need to perform the following steps:
 
@@ -7,7 +7,7 @@ To use xfstt, you will need to perform the following steps:
    TrueType fonts from the fonts category), or copy your other TrueType
    fonts into
 
-	@PREFIX@/lib/X11/fonts/TrueType/
+	${PREFIX}/lib/X11/fonts/TrueType/
 
 2. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy
    ${PREFIX}/etc/rc.d/xfstt to /etc/rc.d/xfstt and add the following
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index b62eaa14ecb..39fd37dd20b 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 22:56:56 grant Exp $
+# $NetBSD: Makefile,v 1.15.2.1 2004/01/01 22:56:24 agc Exp $
 #
 
-DISTNAME=		xfstt-1.4
+DISTNAME=		xfstt-1.6
 CATEGORIES=		x11 net fonts
 MASTER_SITES=		http://download.berlios.de/xfstt/
 
 MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://developer.berlios.de/projects/xfstt
+HOMEPAGE=		http://developer.berlios.de/projects/xfstt/
 COMMENT=		TrueType font server for X11
 
 USE_PKGINSTALL=		YES
diff --git a/x11/xfstt/PLIST b/x11/xfstt/PLIST
index df050a869b4..8bd2fa25d43 100644
--- a/x11/xfstt/PLIST
+++ b/x11/xfstt/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/22 13:33:31 salo Exp $
+@comment $NetBSD: PLIST,v 1.3.2.1 2004/01/01 22:56:24 agc Exp $
 bin/xfstt
 etc/rc.d/xfstt
 man/man1/xfstt.1
-share/doc/xfstt/FAQ
 share/doc/xfstt/CHANGES
+share/doc/xfstt/FAQ
 share/doc/xfstt/THANKS
 share/doc/xfstt/TODO
 share/examples/xfstt/font.properties
diff --git a/x11/xfstt/distinfo b/x11/xfstt/distinfo
index b0ce9a46ff9..a7631b83406 100644
--- a/x11/xfstt/distinfo
+++ b/x11/xfstt/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2003/02/22 13:33:31 salo Exp $
+$NetBSD: distinfo,v 1.6.2.1 2004/01/01 22:56:24 agc Exp $
 
-SHA1 (xfstt-1.4.tar.gz) = 25431050958da607536222b68ed1860cca8d4a5d
-Size (xfstt-1.4.tar.gz) = 323467 bytes
-SHA1 (patch-aa) = d4229fe26bee60d783f933b4ed9705ef39d0c785
-SHA1 (patch-ab) = c0ff812bab52579c4254557bc3890b19d5f936d8
-SHA1 (patch-ac) = 6247c7683f41e56f4017ae38e5c70e11ead22cec
-SHA1 (patch-ad) = c86c0d313be00057d0a485850d2e76d4958a036f
+SHA1 (xfstt-1.6.tar.gz) = 7fe623b27d85c5611346376d2b84e549db038c17
+Size (xfstt-1.6.tar.gz) = 346346 bytes
+SHA1 (patch-aa) = 40e4966dd619fc87e4b4e2797c32be9d330eae06
+SHA1 (patch-ab) = 18d41c9121c4b95b22a831fb987a97c90a8c0a86
+SHA1 (patch-ac) = 0832e115a04d19734cd6808ec1656082da1b118a
 SHA1 (patch-ae) = 18afec3897291c5cf135a466f173acb0341fd427
diff --git a/x11/xfstt/patches/patch-aa b/x11/xfstt/patches/patch-aa
index 2ad6bda108f..d76597202df 100644
--- a/x11/xfstt/patches/patch-aa
+++ b/x11/xfstt/patches/patch-aa
@@ -1,40 +1,42 @@
-$NetBSD: patch-aa,v 1.3 2003/02/22 13:33:31 salo Exp $
+$NetBSD: patch-aa,v 1.3.2.1 2004/01/01 22:56:24 agc Exp $
 
---- doc/FAQ.orig	2002-11-14 13:08:07.000000000 +0100
-+++ doc/FAQ	2003-02-22 12:34:43.000000000 +0100
-@@ -67,7 +67,8 @@
+--- doc/FAQ.orig	2003-08-07 08:59:03.000000000 +0200
++++ doc/FAQ	2004-01-01 20:44:46.000000000 +0100
+@@ -68,8 +68,8 @@
  
  1.1 How do I test it?
  
--	mkdir /usr/share/fonts/truetype and put some *ttf fonts there, now run
+-	mkdir /usr/share/fonts/truetype and put some *ttf fonts there, now
+-	run:
 +	mkdir @PREFIX@/lib/X11/fonts/TrueType and put some *ttf fonts
-+	there, now run
++        there, now run:
  
  	make xfstt && make install
  	xfstt --sync
-@@ -171,9 +172,11 @@
+@@ -175,11 +175,11 @@
  
  2.4 How does one add fonts?
  
--	Copy *.ttf fonts into the /usr/share/fonts/truetype/ directory or put some
--	softlinks to font directories in there. A typical example is
--	ln -s /DOS/windows/fonts /usr/share/fonts/truetype/winfonts
+-	Copy *.ttf fonts into the /usr/share/fonts/truetype/ directory or
+-	put some softlinks to font directories in there. A typical example
+-	is:
 +	Copy *.ttf fonts into the @PREFIX@/lib/X11/fonts/TrueType/
-+	directory or put some softlinks to font directories in there.
-+	A typical example is
-+
-+	  ln -s /DOS/windows/fonts @PREFIX@/lib/X11/fonts/TrueType/winfonts
++        directory or put some softlinks to font directories in there.
++        A typical example is:
+ 
+-	ln -s /DOS/windows/fonts /usr/share/fonts/truetype/winfonts
++	ln -s /DOS/windows/fonts @PREFIX@/lib/X11/fonts/TrueType/winfonts
  
  	Now run "xfstt --sync" in order to have the new fonts recognized.
  	Adding fonts while xfstt is running doesn't work yet.
-@@ -346,8 +349,8 @@
+@@ -358,8 +358,8 @@
  
- 3.0  How do I put fonts in categories?
+ 3.0 How do I put fonts in categories?
  
 -	Create some subdirectories in /usr/share/fonts/truetype, e.g.
 -	modern, script, brush, old, symbol, ...
 +	Create some subdirectories in @PREFIX@/lib/X11/fonts/TrueType,
-+	e.g.  modern, script, brush, old, symbol, ...
++        e.g.  modern, script, brush, old, symbol, ...
  	and put the appropriate fonts in there. The corresponding font
- 	names will be -modern-*, -script-*, -brush-* and so on
+ 	names will be -modern-*, -script-*, -brush-* and so on.
  
diff --git a/x11/xfstt/patches/patch-ab b/x11/xfstt/patches/patch-ab
index 5a6fb5a0377..fc7d2be16f0 100644
--- a/x11/xfstt/patches/patch-ab
+++ b/x11/xfstt/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2003/02/22 13:33:32 salo Exp $
+$NetBSD: patch-ab,v 1.3.2.1 2004/01/01 22:56:24 agc Exp $
 
---- doc/examples/font.properties.orig	2002-11-14 13:08:07.000000000 +0100
-+++ doc/examples/font.properties	2003-02-22 12:35:41.000000000 +0100
+--- doc/examples/font.properties.orig	2003-04-07 05:59:16.000000000 +0200
++++ doc/examples/font.properties	2004-01-01 20:46:52.000000000 +0100
 @@ -1,5 +1,4 @@
  # awt font properties for X11 with xfstt
--# copy to /usr/local/java/lib/font.properties
+-# copy to $(JAVA_HOME)/lib/font.properties
  
  dialog.plain.0		= -*-arial-medium-r-normal--*-%d-*-*-p-*-iso8859-1
  dialog.italic.0		= -*-arial-medium-i-normal--*-%d-*-*-p-*-iso8859-1
diff --git a/x11/xfstt/patches/patch-ac b/x11/xfstt/patches/patch-ac
index 79cb90526cf..a8603603dc9 100644
--- a/x11/xfstt/patches/patch-ac
+++ b/x11/xfstt/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.3 2003/02/22 13:33:32 salo Exp $
+$NetBSD: patch-ac,v 1.3.2.1 2004/01/01 22:56:24 agc Exp $
 
---- src/perftest.cc.orig	2002-11-14 13:08:09.000000000 +0100
-+++ src/perftest.cc	2003-02-22 10:39:47.000000000 +0100
-@@ -21,7 +21,7 @@
-  *
-  */
+--- src/Makefile.in.orig	2003-08-07 08:58:28.000000000 +0200
++++ src/Makefile.in	2004-01-01 20:51:39.000000000 +0100
+@@ -163,8 +163,8 @@
+ target_alias = @target_alias@
  
--#define TTFONTDIR	"/usr/share/fonts/truetype"
-+#define TTFONTDIR	"@PREFIX@/lib/X11/fonts/TrueType"
- #define MAXFONTBUFSIZE (2048*2048)
+ localedir = $(datadir)/locale
+-fontdir = $(datadir)/fonts/truetype
+-cachedir = $(localstatedir)/cache/xfstt
++fontdir = $(prefix)/lib/X11/fonts/TrueType
++cachedir = $(prefix)/lib/X11/fonts/TrueType
+ pidfile = $(localstatedir)/run/xfstt.pid
  
- #include "ttf.h"
+ LDADD = @LIBINTL@ -L$(top_srcdir)/libfstt -lfstt