Fix from upstream for segv when writing to non-existent dir.

Package-Manager: portage-2.1.2_rc3-r8

5 files changed, 126 insertions, 12 deletions

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index 430ef9790873..7a3a5a8e7c21 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,12 @@
 # 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.131 2006/11/26 12:29:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.132 2006/12/20 16:34:48 vapier Exp $
+
+*nano-2.0.1-r1 (20 Dec 2006)
+
+  20 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/nano-2.0.1-bad-path.patch, +nano-2.0.1-r1.ebuild:
+  Fix from upstream for segv when writing to non-existent dir.
 
 *nano-2.0.1 (26 Nov 2006)
 
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index a305fe4402d5..b8903eb7ea6d 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -45,6 +45,10 @@ AUX nano-1.3.12-scroll.patch 1357 RMD160 0ff451539b959ed1b48995cacec0ee5938f5139
 MD5 61c9c18d6e52103460bc4a43d4710d0d files/nano-1.3.12-scroll.patch 1357
 RMD160 0ff451539b959ed1b48995cacec0ee5938f51390 files/nano-1.3.12-scroll.patch 1357
 SHA256 5f44b124d829c3a1d98be782de90728e425e8cd8c7fac73fe36c8dfaa97d4773 files/nano-1.3.12-scroll.patch 1357
+AUX nano-2.0.1-bad-path.patch 643 RMD160 3282f1da1c10515675b9e895d65f26dac37069f7 SHA1 8c1bc45591fa3e6a65a86c51a20e8846e7815318 SHA256 b578f3723570f6b7078f13bb6e444190235246e362816765bff2cf28261543ee
+MD5 092f4864f7e42100cbcee67c5ebecfb2 files/nano-2.0.1-bad-path.patch 643
+RMD160 3282f1da1c10515675b9e895d65f26dac37069f7 files/nano-2.0.1-bad-path.patch 643
+SHA256 b578f3723570f6b7078f13bb6e444190235246e362816765bff2cf28261543ee files/nano-2.0.1-bad-path.patch 643
 AUX nanorc-gentoo 1898 RMD160 df026420d78b71d4bd04bf15eaabbc862b2d2c89 SHA1 da4a8151ac4bd87ef01cf46abe1fa9f9183a41b7 SHA256 e4f58765d1cb6a0548a6a7c6c55873fbccdfa27cef63339f82b1ea999f4faff0
 MD5 9e3cff28391bfad1799dfa30d80ed9ca files/nanorc-gentoo 1898
 RMD160 df026420d78b71d4bd04bf15eaabbc862b2d2c89 files/nanorc-gentoo 1898
@@ -70,14 +74,18 @@ EBUILD nano-2.0.0.ebuild 1951 RMD160 6b3c102fd99bf187e37cc3345eb430c06ea33035 SH
 MD5 d9ea97b15de442bc5345accd2272a903 nano-2.0.0.ebuild 1951
 RMD160 6b3c102fd99bf187e37cc3345eb430c06ea33035 nano-2.0.0.ebuild 1951
 SHA256 aa00428eefc58375944617221d8178a50231862b9eefe8e18acb6e3fd07f64bd nano-2.0.0.ebuild 1951
