Add fix from upstream for segv when cutting & pasting between files.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

4 files changed, 167 insertions, 6 deletions

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index 2ec467b4ee77..33023e8653b6 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/nano
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.206 2008/10/05 17:52:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.207 2008/10/05 20:13:50 vapier Exp $
+
+*nano-2.1.6-r1 (05 Oct 2008)
+
+  05 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/nano-2.1.6-cut-paste-segv.patch, +nano-2.1.6-r1.ebuild:
+  Add fix from upstream for segv when cutting & pasting between files.
 
 *nano-2.1.6 (05 Oct 2008)
 
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 3b93c0a93c94..1a7cf5d15184 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -10,6 +10,7 @@ AUX nano-1.3.12-scroll.patch 1357 RMD160 0ff451539b959ed1b48995cacec0ee5938f5139
 AUX nano-2.1.2-history-justify.patch 1321 RMD160 06d8640fbfe8c994155d38f8dae667d172386e4f SHA1 a21a95ce091336a046d8df0cdc770488895babd1 SHA256 8ae7bdc55044e1864b8ff93f450a9bb359a44a3b4dc15385db0744538e3523ca
 AUX nano-2.1.4-debug.patch 386 RMD160 2a399cc78445b740f1ba69357aa1cca0969462cc SHA1 0ca9e7f27699c39c54b9b7170c6357fc780f822e SHA256 21f0579ecb90f574390433227948137be1fd5e2ead70ce2b426e7c5e86f470c2
 AUX nano-2.1.4-open-mode.patch 685 RMD160 c4790cef44f95812fb607ddb50dea6a5c93cff4d SHA1 1a589253ebc1f24b4587eeae8f4ea3fc9371a42c SHA256 d31769c50c5724d96ea0be295975b7958e9440a646b8ad1f084f1a89f827bd4d
+AUX nano-2.1.6-cut-paste-segv.patch 2412 RMD160 01e5cab9ef42924d8a3b4401073f90047a40d701 SHA1 c887d0bc754417c9de50ea1c935164163dce9899 SHA256 4f9b4a4b62f283a1053af54e53554510c7fb8c86e2d9b0266435a71c89061ab6
 AUX nanorc-gentoo 1898 RMD160 df026420d78b71d4bd04bf15eaabbc862b2d2c89 SHA1 da4a8151ac4bd87ef01cf46abe1fa9f9183a41b7 SHA256 e4f58765d1cb6a0548a6a7c6c55873fbccdfa27cef63339f82b1ea999f4faff0
 AUX xml.nanorc 260 RMD160 eeb168220d7a96ba20c8a537b24e850211bf8cee SHA1 c74a37a415aaa119453060114a06c1dd7291b663 SHA256 d8de59f2993d921801e38127043a05b07277373b32714e7489d0947b3415a406
 DIST nano-1.3.12.tar.gz 1250777 RMD160 f594c4805af873718828b0aedba06c1f89946458 SHA1 70ff08220ebd00399569d64d308a2edc54505264 SHA256 f5537b8a988618fa8524b6a4b0a6950184d37db983b4521ad843b98845da571c
@@ -27,13 +28,13 @@ EBUILD nano-2.0.9.ebuild 1977 RMD160 525188fe59e3d57696960229976e031796505346 SH
 EBUILD nano-2.1.2-r1.ebuild 2142 RMD160 0a4f75045bc4207098f380204bb1b9bc98817c0a SHA1 59df7cf2f310d5fe66a545c2c1dbdb7ef1999f3d SHA256 07a2ffc647bec7c17a668e663d4d6694c98cf52350e77c31a30dc497bb140a14
 EBUILD nano-2.1.4.ebuild 2200 RMD160 9010fe9cba166170d4e40ef8e85c15ff97f6e45a SHA1 e2842e1ee07ac759b5d24a8347a83cf4264ebc2a SHA256 fdf3df334b9f11fa4f04ff17253919087f2c2b51e14ba125d2997cd441cb9898
 EBUILD nano-2.1.5.ebuild 2102 RMD160 61e1a2ff8d532bd0d32781ddebf3676f637ae307 SHA1 ad38acd95f2c37a6262f75810527491bf7983aa7 SHA256 fcff5598fdb5dcbdece7d243f0c091916ac7f20c9ad02b699964bb64f7228862
