From e385216fa03bbaee80d8a83447361991fd228988 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Jun 16 2010 08:46:44 +0000 Subject: - update to 4.7.2, fixes #604223 - BR: groff (#602115) - fix segfault in mcview (#602124) --- diff --git a/.cvsignore b/.cvsignore index e6b5a82..55cb823 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mc-4.7.1.tar.lzma +mc-4.7.2.tar.lzma diff --git a/mc-findfix.patch b/mc-findfix.patch deleted file mode 100644 index 450ddd7..0000000 --- a/mc-findfix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 7b9226c5da3a81fb758bee70aafe05bb64d37464 -Author: Andrew Borodin -Date: Sun Feb 28 18:19:52 2010 +0300 - - Ticket #2068: fixed segfault in panelization of file find result. - - Signed-off-by: Andrew Borodin - -diff --git a/src/find.c b/src/find.c -index dc38e5f..883cb07 100644 ---- a/src/find.c -+++ b/src/find.c -@@ -1255,7 +1255,7 @@ find_file (const char *start_dir, const char *pattern, const char *content, - const char *lc_filename = NULL; - WLEntry *le = (WLEntry *) entry->data; - -- if ((le->text == NULL) || (entry->data == NULL)) -+ if ((le->text == NULL) || (le->data == NULL)) - continue; - - if (content_pattern != NULL) diff --git a/mc-mceditcrash.patch b/mc-mceditcrash.patch deleted file mode 100644 index 3eab2fd..0000000 --- a/mc-mceditcrash.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit d2a9152cec8db6d21af77bb91490666a85e48d55 -Author: Andrew Borodin -Date: Sat Mar 6 11:08:18 2010 +0300 - - Ticket #2087: crash in standalone editor and viewer. - - Don't try update file manager panels if mc runs as standalone editor or viewer. - - Signed-off-by: Andrew Borodin - -diff --git a/src/execute.c b/src/execute.c -index e8f9ad3..16c0898 100644 ---- a/src/execute.c -+++ b/src/execute.c -@@ -304,8 +304,10 @@ toggle_panels (void) - } - #endif /* HAVE_SUBSHELL_SUPPORT */ - -- update_panels (UP_OPTIMIZE, UP_KEEPSEL); -- update_xterm_title_path (); -+ if ((view_one_file == NULL) && (edit_one_file == NULL)) { -+ update_panels (UP_OPTIMIZE, UP_KEEPSEL); -+ update_xterm_title_path (); -+ } - repaint_screen (); - } - diff --git a/mc-mcviewsegfault.patch b/mc-mcviewsegfault.patch new file mode 100644 index 0000000..a7c00da --- /dev/null +++ b/mc-mcviewsegfault.patch @@ -0,0 +1,12 @@ +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) + const char * + edit_get_file_name (const WEdit * edit) + { +- return edit->filename; ++ return edit?edit->filename:NULL; + } + + void diff --git a/mc.spec b/mc.spec index a4fd5b4..356fcb5 100644 --- a/mc.spec +++ b/mc.spec @@ -1,6 +1,6 @@ Summary: User-friendly text console file manager and visual shell Name: mc -Version: 4.7.1 +Version: 4.7.2 Release: 2%{?dist} Epoch: 1 License: GPLv2 @@ -9,12 +9,11 @@ Group: System Environment/Shells Source0: mc-%{version}.tar.lzma URL: http://www.midnight-commander.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glib2-devel e2fsprogs-devel slang-devel gpm-devel +BuildRequires: glib2-devel e2fsprogs-devel slang-devel gpm-devel groff Requires: dev >= 3.3-3 Patch0: mc-extensions.patch -Patch1: mc-findfix.patch -Patch2: mc-mceditcrash.patch +Patch1: mc-mcviewsegfault.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -26,8 +25,7 @@ specific files. %prep %setup -q %patch0 -p1 -b .extensions -%patch1 -p1 -b .findfix -%patch2 -p1 -b .mceditcrash +%patch1 -p1 -b .mcviewsegfault %build export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS" @@ -60,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/mcedit %{_bindir}/mcmfmt %{_bindir}/mcview +%{_bindir}/mcdiff %{_datadir}/mc/* %attr(4711, vcsa, root) %{_libexecdir}/mc/cons.saver %{_libexecdir}/mc/mc* @@ -86,6 +85,11 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/mc/extfs.d %changelog +* Wed Jun 16 2010 Jindrich Novy 4.7.2-1 +- update to 4.7.2, fixes #604223 +- BR: groff (#602115) +- fix segfault in mcview (#602124) + * Thu Mar 18 2010 Jindrich Novy 4.7.1-2 - patches from upstream: - fix crash in mcedit ran stand-alone (#571570) diff --git a/sources b/sources index 435fe12..550e009 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dca7e2392d66e6fc6cce9c43c5fbe48e mc-4.7.1.tar.lzma +8e0c477b0c55123942b4b60827a44058 mc-4.7.2.tar.lzma