-EBUILD nano-2.0.1.ebuild 1951 RMD160 28245f6b85061760d2b3ea11eb617f74d028e6cb SHA1 90f333d8102a5db8d7627e18e2d803c2b0490722 SHA256 b6c2920ce1792424bf7c6768c0784285f80e6d404992b01835c8ce9af820b7f4
-MD5 9fd61bbbbffb0bf722b5da35d2cc543f nano-2.0.1.ebuild 1951
-RMD160 28245f6b85061760d2b3ea11eb617f74d028e6cb nano-2.0.1.ebuild 1951
-SHA256 b6c2920ce1792424bf7c6768c0784285f80e6d404992b01835c8ce9af820b7f4 nano-2.0.1.ebuild 1951
-MISC ChangeLog 15114 RMD160 ad3ef76c538db3370b2c740277e57dde2be12c59 SHA1 1bd25bd86b9d71557ae04d6014497b4c2a38ad74 SHA256 5490f3d8cd4d00fd85de032819c93a9b3154767362c08e4c2d159deb8b1f25cc
-MD5 2414f4fdac80afdf5f42cf1ad0f09ac3 ChangeLog 15114
-RMD160 ad3ef76c538db3370b2c740277e57dde2be12c59 ChangeLog 15114
-SHA256 5490f3d8cd4d00fd85de032819c93a9b3154767362c08e4c2d159deb8b1f25cc ChangeLog 15114
+EBUILD nano-2.0.1-r1.ebuild 1995 RMD160 19686caa63675827a5db013cd380e8052ef94d64 SHA1 6ad7da227784f49639d4dbfca512766d27d421e1 SHA256 541943307fa408f42dddad63cd006ff54b4e515416a8eee43f9df856cc952493
+MD5 42754a24dc708790b12d9a75e7ee6cee nano-2.0.1-r1.ebuild 1995
+RMD160 19686caa63675827a5db013cd380e8052ef94d64 nano-2.0.1-r1.ebuild 1995
+SHA256 541943307fa408f42dddad63cd006ff54b4e515416a8eee43f9df856cc952493 nano-2.0.1-r1.ebuild 1995
+EBUILD nano-2.0.1.ebuild 1946 RMD160 5864ad0bac9101664167ec5bd6ccff35b0325d0c SHA1 bfa3a09c2e74e33f15e1ba0a4a3dfa6ba1d74253 SHA256 649d7f8377a70dccdd51c9d768b0f041576890ab82ef526acd9e73cf0675245a
+MD5 0d66fbfda40e4449e839a8522c5b7dc8 nano-2.0.1.ebuild 1946
+RMD160 5864ad0bac9101664167ec5bd6ccff35b0325d0c nano-2.0.1.ebuild 1946
+SHA256 649d7f8377a70dccdd51c9d768b0f041576890ab82ef526acd9e73cf0675245a nano-2.0.1.ebuild 1946
+MISC ChangeLog 15317 RMD160 d9e8d9d9366555cd6c1137e587dc97e443d7bc79 SHA1 0c1dad23731102860d226af139f2044e5bc95aca SHA256 8b550796c1f6ccb812680cced3c975a5125a17097f3e9024dcb3d710f890d5ed
+MD5 286a5d740e5fa8c8492841e76b805d00 ChangeLog 15317
+RMD160 d9e8d9d9366555cd6c1137e587dc97e443d7bc79 ChangeLog 15317
+SHA256 8b550796c1f6ccb812680cced3c975a5125a17097f3e9024dcb3d710f890d5ed ChangeLog 15317
 MISC metadata.xml 986 RMD160 1ee17789653e837a9a8599d409ebe5a4dbc521c7 SHA1 d75a4da179e63c122a065f6d17f1871ee762040b SHA256 6275a0f662182b053119dda8ce016bf860aa75813c179a951b253fb9f5caef6b
 MD5 91890fbf824e8d11c4f7e7b77153c316 metadata.xml 986
 RMD160 1ee17789653e837a9a8599d409ebe5a4dbc521c7 metadata.xml 986
@@ -97,10 +105,13 @@ SHA256 01fc80911b88ac78e48561b171e72bf7b19fa9671e2b8a14cdeb541960073729 files/di
 MD5 6c276806ce2144b60cc6cc294131cdc8 files/digest-nano-2.0.1 235
 RMD160 b0ed1e76570186eb59b1e968ba2d6385663f1f76 files/digest-nano-2.0.1 235
 SHA256 0e8da9149ca6368913f202fc1bf78df81bb31144680612c27d99954a272eb173 files/digest-nano-2.0.1 235
