From a349f5531481c2f0fdf95ce7a7f1189c8678ad39 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Sat, 11 Apr 2020 10:28:38 -0500 Subject: mc-4.8.24-2.parabola1: updating version --- libre/mc/PKGBUILD | 32 +++++++---- libre/mc/libre.patch | 110 ++++++++++++++++++------------------- libre/mc/mc-mksh-subshell-v2.patch | 74 +++++++++++++++++++++++++ libre/mc/mc-python3.patch | 70 +++++++++++++++++++++++ 4 files changed, 219 insertions(+), 67 deletions(-) create mode 100644 libre/mc/mc-mksh-subshell-v2.patch create mode 100644 libre/mc/mc-python3.patch diff --git a/libre/mc/PKGBUILD b/libre/mc/PKGBUILD index 612bc58b6..856aca45f 100644 --- a/libre/mc/PKGBUILD +++ b/libre/mc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 215416 2017-03-09 17:51:32Z schuay $ +# Maintainer (Arch): Alad Wenter # Maintainer (Arch): schuay # Contributor (Arch): Daniel J Griffiths # Maintainer (Hyperbola): André Silva @@ -6,11 +6,14 @@ # Maintainer: Omar Vega Ramos pkgname=mc -pkgver=4.8.20 -pkgrel=1.parabola1 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with arj recommendation included and nonfree unace and unrar support removed" -arch=('i686' 'x86_64' 'armv7h') -url="http://www.ibiblio.org/mc/" +pkgver=4.8.24 +pkgrel=2 +pkgrel+=.parabola1 +pkgdesc="A file manager that emulates Norton Commander" +pkgdesc+=", with arj recommendation included and nonfree unace and unrar support removed" +arch=('x86_64') +arch+=('i686' 'armv7h') +url="https://midnight-commander.org/" license=('GPL') depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang') makedepends=('libxt' 'libx11' 'unzip') @@ -23,8 +26,8 @@ optdepends=('aspell: spelling corrections' 'mtools: a+ extfs' 'p7zip: support for 7zip archives' 'perl: needed by several extfs scripts' - 'python2-boto: s3+ extfs' - 'python2-pytz: s3+ extfs' + 'python-boto: s3+ extfs' + 'python-pytz: s3+ extfs' 'samba: VFS support' 'arj: uarj extfs' 'zip: uzip extfs') @@ -39,25 +42,30 @@ backup=('etc/mc/edit.indent.rc' 'etc/mc/sfs.ini') options=('!emptydirs') source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz" + "mc-mksh-subshell-v2.patch" + "mc-python3.patch" 'libre.patch') -sha256sums=('017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c' - '09a44d10ed1081ada579dd42fb67cdea8755f4a3aa496433df9a726b90f11862') +sha256sums=('859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46' + '5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96' + '10ab8b8c03770f8fe51f0bdbf0d66a44313bf2eed687cf769397909c07d8e8d5' + '0129171a9af3d1a7e37be232809e3f42921ef8fa016974234ca61f3fa180232b') prepare() { cd ${pkgname}-${pkgver} + patch -p1 < "$srcdir"/mc-mksh-subshell-v2.patch + patch -p1 < "$srcdir"/mc-python3.patch patch -Np1 -i ../libre.patch rm -v src/vfs/extfs/helpers/u{ace,rar}.in } build() { - export PYTHON=/usr/bin/python2 - cd ${pkgname}-${pkgver} ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ --sysconfdir=/etc \ --enable-vfs-smb \ + --with-screen=slang \ --with-x make } diff --git a/libre/mc/libre.patch b/libre/mc/libre.patch index de681f128..5fdc85fd4 100644 --- a/libre/mc/libre.patch +++ b/libre/mc/libre.patch @@ -1,15 +1,15 @@ ---- a/configure 2017-11-25 13:33:45.000000000 -0500 -+++ b/configure 2018-01-17 13:10:33.355116203 -0500 -@@ -30379,7 +30379,7 @@ +--- mc-4.8.24.orig/configure 2020-01-18 16:43:02.000000000 -0500 ++++ mc-4.8.24/configure 2020-04-11 01:02:50.107213882 -0500 +@@ -27064,7 +27064,7 @@ ac_config_files="$ac_config_files src/man2hlp/man2hlp" --ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/uace src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uc1541 src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile intl/Makefile po/Makefile.in" -+ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uc1541 src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile intl/Makefile po/Makefile.in" +-ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.charsets misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/uace src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile po/Makefile.in" ++ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.charsets misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile po/Makefile.in" ac_config_files="$ac_config_files tests/Makefile tests/lib/Makefile tests/lib/mcconfig/Makefile tests/lib/search/Makefile tests/lib/strutil/Makefile tests/lib/vfs/Makefile tests/lib/widget/Makefile tests/src/Makefile tests/src/filemanager/Makefile tests/src/editor/Makefile tests/src/editor/test-data.txt tests/src/vfs/Makefile tests/src/vfs/extfs/Makefile tests/src/vfs/extfs/helpers-list/Makefile tests/src/vfs/extfs/helpers-list/data/config.sh tests/src/vfs/extfs/helpers-list/misc/Makefile" -@@ -31646,7 +31646,6 @@ +@@ -28332,7 +28332,6 @@ "src/vfs/extfs/helpers/patchfs") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/patchfs" ;; "src/vfs/extfs/helpers/rpms+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/rpms+" ;; "src/vfs/extfs/helpers/s3+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/s3+" ;; @@ -17,7 +17,7 @@ "src/vfs/extfs/helpers/ualz") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ualz" ;; "src/vfs/extfs/helpers/uar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uar" ;; "src/vfs/extfs/helpers/uarc") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uarc" ;; -@@ -31656,7 +31655,6 @@ +@@ -28341,7 +28340,6 @@ "src/vfs/extfs/helpers/uha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uha" ;; "src/vfs/extfs/helpers/ulha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulha" ;; "src/vfs/extfs/helpers/ulib") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulib" ;; @@ -25,9 +25,9 @@ "src/vfs/extfs/helpers/uzip") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzip" ;; "src/vfs/extfs/helpers/uzoo") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzoo" ;; "src/vfs/fish/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/fish/Makefile" ;; ---- a/configure.ac 2017-11-18 12:45:59.000000000 -0500 -+++ b/configure.ac 2018-01-17 13:13:08.044979701 -0500 -@@ -568,7 +568,6 @@ +--- mc-4.8.24.orig/configure.ac 2020-01-01 10:52:34.000000000 -0500 ++++ mc-4.8.24/configure.ac 2020-04-11 01:04:19.637212947 -0500 +@@ -615,7 +615,6 @@ src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ @@ -35,7 +35,7 @@ src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc -@@ -578,7 +577,6 @@ +@@ -624,7 +623,6 @@ src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib @@ -43,9 +43,9 @@ src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo ---- a/misc/ext.d/archive.sh 2017-02-24 15:25:57.000000000 -0500 -+++ b/misc/ext.d/archive.sh 2018-01-17 13:15:10.486261473 -0500 -@@ -75,8 +75,7 @@ +--- mc-4.8.24.orig/misc/ext.d/archive.sh 2020-01-01 10:52:34.000000000 -0500 ++++ mc-4.8.24/misc/ext.d/archive.sh 2020-04-11 01:05:50.017212003 -0500 +@@ -82,8 +82,7 @@ lha l "${MC_EXT_FILENAME}" ;; arj) @@ -55,7 +55,7 @@ ;; cab) cabextract -l "${MC_EXT_FILENAME}" -@@ -84,10 +83,6 @@ +@@ -91,10 +90,6 @@ ha) ha lf "${MC_EXT_FILENAME}" ;; @@ -66,7 +66,7 @@ alz) unalz -l "${MC_EXT_FILENAME}" ;; -@@ -115,9 +110,6 @@ +@@ -126,9 +121,6 @@ 7z l "${MC_EXT_FILENAME}" ;; @@ -76,20 +76,20 @@ arc) arc l "${MC_EXT_FILENAME}" ;; ---- a/misc/filehighlight.ini 2017-11-18 12:45:59.000000000 -0500 -+++ b/misc/filehighlight.ini 2018-01-17 13:16:59.554798037 -0500 +--- mc-4.8.24.orig/misc/filehighlight.ini 2020-01-01 10:52:34.000000000 -0500 ++++ mc-4.8.24/misc/filehighlight.ini 2020-04-11 01:07:34.567210912 -0500 @@ -28,7 +28,7 @@ regexp=(^#.*|.*~$) [archive] -- extensions=7z;Z;ace;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;xz;zip;zoo -+ extensions=7z;Z;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rpm;tar;tbz;tbz2;tgz;tlz;txz;xz;zip;zoo +- extensions=7z;Z;ace;apk;arc;arj;ark;bz2;cab;deb;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzst;xz;zip;zoo;zst ++ extensions=7z;Z;apk;arc;arj;ark;bz2;cab;deb;gz;lha;lz;lz4;lzh;lzma;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzst;xz;zip;zoo;zst [doc] extensions=chm;css;ctl;diz;doc;docm;docx;dtd;htm;html;letter;lsm;mail;man;me;msg;nroff;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt ---- a/misc/mc.ext.in 2017-02-24 15:25:57.000000000 -0500 -+++ b/misc/mc.ext.in 2018-01-17 13:18:13.904861498 -0500 -@@ -185,11 +185,6 @@ +--- mc-4.8.24.orig/misc/mc.ext.in 2020-01-01 10:52:34.000000000 -0500 ++++ mc-4.8.24/misc/mc.ext.in 2020-04-11 01:09:41.727209584 -0500 +@@ -191,11 +191,6 @@ Open=%cd %p/uha:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ha @@ -101,7 +101,7 @@ # ALZip shell/i/.alz Open=%cd %p/ualz:// -@@ -706,12 +701,6 @@ +@@ -723,12 +718,6 @@ ### Plain compressed files ### @@ -114,9 +114,9 @@ # arc shell/i/.arc Open=%cd %p/uarc:// ---- a/misc/syntax/php.syntax 2017-11-18 12:45:59.000000000 -0500 -+++ b/misc/syntax/php.syntax 2018-01-17 13:19:14.398867675 -0500 -@@ -2177,22 +2177,6 @@ +--- mc-4.8.24.orig/misc/syntax/php.syntax 2020-01-01 10:52:34.000000000 -0500 ++++ mc-4.8.24/misc/syntax/php.syntax 2020-04-11 01:10:58.417208783 -0500 +@@ -2178,22 +2178,6 @@ # Radius constants keyword whole RADIUS\_\[0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_\] white @@ -139,8 +139,8 @@ # GNU Readline keyword whole readline\[0123456789_abcdefghijklmnopqrstuvwxyz\] yellow ---- a/misc/syntax/sh.syntax 2017-02-24 15:25:57.000000000 -0500 -+++ b/misc/syntax/sh.syntax 2018-01-17 13:20:38.588498398 -0500 +--- mc-4.8.24.orig/misc/syntax/sh.syntax 2020-01-01 10:52:34.000000000 -0500 ++++ mc-4.8.24/misc/syntax/sh.syntax 2020-04-11 01:12:11.577208020 -0500 @@ -610,7 +610,6 @@ keyword whole pwunconv cyan keyword whole ramsize cyan @@ -173,9 +173,9 @@ keyword whole uncompress cyan keyword whole unexpand cyan keyword whole unicode_start cyan ---- a/src/vfs/extfs/helpers/Makefile.am 2017-02-24 15:25:57.000000000 -0500 -+++ b/src/vfs/extfs/helpers/Makefile.am 2018-01-17 13:22:02.854792416 -0500 -@@ -24,7 +24,6 @@ +--- mc-4.8.24.orig/src/vfs/extfs/helpers/Makefile.am 2020-01-01 10:52:34.000000000 -0500 ++++ mc-4.8.24/src/vfs/extfs/helpers/Makefile.am 2020-04-11 01:13:34.177207157 -0500 +@@ -22,7 +22,6 @@ patchfs.in \ rpms+.in \ s3+.in \ @@ -183,7 +183,7 @@ ualz.in \ uar.in \ uarc.in \ -@@ -34,7 +33,6 @@ +@@ -31,7 +30,6 @@ uha.in \ ulha.in \ ulib.in \ @@ -191,7 +191,7 @@ uzip.in \ uzoo.in -@@ -54,7 +52,6 @@ +@@ -51,7 +49,6 @@ patchfs \ rpms+ \ s3+ \ @@ -199,7 +199,7 @@ ualz \ uar \ uarc \ -@@ -64,7 +61,6 @@ +@@ -60,7 +57,6 @@ uha \ ulha \ ulib \ @@ -207,33 +207,33 @@ uzip \ uzoo ---- a/src/vfs/extfs/helpers/Makefile.in 2017-11-25 13:33:53.000000000 -0500 -+++ b/src/vfs/extfs/helpers/Makefile.in 2018-01-17 13:26:22.653366629 -0500 -@@ -154,8 +154,8 @@ +--- mc-4.8.24.orig/src/vfs/extfs/helpers/Makefile.in 2020-01-18 16:43:04.000000000 -0500 ++++ mc-4.8.24/src/vfs/extfs/helpers/Makefile.in 2020-04-11 01:17:03.527204972 -0500 +@@ -145,8 +145,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = a+ apt+ audio deb deba debd dpkg+ iso9660 hp48+ \ -- lslR mailfs patchfs rpms+ s3+ uace ualz uar uarc uarj uc1541 \ -- ucab uha ulha ulib urar uzip uzoo -+ lslR mailfs patchfs rpms+ s3+ ualz uar uarc uarj uc1541 \ -+ ucab uha ulha ulib uzip uzoo +- lslR mailfs patchfs rpms+ s3+ uace ualz uar uarc uarj ucab uha \ +- ulha ulib urar uzip uzoo ++ lslR mailfs patchfs rpms+ s3+ ualz uar uarc uarj ucab uha \ ++ ulha ulib uzip uzoo CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ -@@ -213,10 +213,10 @@ +@@ -203,10 +203,10 @@ $(srcdir)/deba.in $(srcdir)/debd.in $(srcdir)/dpkg+.in \ $(srcdir)/hp48+.in $(srcdir)/iso9660.in $(srcdir)/lslR.in \ $(srcdir)/mailfs.in $(srcdir)/patchfs.in $(srcdir)/rpms+.in \ - $(srcdir)/s3+.in $(srcdir)/uace.in $(srcdir)/ualz.in \ + $(srcdir)/s3+.in $(srcdir)/ualz.in \ $(srcdir)/uar.in $(srcdir)/uarc.in $(srcdir)/uarj.in \ - $(srcdir)/uc1541.in $(srcdir)/ucab.in $(srcdir)/uha.in \ -- $(srcdir)/ulha.in $(srcdir)/ulib.in $(srcdir)/urar.in \ -+ $(srcdir)/ulha.in $(srcdir)/ulib.in \ - $(srcdir)/uzip.in $(srcdir)/uzoo.in README + $(srcdir)/ucab.in $(srcdir)/uha.in $(srcdir)/ulha.in \ +- $(srcdir)/ulib.in $(srcdir)/urar.in $(srcdir)/uzip.in \ ++ $(srcdir)/ulib.in $(srcdir)/uzip.in \ + $(srcdir)/uzoo.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -@@ -475,7 +475,6 @@ +@@ -433,7 +433,6 @@ patchfs.in \ rpms+.in \ s3+.in \ @@ -241,7 +241,7 @@ ualz.in \ uar.in \ uarc.in \ -@@ -485,7 +484,6 @@ +@@ -442,7 +441,6 @@ uha.in \ ulha.in \ ulib.in \ @@ -249,7 +249,7 @@ uzip.in \ uzoo.in -@@ -506,7 +504,6 @@ +@@ -463,7 +461,6 @@ patchfs \ rpms+ \ s3+ \ @@ -257,7 +257,7 @@ ualz \ uar \ uarc \ -@@ -516,7 +513,6 @@ +@@ -472,7 +469,6 @@ uha \ ulha \ ulib \ @@ -265,7 +265,7 @@ uzip \ uzoo -@@ -585,8 +581,6 @@ +@@ -539,8 +535,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ s3+: $(top_builddir)/config.status $(srcdir)/s3+.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -274,7 +274,7 @@ ualz: $(top_builddir)/config.status $(srcdir)/ualz.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ uar: $(top_builddir)/config.status $(srcdir)/uar.in -@@ -605,8 +599,6 @@ +@@ -557,8 +551,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ulib: $(top_builddir)/config.status $(srcdir)/ulib.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -283,8 +283,8 @@ uzip: $(top_builddir)/config.status $(srcdir)/uzip.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ uzoo: $(top_builddir)/config.status $(srcdir)/uzoo.in ---- a/src/vfs/extfs/helpers/uarj.in 2017-02-24 15:25:57.000000000 -0500 -+++ b/src/vfs/extfs/helpers/uarj.in 2018-01-17 13:28:05.322184649 -0500 +--- mc-4.8.24.orig/src/vfs/extfs/helpers/uarj.in 2020-01-01 10:52:34.000000000 -0500 ++++ mc-4.8.24/src/vfs/extfs/helpers/uarj.in 2020-04-11 01:18:24.717204124 -0500 @@ -3,9 +3,8 @@ # Written by Viatcheslav Odintsov (2:5020/181) # (C) 2002 ARJ Software Russia. diff --git a/libre/mc/mc-mksh-subshell-v2.patch b/libre/mc/mc-mksh-subshell-v2.patch new file mode 100644 index 000000000..e701d15f2 --- /dev/null +++ b/libre/mc/mc-mksh-subshell-v2.patch @@ -0,0 +1,74 @@ +# Support mksh for mc subshell +# https://midnight-commander.org/ticket/3748 +diff -Naur mc-4.8.18.orig/lib/shell.c mc-4.8.18/lib/shell.c +--- mc-4.8.18.orig/lib/shell.c 2016-09-22 18:24:12.000000000 +0000 ++++ mc-4.8.18/lib/shell.c 2017-02-16 13:47:34.933939000 +0000 +@@ -66,6 +66,8 @@ + /* 3rd choice: look for existing shells supported as MC subshells. */ + if (access ("/bin/bash", X_OK) == 0) + mc_shell->path = g_strdup ("/bin/bash"); ++ else if (access ("/bin/mksh", X_OK) == 0) ++ mc_shell->path = g_strdup ("/bin/mksh"); + else if (access ("/bin/ash", X_OK) == 0) + mc_shell->path = g_strdup ("/bin/ash"); + else if (access ("/bin/dash", X_OK) == 0) +@@ -149,6 +153,12 @@ + mc_shell->type = SHELL_ZSH; + mc_shell->name = "zsh"; + } ++ else if (strstr (mc_shell->path, "/mksh") != NULL ++ || strstr (mc_shell->real_path, "/mksh") != NULL) ++ { ++ mc_shell->type = SHELL_MKSH; ++ mc_shell->name = "mksh"; ++ } + else if (strstr (mc_shell->path, "/tcsh") != NULL + || strstr (mc_shell->real_path, "/tcsh") != NULL) + { +diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h +--- mc-4.8.18.orig/lib/shell.h 2016-03-12 15:45:47.000000000 +0000 ++++ mc-4.8.18/lib/shell.h 2017-02-15 21:57:39.000000000 +0000 +@@ -12,6 +12,7 @@ + typedef enum + { + SHELL_NONE, ++ SHELL_MKSH, + SHELL_SH, + SHELL_BASH, + SHELL_ASH_BUSYBOX, /* BusyBox default shell (ash) */ +diff -Naur mc-4.8.18.orig/src/subshell/common.c mc-4.8.18/src/subshell/common.c +--- mc-4.8.18.orig/src/subshell/common.c 2016-09-22 18:24:12.000000000 +0000 ++++ mc-4.8.18/src/subshell/common.c 2017-02-20 18:48:22.681514000 +0000 +@@ -320,6 +320,12 @@ + + break; + ++ case SHELL_MKSH: ++ init_file = g_strdup (".shrc"); ++ putenv_str = g_strconcat ("ENV=", init_file, (char *) NULL); ++ putenv (putenv_str); ++ break; ++ + /* TODO: Find a way to pass initfile to TCSH, ZSH and FISH */ + case SHELL_TCSH: + case SHELL_ZSH: +@@ -367,6 +373,7 @@ + + case SHELL_ASH_BUSYBOX: + case SHELL_DASH: ++ case SHELL_MKSH: + case SHELL_TCSH: + case SHELL_FISH: + execl (mc_global.shell->path, mc_global.shell->path, (char *) NULL); +@@ -801,6 +808,11 @@ + "PS1='\\u@\\h:\\w\\$ '\n", subshell_pipe[WRITE]); + break; + ++ case SHELL_MKSH: ++ g_snprintf (precmd, buff_size, ++ "PS1='$(pwd>&%d; kill -STOP $$)'\"$((( USER_ID )) && print '$ ' || print '# ')\"\n", subshell_pipe[WRITE]); ++ break; ++ + case SHELL_ASH_BUSYBOX: + /* BusyBox ash needs a somewhat complicated precmd emulation via PS1, and it is vital + * that BB be built with active CONFIG_ASH_EXPAND_PRMT, but this is the default anyway. diff --git a/libre/mc/mc-python3.patch b/libre/mc/mc-python3.patch new file mode 100644 index 000000000..8b74e0d1b --- /dev/null +++ b/libre/mc/mc-python3.patch @@ -0,0 +1,70 @@ +diff -up mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3 mc-4.8.24/src/vfs/extfs/helpers/uc1541 +--- mc-4.8.24/src/vfs/extfs/helpers/uc1541.python3 2020-01-20 14:40:30.637996501 +0100 ++++ mc-4.8.24/src/vfs/extfs/helpers/uc1541 2020-01-20 14:37:55.253442507 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + UC1541 Virtual filesystem + +--- a/src/vfs/extfs/helpers/s3+.in (original) ++++ b/src/vfs/extfs/helpers/s3+.in (refactored) +@@ -153,16 +153,16 @@ + Propagates exception safely. + """ + from threading import Thread +- import Queue ++ import queue + + items = list(iterable) + nitems = len(items) + if nitems < 2: +- return map(fun, items) ++ return list(map(fun, items)) + + # Create and fill input queue +- input = Queue.Queue() +- output = Queue.Queue() ++ input = queue.Queue() ++ output = queue.Queue() + + for i,item in enumerate(items): + input.put( (i,item) ) +@@ -181,7 +181,7 @@ + output.put( (i,result) ) + except: + output.put( (None,sys.exc_info()) ) +- except Queue.Empty: ++ except queue.Empty: + return + + # Start threads +@@ -196,8 +196,8 @@ + try: + i,res = output.get() + if i == None: +- raise res[0],res[1],res[2] +- except Queue.Empty: ++ raise res[0](res[1]).with_traceback(res[2]) ++ except queue.Empty: + break + ret.append(res) + +@@ -241,7 +241,7 @@ + b = s3.get_bucket(name, validate=False) + b.get_location() # just to raise an exception on error + return b +- except boto.exception.S3ResponseError, e: ++ except boto.exception.S3ResponseError as e: + # Seems this is the only proper way to switch to the bucket's region. + # Requesting of the default region for "?location" does not work unfortunately. + m = re.search(r'(.*?)', e.body) +@@ -340,7 +340,7 @@ + expr = re.compile(r'^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.\d{3}Z$') + def convDate(awsdatetime): + m = expr.match(awsdatetime) +- ye,mo,da,ho,mi,se = map(int,m.groups()) ++ ye,mo,da,ho,mi,se = list(map(int,m.groups())) + + dt = datetime.datetime(ye,mo,da,ho,mi,se, tzinfo=pytz.utc) + return dt.astimezone(tz).strftime('%m-%d-%Y %H:%M') -- cgit v1.2.3