rpms/make
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fix the rlimit patch. The success flag is kept in memory shared with

Browse Source 
parent process after vfork, and so cannot be reset.
- Related: #214033
This commit is contained in:
Petr Machata 2008-03-25 17:38:16 +00:00
parent 5710b6e4bb
commit eb9bbd322e
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
make-3.81-rlimit.patch
View File

@ -1,6 +1,6 @@
diff -Burp make-3.81/job.c make-3.81-pm/job.c diff -urp make-3.81/job.c make-3.81-pm/job.c
--- make-3.81/job.c 2006-11-30 11:00:23.000000000 +0100 --- make-3.81/job.c 2008-03-25 18:15:38.000000000 +0100
+++ make-3.81-pm/job.c 2006-11-30 10:58:46.000000000 +0100 +++ make-3.81-pm/job.c 2008-03-25 17:51:11.000000000 +0100
@@ -2079,6 +2079,9 @@ exec_command (char **argv, char **envp) @@ -2079,6 +2079,9 @@ exec_command (char **argv, char **envp)
# else # else
@ -11,10 +11,10 @@ diff -Burp make-3.81/job.c make-3.81-pm/job.c
environ = envp; environ = envp;
execvp (argv[0], argv); execvp (argv[0], argv);
diff -Burp make-3.81/main.c make-3.81-pm/main.c diff -urp make-3.81/main.c make-3.81-pm/main.c
--- make-3.81/main.c 2006-11-30 11:00:23.000000000 +0100 --- make-3.81/main.c 2008-03-25 18:15:38.000000000 +0100
+++ make-3.81-pm/main.c 2006-11-30 10:38:04.000000000 +0100 +++ make-3.81-pm/main.c 2008-03-25 18:14:04.000000000 +0100
@@ -44,12 +44,51 @@ Foundation, Inc., 51 Franklin St, Fifth @@ -44,12 +44,53 @@ Foundation, Inc., 51 Franklin St, Fifth
# include <fcntl.h> # include <fcntl.h>
#endif #endif
@ -63,14 +63,16 @@ diff -Burp make-3.81/main.c make-3.81-pm/main.c
+ if (getrlimit (RLIMIT_STACK, &rlim) == 0) + if (getrlimit (RLIMIT_STACK, &rlim) == 0)
+ { + {
+ rlim.rlim_cur = setrlimit_orig_cur; + rlim.rlim_cur = setrlimit_orig_cur;
+ if (setrlimit (RLIMIT_STACK, &rlim) != -1) + setrlimit (RLIMIT_STACK, &rlim);
+ setrlimit_succeeded = 0; + /* Don't reset the setrlimit_succeeded flag. This can be called
+ after vfork, in which case the flag is in memory shared with
+ the parent. */
+ } + }
+} +}
#endif #endif
#ifdef _AMIGA #ifdef _AMIGA
@@ -915,17 +954,7 @@ main (int argc, char **argv, char **envp @@ -915,17 +956,7 @@ main (int argc, char **argv, char **envp
#endif #endif
#ifdef SET_STACK_SIZE #ifdef SET_STACK_SIZE
@ -89,9 +91,9 @@ diff -Burp make-3.81/main.c make-3.81-pm/main.c
#endif #endif
#ifdef HAVE_ATEXIT #ifdef HAVE_ATEXIT
diff -Burp make-3.81/make.h make-3.81-pm/make.h diff -urp make-3.81/make.h make-3.81-pm/make.h
--- make-3.81/make.h 2006-11-30 11:00:23.000000000 +0100 --- make-3.81/make.h 2008-03-25 18:15:38.000000000 +0100
+++ make-3.81-pm/make.h 2006-11-30 10:29:50.000000000 +0100 +++ make-3.81-pm/make.h 2008-03-25 17:51:10.000000000 +0100
@@ -346,6 +346,13 @@ extern int strcmpi (const char *,const c @@ -346,6 +346,13 @@ extern int strcmpi (const char *,const c
#define N_(msgid) gettext_noop (msgid) #define N_(msgid) gettext_noop (msgid)
#define S_(msg1,msg2,num) ngettext (msg1,msg2,num) #define S_(msg1,msg2,num) ngettext (msg1,msg2,num)
@ -106,3 +108,4 @@ diff -Burp make-3.81/make.h make-3.81-pm/make.h
/* Handle other OSs. */ /* Handle other OSs. */
#if defined(HAVE_DOS_PATHS) #if defined(HAVE_DOS_PATHS)
# define PATH_SEPARATOR_CHAR ';' # define PATH_SEPARATOR_CHAR ';'
diff -urp make-3.81/w32/Makefile make-3.81-pm/w32/Makefile

7
make.spec
View File

@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users
Name: make Name: make
Epoch: 1 Epoch: 1
Version: 3.81 Version: 3.81
Release: 11%{?dist} Release: 12%{?dist}
License: GPLv2+ License: GPLv2+
Group: Development/Tools Group: Development/Tools
URL: http://www.gnu.org/software/make/ URL: http://www.gnu.org/software/make/
@ -76,6 +76,11 @@ fi
%{_infodir}/*.info* %{_infodir}/*.info*
%changelog %changelog
* Tue Mar 25 2008 Petr Machata <pmachata@redhat.com> - 1:3.81-12
- Fix the rlimit patch. The success flag is kept in memory shared
with parent process after vfork, and so cannot be reset.
- Related: #214033
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1:3.81-11 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1:3.81-11
- Autorebuild for GCC 4.3 - Autorebuild for GCC 4.3