[Forensics-changes] [SCM] debian-forensics/tct branch, debian-sid, updated. upstream/1.18-2-gdd84cf4
Daniel Baumann
daniel at debian.org
Sat Feb 9 18:48:04 UTC 2008
The following commit has been merged in the debian-sid branch:
commit dd84cf4765f2701b5be39514d66d8faf91d38873
Merge: 7854be16abd4ff1798e0a3cace655ee10244015d fade7974b8cae3ed47a61966a57ee1c93ecad5ea
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Feb 9 19:47:46 2008 +0100
New upstream release (Closes: #262948).
diff --combined bin/mactime
index 3d7e579,a50e2c3..f5d490e
--- a/bin/mactime
+++ b/bin/mactime
@@@ -1,4 -1,4 +1,4 @@@
-#!/usr/bin/perl5
+#!/usr/bin/perl
#
# A program that attempts to determine what files (taken from an already
# calculated DB; see the file "body") were mucked with at a given time...
@@@ -97,7 -97,7 +97,7 @@@
BEGIN {
$running_under_grave_robber = 1;
$TCT_HOME = "";
-require "$TCT_HOME/conf/coroner.cf";
+require "/etc/tct/coroner.cf";
}
require "body_init.pl";
@@@ -454,10 -454,10 +454,10 @@@ for $n (0..$#{$table{'data'}})
#
# If the date on the file is too old, don't put it in the array
#
- $all_files_used{"$st_mtime,$file"} .= "m" if $st_mtime > $in_seconds;
- $all_files_used{"$st_atime,$file"} .= "a" if $st_atime > $in_seconds;
- $all_files_used{"$st_ctime,$file"} .= "c" if $st_ctime > $in_seconds;
- $all_files_used{"$st_dtime,$file"} .= "d" if $st_dtime > $in_seconds;
+ $all_files_used{"$st_mtime\377$file"} .= "m" if $st_mtime > $in_seconds;
+ $all_files_used{"$st_atime\377$file"} .= "a" if $st_atime > $in_seconds;
+ $all_files_used{"$st_ctime\377$file"} .= "c" if $st_ctime > $in_seconds;
+ $all_files_used{"$st_dtime\377$file"} .= "d" if $st_dtime > $in_seconds;
$all_filenames{$file} = $file;
@@@ -515,7 -515,7 +515,7 @@@ for $key (sort {$a <=> $b} keys %all_fi
next if $marker;
- ($time, $file) = split(/,/,$key);
+ ($time, $file) = split(/\377/,$key);
print "T-in minus Currfile time = ", $in_seconds - $time, "\n" if $debug;
next if ($in_seconds > $time);
diff --combined lib/ostype.pl
index cb901ef,9efa78e..0a7d051
--- a/lib/ostype.pl
+++ b/lib/ostype.pl
@@@ -1,4 -1,5 +1,4 @@@
#
-#!/bin/perl
# Simple test that uses uname to determine what we're running on...
#
@@@ -11,6 -12,7 +11,7 @@@ print "Determining OS (in determine_os(
"FREEBSD2", "FreeBSD.2",
"FREEBSD3", "FreeBSD.3",
"FREEBSD4", "FreeBSD.4",
+ "FREEBSD5", "FreeBSD.5",
"OPENBSD2", "OpenBSD.2",
"OPENBSD3", "OpenBSD.3",
"BSDI2", "BSD\/OS.2",
diff --combined man/man1/timeout.1
index c43ceaf,d2f07f9..91f4528
--- a/man/man1/timeout.1
+++ b/man/man1/timeout.1
@@@ -20,18 -20,26 +20,26 @@@ Arguments
.IP \fI-signal\fR
Specify an optional signal to send to the controlled process.
By default, \fBtimeout\fR sends SIGKILL, which cannot be caught
-or ignored.
+or ignored. The signal must be provided in its numerical value.
.IP \fItime\fR
-The elapsed time limit after which the command is terminated.
+The elapsed time limit in seconds after which the command is terminated.
.IP \fIcommand\fR
The command to be executed.
.SH DIAGNOSTICS
.ad
.fi
- timeout's exit status is the exit status of the specified command or 1 in
- case of a usage error.
+ The command exit status is the exit status of the command
+ (status 1 in case of a usage error).
+ .SH LICENSE
+ .na
+ .nf
+ The IBM PUBLIC LICENSE must be distributed with this
+ software.
+ .SH HISTORY
+ .na
+ .nf
+ This program was first released as part of SATAN.
.SH AUTHOR(S)
.na
.nf
Wietse Venema
- This program is part of SATAN.
diff --combined src/fstools/fs_tools.h
index 19601d0,5644d1e..f531267
--- a/src/fstools/fs_tools.h
+++ b/src/fstools/fs_tools.h
@@@ -115,6 -115,24 +115,24 @@@ extern int optind
#define INO_TO_CG ino_to_cg
#endif
+ #if defined(FREEBSD5)
+ #define SUPPORTED
+ #include <sys/vnode.h>
+ #include <ufs/ufs/quota.h>
+ #include <ufs/ufs/inode.h>
+ #include <ufs/ffs/fs.h>
+ #define LSEEK lseek
+ #define OFF_T off_t
+ #define STRTOUL strtoul
+ #define itod(fs,i) ino_to_fsba(fs,i)
+ #define itoo(fs,i) ino_to_fsbo(fs,i)
+ #define INOTIME(t) (t)
+ #define DADDR_T int64_t
+ #define UFS_TYPE "ufs"
+ #define DEF_FSTYPE UFS_TYPE
+ #define INO_TO_CG ino_to_cg
+ #endif
+
/*
* BSD/OS can handle filesystems > 2GB.
*/
@@@ -183,23 -201,18 +201,18 @@@
*/
#if defined(LINUX2)
#define SUPPORTED
-#include <linux/ext2_fs.h>
+#include <ext2fs/ext2_fs.h>
#define HAVE_EXT2FS
-
- #if !defined(__ia64__) && !defined(__alpha__) && !defined(__x86_64__)
+ #define HAVE_DTIME
+ #if (_FILE_OFFSET_BITS == 64)
+ #define LSEEK lseek
+ #define OFF_T off_t
+ #else
#define USE_MYLSEEK
#define HAVE_LLSEEK
- #endif
-
- #define HAVE_DTIME
-
- #if !defined(__ia64__) && !defined(__alpha__) && !defined(__x86_64__)
#define LSEEK mylseek
- #else
- #define LSEEK lseek
- #endif
-
#define OFF_T long long
+ #endif
#define STRTOUL strtoul
#define DADDR_T __u32
#define EXT2FS_TYPE "ext2fs"
diff --combined src/fstools/mylseek.c
index ffc455a,c5c19e4..08b30db
--- a/src/fstools/mylseek.c
+++ b/src/fstools/mylseek.c
@@@ -23,15 -23,16 +23,16 @@@
#ifdef USE_MYLSEEK
#ifdef HAVE_LLSEEK
#include <errno.h>
- #include <sys/syscall.h>
+ #include <unistd.h>
+ #include <linux/unistd.h>
/*
* This is LINUX, live on the bleeding edge and watch your software break
* with the next release...
*/
-static _syscall5(int, _llseek, unsigned int, fd, unsigned long, offset_high,
- unsigned long, offset_low, OFF_T *, result,
- unsigned int, origin)
+#define _llseek(fd, offset_high, offset_low, result, origin) \
+ syscall(SYS__llseek, fd, offset_high, offset_low, result, origin)
+
/* mylseek - seek beyond the 32-bit barrier */
OFF_T mylseek(int fd, OFF_T offset, int whence)
diff --combined src/lastcomm/sys_defs.h
index e759837,e0fd50b..5b29632
--- a/src/lastcomm/sys_defs.h
+++ b/src/lastcomm/sys_defs.h
@@@ -6,6 -6,7 +6,7 @@@
* This software is distributed under the IBM Public License.
*/
#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
+ || defined(FREEBSD5) \
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|| defined(OPENBSD2) || defined(OPENBSD3)
#define SUPPORTED
@@@ -76,14 -77,10 +77,14 @@@ extern int getopt()
#define NODEV 0xffff
#define HAVE_COMP_MAJOR_PFLTS
#define HAVE_COMP_EXIT_STATUS
+
+#ifndef __alpha__
#define HAVE_COMP_MEMORY_USAGE
#define HAVE_COMP_CHAR_IO_COUNT
#define HAVE_COMP_BLOCK_RW_COUNT
#define HAVE_COMP_SWAP_USAGE
+#endif
+
#define HAVE_EXIT_STATUS
#define PRINT_LINESIZE 8
#define PRINT_NAMESIZE 8
--
debian-forensics/tct
More information about the forensics-changes
mailing list