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

Package-Manager: portage-2.1.1_pre3-r1

7 files changed, 179 insertions, 5 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/Manifest b/sys-apps/texinfo/Manifest
index 2a75fcf608e2..84af070f811f 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,11 +1,64 @@
-MD5 4f22dc7b2d2cf661b5d11a7a643d851c ChangeLog 8330
-MD5 1c6181fd6a19db98315a1f737a5ae839 files/digest-texinfo-4.8-r2 65
-MD5 1c6181fd6a19db98315a1f737a5ae839 files/digest-texinfo-4.8-r3 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX makeinfo.patch 790 RMD160 7e55e2d176ce5b39a949df4927eb16208e3d6240 SHA1 2098b57f37d3277b3ee1abfdf95a3f400479d28f SHA256 638d84a5fe68c98801e2be0b70dd1b71241399da87139bc5826ead6c431f7ce2
 MD5 a0df107ca9e3036e2ee2d501343cbf2b files/makeinfo.patch 790
+RMD160 7e55e2d176ce5b39a949df4927eb16208e3d6240 files/makeinfo.patch 790
+SHA256 638d84a5fe68c98801e2be0b70dd1b71241399da87139bc5826ead6c431f7ce2 files/makeinfo.patch 790
+AUX mkinfodir 7318 RMD160 57fb7f4524acf84be5e805b9df6f4c435aa2e5b9 SHA1 31b41b7935f8c813536abb6e90b04e97ca10583e SHA256 2361ed35848aba949fa9af03e16f2c83ab28f1ae11d1dd97f2c58fe619406e69
 MD5 690fb86d0c0215155b1d18671099115a files/mkinfodir 7318
+RMD160 57fb7f4524acf84be5e805b9df6f4c435aa2e5b9 files/mkinfodir 7318
+SHA256 2361ed35848aba949fa9af03e16f2c83ab28f1ae11d1dd97f2c58fe619406e69 files/mkinfodir 7318
+AUX texinfo-4.8-bounds-check.patch 1163 RMD160 329f5f612248550ec1e3c6cc9400df2b9180ded4 SHA1 52dff66b2779b0a673fe8c4d7a15d058e7fbba06 SHA256 774e785f01b0a2976b9c050b9d55abbc9c002e2784ab42dd1061cfea13b33289
+MD5 bd3981e1fcbf0da681ff4b8b4bb7fa42 files/texinfo-4.8-bounds-check.patch 1163
+RMD160 329f5f612248550ec1e3c6cc9400df2b9180ded4 files/texinfo-4.8-bounds-check.patch 1163
+SHA256 774e785f01b0a2976b9c050b9d55abbc9c002e2784ab42dd1061cfea13b33289 files/texinfo-4.8-bounds-check.patch 1163
+AUX texinfo-4.8-freebsd.patch 3787 RMD160 94c14ad8d022d7feb5f635d1d5d42ac2571a3549 SHA1 40a772d2bd1a7f2d280d5744dffbc0b942c8ba1a SHA256 844c228352c1d05cfdba381569bbc06bc494b5c22d391730b2da2fd2e4f47661
 MD5 7246b5d34e673e1eb937186e4f18f56d files/texinfo-4.8-freebsd.patch 3787
+RMD160 94c14ad8d022d7feb5f635d1d5d42ac2571a3549 files/texinfo-4.8-freebsd.patch 3787
+SHA256 844c228352c1d05cfdba381569bbc06bc494b5c22d391730b2da2fd2e4f47661 files/texinfo-4.8-freebsd.patch 3787
+AUX texinfo-4.8-tempfile-owl.patch 2565 RMD160 8b54cc3942b09c8fe0eb82523be57002bf04b2fe SHA1 8b2ca277cb38d28328de1152a1db7311820fa747 SHA256 f36057327c44b65e7349ccc6ffdd77588c62796047816062cc51dc4ef3791da4
 MD5 216cdeeac537b57cdb329003c3c46b3d files/texinfo-4.8-tempfile-owl.patch 2565
+RMD160 8b54cc3942b09c8fe0eb82523be57002bf04b2fe files/texinfo-4.8-tempfile-owl.patch 2565
+SHA256 f36057327c44b65e7349ccc6ffdd77588c62796047816062cc51dc4ef3791da4 files/texinfo-4.8-tempfile-owl.patch 2565
+AUX texinfo-4.8-tempfile.patch 708 RMD160 5214ae3b96e2714bba8e61c141dd32b6c0c31b66 SHA1 f0d5135123b09973fe1af8d645924bd8c5fa3efa SHA256 356935c23212eec139885d0217568c35e834a1abdd3b7fe062af0bb2da9fcd01
 MD5 a30131625cc3b1393c59b9603e982f24 files/texinfo-4.8-tempfile.patch 708
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 5214ae3b96e2714bba8e61c141dd32b6c0c31b66 files/texinfo-4.8-tempfile.patch 708
+SHA256 356935c23212eec139885d0217568c35e834a1abdd3b7fe062af0bb2da9fcd01 files/texinfo-4.8-tempfile.patch 708
+DIST texinfo-4.8.tar.bz2 1521822 RMD160 5cb82cd240d1f22da813c7142df8828b4f6f1ea4 SHA1 b19e906f7220294c1e8b087d583c50f5c4d7c420 SHA256 f6bb61fb9c1d6a65523c786a4a74ab61e455420469e09a86929f2d403d9a21bb
+EBUILD texinfo-4.8-r2.ebuild 1961 RMD160 e14f2cf16bb0f77b7cd016124b77fe72c0b8adac SHA1 8eb93709fe07407ad835b33705f08fdb36bd5d8b SHA256 aee9aeb57e1e8a8aea5141ddc206377d091038946c7542967db4960472fd9d3f
 MD5 1f4e811515c036d2926b2f9a9f3fe124 texinfo-4.8-r2.ebuild 1961
+RMD160 e14f2cf16bb0f77b7cd016124b77fe72c0b8adac texinfo-4.8-r2.ebuild 1961
+SHA256 aee9aeb57e1e8a8aea5141ddc206377d091038946c7542967db4960472fd9d3f texinfo-4.8-r2.ebuild 1961
+EBUILD texinfo-4.8-r3.ebuild 2157 RMD160 9573f7fce1a02a428191367f15f6f874b629412c SHA1 fd08c63a21c7e91701db8a96c04b2402ac77a517 SHA256 3357d856ce2eca4676537afbf05d6f81212df40a9425a1fdc90e33756310030c
 MD5 07b23bdba8fbfb503e51b5163516ab88 texinfo-4.8-r3.ebuild 2157
+RMD160 9573f7fce1a02a428191367f15f6f874b629412c texinfo-4.8-r3.ebuild 2157
+SHA256 3357d856ce2eca4676537afbf05d6f81212df40a9425a1fdc90e33756310030c texinfo-4.8-r3.ebuild 2157
+EBUILD texinfo-4.8-r4.ebuild 2208 RMD160 6a8d6c756ec9358a7e87b44e7b830bb56e191630 SHA1 47286f0dbd907911e736256ac6b66b80ee1bd2d7 SHA256 9c95c879d3b2efd14691b22f4031fd081620643a4390a65338f43439d6f2e61e
+MD5 52bff1bb37462e44060e1286432474cc texinfo-4.8-r4.ebuild 2208
+RMD160 6a8d6c756ec9358a7e87b44e7b830bb56e191630 texinfo-4.8-r4.ebuild 2208
+SHA256 9c95c879d3b2efd14691b22f4031fd081620643a4390a65338f43439d6f2e61e texinfo-4.8-r4.ebuild 2208
+MISC ChangeLog 8559 RMD160 37def19ce2e1021eb218965999dc42611ec68643 SHA1 a245a430c67d9d981ac770ecc9d12a6ac8370b00 SHA256 3c240154e64b2e2f7bd0d81939821c8a99c224c863d1d9af4a685d4c12d806ed
+MD5 2bdbe157a99c9022aa2f0a0b5a454a53 ChangeLog 8559
+RMD160 37def19ce2e1021eb218965999dc42611ec68643 ChangeLog 8559
+SHA256 3c240154e64b2e2f7bd0d81939821c8a99c224c863d1d9af4a685d4c12d806ed ChangeLog 8559
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
+SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
+MD5 29bb9e8c5badabb1357af7f2e69f0f79 files/digest-texinfo-4.8-r2 241
+RMD160 854f817351e10a866caacd170b988b60c0538113 files/digest-texinfo-4.8-r2 241
+SHA256 75045d609cf165296a77fcee2f24f408b40d03462a18b787bf8334ee95b618d8 files/digest-texinfo-4.8-r2 241
+MD5 29bb9e8c5badabb1357af7f2e69f0f79 files/digest-texinfo-4.8-r3 241
+RMD160 854f817351e10a866caacd170b988b60c0538113 files/digest-texinfo-4.8-r3 241
+SHA256 75045d609cf165296a77fcee2f24f408b40d03462a18b787bf8334ee95b618d8 files/digest-texinfo-4.8-r3 241
+MD5 29bb9e8c5badabb1357af7f2e69f0f79 files/digest-texinfo-4.8-r4 241
+RMD160 854f817351e10a866caacd170b988b60c0538113 files/digest-texinfo-4.8-r4 241
+SHA256 75045d609cf165296a77fcee2f24f408b40d03462a18b787bf8334ee95b618d8 files/digest-texinfo-4.8-r4 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEvtHqamhnQswr0vIRAje9AKCRLzeZJjB/YSftKlv/F6XUu0dcjQCfWuRT
+n7r0Mxew3yLIyrqGwcA5ygg=
+=Lmiu
+-----END PGP SIGNATURE-----
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
+}