dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: make
-# $Id: Makefile,v 1.1 2004/09/09 08:11:20 cvsdist Exp $
-NAME := make
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

make-3.81-rlimit.patch

@@ -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 @@ diff -Burp make-3.81/job.c make-3.81-pm/job.c
    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 @@ diff -Burp make-3.81/main.c make-3.81-pm/main.c
 +  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 @@ diff -Burp make-3.81/main.c make-3.81-pm/main.c
  #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 @@ diff -Burp make-3.81/make.h make-3.81-pm/make.h
  /* 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

make.spec

@@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users
 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 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Tue Mar 25 2008 Petr Machata <pmachata@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@redhat.com> - 1:3.81-10
 - Fix parallel builds with reexec.
 - Related: #212111, #211290