rpms/dash/F-11 dash-do-not-close-stderr.patch, NONE, 1.1 dash.spec, 1.4, 1.5

[Andreas Thienemann]

Author: ixs

Update of /cvs/pkgs/rpms/dash/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1547/F-11

Modified Files:
	dash.spec 
Added Files:
	dash-do-not-close-stderr.patch 
Log Message:
* Sat May 23 2009 Andreas Thienemann <andreas at bawue.net> - 0.5.5.1-2
- Added patch from upstream git to not close stdout on err. This improves
  initramfs use of dash.


dash-do-not-close-stderr.patch:

--- NEW FILE dash-do-not-close-stderr.patch ---
commit fcc4134a7b76d82d39dea635c41ec593a41d6d19
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date:   Sun Feb 22 19:29:48 2009 +0800

    [JOBS] Do not close stderr when /dev/tty fails to open
    
    As it stands if we fail to open /dev/tty we end up closing stderr
    after saving it at a higher fd.
    
    Thanks to David van Gorkom for reporting this.
    
    Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>

diff --git a/src/jobs.c b/src/jobs.c
index 69a84f7..b1ab7ab 100644
--- a/src/jobs.c
+++ b/src/jobs.c
@@ -195,6 +195,9 @@ setjobctl(int on)
 			while (!isatty(fd))
 				if (--fd < 0)
 					goto out;
+			fd = dup(fd);
+			if (fd < 0)
+				goto out;
 		}
 		fd = savefd(fd);
 		do { /* while we are in the background */


Index: dash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dash/F-11/dash.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dash.spec	13 Apr 2009 15:56:43 -0000	1.4
+++ dash.spec	23 May 2009 11:28:13 -0000	1.5
@@ -1,12 +1,13 @@
 Name:           dash
 Version:        0.5.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Small and fast POSIX-compliant shell
 
 Group:          System Environment/Shells
 License:        BSD
 URL:            http://gondor.apana.org.au/~herbert/dash/
 Source0:        http://gondor.apana.org.au/~herbert/dash/files/dash-%{version}.tar.gz
+Patch0:         dash-do-not-close-stderr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -16,6 +17,7 @@ significantly faster than bash (the GNU 
 
 %prep
 %setup -q
+%patch0 -p 1
 
 %build
 %configure
@@ -38,7 +40,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man1/dash.1.gz
 
 %changelog
-* Mon Apr 13 2009 Warren Togami <wtogami at redhat.com> - 0.5.5.1
+* Sat May 23 2009 Andreas Thienemann <andreas at bawue.net> - 0.5.5.1-2
+- Added patch from upstream git to not close stdout on err. This improves
+  initramfs use of dash.
+
+* Mon Apr 13 2009 Warren Togami <wtogami at redhat.com> - 0.5.5.1-1
 - 0.5.5.1
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-4