bounds checking patches and encodings segfault patches

8 files changed, 150 insertions, 46 deletions

diff --git a/x11-misc/ttmkfdir/ChangeLog b/x11-misc/ttmkfdir/ChangeLog
index 5c87e78ceb93..87667b7f1a29 100644
--- a/x11-misc/ttmkfdir/ChangeLog
+++ b/x11-misc/ttmkfdir/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-misc/ttmkfdir
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.37 2004/07/16 19:11:13 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.38 2004/09/04 04:22:30 seemant Exp $
+
+*ttmkfdir-3.0.9-r2 (02 Sep 2004)
+
+  02 Sep 2004; Seemant Kulleen <seemant@gentoo.org> +metadata.xml,
+  +files/ttmkfdir-3.0.9-encoding.patch, -ttmkfdir-3.0.4.ebuild,
+  +ttmkfdir-3.0.9-r2.ebuild:
+  added ttmkfdir-3.0.9-encodings.patch to stop ttmkfdir from segfaulting on the
+  newer x.org encodings. Patch is a combination of the one in comment 19 by:
+  Benoit Boissinot <b.boissinot@ifrance.com> in bug #60470 and Benjamin
+  Schindler <config@gmx.ch> in bug #62427.
 
   16 Jul 2004; Tom Gall <tgall@gentoo.org> ttmkfdir-3.0.9-r1.ebuild:
   stable on ppc64
diff --git a/x11-misc/ttmkfdir/Manifest b/x11-misc/ttmkfdir/Manifest
index 7c1aaa77fa89..03ed3610dc23 100644
--- a/x11-misc/ttmkfdir/Manifest
+++ b/x11-misc/ttmkfdir/Manifest
@@ -1,14 +1,16 @@
-MD5 b0bf42d1cdb330642e24ce00ec68da3b ChangeLog 4574
-MD5 3bb2f223d8cb8145538a2f959c31a371 ttmkfdir-3.0.4.ebuild 823
-MD5 7ef34cb265c1f9b98caf88663dbdf397 ttmkfdir-3.0.9-r1.ebuild 1058
+MD5 508a26ab02b875206123260e7f4004f6 ttmkfdir-3.0.9-r2.ebuild 1110
 MD5 3cf3990bf24e91275479997d0046325d ttmkfdir-3.0.9.ebuild 878
-MD5 504adfa6639ae2434cdafb013912b9da files/digest-ttmkfdir-3.0.4 66
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9 66
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r1 66
-MD5 d1defff244ae210e4ba3da97b5443b4c files/ttmkfdir-1.0-gentoo.diff 1190
+MD5 7ef34cb265c1f9b98caf88663dbdf397 ttmkfdir-3.0.9-r1.ebuild 1058
+MD5 8ef688419a991e776af91e8e89c9fb67 ChangeLog 5043
+MD5 36a69eed0e585f3dcf096cc82ac54575 metadata.xml 230
 MD5 e285b7a7c7369e7947c0997de817d3ce files/ttmkfdir-2.0-gentoo.patch 688
 MD5 255516ccdde8cad5c8f7b6659f4bdde2 files/ttmkfdir-3.0.9-cpp.patch 505
-MD5 2f9cb69179e04e61bd5666c2c4833a36 files/ttmkfdir-3.0.9-gcc33.patch 529
+MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r1 66
+MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r2 66
 MD5 4a98d364009103c5afb6552165049585 files/ttmkfdir-3.0.9-gcc34.patch 878
-MD5 537b2fa79d0feee2ffd2f994b227eb12 files/ttmkfdir-3.0.9-zlib.patch 1913
 MD5 9b84e6d68d388eb67760658ba28d05c8 files/ttmkfdir2-ignore-FIRSTINDEX.patch 440
