pkgsrc/security/tripwire/patches/patch-aj

$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
@@ -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 %lld %s %s %s %s %s %s %s %s %s %s %s %s %s\n"
 #define DB_RECORD_FIELDS 21
 
 /* system defaults */
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. 2003-12-09 20:17:37 +01:00			$NetBSD: patch-aj,v 1.2 2003/12/09 19:17:37 ben Exp $
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. 2003-12-09 16:56:56 +01:00
			`--- 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"`
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. 2003-12-09 20:17:37 +01:00			`+# 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"`
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. 2003-12-09 16:56:56 +01:00			`#define DB_RECORD_FIELDS 21`

			`/* system defaults */`