From 66d2bd1739c0a0f4ced0ec9a46732a2f7f791b24 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Thu, 7 Oct 2010 09:14:24 +0200
Subject: [PATCH] fix globbing (#629679), thanks to Denys Vlasenko, don't use
 vcsa for cons.saver (#640365)

---
 mc-globfix.patch | 11 +++++++++++
 mc.spec          | 10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 mc-globfix.patch

diff --git a/mc-globfix.patch b/mc-globfix.patch
new file mode 100644
index 0000000..ab1ce2b
--- /dev/null
+++ b/mc-globfix.patch
@@ -0,0 +1,11 @@
+diff -up mc-4.7.4/lib/search/glob.c.globfix mc-4.7.4/lib/search/glob.c
+--- mc-4.7.4/lib/search/glob.c.globfix	2010-09-07 09:16:43.000000000 +0200
++++ mc-4.7.4/lib/search/glob.c	2010-10-07 08:43:56.517785647 +0200
+@@ -144,7 +144,6 @@ mc_search__translate_replace_glob_to_reg
+             {
+                 g_string_append_c (buff, '\\');
+                 c = ++cnt;
+-                continue;
+             }
+             break;
+             /* breaks copying: mc uses "\0" internally, it must not be changed */
diff --git a/mc.spec b/mc.spec
index 6531a74..e308e11 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.4
-Release:	3%{?dist}
+Release:	4%{?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-globfix.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 .globfix
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing"
@@ -60,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mcview
 %{_bindir}/mcdiff
 %{_datadir}/mc/*
-%attr(4711, vcsa, root) %{_libexecdir}/mc/cons.saver
+%attr(4711, root, root) %{_libexecdir}/mc/cons.saver
 %{_libexecdir}/mc/mc*
 %{_libexecdir}/mc/extfs.d/*
 %{_libexecdir}/mc/fish/*
@@ -87,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc/extfs.d
 
 %changelog
+* Thu Oct  7 2010 Jindrich Novy <jnovy@redhat.com> 4.7.4-4
+- fix globbing (#629679), thanks to Denys Vlasenko
+- don't use vcsa for cons.saver (#640365)
+
 * Wed Sep 29 2010 jkeating - 1:4.7.4-3
 - Rebuilt for gcc bug 634757