diff options
| author | ben <ben@pkgsrc.org> | 2003-12-09 15:56:56 +0000 |
|---|---|---|
| committer | ben <ben@pkgsrc.org> | 2003-12-09 15:56:56 +0000 |
| commit | c03f97f79f3942df16d73fc32131ccabb4cdce7b (patch) | |
| tree | b26571ed585eba9acf8e0da47f84ec847b927e0f /security/tripwire/patches | |
| parent | 2acc62fbb91eecc1dae0354775e8e4e7d1bcfc5f (diff) | |
| download | pkgsrc-c03f97f79f3942df16d73fc32131ccabb4cdce7b.tar.gz | |
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.
Diffstat (limited to 'security/tripwire/patches')
| -rw-r--r-- | security/tripwire/patches/patch-aj | 13 | ||||
| -rw-r--r-- | security/tripwire/patches/patch-ak | 24 |
2 files changed, 37 insertions, 0 deletions
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]; + |