Grab fix from upstream cvs for out of bounds error #140902 by Alexey Dobriyan.

(Portage version: 2.1.1_pre3-r1)

6 files changed, 122 insertions, 1 deletions

diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index e49d19d9af4e..764d65176154 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/texinfo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.73 2006/05/23 20:40:27 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.74 2006/07/20 00:44:18 vapier Exp $
+
+*texinfo-4.8-r4 (20 Jul 2006)
+
+  20 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/texinfo-4.8-bounds-check.patch, +texinfo-4.8-r4.ebuild:
+  Grab fix from upstream cvs for out of bounds error #140902 by Alexey Dobriyan.
 
   23 May 2006; <solar@gentoo.org> -texinfo-4.7-r1.ebuild,
   -texinfo-4.8.ebuild, -texinfo-4.8-r1.ebuild:
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.8-r2 b/sys-apps/texinfo/files/digest-texinfo-4.8-r2
index 89aa6b29dbe2..8bfc6f00eb18 100644
--- a/sys-apps/texinfo/files/digest-texinfo-4.8-r2
+++ b/sys-apps/texinfo/files/digest-texinfo-4.8-r2
@@ -1 +1,3 @@
 MD5 6ba369bbfe4afaa56122e65b3ee3a68c texinfo-4.8.tar.bz2 1521822
+RMD160 5cb82cd240d1f22da813c7142df8828b4f6f1ea4 texinfo-4.8.tar.bz2 1521822
+SHA256 f6bb61fb9c1d6a65523c786a4a74ab61e455420469e09a86929f2d403d9a21bb texinfo-4.8.tar.bz2 1521822
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.8-r3 b/sys-apps/texinfo/files/digest-texinfo-4.8-r3
index 89aa6b29dbe2..8bfc6f00eb18 100644
--- a/sys-apps/texinfo/files/digest-texinfo-4.8-r3
+++ b/sys-apps/texinfo/files/digest-texinfo-4.8-r3
@@ -1 +1,3 @@
 MD5 6ba369bbfe4afaa56122e65b3ee3a68c texinfo-4.8.tar.bz2 1521822
+RMD160 5cb82cd240d1f22da813c7142df8828b4f6f1ea4 texinfo-4.8.tar.bz2 1521822
+SHA256 f6bb61fb9c1d6a65523c786a4a74ab61e455420469e09a86929f2d403d9a21bb texinfo-4.8.tar.bz2 1521822
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.8-r4 b/sys-apps/texinfo/files/digest-texinfo-4.8-r4
new file mode 100644
index 000000000000..8bfc6f00eb18
--- /dev/null
+++ b/sys-apps/texinfo/files/digest-texinfo-4.8-r4
@@ -0,0 +1,3 @@
+MD5 6ba369bbfe4afaa56122e65b3ee3a68c texinfo-4.8.tar.bz2 1521822
+RMD160 5cb82cd240d1f22da813c7142df8828b4f6f1ea4 texinfo-4.8.tar.bz2 1521822
+SHA256 f6bb61fb9c1d6a65523c786a4a74ab61e455420469e09a86929f2d403d9a21bb texinfo-4.8.tar.bz2 1521822
diff --git a/sys-apps/texinfo/files/texinfo-4.8-bounds-check.patch b/sys-apps/texinfo/files/texinfo-4.8-bounds-check.patch
new file mode 100644
index 000000000000..48176af4f321
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-4.8-bounds-check.patch
@@ -0,0 +1,32 @@
+http://bugs.gentoo.org/140902
+
+revision 1.30
+date: 2005-04-05 17:04:16 -0400;  author: karl;  state: Exp;  lines: +6 -4
+negative array indexing, grep -c for tests
+
+Index: makeinfo/html.c
+===================================================================
+RCS file: /cvsroot/texinfo/texinfo/makeinfo/html.c,v
+retrieving revision 1.29
+retrieving revision 1.30
+diff -u -p -r1.29 -r1.30
+--- makeinfo/html.c	12 Mar 2005 23:59:39 -0000	1.29
++++ makeinfo/html.c	5 Apr 2005 21:04:16 -0000	1.30
+@@ -448,7 +450,7 @@ rollback_empty_tag (char *tag)
+     return 0;
+ 
+   /* Find the end of the previous tag.  */
+-  while (output_paragraph[check_position-1] != '>' && check_position > 0)
++  while (check_position > 0 && output_paragraph[check_position-1] != '>')
+     check_position--;
+ 
+   /* Save stuff between tag's end to output_paragraph's end.  */
+@@ -465,7 +467,7 @@ rollback_empty_tag (char *tag)
+     }
+ 
+   /* Find the start of the previous tag.  */
+-  while (output_paragraph[check_position-1] != '<' && check_position > 0)
++  while (check_position > 0 && output_paragraph[check_position-1] != '<')
+     check_position--;
+ 
+   /* Check to see if this is the tag.  */
diff --git a/sys-apps/texinfo/texinfo-4.8-r4.ebuild b/sys-apps/texinfo/texinfo-4.8-r4.ebuild
new file mode 100644
index 000000000000..bbcb32a2c30d
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-4.8-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.8-r4.ebuild,v 1.1 2006/07/20 00:44:18 vapier Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="http://www.gnu.org/software/texinfo/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls build static"
+
+RDEPEND="!build? ( >=sys-libs/ncurses-5.2-r2 )
+	!build? ( nls? ( virtual/libintl ) )"
+DEPEND="${RDEPEND}
+	!build? ( nls? ( sys-devel/gettext ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-freebsd.patch
+	epatch "${FILESDIR}"/${P}-tempfile-owl.patch #114499
+	epatch "${FILESDIR}"/${P}-bounds-check.patch #140902
+
+	cd doc
+	# Get the texinfo info page to have a proper name of texinfo.info
+	sed -i 's:setfilename texinfo:setfilename texinfo.info:' texinfo.txi
+	sed -i \
+		-e 's:INFO_DEPS = texinfo:INFO_DEPS = texinfo.info:' \
+		-e 's:texinfo\::texinfo.info\::' \
+		Makefile.in
+}
+
+src_compile() {
+	local myconf=
+	if ! use nls || use build ; then
+		myconf="--disable-nls"
+	fi
+	use static && append-ldflags -static
+
+	econf ${myconf} || die
+
+	# Cross-compile workaround #133429
+	if tc-is-cross-compiler ; then
+		emake -C tools || die "emake tools"
+	fi
+
+	# work around broken dependency's in info/Makefile.am #85540
+	emake -C lib || die "emake lib"
+	emake -C info makedoc || die "emake makedoc"
+	emake -C info doc.c || die "emake doc.c"
+	emake || die "emake"
+}
+
+src_install() {
+	if use build ; then
+		newbin util/ginstall-info install-info
+		dobin makeinfo/makeinfo util/{texi2dvi,texindex}
+	else
+		make DESTDIR="${D}" install || die "install failed"
+		dosbin ${FILESDIR}/mkinfodir
+		# tetex installs this guy #76812
+		has_version '<app-text/tetex-3' && rm -f "${D}"/usr/bin/texi2pdf
+
+		if [[ ! -f ${D}/usr/share/info/texinfo.info ]] ; then
+			die "Could not install texinfo.info!!!"
+		fi
+
+		dodoc AUTHORS ChangeLog INTRODUCTION NEWS README TODO
+		newdoc info/README README.info
+		newdoc makeinfo/README README.makeinfo
+	fi
+}