Converted to use sys-apps/file; Installs configs into /etc now rather than installing a symlink.

4 files changed, 120 insertions, 30 deletions

diff --git a/app-forensics/tct/ChangeLog b/app-forensics/tct/ChangeLog
index e230873b3c2c..a912212b9624 100644
--- a/app-forensics/tct/ChangeLog
+++ b/app-forensics/tct/ChangeLog
@@ -1,6 +1,11 @@
 # 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.1 2004/09/16 16:55:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/tct/ChangeLog,v 1.2 2004/09/17 09:56:34 ka0ttic Exp $
+
+  17 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> files/tct-1.15-gentoo.diff,
+  tct-1.15.ebuild:
+  Converted to use sys-apps/file; Installs configs into /etc now rather than
+  installing a symlink.
 
 *tct-1.15 (16 Sep 2004)
 
diff --git a/app-forensics/tct/Manifest b/app-forensics/tct/Manifest
index 3284225f342e..53344d2390b4 100644
--- a/app-forensics/tct/Manifest
+++ b/app-forensics/tct/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 82a8af96b4d3d8229e2015609da756e0 tct-1.15.ebuild 2417
-MD5 6f84e2baba17305ee7322c43379cf1a0 ChangeLog 348
+MD5 1339c5b4a36dc0aa5424f2c93b4c2648 tct-1.15.ebuild 2340
+MD5 e24c66923c56b6bdc355ca2c69c7fe59 ChangeLog 546
 MD5 41bbb72e2d5a56f8446b18931f49c48a metadata.xml 236
-MD5 4f84b201211e39a37c212afd03072e54 files/tct-1.15-gentoo.diff 2134
+MD5 c0948c285663f6861c03580bdd352d61 files/tct-1.15-gentoo.diff 5214
 MD5 149e3bd10ce891ee1dd2ad2522a705f0 files/digest-tct-1.15 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBScV2EZCkKN40op4RAnLOAJ9xrdt0QBzrykAX75pOx586Ah2G4QCgrHnk
-p5J7UCiKMn6L5kgZ6h5zLnY=
-=hlXb
------END PGP SIGNATURE-----
diff --git a/app-forensics/tct/files/tct-1.15-gentoo.diff b/app-forensics/tct/files/tct-1.15-gentoo.diff
index cc4ccf5dbaa2..b66bf9aded71 100644
--- a/app-forensics/tct/files/tct-1.15-gentoo.diff
+++ b/app-forensics/tct/files/tct-1.15-gentoo.diff
@@ -1,6 +1,65 @@
+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-09-16 23:52:56.153253952 -0400
+@@ -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-09-17 00:47:07.559965000 -0400
+@@ -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-09-16 10:16:17.209578032 -0400
++++ tct-1.15/conf/coroner.cf	2004-09-16 23:44:43.288180832 -0400
 @@ -2,7 +2,7 @@
  # Configuration file for coroner's toolkit
  #
@@ -21,7 +80,7 @@ diff -urN tct-1.15.orig/conf/coroner.cf tct-1.15/conf/coroner.cf
  #  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-09-16 10:16:02.543440243 -0400
++++ tct-1.15/conf/grave-robber.cf	2004-09-16 23:44:43.288180832 -0400
 @@ -2,7 +2,7 @@
  # Configuration file for coroner's toolkit
  #
@@ -42,28 +101,67 @@ diff -urN tct-1.15.orig/conf/grave-robber.cf tct-1.15/conf/grave-robber.cf
  # 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-09-16 12:21:38.645527494 -0400
-@@ -23,7 +23,7 @@
++++ tct-1.15/conf/paths.pl	2004-09-16 23:46:48.573134624 -0400
+@@ -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="/usr/bin/last";
++$LAST="/bin/last";
  
 -$LSOF="/usr/local/sbin/lsof";
 +$LSOF="/usr/sbin/lsof";
  $MKDIR="/bin/mkdir";
- $NETSTAT="/usr/bin/netstat";
+-$NETSTAT="/usr/bin/netstat";
++$NETSTAT="/bin/netstat";
  $PS="/bin/ps";
-@@ -61,7 +61,7 @@
+ $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="/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/reconfig tct-1.15/reconfig
 --- tct-1.15.orig/reconfig	2001-09-15 16:48:51.000000000 -0400
-+++ tct-1.15/reconfig	2004-09-16 09:43:15.790293315 -0400
++++ tct-1.15/reconfig	2004-09-16 23:44:43.289180680 -0400
 @@ -157,7 +157,8 @@
  		   "extras/ils2mac", "extras/realpath");
  
diff --git a/app-forensics/tct/tct-1.15.ebuild b/app-forensics/tct/tct-1.15.ebuild
index c9a9c104f464..ceb1fdde08bc 100644
--- a/app-forensics/tct/tct-1.15.ebuild
+++ b/app-forensics/tct/tct-1.15.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2004/09/16 16:55:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/tct/tct-1.15.ebuild,v 1.2 2004/09/17 09:56:34 ka0ttic Exp $
 
 inherit eutils
 
@@ -44,12 +44,9 @@ src_install() {
 		extras/findkey/findkey || die "extras installation failed"
 
 	# config
-	insinto /usr/lib/tct/conf
+	insinto /etc/tct
 	doins conf/* || die "conf installation failed"
 
-	insinto /usr/lib/tct/etc
-	doins etc/magic || die "etc installation failed"
-
 	# docs
 	newdoc extras/README README.extras || die "newdoc failed"
 	dodoc docs/* Beware CHANGES INSTALL OS-NOTES README.FIRST \
@@ -57,13 +54,13 @@ src_install() {
 		help-when-broken-into quick-start || die "doc installation failed"
 
 	rm man/man1/file.1
+	rm man/man5/magic.5
 	doman man/*/* || die "man installation failed"
 
 	# setup dirs/symlinks
 	keepdir /var/log/tct
 
-	dodir /etc
-	dosym /usr/lib/tct/conf /etc/tct || die "dosym failed"
+	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"