-EBUILD nano-2.1.6.ebuild 2102 RMD160 844a33930b470e7fe7512a8d071e3374b124b5a5 SHA1 c31acf9c52717fe5d8de95c3b8f2a5fd4e6c7c2b SHA256 4338e6f90de796cb9f8b1a150921a736569b65cdf054356e2fbd4658ae9f8cea
-MISC ChangeLog 24055 RMD160 ce4a1852f40574ecf541a3e34c39418fe32e7107 SHA1 cd2768943af24ab2e3b17c5b7ca456ae82911d3e SHA256 202383a50370437a12b646b4124e6056e8812d6ab3e1e7fd6aa4dc6bab93ee36
+EBUILD nano-2.1.6-r1.ebuild 2153 RMD160 04b96ff6e520a2f6ef18870622a1c41aa801d000 SHA1 4cd20a8f6c908db274d651762c12d4b89a2e8f21 SHA256 25ba3d94769eda0fd90a7d9f5b2bddab7d8b59b8da486e07a3b6b3a4acff943f
+MISC ChangeLog 24272 RMD160 db520f7d61aadeb991a2c7a071add9b46199c8b4 SHA1 59225ec7553bb336ee184e34187eb780167428c4 SHA256 9d709f31d3780bab2395f0f3b5f3b4f31152b52a093dbcbc534481646ac5e087
 MISC metadata.xml 1055 RMD160 5ef8d82cdf250abb5cffa58383c7b4d50f81d155 SHA1 4026434ab09a45edff0543c2c20e0fd20e6c03ed SHA256 8cbe9b49592bc79d362fd390c5d5b1782c0765c6f88a91aa199858ad73dec408
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjo/s8ACgkQ67wieSYcaxcCfwCffCdG7Cnv3C2RJE+q/U2qa3nT
-2Z0An0TGdKdhFjcv77+sKBtrvd5Lib07
-=FuTE
+iEYEARECAAYFAkjpIAQACgkQ67wieSYcaxfJewCgvuHWMreM1v74J7jmObd+ReuZ
+H0MAn2t8X+emZ8UH4kCroCC7P5NF+Hvc
+=Qrf2
 -----END PGP SIGNATURE-----
