From a91b1dae3925894ce724b6e7b70f60f4a9c64459 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Sep 01 2010 08:47:38 +0000
Subject: fix segfault in advanced chown dialog (#625801)


---

diff --git a/mc-achownsegfault.patch b/mc-achownsegfault.patch
new file mode 100644
index 0000000..6b5fdf0
--- /dev/null
+++ b/mc-achownsegfault.patch
@@ -0,0 +1,12 @@
+diff -up mc-4.7.3/src/achown.c.achownsegfault mc-4.7.3/src/achown.c
+--- mc-4.7.3/src/achown.c.achownsegfault	2010-07-05 20:32:41.000000000 +0200
++++ mc-4.7.3/src/achown.c	2010-09-01 10:41:15.773738062 +0200
+@@ -498,7 +498,7 @@ advanced_chown_callback (Dlg_head *h, Wi
+ 	    if (f_pos > 2)
+ 		break;
+ 	    flag_pos = f_pos * 3 + i;	/* (strchr(ch_perm,parm)-ch_perm); */
+-	    if (((WButton *) h->current)->text.start[(flag_pos % 3)] ==
++	    if (((WButton *) h->current->data)->text.start[(flag_pos % 3)] ==
+ 		'-')
+ 		ch_flags[flag_pos] = '+';
+ 	    else
diff --git a/mc.spec b/mc.spec
index 9a7ac55..a06f5f4 100644
--- a/mc.spec
+++ b/mc.spec
@@ -1,7 +1,7 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
@@ -14,6 +14,7 @@ Requires:	dev >= 3.3-3
 
 Patch0:		mc-extensions.patch
 Patch1:		mc-mcviewsegfault.patch
+Patch2:		mc-achownsegfault.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -26,6 +27,7 @@ specific files.
 %setup -q
 %patch0 -p1 -b .extensions
 %patch1 -p1 -b .mcviewsegfault
+%patch2 -p1 -b .achownsegfault
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
@@ -87,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc/extfs.d
 
 %changelog
+* Wed Sep  1 2010 Jindrich Novy <jnovy@redhat.com> 4.7.3-2
+- fix segfault in advanced chown dialog (#625801)
+
 * Wed Jul  7 2010 Jindrich Novy <jnovy@redhat.com> 4.7.3-1
 - update to 4.7.3