diff --git a/mc-4.8.10.sha256 b/mc-4.8.10.sha256 deleted file mode 100644 index 4f19807..0000000 --- a/mc-4.8.10.sha256 +++ /dev/null @@ -1,2 +0,0 @@ -5f4166fe78fbf4b42f51ed526ca7f79fea8c77d04355c2b97d4df2a6bd2a1b1a mc-4.8.10.tar.bz2 -5bda5a10bd0447da4b3b36c55d10fdf26e279d29fd30792467d68bdb7c2f2788 mc-4.8.10.tar.xz diff --git a/mc-4.8.10.tar.xz b/mc-4.8.10.tar.xz deleted file mode 100644 index e59957d..0000000 --- a/mc-4.8.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bda5a10bd0447da4b3b36c55d10fdf26e279d29fd30792467d68bdb7c2f2788 -size 2152000 diff --git a/mc-4.8.11.tar.xz b/mc-4.8.11.tar.xz new file mode 100644 index 0000000..702a836 --- /dev/null +++ b/mc-4.8.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1877ea844f9d71e133b9e03ca3bebcd7b10b9ba5b419b8d268e255816fe1993a +size 2211144 diff --git a/mc-extfs-helpers-urar.patch b/mc-extfs-helpers-urar.patch deleted file mode 100644 index 366be1f..0000000 --- a/mc-extfs-helpers-urar.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -urN -x '*~' mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in mc-4.8.10/src/vfs/extfs/helpers/urar.in ---- mc-4.8.10.orig/src/vfs/extfs/helpers/urar.in 2013-08-02 17:02:39.000000000 +0200 -+++ mc-4.8.10/src/vfs/extfs/helpers/urar.in 2013-11-28 07:14:54.000000000 +0100 -@@ -4,6 +4,11 @@ - # (C) 1996 2:5020/337.13@fidonet.org - # Updated by christian.gennerat@alcatel.fr 1999 - # Andrew V. Samoilov 2000 -+# -+# Andrew Borodin -+# David Haller -+# 2013: support unrar5 -+# - # beta version 2.0 - # - # rar and unrar can be found on http://www.rarlabs.com/ -@@ -39,18 +44,62 @@ - - mcrar5fs_list () - { -- $UNRAR v -c- -cfg- "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' --BEGIN { flag=0 } --/^-----------/ { flag++; if (flag > 1) exit 0; next } --flag==1 { -- split($5, a, "-") -- if (index($1, "D") != 0) -- $1="drwxr-xr-x" -- else -- if (index($1, ".") != 0) -- $1="-rw-r--r--" -- printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $1, uid, gid, $2, a[2], a[1], a[3], $6, $8 --}' -+ $UNRAR vt -c- -cfg- "$1" | @AWK@ -F ':' -v uid=`id -u` -v gid=`id -g` ' -+ { -+ ### remove space after the ":" of the field name -+ sub ("^ ", "", $2); -+ } -+ -+ $1 ~ / *Name$/ { -+ ### next file -+ name = mtime = size = attrs = ""; -+ delete date; -+ name = $2; -+ ### if the name contains ":", append the rest of the fields -+ if (NF > 2) { -+ for (i = 3; i <= NF; i++) { -+ name = name ":" $i; -+ } -+ } -+ } -+ $1 ~ /^ *mtime$/ { -+ mtime = $2 ":" $3; -+ } -+ $1 ~ /^ *Size$/ { -+ size = $2; -+ } -+ $1 ~ /^ *Attributes$/ { -+ attrs = $2; -+ } -+ -+ $1 ~ /^ *Compression$/ { -+ ### file done, using /^$/ is not so good you -+ ### would have to skip the version stuff first -+ -+ ### get date and time -+ split (mtime, date, " "); -+ time = date[2]; -+ ### cut off seconds from the time -+ sub (",[0-9]*$", "", time); -+ ### split for reordering of the date in the printf below -+ split (date[1], date, "-"); -+ ### mc seems to be able to parse 4 digit years too, so remove if tested -+ # sub ("^..", "", date[1]); ### cut year to 2 digits only -+ -+ ### check/adjust rights -+ if (index (attrs, "D") != 0) { -+ attrs = "drwxr-xr-x"; -+ } else { -+ if (index (attrs, ".") != 0) { -+ attrs = "-rw-r--r--"; -+ } -+ } -+ -+ ### and finally -+ printf ("%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", -+ attrs, uid, gid, size, date[2], date[3], date[1], time, name); -+ } -+' - } - - mcrarfs_list () diff --git a/mc-extfs-iso9660-xorriso.patch b/mc-extfs-iso9660-xorriso.patch index 96321fa..91bf1f2 100644 --- a/mc-extfs-iso9660-xorriso.patch +++ b/mc-extfs-iso9660-xorriso.patch @@ -1,6 +1,12 @@ ---- mc-4.8.11/src/vfs/extfs/helpers/iso9660.in.orig 2013-12-12 10:57:16.000000000 +0100 -+++ mc-4.8.11/src/vfs/extfs/helpers/iso9660.in 2013-12-12 13:04:28.000000000 +0100 -@@ -38,13 +38,16 @@ +--- + src/vfs/extfs/helpers/iso9660.in | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +Index: mc-4.8.11/src/vfs/extfs/helpers/iso9660.in +=================================================================== +--- mc-4.8.11.orig/src/vfs/extfs/helpers/iso9660.in 2014-01-01 19:44:49.000000000 +0000 ++++ mc-4.8.11/src/vfs/extfs/helpers/iso9660.in 2014-01-01 19:46:02.000000000 +0000 +@@ -38,13 +38,16 @@ xorriso_list() { return 1 fi local dir attr ln usr gr sz dt1 dt2 dt3 nm len name @@ -12,11 +18,10 @@ + test $r -gt 0 && return $r + echo "$lsl" | /usr/bin/grep "^[-d]" | \ while read attr ln usr gr sz dt1 dt2 dt3 nm ; do -- len=$((${#nm} - 2)) + len=$((${#nm} - 1)) - name=$(printf "$nm" | cut -c2-$len) # remove quotes - if test $(printf "$nm" | cut -c1-2) != "d"; then - printf "%s %s %s %s %s %s %s %s %s/%s\n" "$attr" "$ln" "$usr" "$gr" "$sz" "$dt1" "$dt2" "$dt3" "$dir" "$name" -+ len=$((${#nm} - 1)) + name=$(printf -- '%s' "$nm" | cut -c2-$len) # remove quotes + if test $(printf -- '%s' "$attr" | cut -c1) != "d"; then + printf -- "%s %s %s %s %s %s %s %s %s/%s\n" "$attr" "$ln" "$usr" "$gr" "$sz" "$dt1" "$dt2" "$dt3" "$dir" "$name" diff --git a/mc-multi-press-f-keys.patch b/mc-multi-press-f-keys.patch index e6b2732..7994059 100644 --- a/mc-multi-press-f-keys.patch +++ b/mc-multi-press-f-keys.patch @@ -1,8 +1,15 @@ http://www.midnight-commander.org/ticket/287 ---- lib/tty/key.c.orig 2013-08-23 22:08:01.273850736 +0200 -+++ lib/tty/key.c 2013-08-23 22:08:01.285849858 +0200 -@@ -1027,10 +1027,13 @@ - } +--- + lib/tty/key.c | 17 +++++++++++++++-- + lib/tty/tty-slang.h | 1 + + 2 files changed, 16 insertions(+), 2 deletions(-) + +Index: mc-4.8.11/lib/tty/key.c +=================================================================== +--- mc-4.8.11.orig/lib/tty/key.c 2014-01-01 19:47:50.000000000 +0000 ++++ mc-4.8.11/lib/tty/key.c 2014-01-01 19:47:50.000000000 +0000 +@@ -1027,10 +1027,13 @@ correct_key_code (int code) + mod = KEY_M_SHIFT; } - /* F0 is the same as F10 for out purposes */ @@ -16,7 +23,7 @@ http://www.midnight-commander.org/ticket/287 /* * We are not interested if Ctrl was pressed when entering control * characters, so assume that it was. When checking for such keys, -@@ -1116,6 +1119,16 @@ +@@ -1116,6 +1119,16 @@ correct_key_code (int code) mod &= ~KEY_M_SHIFT; } @@ -33,7 +40,7 @@ http://www.midnight-commander.org/ticket/287 if (!mc_global.tty.alternate_plus_minus) switch (c) { -@@ -1928,7 +1941,7 @@ +@@ -1919,7 +1932,7 @@ get_key_code (int no_delay) { /* Convert escape-digits to F-keys */ if (g_ascii_isdigit (c)) @@ -42,8 +49,10 @@ http://www.midnight-commander.org/ticket/287 else if (c == ' ') c = ESC_CHAR; else ---- lib/tty/tty-slang.h.orig 2013-06-25 23:29:14.000000000 +0200 -+++ lib/tty/tty-slang.h 2013-08-23 22:08:01.285849858 +0200 +Index: mc-4.8.11/lib/tty/tty-slang.h +=================================================================== +--- mc-4.8.11.orig/lib/tty/tty-slang.h 2013-04-10 21:04:31.000000000 +0100 ++++ mc-4.8.11/lib/tty/tty-slang.h 2014-01-01 19:47:50.000000000 +0000 @@ -11,6 +11,7 @@ /*** typedefs(not structures) and defined constants **********************************************/ diff --git a/mc-rpm.patch b/mc-rpm.patch index 8c19680..3d6b102 100644 --- a/mc-rpm.patch +++ b/mc-rpm.patch @@ -1,7 +1,12 @@ -Index: misc/syntax/spec.syntax +--- + misc/syntax/spec.syntax | 1 + + src/vfs/extfs/helpers/rpm | 8 ++++++++ + 2 files changed, 9 insertions(+) + +Index: mc-4.8.11/misc/syntax/spec.syntax =================================================================== ---- misc/syntax/spec.syntax.orig -+++ misc/syntax/spec.syntax +--- mc-4.8.11.orig/misc/syntax/spec.syntax 2014-01-01 19:18:39.000000000 +0000 ++++ mc-4.8.11/misc/syntax/spec.syntax 2014-01-01 19:19:23.000000000 +0000 @@ -35,6 +35,7 @@ context default keyword whole Source\[0123456789\]: green keyword whole Suggests: green @@ -10,16 +15,12 @@ Index: misc/syntax/spec.syntax keyword whole Vendor: green keyword whole Version: green keyword whole U\{Rr\}\{Ll\}: green -Index: src/vfs/extfs/helpers/rpm +Index: mc-4.8.11/src/vfs/extfs/helpers/rpm =================================================================== ---- src/vfs/extfs/helpers/rpm.orig -+++ src/vfs/extfs/helpers/rpm -@@ -153,8 +153,14 @@ mcrpmfs_list_fastRPM () - echo "$FILEPREF 0 $DATE INFO/EPOCH" - echo "$FILEPREF 0 $DATE INFO/LICENSE" - echo "$FILEPREF 0 $DATE INFO/REQUIRENAME" -+ echo "$FILEPREF 0 $DATE INFO/ENHANCES" -+ echo "$FILEPREF 0 $DATE INFO/SUGGESTS" +--- mc-4.8.11.orig/src/vfs/extfs/helpers/rpm 2014-01-01 19:19:23.000000000 +0000 ++++ mc-4.8.11/src/vfs/extfs/helpers/rpm 2014-01-01 19:26:43.000000000 +0000 +@@ -159,6 +159,10 @@ mcrpmfs_list_fastRPM () + echo "$FILEPREF 0 $DATE INFO/REQUIRES" echo "$FILEPREF 0 $DATE INFO/OBSOLETES" echo "$FILEPREF 0 $DATE INFO/PROVIDES" + echo "$FILEPREF 0 $DATE INFO/ENHANCES" @@ -29,14 +30,14 @@ Index: src/vfs/extfs/helpers/rpm echo "$FILEPREF 0 $DATE INFO/CONFLICTS" echo "$FILEPREF 0 $DATE INFO/CHANGELOG" } -@@ -272,6 +278,10 @@ mcrpmfs_copyout () +@@ -294,6 +298,10 @@ mcrpmfs_copyout () INFO/LICENSE) mcrpmfs_getOneTag "LICENSE" >"$2"; exit 0;; INFO/RPMVERSION) mcrpmfs_getRawOneTag "%{RPMVERSION}\n" >"$2"; exit 0;; - INFO/REQUIRENAME) mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;; + INFO/REQUIRES) mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;; + INFO/ENHANCES) mcrpmfs_getRawOneTag "[%|ENHANCESFLAGS:depflag_strong?{}:{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;; + INFO/SUGGESTS) mcrpmfs_getRawOneTag "[%|SUGGESTSFLAGS:depflag_strong?{}:{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;; + INFO/RECOMMENDS) mcrpmfs_getRawOneTag "[%|SUGGESTSFLAGS:depflag_strong?{%{SUGGESTSNAME} %{SUGGESTSFLAGS:depflags} %{SUGGESTSVERSION}\n}|]" "$f" >"$3"; exit 0;; + INFO/SUPPLEMENTS) mcrpmfs_getRawOneTag "[%|ENHANCESFLAGS:depflag_strong?{%{ENHANCESNAME} %{ENHANCESFLAGS:depflags} %{ENHANCESVERSION}\n}|]" "$f" >"$3"; exit 0;; - INFO/PROVIDES) mcrpmfs_getRawOneTag "[%{PROVIDES}\n]" >"$2"; exit 0;; + INFO/PROVIDES) mcrpmfs_getRawOneTag "[%{PROVIDES} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}\n]" >"$2"; exit 0;; INFO/SCRIPTS/PREIN) mcrpmfs_getRawOneTag "%{RPMTAG_PREIN}\n" >"$2"; exit 0;; - INFO/SCRIPTS/POSTIN) mcrpmfs_getRawOneTag "%{RPMTAG_POSTIN}\n" >"$2"; exit 0;; + INFO/SCRIPTS/PREINPROG) mcrpmfs_getRawOneTag "%{RPMTAG_PREINPROG}\n" >"$2"; exit 0;; diff --git a/mc.changes b/mc.changes index fdb810b..7edfb0b 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Wed Jan 1 19:48:54 UTC 2014 - andreas.stieger@gmx.de + +- update to 4.8.11: + - Core + * Live update of panels size when editing layout + * Support "Compute totals" option in move file operation + - VFS + * rpm extfs + - show dependency version + - support tar payload + - improve support for EPOCH tag + - add support for PREINPROG/POSTINPROG/PREUNPROG/POSTUNPROG, + VERIFYSCRIPTPROG and TRIGGERSCRIPTS/TRIGGERSCRIPTPROG tags + - Editor + * Support "bracketed paste mode" of xterm + * Clarify Java syntax highlighting + - Misc + * Print warnings about unknown '--with-' / '--enable-' configure options + * Code cleanup and refactoring + - Fixes: + * Segfault while moving files + * Broken handling of mc command line arguments + * Copy/move doesn't work if num_history_items_recorded=0 + * No subdir path completion in current dir, if stub is not starting with './' + * Deprecated "find -perm +xxx" syntax is used + * Home, End, Shift-Fn keys don't work in tmux + * Improper [en|dis]abling of layout dialog split adjustment buttons + * Bogus strings in 'Confirmation' config dialog + * "Configure options" first entry not highlighted + * "Setup saved to ~/.config/mc/ini" message is misleading + * Typo in mc.lib: "less=%filename +%linenog" instead of "+%lineno" + * Wrong order of filename and line number for external editor + * mcedit: tabs are lost when text is pasted + * mcedit: question on large file treats Escape as Yes + * Broken case-sensitive search in editor/viewer/diffviewer + * Changes to files in nested .zip archives are lost + * Incorrect handling of filenames with spaces with unrar v5 + * iso9660 VFS: filenames truncating in ISO file listing + * vfs_path_from_str_flags() doesn't support VPF_STRIP_HOME + * Bright colors are used as background colors in 16-color skins + * Various defects in documentation +- removed patches: + * mc-extfs-helpers-urar.patch, committed upstream +- modified patches: + * mc-extfs-iso9660-xorriso.patch, adjust for upstream change + * mc-multi-press-f-keys.patch, remove fuzz + * mc-rpm.patch, adjust for upstream change in context + ------------------------------------------------------------------- Thu Dec 12 12:10:32 UTC 2013 - dnh@opensuse.org diff --git a/mc.spec b/mc.spec index a15736d..f3d994b 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ # # spec file for package mc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Summary: Midnight Commander License: GPL-3.0+ Group: Productivity/File utilities Url: http://www.midnight-commander.org/ -Version: 4.8.10 +Version: 4.8.11 Release: 0.0 Source: http://ftp.midnight-commander.org/mc-%{version}.tar.xz Source1: x11_browser @@ -43,10 +43,6 @@ Patch17: mc-rpm.patch Patch20: mc-f-keys.patch Patch21: mc-extfs-helpers-deb.patch -# add mc-extfs-helpers-urar.patch (by dnh@opensuse.org) - Fix urar -# extfs failing on files with spaces (bnc#849082). Forwarded to upstream. -# see http://www.midnight-commander.org/ticket/3073 -Patch22: mc-extfs-helpers-urar.patch # add mc-extfs-iso9660-xorriso.patch # fixing iso9660 extfs directory handling using xorriso # http://www.midnight-commander.org/ticket/3122 @@ -117,16 +113,15 @@ isoinfo (from mkisofs) or xorriso for the iso:// extension. %patch71 %patch12 %patch16 -%patch17 +%patch17 -p1 %patch18 %patch20 %patch21 -%patch22 -p1 %patch23 -p1 %patch24 %patch31 %patch32 -%patch41 +%patch41 -p1 %patch52 -p1 %patch60 -p1