diff --git a/app-editors/nano/files/nano-2.1.6-cut-paste-segv.patch b/app-editors/nano/files/nano-2.1.6-cut-paste-segv.patch
new file mode 100644
index 000000000000..aab3643bb9a2
--- /dev/null
+++ b/app-editors/nano/files/nano-2.1.6-cut-paste-segv.patch
@@ -0,0 +1,70 @@
+https://savannah.gnu.org/bugs/?24447
+
+commit af3b86f16fc3e3f07a1d067528ecd84dd72a58d2
+Author: astyanax <astyanax@35c25a1d-7b9e-4130-9fde-d3aeb78583b8>
+Date:   Sat Oct 4 11:10:11 2008 +0000
+
+    2008-10-04 Chris Allegretta <chrisa@asty.org>
+            * cut.c (Add_undo): Save last cut undo information so it can be used for next uncut, fixes
+              Savannah bug 24183.
+    
+    
+    
+    git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4338 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
+
+diff --git a/ChangeLog b/ChangeLog
+index 98e9253..5f0f132 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2008-10-04 Chris Allegretta <chrisa@asty.org>
++	* cut.c (Add_undo): Save last cut undo information so it can be used for next uncut, fixes
++	  Savannah bug 24183.
++
+ GNU nano 2.1.6 - 2008.10.03
+ 2008-10-03 Pascal Gentil <pascal.gentil@univ-rennes1.fr>
+ 	* fortran.nanorc: Sample python syntax highlighting file
+diff --git a/src/text.c b/src/text.c
+index 407b7ec..97e1f19 100644
+--- a/src/text.c
++++ b/src/text.c
+@@ -822,6 +822,7 @@ void add_undo(undo_type current_action)
+     undo *u, *cutu;
+     char *data;
+     openfilestruct *fs = openfile;
++    static undo *last_cutu = NULL; /* Last thing we cut to set up the undo for uncut */
+ 
+     /* Ugh, if we were called while cutting not-to-end, non-marked and on the same lineno,
+        we need to  abort here */
+@@ -896,22 +897,22 @@ void add_undo(undo_type current_action)
+ 	    u->mark_begin_x = openfile->mark_begin_x;
+ 	}
+ 	u->to_end = (current_action == CUTTOEND);
++	last_cutu = u;
+ 	break;
+     case UNCUT:
+-	for (cutu = u; cutu != NULL && cutu->type != CUT; cutu = cutu->next)
+-	    ;
+-	if (cutu->type == CUT) {
+-	    u->cutbuffer = cutu->cutbuffer;
+-	    u->cutbottom = cutu->cutbottom;
+-	    if (!cutu->mark_set)
+-		u->linescut = cutu->linescut;
++	if (!last_cutu)
++	    statusbar(_("Internal error: can't setup uncut.  Please save your work."));
++	else if (last_cutu->type == CUT) {
++	    u->cutbuffer = last_cutu->cutbuffer;
++	    u->cutbottom = last_cutu->cutbottom;
++	    if (!last_cutu->mark_set)
++		u->linescut = last_cutu->linescut;
+ 	    else {
+ 		filestruct *c;
+ 		for (c = u->cutbuffer; c != NULL; c = c->next)
+ 		    u->linescut++;
+ 	    }
+-	} else
+-	    statusbar(_("Internal error: can't setup uncut.  Please save your work."));
++	}
+ 	break;
+     case OTHER:
+ 	statusbar(_("Internal error: unknown type.  Please save your work."));
diff --git a/app-editors/nano/nano-2.1.6-r1.ebuild b/app-editors/nano/nano-2.1.6-r1.ebuild
new file mode 100644
index 000000000000..193f42b43752
--- /dev/null
+++ b/app-editors/nano/nano-2.1.6-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.1.6-r1.ebuild,v 1.1 2008/10/05 20:13:50 vapier Exp $
+
+inherit eutils
+if [[ ${PV} == "9999" ]] ; then
+	ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
+	ECVS_MODULE="nano"
+	ECVS_AUTH="pserver"
+	ECVS_USER="anonymous"
+	inherit cvs
+else
+	MY_P=${PN}-${PV/_}
+	SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="http://www.nano-editor.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug justify minimal ncurses nls slang spell unicode"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	nls? ( sys-devel/gettext )
+	!ncurses? ( slang? ( sys-libs/slang ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cut-paste-segv.patch
+	if [[ ! -e configure ]] ; then
+		./autogen.sh || die "autogen failed"
+	fi
+}
+
+src_compile() {
+	local myconf=""
+	use ncurses \
+		&& myconf="--without-slang" \
+		|| myconf="${myconf} $(use_with slang)"
+
+	econf \
+		--bindir=/bin \
+		$(use_enable !minimal color) \
+		$(use_enable !minimal multibuffer) \
+		$(use_enable !minimal nanorc) \
+		--disable-wrapping-as-root \
+		$(use_enable spell speller) \
+		$(use_enable justify) \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable unicode utf8) \
+		$(use_enable minimal tiny) \
+		${myconf} \
+		|| die "configure failed"
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
+	dohtml *.html
+	insinto /etc
+	newins doc/nanorc.sample nanorc
+
+	dodir /usr/bin
+	dosym /bin/nano /usr/bin/nano
+
+	insinto /usr/share/nano
+	local f
+	for f in "${FILESDIR}"/*.nanorc ; do
+		[[ -e ${D}/usr/share/nano/${f##*/} ]] && continue
+		doins "${f}" || die
+		echo "# include \"/usr/share/nano/${f##*/}\"" >> "${D}"/etc/nanorc
+	done
+}
+
+pkg_postinst() {
+	elog "More helpful info about nano, visit the GDP page:"
+	elog "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
+}