Version bump #154316.

Package-Manager: portage-2.1.2_rc1-r5

5 files changed, 128 insertions, 5 deletions

diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index db1ab8e3557a..a42d662ffa02 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,13 @@
 # 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.75 2006/10/17 06:41:51 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.76 2006/11/09 23:44:17 vapier Exp $
+
+*texinfo-4.8-r5 (09 Nov 2006)
+
+  09 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/texinfo-4.8-buf-overflow-CVE-2006-4810.patch,
+  +texinfo-4.8-r5.ebuild:
+  Version bump #154316.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> texinfo-4.8-r4.ebuild:
   Added ~sparc-fbsd keyword.
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 15bacd623c97..700526c41b6c 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -10,6 +13,10 @@ AUX texinfo-4.8-bounds-check.patch 1163 RMD160 329f5f612248550ec1e3c6cc9400df2b9
 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-buf-overflow-CVE-2006-4810.patch 430 RMD160 cf71be1a567927db11274bfdc0da1b80f4148752 SHA1 e49c836d9b2dfcb80cc56efd924a407b0ab82d1d SHA256 54a18d053467fdaed8d1a75cffead74817a87a73a3100ed9d219a7bd1a6150bb
+MD5 7aa8d8e0017700f643eda67c768ad421 files/texinfo-4.8-buf-overflow-CVE-2006-4810.patch 430
+RMD160 cf71be1a567927db11274bfdc0da1b80f4148752 files/texinfo-4.8-buf-overflow-CVE-2006-4810.patch 430
+SHA256 54a18d053467fdaed8d1a75cffead74817a87a73a3100ed9d219a7bd1a6150bb files/texinfo-4.8-buf-overflow-CVE-2006-4810.patch 430
 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
@@ -35,10 +42,14 @@ EBUILD texinfo-4.8-r4.ebuild 2222 RMD160 c9d091bdb7615169816dd0c866c20107a728d02
 MD5 64f61fbcb9d89af8b47b4ba22960426c texinfo-4.8-r4.ebuild 2222
 RMD160 c9d091bdb7615169816dd0c866c20107a728d028 texinfo-4.8-r4.ebuild 2222
 SHA256 8e4b10ef9e602295fc6ff021be651b1e06532582611cbebcc3848e50116f366e texinfo-4.8-r4.ebuild 2222
-MISC ChangeLog 8663 RMD160 5b609a99d92240456f7f78dc5eb19fc988c9eadb SHA1 cc664f31e25d1041f0adf1739a6852c3ae725ad3 SHA256 5f24a69f4efcef8174c380625bf3bfe2a59a9403a35dc4a39054487c3fd5d952
-MD5 941606e3f54744c2f72d23948ecd956f ChangeLog 8663
-RMD160 5b609a99d92240456f7f78dc5eb19fc988c9eadb ChangeLog 8663
-SHA256 5f24a69f4efcef8174c380625bf3bfe2a59a9403a35dc4a39054487c3fd5d952 ChangeLog 8663
+EBUILD texinfo-4.8-r5.ebuild 2288 RMD160 517fb4a014983a0c757c54afa123778bd909e424 SHA1 98dfda1c8dfb246ae9e0d2410b3b2ee30ec76a69 SHA256 28efa6e86cac8553afcb3718898853f3f5dda3ce4657c59bfde1d232d6e5f414
+MD5 16d8952349533dc1f15680c863096922 texinfo-4.8-r5.ebuild 2288
+RMD160 517fb4a014983a0c757c54afa123778bd909e424 texinfo-4.8-r5.ebuild 2288
+SHA256 28efa6e86cac8553afcb3718898853f3f5dda3ce4657c59bfde1d232d6e5f414 texinfo-4.8-r5.ebuild 2288
+MISC ChangeLog 8848 RMD160 e19f7ed7b687d7d869baf14159d7788a1a9fffa8 SHA1 7106ec510f3cfc8620c3574c64e610c8263fa269 SHA256 d6b8a23c755bf465761ce3a1541a1148b338a2945d31853507a623cd662b9331
+MD5 230dda5ae0e17e3a24a5f4070506d61e ChangeLog 8848
+RMD160 e19f7ed7b687d7d869baf14159d7788a1a9fffa8 ChangeLog 8848
+SHA256 d6b8a23c755bf465761ce3a1541a1148b338a2945d31853507a623cd662b9331 ChangeLog 8848
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -52,3 +63,13 @@ SHA256 75045d609cf165296a77fcee2f24f408b40d03462a18b787bf8334ee95b618d8 files/di
 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
+MD5 29bb9e8c5badabb1357af7f2e69f0f79 files/digest-texinfo-4.8-r5 241
+RMD160 854f817351e10a866caacd170b988b60c0538113 files/digest-texinfo-4.8-r5 241
+SHA256 75045d609cf165296a77fcee2f24f408b40d03462a18b787bf8334ee95b618d8 files/digest-texinfo-4.8-r5 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFU72IamhnQswr0vIRArFMAJ40AHx1VWw8c00aebRjW5uyySq5WwCgjMbo
+nUEKVrzabLJRiDUp7hM1jxY=
+=IC/r
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/texinfo/files/digest-texinfo-4.8-r5 b/sys-apps/texinfo/files/digest-texinfo-4.8-r5
new file mode 100644
index 000000000000..8bfc6f00eb18
--- /dev/null
+++ b/sys-apps/texinfo/files/digest-texinfo-4.8-r5
@@ -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-buf-overflow-CVE-2006-4810.patch b/sys-apps/texinfo/files/texinfo-4.8-buf-overflow-CVE-2006-4810.patch
new file mode 100644
index 000000000000..a842b56335f8
--- /dev/null
+++ b/sys-apps/texinfo/files/texinfo-4.8-buf-overflow-CVE-2006-4810.patch
@@ -0,0 +1,15 @@
+fix for buffer overflow CVE-2006-4810
+
+http://bugs.gentoo.org/154316
+
+--- util/texindex.c
++++ util/texindex.c
+@@ -858,7 +857,7 @@
+         {
+           buffer = (char *) xrealloc (buffer, linebuffer->size *= 2);
+           p += buffer - linebuffer->buffer;
+-          end += buffer - linebuffer->buffer;
++          end = buffer + linebuffer->size;
+           linebuffer->buffer = buffer;
+         }
+       if (c < 0 || c == '\n')
diff --git a/sys-apps/texinfo/texinfo-4.8-r5.ebuild b/sys-apps/texinfo/texinfo-4.8-r5.ebuild
new file mode 100644
index 000000000000..09c4ad73c23f
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-4.8-r5.ebuild
@@ -0,0 +1,77 @@
+# 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-r5.ebuild,v 1.1 2006/11/09 23:44:17 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 ~sparc-fbsd ~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
+	epatch "${FILESDIR}"/${P}-buf-overflow-CVE-2006-4810.patch #154316
+
+	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
+}