Take over maintainership and fix buffer overflow, bug #450064

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

6 files changed, 80 insertions, 9 deletions

diff --git a/app-editors/bvi/ChangeLog b/app-editors/bvi/ChangeLog
index 6ba7346e7f6b..59b8c2c3c359 100644
--- a/app-editors/bvi/ChangeLog
+++ b/app-editors/bvi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/bvi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/ChangeLog,v 1.18 2010/04/05 03:59:08 abcd Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/ChangeLog,v 1.19 2013/01/04 09:55:26 ryao Exp $
+
+*bvi-1.3.2-r1 (04 Jan 2013)
+
+  04 Jan 2013; Richard Yao <ryao@gentoo.org> +bvi-1.3.2-r1.ebuild,
+  +files/bvi-1.3.2-fix-buffer-overflow.patch, bvi-1.3.2.ebuild, metadata.xml:
+  Take over maintainership and fix buffer overflow, bug #450064
 
   05 Apr 2010; Jonathan Callen <abcd@gentoo.org> bvi-1.3.2.ebuild:
   Bump to EAPI=3, add prefix keywords
diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
index fb8eee6cdc85..7048b69fd6e5 100644
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@@ -1,4 +1,6 @@
+AUX bvi-1.3.2-fix-buffer-overflow.patch 622 SHA256 5729f4d044bfa1036d16c236d2400150a1168431cfdc8cf12006c358928ac6f1 SHA512 87549381d8c9ef76c4153917faabe2b814dab9ecfb59e9b0cf75be5d02b917fd88266ad5e846982c8d40b80b3304f7efc912bd13f83f48e7a411f663cb10a28d WHIRLPOOL a26b879cc23428852eccf661dbf6d596b3f62817ba6e0f270f44d83cffff618ab0f4da72f250a34d00a3396855789164b95d5ddeb880d6e85e90968708b6442e
 DIST bvi-1.3.2.src.tar.gz 170444 SHA256 ff390af1c474bf870b6171332726b93bad8e716ea378827b55d8aae82dee1c84 SHA512 eb8a01602751b61c471207124c90346375ccf34ba85e661143f6da8f113f48070d132e98213484bd16d0b6b4c8d0fa27776d36f18cac21336076ca35bcfcb58c WHIRLPOOL 5dfa13a5fefe5f6df95e0d0c37961b7998c1eb37296b31771c27c5a71346891d8b2f9dff8ae9b737cfb7df585076ec1efbadac7b492bda706a1d36fbb3d3d6f8
