Hello community, here is the log from the commit of package mc.3308 for openSUSE:12.3:Update checked in at 2014-12-18 11:51:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/mc.3308 (Old) and /work/SRC/openSUSE:12.3:Update/.mc.3308.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mc.3308" Changes: -------- New Changes file: --- /dev/null 2014-12-10 22:29:50.188034256 +0100 +++ /work/SRC/openSUSE:12.3:Update/.mc.3308.new/mc.changes 2014-12-18 11:50:27.000000000 +0100 @@ -0,0 +1,1340 @@ +------------------------------------------------------------------- +Wed Dec 10 10:09:21 UTC 2014 - [email protected] + +- maintenance update / push to 12.3 cf. e.g + https://bugzilla.novell.com/show_bug.cgi?id=856501 + +Sat Sep 6 01:40:44 UTC 2014 - [email protected] + +- remove file mc-Syntax.cmake.patch / cmds in .spec +- remove file mc-vfs_fish_helpers_ls-formatstring.diff + (extraneous patches seem to cause factory-auto to decline the submit) + cf. e.g. https://build.opensuse.org/request/show/247789 + +------------------------------------------------------------------- +Fri Sep 5 18:37:47 UTC 2014 - [email protected] + +- update to 4.8.13 + various bugfixes and minor improvements, see NEWS file for details +- comment out mc-Syntax.cmake.patch, fixed upstream, to be removed + +------------------------------------------------------------------- +Wed Apr 2 19:35:48 UTC 2014 - [email protected] + +- update to 4.8.12 +- remove mc-vfs_fish_helpers_ls-formatstring.diff (fixed upstream) +- change mc-extfs-iso9660-xorriso.patch to work with upstream fix + +------------------------------------------------------------------- +Sat Mar 15 15:35:23 UTC 2014 - [email protected] + +- fix bug ("%i" is not an appropriate format for off_t) in + mc-vfs_fish_helpers_ls-formatstring.diff, thanks to andrew_b + of upstream in mc-ticket:2983 + +Sat Mar 15 13:58:42 UTC 2014 - [email protected] + +- add mc-vfs_fish_helpers_ls-formatstring.diff + fixing possible format-string attack via filename + http://www.midnight-commander.org/ticket/2983 + until http://www.midnight-commander.org/ticket/3128 + is fixed, fish should stay disabled though! + +------------------------------------------------------------------- +Thu Jan 30 21:47:13 UTC 2014 - [email protected] + +- Spec metadata update, remove redundant %clean section, + do parallel build with %_smp_mflags + +------------------------------------------------------------------- +Tue Jan 14 03:37:35 UTC 2014 - [email protected] + +- add preliminary patch by Sebastian Siebert + mc-vfs-fish-deleted_source_file.patch + bnc#856501 and http://www.midnight-commander.org/ticket/3128 + +------------------------------------------------------------------- +Fri Jan 10 20:51:29 UTC 2014 - [email protected] + +- disable the ssh/fish vfs due to + http://www.midnight-commander.org/ticket/3128 and + https://bugzilla.novell.com/show_bug.cgi?id=856501 +- remove unneccessary build-dep on recode + +------------------------------------------------------------------- +Wed Jan 1 19:48:54 UTC 2014 - [email protected] + +- 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 - [email protected] + +- fix the iso9660 some more and fall back from xorriso to isoinfo as + xorriso fails on many DVD-iso files (well, that's UDF actually ..) + +------------------------------------------------------------------- +Thu Dec 12 10:02:02 UTC 2013 - [email protected] + +- add mc-extfs-iso9660-xorriso.patch + fixing iso9660 extfs directory handling using xorriso + see http://www.midnight-commander.org/ticket/3122 + +------------------------------------------------------------------- +Thu Nov 28 12:27:16 UTC 2013 - [email protected] + +- Reimplementation of mcrar5fs_list in vfs/extfs/helpers/urar using + 'unrar vt' fixing the "trailing space" problem with 'unrar [lv]' + closing http://www.midnight-commander.org/ticket/3073 and bnc#849082 + +------------------------------------------------------------------- +Mon Nov 25 22:45:29 UTC 2013 - [email protected] + +- What a ghastly %description ... Where'd that come from? ;) Fixed + with text from the README and a little added mention of Norton Cmdr + +------------------------------------------------------------------- +Mon Nov 25 22:12:19 UTC 2013 - [email protected] + +- What's with those "trailing spaces" for filenames with length <13? + +------------------------------------------------------------------- +Mon Nov 25 03:47:18 UTC 2013 - [email protected] + +- fix the urar patch (add trailing whitespace) (thanks to D. Werner again) + +------------------------------------------------------------------- +Sat Nov 23 18:11:35 UTC 2013 - [email protected] + +- fix the urar patch (thanks to D. Werner again) + +------------------------------------------------------------------- +Sat Nov 23 05:42:12 UTC 2013 - [email protected] + +- fix SLE* %post scriptlet error (%set_permissions not available) + +------------------------------------------------------------------- +Fri Nov 22 18:34:57 UTC 2013 - [email protected] + +- make urar-helper patch portable (tested with busybox awk) + +------------------------------------------------------------------- +Fri Nov 15 07:31:20 UTC 2013 - [email protected] + +- four argument ("seps") gawk split() is new in 4.0.0, so explicitly + require a gawk new enough + +------------------------------------------------------------------- +Tue Nov 12 21:09:36 UTC 2013 - [email protected] + +- add mc-extfs-helpers-urar.patch to fix urar extfs failing on files + with spaces when unrar5 is used (bnc#849082). Thanks to D. Werner + for finding the problem and proposing the fix. + +------------------------------------------------------------------- +Mon Sep 30 17:23:48 CEST 2013 - [email protected] + +- Fix invalid mc.png (IDAT TFB error). + +------------------------------------------------------------------- +Fri Sep 27 12:10:18 UTC 2013 - [email protected] + +- mc-startup-timeout.patch: reduce the timeout when a dns server does + not respond (bnc#824729) + +------------------------------------------------------------------- +Fri Aug 23 18:10:44 UTC 2013 - [email protected] + +- update to 4.8.10 +- remove patch90 mc-bf3034-zip_in_tar.diff, fixed upstream +- remove patch91 mc-bf3040-mcedit_fd_leak.diff, fixed upstream +- more bugfixes: #3041, #3043, #3047, #2713, #3036 + see https://www.midnight-commander.org/ticket/<BUGNO> +- add libssh2 for sftp + ++++ 1143 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.mc.3308.new/mc.changes New: ---- 02_ignore_ftp_chmod_error.patch 09_uzip_broken_528239.patch 20_wrong_path_to_wrappers.patch cmake.syntax mc-4.8.13.tar.xz mc-esc-seq.patch mc-ext-audio.patch mc-extd-doc.patch mc-extd-misc.patch mc-extd-sound.patch mc-extd-video.patch mc-extd-xdg.patch mc-extfs-helpers-deb.patch mc-extfs-iso9660-xorriso.patch mc-f-keys.patch mc-fix_lib_search_path.patch mc-multi-press-f-keys.patch mc-pie.patch mc-rpm.patch mc-rpmlintrc mc-startup-timeout.patch mc-vfs-fish-deleted_source_file.patch mc-wrapper.patch mc.changes mc.desktop mc.png mc.spec x11_browser ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mc.spec ++++++ # # spec file for package mc # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: mc Summary: Midnight Commander License: GPL-3.0+ Group: Productivity/File utilities Url: http://midnight-commander.org/ Version: 4.8.13 Release: 0 #Git-Clone: git://github.com/MidnightCommander/mc Source: http://ftp.midnight-commander.org/mc-%{version}.tar.xz Source1: x11_browser Source2: %{name}.desktop Source3: %{name}.png Source4: cmake.syntax Source5: mc-rpmlintrc Patch0: mc-fix_lib_search_path.patch Patch61: mc-extd-misc.patch Patch62: mc-extd-video.patch Patch63: mc-extd-doc.patch Patch64: mc-extd-sound.patch Patch69: mc-extd-xdg.patch Patch71: mc-ext-audio.patch Patch12: mc-wrapper.patch Patch16: mc-esc-seq.patch Patch17: mc-rpm.patch Patch20: mc-f-keys.patch Patch21: mc-extfs-helpers-deb.patch # add patch. bnc#856501 # http://www.midnight-commander.org/ticket/3128 Patch22: mc-vfs-fish-deleted_source_file.patch # changed mc-extfs-iso9660-xorriso.patch # to reflect upstream fix Patch23: mc-extfs-iso9660-xorriso.patch #debian fixes for vfs Patch24: 02_ignore_ftp_chmod_error.patch #Debian fixes Patch31: 09_uzip_broken_528239.patch Patch32: 20_wrong_path_to_wrappers.patch # PATCH-FIX-UPSTREAM mc-multi-press-f-keys.patch mc287 [email protected] - Fixed Esc + Numeral F-key emulation. Patch41: mc-multi-press-f-keys.patch # Patches from Fedora #Patch adding -fpie and -pie to compilation and linking of setuid binaries Patch52: mc-pie.patch # mc-startup-timeout.patch mc3082 [email protected] - fix for long timeout on startup, bnc#824729 Patch60: mc-startup-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audiofile-devel BuildRequires: e2fsprogs-devel BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: libtool %if 0%{?suse_version} > 1130 BuildRequires: gpm-devel %else BuildRequires: gpm %endif BuildRequires: indent BuildRequires: jpeg BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libssh2-devel BuildRequires: readline-devel BuildRequires: slang-devel BuildRequires: update-desktop-files BuildRequires: xdg-utils BuildRequires: xorg-x11-devel BuildRequires: xz Requires(pre): permissions Recommends: %{name}-lang = %{version} Recommends: mkisofs xorriso %description GNU Midnight Commander (also referred to as MC) is a user shell much like the (in)famous Norton Commander with text-mode full-screen interface. It can be run on the OS console, in xterm and other terminal emulators. GNU Midnight Commander allows you to manage files while making most of your screen and giving you a clear representation of the filesystem, yet it's simple enough to be run over a telnet or ssh session. MC needs several other programs for its various extfs extensions, e.g. isoinfo (from mkisofs) or xorriso for the iso:// extension. %lang_package %prep %setup -q %patch0 %patch61 %patch62 %patch63 %patch64 %patch69 %patch71 %patch12 %patch16 %patch17 -p1 %patch20 %patch21 %patch22 -p1 %patch23 -p0 %patch24 %patch31 %patch32 %patch41 -p1 %patch52 -p1 %patch60 -p1 %build autoreconf --force --install %define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter export CFLAGS="$RPM_OPT_FLAGS %{warn_flags}" export X11_WWW="%{_datadir}/mc/x11_browser" %configure \ --localstatedir=/var/lib \ --enable-charset \ --enable-vfs-smb --with-smb-configdir=%{_sysconfdir}/samba \ --disable-vfs-fish make %{?_smp_mflags} V=1 %install make DESTDIR=%{buildroot} install # clean up this setuid problem for now chmod 755 %{buildroot}/%{_libexecdir}/mc/cons.saver install -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/mc/syntax/ #install the shell functions for bourne shell and csh mkdir -p %{buildroot}%{_sysconfdir}/profile.d ln -fs -t %{buildroot}%{_sysconfdir}/profile.d %{_datadir}/mc/mc.{,c}sh #support script for calling available GUI webbrosers install -m 755 %{SOURCE1} %{buildroot}%{_datadir}/mc/ install -D -m 644 %{S:3} %{buildroot}%{_datadir}/pixmaps/%{name}.png install -D -m 644 %{S:3} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png for f in ext.d/misc.sh ext.d/sound.sh ext.d/video.sh \ extfs.d/gitfs+ extfs.d/uace extfs.d/uarc ; do sed -i -e '1s@bin/sh@bin/bash@' "%{buildroot}%{_libexecdir}/mc/${f}" done %suse_update_desktop_file -i %name System FileManager # Remove not supported language rm -rf %{buildroot}%{_datadir}/locale/be@tarask %find_lang %name %fdupes -s %{buildroot}%{_prefix} %post %if 0%{?suse_version} >= 1140 %set_permissions %{_libexecdir}/mc/cons.saver %else %run_permissions %endif %verifyscript %verify_permissions -e %{_libexecdir}/mc/cons.saver %files %defattr(-, root, root) %doc ABOUT-NLS COPYING NEWS README %config %{_sysconfdir}/profile.d/* %{_bindir}/mc* %dir %{_sysconfdir}/mc/ %config %{_sysconfdir}/mc/filehighlight.ini %config %{_sysconfdir}/mc/sfs.ini %config %{_sysconfdir}/mc/mc.menu %config %{_sysconfdir}/mc/mc.ext ###config #{_sysconfdir}/mc/edit.spell.rc %config %{_sysconfdir}/mc/mcedit.menu %config %{_sysconfdir}/mc/mc.keymap %config %{_sysconfdir}/mc/mc.default.keymap %config %{_sysconfdir}/mc/mc.emacs.keymap %config %{_sysconfdir}/mc/edit.indent.rc %dir %{_libexecdir}/mc %{_libexecdir}/mc/ext.d %{_libexecdir}/mc/extfs.d %verify(not mode) %{_libexecdir}/mc/cons.saver %{_mandir}/man1/* %exclude %{_mandir}/*/man1/* %{_datadir}/mc %{_datadir}/mc/syntax/Syntax %{_datadir}/mc/mc.charsets %{_datadir}/mc/mc.lib %{_datadir}/mc/hints/mc.hint %exclude %{_datadir}/mc/hints/mc.hint.* %{_datadir}/mc/help/mc.hlp %exclude %{_datadir}/mc/help/mc.hlp.* %exclude %{_sysconfdir}/mc/mc.menu.* %exclude %{_datadir}/locale/*/LC_MESSAGES/mc.mo %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/32x32 %dir %{_datadir}/icons/hicolor/32x32/apps %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %exclude %{_sysconfdir}/mc/mc.menu.* %files lang -f %name.lang %defattr(-, root, root) %if 0%{?suse_version} < 1140 || 0%{?sles_version} && 0%{?sles_version} <= 11 %lang(sv) %dir %{_datadir}/locale/sv_SE %lang(sv) %dir %{_datadir}/locale/sv_SE/LC_MESSAGES %lang(szl) %dir %{_datadir}/locale/szl %lang(szl) %dir %{_datadir}/locale/szl/LC_MESSAGES %endif %lang(hu) %dir %{_mandir}/hu/ %lang(hu) %dir %{_mandir}/hu/man1/ %lang(hu) %{_mandir}/hu/man1/mc.1.gz %lang(pl) %dir %{_mandir}/pl/ %lang(pl) %dir %{_mandir}/pl/man1/ %lang(pl) %{_mandir}/pl/man1/mc.1.gz %lang(sr) %dir %{_mandir}/sr/ %lang(sr) %dir %{_mandir}/sr/man1/ %lang(sr) %{_mandir}/sr/man1/mc.1.gz %lang(cs) %doc %{_datadir}/mc/*/mc.*.cs %lang(es) %doc %{_datadir}/mc/*/mc.*.es %lang(hu) %doc %{_datadir}/mc/*/mc.*.hu %lang(it) %doc %{_datadir}/mc/*/mc.*.it %lang(nl) %doc %{_datadir}/mc/*/mc.*.nl %lang(pl) %doc %{_datadir}/mc/*/mc.*.pl %lang(ru) %doc %{_datadir}/mc/*/mc.*.ru %lang(sr) %doc %{_datadir}/mc/*/mc.*.sr %lang(uk) %doc %{_datadir}/mc/*/mc.*.uk %lang(zh) %doc %{_datadir}/mc/*/mc.*.zh %changelog ++++++ 02_ignore_ftp_chmod_error.patch ++++++ Index: src/vfs/ftpfs/ftpfs.c =================================================================== --- src/vfs/ftpfs/ftpfs.c.orig +++ src/vfs/ftpfs/ftpfs.c @@ -1987,7 +1987,7 @@ ftpfs_chmod (struct vfs_class *me, const g_snprintf (buf, sizeof (buf), "SITE CHMOD %4.4o /%%s", (int) (mode & 07777)); - ret = ftpfs_send_command (vpath, buf, OPT_FLUSH); + ret = ftpfs_send_command (vpath, buf, OPT_FLUSH | OPT_IGNORE_ERROR); return ftpfs_ignore_chattr_errors ? 0 : ret; } ++++++ 09_uzip_broken_528239.patch ++++++ Description: Fix fails to display zip file contents after unzip update Bug-Debian: http://bugs.debian.org/528239 Author: Johannes Stezenbach <[email protected]> Author: Yury V. Zaytsev <[email protected]> --- src/vfs/extfs/helpers/uzip.in 2010-02-25 11:51:39.000000000 +0100 +++ src/vfs/extfs/helpers/uzip.in 2010-03-17 10:43:37.000000000 +0100 @@ -19,7 +19,7 @@ # Location of the unzip program my $app_unzip = "@UNZIP@"; # Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0. -my $op_has_zipinfo = @HAVE_ZIPINFO@; +my $op_has_zipinfo = 1; # Command used to list archives (zipinfo mode) my $cmd_list_zi = "$app_unzip -Z -l -T"; ++++++ 20_wrong_path_to_wrappers.patch ++++++ Description: Fix wrong path to the wrapper script Bug-Debian: http://bugs.debian.org/540238 Author: Denis Briand <[email protected]> Author: Jindřich Makovička Index: contrib/mc.csh.in =================================================================== --- contrib/mc.csh.in.orig 2010-07-05 21:12:51.000000000 +0200 +++ contrib/mc.csh.in 2010-07-07 18:54:54.616547000 +0200 @@ -1 +1 @@ -alias mc 'source @pkglibexecdir@/mc-wrapper.csh' +alias mc 'source @datadir@/mc/mc-wrapper.csh' Index: contrib/Makefile.am =================================================================== --- contrib/Makefile.am.orig 2010-07-05 21:12:51.000000000 +0200 +++ contrib/Makefile.am 2010-07-07 18:56:25.946339000 +0200 @@ -8,7 +8,7 @@ SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapp SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh pkglibexec_SCRIPTS = $(SCRIPTS_OUT) -pkglibexecdir = $(libexecdir)/@PACKAGE@ +pkglibexecdir = $(datadir)/@PACKAGE@ cfgdir = $(sysconfdir)/@PACKAGE@ cfg_DATA = \ ++++++ cmake.syntax ++++++ # CMake syntax # Author: Henrik Pauli <[email protected]> # Author: Emil Biserov <[email protected]> caseinsensitive context default keyword \( brightcyan keyword \) brightcyan ### Commands ################################################################## keyword whole add_custom_command yellow keyword whole add_custom_target yellow keyword whole add_definitions yellow keyword whole add_dependencies yellow keyword whole add_executable yellow keyword whole add_library yellow keyword whole add_subdirectory yellow keyword whole add_test yellow keyword whole aux_source_directory yellow keyword whole break magenta keyword whole build_command yellow keyword whole cmake_minimum_required yellow keyword whole cmake_policy yellow keyword whole configure_file yellow keyword whole create_test_sourcelist yellow keyword whole define_property yellow keyword whole else magenta keyword whole elseif magenta keyword whole enable_language yellow keyword whole enable_testing yellow keyword whole endforeach magenta keyword whole endfunction magenta keyword whole endif magenta keyword whole endmacro magenta keyword whole endwhile magenta keyword whole execute_process yellow keyword whole export yellow keyword whole file yellow keyword whole find_file yellow keyword whole find_library yellow keyword whole find_package yellow keyword whole find_path yellow keyword whole find_program yellow keyword whole fltk_wrap_ui yellow keyword whole foreach magenta keyword whole function magenta keyword whole get_cmake_property yellow keyword whole get_directory_property yellow keyword whole get_filename_component yellow keyword whole get_property yellow keyword whole get_source_file_property yellow keyword whole get_target_property yellow keyword whole get_test_property yellow keyword whole if magenta keyword whole include yellow keyword whole include_directories yellow keyword whole include_external_msproject yellow keyword whole include_regular_expression yellow keyword whole install yellow keyword whole link_directories yellow keyword whole list yellow keyword whole load_cache yellow keyword whole load_command yellow keyword whole macro magenta keyword whole mark_as_advanced yellow keyword whole math yellow keyword whole message yellow keyword whole option yellow keyword whole project yellow keyword whole qt_wrap_cpp yellow keyword whole qt_wrap_ui yellow keyword whole remove_definitions yellow keyword whole return yellow keyword whole separate_arguments yellow keyword whole set yellow keyword whole set_directory_properties yellow keyword whole set_property yellow keyword whole set_source_files_properties yellow keyword whole set_target_properties yellow keyword whole set_tests_properties yellow keyword whole site_name yellow keyword whole source_group yellow keyword whole string yellow keyword whole target_link_libraries yellow keyword whole try_compile yellow keyword whole try_run yellow keyword whole unset yellow keyword whole variable_watch yellow keyword whole while magenta ############################################################################### keyword ${\[^}\]+} brightgreen # keyword whole cpack_+ yellow # keyword whole get_+ yellow # keyword whole set_+ yellow # keyword whole target_+ yellow # keyword whole find_+ yellow # keyword whole file_+ yellow # keyword whole configure_+ yellow # keyword whole install yellow # keyword whole qt4_+ yellow keyword whole ON brightcyan keyword whole OFF brightcyan keyword whole TRUE brightcyan keyword whole FALSE brightcyan ############################################################################### ###context exclusive add_custom_command\( \) keyword whole OUTPUT white keyword whole COMMAND white keyword whole MAIN_DEPENDENCY white keyword whole DEPENDS white keyword whole IMPLICIT_DEPENDS white keyword whole WORKING_DIRECTORY white keyword whole COMMENT white keyword whole VERBATIM white keyword whole APPEND white ###context exclusive add_custom_target\( \) keyword whole ALL white keyword whole COMMAND white keyword whole DEPENDS white keyword whole WORKING_DIRECTORY white keyword whole COMMENT white keyword whole VERBATIM white keyword whole SOURCES white ###context exclusive add_executable\( \) keyword whole WIN32 white keyword whole MACOSX_BUNDLE white keyword whole EXCLUDE_FROM_ALL white keyword whole IMPORTED white keyword whole GLOBAL white ###context exclusive add_library\( \) keyword whole STATIC white keyword whole SHARED white keyword whole MODULE white keyword whole EXCLUDE_FROM_ALL white keyword whole UNKNOWN white keyword whole IMPORTED white keyword whole GLOBAL white keyword whole OBJECT white ###context exclusive add_subdirectory\( \) keyword whole EXCLUDE_FROM_ALL white ### context exclusive add_test\( \) keyword whole NAME white keyword whole CONFIGURATIONS white keyword whole WORKING_DIRECTORY white keyword whole COMMAND white # build_command # cmake_minimum_required # cmake_policy ### context exclusive configure_file\( \) keyword whole COPYONLY white keyword whole ESCAPE_QUOTES white keyword whole @ONLY white keyword whole NEWLINE_STYLE white keyword whole UNIX white keyword whole DOS white keyword whole WIN32 white keyword whole LF white keyword whole CRLF white # create_test_sourcelist ### context exclusive define_property\( \) keyword whole GLOBAL white keyword whole DIRECTORY white keyword whole TARGET white keyword whole SOURCE white keyword whole TEST white keyword whole VARIABLE white keyword whole CACHED_VARIABLE white keyword whole PROPERTY white keyword whole INHERITED white keyword whole BRIEF_DOCS white keyword whole FULL_DOCS white ### context exclusive enable_language\( \) keyword whole OPTIONAL white ### context exclusive execute_process\( \) keyword whole COMMAND white keyword whole WORKING_DIRECTORY white keyword whole TIMEOUT white keyword whole RESULT_VARIABLE white keyword whole OUTPUT_VARIABLE white keyword whole ERROR_VARIABLE white keyword whole INPUT_FILE white keyword whole OUTPUT_FILE white keyword whole ERROR_FILE white keyword whole OUTPUT_QUIET white keyword whole ERROR_QUIET white keyword whole OUTPUT_STRIP_TRAILING_WHITESPACE white keyword whole ERROR_STRIP_TRAILING_WHITESPACE white ### context exclusive export\( \) keyword whole TARGETS white keyword whole NAMESPACE white keyword whole APPEND white keyword whole FILE white ### context exclusive file\( \) keyword whole WRITE white keyword whole APPEND white keyword whole READ white keyword whole LIMIT white keyword whole OFFSET white keyword whole HEX white keyword whole MD5 white keyword whole SHA1 white keyword whole SHA224 white keyword whole SHA256 white keyword whole SHA384 white keyword whole SHA512 white keyword whole STRINGS white keyword whole LIMIT_COUNT white keyword whole LIMIT_INPUT white keyword whole LIMIT_OUTPUT white keyword whole LENGTH_MINIMUM white keyword whole LENGTH_MAXIMUM white keyword whole NEWLINE_CONSUME white keyword whole REGEX white keyword whole NO_HEX_CONVERSION white keyword whole GLOB white keyword whole GLOB_RECURSE white keyword whole RELATIVE white keyword whole FOLLOW_SYMLINKS white keyword whole RENAME white keyword whole REMOVE white keyword whole REMOVE_RECURSE white keyword whole MAKE_DIRECTORY white keyword whole RELATIVE_PATH white keyword whole TO_CMAKE_PATH white keyword whole TO_NATIVE_PATH white keyword whole DOWNLOAD white keyword whole INACTIVITY_TIMEOUT white keyword whole TIMEOUT white keyword whole STATUS white keyword whole LOG white keyword whole SHOW_PROGRESS white keyword whole EXPECTED_MD5 white keyword whole UPLOAD white keyword whole COPY white keyword whole INSTALL white keyword whole DESTINATION white keyword whole FILE_PERMISSIONS white keyword whole DIRECTORY_PERMISSIONS white keyword whole NO_SOURCE_PERMISSIONS white keyword whole USE_SOURCE_PERMISSIONS white keyword whole FILES_MATCHING white keyword whole PATTERN white keyword whole REGEX white keyword whole EXCLUDE white keyword whole PERMISSIONS white # find_file # find_library # find_package # find_path # find_program # fltk_wrap_ui # get_cmake_property # get_directory_property ### context exclusive get_filename_component\( \) keyword whole PATH white keyword whole ABSOLUTE white keyword whole NAME white keyword whole EXT white keyword whole NAME_WE white keyword whole REALPATH white keyword whole CACHE white keyword whole PROGRAM white keyword whole PROGRAM_ARGS white # get_property # get_source_file_property # get_target_property # get_test_property ### context exclusive if\( \) keyword whole NOT brightcyan keyword whole AND brightcyan keyword whole OR brightcyan keyword whole COMMAND brightcyan keyword whole POLICY brightcyan keyword whole TARGET brightcyan keyword whole EXISTS brightcyan keyword whole IS_NEWER_THAN brightcyan keyword whole IS_DIRECTORY brightcyan keyword whole IS_SYMLINK brightcyan keyword whole IS_ABSOLUTE brightcyan keyword whole MATCHES brightcyan keyword whole LESS brightcyan keyword whole GREATER brightcyan keyword whole EQUAL brightcyan keyword whole STRLESS brightcyan keyword whole STRGREATER brightcyan keyword whole STREQUAL brightcyan keyword whole VERSION_LESS brightcyan keyword whole VERSION_EQUAL brightcyan keyword whole VERSION_GREATER brightcyan keyword whole DEFINED brightcyan ### context exclusive include\( \) keyword whole OPTIONAL white keyword whole RESULT_VARIABLE white keyword whole NO_POLICY_SCOPE white # include_directories # include_external_msproject # include_regular_expression ###context exclusive install\( \) keyword whole TARGETS white keyword whole EXPORT white keyword whole ARCHIVE white keyword whole LIBRARY white keyword whole RUNTIME white keyword whole FRAMEWORK white keyword whole BUNDLE white keyword whole PRIVATE_HEADER white keyword whole PUBLIC_HEADER white keyword whole RESOURCE white keyword whole DESTINATION white keyword whole PERMISSIONS white keyword whole CONFIGURATIONS white keyword whole COMPONENT white keyword whole OPTIONAL white keyword whole NAMELINK_ONLY white keyword whole NAMELINK_SKIP white keyword whole FILES white keyword whole DESTINATION white keyword whole PERMISSIONS white keyword whole CONFIGURATIONS white keyword whole COMPONENT white keyword whole RENAME white keyword whole OPTIONAL white keyword whole OWNER_READ brightcyan keyword whole OWNER_WRITE brightcyan keyword whole OWNER_EXECUTE brightcyan keyword whole GROUP_READ brightcyan keyword whole GROUP_WRITE brightcyan keyword whole GROUP_EXECUTE brightcyan keyword whole WORLD_READ brightcyan keyword whole WORLD_WRITE brightcyan keyword whole WORLD_EXECUTE brightcyan keyword whole SETUID brightcyan keyword whole SETGID brightcyan ### FIXME: !!! install unfinished !!! # link_directories ###context exclusive list\( \) keyword whole LENGTH white keyword whole GET white keyword whole APPEND white keyword whole FIND white keyword whole INSERT white keyword whole REMOVE_ITEM white keyword whole REMOVE_AT white keyword whole REMOVE_DUPLICATES white keyword whole REVERSE white keyword whole SORT white # load_cache # load_command ### context exclusive mark_as_advanced\( \) keyword whole CLEAR white keyword whole FORCE white ### context exclusive math\( \) keyword whole EXPR white ### context exclusive message\( \) keyword whole STATUS white keyword whole WARNING white keyword whole AUTHOR_WARNING white keyword whole FATAL_ERROR white keyword whole SEND_ERROR white # qt_wrap_cpp # qt_wrap_ui # remove_definitions # separate_arguments ### context exclusive set\( \) keyword whole CACHE white keyword whole FORCE white keyword whole PARENT_SCOPE white # types keyword whole FILEPATH cyan keyword whole PATH cyan keyword whole STRING cyan keyword whole BOOL cyan keyword whole INTERNAL cyan # set_directory_properties # set_property # set_source_files_properties # set_target_properties # set_tests_properties # site_name # source_group ### context exclusive string\( \) keyword whole REGEX white keyword whole MATCH white keyword whole MATCHALL white keyword whole REPLACE white keyword whole MD5 white keyword whole SHA1 white keyword whole SHA224 white keyword whole SHA256 white keyword whole SHA384 white keyword whole SHA512 white keyword whole COMPARE white keyword whole EQUAL white keyword whole NOTEQUAL white keyword whole LESS white keyword whole GREATER white keyword whole ASCII white keyword whole CONFIGURE white keyword whole \@ONLY white keyword whole ESCAPE_QUOTES white keyword whole TOUPPER white keyword whole TOLOWER white keyword whole LENGTH white keyword whole SUBSTRING white keyword whole STRIP white keyword whole RANDOM white keyword whole LENGTH white keyword whole ALPHABET white keyword whole RANDOM_SEED white keyword whole FIND white keyword whole REVERSE white ### context exclusive target_link_libraries\( \) ### context exclusive try_compile\( \) keyword whole CMAKE_FLAGS white keyword whole OUTPUT_VARIABLE white keyword whole COMPILE_DEFINITIONS white keyword whole OUTPUT_VARIABLE white keyword whole COPY_FILE white ### context exclusive try_run\( \) keyword whole CMAKE_FLAGS white keyword whole COMPILE_DEFINITIONS white keyword whole COMPILE_OUTPUT_VARIABLE white keyword whole RUN_OUTPUT_VARIABLE white keyword whole OUTPUT_VARIABLE white keyword whole ARGS white ### context exclusive unset\( \) keyword whole CACHE white context # \n brown context " " green keyword ${\[^}\]+} brightgreen spellcheck ++++++ mc-esc-seq.patch ++++++ --- lib/util.c.orig 2014-09-05 20:50:09.000000000 +0200 +++ lib/util.c 2014-09-05 20:51:02.000000000 +0200 @@ -748,6 +748,8 @@ strip_ctrl_codes (char *s) while (*(++r) != '\0' && strchr ("0123456789;:?", *r) != NULL) ; } + else if (*r == '(') + r++; else if (*r == ']') { /* ++++++ mc-ext-audio.patch ++++++ --- misc/mc.ext.in.orig 2012-12-11 01:04:32.000000000 +0400 +++ misc/mc.ext.in 2013-03-10 10:59:02.741159661 +0400 @@ -433,16 +433,19 @@ ### Sound files ### regex/i/\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv)$ - Open=@EXTHELPERSDIR@/sound.sh open common + Include=audio regex/i/\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$ Open=@EXTHELPERSDIR@/sound.sh open mod + View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mod shell/i/.waw22 Open=@EXTHELPERSDIR@/sound.sh open wav22 + View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wav22 shell/i/.mp3 Open=@EXTHELPERSDIR@/sound.sh open mp3 + Include=audio View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3 regex/i/\.og[gax]$ @@ -450,15 +453,22 @@ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view ogg regex/i/\.(spx|flac)$ - Open=@EXTHELPERSDIR@/sound.sh open common + Include=audio regex/i/\.(midi?|rmid?)$ Open=@EXTHELPERSDIR@/sound.sh open midi + View=%view{ascii} @EXTHELPERSDIR@/sound.sh view midi shell/i/.wma Open=@EXTHELPERSDIR@/sound.sh open wma View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wma +shell/i/.mka + Include=audio + +include/audio + Open=@EXTHELPERSDIR@/sound.sh open common + View=%view{ascii} @EXTHELPERSDIR@/sound.sh view common ### Play lists ### ++++++ mc-extd-doc.patch ++++++ --- 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 @@ 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 && { tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX` ++++++ mc-extd-misc.patch ++++++ --- misc/ext.d/misc.sh.in.orig 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/misc.sh.in 2013-03-09 12:10:56.696615817 +0400 @@ -47,3 +47,9 @@ torrent) - ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null + if type -p ctorrent >/dev/null 2>&1 ; then + ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null + elif type -p transmission-show >/dev/null 2>&1 ; then + transmission-show "${MC_EXT_FILENAME}" + else + file "${MC_EXT_FILENAME}" + fi ;; ++++++ mc-extd-sound.patch ++++++ --- misc/ext.d/sound.sh.orig 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/sound.sh 2013-03-10 11:54:01.186301679 +0400 @@ -6,27 +6,46 @@ action=$1 filetype=$2 -[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" +[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="_xdg_open" + +_xdg_open() +{ + if [ -n "$DISPLAY" ] && type -p gmplayer ; then + gmplayer "${MC_EXT_FILENAME}" + elif type -p mplayer ; then + mplayer "${MC_EXT_FILENAME}" + else + xdg-open "${MC_EXT_FILENAME}" + fi +} do_view_action() { filetype=$1 + if type -p mediainfo >/dev/null 2>&1 ; then + mediainfo "${MC_EXT_FILENAME}" + return $? + fi + case "${filetype}" in mp3) - mpg123 -vtn1 "${MC_EXT_FILENAME}" 2>&1 | \ - sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p' + if type -p mpg123 ; then + mpg123 -vtn1 "${MC_EXT_FILENAME}" 2>&1 | \ + sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p' + return 0 + fi ;; ogg) - ogginfo "${MC_EXT_FILENAME}" + type -p ogginfo && ogginfo "${MC_EXT_FILENAME}" && return 0 ;; wma) mplayer -quiet -slave -frames 0 -vo null -ao null -identify "${MC_EXT_FILENAME}" 2>/dev/null | \ tail +13 || file "${MC_EXT_FILENAME}" - ;; - *) - cat "${MC_EXT_FILENAME}" + return $? ;; esac + + mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | sed -n '/^ID_/p' } do_open_action() { ++++++ mc-extd-video.patch ++++++ --- 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 @@ action=$1 filetype=$2 -[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open" +[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="_xdg_open" + +_xdg_open() +{ + if [ -n "$DISPLAY" ] && type -p gmplayer ; then + gmplayer "${MC_EXT_FILENAME}" + elif type -p mplayer ; then + mplayer "${MC_EXT_FILENAME}" + else + xdg-open "${MC_EXT_FILENAME}" + fi +} 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 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 } ++++++ mc-extd-xdg.patch ++++++ diff -ru1 misc/ext.d.orig/archive.sh misc/ext.d/archive.sh --- misc/ext.d.orig/archive.sh 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/archive.sh 2013-03-10 09:01:31.154705008 +0400 @@ -145,3 +145,3 @@ open) - "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ + [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ do_open_action "${filetype}" "${pager}" diff -ru1 misc/ext.d.orig/doc.sh.in misc/ext.d/doc.sh.in --- misc/ext.d.orig/doc.sh.in 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/doc.sh.in 2013-03-10 09:01:48.230710602 +0400 @@ -189,3 +189,3 @@ open) - "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ + [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ do_open_action "${filetype}" diff -ru1 misc/ext.d.orig/image.sh misc/ext.d/image.sh --- misc/ext.d.orig/image.sh 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/image.sh 2013-03-10 09:02:00.086714848 +0400 @@ -56,3 +56,3 @@ open) - "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ + [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ do_open_action "${filetype}" diff -ru1 misc/ext.d.orig/misc.sh.in misc/ext.d/misc.sh.in --- misc/ext.d.orig/misc.sh.in 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/misc.sh.in 2013-03-10 09:02:13.470718625 +0400 @@ -90,3 +90,3 @@ open) - "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ + [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ do_open_action "${filetype}" diff -ru1 misc/ext.d.orig/package.sh misc/ext.d/package.sh --- misc/ext.d.orig/package.sh 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/package.sh 2013-03-10 09:02:23.630723087 +0400 @@ -53,3 +53,3 @@ open) - "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ + [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ do_open_action "${filetype}" diff -ru1 misc/ext.d.orig/sound.sh misc/ext.d/sound.sh --- misc/ext.d.orig/sound.sh 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/sound.sh 2013-03-10 09:02:31.222725342 +0400 @@ -86,3 +86,3 @@ open) - "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ + [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ do_open_action "${filetype}" diff -ru1 misc/ext.d.orig/text.sh.in misc/ext.d/text.sh.in --- misc/ext.d.orig/text.sh.in 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/text.sh.in 2013-03-10 09:02:39.018727707 +0400 @@ -135,3 +135,3 @@ open) - "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ + [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ do_open_action "${filetype}" "${pager}" diff -ru1 misc/ext.d.orig/video.sh misc/ext.d/video.sh --- misc/ext.d.orig/video.sh 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/video.sh 2013-03-10 09:02:48.414731630 +0400 @@ -45,3 +45,3 @@ open) - "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ + [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ do_open_action "${filetype}" diff -ru1 misc/ext.d.orig/web.sh.in misc/ext.d/web.sh.in --- misc/ext.d.orig/web.sh.in 2012-12-27 12:13:20.000000000 +0400 +++ misc/ext.d/web.sh.in 2013-03-10 09:02:56.670734093 +0400 @@ -48,3 +48,3 @@ open) - "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ + [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \ do_open_action "${filetype}" ++++++ mc-extfs-helpers-deb.patch ++++++ --- src/vfs/extfs/helpers/deb.in.orig 2012-04-20 11:21:37.000000000 +0400 +++ src/vfs/extfs/helpers/deb.in 2012-07-23 17:21:47.000000000 +0400 @@ -176,6 +176,15 @@ } } +sub _which +{ + my $app = shift; + foreach my $dir (split/:/, $ENV{'PATH'}) { + return "$dir/$app" if -x "$dir/$app"; + } + return undef; +} + $pressinstall=<<EOInstall; WARNING @@ -192,6 +201,20 @@ umask 077; + +# check for required dpkg utilities +my $dpkg_deb = _which('dpkg-deb'); +my $dpkg = _which('dpkg'); + +# use uar extfs-heper if not exists +if (not defined $dpkg_deb or not defined $dpkg) +{ + if ($0 =~ /^(.*)\/deb$/) { + my $uar = "$1/uar" ; + exec $uar, @ARGV; + } +} + if($ARGV[0] eq "list") { shift; &mcdebfs_list(@ARGV); exit 0; } elsif($ARGV[0] eq "copyout") { shift; &mcdebfs_copyout(@ARGV); exit 0; } elsif($ARGV[0] eq "run") { shift; &mcdebfs_run(@ARGV); exit 0; } ++++++ mc-extfs-iso9660-xorriso.patch ++++++ --- src/vfs/extfs/helpers/iso9660.in.orig 2014-04-02 21:42:18.000000000 +0200 +++ src/vfs/extfs/helpers/iso9660.in 2014-04-02 21:43:40.000000000 +0200 @@ -46,9 +46,9 @@ echo "$lsl" | @GREP@ "^[-d]" | \ while read attr ln usr gr sz dt1 dt2 dt3 nm ; do len=$((${#nm} - 1)) - name=$(printf -- "$nm" | cut -c2-$len) # remove quotes + name=$(printf -- '%s' "$nm" | cut -c2-$len) # remove quotes - if test $(printf -- "$attr" | cut -c1-1) != "d"; then + if test $(printf -- '%s' "$attr" | cut -c1-1) != "d"; then printf -- "%s %s %s %s %s %s %s %s %s/%s\n" "$attr" "$ln" "$usr" "$gr" "$sz" "$dt1" "$dt2" "$dt3" "$dir" "$name" else xorriso_list "$1" "$dir/$name" ++++++ mc-f-keys.patch ++++++ Index: lib/tty/key.c =================================================================== --- lib/tty/key.c.orig 2010-07-05 21:12:51.000000000 +0200 +++ lib/tty/key.c 2010-07-07 11:35:25.871011522 +0200 @@ -273,6 +273,11 @@ static key_define_t xterm_key_defines[] {KEY_F (9), ESC_STR "[20~", MCKEY_NOACTION}, {KEY_F (10), ESC_STR "[21~", MCKEY_NOACTION}, + { KEY_M_SHIFT | KEY_F(1), ESC_STR "[1;2P", MCKEY_NOACTION }, + { KEY_M_SHIFT | KEY_F(2), ESC_STR "[1;2Q", MCKEY_NOACTION }, + { KEY_M_SHIFT | KEY_F(3), ESC_STR "[1;2R", MCKEY_NOACTION }, + { KEY_M_SHIFT | KEY_F(4), ESC_STR "[1;2S", MCKEY_NOACTION }, + /* old xterm Shift-arrows */ {KEY_M_SHIFT | KEY_UP, ESC_STR "O2A", MCKEY_NOACTION}, {KEY_M_SHIFT | KEY_DOWN, ESC_STR "O2B", MCKEY_NOACTION}, ++++++ mc-fix_lib_search_path.patch ++++++ Index: m4.include/mc-with-screen-ncurses.m4 =================================================================== --- m4.include/mc-with-screen-ncurses.m4.orig 2010-07-05 21:12:51.000000000 +0200 +++ m4.include/mc-with-screen-ncurses.m4 2010-07-07 17:20:37.294701000 +0200 @@ -9,7 +9,14 @@ AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [ fi if test x"$ac_ncurses_lib_path" != x; then - ac_ncurses_lib_path="-L"$ac_ncurses_lib_path + case $ac_ncurses_lib_path in + /usr/lib*) + ac_ncurses_lib_path="" + ;; + *) + ac_ncurses_lib_path="-L"$ac_ncurses_lib_path + ;; + esac fi saved_CPPFLAGS="$CPPFLAGS" @@ -30,9 +37,6 @@ AC_DEFUN([MC_CHECK_NCURSES_BY_PATH], [ if test x"$ac_ncurses_inc_path" = x; then ac_ncurses_inc_path="-I/usr/include" fi - if test x"$ac_ncurses_lib_path" = x; then - ac_ncurses_lib_path="-L/usr/lib" - fi found_ncurses=yes AC_DEFINE(HAVE_NCURSES_NCURSES_H, 1, [Define to 1 if you have the <ncurses/ncurses.h> header file.]) ++++++ mc-multi-press-f-keys.patch ++++++ http://www.midnight-commander.org/ticket/287 --- 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 */ + /* F0 is the same as F10 for our purposes */ if (c == KEY_F (0)) c = KEY_F (10); + if (c == KEY_F_IMMUTABLE (0)) + c = KEY_F_IMMUTABLE (10); + /* * 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 @@ correct_key_code (int code) mod &= ~KEY_M_SHIFT; } + /* + * Numerals may require modifilers with some keymaps or on obscure + * keyboards (e. g. F4 = Esc Shift+4). We have to ignore all + * modifiers while interpreting Esc + Numeral. + */ + if (c >= KEY_F_IMMUTABLE (1) && c <= KEY_F_IMMUTABLE (10)) { + c += KEY_F (0) - KEY_F_IMMUTABLE (0); + mod &= ~KEY_M_MASK; + } + if (!mc_global.tty.alternate_plus_minus) switch (c) { @@ -1919,7 +1932,7 @@ get_key_code (int no_delay) { /* Convert escape-digits to F-keys */ if (g_ascii_isdigit (c)) - c = KEY_F (c - '0'); + c = KEY_F_IMMUTABLE (c - '0'); else if (c == ' ') c = ESC_CHAR; else 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 **********************************************/ #define KEY_F(x) (1000 + x) +#define KEY_F_IMMUTABLE(x) (970+x) #define ACS_VLINE SLSMG_VLINE_CHAR #define ACS_HLINE SLSMG_HLINE_CHAR ++++++ mc-pie.patch ++++++ --- mc-4.8.1.7/src/consaver/Makefile.am.orig 2012-12-28 12:47:48.000000000 +0400 +++ mc-4.8.1.7/src/consaver/Makefile.am 2013-03-07 10:00:44.473817319 +0400 @@ -4,4 +4,6 @@ cons_saver_SOURCES = cons.saver.c -AM_CPPFLAGS = -I$(top_srcdir) +AM_CPPFLAGS = -fpie -I$(top_srcdir) + +cons_saver_LDFLAGS= -pie ++++++ mc-rpm.patch ++++++ --- 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 =================================================================== --- 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 keyword whole Summary: green + keyword whole Supplements: green keyword whole Vendor: green keyword whole Version: green keyword whole U\{Rr\}\{Ll\}: green Index: mc-4.8.11/src/vfs/extfs/helpers/rpm =================================================================== --- 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" + echo "$FILEPREF 0 $DATE INFO/SUGGESTS" + echo "$FILEPREF 0 $DATE INFO/RECOMMENDS" + echo "$FILEPREF 0 $DATE INFO/SUPPLEMENTS" echo "$FILEPREF 0 $DATE INFO/CONFLICTS" echo "$FILEPREF 0 $DATE INFO/CHANGELOG" } @@ -294,6 +298,10 @@ mcrpmfs_copyout () INFO/LICENSE) mcrpmfs_getOneTag "LICENSE" >"$2"; exit 0;; INFO/RPMVERSION) mcrpmfs_getRawOneTag "%{RPMVERSION}\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} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}\n]" >"$2"; exit 0;; INFO/SCRIPTS/PREIN) mcrpmfs_getRawOneTag "%{RPMTAG_PREIN}\n" >"$2"; exit 0;; INFO/SCRIPTS/PREINPROG) mcrpmfs_getRawOneTag "%{RPMTAG_PREINPROG}\n" >"$2"; exit 0;; ++++++ mc-rpmlintrc ++++++ addFilter("mc\..* W: script-without-shebang /usr/lib/mc/fish/.+") addFilter("mc\..* W: script-without-shebang /usr/share/mc/mc.*\.c?sh") addFilter("mc\..* W: files-duplicate /etc/mc/mc.keymap") ++++++ mc-startup-timeout.patch ++++++ diff -ru mc-4.8.10.orig/src/vfs/smbfs/helpers/lib/util.c mc-4.8.10/src/vfs/smbfs/helpers/lib/util.c --- mc-4.8.10.orig/src/vfs/smbfs/helpers/lib/util.c 2013-06-25 23:29:14.000000000 +0200 +++ mc-4.8.10/src/vfs/smbfs/helpers/lib/util.c 2013-09-27 12:04:27.306008996 +0200 @@ -1841,11 +1841,13 @@ /* Ensure null termination. */ hostname[sizeof (hostname) - 1] = '\0'; - /* get host info */ - if ((hp = Get_Hostbyname (hostname)) == 0) - { - DEBUG (0, ("Get_Hostbyname: Unknown host %s\n", hostname)); - return False; + if (ip) { /* query the ip only if it is requested */ + /* get host info */ + if ((hp = Get_Hostbyname (hostname)) == 0) + { + DEBUG (0, ("Get_Hostbyname: Unknown host %s\n", hostname)); + return False; + } } if (my_name) @@ -2474,6 +2476,9 @@ return (ret); } +#if 0 + /* IMHO this is useless and only increases the timeout */ + /* try with all lowercase */ strlower (name2); ret = sys_gethostbyname (name2); @@ -2491,6 +2496,7 @@ free (name2); return (ret); } +#endif /* nothing works :-( */ free (name2); ++++++ mc-vfs-fish-deleted_source_file.patch ++++++ 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 @@ -1914,6 +1914,8 @@ copy_file_file (FileOpTotalContext * tct continue; if (temp_status == FILE_ABORT) return_status = temp_status; + if (temp_status == FILE_SKIP) + return_status = temp_status; if (temp_status == FILE_SKIPALL) ctx->skip_all = TRUE; break; @@ -1924,6 +1926,8 @@ copy_file_file (FileOpTotalContext * tct temp_status = file_error (_("Cannot close target file \"%s\"\n%s"), dst_path); if (temp_status == FILE_RETRY) continue; + if (temp_status == FILE_SKIP) + return_status = temp_status; if (temp_status == FILE_SKIPALL) ctx->skip_all = TRUE; return_status = temp_status; @@ -1957,10 +1961,10 @@ copy_file_file (FileOpTotalContext * tct if (temp_status == FILE_SKIPALL) { ctx->skip_all = TRUE; - return_status = FILE_CONT; + return_status = FILE_SKIPALL; } if (temp_status == FILE_SKIP) - return_status = FILE_CONT; + return_status = FILE_SKIP; break; } } @@ -1977,10 +1981,10 @@ copy_file_file (FileOpTotalContext * tct if (temp_status == FILE_SKIPALL) { ctx->skip_all = TRUE; - return_status = FILE_CONT; + return_status = FILE_SKIPALL; } if (temp_status == FILE_SKIP) - return_status = FILE_CONT; + return_status = FILE_SKIP; 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 @@ "FILESIZE=${FISH_FILESIZE}\n" \ "#STOR $FILESIZE $FILENAME\n" \ "echo \"### 001\"\n" \ +"touch $FILENAME 2>/dev/null\n" \ +"if [ -f $FILENAME ]; then\n" \ +"rm $FILENAME\n" \ "{\n" \ " while [ $FILESIZE -gt 0 ]; do\n" \ " cnt=`expr \\( $FILESIZE + 255 \\) / 256`\n" \ " n=`dd bs=256 count=$cnt | tee -a \"${FILENAME}\" | wc -c`\n" \ " FILESIZE=`expr $FILESIZE - $n`\n" \ " done\n" \ -"}; echo \"### 200\"\n" +"}; echo \"### 200\"\n" \ +"else\n" \ +" echo \"### 500\"\n" \ +"fi\n" /* 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 @@ -1,6 +1,7 @@ #CHMOD $FISH_FILEMODE $FISH_FILENAME -if chmod ${FISH_FILEMODE} "/${FISH_FILENAME}" 2>/dev/null; then - echo "### 000" -else +chmod ${FISH_FILEMODE} "/${FISH_FILENAME}" 2>/dev/null +if [ $? -ne 0 ]; then echo "### 500" +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 @@ -1,6 +1,7 @@ #CHOWN $FISH_FILEOWNER:$FISH_FILEGROUP $FISH_FILENAME -if chown ${FISH_FILEOWNER}:${FISH_FILEGROUP} "/${FISH_FILENAME}" ; then - echo "### 000" -else +chown ${FISH_FILEOWNER}:${FISH_FILEGROUP} "/${FISH_FILENAME}" +if [ $? -ne 0 ]; then echo "### 500" +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 @@ -1,6 +1,9 @@ #STOR $FISH_FILESIZE $FISH_FILENAME FILENAME="/${FISH_FILENAME}" echo "### 001" +touch $FILENAME 2>/dev/null +if [ -f $FILENAME ]; then +rm $FILENAME 2>/dev/null { > "${FILENAME}" bss=4096 @@ -15,3 +18,6 @@ echo "### 001" FISH_FILESIZE=`expr $FISH_FILESIZE - $n` done }; echo "### 200" +else + echo "### 500" +fi ++++++ mc-wrapper.patch ++++++ Index: contrib/mc.sh.in =================================================================== --- contrib/mc.sh.in.orig 2010-07-05 21:12:51.000000000 +0200 +++ contrib/mc.sh.in 2010-09-14 12:43:40.906036450 +0200 @@ -1,3 +1,10 @@ # Don't define aliases in plain Bourne shell [ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0 -alias mc='. @pkglibexecdir@/mc-wrapper.sh' +mc() +{ +. @datadir@/mc/mc-wrapper.sh +} +if [ -n "$BASH_VERSION" ] +then + export -f mc +fi Index: contrib/Makefile.am =================================================================== --- contrib/Makefile.am.orig 2010-09-14 12:43:45.000000000 +0200 +++ contrib/Makefile.am 2010-09-14 12:47:16.291629539 +0200 @@ -22,10 +22,10 @@ EXTRA_DIST = \ $(noinst_DATA) mc.csh: $(srcdir)/mc.csh.in - sed "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.csh.in > mc.csh + sed "s%@""datadir@%$(datadir)%" $(srcdir)/mc.csh.in > mc.csh mc.sh: $(srcdir)/mc.sh.in - sed "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.sh.in > mc.sh + sed -e "s%@""datadir@%$(datadir)%" $(srcdir)/mc.sh.in > mc.sh mc-wrapper.csh: $(srcdir)/mc-wrapper.csh.in sed "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.csh.in > mc-wrapper.csh ++++++ mc.desktop ++++++ [Desktop Entry] Type=Application Name=Midnight Commander GenericName=File Manager Exec=mc Terminal=true Icon=mc ++++++ x11_browser ++++++ #!/bin/bash # # Call appropriate brower # # Copyright (c) 2001 Philipp Thomas <[email protected]> # # Borrowed heavily from url_handler.sh by Werner Fink <[email protected]> # url="$1" method="${1%%:*}" if test -n "$DISPLAY" -a -x /usr/bin/xdg-open ; then exec /usr/bin/xdg-open "$url" fi if test "$url" = "$method" ; then case "${url}" in */*.htm|*/*.html) method=http ;; */*.htmls) method=https ;; /*) if test -r "${url}" ; then method=file fi ;; *) if test -r "$PWD/${url}" ; then method=file url="$PWD/${url}" fi ;; esac case "$method" in file) url="${method}:$url" ;; *) url="${method}://$url" ;; esac fi shift case "$method" in file|http|https) http= type -p lynx >& /dev/null && http=lynx type -p links >& /dev/null && http=links type -p w3m >& /dev/null && http=w3m test -n "$DISPLAY" && type -p netscape >& /dev/null && http=netscape test -n "$DISPLAY" && type -p Netscape >& /dev/null && http=Netscape test -n "$DISPLAY" && type -p opera >& /dev/null && http=opera test -n "$DISPLAY" && type -p mozilla >& /dev/null && http=mozilla test -n "$DISPLAY" && type -p firefox >& /dev/null && http=firefox test -n "$DISPLAY" && type -p chromium >& /dev/null && http=chromium case "$http" in chromium) $http "$url" >/dev/null 2>&1 & ;; [nN]etscape|opera|mozilla|firefox) ($http -remote "openURL($url)" || $http "$url") >/dev/null 2>&1 & ;; lynx|w3m|links) exec $http "$url" ;; *) echo "No HTTP browser found." read -p "Press return to continue: " exit 0 # No error return ;; esac ;; *) echo "URL type \"$method\" not known" read -p "Press return to continue: " exit 0 # No error return ;; esac -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
