- Fix patches to apply cleanly with fuzz=0

make-3.79.1-noclock_gettime.patch

@@ -1,11 +1,13 @@
---- make-3.80/configure
+diff -urp make-3.81/configure make-3.81-pm/configure
-+++ make-3.80/configure
+--- make-3.81/configure	2006-04-01 08:40:00.000000000 +0200
-@@ -6794,7 +6794,7 @@
++++ make-3.81-pm/configure	2008-09-22 10:50:40.000000000 +0200
- fi
+@@ -8018,7 +8018,7 @@ fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
  if test "$ac_cv_search_clock_gettime" = no; then
 -  for ac_lib in rt posix4; do
 +  for ac_lib in posix4; do
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
      cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
+ /* confdefs.h.  */
+Only in make-3.81-pm/: configure.orig

make-3.80-getcwd.patch

@@ -1,11 +1,15 @@
---- make-3.80/make.h.jj	2002-09-11 12:55:44.000000000 -0400
+Only in make-3.81-pm/: configure.orig
-+++ make-3.80/make.h	2005-03-07 09:24:53.000000000 -0500
+diff -urp make-3.81/make.h make-3.81-pm/make.h
-@@ -474,7 +474,7 @@ extern long int lseek ();
+--- make-3.81/make.h	2006-02-16 00:54:43.000000000 +0100
++++ make-3.81-pm/make.h	2008-09-22 10:53:35.000000000 +0200
+@@ -488,7 +488,7 @@ extern long int lseek ();
  #endif  /* Not GNU C library or POSIX.  */
  
  #ifdef  HAVE_GETCWD
 -# if !defined(VMS) && !defined(__DECC)
 +# if !defined(VMS) && !defined(__DECC) && !defined(getcwd)
  extern char *getcwd ();
- #endif
+ # endif
  #else
+Only in make-3.81-pm/: make.h~
+Only in make-3.81-pm/: make.h.orig

make-3.81-err-reporting.patch

@@ -1,15 +1,16 @@
---- make-3.80/misc.c.jj	2002-09-12 18:15:58.000000000 -0400
+diff -urp make-3.81/misc.c make-3.81-pm/misc.c
-+++ make-3.80/misc.c	2005-08-22 05:46:05.000000000 -0400
+--- make-3.81/misc.c	2006-04-01 08:36:40.000000000 +0200
-@@ -311,17 +311,31 @@ strerror (errnum)
++++ make-3.81-pm/misc.c	2008-09-22 12:45:18.000000000 +0200
+@@ -311,17 +311,31 @@ strerror (int errnum)
  /* Print an error message from errno.  */
  
-+void
+ void
 +perror_with_name_err (const char *str, const char *name, int errnum)
 +{
 +  error (NILF, _("%s%s: %s"), str, name, strerror (errnum));
 +}
 +