+MD5 6c276806ce2144b60cc6cc294131cdc8 files/digest-nano-2.0.1-r1 235
+RMD160 b0ed1e76570186eb59b1e968ba2d6385663f1f76 files/digest-nano-2.0.1-r1 235
+SHA256 0e8da9149ca6368913f202fc1bf78df81bb31144680612c27d99954a272eb173 files/digest-nano-2.0.1-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFaYkdamhnQswr0vIRAqrkAJoDjttitHZoA0+LnkG+aRj3o54pQACgnBzY
-t46e6f9K6o7n3VHSdm+MA0Q=
-=bBje
+iD8DBQFFiWY/K9sYciBdMQMRAjj5AJ0Yt6hIN4orRC0u7BwUE3NeQs/VWgCfUSnz
+SoyLChW7X7M1HGp2aSEAo/M=
+=ZR5a
 -----END PGP SIGNATURE-----
diff --git a/app-editors/nano/files/digest-nano-2.0.1-r1 b/app-editors/nano/files/digest-nano-2.0.1-r1
new file mode 100644
index 000000000000..d2664d8e8d28
--- /dev/null
+++ b/app-editors/nano/files/digest-nano-2.0.1-r1
@@ -0,0 +1,3 @@
+MD5 8abe33be6816ad9acd17391806b42d92 nano-2.0.1.tar.gz 1299203
+RMD160 bce343f9f31c1cc63bd4b37a66fefcaa159a11cf nano-2.0.1.tar.gz 1299203
+SHA256 6af1a2081c6303008163719b9012b403b461fb07991b5603ac28a820494741e2 nano-2.0.1.tar.gz 1299203
diff --git a/app-editors/nano/files/nano-2.0.1-bad-path.patch b/app-editors/nano/files/nano-2.0.1-bad-path.patch
new file mode 100644
index 000000000000..e6547290cf68
--- /dev/null
+++ b/app-editors/nano/files/nano-2.0.1-bad-path.patch
@@ -0,0 +1,17 @@
+fix from upstream
+
+diff -ur nano-2.0.1/src/files.c nano-2.0.1-fixed/src/files.c
+--- nano-2.0.1/src/files.c	2006-11-09 21:47:11.000000000 -0500
++++ nano-2.0.1-fixed/src/files.c	2006-12-15 00:57:10.000000000 -0500
+@@ -1871,8 +1871,9 @@
+ 	    if (append == OVERWRITE) {
+ 		char *full_answer = get_full_path(answer);
+ 		char *full_filename = get_full_path(openfile->filename);
+-		bool different_name = (strcmp(full_answer,
+-			full_filename) != 0);
++		bool different_name = (strcmp((full_answer == NULL) ?
++			answer : full_answer, (full_filename == NULL) ?
++			openfile->filename : full_filename) != 0);
+ 		struct stat st;
+ 		bool name_exists;
+ 
diff --git a/app-editors/nano/nano-2.0.1-r1.ebuild b/app-editors/nano/nano-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..a7e604874805
--- /dev/null
+++ b/app-editors/nano/nano-2.0.1-r1.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/app-editors/nano/nano-2.0.1-r1.ebuild,v 1.1 2006/12/20 16:34:48 vapier Exp $
+
+#ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
+#ECVS_MODULE="nano"
+#ECVS_AUTH="pserver"
+#ECVS_USER="anonymous"
+#inherit cvs
+
+MY_P=${PN}-${PV/_}
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="http://www.nano-editor.org/"
+SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
+
+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="debug justify minimal ncurses nls slang spell unicode"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	nls? ( sys-devel/gettext )
+	!ncurses? ( slang? ( sys-libs/slang ) )"
+PROVIDE="virtual/editor"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-bad-path.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 \
+		--enable-color \
+		--enable-multibuffer \
+		--enable-nanorc \
+		--disable-wrapping-as-root \
+		$(use_enable spell) \
+		$(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
+
+	insinto /usr/share/nano
+	doins "${FILESDIR}"/*.nanorc || die
+	echo $'\n''# include "/usr/share/nano/gentoo.nanorc"' >> "${D}"/etc/nanorc
+
+	dodir /usr/bin
+	dosym /bin/nano /usr/bin/nano
+}
+
+pkg_postinst() {
+	einfo "More helpful info about nano, visit the GDP page:"
+	einfo "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
+}