In include/config.h, uint32 was by default defined as an unsigned long.

However (because of -DTW_TYPE32='int' being added to CFLAGS for an LP64 fix
in revision 1.3 of patches/patch-aa) uint32 is defined as an unsigned int.
This caused two problems:
1) The format string in include/tripwire.h was not updated to match.
2) On NetBSD, off_t is __int64_t.

I am changing the format string in tripwire.h to match uint32.  I also
changed the type of the variable "size" from uint32 to off_t, and changed
its format string to match intmax_t.

This fixes the sparc64 coredump mentioned in PR 19391.

4 files changed, 42 insertions, 3 deletions

diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index aa18ce78b8c..e34585e3dbc 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2003/12/09 15:40:20 ben Exp $
+# $NetBSD: Makefile,v 1.19 2003/12/09 15:56:56 ben Exp $
 #
 
 DISTNAME=	tripwire-1.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/security/tripwire/old/
 
diff --git a/security/tripwire/distinfo b/security/tripwire/distinfo
index 39f74566e92..cc9d31b840a 100644
--- a/security/tripwire/distinfo
+++ b/security/tripwire/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/12/05 05:40:32 ben Exp $
+$NetBSD: distinfo,v 1.7 2003/12/09 15:56:56 ben Exp $
 
 SHA1 (tripwire-1.2.tar.gz) = 6fc91e25b3e1af3881fd5b6acf240ab6c1133e38
 Size (tripwire-1.2.tar.gz) = 299831 bytes
@@ -11,3 +11,5 @@ SHA1 (patch-af) = 968df5d2ea577a8fde9c5aafa43d9fb1e4efde54
 SHA1 (patch-ag) = 3bfc6965782d727b6b5cf20da4dd44e45327925f
 SHA1 (patch-ah) = 97eccc44190e165dbf174f04c3acab5f1b442bc7
 SHA1 (patch-ai) = 51075e32a7523a8d1691aa41336fe46b671fa865
+SHA1 (patch-aj) = b1d92f402f70eef8dc0e5cf6f285515c9e76d092
+SHA1 (patch-ak) = 3f60f374f4163b8af1215a05cd8760a4b655bdc1
diff --git a/security/tripwire/patches/patch-aj b/security/tripwire/patches/patch-aj
new file mode 100644
index 00000000000..82c5e059fb4
--- /dev/null
+++ b/security/tripwire/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2003/12/09 15:56:56 ben Exp $
+
+--- include/tripwire.h.orig	1994-07-25 09:04:34.000000000 -0700
++++ include/tripwire.h
+@@ -67,7 +67,7 @@
+  *		ltob64(statbuf->st_ctime, vec64_c), sig0, sig1, ..., sig9
+  */
+ 
+-# 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_FIELDS 21
+ 
+ /* system defaults */
diff --git a/security/tripwire/patches/patch-ak b/security/tripwire/patches/patch-ak
new file mode 100644
index 00000000000..a10869d9074
--- /dev/null
+++ b/security/tripwire/patches/patch-ak
@@ -0,0 +1,24 @@
+$NetBSD: patch-ak,v 1.1 2003/12/09 15:56:56 ben Exp $
+
+--- src/preen.report.c.orig	1994-08-03 20:44:34.000000000 -0700
++++ src/preen.report.c
+@@ -452,7 +452,8 @@ preen_change_count()
+     char *s;
+     int ignoremask;
+     char ignorevec[512];
+-    uint32 mode, ino, nlink, uid, gid, size;
++    uint32 mode, ino, nlink, uid, gid;
++    off_t size;
+     int entrynum;
+     int nfields;
+ 
+@@ -633,7 +634,8 @@ structstat_fill (string, statbuf, sigs, 
+ {
+     char *ignorevec;
+     static char structstat_fill_string[512];
+-    uint32        mode, ino, nlink, uid, gid, size;
++    uint32        mode, ino, nlink, uid, gid;
++    off_t size;
+     int entrynum;
+     char vec64_a[50], vec64_m[50], vec64_c[50];
+