libre.patch 15 KB

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