Recreate patch because Mac OS X's patch refuses to apply it.

2 files changed, 13 insertions, 14 deletions

diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo
index d479cc18c2d..90d39c89efa 100644
--- a/sysutils/coreutils/distinfo
+++ b/sysutils/coreutils/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2003/11/05 11:54:47 tron Exp $
+$NetBSD: distinfo,v 1.4 2003/11/22 15:59:24 tron Exp $
 
 SHA1 (coreutils-5.0.tar.bz2) = ce67aacedfc917a92b5be62dd32095393c2f220c
 Size (coreutils-5.0.tar.bz2) = 3952653 bytes
 SHA1 (patch-aa) = 352b6b8eeff29159ebdbae4929db75d243a19354
-SHA1 (patch-ab) = 28ad6f03c6c116837a1c4754b0dc09c3488b5ca8
+SHA1 (patch-ab) = 02709d459c9d8b52b879feec4c7bae318e1538a4
 SHA1 (patch-ac) = 323a960e5506876f2222723f7b7dec1446c0c30c
diff --git a/sysutils/coreutils/patches/patch-ab b/sysutils/coreutils/patches/patch-ab
index 8b4efda4f07..216138d9487 100644
--- a/sysutils/coreutils/patches/patch-ab
+++ b/sysutils/coreutils/patches/patch-ab
@@ -1,9 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/11/05 11:54:47 tron Exp $
+$NetBSD: patch-ab,v 1.3 2003/11/22 15:59:24 tron Exp $
 
---- lib/xmalloc.c~	2002-11-21 21:39:59.000000000 +0100
-+++ lib/xmalloc.c	2003-11-05 00:26:39.000000000 +0100
-@@ -22,7 +22,8 @@
- #include <sys/types.h>
+--- lib/xmalloc.c.orig	Thu Nov 21 21:39:59 2002
++++ lib/xmalloc.c	Sat Nov 22 16:53:38 2003
+@@ -23,6 +23,7 @@
  
  #if STDC_HEADERS
  # include <stdlib.h>
@@ -11,7 +10,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/05 11:54:47 tron Exp $
  #else
  void *calloc ();
  void *malloc ();
-@@ -43,6 +45,10 @@
+@@ -43,6 +44,10 @@
  
  /* The following tests require AC_PREREQ(2.54).  */
  
@@ -22,7 +21,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/05 11:54:47 tron Exp $
  #ifndef HAVE_MALLOC
  "you must run the autoconf test for a GNU libc compatible malloc"
  #endif
-@@ -58,6 +64,15 @@
+@@ -58,6 +63,15 @@
  /* If non NULL, call this function when memory is exhausted. */
  void (*xalloc_fail_func) PARAMS ((void)) = 0;
  
@@ -38,7 +37,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/05 11:54:47 tron Exp $
  /* If XALLOC_FAIL_FUNC is NULL, or does return, display this message
     before exiting when memory is exhausted.  Goes through gettext. */
  char const xalloc_msg_memory_exhausted[] = N_("memory exhausted");
-@@ -70,8 +85,20 @@
+@@ -70,8 +84,20 @@
    error (xalloc_exit_failure, 0, "%s", _(xalloc_msg_memory_exhausted));
    /* The `noreturn' cannot be given to error, since it may return if
       its first argument is 0.  To help compilers understand the
@@ -61,7 +60,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/05 11:54:47 tron Exp $
  }
  
  /* Allocate N bytes of memory dynamically, with error checking.  */
-@@ -79,10 +106,16 @@
+@@ -79,10 +105,16 @@
  void *
  xmalloc (size_t n)
  {
@@ -81,7 +80,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/05 11:54:47 tron Exp $
      xalloc_die ();
    return p;
  }
-@@ -93,21 +126,39 @@
+@@ -93,21 +125,39 @@
  void *
  xrealloc (void *p, size_t n)
  {
@@ -118,7 +117,7 @@ $NetBSD: patch-ab,v 1.2 2003/11/05 11:54:47 tron Exp $
 +  if (array_size_overflow (n, s) || ! (p = calloc (n, s)))
      xalloc_die ();
    return p;
- }
++}
 +
 +/* Clone an object P of size S, with error checking.  There's no need
 +   for xnclone (P, N, S), since xclone (P, N * S) works without any
@@ -128,4 +127,4 @@ $NetBSD: patch-ab,v 1.2 2003/11/05 11:54:47 tron Exp $
 +xclone (void const *p, size_t s)
 +{
 +  return memcpy (xmalloc (s), p, s);
-+}
+ }