summaryrefslogtreecommitdiff
path: root/package/mc/patches
diff options
context:
space:
mode:
authorwbx <wbx@hydrogenium.(none)>2009-05-17 14:41:34 +0200
committerwbx <wbx@hydrogenium.(none)>2009-05-17 14:41:34 +0200
commit219a6dab8995aad9ac4860cc1a84d6f3509a03a4 (patch)
treeb9c0f3c43aebba2fcfef777592d0add39f2072f4 /package/mc/patches
Initial import
Diffstat (limited to 'package/mc/patches')
-rw-r--r--package/mc/patches/patch-lib_mc_ext_in92
-rw-r--r--package/mc/patches/patch-lib_mc_lib378
-rw-r--r--package/mc/patches/patch-lib_mc_menu17
-rw-r--r--package/mc/patches/patch-src_key_c13
-rw-r--r--package/mc/patches/patch-src_main_c13
-rw-r--r--package/mc/patches/patch-vfs_extfs_iso9660_in31
6 files changed, 544 insertions, 0 deletions
diff --git a/package/mc/patches/patch-lib_mc_ext_in b/package/mc/patches/patch-lib_mc_ext_in
new file mode 100644
index 000000000..3169ca23a
--- /dev/null
+++ b/package/mc/patches/patch-lib_mc_ext_in
@@ -0,0 +1,92 @@
+$Id$
+$MirOS: ports/misc/mc/patches/patch-lib_mc_ext_in,v 1.7 2006/09/28 20:31:52 tg Exp $
+--- mc-4.6.1.orig/lib/mc.ext.in 2005-07-23 16:51:15.000000000 +0000
++++ mc-4.6.1/lib/mc.ext.in 2007-03-20 13:32:10.000000000 +0000
+@@ -106,6 +106,42 @@
+
+ ### Archives ###
+
++## CPIO
++
++# .cgz
++shell/.cgz
++ Open=%cd %p#ucpio
++ View=%view{ascii} gzip -dc %f 2>/dev/null | cpio -itv 2>/dev/null
++
++# .cbz
++shell/.cbz
++ Open=%cd %p#ucpio
++ View=%view{ascii} bzip2 -dc %f 2>/dev/null | cpio -itv 2>/dev/null
++
++## CPIO (newc) - MirOS extension
++
++# .ngz
++shell/.ngz
++ Open=%cd %p#ucpio
++ View=%view{ascii} gzip -dc %f 2>/dev/null | cpio -itv 2>/dev/null
++
++# .nbz
++shell/.nbz
++ Open=%cd %p#ucpio
++ View=%view{ascii} bzip2 -dc %f 2>/dev/null | cpio -itv 2>/dev/null
++
++# .mcz
++shell/.mcz
++ Open=%cd %p#ucpio
++ View=%view{ascii} gzip -dc %f 2>/dev/null | cpio -itv 2>/dev/null
++
++## USTAR
++
++# .tbz
++shell/.tbz
++ Open=%cd %p#utar
++ View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
++
+ # .tgz, .tpz, .tar.gz, .tar.z, .tar.Z
+ regex/\.t([gp]?z|ar\.g?[zZ])$
+ Open=%cd %p#utar
+@@ -135,6 +171,10 @@ regex/\.(tar|TAR)$
+ View=%view{ascii} tar tvvf %f
+
+ # lha
++regex/\.[Ll]([Zz][Hh]|[Hh][Aa])$
++ Open=%cd %p#ulha
++ View=%view{ascii} lha l %f
++
+ type/^LHa\ .*archive
+ Open=%cd %p#ulha
+ View=%view{ascii} lha l %f
+@@ -191,13 +231,20 @@ regex/\.(rpm|spm)$
+ Open=%cd %p#rpm
+ View=%view{ascii} if rpm --nosignature --version >/dev/null 2>&1; then RPM="rpm --nosignature" ; else RPM="rpm" ; fi ; $RPM -qivlp --scripts %f
+
+-# deb
++# deb - Debian packages
+ regex/\.u?deb$
+- Open=%cd %p#deb
+- View=%view{ascii} dpkg-deb -c %f
++# Open=%cd %p#deb
++# View=%view{ascii} dpkg-deb -c %f
++ Open=%cd %p#uar
++ View=%view{ascii} ar p %f control.tar.gz | gzip -d | tar xOf - ./control; echo; ar p %f data.tar.gz | gzip -d | tar tvvf -
++
++# ipk - like deb, but tgz instead of ar
++shell/.ipk
++ Open=%cd %p#utar
++ View=%view{ascii} gzip -dc %f 2>&- | tar xOf - ./control.tar.gz | gzip -d | tar xOf - ./control; echo; gzip -dc %f 2>&- | tar xOf - ./data.tar.gz | gzip -d | tar tvvf -
+
+ # ISO9660
+-regex/\.iso$
++regex/\.[Ii][Ss][Oo]$
+ Open=%cd %p#iso9660
+ View=%view{ascii} isoinfo -l -i %f
+
+@@ -417,7 +464,7 @@ type/^PDF
+
+ # html
+ regex/\.([hH][tT][mM][lL]?)$
+- Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
++ Open=lynx -force_html %f
+ View=%view{ascii} lynx -dump -force_html %f
+
+ # StarOffice 5.2
diff --git a/package/mc/patches/patch-lib_mc_lib b/package/mc/patches/patch-lib_mc_lib
new file mode 100644
index 000000000..51445e0fe
--- /dev/null
+++ b/package/mc/patches/patch-lib_mc_lib
@@ -0,0 +1,378 @@
+$Id$
+$MirOS: ports/misc/mc/patches/patch-lib_mc_lib,v 1.9 2007/03/01 23:56:43 tg Exp $
+--- mc-4.6.1.orig/lib/mc.lib 2004-09-10 09:23:44.000000000 +0000
++++ mc-4.6.1/lib/mc.lib 2007-03-20 13:32:10.000000000 +0000
+@@ -1,8 +1,27 @@
++# $MirOS: ports/misc/mc/patches/patch-lib_mc_lib,v 1.9 2007/03/01 23:56:43 tg Exp $
++#-
++# Copyright (c) 2003, 2004, 2005, 2006
++# Thorsten Glaser <tg@mirbsd.de>
++#
++# Provided that these terms and disclaimer and all copyright notices
++# are retained or reproduced in an accompanying document, permission
++# is granted to deal in this work without restriction, including un-
++# limited rights to use, publicly perform, distribute, sell, modify,
++# merge, give away, or sublicence.
++#
++# This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
++# the utmost extent permitted by applicable law, neither express nor
++# implied; without malicious intent or gross negligence. In no event
++# may a licensor, author or contributor be held liable for indirect,
++# direct, other damage, loss, or other issues arising in any way out
++# of dealing in the work, even if advised of the possibility of such
++# damage or existence of a defect, except proven that it results out
++# of said person's immediate fault when using the work as intended.
++
+ [Special dirs]
+ list=/afs,/coda,/:,/...,/net,/#smb
+
+ [terminal:console]
+-insert=\e[2~
+ f11=\e[23~
+ f12=\e[24~
+ f13=\e[25~
+@@ -13,25 +32,25 @@ f17=\e[31~
+ f18=\e[32~
+ f19=\e[33~
+ f20=\e[34~
+-kpleft=\eOt
+-kpright=\eOv
+-kpup=\eOx
++insert=\e[2~
++kpasterix=\eOR
++kpdelete=\eOn
+ kpdown=\eOr
+-kphome=\eOw
+ kpend=\eOq
++kpenter=\eOM
++kphome=\eOw
++kpinsert=\eOp
++kpleft=\eOt
++kpminus=\eOS
+ kpnpage=\eOs
+-kpppage=\eOy
++kpnumlock=\eOP
+ kpplus=\eOl
+-kpminus=\eOS
+-kpasterix=\eOR
+-kpinsert=\eOp
+-kpdelete=\eOn
+-kpenter=\eOM
++kpppage=\eOy
++kpright=\eOv
+ kpslash=\eOQ
+-kpnumlock=\eOP
++kpup=\eOx
+
+ [terminal:linux]
+-insert=\e[2~
+ f11=\e[23~
+ f12=\e[24~
+ f13=\e[25~
+@@ -42,25 +61,31 @@ f17=\e[31~
+ f18=\e[32~
+ f19=\e[33~
+ f20=\e[34~
+-kpleft=\eOt
+-kpright=\eOv
+-kpup=\eOx
++insert=\e[2~
++kpasterix=\eOR
++kpdelete=\eOn
+ kpdown=\eOr
+-kphome=\eOw
+ kpend=\eOq
++kpenter=\eOM
++kphome=\eOw
++kpinsert=\eOp
++kpleft=\eOt
++kpminus=\eOS
+ kpnpage=\eOs
+-kpppage=\eOy
++kpnumlock=\eOP
+ kpplus=\eOl
+-kpminus=\eOS
+-kpasterix=\eOR
+-kpinsert=\eOp
+-kpdelete=\eOn
+-kpenter=\eOM
++kpppage=\eOy
++kpright=\eOv
+ kpslash=\eOQ
+-kpnumlock=\eOP
++kpup=\eOx
+
+ [terminal:xterm]
+-insert=\e[2~
++bs=
++delete=\e[3~
++end=\eOF
++end=\e[4~
++end=\e[8~
++end=\e[F
+ f11=\e[23~
+ f12=\e[24~
+ f13=\e[25~
+@@ -71,27 +96,22 @@ f17=\e[31~
+ f18=\e[32~
+ f19=\e[33~
+ f20=\e[34~
+-kpleft=\eOt
+-kpright=\eOv
+-kpup=\eOx
++home=\eOH
++home=\e[1~
++home=\e[7~
++home=\e[H
++insert=\e[2~
++kpasterix=\eOj
+ kpdown=\eOr
+-kphome=\eOw
+ kpend=\eOq
++kphome=\eOw
++kpleft=\eOt
++kpminus=\eOm
+ kpnpage=\eOs
+-kpppage=\eOy
+ kpplus=\eOk
+-kpminus=\eOm
+-kpasterix=\eOj
+-delete=\e[3~
+-bs=
+-home=\e[1~
+-home=\e[7~
+-end=\eOF
+-end=\e[F
+-end=\e[4~
+-end=\e[8~
+-home=\eOH
+-home=\e[H
++kpppage=\eOy
++kpright=\eOv
++kpup=\eOx
+ pgdn=\e[6~
+ pgup=\e[5~
+
+@@ -108,14 +128,14 @@ f19=\e[20;2~
+ f20=\e[21;2~
+
+ # Arrows for both keypad modes (application and normal).
+-up=\e[A
+-up=\eOA
+-down=\e[B
+ down=\eOB
+-right=\e[C
+-right=\eOC
+-left=\e[D
++down=\e[B
+ left=\eOD
++left=\e[D
++right=\eOC
++right=\e[C
++up=\eOA
++up=\e[A
+
+ [terminal:gnome]
+ copy=xterm
+@@ -126,8 +146,15 @@ copy=xterm
+ [terminal:xterm-new]
+ copy=xterm
+
++[terminal:xterm-xfree86]
++copy=xterm
++
+ [terminal:xterm-color]
+-insert=\e[2~
++bs=
++delete=\e[3~
++end=\eOF
++end=\e[4~
++end=\e[8~
+ f11=\e[23~
+ f12=\e[24~
+ f13=\e[25~
+@@ -138,29 +165,27 @@ f17=\e[31~
+ f18=\e[32~
+ f19=\e[33~
+ f20=\e[34~
+-kpleft=\eOt
+-kpright=\eOv
+-kpup=\eOx
++home=\eOH
++home=\e[1~
++home=\e[7~
++insert=\e[2~
++kpasterix=\eOj
+ kpdown=\eOr
+-kphome=\eOw
+ kpend=\eOq
++kphome=\eOw
++kpleft=\eOt
++kpminus=\eOm
+ kpnpage=\eOs
+-kpppage=\eOy
+ kpplus=\eOk
+-kpminus=\eOm
+-kpasterix=\eOj
+-delete=\e[3~
+-bs=
+-home=\e[1~
+-home=\e[7~
+-home=\eOH
+-end=\e[4~
+-end=\e[8~
+-end=\eOF
++kpppage=\eOy
++kpright=\eOv
++kpup=\eOx
+ pgdn=\e[6~
+ pgup=\e[5~
+
+ [terminal:ibmpc3]
++bs=^h
++end=\e[F
+ f11=\e[Y
+ f12=\e[Z
+ f13=\e[a
+@@ -171,11 +196,9 @@ f17=\e[e
+ f18=\e[f
+ f19=\e[g
+ f20=\e[h
+-bs=^h
+-end=\e[F
+-kpplus=\e[+
+-kpminus=\e[-
+ kpasterix=\e[*
++kpminus=\e[-
++kpplus=\e[+
+
+ [terminal:cons25]
+ f11=\e[Y
+@@ -188,3 +211,127 @@ f17=\e[e
+ f18=\e[f
+ f19=\e[g
+ f20=\e[h
++
++# Sequences below are used in OpenBSD wscons, also via remote login
++
++[terminal:vt220]
++bs=
++end=\e[8~
++f1=\e[11~
++f2=\e[12~
++f3=\e[13~
++f4=\e[14~
++f5=\e[15~
++f6=\e[17~
++f7=\e[18~
++f8=\e[19~
++f9=\e[20~
++f10=\e[21~
++f11=\e[23~
++f12=\e[24~
++home=\e[7~
++
++[terminal:wsvt25]
++bs=
++end=\e[8~
++f1=\e[11~
++f2=\e[12~
++f3=\e[13~
++f4=\e[14~
++f5=\e[15~
++f6=\e[17~
++f7=\e[18~
++f8=\e[19~
++f9=\e[20~
++f10=\e[21~
++f11=\e[23~
++f12=\e[24~
++home=\e[7~
++
++[terminal:wsvtg]
++bs=
++end=\e[8~
++f1=\e[11~
++f2=\e[12~
++f3=\e[13~
++f4=\e[14~
++f5=\e[15~
++f6=\e[17~
++f7=\e[18~
++f8=\e[19~
++f9=\e[20~
++f10=\e[21~
++f11=\e[23~
++f12=\e[24~
++home=\e[7~
++
++# Not a real vt100, but NetBSD wscons in vt220 mode with
++# $TERM set to vt100. Except F5-F9, this matches screen.
++
++[terminal:vt100]
++bs=
++complete=‰
++delete=\e[3~
++end=\e[8~
++f1=\e[11~
++f2=\e[12~
++f3=\e[13~
++f4=\e[14~
++f5=\e[15~
++f6=\e[17~
++f7=\e[18~
++f8=\e[19~
++f9=\e[20~
++f10=\e[21~
++f11=\e[23~
++f12=\e[24~
++home=\e[7~
++insert=\e[2~
++pgdn=\e[6~
++pgup=\e[5~
++
++# GNU screen - depending on its environment, here: wsvt25
++[terminal:screen]
++end=\e[8~
++f10=\e[20~
++f1=\e[11~
++f2=\e[12~
++f3=\e[13~
++f4=\e[14~
++f5=\e[15~
++f6=\e[15~
++f7=\e[17~
++f8=\e[18~
++f9=\e[19~
++home=\e[7~
++
++# PuTTY
++[terminal:ansi]
++bs=^h
++down=\eOB
++f1=\eOP
++f2=\eOQ
++f3=\eOR
++f4=\eOS
++left=\eOD
++right=\eOC
++up=\eOA
++
++# Windows 3.1 TELNET.EXE
++# (not really useful. The F-Keys, INS etc. don't work.)
++[terminal:ansi-nt]
++f1=\eOP
++f2=\eOQ
++f3=\eOR
++f4=\eOS
++bs=^h
++up=\e[A
++down=\e[B
++left=\e[D
++right=\e[C
++delete=
++
++# Microsoft Services for Unix 3.5 (native terminal, xterm see above)
++[terminal:interix]
++home=\e[H
++delete=
diff --git a/package/mc/patches/patch-lib_mc_menu b/package/mc/patches/patch-lib_mc_menu
new file mode 100644
index 000000000..c29c0a79d
--- /dev/null
+++ b/package/mc/patches/patch-lib_mc_menu
@@ -0,0 +1,17 @@
+$Id$
+$MirOS: ports/misc/mc/patches/patch-lib_mc_menu,v 1.9 2007/03/01 23:56:43 tg Exp $
+--- mc-4.6.1.orig/lib/mc.menu 2004-08-17 08:31:16.000000000 +0000
++++ mc-4.6.1/lib/mc.menu 2007-03-20 13:32:10.000000000 +0000
+@@ -1,4 +1,12 @@
+ shell_patterns=0
+++ t r & ! t t
++u Diff file against opposite
++ diff -dupa %f %D/%F 2>&1 | less
++
++= t d
++U Diff dir against opposite
++ diff -pdu . %D 2>&1 | grep -v "^Only in " | less
++
+ + ! t t
+ @ Do something on the current file
+ CMD=%{Enter command}
diff --git a/package/mc/patches/patch-src_key_c b/package/mc/patches/patch-src_key_c
new file mode 100644
index 000000000..00b504c71
--- /dev/null
+++ b/package/mc/patches/patch-src_key_c
@@ -0,0 +1,13 @@
+$Id$
+$MirOS: ports/misc/mc/patches/patch-src_key_c,v 1.1 2006/10/28 22:35:47 tg Exp $
+--- mc-4.6.1.orig/src/key.c 2005-06-08 12:27:19.000000000 +0000
++++ mc-4.6.1/src/key.c 2007-03-20 13:32:10.000000000 +0000
+@@ -86,7 +86,7 @@ int mou_auto_repeat = 100;
+ int double_click_speed = 250;
+ int old_esc_mode = 0;
+
+-int use_8th_bit_as_meta = 0;
++int use_8th_bit_as_meta = 1;
+
+ typedef struct key_def {
+ char ch; /* Holds the matching char code */
diff --git a/package/mc/patches/patch-src_main_c b/package/mc/patches/patch-src_main_c
new file mode 100644
index 000000000..f7b29b3d0
--- /dev/null
+++ b/package/mc/patches/patch-src_main_c
@@ -0,0 +1,13 @@
+$Id$
+$MirOS: ports/misc/mc/patches/patch-src_main_c,v 1.6 2006/10/28 22:35:48 tg Exp $
+--- mc-4.6.1.orig/src/main.c 2005-07-23 16:52:02.000000000 +0000
++++ mc-4.6.1/src/main.c 2007-03-20 13:32:10.000000000 +0000
+@@ -150,7 +150,7 @@ int auto_save_setup = 1;
+
+ #ifndef HAVE_CHARSET
+ /* If true, allow characters in the range 160-255 */
+-int eight_bit_clean = 1;
++int eight_bit_clean = 0;
+
+ /*
+ * If true, also allow characters in the range 128-159.
diff --git a/package/mc/patches/patch-vfs_extfs_iso9660_in b/package/mc/patches/patch-vfs_extfs_iso9660_in
new file mode 100644
index 000000000..d515ff0a8
--- /dev/null
+++ b/package/mc/patches/patch-vfs_extfs_iso9660_in
@@ -0,0 +1,31 @@
+$Id$
+$MirOS: ports/misc/mc/patches/patch-vfs_extfs_iso9660_in,v 1.1 2006/09/28 20:39:05 tg Exp $
+
+ This does limit names to the C locale, but skips error messages.
+
+--- mc-4.6.1.orig/vfs/extfs/iso9660.in 2004-10-29 09:14:38.000000000 +0000
++++ mc-4.6.1/vfs/extfs/iso9660.in 2007-03-20 13:32:10.000000000 +0000
+@@ -9,15 +9,7 @@
+ # tested to comply with isoinfo 2.0's output
+
+ test_iso () {
+- CHARSET=`echo "$save_ctype" | sed -n -e 's/.*\.\(.*\)"$/\1/p' | tr '[A-Z]' '[a-z]'`
+- if test -n "$CHARSET"; then
+- isoinfo -j $CHARSET 2>&1 | grep "Unknown charset" >/dev/null && CHARSET=
+- fi
+- if test -n "$CHARSET"; then
+- JOLIET_OPT="-j $CHARSET -J"
+- else
+ JOLIET_OPT="-J"
+- fi
+ ISOINFO="isoinfo -R"
+ isoinfo -d -i "$1" | grep "NO Joliet" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT"
+ }
+@@ -65,7 +57,6 @@ mcisofs_copyout () {
+ $ISOINFO -i "$1" -x "/$2" > "$3"
+ }
+
+-save_ctype=`locale | grep LC_CTYPE`
+ LC_ALL=C
+
+ cmd="$1"