diff --git a/mc-edit-segv.patch b/mc-edit-segv.patch new file mode 100644 index 0000000..45767e0 --- /dev/null +++ b/mc-edit-segv.patch @@ -0,0 +1,11 @@ +diff -up mc-4.6.2-pre1/edit/edit.c.segv mc-4.6.2-pre1/edit/edit.c +--- mc-4.6.2-pre1/edit/edit.c.segv 2009-05-15 11:42:08.000000000 +0200 ++++ mc-4.6.2-pre1/edit/edit.c 2009-05-15 11:54:29.000000000 +0200 +@@ -1808,6 +1808,7 @@ my_type_of (int c) + c = '0'; + else if (iswspace (c)) + c = ' '; ++ if ( c > 0xff ) c = ' '; + #endif /* UTF8 */ + q = strchr (option_chars_move_whole_word, c); + if (!q) diff --git a/mc-extensions.patch b/mc-extensions.patch index 3e1a014..d83829d 100644 --- a/mc-extensions.patch +++ b/mc-extensions.patch @@ -1,7 +1,19 @@ +diff -up mc-4.6.2-pre1/configure.ac.extensions mc-4.6.2-pre1/configure.ac +--- mc-4.6.2-pre1/configure.ac.extensions 2007-09-10 16:25:30.000000000 +0200 ++++ mc-4.6.2-pre1/configure.ac 2009-04-15 15:29:14.000000000 +0200 +@@ -83,7 +83,7 @@ AC_PROG_LN_S + AC_CHECK_TOOL(AR, ar, ar) + + dnl Only list browsers here that can be run in background (i.e. with `&') +-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape]) ++AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape]) + + dnl + dnl Ovverriding mmap support. This has to be before AC_FUNC_MMAP is used. diff -up mc-4.6.2-pre1/configure.extensions mc-4.6.2-pre1/configure --- mc-4.6.2-pre1/configure.extensions 2007-09-11 16:33:32.000000000 +0200 -+++ mc-4.6.2-pre1/configure 2008-03-07 14:28:51.000000000 +0100 -@@ -5736,7 +5736,7 @@ ++++ mc-4.6.2-pre1/configure 2009-04-15 15:29:14.000000000 +0200 +@@ -5736,7 +5736,7 @@ else fi @@ -12,8 +24,8 @@ diff -up mc-4.6.2-pre1/configure.extensions mc-4.6.2-pre1/configure set dummy $ac_prog; ac_word=$2 diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in --- mc-4.6.2-pre1/lib/mc.ext.in.extensions 2006-12-28 04:57:01.000000000 +0100 -+++ mc-4.6.2-pre1/lib/mc.ext.in 2008-03-07 14:28:31.000000000 +0100 -@@ -119,6 +119,11 @@ ++++ mc-4.6.2-pre1/lib/mc.ext.in 2009-04-15 15:30:51.000000000 +0200 +@@ -119,6 +119,11 @@ regex/\.t(ar\.bz2|bz|b2)$ Open=%cd %p#utar View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf - @@ -25,7 +37,18 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in # .tar.F - used in QNX regex/\.tar\.F$ # Open=%cd %p#utar -@@ -220,14 +225,25 @@ +@@ -198,8 +203,8 @@ regex/\.(rpm|spm)$ + + # deb + regex/\.u?deb$ +- Open=%cd %p#deb +- View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f ++ Open=%cd %p#uar ++ View=%view{ascii} file %f && nm %f + + # ISO9660 + regex/\.iso$ +@@ -220,14 +225,25 @@ type/^ASCII\ mail\ text # C shell/.c @@ -54,7 +77,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in Open=%var{EDITOR:vi} %f # Object -@@ -251,10 +267,12 @@ +@@ -251,10 +267,12 @@ regex/\.(te?xi|texinfo)$ # GNU Info page type/^Info\ text @@ -69,7 +92,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in # Manual page # Exception - .so libraries are not manual pages -@@ -298,6 +316,10 @@ +@@ -298,6 +316,10 @@ regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*| Open=case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac | %var{PAGER:more} View=%view{ascii,nroff} case %d/%f in */log/*|*/logs/*) bzip2 -dc %f ;; *) bzip2 -dc %f | nroff @MAN_FLAGS@ @MANDOC@ ;; esac @@ -80,7 +103,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in ### Images ### -@@ -328,18 +350,24 @@ +@@ -328,18 +350,24 @@ type/^PPM type/^Netpbm Include=image @@ -107,7 +130,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in View=%view{ascii} identify %f #View=%view{ascii} asciiview %f -@@ -347,7 +375,8 @@ +@@ -347,7 +375,8 @@ include/image ### Sound files ### regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$ @@ -117,7 +140,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$ Open=mikmod %f -@@ -357,11 +386,16 @@ +@@ -357,11 +386,16 @@ regex/\.([wW][aA][wW]22)$ Open=vplay -s 22 %f regex/\.([mM][pP]3)$ @@ -137,7 +160,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in View=%view{ascii} ogginfo %s regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$ -@@ -371,11 +405,15 @@ +@@ -371,11 +405,15 @@ regex/\.([wW][mM][aA])$ Open=mplayer -vo null %f View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f @@ -154,7 +177,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in ### Video ### -@@ -395,20 +433,27 @@ +@@ -395,20 +433,27 @@ regex/\.([mM][oO][vV]|[qQ][tT])$ regex/\.([mM][pP]4|[mM][pP][eE]?[gG])$ Include=video @@ -183,7 +206,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in #Open=(gtv %f >/dev/null 2>&1 &) #Open=(xanim %f >/dev/null 2>&1 &) -@@ -417,12 +462,13 @@ +@@ -417,12 +462,13 @@ include/video # Postscript type/^PostScript @@ -199,7 +222,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in #Open=(acroread %f &) #Open=(ghostview %f &) View=%view{ascii} pdftotext %f - -@@ -433,7 +479,7 @@ +@@ -433,7 +479,7 @@ type/^PDF # html regex/\.([hH][tT][mM][lL]?)$ Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null @@ -208,7 +231,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in # StarOffice 5.2 shell/.sdw -@@ -450,22 +496,27 @@ +@@ -450,22 +496,27 @@ shell/.abw # Microsoft Word Document regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$ @@ -241,7 +264,7 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in View=%view{ascii} xls2csv %f || strings %f # Use OpenOffice.org to open any MS Office documents -@@ -542,6 +593,11 @@ +@@ -542,6 +593,11 @@ type/^compress Open=gzip -dc %f | %var{PAGER:more} View=%view{ascii} gzip -dc %f 2>/dev/null @@ -253,15 +276,3 @@ diff -up mc-4.6.2-pre1/lib/mc.ext.in.extensions mc-4.6.2-pre1/lib/mc.ext.in ### Default ### -diff -up mc-4.6.2-pre1/configure.ac.extensions mc-4.6.2-pre1/configure.ac ---- mc-4.6.2-pre1/configure.ac.extensions 2007-09-10 16:25:30.000000000 +0200 -+++ mc-4.6.2-pre1/configure.ac 2008-03-07 14:28:51.000000000 +0100 -@@ -83,7 +83,7 @@ - AC_CHECK_TOOL(AR, ar, ar) - - dnl Only list browsers here that can be run in background (i.e. with `&') --AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape]) -+AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape]) - - dnl - dnl Ovverriding mmap support. This has to be before AC_FUNC_MMAP is used. diff --git a/mc.spec b/mc.spec index 69e7652..64699d3 100644 --- a/mc.spec +++ b/mc.spec @@ -35,6 +35,7 @@ Patch20: mc-7zip.patch Patch21: mc-oldrpmtags.patch Patch22: mc-shellcwd.patch Patch23: mc-cedit-configurable-highlight.patch +Patch24: mc-edit-segv.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -69,6 +70,7 @@ specific files. %patch21 -p1 -b .oldrpmtags %patch22 -p1 -b .shellcwd %patch23 -p1 -b .cedit-configurable-highlight +%patch24 -p1 -b .edit-segv # convert files in /lib to UTF-8 pushd lib @@ -206,6 +208,11 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/mc %changelog +* Fri May 15 2009 Jindrich Novy 4.6.2-9.pre1 +- fix segfault in mc editor when pressing ctrl+right (skip one word) + in binary file (#500818) +- don't use dpkg tools for *.deb files (#495649), thanks to Dan Horak + * Wed Feb 25 2009 Fedora Release Engineering - 1:4.6.2-9.pre1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild