---- mc-4.8.21/misc/mc.ext.in~ 2018-05-27 21:56:21.000000000 +0200
-+++ mc-4.8.21/misc/mc.ext.in 2018-06-13 23:35:38.484935556 +0200
-@@ -657,7 +657,7 @@
- Open=@EXTHELPERSDIR@/doc.sh open comic
-
- # Epub & mobi
--regex/i/\.(epub|mobi)$
-+regex/i/\.(epub|mobi|lrf|lrs|azw[123]?|pobi|lit|fb2)$
- Open=@EXTHELPERSDIR@/doc.sh open epub
- View=%view{ascii} @EXTHELPERSDIR@/doc.sh view epub
+diff -urpa mc-4.8.31.orig/misc/mc.ext.ini.in mc-4.8.31/misc/mc.ext.ini.in
+--- mc-4.8.31.orig/misc/mc.ext.ini.in 2024-01-20 20:34:38.000000000 +0100
++++ mc-4.8.31/misc/mc.ext.ini.in 2024-04-03 21:49:49.793099557 +0200
+@@ -800,7 +800,7 @@ Open=@EXTHELPERSDIR@/doc.sh open comic
+ # Epup, mobi, fb2
+ [ebook]
+-Regex=\\.(epub|mobi|fb2)$
++Regex=\\.(epub|mobi|lrf|lrs|azw[123]?|pobi|lit|fb2)$
+ RegexIgnoreCase=true
+ Open=@EXTHELPERSDIR@/doc.sh open ebook
+ View=%view{ascii} @EXTHELPERSDIR@/doc.sh view ebook
+++ /dev/null
-diff -urpa mc-4.8.20.orig/src/setup.c mc-4.8.20/src/setup.c
---- mc-4.8.20.orig/src/setup.c 2018-04-09 12:33:43.452504866 +0000
-+++ mc-4.8.20/src/setup.c 2018-04-09 12:34:41.690504210 +0000
-@@ -100,7 +100,7 @@ gboolean confirm_overwrite = TRUE;
- /* Asks for confirmation before executing a program by pressing enter */
- gboolean confirm_execute = FALSE;
- /* Asks for confirmation before leaving the program */
--gboolean confirm_exit = FALSE;
-+gboolean confirm_exit = TRUE;
-
- /* If true, at startup the user-menu is invoked */
- gboolean auto_menu = FALSE;
-diff -urpa mc-4.8.20.orig/src/filemanager/find.c mc-4.8.20/src/filemanager/find.c
---- mc-4.8.20.orig/src/filemanager/find.c 2018-04-09 12:32:24.759505752 +0000
-+++ mc-4.8.20/src/filemanager/find.c 2018-04-09 12:32:53.728505426 +0000
-@@ -284,7 +284,7 @@ find_load_options (void)
+diff -urpa mc-4.8.31.orig/src/filemanager/find.c mc-4.8.31/src/filemanager/find.c
+--- mc-4.8.31.orig/src/filemanager/find.c 2024-01-20 20:34:38.000000000 +0100
++++ mc-4.8.31/src/filemanager/find.c 2024-04-03 21:45:19.741258251 +0200
+@@ -285,7 +285,7 @@ find_load_options (void)
loaded = TRUE;
options.file_case_sens =
options.file_pattern =
mc_config_get_bool (mc_global.main_config, "FindFile", "file_shell_pattern", TRUE);
options.find_recurs =
-@@ -294,7 +294,7 @@ find_load_options (void)
+@@ -297,7 +297,7 @@ find_load_options (void)
options.file_all_charsets =
mc_config_get_bool (mc_global.main_config, "FindFile", "file_all_charsets", FALSE);
options.content_case_sens =
-diff -urpa mc-4.8.20.orig/src/editor/editdraw.c mc-4.8.20/src/editor/editdraw.c
---- mc-4.8.20.orig/src/editor/editdraw.c 2017-03-04 17:51:38.000000000 +0000
-+++ mc-4.8.20/src/editor/editdraw.c 2018-04-09 12:30:00.046507381 +0000
-@@ -63,8 +63,8 @@
- /* Toggles statusbar draw style */
- gboolean simple_statusbar = FALSE;
-
--gboolean visible_tws = TRUE;
--gboolean visible_tabs = TRUE;
-+gboolean visible_tws = FALSE;
-+gboolean visible_tabs = FALSE;
-
- /*** file scope macro definitions ****************************************************************/
-
+diff -urpa mc-4.8.31.orig/src/editor/edit.c mc-4.8.31/src/editor/edit.c
+--- mc-4.8.31.orig/src/editor/edit.c 2024-01-20 20:34:38.000000000 +0100
++++ mc-4.8.31/src/editor/edit.c 2024-04-03 21:43:01.355289821 +0200
+@@ -99,8 +99,8 @@ edit_options_t edit_options = {
+ .backup_ext = NULL,
+ .filesize_threshold = NULL,
+ .stop_format_chars = NULL,
+- .visible_tabs = TRUE,
+- .visible_tws = TRUE,
++ .visible_tabs = FALSE,
++ .visible_tws = FALSE,
+ .show_right_margin = FALSE,
+ .simple_statusbar = FALSE,
+ .check_nl_at_eof = FALSE
+++ /dev/null
---- mc-4.7.0-pre2/m4.include/mc-vfs.m4~ 2009-08-04 23:36:33.000000000 +0200
-+++ mc-4.7.0-pre2/m4.include/mc-vfs.m4 2009-09-06 18:44:17.955791270 +0200
-@@ -40,7 +40,7 @@
- dnl FIXME: network checks should probably be in their own macro.
- AC_SEARCH_LIBS(socket, [xnet bsd socket inet], [have_socket=yes])
- if test x"$have_socket" = xyes; then
-- AC_SEARCH_LIBS(gethostbyname, [bsd socket inet netinet])
-+ AC_SEARCH_LIBS(gethostbyname, [bsd socket inet netinet nsl])
- AC_CHECK_MEMBERS([struct linger.l_linger], , , [
- #include <sys/types.h>
- #include <sys/socket.h>
+++ /dev/null
-diff -urN mc-2006-02-24-22.org/syntax/cvs-userlist.syntax mc-2006-02-24-22/syntax/cvs-userlist.syntax
---- mc-2006-02-24-22.org/misc/syntax/cvs-userlist.syntax 1970-01-01 01:00:00.000000000 +0100
-+++ mc-2006-02-24-22/misc/syntax/cvs-userlist.syntax 2006-02-28 17:37:11.801898000 +0100
-@@ -0,0 +1,20 @@
-+wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._-
-+
-+context default
-+ keyword : yellow black
-+# people
-+ keyword whole linestart ac-admin black white
-+ keyword whole linestart ra-admin black white
-+ keyword whole linestart nest-admin black white
-+ keyword whole linestart cvsadmin black white
-+ keyword whole linestart distfilesadmin black white
-+# machines (hm... people vs machines... like in the Matrix ;))
-+ keyword wholeleft linestart builder gray white
-+ keyword wholeleft linestart buildlogs gray white
-+ keyword wholeleft linestart cia gray white
-+ keyword wholeleft linestart distfiles gray white
-+
-+context exclusive : : cyan
-+ keyword , yellow black
-+
-+
---- mc-4.8.19/misc/syntax/Makefile.am.orig 2017-03-11 18:30:38.998587163 +0100
-+++ mc-4.8.19/misc/syntax/Makefile.am 2017-03-11 18:34:17.005281053 +0100
-@@ -16,6 +16,7 @@
- cs.syntax \
- css.syntax \
- cuda.syntax \
-+ cvs-userlist.syntax \
- cxx.syntax \
- cython.syntax \
- d.syntax \
-@@ -35,6 +36,7 @@
- pascal.syntax \
- perl.syntax \
- php.syntax \
-+ pld-update-todo.syntax \
- po.syntax \
- povray.syntax \
- procmail.syntax \
-diff -urN mc-2006-02-24-22.org/syntax/pld-update-todo.syntax mc-2006-02-24-22/syntax/pld-update-todo.syntax
---- mc-2006-02-24-22.org/misc/syntax/pld-update-todo.syntax 1970-01-01 01:00:00.000000000 +0100
-+++ mc-2006-02-24-22/misc/syntax/pld-update-todo.syntax 2006-02-28 17:37:11.805898250 +0100
-@@ -0,0 +1,5 @@
-+context default
-+ keyword wholeleft [OLD]\s*\s brightred
-+ keyword wholeleft [NEW]\s*\n green
-+ keyword wholeright (*) white black
-+
-diff -urN mc-2006-02-24-22.org/syntax/Syntax.in mc-2006-02-24-22/syntax/Syntax.in
---- mc-2006-02-24-22.org/misc/syntax/Syntax.in 2005-10-31 22:15:34.000000000 +0100
-+++ mc-2006-02-24-22/misc/syntax/Syntax.in 2006-02-28 17:37:11.805898250 +0100
-@@ -145,6 +145,12 @@
- file Don_t_match_me Mail\sfolder ^(From|Return-(P|p)ath:|From:|Date:)\s
- include mail.syntax
-
-+file PLD-update-TODO PLD\sTODO
-+include pld-update-todo.syntax
-+
-+file users CVS\suser\slist
-+include cvs-userlist.syntax
-+
- file \\.procmailrc$ Procmail\sRC\sFile ^#/usr/bin/procmail
- include procmail.syntax
-
+#
# Conditional build:
%bcond_with ext2undel # with ext2 undelete fs
%bcond_without perl_vfs # without perl depending vfs'es -- to avoid perl autoreq
-%bcond_with samba # with SAMBA vfs support
%bcond_without x # without text edit in X support
#
Summary: A user-friendly file manager and visual shell
Summary(uk.UTF-8): Диспетчер файлів Midnight Commander
Summary(zh_CN.UTF-8): 一个方便实用的文件管理器和虚拟Shell
Name: mc
-Version: 4.8.26
+Version: 4.8.31
Release: 1
Epoch: 1
License: GPL v3+
Group: Applications/Shells
Source0: http://ftp.midnight-commander.org/%{name}-%{version}.tar.xz
-# Source0-md5: 3c1f77b71dba1f4eeeedc4276627fed7
+# Source0-md5: 2c3dd9af66e4cfef5a7a460df1cdf868
Source3: %{name}-non-english-man-pages.tar.bz2
# Source3-md5: 17d7b574e1b85ad6f8ddceda9e841f19
Source7: %{name}.desktop
Patch1: %{name}-no-ws-visible.patch
Patch2: %{name}-no-compute-totals.patch
Patch3: %{name}-file-find-case-insensitive.patch
-Patch4: %{name}-confirm-exit.patch
-Patch5: %{name}-noperl-vfs.patch
-# at now syntax highligthing for PLD-update-TODO and CVSROOT/users
-Patch6: %{name}-pld-developerfriendly.patch
-Patch7: ebook-ext.patch
-Patch8: zip.patch
+Patch4: %{name}-noperl-vfs.patch
+Patch5: ebook-ext.patch
URL: http://www.midnight-commander.org/
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1.5
+BuildRequires: autoconf >= 2.64
+BuildRequires: automake >= 1:1.12
%{?with_ext2undel:BuildRequires: e2fsprogs-devel}
BuildRequires: file
-BuildRequires: gettext-tools >= 0.18.1
+BuildRequires: gettext-tools >= 0.21
BuildRequires: glib2-devel >= 1:2.30.0
%ifnarch s390 s390x
BuildRequires: gpm-devel
%endif
-BuildRequires: libssh2-devel >= 1.2.5
+BuildRequires: libssh2-devel >= 1.2.8
BuildRequires: libtool >= 2:2
BuildRequires: pam-devel
BuildRequires: pcre-devel
BuildRequires: xz
Requires: file
Requires: glib2 >= 1:2.30.0
-Requires: libssh2 >= 1.2.5
+Requires: libssh2 >= 1.2.8
Requires: pam >= 0.77.3
Requires: sed
Requires: setup >= 2.4.6-2
Suggests: groff
Suggests: gzip
Suggests: lha
-Suggests: links
+Suggests: links2
Suggests: lynx
Suggests: lzma
Suggests: odt2txt
Suggests: xpdf-tools
Suggests: xz
Suggests: zoo
-Obsoletes: mc46
-Obsoletes: mc46serv
-Obsoletes: mcserv
-Obsoletes: tkmc
+Obsoletes: mc46 < 1:4.7
+Obsoletes: mc46serv < 1:4.7
+Obsoletes: mcserv < 1:4.7.4
+Obsoletes: tkmc < 4.1.35
Conflicts: bash < 2.05b
Conflicts: rpm < 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%{!?with_perl_vfs:%patch5 -p1}
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%{!?with_perl_vfs:%patch4 -p1}
+%patch5 -p1
%{__rm} po/stamp-po
%{__sed} -i 's:|hxx|:|hxx|tcc|:' misc/syntax/Syntax.in
-sed -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python3}\1,' \
+sed -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
src/vfs/extfs/helpers/uc1541
%build
%configure \
PYTHON=%{_bindir}/python3 \
%{?with_ext2undel:--enable-vfs-undelfs} \
- %{?with_samba:--enable-vfs-smb} \
- --with-smb-configdir=/etc/samba \
- --with-smb-codepagedir=/etc/samba/codepages \
--with%{!?with_x:out}-x \
--with-gpm-mouse \
--with-pcre \
%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/mcserv.8
-# just a copy of sv
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/mc/hints/mc.hint.sv_SE
-# another variant of it
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/mc/hints/mc.hint.it_IT
-# enhanced version
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/mc/hints/mc.hint.{zh,zh_CN}
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
%find_lang %{name}
%lang(id) %{_datadir}/mc/hints/mc.hint.id
%lang(it) %{_datadir}/mc/hints/mc.hint.it
%lang(ja) %{_datadir}/mc/hints/mc.hint.ja
+%lang(ka) %{_datadir}/mc/hints/mc.hint.ka
%lang(ko) %{_datadir}/mc/hints/mc.hint.ko
%lang(lt) %{_datadir}/mc/hints/mc.hint.lt
%lang(nb) %{_datadir}/mc/hints/mc.hint.nb
%attr(755,root,root) %{_libexecdir}/mc/extfs.d/urar
%attr(755,root,root) %{_libexecdir}/mc/extfs.d/uwim
%attr(755,root,root) %{_libexecdir}/mc/extfs.d/uzoo
-%dir %{_libexecdir}/mc/fish
-%{_libexecdir}/mc/fish/README.fish
-%attr(755,root,root) %{_libexecdir}/mc/fish/[a-z]*
+%dir %{_libexecdir}/mc/shell
+%{_libexecdir}/mc/shell/README.shell
+%attr(755,root,root) %{_libexecdir}/mc/shell/[a-z]*
%{_desktopdir}/mc.desktop
%{_pixmapsdir}/mc.png
+++ /dev/null
-From 1ed638d66cf803f69ac12ee80a72d217f2146e43 Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Tue, 16 Feb 2021 16:29:51 +0300
-Subject: [PATCH] Ticket #4180: fix zip handling.
-
-After 8857423e4ebb770b6f0ea3103abf5d35c85fcbe8 zip archives opened with
-an error:
-
- file -L -z archive.zip: Bad system call
-
-This caused by using /usr/bin/file with -z option, because seccomp (a
-security sandbox) doesn't allow it..
-
-Solution: use -S option together with -z one.
-
-The file command accepts the -S option since 5.33.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- configure.ac | 66 +++++++++++++++++++++++++++++++++++--------
- src/filemanager/ext.c | 7 +++--
- src/setup.c | 2 ++
- 3 files changed, 60 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5f372dc3f5..f2351c99ad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -115,23 +115,65 @@ fi
- AC_SUBST(MANDOC)
- AC_SUBST(MAN_FLAGS)
-
--dnl Check for -L option to file
-+dnl Check for -z, -L, and -S options to file
- AC_CHECK_PROG(HAVE_FILECMD, file, true, false)
- if $HAVE_FILECMD; then
-- AC_MSG_CHECKING([for -L option to file command])
-- AC_CACHE_VAL(mc_cv_filel, [
-- file -L . > /dev/null 2>&1
-- if test $? = 0; then
-- mc_cv_filel=yes
-+ dnl Don't use the file command if it doesn't accept the -z option
-+ AC_MSG_CHECKING([for -z option to file command])
-+ AC_CACHE_VAL(mc_cv_file_z, [
-+ file -z . > /dev/null 2>&1
-+ if test $? = 0; then
-+ mc_cv_file_z=yes
-+ else
-+ mc_cv_file_z=no
-+ fi
-+ ])
-+ AC_MSG_RESULT([$mc_cv_file_z])
-+
-+ if test x$mc_cv_file_z = xyes; then
-+ AC_DEFINE(USE_FILE_CMD, 1, [Define if the file command accepts the -z option])
- else
-- mc_cv_filel=no
-+ AC_MSG_WARN([The file command doesn't accept the -z option and will not be used])
- fi
-- ])
-- if test x$mc_cv_filel = xyes; then
-- AC_DEFINE(FILE_L, 1, [Define if the file command accepts the -L option])
-+
-+ if test x$mc_cv_file_z = xyes; then
-+ dnl file is used; check -L and -S options
-+
-+ AC_MSG_CHECKING([for -L option to file command])
-+ AC_CACHE_VAL(mc_cv_file_L, [
-+ file -L . > /dev/null 2>&1
-+ if test $? = 0; then
-+ mc_cv_file_L=yes
-+ else
-+ mc_cv_file_L=no
-+ fi
-+ ])
-+ AC_MSG_RESULT([$mc_cv_file_L])
-+
-+ if test x$mc_cv_file_L = xyes; then
-+ AC_DEFINE(FILE_L, "-L ", [Define if the file command accepts the -L option])
-+ else
-+ AC_DEFINE(FILE_L, "", [Define if the file command accepts the -L option])
-+ fi
-+
-+ dnl The file command accepts the -S option since 5.33
-+ AC_MSG_CHECKING([for -S option to file command])
-+ AC_CACHE_VAL(mc_cv_file_S, [
-+ file -S . > /dev/null 2>&1
-+ if test $? = 0; then
-+ mc_cv_file_S=yes
-+ else
-+ mc_cv_file_S=no
-+ fi
-+ ])
-+ AC_MSG_RESULT([$mc_cv_file_S])
-+
-+ if test x$mc_cv_file_S = xyes; then
-+ AC_DEFINE(FILE_S, "-S ", [Define if file command accepts the -S option])
-+ else
-+ AC_DEFINE(FILE_S, "", [Define if file command accepts the -S option])
-+ fi
- fi
-- filel=$mc_cv_filel
-- AC_MSG_RESULT([$filel])
- fi
-
- dnl Only list browsers here that can be run in background (i.e. with `&')
-diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c
-index 4e6f10c6c5..d6a09df7bb 100644
---- a/src/filemanager/ext.c
-+++ b/src/filemanager/ext.c
-@@ -71,10 +71,11 @@
-
- /*** file scope macro definitions ****************************************************************/
-
--#ifdef FILE_L
--#define FILE_CMD "file -L -z "
-+#ifdef USE_FILE_CMD
-+#define FILE_CMD "file -z " FILE_S FILE_L
- #else
--#define FILE_CMD "file -z "
-+/* actually file is unused, but define some reasonable command */
-+#define FILE_CMD "file "
- #endif
-
- /*** file scope type declarations ****************************************************************/
-diff --git a/src/setup.c b/src/setup.c
-index 77c07649d5..2ef07f2569 100644
---- a/src/setup.c
-+++ b/src/setup.c
-@@ -317,7 +317,9 @@ static const struct
- { "old_esc_mode", &old_esc_mode },
- { "cd_symlinks", &mc_global.vfs.cd_symlinks },
- { "show_all_if_ambiguous", &mc_global.widget.show_all_if_ambiguous },
-+#ifdef USE_FILE_CMD
- { "use_file_to_guess_type", &use_file_to_check_type },
-+#endif
- { "alternate_plus_minus", &mc_global.tty.alternate_plus_minus },
- { "only_leading_plus_minus", &only_leading_plus_minus },
- { "show_output_starts_shell", &output_starts_shell },
-From 7881ed2fda7390d3821abd6864d0097fc818f0ac Mon Sep 17 00:00:00 2001
-From: Andrew Borodin <aborodin@vmail.ru>
-Date: Sat, 23 Jan 2021 21:10:04 +0300
-Subject: [PATCH] Ticket #4180: fix handling of zip archives.
-
-After 8857423e4ebb770b6f0ea3103abf5d35c85fcbe8 due to
-using "file -z", zip archves w/o ".zip" file name extension
-(i.e. "ff_ext.xpi", a Firefox extension) aren't handled
-as zip archives.
-
-misc/mc.ext.in: fix regular expression for zip format.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- misc/mc.ext.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/misc/mc.ext.in b/misc/mc.ext.in
-index e9b475cde4..2da4635d1e 100644
---- a/misc/mc.ext.in
-+++ b/misc/mc.ext.in
-@@ -751,7 +751,7 @@ shell/i/.zip
- View=%view{ascii} @EXTHELPERSDIR@/archive.sh view zip
-
- # zip
--type/i/^zip\ archive
-+type/\(Zip archive
- Open=%cd %p/uzip://
- View=%view{ascii} @EXTHELPERSDIR@/archive.sh view zip
-
-From 0e023f0dd9ca18a2bab8df6d25ed3c7d9dcbd2d1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotrek=20=C5=BBygie=C5=82o?=
- <pzygielo@users.noreply.github.com>
-Date: Thu, 25 Mar 2021 16:59:19 +0100
-Subject: [PATCH] Ticket #4223: fix recognition of JAR files as ZIP archives
-
-Similar to 7881ed2 that solved ticket #4180.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- misc/mc.ext.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/misc/mc.ext.in b/misc/mc.ext.in
-index 75f95fc743..f93d8bf229 100644
---- a/misc/mc.ext.in
-+++ b/misc/mc.ext.in
-@@ -386,7 +386,7 @@ type/\(Zip archive
- View=%view{ascii} @EXTHELPERSDIR@/archive.sh view zip
-
- # jar(zip)
--type/i/^Java\ (Jar\ file|archive)\ data\ \((zip|JAR)\)
-+type/i/\(Java\ (Jar\ file|archive)\ data\ \((zip|JAR)\)
- Open=%cd %p/uzip://
- View=%view{ascii} @EXTHELPERSDIR@/archive.sh view zip
-
TLD / packages / mc.git / commitdiff