Fix bug 314165, crash in find file results panelization, remove old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 27 insertions, 71 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index cf3333acf5d1..85b84efd2717 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.197 2010/04/09 03:51:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.198 2010/04/09 16:25:02 reavertm Exp $
+
+*mc-4.7.1-r2 (09 Apr 2010)
+
+  09 Apr 2010; Maciej Mrozowski <reavertm@gentoo.org> -mc-4.7.1.ebuild,
+  -mc-4.7.1-r1.ebuild, +mc-4.7.1-r2.ebuild,
+  +files/mc-4.7.1_find-results-panelization-crash.patch:
+  Fix bug 314165, crash in find file results panelization, remove old
 
   09 Apr 2010; Jeroen Roovers <jer@gentoo.org> mc-4.7.0.3.ebuild:
   Stable for HPPA (bug #308383).
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index b34887e46ce4..c37cf0dc0fa3 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,5 +1,6 @@
 AUX mc-4.7.0.2_hotlist_fix.patch 913 RMD160 344e35fbd503e6fd1f245fe896f4b3c499bdc740 SHA1 857ede6795f9a9c78704c5e6334b3425dc87ea4d SHA256 15775735f244593a3cc9ff49869a91f242226f59bb16649ae484010e5a557dbf
 AUX mc-4.7.0.2_syntax_fix.patch 187 RMD160 393228cf02a9e4d1a600e0cffc51eb05e5e00512 SHA1 760cbb70eae34511e5132289639ebb1449c35a76 SHA256 5b7567e9b293b0598c444640f5272f8c78085f7e6920b5c6182d6c4a9852b933
+AUX mc-4.7.1_find-results-panelization-crash.patch 422 RMD160 6968c4dd2f34b0d9392ee536e86a0621ea4f9652 SHA1 72870dbcb045bc191d26f6690c90d4ab2c506e76 SHA256 6b71b380347c33ecd83de5a4cc0f3c812a836bac37534f09c3480de7d59495e7
 AUX mc-4.7_mcedit_fix.patch 475 RMD160 eb2234acd6f99abb06c5ae4e20661b43675f2c73 SHA1 f960a559fa7fe3fcb0909ef1b8687c3d786a0b4c SHA256 c08899151ea58423db30eb4d7e5cfb91cc1abec9f1e5b654ed3654f47ea604e6
 DIST mc-4.7.0.1.tar.bz2 2831780 RMD160 15d77153377ea8b11910179e7267d70c2ccc303d SHA1 a5953341eee78c29d84f2c426c082a58516904e5 SHA256 4abb66b20c46c583159b29109282cf0d8cf2c7cc078e6062d914c95e776057c4
 DIST mc-4.7.0.2.tar.bz2 2809115 RMD160 4dc0b546ace58bf7251794c6cfd3fb4d775ad0f1 SHA1 4a193204405e6ec41e705e3eacc3cb54be8401af SHA256 6f23757e1911f6e0e84ce41e53a09b2315576c57c564fccd0b783c4dd5756eb3
@@ -12,7 +13,6 @@ EBUILD mc-4.7.0.2.ebuild 1577 RMD160 adff7061c52b1ead6cff72914c8277f2e6fcf47f SH
 EBUILD mc-4.7.0.3.ebuild 1706 RMD160 47509be466b4c9cb659cbaee63ac3f4919802b30 SHA1 7e81b7de80a5b28b9f458a25f9c7f4e932a2a155 SHA256 5108770f4b2d507a912a0ec5669dd6d23512afd0b70eadfcc10f7359513f9dbf
 EBUILD mc-4.7.0.4-r1.ebuild 1776 RMD160 75228be5305ea407cb53af5fbb10d6acba227b82 SHA1 3599e87c775d3cfb4c22f551b87368eb0cc17c9d SHA256 0ac74355264a933499b42b83e5eb8309362cf3ec0e000700404b44c95097a273
 EBUILD mc-4.7.0.4.ebuild 1719 RMD160 b372c0c7367b468467b3588db34ec37808ea893b SHA1 22d7cdbd3737cad1bb9f5c67fb24a4194034ac61 SHA256 c80fc29f665c90dbe26ad8fe4d81dfbaede5d4b025de391f5ad787de98a5879e
-EBUILD mc-4.7.1-r1.ebuild 1774 RMD160 9411451fd606ed0e5bf6a07b72792ceb18618a77 SHA1 15dad191ee22b10590f3e9ea67e15f4d85cef583 SHA256 a91dd49ea237355a504fee7f967f8c2ae640b6eb26cf2ae75ec858e613f3ae76
-EBUILD mc-4.7.1.ebuild 1717 RMD160 373bd1d48437a5dcb2849983e881f4b50a097ea5 SHA1 c7ef72c273deca334004feaee734eef20b082634 SHA256 7b908c3092c7471f3c70c624dca8b4e8320c5d2715a451b65b11447f7a7f5c62
-MISC ChangeLog 27377 RMD160 5482cc5d6301e2a86d18a38e86098a533a63f657 SHA1 7f9482c66b1e5b406ae170f81c50a6745f3065a0 SHA256 1434549770bb18e517d423358d9062243c8f2c7729be245a066f982bf82970df
+EBUILD mc-4.7.1-r2.ebuild 1843 RMD160 79655e812de59aace2db63b75b33c2c22265221d SHA1 08c7f21f0556a39616fdbb4d2a725aa5b7120299 SHA256 6f150f38fedcb2879fb98e9845d7cc1f1dcf6f100af1c8b60e6229e296825a99
+MISC ChangeLog 27654 RMD160 dae960dca4d24037ade1c6da60b37bda7d264c69 SHA1 a8b039e55575e04776c5e54bf24e577e672af8f2 SHA256 a87be30fa26cd1ddad94f679bd2d3f03f5f8a4c366f7539706b4d8f36ca6ef84
 MISC metadata.xml 305 RMD160 319f6d3a222a3028d69dfb5ece59f4ae0343125a SHA1 705291c975a8b25ccc5a040d4fa7feab9190048e SHA256 e8245261e4eaebac2b2f5017c36165f9e733bc1e3619392b8f64c0d5392e7cd9
diff --git a/app-misc/mc/files/mc-4.7.1_find-results-panelization-crash.patch b/app-misc/mc/files/mc-4.7.1_find-results-panelization-crash.patch
new file mode 100644
index 000000000000..09934d2de02b
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.1_find-results-panelization-crash.patch
@@ -0,0 +1,11 @@
+Index: src/find.c

+===================================================================

+--- src/find.c (revision 1947d842a5d87c11862039037dc85051448a6081)

++++ src/find.c (revision 7b9226c5da3a81fb758bee70aafe05bb64d37464)

+@@ -1256,5 +1256,5 @@

+ 	    WLEntry *le = (WLEntry *) entry->data;

+ 

+-	    if ((le->text == NULL) || (entry->data == NULL))

++	    if ((le->text == NULL) || (le->data == NULL))

+ 		continue;

+ 

diff --git a/app-misc/mc/mc-4.7.1-r1.ebuild b/app-misc/mc/mc-4.7.1-r2.ebuild
index ff748f440eba..837f7f0b19e1 100644
--- a/app-misc/mc/mc-4.7.1-r1.ebuild
+++ b/app-misc/mc/mc-4.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.1-r1.ebuild,v 1.1 2010/04/08 18:41:06 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.1-r2.ebuild,v 1.1 2010/04/09 16:25:02 reavertm Exp $
 
 EAPI=3
 
@@ -34,7 +34,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}/${PN}-4.7_mcedit_fix.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7_mcedit_fix.patch"
+	"${FILESDIR}/${PN}-4.7.1_find-results-panelization-crash.patch"
+)
 
 src_configure() {
 	local myscreen=ncurses
diff --git a/app-misc/mc/mc-4.7.1.ebuild b/app-misc/mc/mc-4.7.1.ebuild
deleted file mode 100644
index 5ec248b24dab..000000000000
--- a/app-misc/mc/mc-4.7.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.7.1.ebuild,v 1.1 2010/02/26 17:50:41 wired Exp $
-
-EAPI=3
-
-inherit base
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="http://www.midnight-commander.org"
-SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba slang X"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_with samba) \
-		--with-configdir="${EPREFIX}"/etc/samba \
-		--with-codepagedir="${EPREFIX}"/var/lib/samba/codepages \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}