[Frugalware-darcs] frugalware-current: mc-4.6.1-7-x86_64

Christian Hamar alias krix krics at linuxforum.hu
Sat Oct 28 23:26:54 CEST 2006


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061028211817-d209c-a7f80ab54ee1b2e2eb0ca2d3caadc263f926f71b.gz;

[mc-4.6.1-7-x86_64
Christian Hamar alias krix <krics at linuxforum.hu>**20061028211817
   * Release bump
   * Fixes bash-3.2 directory change problem.
   * Patch from Leonard (from gnome-devel list) (thx for it :) )
   * Savannah ID on MC bts: #18136
 
] {
hunk ./source/apps/mc/FrugalBuild 7
-pkgrel=6
+pkgrel=7
hunk ./source/apps/mc/FrugalBuild 22
-	mc-wrapper.sh-rewrite mc-4.6.1-nonblock.patch mc-4.6.1-largefile.patch)
+	mc-wrapper.sh-rewrite mc-4.6.1-nonblock.patch mc-4.6.1-largefile.patch \
+	mc-workaround-for-bash32.patch)
hunk ./source/apps/mc/FrugalBuild 38
-	  '1bbe8c7d614aae3ed8225237b0ac2fdc6bc4ca64')
+	  '1bbe8c7d614aae3ed8225237b0ac2fdc6bc4ca64' \
+	  '6c6256cad3fe32b92072453fd978444748fc8187')
addfile ./source/apps/mc/mc-workaround-for-bash32.patch
hunk ./source/apps/mc/mc-workaround-for-bash32.patch 1
+diff -Naur mc-4.6.1.orig/src/subshell.c mc-4.6.1/src/subshell.c
+--- mc-4.6.1.orig/src/subshell.c	2006-10-28 23:12:02.000000000 +0200
++++ mc-4.6.1/src/subshell.c	2006-10-28 23:12:10.000000000 +0200
+@@ -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));
}


More information about the Frugalware-darcs mailing list