summaryrefslogtreecommitdiff
path: root/libre/mc
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2021-05-19 00:11:26 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2021-05-19 00:11:26 -0500
commit5063cdd447b55fe92ed0d33dd30ae653c9eb4020 (patch)
treecdaaabc76e74f9a5b0f9d300e010b04aa825c3e0 /libre/mc
parent1107c0d98cde0551cbe573694b2881c6874f6e03 (diff)
downloadabslibre-5063cdd447b55fe92ed0d33dd30ae653c9eb4020.tar.gz
abslibre-5063cdd447b55fe92ed0d33dd30ae653c9eb4020.tar.bz2
abslibre-5063cdd447b55fe92ed0d33dd30ae653c9eb4020.zip
mc-4.8.26-1.parabola1: updating version
Diffstat (limited to 'libre/mc')
-rw-r--r--libre/mc/PKGBUILD11
-rw-r--r--libre/mc/libre.patch148
2 files changed, 79 insertions, 80 deletions
diff --git a/libre/mc/PKGBUILD b/libre/mc/PKGBUILD
index 856aca45f..eb3e9ea9a 100644
--- a/libre/mc/PKGBUILD
+++ b/libre/mc/PKGBUILD
@@ -6,8 +6,8 @@
# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
pkgname=mc
-pkgver=4.8.24
-pkgrel=2
+pkgver=4.8.26
+pkgrel=1
pkgrel+=.parabola1
pkgdesc="A file manager that emulates Norton Commander"
pkgdesc+=", with arj recommendation included and nonfree unace and unrar support removed"
@@ -15,7 +15,7 @@ arch=('x86_64')
arch+=('i686' 'armv7h')
url="https://midnight-commander.org/"
license=('GPL')
-depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang')
+depends=('e2fsprogs' 'glib2' 'gpm' 'libssh2' 'slang' 'which')
makedepends=('libxt' 'libx11' 'unzip')
optdepends=('aspell: spelling corrections'
'cabextract: ucab extfs'
@@ -26,6 +26,7 @@ optdepends=('aspell: spelling corrections'
'mtools: a+ extfs'
'p7zip: support for 7zip archives'
'perl: needed by several extfs scripts'
+ 'python: to access uc1541 or s3 storage'
'python-boto: s3+ extfs'
'python-pytz: s3+ extfs'
'samba: VFS support'
@@ -45,10 +46,10 @@ source=("http://ftp.midnight-commander.org/${pkgname}-${pkgver}.tar.xz"
"mc-mksh-subshell-v2.patch"
"mc-python3.patch"
'libre.patch')
-sha256sums=('859f1cc070450bf6eb4d319ffcb6a5ac29deb0ac0d81559fb2e71242b1176d46'
+sha256sums=('c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27'
'5147afa3f9dfc00d8b7b36bbb144bcdb78d86301a0f8196686262a9eee41fb96'
'10ab8b8c03770f8fe51f0bdbf0d66a44313bf2eed687cf769397909c07d8e8d5'
- '0129171a9af3d1a7e37be232809e3f42921ef8fa016974234ca61f3fa180232b')
+ 'e3124bb9c43bdf43765e5538381c6b8749619e2fdde4f711e6a17d0ff6946dd8')
prepare() {
cd ${pkgname}-${pkgver}
diff --git a/libre/mc/libre.patch b/libre/mc/libre.patch
index 5fdc85fd4..c82ece0d4 100644
--- a/libre/mc/libre.patch
+++ b/libre/mc/libre.patch
@@ -1,15 +1,15 @@
---- 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 @@
+--- mc-4.8.26.orig/configure 2021-01-21 12:14:03.000000000 -0500
++++ mc-4.8.26/configure 2021-05-18 22:32:42.938105669 -0500
+@@ -27253,7 +27253,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.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 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/unar src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uwim 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/unar src/vfs/extfs/helpers/uwim 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"
-@@ -28332,7 +28332,6 @@
+@@ -28525,7 +28525,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,17 +17,17 @@
"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" ;;
-@@ -28341,7 +28340,6 @@
- "src/vfs/extfs/helpers/uha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uha" ;;
+@@ -28535,7 +28534,6 @@
"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" ;;
+ "src/vfs/extfs/helpers/unar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/unar" ;;
- "src/vfs/extfs/helpers/urar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/urar" ;;
+ "src/vfs/extfs/helpers/uwim") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uwim" ;;
"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" ;;
---- 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 @@
+--- mc-4.8.26.orig/configure.ac 2021-01-10 06:50:16.000000000 -0500
++++ mc-4.8.26/configure.ac 2021-05-18 22:34:01.688104728 -0500
+@@ -616,7 +616,6 @@
src/vfs/extfs/helpers/patchfs
src/vfs/extfs/helpers/rpms+
src/vfs/extfs/helpers/s3+
@@ -35,27 +35,25 @@
src/vfs/extfs/helpers/ualz
src/vfs/extfs/helpers/uar
src/vfs/extfs/helpers/uarc
-@@ -624,7 +623,6 @@
- src/vfs/extfs/helpers/uha
+@@ -626,7 +625,6 @@
src/vfs/extfs/helpers/ulha
src/vfs/extfs/helpers/ulib
+ src/vfs/extfs/helpers/unar
-src/vfs/extfs/helpers/urar
+ src/vfs/extfs/helpers/uwim
src/vfs/extfs/helpers/uzip
src/vfs/extfs/helpers/uzoo
-
---- 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}"
+--- mc-4.8.26.orig/misc/ext.d/archive.sh 2021-01-10 06:50:16.000000000 -0500
++++ mc-4.8.26/misc/ext.d/archive.sh 2021-05-18 22:43:10.808098165 -0500
+@@ -85,7 +85,6 @@
;;
arj)
-- arj l "${MC_EXT_FILENAME}" 2>/dev/null || \
-- unarj l "${MC_EXT_FILENAME}"
-+ arj l "${MC_EXT_FILENAME}" 2>/dev/null
+ arj l "${MC_EXT_FILENAME}" 2>/dev/null || \
+- unarj l "${MC_EXT_FILENAME}" 2>/dev/null || \
+ 7za l "${MC_EXT_FILENAME}" 2>/dev/null
;;
cab)
- cabextract -l "${MC_EXT_FILENAME}"
-@@ -91,10 +90,6 @@
+@@ -95,10 +94,6 @@
ha)
ha lf "${MC_EXT_FILENAME}"
;;
@@ -66,7 +64,7 @@
alz)
unalz -l "${MC_EXT_FILENAME}"
;;
-@@ -126,9 +121,6 @@
+@@ -130,9 +125,6 @@
7z l "${MC_EXT_FILENAME}"
;;
@@ -76,20 +74,20 @@
arc)
arc l "${MC_EXT_FILENAME}"
;;
---- 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
+--- mc-4.8.26.orig/misc/filehighlight.ini 2021-01-10 06:50:16.000000000 -0500
++++ mc-4.8.26/misc/filehighlight.ini 2021-05-18 22:45:05.338096796 -0500
@@ -28,7 +28,7 @@
regexp=(^#.*|.*~$)
[archive]
-- 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
+- extensions=7z;Z;ace;apk;arc;arj;ark;bz2;cab;cpio;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;cpio;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
---- 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 @@
+ extensions=chm;css;ctl;diz;doc;docm;docx;dtd;fodg;fodp;fods;fodt;htm;html;letter;lsm;mail;man;me;msg;nroff;odg;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt
+--- mc-4.8.26.orig/misc/mc.ext.in 2021-01-10 06:50:16.000000000 -0500
++++ mc-4.8.26/misc/mc.ext.in 2021-05-18 22:46:51.238095531 -0500
+@@ -196,11 +196,6 @@
Open=%cd %p/uha://
View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ha
@@ -101,7 +99,7 @@
# ALZip
shell/i/.alz
Open=%cd %p/ualz://
-@@ -723,12 +718,6 @@
+@@ -732,12 +727,6 @@
### Plain compressed files ###
@@ -114,8 +112,8 @@
# arc
shell/i/.arc
Open=%cd %p/uarc://
---- 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
+--- mc-4.8.26.orig/misc/syntax/php.syntax 2021-01-10 06:50:16.000000000 -0500
++++ mc-4.8.26/misc/syntax/php.syntax 2021-05-18 22:47:43.388094907 -0500
@@ -2178,22 +2178,6 @@
# Radius constants
keyword whole RADIUS\_\[0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_\] white
@@ -139,9 +137,9 @@
# GNU Readline
keyword whole readline\[0123456789_abcdefghijklmnopqrstuvwxyz\] yellow
---- 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 @@
+--- mc-4.8.26.orig/misc/syntax/sh.syntax 2021-01-10 06:50:16.000000000 -0500
++++ mc-4.8.26/misc/syntax/sh.syntax 2021-05-18 22:49:18.508093770 -0500
+@@ -613,7 +613,6 @@
keyword whole pwunconv cyan
keyword whole ramsize cyan
keyword whole ranlib cyan
@@ -149,7 +147,7 @@
keyword whole rarp cyan
keyword whole raw cyan
keyword whole rbash cyan
-@@ -782,7 +781,6 @@
+@@ -785,7 +784,6 @@
keyword whole ul cyan
keyword whole umount cyan
keyword whole uname cyan
@@ -157,7 +155,7 @@
keyword whole uncompress cyan
keyword whole unexpand cyan
keyword whole unicode_start cyan
-@@ -1714,7 +1712,6 @@
+@@ -1717,7 +1715,6 @@
keyword whole pwunconv cyan
keyword whole ramsize cyan
keyword whole ranlib cyan
@@ -165,7 +163,7 @@
keyword whole rarp cyan
keyword whole raw cyan
keyword whole rbash cyan
-@@ -1886,7 +1883,6 @@
+@@ -1889,7 +1886,6 @@
keyword whole ul cyan
keyword whole umount cyan
keyword whole uname cyan
@@ -173,8 +171,8 @@
keyword whole uncompress cyan
keyword whole unexpand cyan
keyword whole unicode_start cyan
---- 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
+--- mc-4.8.26.orig/src/vfs/extfs/helpers/Makefile.am 2021-01-10 06:50:16.000000000 -0500
++++ mc-4.8.26/src/vfs/extfs/helpers/Makefile.am 2021-05-18 22:50:38.028092820 -0500
@@ -22,7 +22,6 @@
patchfs.in \
rpms+.in \
@@ -183,15 +181,15 @@
ualz.in \
uar.in \
uarc.in \
-@@ -31,7 +30,6 @@
- uha.in \
+@@ -32,7 +31,6 @@
ulha.in \
ulib.in \
+ unar.in \
- urar.in \
+ uwim.in \
uzip.in \
uzoo.in
-
-@@ -51,7 +49,6 @@
+@@ -53,7 +51,6 @@
patchfs \
rpms+ \
s3+ \
@@ -199,28 +197,28 @@
ualz \
uar \
uarc \
-@@ -60,7 +57,6 @@
- uha \
+@@ -63,7 +60,6 @@
ulha \
ulib \
+ unar \
- urar \
+ uwim \
uzip \
uzoo
-
---- 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 @@
+--- mc-4.8.26.orig/src/vfs/extfs/helpers/Makefile.in 2021-01-21 12:14:05.000000000 -0500
++++ mc-4.8.26/src/vfs/extfs/helpers/Makefile.in 2021-05-18 22:54:14.698090231 -0500
+@@ -146,8 +146,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 ucab uha \
-- ulha ulib urar uzip uzoo
+- ulha ulib unar urar uwim uzip uzoo
+ lslR mailfs patchfs rpms+ s3+ ualz uar uarc uarj ucab uha \
-+ ulha ulib uzip uzoo
++ ulha ulib unar uwim uzip uzoo
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
-@@ -203,10 +203,10 @@
+@@ -204,10 +204,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 \
@@ -228,12 +226,12 @@
+ $(srcdir)/s3+.in $(srcdir)/ualz.in \
$(srcdir)/uar.in $(srcdir)/uarc.in $(srcdir)/uarj.in \
$(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
+- $(srcdir)/ulib.in $(srcdir)/unar.in $(srcdir)/urar.in \
++ $(srcdir)/ulib.in $(srcdir)/unar.in \
+ $(srcdir)/uwim.in $(srcdir)/uzip.in $(srcdir)/uzoo.in README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-@@ -433,7 +433,6 @@
+@@ -438,7 +438,6 @@
patchfs.in \
rpms+.in \
s3+.in \
@@ -241,15 +239,15 @@
ualz.in \
uar.in \
uarc.in \
-@@ -442,7 +441,6 @@
- uha.in \
+@@ -448,7 +447,6 @@
ulha.in \
ulib.in \
+ unar.in \
- urar.in \
+ uwim.in \
uzip.in \
uzoo.in
-
-@@ -463,7 +461,6 @@
+@@ -470,7 +468,6 @@
patchfs \
rpms+ \
s3+ \
@@ -257,15 +255,15 @@
ualz \
uar \
uarc \
-@@ -472,7 +469,6 @@
- uha \
+@@ -480,7 +477,6 @@
ulha \
ulib \
+ unar \
- urar \
+ uwim \
uzip \
uzoo
-
-@@ -539,8 +535,6 @@
+@@ -548,8 +544,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
s3+: $(top_builddir)/config.status $(srcdir)/s3+.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -274,17 +272,17 @@
ualz: $(top_builddir)/config.status $(srcdir)/ualz.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
uar: $(top_builddir)/config.status $(srcdir)/uar.in
-@@ -557,8 +551,6 @@
+@@ -568,8 +562,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- ulib: $(top_builddir)/config.status $(srcdir)/ulib.in
+ unar: $(top_builddir)/config.status $(srcdir)/unar.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-urar: $(top_builddir)/config.status $(srcdir)/urar.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- uzip: $(top_builddir)/config.status $(srcdir)/uzip.in
+ uwim: $(top_builddir)/config.status $(srcdir)/uwim.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- uzoo: $(top_builddir)/config.status $(srcdir)/uzoo.in
---- 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
+ uzip: $(top_builddir)/config.status $(srcdir)/uzip.in
+--- mc-4.8.26.orig/src/vfs/extfs/helpers/uarj.in 2021-01-10 06:50:16.000000000 -0500
++++ mc-4.8.26/src/vfs/extfs/helpers/uarj.in 2021-05-18 22:56:02.148088946 -0500
@@ -3,9 +3,8 @@
# Written by Viatcheslav Odintsov (2:5020/181)
# (C) 2002 ARJ Software Russia.