[pkgsrc/trunk]: pkgsrc/archivers/gtar-base Make build on Interix - security f...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7b2e44608ff3
branches:  trunk
changeset: 521930:7b2e44608ff3
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Nov 27 22:05:34 2006 +0000

description:
Make build on Interix - security fix was assuming that SIZE_MAX is defined;
copy #ifndef...#define...#endif block used in other source files.

diffstat:

 archivers/gtar-base/distinfo         |   4 ++--
 archivers/gtar-base/patches/patch-ai |  31 +++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diffs (104 lines):

diff -r 0bd4fa7d367f -r 7b2e44608ff3 archivers/gtar-base/distinfo
--- a/archivers/gtar-base/distinfo      Mon Nov 27 21:48:49 2006 +0000
+++ b/archivers/gtar-base/distinfo      Mon Nov 27 22:05:34 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2006/09/03 17:24:16 adrianp Exp $
+$NetBSD: distinfo,v 1.18 2006/11/27 22:05:34 tv Exp $
 
 SHA1 (tar-1.15.1.tar.gz) = 21574ae5d39b698f7f577e2cecc91a5ec89b659c
 RMD160 (tar-1.15.1.tar.gz) = 83f35ee090d05f0865ebd9915bbd1b649a6555c5
@@ -11,4 +11,4 @@
 SHA1 (patch-af) = be20dafd1c65db4ca60a5aedbc7a972117cd7072
 SHA1 (patch-ag) = dc39d490b0085e452664b8ea7af0329f01f630d5
 SHA1 (patch-ah) = d8532a99bf2bd0c35a9d994101fbd722f52c9ead
-SHA1 (patch-ai) = 444d47a539427df39404fcf4996082de1d00a4df
+SHA1 (patch-ai) = 9e065a4bbe3fcaee7e08a53b64e863b8fbd0d32a
diff -r 0bd4fa7d367f -r 7b2e44608ff3 archivers/gtar-base/patches/patch-ai
--- a/archivers/gtar-base/patches/patch-ai      Mon Nov 27 21:48:49 2006 +0000
+++ b/archivers/gtar-base/patches/patch-ai      Mon Nov 27 22:05:34 2006 +0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-ai,v 1.1 2006/09/03 17:24:16 adrianp Exp $
+$NetBSD: patch-ai,v 1.2 2006/11/27 22:05:34 tv Exp $
 
---- src/xheader.c.orig 2004-09-06 12:31:14.000000000 +0100
+--- src/xheader.c.orig 2004-09-06 07:31:14.000000000 -0400
 +++ src/xheader.c
-@@ -783,6 +783,32 @@ code_num (uintmax_t value, char const *k
+@@ -24,6 +24,10 @@
+ #include <stpcpy.h>
+ #include <xstrtol.h>
+ 
++#ifndef SIZE_MAX
++# define SIZE_MAX ((size_t) -1)
++#endif
++
+ #include "common.h"
+ 
+ #define obstack_chunk_alloc xmalloc
+@@ -783,6 +787,32 @@ code_num (uintmax_t value, char const *k
    xheader_print (xhdr, keyword, sbuf);
  }
  
@@ -35,7 +46,7 @@
  static void
  dummy_coder (struct tar_stat_info const *st __attribute__ ((unused)),
             char const *keyword __attribute__ ((unused)),
-@@ -821,7 +847,7 @@ static void
+@@ -821,7 +851,7 @@ static void
  gid_decoder (struct tar_stat_info *st, char const *arg)
  {
    uintmax_t u;
@@ -44,7 +55,7 @@
      st->stat.st_gid = u;
  }
  
-@@ -903,7 +929,7 @@ static void
+@@ -903,7 +933,7 @@ static void
  size_decoder (struct tar_stat_info *st, char const *arg)
  {
    uintmax_t u;
@@ -53,7 +64,7 @@
      st->archive_file_size = st->stat.st_size = u;
  }
  
-@@ -918,7 +944,7 @@ static void
+@@ -918,7 +948,7 @@ static void
  uid_decoder (struct tar_stat_info *st, char const *arg)
  {
    uintmax_t u;
@@ -62,7 +73,7 @@
      st->stat.st_uid = u;
  }
  
-@@ -946,7 +972,7 @@ static void
+@@ -946,7 +976,7 @@ static void
  sparse_size_decoder (struct tar_stat_info *st, char const *arg)
  {
    uintmax_t u;
@@ -71,7 +82,7 @@
      st->stat.st_size = u;
  }
  
-@@ -962,10 +988,10 @@ static void
+@@ -962,10 +992,10 @@ static void
  sparse_numblocks_decoder (struct tar_stat_info *st, char const *arg)
  {
    uintmax_t u;
@@ -84,7 +95,7 @@
        st->sparse_map_avail = 0;
      }
  }
-@@ -982,8 +1008,14 @@ static void
+@@ -982,8 +1012,14 @@ static void
  sparse_offset_decoder (struct tar_stat_info *st, char const *arg)
  {
    uintmax_t u;
@@ -100,7 +111,7 @@
  }
  
  static void
-@@ -998,15 +1030,13 @@ static void
+@@ -998,15 +1034,13 @@ static void
  sparse_numbytes_decoder (struct tar_stat_info *st, char const *arg)
  {
    uintmax_t u;