From b575a4c14297db9ebdce2dea7aa429bef94b94c90813d10ba2a144c6f4478500 Mon Sep 17 00:00:00 2001 From: Brian White Date: Wed, 16 Jan 2019 01:08:34 +0000 Subject: [PATCH] Accepting request 666258 from home:adamm:branches:Base:System - update to 4.8.22 * Core - Support BTRFS's file clone operation - Find file: show pattern and content in the results window title - Find file: remember state (empty or not) of Content field - Improve support IBM i - Improve handling of hard link creation errors - Support user-defined prompt in the Fish subshell * VFS - sftp: preserve atime and mtime (#3917) * Editor - man page cleanup (#3918) - syntax: PHP - highlight keyword 'null' (#3920) Meson - initial implementation (#3940) * Misc - ext.d: use MPV as a fallback for mplayer -identify (#3919) - ext.d: improve recognition of MS Office formats (#3929) * Fixes - "Cannot create target file" when target has backslash space in the name (#3923) - Quiet single file overwrite (#3908) - Show error message for each not-installed program when view documents in MS Word and Excel formats (#3926) - Crash when trying some sftp connections (#3937) - Crash when return to filemanager from subshell (#3943) - mc-extd-doc.patch: refreshed - mc-extd-video.patch: refreshed - mc-vfs-fish-deleted_source_file.patch: refreshed - xls2csv_update.patch: refreshed OBS-URL: https://build.opensuse.org/request/show/666258 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=124 --- mc-4.8.21.sha256 | 2 -- mc-4.8.21.tar.xz | 3 -- mc-4.8.22.sha256 | 2 ++ mc-4.8.22.tar.xz | 3 ++ mc-extd-doc.patch | 34 +++++++++++-------- mc-extd-video.patch | 27 ++++++--------- mc-vfs-fish-deleted_source_file.patch | 48 +++++++++++++++------------ mc.changes | 40 +++++++++++++++++++++- mc.spec | 4 +-- xls2csv_update.patch | 18 +++++----- 10 files changed, 112 insertions(+), 69 deletions(-) delete mode 100644 mc-4.8.21.sha256 delete mode 100644 mc-4.8.21.tar.xz create mode 100644 mc-4.8.22.sha256 create mode 100644 mc-4.8.22.tar.xz diff --git a/mc-4.8.21.sha256 b/mc-4.8.21.sha256 deleted file mode 100644 index 7257920..0000000 --- a/mc-4.8.21.sha256 +++ /dev/null @@ -1,2 +0,0 @@ -251d9f0ef9309ef3eea0fdc4c12b8b61149e5056bef1b2de2ccc7f015d973444 mc-4.8.21.tar.bz2 -8f37e546ac7c31c9c203a03b1c1d6cb2d2f623a300b86badfd367e5559fe148c mc-4.8.21.tar.xz diff --git a/mc-4.8.21.tar.xz b/mc-4.8.21.tar.xz deleted file mode 100644 index 6e6f1c0..0000000 --- a/mc-4.8.21.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f37e546ac7c31c9c203a03b1c1d6cb2d2f623a300b86badfd367e5559fe148c -size 2528292 diff --git a/mc-4.8.22.sha256 b/mc-4.8.22.sha256 new file mode 100644 index 0000000..7c24076 --- /dev/null +++ b/mc-4.8.22.sha256 @@ -0,0 +1,2 @@ +8d9f1c75369967adfd317a05fef9861444ed049b033e4debaeaafc6df218b431 mc-4.8.22.tar.bz2 +ee7868d7ba0498cf2cccefe107d7efee7f2571098806bba2aed5a159db801318 mc-4.8.22.tar.xz diff --git a/mc-4.8.22.tar.xz b/mc-4.8.22.tar.xz new file mode 100644 index 0000000..9b5d90a --- /dev/null +++ b/mc-4.8.22.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee7868d7ba0498cf2cccefe107d7efee7f2571098806bba2aed5a159db801318 +size 2538524 diff --git a/mc-extd-doc.patch b/mc-extd-doc.patch index 8b0b795..2e31eb7 100644 --- a/mc-extd-doc.patch +++ b/mc-extd-doc.patch @@ -1,16 +1,22 @@ ---- misc/ext.d/doc.sh.in.orig 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/doc.sh.in 2013-03-10 08:03:31.889494487 +0400 -@@ -50,3 +50,3 @@ +Index: misc/ext.d/doc.sh.in +=================================================================== +--- misc/ext.d/doc.sh.in.orig ++++ misc/ext.d/doc.sh.in +@@ -52,7 +52,7 @@ do_view_action() { + fi + ;; msdoc) -- which wvHtml >/dev/null 2>&1 && -+ which wvHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1 && - { -@@ -57,2 +57,3 @@ - } || \ -+ wvText "${MC_EXT_FILENAME}" - || \ - antiword -t "${MC_EXT_FILENAME}" || \ -@@ -63,3 +64,3 @@ - msxls) -- which xlHtml >/dev/null 2>&1 && { -+ which xlHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1 && { +- if wvHtml >/dev/null 2>&1; then ++ if wvHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1; then tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX` + wvHtml "${MC_EXT_FILENAME}" --targetdir="$tmp" page.html + elinks -dump "$tmp/page.html" +@@ -68,7 +68,7 @@ do_view_action() { + fi + ;; + msxls) +- if xlhtml >/dev/null 2>&1; then ++ if xlhtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1; then + tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX` + xlhtml -a "${MC_EXT_FILENAME}" > "$tmp/page.html" + elinks -dump "$tmp/page.html" diff --git a/mc-extd-video.patch b/mc-extd-video.patch index a31b9db..9d7c5c7 100644 --- a/mc-extd-video.patch +++ b/mc-extd-video.patch @@ -1,6 +1,8 @@ ---- misc/ext.d/video.sh.orig 2012-12-27 12:13:20.000000000 +0400 -+++ misc/ext.d/video.sh 2013-03-09 12:29:54.845011661 +0400 -@@ -6,7 +6,18 @@ +Index: misc/ext.d/video.sh +=================================================================== +--- misc/ext.d/video.sh.orig ++++ misc/ext.d/video.sh +@@ -6,14 +6,27 @@ action=$1 filetype=$2 @@ -20,20 +22,13 @@ do_view_action() { filetype=$1 -@@ -13,8 +13,14 @@ case "${filetype}" in *) -- mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | \ -- sed -n 's/^ID_//p' +- if mplayer >/dev/null 2>&1; then + if type -p mediainfo >/dev/null 2>&1 ; then -+ mediainfo "${MC_EXT_FILENAME}" -+ elif type -p mplayer >/dev/null 2>&1 ; then -+ mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | \ -+ sed -n 's/^ID_//p' -+ else -+ file "${MC_EXT_FILENAME}" -+ fi - ;; - esac - } ++ mediainfo "${MC_EXT_FILENAME}" ++ elif mplayer >/dev/null 2>&1; then + mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | \ + sed -n 's/^ID_//p' + elif which mpv_identify.sh >/dev/null 2>&1; then diff --git a/mc-vfs-fish-deleted_source_file.patch b/mc-vfs-fish-deleted_source_file.patch index c946317..0278567 100644 --- a/mc-vfs-fish-deleted_source_file.patch +++ b/mc-vfs-fish-deleted_source_file.patch @@ -1,7 +1,8 @@ -diff -rup mc-4.8.11.orig/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c ---- mc-4.8.11.orig/src/filemanager/file.c 2013-11-29 19:27:07.000000000 +0100 -+++ mc-4.8.11/src/filemanager/file.c 2014-01-14 00:09:30.540439661 +0100 -@@ -1923,6 +1923,8 @@ copy_file_file (FileOpTotalContext * tct +Index: mc-4.8.22/src/filemanager/file.c +=================================================================== +--- mc-4.8.22.orig/src/filemanager/file.c ++++ mc-4.8.22/src/filemanager/file.c +@@ -2662,6 +2662,8 @@ copy_file_file (file_op_total_context_t continue; if (temp_status == FILE_ABORT) return_status = temp_status; @@ -10,8 +11,8 @@ diff -rup mc-4.8.11.orig/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c if (temp_status == FILE_SKIPALL) ctx->skip_all = TRUE; break; -@@ -1933,6 +1933,8 @@ copy_file_file (FileOpTotalContext * tct - temp_status = file_error (_("Cannot close target file \"%s\"\n%s"), dst_path); +@@ -2672,6 +2674,8 @@ copy_file_file (file_op_total_context_t + temp_status = file_error (TRUE, _("Cannot close target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_RETRY) continue; + if (temp_status == FILE_SKIP) @@ -19,7 +20,7 @@ diff -rup mc-4.8.11.orig/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c if (temp_status == FILE_SKIPALL) ctx->skip_all = TRUE; return_status = temp_status; -@@ -1959,10 +1959,10 @@ copy_file_file (FileOpTotalContext * tct +@@ -2698,10 +2702,10 @@ copy_file_file (file_op_total_context_t if (temp_status == FILE_SKIPALL) { ctx->skip_all = TRUE; @@ -32,7 +33,7 @@ diff -rup mc-4.8.11.orig/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c break; } } -@@ -1979,10 +1979,10 @@ copy_file_file (FileOpTotalContext * tct +@@ -2719,10 +2723,10 @@ copy_file_file (file_op_total_context_t if (temp_status == FILE_SKIPALL) { ctx->skip_all = TRUE; @@ -45,10 +46,11 @@ diff -rup mc-4.8.11.orig/src/filemanager/file.c mc-4.8.11/src/filemanager/file.c break; } } -diff -rup mc-4.8.11.orig/src/vfs/fish/fishdef.h mc-4.8.11/src/vfs/fish/fishdef.h ---- mc-4.8.11.orig/src/vfs/fish/fishdef.h 2013-04-10 22:04:31.000000000 +0200 -+++ mc-4.8.11/src/vfs/fish/fishdef.h 2014-01-13 23:54:30.773582204 +0100 -@@ -145,13 +145,19 @@ +Index: mc-4.8.22/src/vfs/fish/fishdef.h +=================================================================== +--- mc-4.8.22.orig/src/vfs/fish/fishdef.h ++++ mc-4.8.22/src/vfs/fish/fishdef.h +@@ -149,13 +149,19 @@ "FILESIZE=${FISH_FILESIZE}\n" \ "#STOR $FILESIZE $FILENAME\n" \ "echo \"### 001\"\n" \ @@ -69,9 +71,10 @@ diff -rup mc-4.8.11.orig/src/vfs/fish/fishdef.h mc-4.8.11/src/vfs/fish/fishdef.h /* default 'appe' script */ #define FISH_APPEND_DEF_CONTENT "" \ -diff -rup mc-4.8.11.orig/src/vfs/fish/helpers/chmod mc-4.8.11/src/vfs/fish/helpers/chmod ---- mc-4.8.11.orig/src/vfs/fish/helpers/chmod 2013-04-10 22:04:31.000000000 +0200 -+++ mc-4.8.11/src/vfs/fish/helpers/chmod 2014-01-13 23:54:30.773582204 +0100 +Index: mc-4.8.22/src/vfs/fish/helpers/chmod +=================================================================== +--- mc-4.8.22.orig/src/vfs/fish/helpers/chmod ++++ mc-4.8.22/src/vfs/fish/helpers/chmod @@ -1,6 +1,7 @@ #CHMOD $FISH_FILEMODE $FISH_FILENAME -if chmod ${FISH_FILEMODE} "/${FISH_FILENAME}" 2>/dev/null; then @@ -83,9 +86,10 @@ diff -rup mc-4.8.11.orig/src/vfs/fish/helpers/chmod mc-4.8.11/src/vfs/fish/helpe +else + echo "### 000" fi -diff -rup mc-4.8.11.orig/src/vfs/fish/helpers/chown mc-4.8.11/src/vfs/fish/helpers/chown ---- mc-4.8.11.orig/src/vfs/fish/helpers/chown 2013-04-10 22:04:31.000000000 +0200 -+++ mc-4.8.11/src/vfs/fish/helpers/chown 2014-01-13 23:54:30.774582155 +0100 +Index: mc-4.8.22/src/vfs/fish/helpers/chown +=================================================================== +--- mc-4.8.22.orig/src/vfs/fish/helpers/chown ++++ mc-4.8.22/src/vfs/fish/helpers/chown @@ -1,6 +1,7 @@ #CHOWN $FISH_FILEOWNER:$FISH_FILEGROUP $FISH_FILENAME -if chown ${FISH_FILEOWNER}:${FISH_FILEGROUP} "/${FISH_FILENAME}" ; then @@ -97,9 +101,10 @@ diff -rup mc-4.8.11.orig/src/vfs/fish/helpers/chown mc-4.8.11/src/vfs/fish/helpe +else + echo "### 000" fi -diff -rup mc-4.8.11.orig/src/vfs/fish/helpers/send mc-4.8.11/src/vfs/fish/helpers/send ---- mc-4.8.11.orig/src/vfs/fish/helpers/send 2013-04-10 22:04:31.000000000 +0200 -+++ mc-4.8.11/src/vfs/fish/helpers/send 2014-01-13 23:54:30.774582155 +0100 +Index: mc-4.8.22/src/vfs/fish/helpers/send +=================================================================== +--- mc-4.8.22.orig/src/vfs/fish/helpers/send ++++ mc-4.8.22/src/vfs/fish/helpers/send @@ -1,6 +1,9 @@ #STOR $FISH_FILESIZE $FISH_FILENAME FILENAME="/${FISH_FILENAME}" @@ -117,4 +122,3 @@ diff -rup mc-4.8.11.orig/src/vfs/fish/helpers/send mc-4.8.11/src/vfs/fish/helper +else + echo "### 500" +fi - diff --git a/mc.changes b/mc.changes index f85d7ef..ed5f205 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Tue Jan 15 13:37:27 UTC 2019 - adam.majer@suse.de + +- update to 4.8.22 + * Core + - Support BTRFS's file clone operation + - Find file: show pattern and content in the results window title + - Find file: remember state (empty or not) of Content field + - Improve support IBM i + - Improve handling of hard link creation errors + - Support user-defined prompt in the Fish subshell + + * VFS - sftp: preserve atime and mtime (#3917) + + * Editor + - man page cleanup (#3918) + - syntax: + PHP - highlight keyword 'null' (#3920) + Meson - initial implementation (#3940) + * Misc + - ext.d: use MPV as a fallback for mplayer -identify (#3919) + - ext.d: improve recognition of MS Office formats (#3929) + + * Fixes + - "Cannot create target file" when target has backslash space + in the name (#3923) + - Quiet single file overwrite (#3908) + - Show error message for each not-installed program when view + documents in MS Word and Excel formats (#3926) + - Crash when trying some sftp connections (#3937) + - Crash when return to filemanager from subshell (#3943) + +- mc-extd-doc.patch: refreshed +- mc-extd-video.patch: refreshed +- mc-vfs-fish-deleted_source_file.patch: refreshed +- xls2csv_update.patch: refreshed + ------------------------------------------------------------------- Tue Jun 26 10:33:31 UTC 2018 - adam.majer@suse.de @@ -36,7 +73,8 @@ Tue Jun 5 17:27:40 UTC 2018 - ecsos@opensuse.org * mc.ext: allow Java class files to be viewed even if JAD isn't on PATH (MidnightCommander/mc#134) * mcedit: broken extended key mode (#3897) * mcedit doesn't save all opened files (#3898) - * extfs: sftps: -31 SFTP Protocol Error when transferring file (#3406) + * extfs: sftps: -31 SFTP Protocol Error when transferring file + (#3406, bsc#1119302) * extfs: rpm: truncated script content in the viewer (#3865) * extfs: rpm helper misses CONFLICTS field (#3789) diff --git a/mc.spec b/mc.spec index c14607b..0f8be63 100644 --- a/mc.spec +++ b/mc.spec @@ -1,7 +1,7 @@ # # spec file for package mc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX 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-or-later Group: Productivity/File utilities Url: http://midnight-commander.org/ -Version: 4.8.21 +Version: 4.8.22 Release: 0 Source0: http://ftp.midnight-commander.org/mc-%{version}.tar.xz Source1: x11_browser diff --git a/xls2csv_update.patch b/xls2csv_update.patch index 0ee7cbb..026317d 100644 --- a/xls2csv_update.patch +++ b/xls2csv_update.patch @@ -2,16 +2,16 @@ Author: Adam Majer Upstream: http://midnight-commander.org/ticket/3912 Bugzilla: 1087708 -Index: mc-4.8.11/misc/ext.d/doc.sh.in +Index: mc-4.8.22/misc/ext.d/doc.sh.in =================================================================== ---- mc-4.8.11.orig/misc/ext.d/doc.sh.in -+++ mc-4.8.11/misc/ext.d/doc.sh.in -@@ -68,7 +68,7 @@ do_view_action() { +--- mc-4.8.22.orig/misc/ext.d/doc.sh.in ++++ mc-4.8.22/misc/ext.d/doc.sh.in +@@ -74,7 +74,7 @@ do_view_action() { elinks -dump "$tmp/page.html" rm -rf "$tmp" - } || \ -- xls2csv "${MC_EXT_FILENAME}" || \ -+ xls2csv -c - -x "${MC_EXT_FILENAME}" || \ + elif xls2csv >/dev/null 2>&1; then +- xls2csv "${MC_EXT_FILENAME}" ++ xls2csv -c - -x "${MC_EXT_FILENAME}" + else strings "${MC_EXT_FILENAME}" - ;; - dvi) + fi