rpms/bash/devel bash-login.patch,NONE,1.1 bash.spec,1.102,1.103

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23454

Modified Files:
	bash.spec 
Added Files:
	bash-login.patch 
Log Message:
* Fri Jan 13 2006 Tim Waugh <twaugh at redhat.com>
- Fix 'exec -l /bin/bash'.


bash-login.patch:
 shell.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE bash-login.patch ---
--- bash-3.1/shell.c.login	2006-01-13 16:52:14.000000000 +0000
+++ bash-3.1/shell.c	2006-01-13 16:52:15.000000000 +0000
@@ -1543,9 +1543,10 @@
      any startup files; just try to be more like /bin/sh. */
   shell_name = argv0 ? base_pathname (argv0) : PROGRAM;
 
-  if (*shell_name == '-')
+  if (argv0 && *argv0 == '-')
     {
-      shell_name++;
+      if (*shell_name == '-')
+        shell_name++;
       login_shell++;
     }
 


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- bash.spec	12 Jan 2006 10:32:28 -0000	1.102
+++ bash.spec	13 Jan 2006 17:05:44 -0000	1.103
@@ -22,6 +22,7 @@
 Patch102: bash-2.03-profile.patch
 Patch103: bash-2.05a-requires.patch
 Patch105: bash-aq.patch
+Patch106: bash-login.patch
 Patch107: bash-2.05a-interpreter.patch
 Patch108: bash-2.05b-readline-oom.patch
 Patch112: bash-ulimit.patch
@@ -68,6 +69,7 @@
 %patch102 -p1 -b .profile
 %patch103 -p1 -b .requires
 %patch105 -p1 -b .aq
+%patch106 -p1 -b .login
 %patch107 -p1 -b .interpreter
 %patch108 -p1 -b .readline-oom
 %patch112 -p1 -b .ulimit
@@ -211,6 +213,9 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Fri Jan 13 2006 Tim Waugh <twaugh at redhat.com>
+- Fix 'exec -l /bin/bash'.
+
 * Thu Jan 12 2006 Tim Waugh <twaugh at redhat.com> 3.1-4
 - Fix sighandler patch bug (bug #177545).