Revision bump; fixes bug #70307, use tc-getCC, and don't install md5 man page as it gets installed by openssl.

5 files changed, 296 insertions, 4 deletions

diff --git a/app-forensics/tct/ChangeLog b/app-forensics/tct/ChangeLog
index 7a88c7378777..15d59d672fed 100644
--- a/app-forensics/tct/ChangeLog
+++ b/app-forensics/tct/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-forensics/tct
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/tct/ChangeLog,v 1.3 2004/10/18 12:18:04 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/tct/ChangeLog,v 1.4 2004/11/07 09:48:38 ka0ttic Exp $
+
+*tct-1.15-r1 (07 Nov 2004)
+
+  07 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/tct-1.15-r1-gentoo.diff, +tct-1.15-r1.ebuild:
+  Revision bump; fixes bug #70307, use tc-getCC, and don't install md5 man
+  page as it gets installed by openssl.
 
   18 Oct 2004; David Holm <dholm@gentoo.org> tct-1.15.ebuild:
   Added to ~ppc.
diff --git a/app-forensics/tct/Manifest b/app-forensics/tct/Manifest
index 509ddc63ca70..97260b449103 100644
--- a/app-forensics/tct/Manifest
+++ b/app-forensics/tct/Manifest
@@ -1,5 +1,8 @@
-MD5 cb8811daa102701312ef7b47cac69e38 ChangeLog 624
-MD5 41bbb72e2d5a56f8446b18931f49c48a metadata.xml 236
+MD5 6c32b850619087eca6ea03f4b1526cf9 tct-1.15-r1.ebuild 2502
 MD5 1bb4a5dbd19cd3607064aaad65cab831 tct-1.15.ebuild 2343
-MD5 149e3bd10ce891ee1dd2ad2522a705f0 files/digest-tct-1.15 60
+MD5 2826cc3fbdc4b37d9cc2eec8c2ab8bcd ChangeLog 872
+MD5 41bbb72e2d5a56f8446b18931f49c48a metadata.xml 236
 MD5 c0948c285663f6861c03580bdd352d61 files/tct-1.15-gentoo.diff 5214