- void
++void
  perror_with_name (const char *str, const char *name)
  {
 -  error (NILF, _("%s%s: %s"), str, name, strerror (errno));
@@ -18,7 +19,7 @@
  
  /* Print an error message from errno and exit.  */
  
-+void
+ void
 +pfatal_with_name_err (const char *name, int errnum)
 +{
 +  fatal (NILF, _("%s: %s"), name, strerror (errnum));
@@ -26,7 +27,7 @@
 +  /* NOTREACHED */
 +}
 +
- void
++void
  pfatal_with_name (const char *name)
  {
 -  fatal (NILF, _("%s: %s"), name, strerror (errno));
@@ -34,10 +35,10 @@
  
    /* NOTREACHED */
  }
-
+diff -urp make-3.81/main.c make-3.81-pm/main.c
---- make-3.81/main.c.jj	2006-05-23 12:51:25.000000000 +0200
+--- make-3.81/main.c	2008-09-22 12:45:07.000000000 +0200
-+++ make-3.81/main.c	2006-05-23 12:50:48.000000000 +0200
++++ make-3.81-pm/main.c	2008-09-22 12:45:18.000000000 +0200
-@@ -1502,13 +1502,13 @@
+@@ -1502,13 +1502,13 @@ main (int argc, char **argv, char **envp
  	    strcat (template, DEFAULT_TMPFILE);
  	    outfile = open_tmpfile (&stdin_nm, template);
  	    if (outfile == 0)
@@ -53,7 +54,7 @@
  	      }
  	    (void) fclose (outfile);
  
-@@ -1681,7 +1681,7 @@
+@@ -1681,7 +1681,7 @@ main (int argc, char **argv, char **envp
      else if ((job_rfd = dup (job_fds[0])) < 0)
        {
          if (errno != EBADF)
@@ -62,7 +63,7 @@
  
          error (NILF,
                 _("warning: jobserver unavailable: using -j1.  Add `+' to parent make rule."));
-@@ -1721,7 +1721,7 @@
+@@ -1721,7 +1721,7 @@ main (int argc, char **argv, char **envp
        char c = '+';
  
        if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0)
@@ -71,7 +72,7 @@
  
        /* Every make assumes that it always has one job it can run.  For the
           submakes it's the token they were given by their parent.  For the
-@@ -1736,7 +1736,7 @@
+@@ -1736,7 +1736,7 @@ main (int argc, char **argv, char **envp
  
            EINTRLOOP (r, write (job_fds[1], &c, 1));
            if (r != 1)
@@ -80,7 +81,7 @@
          }
  
        /* Fill in the jobserver_fds struct for our children.  */
-@@ -2151,8 +2151,8 @@
+@@ -2151,7 +2151,7 @@ main (int argc, char **argv, char **envp
    /* If there is a temp file from reading a makefile from stdin, get rid of
       it now.  */
    if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT)
@@ -89,10 +90,10 @@
  
    {
      int status;
-
+diff -urp make-3.81/make.h make-3.81-pm/make.h
---- make-3.81/make.h.jj	2006-05-23 12:54:45.000000000 +0200
+--- make-3.81/make.h	2008-09-22 12:45:07.000000000 +0200
-+++ make-3.81/make.h	2006-05-23 12:55:00.000000000 +0200
++++ make-3.81-pm/make.h	2008-09-22 12:45:18.000000000 +0200
-@@ -414,6 +414,8 @@
+@@ -414,6 +414,8 @@ extern void die PARAMS ((int)) __attribu
  extern void log_working_directory PARAMS ((int));
  extern void pfatal_with_name PARAMS ((const char *)) __attribute__ ((noreturn));
  extern void perror_with_name PARAMS ((const char *, const char *));
@@ -101,10 +102,10 @@
  extern char *savestring PARAMS ((const char *, unsigned int));
  extern char *concat PARAMS ((const char *, const char *, const char *));
  extern char *xmalloc PARAMS ((unsigned int));
-
+diff -urp make-3.81/job.c make-3.81-pm/job.c
---- make-3.81/job.c.jj	2006-05-23 13:01:35.000000000 +0200
+--- make-3.81/job.c	2006-03-20 04:03:04.000000000 +0100
-+++ make-3.81/job.c	2006-05-23 13:50:44.000000000 +0200
++++ make-3.81-pm/job.c	2008-09-22 12:45:18.000000000 +0200
-@@ -859,7 +859,7 @@
+@@ -859,7 +859,7 @@ free_child (struct child *child)
  
        EINTRLOOP (r, write (job_fds[1], &token, 1));
        if (r != 1)
@@ -113,7 +114,7 @@
  
        DB (DB_JOBS, (_("Released token for child 0x%08lx (%s).\n"),
                      (unsigned long int) child, child->file->name));
-@@ -1699,6 +1699,7 @@
+@@ -1699,6 +1699,7 @@ new_job (struct file *file)
  
          /* Set interruptible system calls, and read() for a job token.  */
  	set_child_handler_action_flags (1, waiting_jobs != NULL);
@@ -121,7 +122,7 @@
  	got_token = read (job_rfd, &token, 1);
  	saved_errno = errno;
  	set_child_handler_action_flags (0, waiting_jobs != NULL);
-@@ -1713,10 +1714,14 @@
+@@ -1713,10 +1714,14 @@ new_job (struct file *file)
  
          /* If the error _wasn't_ expected (EINTR or EBADF), punt.  Otherwise,
             go back and reap_children(), and try again.  */
@@ -140,7 +141,7 @@
            DB (DB_JOBS, ("Read returned EBADF.\n"));
        }
  #endif
-@@ -1831,7 +1836,7 @@
+@@ -1831,7 +1836,7 @@ load_too_high (void)
  	    error (NILF,
                     _("cannot enforce load limits on this operating system"));
  	  else

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: 13%{?dist}
+Release: 14%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -78,6 +78,9 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Mon Sep 22 2008 Petr Machata <pmachata@redhat.com> - 1:3.81-14
+- Fix patches to apply cleanly with fuzz=0
+
 * Tue Sep 16 2008 Petr Machata <pmachata@redhat.com> - 1:3.81-13
 - Mark opened files as cloexec to prevent their leaking through fork
 - Resolves: #462090