- Fix newline handling for quoted SHELL.

- Resolves: #228732
This commit is contained in:
Petr Machata 2007-02-22 17:27:40 +00:00
parent 7264eaac0b
commit e74898ad5a
2 changed files with 30 additions and 1 deletions

23
make-3.81-newlines.patch Normal file
View File

@ -0,0 +1,23 @@
--- 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;

View File

@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users
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 @@ Patch5: make-3.80-getcwd.patch
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 @@ commonly used to simplify the process of installing programs.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
config/missing --run aclocal -I config
@ -77,6 +79,10 @@ fi
%{_infodir}/*.info*
%changelog
* Thu Feb 22 2007 Petr Machata <pmachata@redhat.com> - 1:3.81-5
- Fix newline handling for quoted SHELL.
- Resolves: #228732
* Fri Feb 2 2007 Petr Machata <pmachata@redhat.com> - 1:3.81-4
- Tidy up the specfile per rpmlint comments
- Use utf-8 and fix national characters in contributor's names