Update the format string in dbase.build.c also.

Fix the format string and types to work on older versions of NetBSD, in
addition to FreeBSD and SunOS.

4 files changed, 28 insertions, 10 deletions

diff --git a/security/tripwire/distinfo b/security/tripwire/distinfo
index cc9d31b840a..f2d2064c823 100644
--- a/security/tripwire/distinfo
+++ b/security/tripwire/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/12/09 15:56:56 ben Exp $
+$NetBSD: distinfo,v 1.8 2003/12/09 19:17:37 ben Exp $
 
 SHA1 (tripwire-1.2.tar.gz) = 6fc91e25b3e1af3881fd5b6acf240ab6c1133e38
 Size (tripwire-1.2.tar.gz) = 299831 bytes
@@ -7,9 +7,9 @@ SHA1 (patch-ab) = 186edaa504e6e1a7edadb2168982b9b8a2482bac
 SHA1 (patch-ac) = 35b3fe52f497e6cbbf7edfeaee398f0d24aff219
 SHA1 (patch-ad) = 4b8ad8d0cd7c17a8f3a655c5a574856670533ea5
 SHA1 (patch-ae) = 18fe18ded565476a80b9280054cdf7f90403588e
-SHA1 (patch-af) = 968df5d2ea577a8fde9c5aafa43d9fb1e4efde54
+SHA1 (patch-af) = b8238aa69ddab6c74ac9057bdc58acbce0f50c0e
 SHA1 (patch-ag) = 3bfc6965782d727b6b5cf20da4dd44e45327925f
 SHA1 (patch-ah) = 97eccc44190e165dbf174f04c3acab5f1b442bc7
 SHA1 (patch-ai) = 51075e32a7523a8d1691aa41336fe46b671fa865
-SHA1 (patch-aj) = b1d92f402f70eef8dc0e5cf6f285515c9e76d092
-SHA1 (patch-ak) = 3f60f374f4163b8af1215a05cd8760a4b655bdc1
+SHA1 (patch-aj) = 87a7df6f487339cf06ec662492db4fc238674488
+SHA1 (patch-ak) = f97dbba31eec398322384ec72c75ba6698d55718
diff --git a/security/tripwire/patches/patch-af b/security/tripwire/patches/patch-af
index fa066f13751..c6fbc789b9c 100644
--- a/security/tripwire/patches/patch-af
+++ b/security/tripwire/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2003/12/05 05:40:32 ben Exp $
+$NetBSD: patch-af,v 1.2 2003/12/09 19:17:37 ben Exp $
 
 --- src/dbase.build.c.orig	1994-07-25 08:24:09.000000000 -0700
 +++ src/dbase.build.c
@@ -61,3 +61,21 @@ $NetBSD: patch-af,v 1.1 2003/12/05 05:40:32 ben Exp $
  	rewind(fptempdbase);
      } else {
  	fclose(fpw);
+@@ -413,7 +419,7 @@ database_record_write (fpw, filename, fl
+     /* filename, entrynum, ignore, mode, inode, nlinks, uid, gid, size,
+      *		access, modify, ctime, {sig0, sig1, ..., sig9}
+      */
+-    static char *format = "%s %ld %s %lo %ld %ld %ld %ld %ld %s %s %s %s\n";
++    static char *format = "%s %d %s %o %u %u %u %u %lld %s %s %s %s\n";
+ 
+     /* initialize our temporary file */
+     if (fdsymlink == -1) {
+@@ -541,7 +547,7 @@ SKIPPED_SIGS:
+ 	fprintf(fpw, format, filename_escape(filename), (int32)entrynum, ignorevec,
+ 	    (int32)statbuf->st_mode, (int32)statbuf->st_ino,
+ 	    (int32)statbuf->st_nlink, (int32)statbuf->st_uid,
+-	    (int32)statbuf->st_gid, (int32)statbuf->st_size,
++	    (int32)statbuf->st_gid, (long long)statbuf->st_size,
+ 	    pltob64((uint32 *) &va, (char *) vec64_a, 1),
+ 	    pltob64((uint32 *) &vm, (char *) vec64_m, 1),
+ 	    pltob64((uint32 *) &vc, (char *) vec64_c, 1),
diff --git a/security/tripwire/patches/patch-aj b/security/tripwire/patches/patch-aj
index 82c5e059fb4..d0e1b171cc4 100644
--- a/security/tripwire/patches/patch-aj
+++ b/security/tripwire/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2003/12/09 15:56:56 ben Exp $
+$NetBSD: patch-aj,v 1.2 2003/12/09 19:17:37 ben Exp $
 
 --- include/tripwire.h.orig	1994-07-25 09:04:34.000000000 -0700
 +++ include/tripwire.h
@@ -7,7 +7,7 @@ $NetBSD: patch-aj,v 1.1 2003/12/09 15:56:56 ben Exp $
   */
  
 -# define DB_RECORD_FORMAT "%ld %s %lo %lu %lu %lu %lu %lu %s %s %s %s %s %s %s %s %s %s %s %s %s\n"
-+# define DB_RECORD_FORMAT "%d %s %o %u %u %u %u %jd %s %s %s %s %s %s %s %s %s %s %s %s %s\n"
++# define DB_RECORD_FORMAT "%d %s %o %u %u %u %u %lld %s %s %s %s %s %s %s %s %s %s %s %s %s\n"
  #define DB_RECORD_FIELDS 21
  
  /* system defaults */
diff --git a/security/tripwire/patches/patch-ak b/security/tripwire/patches/patch-ak
index a10869d9074..2cfc124da15 100644
--- a/security/tripwire/patches/patch-ak
+++ b/security/tripwire/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2003/12/09 15:56:56 ben Exp $
+$NetBSD: patch-ak,v 1.2 2003/12/09 19:17:37 ben Exp $
 
 --- src/preen.report.c.orig	1994-08-03 20:44:34.000000000 -0700
 +++ src/preen.report.c
@@ -8,7 +8,7 @@ $NetBSD: patch-ak,v 1.1 2003/12/09 15:56:56 ben Exp $
      char ignorevec[512];
 -    uint32 mode, ino, nlink, uid, gid, size;
 +    uint32 mode, ino, nlink, uid, gid;
-+    off_t size;
++    long long size;
      int entrynum;
      int nfields;
  
@@ -18,7 +18,7 @@ $NetBSD: patch-ak,v 1.1 2003/12/09 15:56:56 ben Exp $
      static char structstat_fill_string[512];
 -    uint32        mode, ino, nlink, uid, gid, size;
 +    uint32        mode, ino, nlink, uid, gid;
-+    off_t size;
++    long long size;
      int entrynum;
      char vec64_a[50], vec64_m[50], vec64_c[50];