From: Marcin Krol Date: Wed, 5 May 2021 22:46:35 +0000 (+0200) Subject: - merged 4.8.26 from PLD, dropped python2 X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmc.git;a=commitdiff_plain;h=195cde83c633131169300e33f68e6ce082235616 - merged 4.8.26 from PLD, dropped python2 --- diff --git a/ebook-ext.patch b/ebook-ext.patch new file mode 100644 index 0000000..32bd588 --- /dev/null +++ b/ebook-ext.patch @@ -0,0 +1,11 @@ +--- 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 --git a/mc-pld-developerfriendly.patch b/mc-pld-developerfriendly.patch index a55e135..ec55423 100644 --- a/mc-pld-developerfriendly.patch +++ b/mc-pld-developerfriendly.patch @@ -39,7 +39,7 @@ diff -urN mc-2006-02-24-22.org/syntax/cvs-userlist.syntax mc-2006-02-24-22/synta + pld-update-todo.syntax \ po.syntax \ povray.syntax \ - python.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 @@ -52,8 +52,8 @@ diff -urN mc-2006-02-24-22.org/syntax/pld-update-todo.syntax mc-2006-02-24-22/sy 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,5 +145,11 @@ - file Don_t_match_me Mail\sfolder ^From\s +@@ -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 @@ -62,5 +62,6 @@ diff -urN mc-2006-02-24-22.org/syntax/Syntax.in mc-2006-02-24-22/syntax/Syntax.i +file users CVS\suser\slist +include cvs-userlist.syntax + - file .\* unknown - include unknown.syntax + file \\.procmailrc$ Procmail\sRC\sFile ^#/usr/bin/procmail + include procmail.syntax + diff --git a/mc.spec b/mc.spec index 1f17329..663a557 100644 --- a/mc.spec +++ b/mc.spec @@ -17,13 +17,13 @@ Summary(tr.UTF-8): Midnight Commander görsel kabuğu Summary(uk.UTF-8): Диспетчер файлів Midnight Commander Summary(zh_CN.UTF-8): 一个方便实用的文件管理器和虚拟Shell Name: mc -Version: 4.8.25 +Version: 4.8.26 Release: 1 Epoch: 1 License: GPL v3+ Group: Applications/Shells Source0: http://ftp.midnight-commander.org/%{name}-%{version}.tar.xz -# Source0-md5: 19f14d368001aac454c28a2ddd2e851b +# Source0-md5: 3c1f77b71dba1f4eeeedc4276627fed7 Source3: %{name}-non-english-man-pages.tar.bz2 # Source3-md5: 17d7b574e1b85ad6f8ddceda9e841f19 Source7: %{name}.desktop @@ -35,17 +35,20 @@ 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 URL: http://www.midnight-commander.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1.5 %{?with_ext2undel:BuildRequires: e2fsprogs-devel} -BuildRequires: gettext-tools >= 0.14.3 -BuildRequires: glib2-devel >= 2.8 +BuildRequires: file +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: glib2-devel >= 1:2.30.0 %ifnarch s390 s390x BuildRequires: gpm-devel %endif BuildRequires: libssh2-devel >= 1.2.5 -BuildRequires: libtool +BuildRequires: libtool >= 2:2 BuildRequires: pam-devel BuildRequires: pcre-devel BuildRequires: pkgconfig @@ -53,8 +56,12 @@ BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: sed >= 4.0 BuildRequires: slang-devel >= 2.2.1 +BuildRequires: tar >= 1:1.22 %{?with_x:BuildRequires: xorg-lib-libX11-devel} +BuildRequires: xz Requires: file +Requires: glib2 >= 1:2.30.0 +Requires: libssh2 >= 1.2.5 Requires: pam >= 0.77.3 Requires: sed Requires: setup >= 2.4.6-2 @@ -165,12 +172,14 @@ tar, zip ve RPM dosyalarının içeriklerini gösterebilmesidir. %patch4 -p1 %{!?with_perl_vfs:%patch5 -p1} %patch6 -p1 +%patch7 -p1 +%patch8 -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|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \ +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,' \ src/vfs/extfs/helpers/uc1541 %build @@ -178,6 +187,7 @@ sed -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' -e '1s,#!\s %{__libtoolize} %{__aclocal} -I m4 %{__autoconf} +%{__autoheader} %{__automake} export X11_WWW="xdg-open" @@ -235,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) %doc NEWS README -%config /etc/shrc.d/* +%config /etc/shrc.d/mc.* %attr(755,root,root) %{_bindir}/mc* %dir %{_libexecdir}/mc %attr(755,root,root) %{_libexecdir}/mc/cons.saver @@ -261,10 +271,7 @@ rm -rf $RPM_BUILD_ROOT %lang(sr) %{_datadir}/mc/help/mc.hlp.sr %dir %{_datadir}/mc/hints %{_datadir}/mc/hints/mc.hint -# disabled hint files contain only English messages (as for 4.8.21) -#%lang(af) %{_datadir}/mc/hints/mc.hint.af -#%lang(ar) %{_datadir}/mc/hints/mc.hint.ar -#%lang(az) %{_datadir}/mc/hints/mc.hint.az +# disabled hint files contain only English messages (as for 4.8.26) %lang(be) %{_datadir}/mc/hints/mc.hint.be %lang(bg) %{_datadir}/mc/hints/mc.hint.bg %lang(ca) %{_datadir}/mc/hints/mc.hint.ca @@ -279,21 +286,17 @@ rm -rf $RPM_BUILD_ROOT %lang(et) %{_datadir}/mc/hints/mc.hint.et %lang(eu) %{_datadir}/mc/hints/mc.hint.eu %lang(fa) %{_datadir}/mc/hints/mc.hint.fa -#%lang(fi) %{_datadir}/mc/hints/mc.hint.fi %lang(fr) %{_datadir}/mc/hints/mc.hint.fr #%lang(fr_CA) %{_datadir}/mc/hints/mc.hint.fr_CA %lang(ga) %{_datadir}/mc/hints/mc.hint.ga %lang(gl) %{_datadir}/mc/hints/mc.hint.gl -#%lang(hr) %{_datadir}/mc/hints/mc.hint.hr %lang(hu) %{_datadir}/mc/hints/mc.hint.hu -#%lang(ia) %{_datadir}/mc/hints/mc.hint.ia %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(kk) %{_datadir}/mc/hints/mc.hint.kk -#%lang(ko) %{_datadir}/mc/hints/mc.hint.ko +%lang(ko) %{_datadir}/mc/hints/mc.hint.ko %lang(lt) %{_datadir}/mc/hints/mc.hint.lt +%lang(nb) %{_datadir}/mc/hints/mc.hint.nb %lang(nl) %{_datadir}/mc/hints/mc.hint.nl %lang(pl) %{_datadir}/mc/hints/mc.hint.pl %lang(pt) %{_datadir}/mc/hints/mc.hint.pt @@ -301,15 +304,12 @@ rm -rf $RPM_BUILD_ROOT %lang(ro) %{_datadir}/mc/hints/mc.hint.ro %lang(ru) %{_datadir}/mc/hints/mc.hint.ru %lang(sk) %{_datadir}/mc/hints/mc.hint.sk -#%lang(sl) %{_datadir}/mc/hints/mc.hint.sl %lang(sr) %{_datadir}/mc/hints/mc.hint.sr %lang(sv) %{_datadir}/mc/hints/mc.hint.sv -#%lang(szl) %{_datadir}/mc/hints/mc.hint.szl -#%lang(te) %{_datadir}/mc/hints/mc.hint.te %lang(tr) %{_datadir}/mc/hints/mc.hint.tr %lang(uk) %{_datadir}/mc/hints/mc.hint.uk -#%lang(uz) %{_datadir}/mc/hints/mc.hint.uz %lang(zh_CN) %{_datadir}/mc/hints/mc.hint.zh_CN +%lang(zh_TW) %{_datadir}/mc/hints/mc.hint.zh_TW %dir %{_libexecdir}/mc/ext.d %attr(755,root,root) %{_libexecdir}/mc/ext.d/archive.sh @@ -354,7 +354,9 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libexecdir}/mc/extfs.d/ucab %attr(755,root,root) %{_libexecdir}/mc/extfs.d/uha %attr(755,root,root) %{_libexecdir}/mc/extfs.d/ulha +%attr(755,root,root) %{_libexecdir}/mc/extfs.d/unar %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 diff --git a/zip.patch b/zip.patch new file mode 100644 index 0000000..dfbc4f5 --- /dev/null +++ b/zip.patch @@ -0,0 +1,195 @@ +From 1ed638d66cf803f69ac12ee80a72d217f2146e43 Mon Sep 17 00:00:00 2001 +From: Andrew Borodin +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 +--- + 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 +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 +--- + 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?= + +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 +--- + 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 +