[ksh/f17] fix tilda expansion in scripts

[Michal Hlavinka]

commit 4a8e250a20ffa4c0a56a2ababc6f84b6ea3ec44b
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Wed Mar 14 11:06:26 2012 +0100

    fix tilda expansion in scripts

 ksh-20120214-tildafix.patch |   16 ++++++++++++++++
 ksh.spec                    |    9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/ksh-20120214-tildafix.patch b/ksh-20120214-tildafix.patch
new file mode 100644
index 0000000..a6508ce
--- /dev/null
+++ b/ksh-20120214-tildafix.patch
@@ -0,0 +1,16 @@
+diff -up ksh-20120214/src/cmd/ksh93/sh/macro.c.tildafix ksh-20120214/src/cmd/ksh93/sh/macro.c
+--- ksh-20120214/src/cmd/ksh93/sh/macro.c.tildafix	2012-03-13 10:09:36.895655554 +0100
++++ ksh-20120214/src/cmd/ksh93/sh/macro.c	2012-03-13 10:11:54.751591156 +0100
+@@ -2719,7 +2719,12 @@ skip:
+ 	if(!logins_tree)
+ 		logins_tree = dtopen(&_Nvdisc,Dtbag);
+ 	if(np=nv_search(string,logins_tree,NV_ADD))
++	{
++		c = shp->subshell;
++		shp->subshell = 0;
+ 		nv_putval(np, pw->pw_dir,0);
++		shp->subshell = c;
++	}
+ 	return(pw->pw_dir);
+ }
+ 
diff --git a/ksh.spec b/ksh.spec
index 15a9df6..285d426 100644
--- a/ksh.spec
+++ b/ksh.spec
@@ -6,7 +6,7 @@ URL:          http://www.kornshell.com/
 Group:        System Environment/Shells
 License:      EPL
 Version:      20120214
-Release:      2%{?dist}
+Release:      3%{?dist}
 Source0:      http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{releasedate}.tgz
 Source1:      http://www.research.att.com/~gsf/download/tgz/INIT.%{releasedate}.tgz
 Source3:      kshrc.rhs
@@ -21,6 +21,9 @@ Patch1:       ksh-20070328-builtins.patch
 Patch2:       ksh-20100826-fixregr.patch
 Patch3: ksh-20120214-fdleak.patch
 
+# for ksh <= 2012-03-09, fix tilda expansion, rhbz#802565
+Patch4: ksh-20120214-tildafix.patch
+
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Conflicts:    pdksh
 Requires: coreutils, glibc-common, diffutils
@@ -42,6 +45,7 @@ with "sh" (the Bourne Shell).
 %patch1 -p1 -b .builtins
 %patch2 -p1 -b .fixregr
 %patch3 -p1 -b .fdleak
+%patch4 -p1 -b .tildafix
 
 #/dev/fd test does not work because of mock
 sed -i 's|ls /dev/fd|ls /proc/self/fd|' src/cmd/ksh93/features/options
@@ -127,6 +131,9 @@ fi
     rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Mar 14 2012 Michal Hlavinka <mhlavink at redhat.com> - 20120214-3
+- fix tilda expansion in scripts
+
 * Mon Feb 27 2012 Michal Hlavinka <mhlavink at redhat.com> - 20120214-2
 - fix file descriptor leak