+MD5 11a05e48e2bba01444957f6049353fc7 files/ttmkfdir-3.0.9-encoding.patch 2334
+MD5 d1defff244ae210e4ba3da97b5443b4c files/ttmkfdir-1.0-gentoo.diff 1190
+MD5 537b2fa79d0feee2ffd2f994b227eb12 files/ttmkfdir-3.0.9-zlib.patch 1913
+MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9 66
+MD5 2f9cb69179e04e61bd5666c2c4833a36 files/ttmkfdir-3.0.9-gcc33.patch 529
diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.4 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.4
deleted file mode 100644
index 10fa1b11a28b..000000000000
--- a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 258b38503b169612bd641156cd55032e ttmkfdir-3.0.4.tar.bz2 18496
diff --git a/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r2 b/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r2
new file mode 100644
index 000000000000..23c8357a597c
--- /dev/null
+++ b/x11-misc/ttmkfdir/files/digest-ttmkfdir-3.0.9-r2
@@ -0,0 +1 @@
+MD5 7fbf13e432aa519669899b13d00673f3 ttmkfdir-3.0.9.tar.bz2 20160
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-encoding.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-encoding.patch
new file mode 100644
index 000000000000..30f0170f4b3b
--- /dev/null
+++ b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-encoding.patch
@@ -0,0 +1,73 @@
+diff -urN ttmkfdir-3.0.9.orig/directory.cpp ttmkfdir-3.0.9/directory.cpp
+--- ttmkfdir-3.0.9.orig/directory.cpp	2002-12-09 00:29:11.000000000 -0800
++++ ttmkfdir-3.0.9/directory.cpp	2004-09-02 23:42:16.000000000 -0700
+@@ -9,10 +9,12 @@
+ {
+ }
+ 
+-void
++int
+ directory::scan (const std::string &dir)
+ {
+     DIR *ttfdir = opendir(dir.c_str ());
++    if(!ttfdir)
++    	return -1;
+ 
+     this->clear ();
+     dirpath = dir;
+@@ -26,6 +28,7 @@
+     }
+ 
+     closedir (ttfdir);
++    return 0;
+ }
+ 
+ bool
+diff -urN ttmkfdir-3.0.9.orig/directory.h ttmkfdir-3.0.9/directory.h
+--- ttmkfdir-3.0.9.orig/directory.h	2002-12-09 00:29:11.000000000 -0800
++++ ttmkfdir-3.0.9/directory.h	2004-09-02 23:42:16.000000000 -0700
+@@ -11,7 +11,7 @@
+ 	if (path != "") scan (path);
+     };
+     virtual ~directory (void);
+-    void scan (const std::string &path = ".");
++    int scan (const std::string &path = ".");
+     virtual bool select (const char *name) const;
+     const std::string &path (void) const {
+ 	return dirpath;
+diff -urN ttmkfdir-3.0.9.orig/encoding.l ttmkfdir-3.0.9/encoding.l
+--- ttmkfdir-3.0.9.orig/encoding.l	2003-01-07 21:25:25.000000000 -0800
++++ ttmkfdir-3.0.9/encoding.l	2004-09-02 23:42:51.000000000 -0700
+@@ -108,7 +108,7 @@
+     }
+     
+     /* now mark all the unassigned codes */
+-    for (long i = i1; i <= i2; i++) {
++    for (long i = i1; i <= i2 && i < cur_enc->size; i++) {
+ 	(*cur_map)[i] = -1;
+     }
+ }
+@@ -140,7 +140,7 @@
+ 	break;
+     }
+ 
+-    for (i = start_range; i <= end_range; i++, target++) {
++    for (i = start_range; i <= end_range && i < cur_enc->size; i++, target++) {
+ 	(*cur_map)[i] = target;
+     }
+     cur_enc->enc_size = cur_enc->enc_size + end_range - start_range + 1;   
+diff -urN ttmkfdir-3.0.9.orig/ttmkfdir.cpp ttmkfdir-3.0.9/ttmkfdir.cpp
+--- ttmkfdir-3.0.9.orig/ttmkfdir.cpp	2003-01-19 15:33:11.000000000 -0800
++++ ttmkfdir-3.0.9/ttmkfdir.cpp	2004-09-02 23:42:16.000000000 -0700
+@@ -60,7 +60,10 @@
+ 	return 0;
+     }
+     
+-    dir::instance()->scan (cmdline::instance()->option ("font-dir"));
++    if(dir::instance()->scan (cmdline::instance()->option ("font-dir")) == -1) {
++    	printf("No such directory...\n");
++	return -1;
++    }
+     
+     for (directory::iterator i = dir::instance()->begin (); i != dir::instance()->end(); i++) {
+ 	const ttf::Face face (dir::instance()->path() + '/' + *i);
diff --git a/x11-misc/ttmkfdir/metadata.xml b/x11-misc/ttmkfdir/metadata.xml
new file mode 100644
index 000000000000..f3639d375dc6
--- /dev/null
+++ b/x11-misc/ttmkfdir/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>X11</herd>
+<longdescription>X11 implementation by X.Org Foundation</longdescription>
+</pkgmetadata>
diff --git a/x11-misc/ttmkfdir/ttmkfdir-3.0.4.ebuild b/x11-misc/ttmkfdir/ttmkfdir-3.0.4.ebuild
deleted file mode 100644
index 3f3a46025a08..000000000000
--- a/x11-misc/ttmkfdir/ttmkfdir-3.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.4.ebuild,v 1.17 2004/07/15 00:56:05 agriffis Exp $
-
-IUSE=""
-
-inherit eutils
-
-DESCRIPTION="A utility to create a fonts.scale file from a set of TrueType fonts"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://www.joerg-pommnitz.de/TrueType/xfsft.html"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ~sparc ppc alpha hppa amd64 mips"
-
-DEPEND=">=media-libs/freetype-2.0.8
-	>=sys-devel/flex-2.5.4a-r5
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}; epatch ${FILESDIR}/${PN}-3.0.9-gcc33.patch
-}
-
-src_compile() {
-	make CXX="${CXX:=g++}" \
-		OPTFLAGS="${CFLAGS}" DEBUG="" || die
-}
-
-src_install() {
-	exeinto /usr/X11R6/bin
-	doexe ${S}/ttmkfdir
-}
diff --git a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild b/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild
new file mode 100644
index 000000000000..bc696b16fb22
--- /dev/null
+++ b/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r2.ebuild,v 1.1 2004/09/04 04:22:30 seemant Exp $
+
+inherit eutils flag-o-matic gcc
+
+IUSE=""
+
+DESCRIPTION="A utility to create a fonts.scale file from a set of TrueType fonts"
+HOMEPAGE="http://www.joerg-pommnitz.de/TrueType/xfsft.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+
+RDEPEND="virtual/libc
+	sys-libs/zlib
+	>=media-libs/freetype-2.0.8"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.4a-r5
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-cpp.patch
+	epatch ${FILESDIR}/${P}-zlib.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/${P}-encoding.patch
+}
+
+src_compile() {
+	filter-flags -O -O1 -O2 -O3
+	emake \
+		CXX="$(gcc-getCXX)" \
+		OPTFLAGS="${CFLAGS}" \
+		DEBUG="" \
+		|| die "emake failed"
+}
+
+src_install() {
+	exeinto /usr/X11R6/bin
+	doexe ttmkfdir || die "doexe failed"
+	dodoc README
+}