[mc/f17] update to 4.8.7, fix couple of segfaults + various fixes
Jindrich Novy
jnovy at fedoraproject.org
Fri Mar 22 09:28:07 UTC 2013
commit 6383836ea55e8587d7f77cb3f1074c9c83f5fe11
Author: Jindrich Novy <jnovy at redhat.com>
Date: Fri Mar 22 10:25:22 2013 +0100
update to 4.8.7, fix couple of segfaults + various fixes
.gitignore | 2 +-
mc-VFSsegfault.patch | 12 +++++
mc-cpiosegfault.patch | 12 +++++
mc-ext.c_quote_mc_ext_env_vars.diff | 31 ------------
mc-widgetsegfault.patch | 12 +++++
mc.spec | 90 ++++++++++++++++++++++------------
sources | 2 +-
7 files changed, 96 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7080888..60c68ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mc-4.8.6.tar.xz
+/mc-4.8.7.tar.xz
diff --git a/mc-VFSsegfault.patch b/mc-VFSsegfault.patch
new file mode 100644
index 0000000..0ef9d8b
--- /dev/null
+++ b/mc-VFSsegfault.patch
@@ -0,0 +1,12 @@
+diff -up mc-4.8.7/lib/vfs/direntry.c.VFSsegfault mc-4.8.7/lib/vfs/direntry.c
+--- mc-4.8.7/lib/vfs/direntry.c.VFSsegfault 2012-12-27 09:13:20.000000000 +0100
++++ mc-4.8.7/lib/vfs/direntry.c 2013-03-21 10:54:15.344172569 +0100
+@@ -656,6 +656,8 @@ vfs_s_close (void *fh)
+ int res = 0;
+ struct vfs_class *me = FH_SUPER->me;
+
++ if (!me) return -1;
++
+ FH_SUPER->fd_usage--;
+ if (!FH_SUPER->fd_usage)
+ vfs_stamp_create (me, FH_SUPER);
diff --git a/mc-cpiosegfault.patch b/mc-cpiosegfault.patch
new file mode 100644
index 0000000..8627031
--- /dev/null
+++ b/mc-cpiosegfault.patch
@@ -0,0 +1,12 @@
+diff -up mc-4.8.7/src/vfs/cpio/cpio.c.cpiosegfault mc-4.8.7/src/vfs/cpio/cpio.c
+--- mc-4.8.7/src/vfs/cpio/cpio.c.cpiosegfault 2012-12-27 09:13:20.000000000 +0100
++++ mc-4.8.7/src/vfs/cpio/cpio.c 2013-03-14 11:55:50.660147302 +0100
+@@ -795,7 +795,7 @@ cpio_super_same (const vfs_path_element_
+ g_free (archive_name);
+
+ /* Has the cached archive been changed on the disk? */
+- if (((cpio_super_data_t *) parc->data)->st.st_mtime < archive_stat->st_mtime)
++ if (parc->data && ((cpio_super_data_t *) parc->data)->st.st_mtime < archive_stat->st_mtime)
+ {
+ /* Yes, reload! */
+ (*vfs_cpiofs_ops.free) ((vfsid) parc);
diff --git a/mc-widgetsegfault.patch b/mc-widgetsegfault.patch
new file mode 100644
index 0000000..bcfb0bb
--- /dev/null
+++ b/mc-widgetsegfault.patch
@@ -0,0 +1,12 @@
+diff -up mc-4.8.7/lib/widget/widget-common.h.widgetsegfault mc-4.8.7/lib/widget/widget-common.h
+--- mc-4.8.7/lib/widget/widget-common.h.widgetsegfault 2012-12-10 22:04:32.000000000 +0100
++++ mc-4.8.7/lib/widget/widget-common.h 2013-03-21 09:38:39.000000000 +0100
+@@ -153,7 +153,7 @@ gboolean mouse_global_in_widget (const G
+ static inline cb_ret_t
+ send_message (void *w, void *sender, widget_msg_t msg, int parm, void *data)
+ {
+- return WIDGET (w)->callback (WIDGET (w), WIDGET (sender), msg, parm, data);
++ return w ? WIDGET (w)->callback (WIDGET (w), WIDGET (sender), msg, parm, data) : 1;
+ }
+
+ #endif /* MC__WIDGET_INTERNAL_H */
diff --git a/mc.spec b/mc.spec
index c1549f6..4a287ce 100644
--- a/mc.spec
+++ b/mc.spec
@@ -1,16 +1,18 @@
Summary: User-friendly text console file manager and visual shell
Name: mc
-Version: 4.8.6
-Release: 2%{?dist}
+Version: 4.8.7
+Release: 3%{?dist}
Epoch: 1
License: GPLv3+
Group: System Environment/Shells
Source0: http://www.midnight-commander.org/downloads/mc-%{version}.tar.xz
URL: http://www.midnight-commander.org/
-Patch0: mc-ext.c_quote_mc_ext_env_vars.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel e2fsprogs-devel slang-devel gpm-devel groff
BuildRequires: aspell-devel libssh2-devel >= 1.2.5
+Patch0: mc-cpiosegfault.patch
+Patch1: mc-widgetsegfault.patch
+Patch2: mc-VFSsegfault.patch
%description
Midnight Commander is a visual shell much like a file manager, only
@@ -21,7 +23,9 @@ specific files.
%prep
%setup -q
-%patch0 -p1 -b .CVE-2012-4463
+%patch0 -p1 -b .cpiosegfault
+%patch1 -p1 -b .widgetsegfault
+%patch2 -p1 -b .VFSsegfault
%build
export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing"
@@ -77,6 +81,21 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libexecdir}/mc/ext.d
%changelog
+* Thu Mar 21 2013 Jindrich Novy <jnovy at redhat.com> 4.8.7-3
+- attempt to fix segfault while passing messages to widgets (#907045, #912033)
+- fix possible segfault when freeing a VFS (#923415)
+
+* Thu Mar 14 2013 Jindrich Novy <jnovy at redhat.com> 4.8.7-2
+- fix segfault in cpio VFS while reading corrupted RPM (#921414)
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.8.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jan 02 2013 Jindrich Novy <jnovy at redhat.com> 4.8.7-1
+- update to 4.8.7 (#890662)
+- drop patch for CVE-2012-4463 - applied upstream
+- fix chagelog dates
+
* Wed Nov 28 2012 Jindrich Novy <jnovy at redhat.com> 4.8.6-2
- sanitize of MC_EXT_SELECTED variable when viewing
multiple files, CVE-2012-4463 (#862814)
@@ -88,11 +107,18 @@ rm -rf $RPM_BUILD_ROOT
* Tue Sep 11 2012 Jindrich Novy <jnovy at redhat.com> 4.8.5-1
- update to 4.8.5 (#815307)
-* Mon Jul 23 2012 Jindrich Novy <jnovy at redhat.com> 4.8.4-2
-- BR: libssh2-devel for SFTP support
-- BR: aspell-devel
+* Thu Aug 09 2012 Jindrich Novy <jnovy at redhat.com> 4.8.4-5
+- handle overlapping menus correctly (#844392)
+ (https://www.midnight-commander.org/ticket/2817)
+
+* Tue Jul 31 2012 Jindrich Novy <jnovy at redhat.com> 4.8.4-4
+- fix segfault if aspell dicts aren't present
+- fix segfault in mcedit when pressing alt-minus
+
+* Fri Jul 27 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-* Tue Jul 18 2012 Jindrich Novy <jnovy at redhat.com> 4.8.4-1
+* Wed Jul 18 2012 Jindrich Novy <jnovy at redhat.com> 4.8.4-1
- update to 4.8.4
* Mon Apr 23 2012 Jindrich Novy <jnovy at redhat.com> 1:4.8.3-1
@@ -121,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT
- update to 4.8.0
- update license to GPLv3+
-* Mon Sep 29 2011 Jindrich Novy <jnovy at redhat.com> 4.7.5.5-1
+* Thu Sep 29 2011 Jindrich Novy <jnovy at redhat.com> 4.7.5.5-1
- update to 4.7.5.5
* Thu Sep 15 2011 Jindrich Novy <jnovy at redhat.com> 4.7.5.4-1
@@ -254,7 +280,7 @@ rm -rf $RPM_BUILD_ROOT
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.6.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-* Wed May 17 2009 Jindrich Novy <jnovy at redhat.com> 4.6.2-11
+* Sun May 17 2009 Jindrich Novy <jnovy at redhat.com> 4.6.2-11
- update to mc-4.6.2 release
- drop .8bit-hex, .preserveattrs, .cloexec, .7zip and part of
.utf8-look-and-feel patch, applied upstream
@@ -371,7 +397,7 @@ rm -rf $RPM_BUILD_ROOT
doesn't leave them open while execve()ing commands (#217027)
- more general fix for #215909
-* Thu Nov 27 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-36
+* Mon Nov 27 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-36
- don't crash when temporary directory cannot be created (#217342)
* Thu Nov 16 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-35
@@ -382,7 +408,7 @@ rm -rf $RPM_BUILD_ROOT
disable support for directories with '\n' in name to avoid
further issues (remove .uglydir patch) and report chdir error
-* Wed Nov 2 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-34
+* Thu Nov 2 2006 Jindrich Novy <jnovy at redhat.com> 4.6.1a-34
- fix #214255 - sh vfs disconnects with special character in filename
- drop fish-upload patch, applied upstream
@@ -533,7 +559,7 @@ rm -rf $RPM_BUILD_ROOT
- use evince instead of gv to view ps files
- align mini status bar with main panels
-* Fri Dec 1 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-4
+* Thu Dec 1 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-4
- don't segfault when LANG is not set, thanks to Andy Shevchenko (#174070)
- drop specsyntax patch, applied upstream
- sync NVRE with Fedoras
@@ -554,7 +580,7 @@ rm -rf $RPM_BUILD_ROOT
- add slang2 support to utf8 patch (Leonard den Ottolander)
- update %%description
-* Mon Nov 5 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.21
+* Sat Nov 5 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.21
- add vertical scrollbars to main panels and listboxes
- fix memleak in menu.c caused by UTF-8 patch
- display UTF-8 characters corectly in mcview (#172571)
@@ -563,7 +589,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Oct 25 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.20
- don't display UTF-8 characters as questionmarks in xterm title (#170971)
-* Mon Oct 16 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.19
+* Sun Oct 16 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.19
- update from CVS
- convert spec to UTF-8
- sync utf8, promptfix, 64bit patches
@@ -610,7 +636,7 @@ rm -rf $RPM_BUILD_ROOT
- sync .utf8, .userhost patch
- drop upstreamed .fixes patch
-* Wed Jun 06 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.10
+* Mon Jun 06 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.10
- update from CVS
- sync with .utf8 patch and some minor gcc4 fixups
- add .fixes patch
@@ -618,7 +644,7 @@ rm -rf $RPM_BUILD_ROOT
- update .userhost, .64bit patch
- add mcview
-* Thu May 04 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.9
+* Wed May 04 2005 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.9
- update from CVS
- sync with .utf8 patch
- fix broken charset conversion feature in the .utf8 patch,
@@ -669,7 +695,7 @@ rm -rf $RPM_BUILD_ROOT
- update from CVS - problem in uzip.in fixed by upstream (#141844)
- fix msglen patch to deal with wide UTF-8 characters (#141875)
-* Wed Dec 9 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.1
+* Thu Dec 9 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1a-0.1
- update from CVS
- sync UTF-8 patches with upstream
- drop upstreamed badsize, growbuf patches
@@ -686,7 +712,7 @@ rm -rf $RPM_BUILD_ROOT
- add growbuf patch from Roland Illig #141422 to view files
in /proc and /sys properly
-* Fri Nov 24 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.10
+* Wed Nov 24 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.10
- update from CVS
- update promptfix patch, drop upstreamed strippwd patch
- add badsize patch to fix displaying of filesizes >2GB
@@ -696,7 +722,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Nov 12 2004 Jindrich Novy <jnovy at redhat.com>
- convert man pages to UTF-8 (#138871)
-* Thu Nov 8 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.9
+* Mon Nov 8 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.9
- update from CVS
- convert help files in /doc to UTF-8
- add --enable-charset (#76486)
@@ -727,7 +753,7 @@ rm -rf $RPM_BUILD_ROOT
- merged hp48.in patch to extfs patch (from Leonard den Ottolander)
- rebuilt
-* Thu Oct 08 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.6
+* Fri Oct 08 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.6
- update from CVS
- drop upstreamed vcsa and xtermaliases patches
- sync the rest of the patches with upstream
@@ -741,12 +767,12 @@ rm -rf $RPM_BUILD_ROOT
* Tue Sep 21 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.4
- fixed .strippwd patch to deal better with ':' and '@' in URL
-* Thu Sep 17 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.3
+* Fri Sep 17 2004 Jindrich Novy <jnovy at redhat.com> 4.6.1-0.3
- patch to prevent displaying passwords in ftp paths (#131088)
- also removes pswd from Delete/Copy/Error dialogs, etc.
- added patch to fix/add extensions in mc.ext.in (#124242)
-* Thu Sep 17 2004 Karel Zak <zakkr at zf.jcu.cz>
+* Fri Sep 17 2004 Karel Zak <zakkr at zf.jcu.cz>
- patch to prevent hangs on directory with '\n' in name, (#127164)
- UTF8 hints support
- original hint files conversion to UTF8 in the spec file
@@ -947,7 +973,7 @@ rm -rf $RPM_BUILD_ROOT
- use %%{_tmppath}
- langify
-* Tue Feb 21 2001 Akira TAGOH <tagoh at redhat.com>
+* Wed Feb 21 2001 Akira TAGOH <tagoh at redhat.com>
- Fixed install some desktop icons for specific language.
* Fri Feb 16 2001 Akira TAGOH <tagoh at redhat.com>
@@ -1033,10 +1059,10 @@ rm -rf $RPM_BUILD_ROOT
* Tue Mar 7 2000 Jeff Johnson <jbj at redhat.com>
- rebuild for sparc baud rates > 38400.
-* Wed Feb 22 2000 Preston Brown <pbrown at redhat.com>
+* Tue Feb 22 2000 Preston Brown <pbrown at redhat.com>
- fix mc.sh, function was not exported
-* Wed Feb 17 2000 Jakub Jelinek <jakub at redhat.com>
+* Thu Feb 17 2000 Jakub Jelinek <jakub at redhat.com>
- builtin cpio vfs, change rpm extfs to use it -
should speed up e.g. copyout from rpm by orders of magnitude
patch by Jan Hudec <jhud7196 at artax.karlin.mff.cuni.cz>
@@ -1053,7 +1079,7 @@ rm -rf $RPM_BUILD_ROOT
- use /bin/rm instead of rm so that aliases won't interfere with the
script
-* Fri Sep 25 1999 Bill Nottingham <notting at redhat.com>
+* Sat Sep 25 1999 Bill Nottingham <notting at redhat.com>
- chkconfig --del in %%preun, not %postun
* Wed Sep 22 1999 Michael Fulbright <drmike at redhat.com>
@@ -1063,7 +1089,7 @@ rm -rf $RPM_BUILD_ROOT
- moved configure to setup
- buildrequires gpm-devel so mouse works in console
-* Wed Jul 22 1999 Michael Fulbright <drmike at redhat.com>
+* Thu Jul 22 1999 Michael Fulbright <drmike at redhat.com>
- added ${prefix}/lib/mc/syntax to mc file list
- turned off samba support
@@ -1091,14 +1117,14 @@ rm -rf $RPM_BUILD_ROOT
* Wed Mar 31 1999 Michael Fulbright <drmike at redhat.com>
- fixed errata support URL
-* Tue Mar 25 1999 Michael Fulbright <drmike at redhat.com>
+* Thu Mar 25 1999 Michael Fulbright <drmike at redhat.com>
- version 4.5.29
- added default desktop icons for Red Hat desktop
- added redhat-logos to requirements
- added README.desktop to doc list for gmc
- added locale data
-* Fri Mar 25 1999 Preston Brown <pbrown at redhat.com>
+* Thu Mar 25 1999 Preston Brown <pbrown at redhat.com>
- patched so that TERM variable set to xterm produces color
* Mon Mar 22 1999 Michael Fulbright <drmike at redhat.com>
@@ -1231,12 +1257,12 @@ rm -rf $RPM_BUILD_ROOT
- removed %%{prefix}/lib/mc/bin/create_vcs,
- removed %%{prefix}/lib/mc/term.
-* Wed May 9 1997 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
+* Fri May 9 1997 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
- changed source url,
- fixed link mcedit to mc,
-* Tue May 7 1997 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
+* Wed May 7 1997 Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
- new version 3.5.27,
- %%dir %%{prefix}/lib/mc/icons and icons removed from tkmc,
diff --git a/sources b/sources
index cfe8130..cf2307b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e50fac70c472dfa108e07152f88bdae mc-4.8.6.tar.xz
+3e825e767f85a57af210919f9f6c90b2 mc-4.8.7.tar.xz
More information about the scm-commits
mailing list