diff --git a/.gitignore b/.gitignore index c520844..03d9a9d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -mc-4.7.4.tar.lzma +mc-4.7.5.tar.lzma diff --git a/mc-fileguicrash.patch b/mc-fileguicrash.patch deleted file mode 100644 index 55b084b..0000000 --- a/mc-fileguicrash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mc-4.7.4/src/filegui.c.fileguicrash mc-4.7.4/src/filegui.c ---- mc-4.7.4/src/filegui.c.fileguicrash 2010-09-07 09:16:44.000000000 +0200 -+++ mc-4.7.4/src/filegui.c 2010-12-09 08:53:07.950820700 +0100 -@@ -343,7 +343,7 @@ file_op_context_create_ui_without_init ( - if ((right_panel == current_panel) && !classic_progressbar) - { - ui->progress_file_gauge->from_left_to_right = FALSE; -- if (dialog_type == FILEGUI_DIALOG_MULTI_ITEM) -+ if (verbose && dialog_type == FILEGUI_DIALOG_MULTI_ITEM) - ui->progress_total_gauge->from_left_to_right = FALSE; - } - } diff --git a/mc-globfix.patch b/mc-globfix.patch deleted file mode 100644 index ab1ce2b..0000000 --- a/mc-globfix.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-mcviewsegfault.patch b/mc-mcviewsegfault.patch index a7c00da..2550988 100644 --- a/mc-mcviewsegfault.patch +++ b/mc-mcviewsegfault.patch @@ -1,7 +1,7 @@ -diff -up mc-4.7.2.99/src/editor/editwidget.c.mcviewsegfault mc-4.7.2.99/src/editor/editwidget.c ---- mc-4.7.2.99/src/editor/editwidget.c.mcviewsegfault 2010-06-08 13:23:03.000000000 +0200 -+++ mc-4.7.2.99/src/editor/editwidget.c 2010-06-08 13:28:14.960729778 +0200 -@@ -286,7 +286,7 @@ edit_file (const char *_file, int line) +diff -up mc-4.7.5-pre1/src/editor/editwidget.c.mcviewsegfault mc-4.7.5-pre1/src/editor/editwidget.c +--- mc-4.7.5-pre1/src/editor/editwidget.c.mcviewsegfault 2010-12-03 09:53:38.000000000 +0100 ++++ mc-4.7.5-pre1/src/editor/editwidget.c 2010-12-08 12:33:35.943724419 +0100 +@@ -387,7 +387,7 @@ edit_file (const char *_file, int line) const char * edit_get_file_name (const WEdit * edit) { @@ -9,4 +9,4 @@ diff -up mc-4.7.2.99/src/editor/editwidget.c.mcviewsegfault mc-4.7.2.99/src/edit + return edit?edit->filename:NULL; } - void + /* --------------------------------------------------------------------------------------------- */ diff --git a/mc-vfscrash.patch b/mc-vfscrash.patch deleted file mode 100644 index 4def655..0000000 --- a/mc-vfscrash.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up mc-4.7.4/lib/vfs/mc-vfs/direntry.c.vfscrash mc-4.7.4/lib/vfs/mc-vfs/direntry.c ---- mc-4.7.4/lib/vfs/mc-vfs/direntry.c.vfscrash 2010-09-07 09:16:43.000000000 +0200 -+++ mc-4.7.4/lib/vfs/mc-vfs/direntry.c 2010-12-09 08:50:40.695756257 +0100 -@@ -787,8 +787,12 @@ vfs_s_open (struct vfs_class *me, const - } - - split_dir_name (me, q, &dirname, &name, &save); -- /* FIXME: check if vfs_s_find_inode returns NULL */ - dir = vfs_s_find_inode (me, super, dirname, LINK_FOLLOW, FL_DIR); -+ if (dir == NULL) -+ { -+ g_free (q); -+ return NULL; -+ } - if (save) - *save = PATH_SEP; - ent = vfs_s_generate_entry (me, name, dir, 0755); -diff -up mc-4.7.4/lib/vfs/mc-vfs/gc.c.vfscrash mc-4.7.4/lib/vfs/mc-vfs/gc.c ---- mc-4.7.4/lib/vfs/mc-vfs/gc.c.vfscrash 2010-09-07 09:16:43.000000000 +0200 -+++ mc-4.7.4/lib/vfs/mc-vfs/gc.c 2010-12-09 08:51:30.500778054 +0100 -@@ -195,7 +195,7 @@ vfs_stamp_create (struct vfs_class *oldv - n3vfsid = NULL; - } - -- if (!oldvfs->nothingisopen || !(*oldvfs->nothingisopen) (oldvfsid)) -+ if (!oldvfs || !oldvfs->nothingisopen || !(*oldvfs->nothingisopen) (oldvfsid)) - return; - - vfs_addstamp (oldvfs, oldvfsid); diff --git a/mc.spec b/mc.spec index 33693c8..e5abaf8 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: 4%{?dist} +Version: 4.7.5 +Release: 1%{?dist} Epoch: 1 License: GPLv2 Group: System Environment/Shells @@ -14,9 +14,6 @@ Requires: dev >= 3.3-3 Patch0: mc-extensions.patch Patch1: mc-mcviewsegfault.patch -Patch2: mc-globfix.patch -Patch3: mc-vfscrash.patch -Patch4: mc-fileguicrash.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -29,9 +26,6 @@ specific files. %setup -q %patch0 -p1 -b .extensions %patch1 -p1 -b .mcviewsegfault -%patch2 -p1 -b .globfix -%patch3 -p1 -b .vfscrash -%patch4 -p1 -b .fileguicrash %build export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -Wno-strict-aliasing" @@ -62,7 +56,6 @@ rm -rf $RPM_BUILD_ROOT %doc doc/FAQ doc/COPYING doc/NEWS doc/README %{_bindir}/mc %{_bindir}/mcedit -%{_bindir}/mcmfmt %{_bindir}/mcview %{_bindir}/mcdiff %{_datadir}/mc/* @@ -78,9 +71,6 @@ rm -rf $RPM_BUILD_ROOT %lang(ru) %{_mandir}/ru/man1/mc.1* %lang(sr) %{_mandir}/sr/man1/mc.1* %{_sysconfdir}/profile.d/* -%config %{_sysconfdir}/mc/Syntax -%config %{_sysconfdir}/mc/mc.charsets -%config %{_sysconfdir}/mc/mc.lib %config(noreplace) %{_sysconfdir}/mc/mc.ext %config(noreplace) %{_sysconfdir}/mc/*edit* %config(noreplace) %{_sysconfdir}/mc/mc.keymap* @@ -93,6 +83,11 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/mc/extfs.d %changelog +* Wed Jan 12 2011 Jindrich Novy 4.7.5-1 +- update to mc-4.7.5 +- drop globfix, filegui and vfscrash patches - applied upstream +- introduce mc viewer segfault fix (#602124) + * Tue Dec 14 2010 Jindrich Novy 4.7.4-4 - make cons.saver not suid root, it is no more needed (#640365) diff --git a/sources b/sources index d9a2de8..2228e74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9932eaef64b7501c01f06faa888e8998 mc-4.7.4.tar.lzma +6e3d5d992d3c8ace46ecb4a55dbdca14 mc-4.7.5.tar.lzma