Fix for buffer overflow in ui.c

Package-Manager: portage-2.2.0_alpha17/cvs/Linux x86_64

4 files changed, 78 insertions, 5 deletions

diff --git a/app-text/multitail/ChangeLog b/app-text/multitail/ChangeLog
index 8aacb6257e43..8b80fc21de8d 100644
--- a/app-text/multitail/ChangeLog
+++ b/app-text/multitail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/multitail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.76 2011/01/11 22:28:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/ChangeLog,v 1.77 2011/01/18 15:07:22 jlec Exp $
+
+*multitail-5.2.6-r1 (18 Jan 2011)
+
+  18 Jan 2011; Justin Lecher <jlec@gentoo.org>
+  +files/5.2.6-buffer-overflow.patch, +multitail-5.2.6-r1.ebuild:
+  Fix for buffer overflow in ui.c
 
   11 Jan 2011; Markus Meier <maekke@gentoo.org> multitail-5.2.6.ebuild:
   x86 stable, bug #350735
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 227e738b0f6e..aa78357ac877 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 AUX 5.2.2-as-needed.patch 1193 RMD160 1b26d19c7ee3f1a8c25feb7a9bbdf6b4e81b4e5f SHA1 c06b68a4a57f584d2a6fe09aae8801cfaa3431ba SHA256 79e19c630837acf6d6b1e1c8fc0528584d4f52b88cda5ddd93835ecc960e82b2
+AUX 5.2.6-buffer-overflow.patch 361 RMD160 469c04d2db2c90e90578f19f1077a37ca8ba4bdb SHA1 bd56cb19b2d011264bde7e7ba66c88f541b976ea SHA256 6c4cec018a91fbb83176a6e38ee3f88849e168c0e2fc045e19ca51eba147b145
 DIST multitail-5.2.2.tgz 164676 RMD160 876e828e9dda2d8017e28831cb243dbd533d0a3f SHA1 9ecc9d27f2b79fc7dfa071bde2612711867cb8b9 SHA256 f2a57b289e64b388f6353c78a4ca101ce499d9fa494564a835dc350bb9206bee
 DIST multitail-5.2.6.tgz 164839 RMD160 f95bf81e3ddc25a7d441f0ef284cbc49e05f23ea SHA1 29a93f4db584daf06fe1eb389b5770f4aa6b4e33 SHA256 cdbefcf64fecd82f74091608855c819dda63f5e0639af60d42844e3393fdc31f
 EBUILD multitail-5.2.2-r1.ebuild 1037 RMD160 65c3a0e449ff659ff62806fd9fab970e4b85ea9c SHA1 37c72138aaf77716a65bc0e3027b4b953d9d00dc SHA256 4c0bc0852fd1cec7128f04178e0c7987b472bd5eabeff86e1752a75a1ffb7014
 EBUILD multitail-5.2.2.ebuild 894 RMD160 d1207a61973f110d63e4342d9f04079e383d2e0f SHA1 829244745f3c086b5d72f5dc6f411c45a355a6fb SHA256 e338e5bca2971da093e96a731674af2cd4f6658eb61054a5a2af4cb33e7248b0
+EBUILD multitail-5.2.6-r1.ebuild 1249 RMD160 77b55a76dcaa617f7b2dabc4b9a3cf7da265093a SHA1 ed7e6c7ba8910ecc76186e3cbcd7346c172904ec SHA256 55de11ae2e0553cbabdc6035e7e8e5740586f64b737357def557d7bfc22e8f02
 EBUILD multitail-5.2.6.ebuild 1194 RMD160 837f1ab3504e25a5efacc16f77acbfa323776b1f SHA1 d3a7f83f83c91688328caa438dc8f19d9410f7d9 SHA256 e33f07128f20a22fa6b441c77a611bab68f1bb4048743c20974fd9c9457b72f9
-MISC ChangeLog 9203 RMD160 68c72aed729b718a2ab636b5dd6b12071d2ccc4a SHA1 a9a3ac9b5cda79efd110619f127c0cb12a74427b SHA256 12abd055d6a0c2e9b2e68aa007d30a6a3bedaedbf881d146a1c7aa6e7d9a1229
+MISC ChangeLog 9384 RMD160 2839cb8401a0f0ffe6d7490bd0c982de72f794e4 SHA1 0277218c8c3962ac4067c5cc9b8703307f549112 SHA256 5ed23766253dfc9c84a6630c4a50699103c9ae20e04c4a0fa6dfe41eb7209817
 MISC metadata.xml 310 RMD160 d2cbd20071237679215482df8f5d75e631543301 SHA1 11b73fa4f7df3ef2016048e5f30824f58e444587 SHA256 b4ead20e58116c223ab0fc0a668ec07a78bde29f259fdc629f7a01913fafa1fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0s2V4ACgkQkKaRLQcq0GJLdgCcDLYfIQr2hIHS+/zahWj9XH3n
-DJwAn22dgyEigl9+Jo0WgjxlMYnu1lFM
-=HHiD
+iEYEARECAAYFAk01rK8ACgkQgAnW8HDreRZ24ACff8z4Rw6o8tQGB9yXu0bl/T6o
+yrYAn35f1s+exowRR6J6xAs5B2BlEmRs
+=2iLq
 -----END PGP SIGNATURE-----
diff --git a/app-text/multitail/files/5.2.6-buffer-overflow.patch b/app-text/multitail/files/5.2.6-buffer-overflow.patch
new file mode 100644
index 000000000000..9a2ddcefe5a3
--- /dev/null
+++ b/app-text/multitail/files/5.2.6-buffer-overflow.patch
@@ -0,0 +1,13 @@
+diff --git a/ui.c b/ui.c
+index f74f3d3..37889fd 100644
+--- a/ui.c
++++ b/ui.c
+@@ -2465,7 +2465,7 @@ void regexp_error_popup(int rc, regex_t *pre)
+ 			popup_buffer[sizeof(popup_buffer) - 1] = 0x00;
+ 		}
+ 		else
+-			strncat(popup_buffer, error, sizeof(popup_buffer));
++			strncat(popup_buffer, error, sizeof(popup_buffer) - sizeof(error));
+ 
+ 		myfree(error);
+ 	}
diff --git a/app-text/multitail/multitail-5.2.6-r1.ebuild b/app-text/multitail/multitail-5.2.6-r1.ebuild
new file mode 100644
index 000000000000..2431909b8390
--- /dev/null
+++ b/app-text/multitail/multitail-5.2.6-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.6-r1.ebuild,v 1.1 2011/01/18 15:07:22 jlec Exp $
+
+EAPI="3"
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/index.html"
+SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="debug doc examples"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/5.2.2-as-needed.patch \
+		"${FILESDIR}"/${PV}-buffer-overflow.patch
+
+	use x86-interix && epatch "${FILESDIR}"/${P}-interix.patch
+}
+
+src_configure() {
+	tc-export CC
+	use debug && append-flags "-D_DEBUG"
+	use prefix && sed "s:DESTDIR=/:DESTDIR=${EROOT}:g" -i Makefile
+}
+
+src_install () {
+	dobin multitail || die
+
+	insinto /etc
+	doins multitail.conf || die
+
+	dodoc Changes readme.txt thanks.txt || die
+	doman multitail.1 || die
+
+	if use examples; then
+		docinto examples
+		dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl || die
+	fi
+
+	if use doc; then
+		dohtml manual.html || die
+	fi
+}