rpms/make/devel make-3.81-newlines.patch, NONE, 1.1 make.spec, 1.34, 1.35

[fedora-cvs-commits at redhat.com]

Author: pmachata

Update of /cvs/dist/rpms/make/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26946

Modified Files:
	make.spec 
Added Files:
	make-3.81-newlines.patch 
Log Message:
- Fix newline handling for quoted SHELL.
- Resolves: #228732


make-3.81-newlines.patch:
 job.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE make-3.81-newlines.patch ---
--- make-3.81-orig/job.c	2007-02-21 19:10:54.000000000 +0100
+++ make-3.81-pm/job.c	2007-02-22 18:13:59.000000000 +0100
@@ -2706,7 +2706,7 @@
     unsigned int line_len = strlen (line);
 
     char *new_line = (char *) alloca (shell_len + (sizeof (minus_c) - 1)
-				      + (line_len * 2) + 1);
+				      + (line_len * 4) + 1);
     char *command_ptr = NULL; /* used for batch_mode_shell mode */
 
 # ifdef __EMX__ /* is this necessary? */
@@ -2740,9 +2740,10 @@
 #endif
 	    if (PRESERVE_BSNL)
 	      {
-		*(ap++) = '\\';
+		*(ap++) = '\'';
 		*(ap++) = '\\';
 		*(ap++) = '\n';
+		*(ap++) = '\'';
 	      }
 
 	    ++p;


Index: make.spec
===================================================================
RCS file: /cvs/dist/rpms/make/devel/make.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- make.spec	7 Feb 2007 18:21:38 -0000	1.34
+++ make.spec	22 Feb 2007 17:27:40 -0000	1.35
@@ -3,7 +3,7 @@
 Name: make
 Epoch: 1
 Version: 3.81
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -14,6 +14,7 @@
 Patch6: make-3.81-err-reporting.patch
 Patch7: make-3.81-memory.patch
 Patch8: make-3.81-rlimit.patch
+Patch9: make-3.81-newlines.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -37,6 +38,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 config/missing --run aclocal -I config
@@ -77,6 +79,10 @@
 %{_infodir}/*.info*
 
 %changelog
+* Thu Feb 22 2007 Petr Machata <pmachata at redhat.com> - 1:3.81-5
+- Fix newline handling for quoted SHELL.
+- Resolves: #228732
+
 * Fri Feb  2 2007 Petr Machata <pmachata at redhat.com> - 1:3.81-4
 - Tidy up the specfile per rpmlint comments
 - Use utf-8 and fix national characters in contributor's names