+MD5 149e3bd10ce891ee1dd2ad2522a705f0 files/digest-tct-1.15 60
+MD5 ba49bff0b5ebda0a767b57f11b8ff140 files/tct-1.15-r1-gentoo.diff 5908
+MD5 149e3bd10ce891ee1dd2ad2522a705f0 files/digest-tct-1.15-r1 60
diff --git a/app-forensics/tct/files/digest-tct-1.15-r1 b/app-forensics/tct/files/digest-tct-1.15-r1
new file mode 100644
index 000000000000..38d219d8302e
--- /dev/null
+++ b/app-forensics/tct/files/digest-tct-1.15-r1
@@ -0,0 +1 @@
+MD5 d4992f242f7b3a6c8137e8562935f946 tct-1.15.tar.gz 317164
diff --git a/app-forensics/tct/files/tct-1.15-r1-gentoo.diff b/app-forensics/tct/files/tct-1.15-r1-gentoo.diff
new file mode 100644
index 000000000000..363193d81a66
--- /dev/null
+++ b/app-forensics/tct/files/tct-1.15-r1-gentoo.diff
@@ -0,0 +1,193 @@
+diff -urN tct-1.15.orig/Makefile tct-1.15/Makefile
+--- tct-1.15.orig/Makefile	2001-09-15 16:23:28.000000000 -0400
++++ tct-1.15/Makefile	2004-11-07 04:15:01.023763997 -0500
+@@ -16,7 +16,6 @@
+ 	cd src/misc; make "CC=$(CC)" MAKELEVEL=
+ 	cd src/fstools; make "CC=$(CC)" MAKELEVEL=
+ 	cd src/pcat; make "CC=$(CC)" MAKELEVEL=
+-	cd src/file; make "CC=$(CC)" MAKELEVEL=
+ 	cd src/lastcomm; make "CC=$(CC)" MAKELEVEL=
+ 	cd src/major_minor; make "CC=$(CC)" MAKELEVEL=
+ 	cd extras/entropy; make "CC=$(CC)" MAKELEVEL=
+@@ -30,7 +29,6 @@
+ 	cd src/misc; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/fstools; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/pcat; make $@ "CC=$(CC)" MAKELEVEL=
+-	cd src/file; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/lastcomm; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/major_minor; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd extras/entropy; make $@ "CC=$(CC)" MAKELEVEL=
+@@ -44,7 +42,6 @@
+ 	cd src/misc; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/fstools; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/pcat; make $@ "CC=$(CC)" MAKELEVEL=
+-	cd src/file; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/lastcomm; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/major_minor; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd extras/entropy; make $@ "CC=$(CC)" MAKELEVEL=
+diff -urN tct-1.15.orig/bin/grave-robber tct-1.15/bin/grave-robber
+--- tct-1.15.orig/bin/grave-robber	2004-01-22 14:48:01.000000000 -0500
++++ tct-1.15/bin/grave-robber	2004-11-07 04:15:01.024763832 -0500
+@@ -424,9 +424,7 @@
+ 	die "Can't find TCT_HOME - did you run reconfig?\n";
+ 	}
+ 
+-if (!-f "$BIN/file") {
+-	die "Can't find our \"$BIN/file\" command  - did you type \"make\" first?\n";
+-	}
++die "Can't find \"$FILE\" command \n" unless (-f $FILE);
+ 
+ require "logger.pl";
+ require "command.pl";
+@@ -495,15 +493,10 @@
+ #
+ #  we usually carry around the alternate magic file...
+ #
+-if (-f "$ETC/magic") { $magic_file = "$ETC/magic"; }
+-        else {
+-        die "Can't find the /etc/magic file\n" unless (-f "/etc/magic");
+-        $magic_file = "/etc/magic";
+-        warn "Couldn't find $ETC/magic, switching over to $magic_file\n";
+-        }
++$magic_file = "/usr/share/misc/file/magic";
++die "Can't find $magic_file" unless (-f $magic_file);
+ 
+ }
+-
+ #
+ #  does a system have a proc file system?  Returns 0 if so, !0 if no
+ #
+diff -urN tct-1.15.orig/conf/coroner.cf tct-1.15/conf/coroner.cf
+--- tct-1.15.orig/conf/coroner.cf	2004-01-22 14:48:00.000000000 -0500
++++ tct-1.15/conf/coroner.cf	2004-11-07 04:15:01.024763832 -0500
+@@ -2,7 +2,7 @@
+ # Configuration file for coroner's toolkit
+ #
+ 
+-$TCT_HOME = "";
++$TCT_HOME = "/usr/lib/tct";
+ 
+ $ETC    = "$TCT_HOME/etc"  unless $ETC;
+ 
+@@ -21,7 +21,7 @@
+ #
+ # All sensitive operations are logged with a time stamp.
+ #
+-$logfile = "coroner.log";
++$logfile = "/var/log/tct/coroner.log";
+ 
+ #
+ #  What colors to use for MACtime HTML stuff
+diff -urN tct-1.15.orig/conf/grave-robber.cf tct-1.15/conf/grave-robber.cf
+--- tct-1.15.orig/conf/grave-robber.cf	2004-01-22 14:48:00.000000000 -0500
++++ tct-1.15/conf/grave-robber.cf	2004-11-07 04:15:01.025763666 -0500
+@@ -2,7 +2,7 @@
+ # Configuration file for coroner's toolkit
+ #
+ 
+-$TCT_HOME = "";
++$TCT_HOME = "/usr/lib/tct";
+ 
+ $LIB    = "$TCT_HOME/lib"  unless $LIB;
+ $BIN    = "$TCT_HOME/bin"  unless $BIN;
+@@ -28,7 +28,7 @@
+ #
+ # stderr goes...
+ #
+-$error_log = "error.log";
++$error_log = "/var/log/tct/error.log";
+ 
+ #
+ # Don't copy file larger than this (bytes).  Set to 0 if don't want limits
+diff -urN tct-1.15.orig/conf/paths.pl tct-1.15/conf/paths.pl
+--- tct-1.15.orig/conf/paths.pl	2004-01-08 17:29:05.000000000 -0500
++++ tct-1.15/conf/paths.pl	2004-11-07 04:15:01.025763666 -0500
+@@ -13,7 +13,7 @@
+ 
+ $CRONTAB="/usr/bin/crontab";
+ $DATE="/bin/date";
+-$DMESG="/sbin/dmesg";
++$DMESG="/bin/dmesg";
+ $DOMAINNAME="/bin/domainname";
+ $ECHO="/bin/echo";
+ 
+@@ -21,20 +21,20 @@
+ $FINGER="/usr/bin/finger";
+ $IFCONFIG="/sbin/ifconfig";
+ $IPCS="/usr/bin/ipcs";
+-$LAST="/usr/bin/last";
++$LAST="/bin/last";
+ 
+-$LSOF="/usr/local/sbin/lsof";
++$LSOF="/usr/sbin/lsof";
+ $MKDIR="/bin/mkdir";
+-$NETSTAT="/usr/bin/netstat";
++$NETSTAT="/bin/netstat";
+ $PS="/bin/ps";
+ $PWD="/bin/pwd";
+ 
+-$RPCINFO="/usr/bin/rpcinfo";
++$RPCINFO="/usr/sbin/rpcinfo";
+ $SHOWMOUNT="/usr/bin/showmount";
+ $STRINGS="/usr/bin/strings";
+-$SU="/usr/bin/su";
++$SU="/bin/su";
+ $SYNC="/bin/sync";
+-$TEE="/usr/bin/tee";
++$TEE="/bin/tee";
+ 
+ $TOP="/usr/bin/top";
+ $UNAME="/usr/bin/uname";
+@@ -61,9 +61,9 @@
+ $PSTAT="/usr/sbin/pstat";
+ 
+ # linux
+-$RPM="/usr/local/bin/rpm";
++$RPM="/usr/bin/rpm";
+ $KSYMS="/sbin/ksyms";
+-$LSMOD="/sbin/lsmod";
++$LSMOD="/bin/lsmod";
+ 
+ # kernel modules
+ $MODINFO="/sbin/modinfo";
+@@ -77,7 +77,7 @@
+ #
+ # our stuff
+ #
+-$FILE     = "$TCT_HOME/bin/file";
++$FILE     = "/usr/bin/file";
+ $MD5      = "$TCT_HOME/bin/md5";
+ $PCAT     = "$TCT_HOME/bin/pcat";
+ $ICAT     = "$TCT_HOME/bin/icat";
+diff -urN tct-1.15.orig/lazarus/lazarus tct-1.15/lazarus/lazarus
+--- tct-1.15.orig/lazarus/lazarus	2004-01-22 14:48:00.000000000 -0500
++++ tct-1.15/lazarus/lazarus	2004-11-07 04:19:27.807662812 -0500
+@@ -88,12 +88,9 @@
+ #
+ #  we usually carry around the alternate magic file...
+ #
+-if (-f "$ETC/magic") { $magic_file = "$ETC/magic"; }
+-else {
+-	die "Can't find the /etc/magic file\n" unless (-f "/etc/magic");
+-	$magic_file = "/etc/magic";
+-	warn "Couldn't find $ETC/magic, switching over to $magic_file\n";
+-	}
++$magic_file="/usr/share/misc/file/magic"
++die "Can't find $magic_file\n" unless (-f $magic_file);
++
+ 
+ #
+ #  Currently the default is to save/write everything other than unresolved
+diff -urN tct-1.15.orig/reconfig tct-1.15/reconfig
+--- tct-1.15.orig/reconfig	2001-09-15 16:48:51.000000000 -0400
++++ tct-1.15/reconfig	2004-11-07 04:15:01.026763501 -0500
+@@ -157,7 +157,8 @@
+ 		   "extras/ils2mac", "extras/realpath");
+ 
+ # where are we now?
+-chop($cwd = `pwd`);
++#chop($cwd = `pwd`);
++$cwd = "/usr/lib/tct";
+ 
+ # a few small files; suck them in, change in memory, overwrite the old one
+ for $file (@files2reconfig) {
diff --git a/app-forensics/tct/tct-1.15-r1.ebuild b/app-forensics/tct/tct-1.15-r1.ebuild
new file mode 100644
index 000000000000..c37c25c04629
--- /dev/null
+++ b/app-forensics/tct/tct-1.15-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/tct/tct-1.15-r1.ebuild,v 1.1 2004/11/07 09:48:38 ka0ttic Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The Coroner's Toolkit - a collection of tools to aide in gathering and analyzing forensic data on a UNIX system"
+HOMEPAGE="http://www.porcupine.org/forensics/tct.html"
+SRC_URI="http://www.porcupine.org/forensics/${P}.tar.gz"
+
+LICENSE="IBM as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.0004
+	>=sys-apps/sed-4"
+RDEPEND="${DEPEND}
+	dev-perl/DateManip"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i "s:^\(CC.*= \).*:\1$(tc-getCC):" Makefile || die "sed CC failed"
+	sed -i "s:\$(OPT) \$(DEBUG):${CFLAGS}:" */*/Makefile \
+		|| die "sed CFLAGS failed"
+
+	epatch ${FILESDIR}/${PF}-gentoo.diff
+}
+
+src_install() {
+	# bins/libs
+	into /usr/lib/tct
+	dobin bin/* || die "bin installation failed"
+
+	exeinto /usr/lib/tct
+	doexe reconfig || die "reconfig installation failed"
+
+	insinto /usr/lib/tct/lib
+	doins lib/*.pl || die "lib installation failed"
+
+	exeinto /usr/lib/tct/extras
+	doexe extras/bdf extras/ils2mac extras/realpath extras/entropy/entropy \
+		extras/findkey/findkey || die "extras installation failed"
+
+	# config
+	insinto /etc/tct
+	doins conf/* || die "conf installation failed"
+
+	# docs
+	newdoc extras/README README.extras || die "newdoc failed"
+	dodoc docs/* Beware CHANGES INSTALL OS-NOTES README.FIRST \
+		TODO* additional-resources bibliography help-recovering-file \
+		help-when-broken-into quick-start || die "doc installation failed"
+
+	# these manual pages are provided by other packages
+	rm man/man1/file.1
+	rm man/man1/md5.1
+	rm man/man5/magic.5
+	doman man/*/* || die "man installation failed"
+
+	# setup dirs/symlinks
+	keepdir /var/log/tct
+
+	dosym /etc/tct /usr/lib/tct/conf || die "dosym failed"
+
+	keepdir /var/lib/tct
+	dosym /var/lib/tct /usr/lib/tct/data || die "dosym failed"
+
+	dodir /usr/sbin
+	cd ${S}/bin
+	# all binaries except the following are meant for internal use
+	for bin in grave-robber lazarus mactime unrm; do
+		dosym /usr/lib/tct/bin/${bin} /usr/sbin/${bin} \
+			|| die "dosym ${bin} failed"
+	done
+}
+
+pkg_postinst() {
+	echo
+	einfo "The authors of The Coroner's Toolkit highly recommend"
+	einfo "installing sys-apps/lsof for use by the toolkit."
+	einfo
+	einfo "Please read the README and quickstart files installed"
+	einfo "in /usr/share/doc/${PF} before using The Coroner's Toolkit."
+	echo
+}