libre.patch 15 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300
  1. --- mc-4.8.24.orig/configure 2020-01-18 16:43:02.000000000 -0500
  2. +++ mc-4.8.24/configure 2020-04-11 01:02:50.107213882 -0500
  3. @@ -27064,7 +27064,7 @@
  4. ac_config_files="$ac_config_files src/man2hlp/man2hlp"
  5. -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"
  6. +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"
  7. 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"
  8. @@ -28332,7 +28332,6 @@
  9. "src/vfs/extfs/helpers/patchfs") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/patchfs" ;;
  10. "src/vfs/extfs/helpers/rpms+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/rpms+" ;;
  11. "src/vfs/extfs/helpers/s3+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/s3+" ;;
  12. - "src/vfs/extfs/helpers/uace") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uace" ;;
  13. "src/vfs/extfs/helpers/ualz") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ualz" ;;
  14. "src/vfs/extfs/helpers/uar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uar" ;;
  15. "src/vfs/extfs/helpers/uarc") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uarc" ;;
  16. @@ -28341,7 +28340,6 @@
  17. "src/vfs/extfs/helpers/uha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uha" ;;
  18. "src/vfs/extfs/helpers/ulha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulha" ;;
  19. "src/vfs/extfs/helpers/ulib") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulib" ;;
  20. - "src/vfs/extfs/helpers/urar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/urar" ;;
  21. "src/vfs/extfs/helpers/uzip") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzip" ;;
  22. "src/vfs/extfs/helpers/uzoo") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzoo" ;;
  23. "src/vfs/fish/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/fish/Makefile" ;;
  24. --- mc-4.8.24.orig/configure.ac 2020-01-01 10:52:34.000000000 -0500
  25. +++ mc-4.8.24/configure.ac 2020-04-11 01:04:19.637212947 -0500
  26. @@ -615,7 +615,6 @@
  27. src/vfs/extfs/helpers/patchfs
  28. src/vfs/extfs/helpers/rpms+
  29. src/vfs/extfs/helpers/s3+
  30. -src/vfs/extfs/helpers/uace
  31. src/vfs/extfs/helpers/ualz
  32. src/vfs/extfs/helpers/uar
  33. src/vfs/extfs/helpers/uarc
  34. @@ -624,7 +623,6 @@
  35. src/vfs/extfs/helpers/uha
  36. src/vfs/extfs/helpers/ulha
  37. src/vfs/extfs/helpers/ulib
  38. -src/vfs/extfs/helpers/urar
  39. src/vfs/extfs/helpers/uzip
  40. src/vfs/extfs/helpers/uzoo
  41. --- mc-4.8.24.orig/misc/ext.d/archive.sh 2020-01-01 10:52:34.000000000 -0500
  42. +++ mc-4.8.24/misc/ext.d/archive.sh 2020-04-11 01:05:50.017212003 -0500
  43. @@ -82,8 +82,7 @@
  44. lha l "${MC_EXT_FILENAME}"
  45. ;;
  46. arj)
  47. - arj l "${MC_EXT_FILENAME}" 2>/dev/null || \
  48. - unarj l "${MC_EXT_FILENAME}"
  49. + arj l "${MC_EXT_FILENAME}" 2>/dev/null
  50. ;;
  51. cab)
  52. cabextract -l "${MC_EXT_FILENAME}"
  53. @@ -91,10 +90,6 @@
  54. ha)
  55. ha lf "${MC_EXT_FILENAME}"
  56. ;;
  57. - rar)
  58. - rar v -c- "${MC_EXT_FILENAME}" 2>/dev/null || \
  59. - unrar v -c- "${MC_EXT_FILENAME}"
  60. - ;;
  61. alz)
  62. unalz -l "${MC_EXT_FILENAME}"
  63. ;;
  64. @@ -126,9 +121,6 @@
  65. 7z l "${MC_EXT_FILENAME}"
  66. ;;
  67. - ace)
  68. - unace l "${MC_EXT_FILENAME}"
  69. - ;;
  70. arc)
  71. arc l "${MC_EXT_FILENAME}"
  72. ;;
  73. --- mc-4.8.24.orig/misc/filehighlight.ini 2020-01-01 10:52:34.000000000 -0500
  74. +++ mc-4.8.24/misc/filehighlight.ini 2020-04-11 01:07:34.567210912 -0500
  75. @@ -28,7 +28,7 @@
  76. regexp=(^#.*|.*~$)
  77. [archive]
  78. - 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
  79. + 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
  80. [doc]
  81. 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
  82. --- mc-4.8.24.orig/misc/mc.ext.in 2020-01-01 10:52:34.000000000 -0500
  83. +++ mc-4.8.24/misc/mc.ext.in 2020-04-11 01:09:41.727209584 -0500
  84. @@ -191,11 +191,6 @@
  85. Open=%cd %p/uha://
  86. View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ha
  87. -# rar
  88. -regex/i/\.r(ar|[0-9][0-9])$
  89. - Open=%cd %p/urar://
  90. - View=%view{ascii} @EXTHELPERSDIR@/archive.sh view rar
  91. -
  92. # ALZip
  93. shell/i/.alz
  94. Open=%cd %p/ualz://
  95. @@ -723,12 +718,6 @@
  96. ### Plain compressed files ###
  97. -# ace
  98. -shell/i/.ace
  99. - Open=%cd %p/uace://
  100. - View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ace
  101. - Extract=unace x %f
  102. -
  103. # arc
  104. shell/i/.arc
  105. Open=%cd %p/uarc://
  106. --- mc-4.8.24.orig/misc/syntax/php.syntax 2020-01-01 10:52:34.000000000 -0500
  107. +++ mc-4.8.24/misc/syntax/php.syntax 2020-04-11 01:10:58.417208783 -0500
  108. @@ -2178,22 +2178,6 @@
  109. # Radius constants
  110. keyword whole RADIUS\_\[0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_\] white
  111. -# Rar Functions
  112. - keyword whole rar_close yellow
  113. - keyword whole rar_entry_get yellow
  114. - keyword whole rar_list yellow
  115. - keyword whole rar_open yellow
  116. -
  117. -# Rar Functions Rar methods
  118. - keyword whole Rar yellow
  119. -
  120. -# Rar Functions constants
  121. - keyword whole RAR_HOST_BEOS white
  122. - keyword whole RAR_HOST_MSDOS white
  123. - keyword whole RAR_HOST_OS2 white
  124. - keyword whole RAR_HOST_UNIX white
  125. - keyword whole RAR_HOST_WIN32 white
  126. -
  127. # GNU Readline
  128. keyword whole readline\[0123456789_abcdefghijklmnopqrstuvwxyz\] yellow
  129. --- mc-4.8.24.orig/misc/syntax/sh.syntax 2020-01-01 10:52:34.000000000 -0500
  130. +++ mc-4.8.24/misc/syntax/sh.syntax 2020-04-11 01:12:11.577208020 -0500
  131. @@ -610,7 +610,6 @@
  132. keyword whole pwunconv cyan
  133. keyword whole ramsize cyan
  134. keyword whole ranlib cyan
  135. - keyword whole rar cyan
  136. keyword whole rarp cyan
  137. keyword whole raw cyan
  138. keyword whole rbash cyan
  139. @@ -782,7 +781,6 @@
  140. keyword whole ul cyan
  141. keyword whole umount cyan
  142. keyword whole uname cyan
  143. - keyword whole unarj cyan
  144. keyword whole uncompress cyan
  145. keyword whole unexpand cyan
  146. keyword whole unicode_start cyan
  147. @@ -1714,7 +1712,6 @@
  148. keyword whole pwunconv cyan
  149. keyword whole ramsize cyan
  150. keyword whole ranlib cyan
  151. - keyword whole rar cyan
  152. keyword whole rarp cyan
  153. keyword whole raw cyan
  154. keyword whole rbash cyan
  155. @@ -1886,7 +1883,6 @@
  156. keyword whole ul cyan
  157. keyword whole umount cyan
  158. keyword whole uname cyan
  159. - keyword whole unarj cyan
  160. keyword whole uncompress cyan
  161. keyword whole unexpand cyan
  162. keyword whole unicode_start cyan
  163. --- mc-4.8.24.orig/src/vfs/extfs/helpers/Makefile.am 2020-01-01 10:52:34.000000000 -0500
  164. +++ mc-4.8.24/src/vfs/extfs/helpers/Makefile.am 2020-04-11 01:13:34.177207157 -0500
  165. @@ -22,7 +22,6 @@
  166. patchfs.in \
  167. rpms+.in \
  168. s3+.in \
  169. - uace.in \
  170. ualz.in \
  171. uar.in \
  172. uarc.in \
  173. @@ -31,7 +30,6 @@
  174. uha.in \
  175. ulha.in \
  176. ulib.in \
  177. - urar.in \
  178. uzip.in \
  179. uzoo.in
  180. @@ -51,7 +49,6 @@
  181. patchfs \
  182. rpms+ \
  183. s3+ \
  184. - uace \
  185. ualz \
  186. uar \
  187. uarc \
  188. @@ -60,7 +57,6 @@
  189. uha \
  190. ulha \
  191. ulib \
  192. - urar \
  193. uzip \
  194. uzoo
  195. --- mc-4.8.24.orig/src/vfs/extfs/helpers/Makefile.in 2020-01-18 16:43:04.000000000 -0500
  196. +++ mc-4.8.24/src/vfs/extfs/helpers/Makefile.in 2020-04-11 01:17:03.527204972 -0500
  197. @@ -145,8 +145,8 @@
  198. mkinstalldirs = $(install_sh) -d
  199. CONFIG_HEADER = $(top_builddir)/config.h
  200. CONFIG_CLEAN_FILES = a+ apt+ audio deb deba debd dpkg+ iso9660 hp48+ \
  201. - lslR mailfs patchfs rpms+ s3+ uace ualz uar uarc uarj ucab uha \
  202. - ulha ulib urar uzip uzoo
  203. + lslR mailfs patchfs rpms+ s3+ ualz uar uarc uarj ucab uha \
  204. + ulha ulib uzip uzoo
  205. CONFIG_CLEAN_VPATH_FILES =
  206. am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  207. am__vpath_adj = case $$p in \
  208. @@ -203,10 +203,10 @@
  209. $(srcdir)/deba.in $(srcdir)/debd.in $(srcdir)/dpkg+.in \
  210. $(srcdir)/hp48+.in $(srcdir)/iso9660.in $(srcdir)/lslR.in \
  211. $(srcdir)/mailfs.in $(srcdir)/patchfs.in $(srcdir)/rpms+.in \
  212. - $(srcdir)/s3+.in $(srcdir)/uace.in $(srcdir)/ualz.in \
  213. + $(srcdir)/s3+.in $(srcdir)/ualz.in \
  214. $(srcdir)/uar.in $(srcdir)/uarc.in $(srcdir)/uarj.in \
  215. $(srcdir)/ucab.in $(srcdir)/uha.in $(srcdir)/ulha.in \
  216. - $(srcdir)/ulib.in $(srcdir)/urar.in $(srcdir)/uzip.in \
  217. + $(srcdir)/ulib.in $(srcdir)/uzip.in \
  218. $(srcdir)/uzoo.in README
  219. DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  220. ACLOCAL = @ACLOCAL@
  221. @@ -433,7 +433,6 @@
  222. patchfs.in \
  223. rpms+.in \
  224. s3+.in \
  225. - uace.in \
  226. ualz.in \
  227. uar.in \
  228. uarc.in \
  229. @@ -442,7 +441,6 @@
  230. uha.in \
  231. ulha.in \
  232. ulib.in \
  233. - urar.in \
  234. uzip.in \
  235. uzoo.in
  236. @@ -463,7 +461,6 @@
  237. patchfs \
  238. rpms+ \
  239. s3+ \
  240. - uace \
  241. ualz \
  242. uar \
  243. uarc \
  244. @@ -472,7 +469,6 @@
  245. uha \
  246. ulha \
  247. ulib \
  248. - urar \
  249. uzip \
  250. uzoo
  251. @@ -539,8 +535,6 @@
  252. cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  253. s3+: $(top_builddir)/config.status $(srcdir)/s3+.in
  254. cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  255. -uace: $(top_builddir)/config.status $(srcdir)/uace.in
  256. - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  257. ualz: $(top_builddir)/config.status $(srcdir)/ualz.in
  258. cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  259. uar: $(top_builddir)/config.status $(srcdir)/uar.in
  260. @@ -557,8 +551,6 @@
  261. cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  262. ulib: $(top_builddir)/config.status $(srcdir)/ulib.in
  263. cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  264. -urar: $(top_builddir)/config.status $(srcdir)/urar.in
  265. - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  266. uzip: $(top_builddir)/config.status $(srcdir)/uzip.in
  267. cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
  268. uzoo: $(top_builddir)/config.status $(srcdir)/uzoo.in
  269. --- mc-4.8.24.orig/src/vfs/extfs/helpers/uarj.in 2020-01-01 10:52:34.000000000 -0500
  270. +++ mc-4.8.24/src/vfs/extfs/helpers/uarj.in 2020-04-11 01:18:24.717204124 -0500
  271. @@ -3,9 +3,8 @@
  272. # Written by Viatcheslav Odintsov (2:5020/181)
  273. # (C) 2002 ARJ Software Russia.
  274. #
  275. -# This is an updated parser for ARJ archives in Midnight Commander. You need
  276. -# full ARJ rather than UNARJ. Open-source ARJ v 3.10 for Unix platforms can
  277. -# be obtained here:
  278. +# This is an updated parser for ARJ archives in Midnight Commander.
  279. +# Open-source ARJ v 3.10 for Unix platforms can be obtained here:
  280. #
  281. # - http://www.sourceforge.net/projects/arj/
  282. # - http://arj.sourceforge.net/