summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2012-04-23 15:59:12 +0000
committerLars Wendler <polynomial-c@gentoo.org>2012-04-23 15:59:12 +0000
commit1a249758026af2c6fb84946ac54cda800999c84a (patch)
tree5701c27fdea50f7c3415b45a075574dd6b651645 /app-misc
parentdepend on new enough libedit (diff)
downloadgentoo-2-1a249758026af2c6fb84946ac54cda800999c84a.tar.gz
gentoo-2-1a249758026af2c6fb84946ac54cda800999c84a.tar.bz2
gentoo-2-1a249758026af2c6fb84946ac54cda800999c84a.zip
Fixed crash when changing ownership wit "CTRL-x o" (bug #413259)
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/mc/ChangeLog9
-rw-r--r--app-misc/mc/files/mc-4.8.3-fix-chown-crash.patch14
-rw-r--r--app-misc/mc/mc-4.8.3-r1.ebuild (renamed from app-misc/mc/mc-4.8.3.ebuild)7
3 files changed, 27 insertions, 3 deletions
diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index e1b6e3d32c18..7c34655de082 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-misc/mc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.252 2012/04/22 14:53:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.253 2012/04/23 15:59:12 polynomial-c Exp $
+
+*mc-4.8.3-r1 (23 Apr 2012)
+
+ 23 Apr 2012; Lars Wendler <polynomial-c@gentoo.org> -mc-4.8.3.ebuild,
+ +mc-4.8.3-r1.ebuild, +files/mc-4.8.3-fix-chown-crash.patch:
+ non-maintainer commit: Fixed crash when changing ownership wit "CTRL-x o"
+ (bug #413259). Permission granted by slyfox.
*mc-4.8.3 (22 Apr 2012)
diff --git a/app-misc/mc/files/mc-4.8.3-fix-chown-crash.patch b/app-misc/mc/files/mc-4.8.3-fix-chown-crash.patch
new file mode 100644
index 000000000000..8ea232d15593
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.3-fix-chown-crash.patch
@@ -0,0 +1,14 @@
+https://www.midnight-commander.org/ticket/2784
+https://www.midnight-commander.org/changeset/ac880c71a74c1fc75d7162b2ca3613970479e663
+
+--- mc-4.8.3/src/filemanager/chown.c
++++ mc-4.8.3/src/filemanager/chown.c
+@@ -378,7 +378,7 @@
+ if (mc_chown (fname_vpath, new_user, new_group) == -1)
+ message (D_ERROR, MSG_ERROR, _("Cannot chown \"%s\"\n%s"),
+ fname, unix_error_string (errno));
+- vfs_path_free (vpath);
++ vfs_path_free (fname_vpath);
+ }
+ else
+ apply_chowns (new_user, new_group);
diff --git a/app-misc/mc/mc-4.8.3.ebuild b/app-misc/mc/mc-4.8.3-r1.ebuild
index 31937f9b405b..0e72f8a89b72 100644
--- a/app-misc/mc/mc-4.8.3.ebuild
+++ b/app-misc/mc/mc-4.8.3-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.3.ebuild,v 1.1 2012/04/22 14:53:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.3-r1.ebuild,v 1.1 2012/04/23 15:59:12 polynomial-c Exp $
EAPI=4
-inherit flag-o-matic
+inherit eutils flag-o-matic
MY_P=${P/_/-}
@@ -40,6 +40,9 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
cp "${FILESDIR}"/${P}-missing-do_panel_cd_stub_env.c \
tests/src/filemanager/do_panel_cd_stub_env.c || die
+
+ # bug #413259
+ epatch "${FILESDIR}"/${P}-fix-chown-crash.patch
}
src_configure() {