-EBUILD bvi-1.3.2.ebuild 1002 SHA256 5cfb4e199cd225fd5c06f6feaf40b75d1891fa48210382581658ccd6a35f9e16 SHA512 232b1997181673e04ab3e63bbe1543e5af88c97198395bb4d5818342dc902df5aec547c2de91ab1f0901e938c11df1115287606884ffc89b2f093fb0cfe4c520 WHIRLPOOL 3a64433afbd217e274f1b85acd8baf4c0de3ca9aaf484ed7c21959ee2d6fab92f256ec96e6ebd73ca947ef282cfed15957d4a056ad79486fbe5e0c6adfbf1bda
-MISC ChangeLog 1827 SHA256 5635891439037c794d0724c8cdb6002f772e74fe2150e6d40340d9e068a597db SHA512 4af164b9494c905726aa99be214202dd62a5ee6772327914314dd9344d24efce05c533e85fb29ddcafdc945972912776d23c8f64d040189e1c2d2b793074dc8c WHIRLPOOL 31599881565f037d122020da23abc2f84d23225ba6a74dea475eed71e1afd37b97e7a1a2449bafdeab84de4ee08d0e9921bab7e8e2de7b96c5668fd181ff8451
-MISC metadata.xml 292 SHA256 ed31222caf411bbd2101fd43f6b711048213b7ecf27ce7f1643eff0f0ed5f2b3 SHA512 0ec4134c0758cff77acbf2579a2643ec60918c78442908c6d9fb905aca1ab933dba831c863409d34b535f7f8f20cbd4faaa5f9e9914995814d5192333eaf7497 WHIRLPOOL 5520ce6a1c103e5a91a62a5c3a38a9b2dbae12991be718f2104e7fae4f0122e9a6bee61edb5b9818c0234b908de9481316b0596b9084cd54c2d36774541dcf11
+EBUILD bvi-1.3.2-r1.ebuild 1118 SHA256 90ff22877b08d94c19fb87860c5228b88d99f781b810d31a56cc51c1e16427ee SHA512 212652b2adedede7a56a1744d5a839c2a8ad9b98722dba977bcbfa350f3e2d0f274ac848ffdb23ab2c5af520bec677010a2ae50f6d4e2198d3219be77edf64e0 WHIRLPOOL 8a7bc8620aba5ba8d2174a853aaf97897784eaa0e01e68fb90321d00b8821500c3be23a3419131c9682cc12d0055285bc1b80414cb929c7f02edd350013826f6
+EBUILD bvi-1.3.2.ebuild 1022 SHA256 0ec81db57b42b898c452a106f9726702f0042e10f7ae6aff4ecc2b68e4c5aa0b SHA512 6cc44a1b0545faef2809a6c6dd5a1084e1cfd2205a31abea8a000504393cff15a2925ba30622e5b2a8bc6928aed425eaf5f492d058563b0ca317d7270b191040 WHIRLPOOL d3511ef9cfe4ffedf3ddee4549beee975cda7d5b8a4b8760764e204c6bfa2c46580970cf9668eff14ceefef64b36f0ba83df1509dbad9e1873008bc8bb948ab4
+MISC ChangeLog 2066 SHA256 eb2b43e5c3478c271d235088ce7aad2bb54f03bd548e40ea556fdecf05da2510 SHA512 1a6cf3b5d80c90f0e571bae5aa10f87681c525534fc9abfbd053e2ec4f7f3e427bb88545f4514be2c874262a6b908bcfba2e3d89b32c1300329b64893c7cd907 WHIRLPOOL 28b4b8c2e3e1d7d93271d435f686f39e94d3c2cf22cdd84852f6ab68045e058c6ccdc03d69a1a895bc6e47f6c9961b4bff4ac27ffef05f7e558fca7470816f1b
+MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264
diff --git a/app-editors/bvi/bvi-1.3.2-r1.ebuild b/app-editors/bvi/bvi-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..aad2d3ee5cc6
--- /dev/null
+++ b/app-editors/bvi/bvi-1.3.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/bvi-1.3.2-r1.ebuild,v 1.1 2013/01/04 09:55:25 ryao Exp $
+
+EAPI=3
+
+inherit multilib eutils
+
+DESCRIPTION="display-oriented editor for binary files, based on the vi texteditor"
+HOMEPAGE="http://bvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bvi/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-buffer-overflow.patch"
+	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
+		Makefile.in || die "sed failed in Makefile.in"
+
+	epatch_user
+}
+
+src_configure() {
+	econf --with-ncurses="${EPREFIX}"/usr
+
+	sed -i -e 's:ncurses/term.h:term.h:g' bmore.h || die "sed failed in bmore.h"
+}
+
+src_install() {
+	einstall || die "make install failed"
+	rm -rf "${ED}"/usr/$(get_libdir)/bmore.help
+	dodoc README CHANGES CREDITS bmore.help
+	dohtml -r html/*
+}
diff --git a/app-editors/bvi/bvi-1.3.2.ebuild b/app-editors/bvi/bvi-1.3.2.ebuild
index 679d2372f9ad..02ef97cd9022 100644
--- a/app-editors/bvi/bvi-1.3.2.ebuild
+++ b/app-editors/bvi/bvi-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/bvi-1.3.2.ebuild,v 1.10 2010/04/05 03:59:08 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/bvi-1.3.2.ebuild,v 1.11 2013/01/04 09:55:25 ryao Exp $
 
 EAPI=3
 
@@ -16,6 +16,7 @@ IUSE=""
 KEYWORDS="amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
diff --git a/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch b/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch
new file mode 100644
index 000000000000..e3ebaa3d1295
--- /dev/null
+++ b/app-editors/bvi/files/bvi-1.3.2-fix-buffer-overflow.patch
@@ -0,0 +1,22 @@
+diff --git a/edit.c b/edit.c
+index 328a0cd..3cf6572 100644
+--- a/edit.c
++++ b/edit.c
+@@ -42,7 +42,7 @@ char contru[][4] = {"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
+ 					"CAN", " EM", "SUB", "ESC", " FS", " GS", " RS", " US",
+ 					"DEL" };
+ char tmpbuf[10];
+-char linbuf[256];
++char linbuf[16384];
+ 
+ static  char    getcbuff[BUFFER];
+ static  char    *getcnext = NULL;
+@@ -492,7 +492,7 @@ printline(mempos, scpos)
+ 			*(string + print_pos) = '.';
+ 	}
+ 	*(string + Anzahl) = '\0';
+-	strcat(linbuf, string);
++	strncat(linbuf, string, sizeof(linbuf) - strlen(linbuf) - 1);
+ 	mvaddstr(scpos, 0, linbuf);
+ }
+ 
diff --git a/app-editors/bvi/metadata.xml b/app-editors/bvi/metadata.xml
index f9d50da18d39..e63e3c3865da 100644
--- a/app-editors/bvi/metadata.xml
+++ b/app-editors/bvi/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>ryao@gentoo.org</email>
+		<name>Richard Yao</name>
 	</maintainer>
 </pkgmetadata>