Grab fix from upstream for segfaults with some files #111564.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 105 insertions, 8 deletions

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index 1095a27d09ee..9279b67333b1 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/nano
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.91 2006/01/17 00:39:09 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.92 2006/02/03 23:22:00 vapier Exp $
+
+*nano-1.3.10-r1 (03 Feb 2006)
+
+  03 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/nano-1.3.10-crash.patch, -nano-1.3.10.ebuild,
+  +nano-1.3.10-r1.ebuild:
+  Grab fix from upstream for segfaults with some files #111564.
 
   17 Jan 2006; Stuart Longland <redhatter@gentoo.org> nano-1.3.9.ebuild:
   Marked nano-1.3.9 stable on mips as per bug #118946
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index c5bcf2beaa07..b39c2720a226 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,21 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b8e8ebabee94510ea3d9378fe2c40f80 ChangeLog 10011
+MD5 95dd07842f230075c7042996910ec1a2 ChangeLog 10235
+RMD160 d63ac602edd1d41d6d88070013546caa8bb0ec64 ChangeLog 10235
+SHA256 becee2c7b2cc9e5536f88636421c29e1f76ad8a12564f126ecb1de31da47e0dc ChangeLog 10235
 MD5 b075a7a5fe393380c5f00e4efd3146fb files/digest-nano-1.2.5 62
-MD5 12a38b1eed4e09bc09aa3e26f3d4886e files/digest-nano-1.3.10 64
+RMD160 19ef998d60a5549c0cb6ed61c6cddc78545a6b67 files/digest-nano-1.2.5 62
+SHA256 86da58ff57bfb2f6011ed5b11943ad1f531c89b58feab0e53eda5e5f0be30058 files/digest-nano-1.2.5 62
+MD5 12a38b1eed4e09bc09aa3e26f3d4886e files/digest-nano-1.3.10-r1 64
+RMD160 76a147a1c8efa520fdc16b113e65dfe3749ddeb6 files/digest-nano-1.3.10-r1 64
+SHA256 74e25fd25e6e6d7f4fe435ed0e863995bfdbae069da0e9f70322bed376214c22 files/digest-nano-1.3.10-r1 64
 MD5 babc61f182cc2692e1c4f5689ea30f3e files/digest-nano-1.3.9 63
+RMD160 544c3365b694d6b903510ebed740416bfcb12080 files/digest-nano-1.3.9 63
+SHA256 8749e12a5245685e719d7b69e89238db3244d4e663d0170cabc43a776851575e files/digest-nano-1.3.9 63
+MD5 7151e8b7b8c9267b63a4f9b84148992a files/nano-1.3.10-crash.patch 2409
+RMD160 5aa12ba776b5f1be0a906c97bcba5afccd734d36 files/nano-1.3.10-crash.patch 2409
+SHA256 ea4ac8594bbbe0a2e4305ceca9390dfe72fcb86cb9ac94e2a05c11b1895c3a99 files/nano-1.3.10-crash.patch 2409
 MD5 4fd1c712601540686888c2f8e4927ab3 files/nano-1.3.10-disp.patch 659
+RMD160 4d9678202f0b7ccb565c814aeece13bc6953df48 files/nano-1.3.10-disp.patch 659
+SHA256 e6ab908907cf9ecfeefda2df7b5d6fdb5f7eb577927574b5cbbdc4a00da616de files/nano-1.3.10-disp.patch 659
 MD5 e96987d3e608193dd5a2c0c0122571b5 files/nanorc-gentoo 1864
+RMD160 8f7ba87cb16e55e72f6942cae29db0ed5ebe7abd files/nanorc-gentoo 1864
+SHA256 7363b99a85d14f3500c8606afa157ea64fe11c6f5143f3ec64aac58f511b5c2a files/nanorc-gentoo 1864
 MD5 9ecacdb9e41a6ddb3200113238ca4b2b files/nanorc-sh 646
+RMD160 68d7c9abab70dc3860c95c92245e995038aef7a4 files/nanorc-sh 646
+SHA256 60247daed92449277ab3eb9b9e8ee37147372574dba85892fc02a6c82f0aa5e0 files/nanorc-sh 646
 MD5 b297797b490f7c6ca8d5f40f2d6347cc metadata.xml 1015
+RMD160 37b6ed999eb17334da133052b31559ed1114b7c5 metadata.xml 1015
+SHA256 a457d24a0dbcdc2b2d132079e4e254fe2f23c2e5990c94ae9f13c848b3b05675 metadata.xml 1015
 MD5 32ad8dd2260ac44dbbeb2d50e2ed0df6 nano-1.2.5.ebuild 1429
-MD5 9221a1c204707554b4c05ad03d5042e6 nano-1.3.10.ebuild 1954
+RMD160 00c5cf2753197d2a2f57f88449b9f8ba7c0f624e nano-1.2.5.ebuild 1429
+SHA256 a983beb093ab143257d35753ef9316438abbca4baa3813c47f78bd8f0ef3e3e5 nano-1.2.5.ebuild 1429
+MD5 e1a716a2e3df318237cbf96f239cc269 nano-1.3.10-r1.ebuild 1996
+RMD160 b4afe253b108e9db2ae855a4eb976d56041a481d nano-1.3.10-r1.ebuild 1996
+SHA256 14585e98b60ae09b9b53f9921a2da105ca9e7b0d4077a98161e2ddec995ee5fb nano-1.3.10-r1.ebuild 1996
 MD5 02ab1949e07d6f81c569e5fe3f607173 nano-1.3.9.ebuild 1863
