commit fe449aff4c7d4c360212c1b750530d9f300f2a80 Author: Juergen Daubert <jue@jue.li> Date: Tue Nov 21 08:24:35 2006 +0100 mc: added bash 3.2 compatibility patch diff --git a/mc/.footprint b/mc/.footprint index 31f70a5..c206f0a 100644 --- a/mc/.footprint +++ b/mc/.footprint @@ -23,7 +23,6 @@ drwxr-xr-x root/root usr/share/mc/bin/ -rw-r--r-- root/root usr/share/mc/edit.indent.rc -rw-r--r-- root/root usr/share/mc/edit.spell.rc drwxr-xr-x root/root usr/share/mc/extfs/ --rw-r--r-- root/root usr/share/mc/extfs/README -rwxr-xr-x root/root usr/share/mc/extfs/a -rwxr-xr-x root/root usr/share/mc/extfs/apt -rwxr-xr-x root/root usr/share/mc/extfs/audio diff --git a/mc/.md5sum b/mc/.md5sum index 790567a..2c89796 100644 --- a/mc/.md5sum +++ b/mc/.md5sum @@ -1 +1,2 @@ +1b1c9691cfd14c071d786322be1279f6 mc-4.6.1-bash_3_2.patch 18b20db6e40480a53bac2870c56fc3c4 mc-4.6.1.tar.gz diff --git a/mc/Pkgfile b/mc/Pkgfile index 34e67cf..f6c9bb9 100644 --- a/mc/Pkgfile +++ b/mc/Pkgfile @@ -5,14 +5,16 @@ name=mc version=4.6.1 -release=1 -source=(http://www.ibiblio.org/pub/Linux/utils/file/managers/$name/$name-$version.ta...) +release=2 +source=(http://www.ibiblio.org/pub/Linux/utils/file/managers/$name/$name-$version.ta... \ + $name-$version-bash_3_2.patch) build () { cd $name-$version + patch -p1 -i $SRC/$name-$version-bash_3_2.patch ./configure --prefix=/usr --disable-nls make make DESTDIR=$PKG install - rm $PKG/usr/share/mc/mc.hint.* + rm $PKG/usr/share/mc/{mc.hint.*,extfs/README} rm -r $PKG/usr/{sbin,man/man8} } diff --git a/mc/mc-4.6.1-bash_3_2.patch b/mc/mc-4.6.1-bash_3_2.patch new file mode 100644 index 0000000..c0b2900 --- /dev/null +++ b/mc/mc-4.6.1-bash_3_2.patch @@ -0,0 +1,35 @@ +See http://mail.gnome.org/archives/mc-devel/2006-October/msg00025.html + +diff -Nru mc-4.6.1.orig/src/subshell.c mc-4.6.1/src/subshell.c +--- mc-4.6.1.orig/src/subshell.c 2006-11-21 08:13:35.498257460 +0100 ++++ mc-4.6.1/src/subshell.c 2006-11-21 08:14:10.971977460 +0100 +@@ -718,29 +718,13 @@ + memcpy (d, cmd_start, len); + d += len; + +- /* +- * Print every character in octal format with the leading backslash. +- * tcsh and zsh may require 4-digit octals, bash < 2.05b doesn't like them. +- */ +- if (subshell_type == BASH) { + for (; *s; s++) { +- /* Must quote numbers, so that they are not glued to octals */ + if (isalpha ((unsigned char) *s)) { + *d++ = (unsigned char) *s; + } else { +- sprintf (d, "\\%03o", (unsigned char) *s); +- d += 4; +- } +- } +- } else { +- for (; *s; s++) { +- if (isalnum ((unsigned char) *s)) { +- *d++ = (unsigned char) *s; +- } else { + sprintf (d, "\\0%03o", (unsigned char) *s); + d += 5; + } +- } + } + + memcpy (d, common_end, sizeof (common_end));