rpms/make/F-8 make-3.81-rlimit.patch,1.1,1.2 make.spec,1.41,1.42
Petr Machata (pmachata)
fedora-extras-commits at redhat.com
Wed Mar 26 13:34:45 UTC 2008
- Previous message (by thread): rpms/tzdata/devel .cvsignore, 1.42, 1.43 sources, 1.46, 1.47 tzdata.spec, 1.61, 1.62 tzdata-2007k-chile.patch, 1.1, NONE
- Next message (by thread): rpms/make/F-7 make-3.81-rlimit.patch,1.1,1.2 make.spec,1.37,1.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pmachata
Update of /cvs/pkgs/rpms/make/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23072
Modified Files:
make-3.81-rlimit.patch make.spec
Log Message:
- Fix the rlimit patch. The success flag is kept in memory shared
with parent process after vfork, and so cannot be reset.
- Related: #214033
make-3.81-rlimit.patch:
Index: make-3.81-rlimit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/make/F-8/make-3.81-rlimit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- make-3.81-rlimit.patch 25 Jan 2007 12:00:34 -0000 1.1
+++ make-3.81-rlimit.patch 26 Mar 2008 13:34:38 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Burp 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-pm/job.c 2006-11-30 10:58:46.000000000 +0100
+diff -urp make-3.81/job.c make-3.81-pm/job.c
+--- make-3.81/job.c 2008-03-25 18:15:38.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)
# else
@@ -11,10 +11,10 @@
environ = envp;
execvp (argv[0], argv);
-diff -Burp 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-pm/main.c 2006-11-30 10:38:04.000000000 +0100
-@@ -44,12 +44,51 @@ Foundation, Inc., 51 Franklin St, Fifth
+diff -urp make-3.81/main.c make-3.81-pm/main.c
+--- make-3.81/main.c 2008-03-25 18:15:38.000000000 +0100
++++ make-3.81-pm/main.c 2008-03-25 18:14:04.000000000 +0100
+@@ -44,12 +44,53 @@ Foundation, Inc., 51 Franklin St, Fifth
# include <fcntl.h>
#endif
@@ -63,14 +63,16 @@
+ if (getrlimit (RLIMIT_STACK, &rlim) == 0)
+ {
+ rlim.rlim_cur = setrlimit_orig_cur;
-+ if (setrlimit (RLIMIT_STACK, &rlim) != -1)
-+ setrlimit_succeeded = 0;
++ setrlimit (RLIMIT_STACK, &rlim);
++ /* 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
#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
#ifdef SET_STACK_SIZE
@@ -89,9 +91,9 @@
#endif
#ifdef HAVE_ATEXIT
-diff -Burp 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-pm/make.h 2006-11-30 10:29:50.000000000 +0100
+diff -urp make-3.81/make.h make-3.81-pm/make.h
+--- make-3.81/make.h 2008-03-25 18:15:38.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
#define N_(msgid) gettext_noop (msgid)
#define S_(msg1,msg2,num) ngettext (msg1,msg2,num)
@@ -106,3 +108,4 @@
/* Handle other OSs. */
#if defined(HAVE_DOS_PATHS)
# define PATH_SEPARATOR_CHAR ';'
+diff -urp make-3.81/w32/Makefile make-3.81-pm/w32/Makefile
Index: make.spec
===================================================================
RCS file: /cvs/pkgs/rpms/make/F-8/make.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- make.spec 5 Oct 2007 14:42:31 -0000 1.41
+++ make.spec 26 Mar 2008 13:34:38 -0000 1.42
@@ -3,7 +3,7 @@
Name: make
Epoch: 1
Version: 3.81
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2+
Group: Development/Tools
URL: http://www.gnu.org/software/make/
@@ -76,6 +76,11 @@
%{_infodir}/*.info*
%changelog
+* Tue Mar 25 2008 Petr Machata <pmachata at redhat.com> - 1:3.81-11
+- Fix the rlimit patch. The success flag is kept in memory shared
+ with parent process after vfork, and so cannot be reset.
+- Related: #214033
+
* Thu Oct 4 2007 Petr Machata <pmachata at redhat.com> - 1:3.81-10
- Fix parallel builds with reexec.
- Related: #212111, #211290
- Previous message (by thread): rpms/tzdata/devel .cvsignore, 1.42, 1.43 sources, 1.46, 1.47 tzdata.spec, 1.61, 1.62 tzdata-2007k-chile.patch, 1.1, NONE
- Next message (by thread): rpms/make/F-7 make-3.81-rlimit.patch,1.1,1.2 make.spec,1.37,1.38
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list