+RMD160 1a3bbcfa38d6ac3dfa80c2d90307809d0888fd67 nano-1.3.9.ebuild 1863
+SHA256 3a34a4f13252030df2062e6f7595ab91befa0bae01e4466eb408b9d5e9fb469e nano-1.3.9.ebuild 1863
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD0Ba92+ySkm8kpY0RAgXfAKCqYeykDqxJjU8aysKPQzG86ODuDACgreMr
-OSv8T8/Qw6pXvun2I4DWbxg=
-=jDoA
+iD8DBQFD4+XL2+ySkm8kpY0RAnu8AJ90YOXuP46POqUGeIyLmLCc1UPGpgCguKue
+prB4+kwZlQSKhCguYVVrrNc=
+=WH1b
 -----END PGP SIGNATURE-----
diff --git a/app-editors/nano/files/digest-nano-1.3.10 b/app-editors/nano/files/digest-nano-1.3.10-r1
index f0410784444b..f0410784444b 100644
--- a/app-editors/nano/files/digest-nano-1.3.10
+++ b/app-editors/nano/files/digest-nano-1.3.10-r1
diff --git a/app-editors/nano/files/nano-1.3.10-crash.patch b/app-editors/nano/files/nano-1.3.10-crash.patch
new file mode 100644
index 000000000000..f0fdd856b6c7
--- /dev/null
+++ b/app-editors/nano/files/nano-1.3.10-crash.patch
@@ -0,0 +1,64 @@
+http://bugs.gentoo.org/111564
+http://lists.gnu.org/archive/html/nano-devel/2006-02/msg00006.html
+
+diff -ur nano-1.3.7/src/winio.c nano-1.3.7-fixed/src/winio.c
+--- nano-1.3.7/src/winio.c	2005-04-10 23:51:22.000000000 -0400
++++ nano-1.3.7-fixed/src/winio.c	2006-02-02 23:47:01.000000000 -0500
+@@ -2253,10 +2253,22 @@
+ 
+     assert(column <= start_col);
+ 
+-    /* Allocate enough space for the entire line. */
+-    alloc_len = (mb_cur_max() * (COLS + 1));
++    /* Make sure there's enough room for the initial character, whether
++     * it's a multibyte control character, a non-control multibyte
++     * character, a tab character, or a null terminator.  Rationale:
++     *
++     * multibyte control character followed by a null terminator:
++     *     1 byte ('^') + mb_cur_max() bytes + 1 byte ('\0')
++     * multibyte non-control character followed by a null terminator:
++     *     mb_cur_max() bytes + 1 byte ('\0')
++     * tab character followed by a null terminator:
++     *     mb_cur_max() bytes + (tabsize - 1) bytes + 1 byte ('\0')
++     *
++     * Since tabsize has a minimum value of 1, it can substitute for 1
++     * byte above. */
++    alloc_len = (mb_cur_max() + tabsize + 1) * 128;
++    converted = charalloc(alloc_len);
+ 
+-    converted = charalloc(alloc_len + 1);
+     index = 0;
+ 
+     if (buf[start_index] != '\t' && (column < start_col || (dollars &&
+@@ -2295,9 +2306,17 @@
+ #endif
+     }
+ 
+-    while (index < alloc_len - 1 && buf[start_index] != '\0') {
++    while (buf[start_index] != '\0') {
+ 	buf_mb_len = parse_mbchar(buf + start_index, buf_mb, NULL);
+ 
++	/* Make sure there's enough room for the next character, whether
++	 * it's a multibyte control character, a non-control multibyte
++	 * character, a tab character, or a null terminator. */
++	if (index + mb_cur_max() + tabsize + 1 >= alloc_len - 1) {
++	    alloc_len += (mb_cur_max() + tabsize + 1) * 128;
++	    converted = charealloc(converted, alloc_len);
++	}
++
+ 	/* If buf contains a tab character, interpret it. */
+ 	if (*buf_mb == '\t') {
+ #if !defined(NANO_SMALL) && defined(ENABLE_NANORC)
+@@ -2379,8 +2398,10 @@
+ 	start_index += buf_mb_len;
+     }
+ 
+-    if (index < alloc_len - 1)
+-	converted[index] = '\0';
++    assert(alloc_len >= index + 1);
++
++    /* Null terminate converted. */
++    converted[index] = '\0';
+ 
+     /* Make sure converted takes up no more than len columns. */
+     index = actual_x(converted, len);
diff --git a/app-editors/nano/nano-1.3.10.ebuild b/app-editors/nano/nano-1.3.10-r1.ebuild
index 2c0b5361bceb..9d7ee47ccd12 100644
--- a/app-editors/nano/nano-1.3.10.ebuild
+++ b/app-editors/nano/nano-1.3.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.10.ebuild,v 1.2 2006/01/11 04:28:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.10-r1.ebuild,v 1.1 2006/02/03 23:22:00 vapier Exp $
 
 #ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
 #ECVS_MODULE="nano"
@@ -28,6 +28,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-disp.patch
+	epatch "${FILESDIR}"/${P}-crash.patch
 }
 
 src_compile() {