packages: mksh/mksh-mkshrc_support.patch - expand ~ in ENV - as /etc/mkshrc...

[draenog]

Author: draenog                      Date: Thu Jul  7 22:12:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- expand ~ in ENV
- as /etc/mkshrc is not sourced any more when ENV is set, the patch for
  tests is obsoleted

---- Files affected:
packages/mksh:
   mksh-mkshrc_support.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/mksh/mksh-mkshrc_support.patch
diff -u packages/mksh/mksh-mkshrc_support.patch:1.2 packages/mksh/mksh-mkshrc_support.patch:1.3
--- packages/mksh/mksh-mkshrc_support.patch:1.2	Thu Jul  7 19:27:08 2011
+++ packages/mksh/mksh-mkshrc_support.patch	Fri Jul  8 00:12:17 2011
@@ -6,7 +6,7 @@
  		/* include $ENV */
 -		env_file = substitute(substitute("${ENV:-" MKSHRC_PATH "}", 0),
 -		    DOTILDE);
-+                env_file = substitute("${ENV}", 0);
++                env_file = substitute(substitute("${ENV}", 0), DOTILDE);
  		if (*env_file != '\0')
  			include(env_file, 0, NULL, 1);
 +                else { 
@@ -17,26 +17,3 @@
  	}
  
  	if (restricted) {
---- check.t~	2011-07-07 09:55:26.802497928 +0100
-+++ check.t	2011-07-07 09:55:31.859107570 +0100
-@@ -5908,13 +5908,13 @@
- 	Ensure ±U on the command line is honoured
- 	(this test may pass falsely depending on CPPFLAGS)
- stdin:
--	export i=0
--	code='if [[ $- = *U* ]]; then echo $i on; else echo $i off; fi'
--	let i++; "$__progname" -U -c "$code"
--	let i++; "$__progname" +U -c "$code"
--	let i++; "$__progname" -U -ic "$code"
--	let i++; "$__progname" +U -ic "$code"
--	echo $((++i)) done
-+	export iter=0
-+	code='if [[ $- = *U* ]]; then echo $iter on; else echo $iter off; fi'
-+	let iter++; "$__progname" -U -c "$code"
-+	let iter++; "$__progname" +U -c "$code"
-+	let iter++; "$__progname" -U -ic "$code"
-+	let iter++; "$__progname" +U -ic "$code"
-+	echo $((++iter)) done
- expected-stdout:
- 	1 on
- 	2 off
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mksh/mksh-mkshrc_support.patch?r1=1.2&r2=1.3&f=u