From e8046d16f886708eb62e3879411e108bf3f2104c Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Tue, 28 Jul 2009 14:58:10 +0200
Subject: [PATCH] Add several packages to GRML_FORENSIC

---
 debian/changelog                                 | 33 ++++------
 etc/grml/fai/config/package_config/GRML_FORENSIC | 84 +++++++++++++++++++++++-
 2 files changed, 96 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 053d15a..c5de4d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,25 +21,20 @@ grml-live (0.9.19) UNRELEASED; urgency=low
      that have been removed from GRML_FULL.
   * Software related changes in GRML_FORENSIC:
     - drop stegdetect (see #507908)
-    - add cryptcat
-    - add dsniff
-    - add gphoto2
-    - add hdparm
-    - add hping3
-    - add netdiscover
-    - add nmap
-    - add readpst
-    - add recoverdm
-    - add rifiuti
-    - add tcpdump
-    - add tcpflow
-    - add tcpreplay
-    - add tcptrace
-    - add tcptrack
-    - add zfs-fuse
-    Thanks to Hans-Peter Merkel for his tool list.
-
- -- Michael Prokop <mika@grml.org>  Tue, 21 Jul 2009 11:37:33 +0200
+    - add several further packages: 
+      acpi apache2 apache2-utils at bluez-utils cpufrequtils cryptcat
+      cups cups-pdf dc dsniff dvd+rw-tools gphoto2 hdparm hping3
+      mysql-client netdiscover nmap os-prober poppler-utils pppconfig
+      rdesktop readahead readpst recoverdm rifiuti rifiuti2 rpm samba
+      samdump2 sdparm sg3-utils smbclient socat sqlite3 tcpdump
+      tcpflow tcpreplay tcptrace tcptrack tcpxtract tct time unhide
+      untex uuid-runtime vinetto w3m wamerican whois wireshark wv
+      wvdial zfs-fuse
+    Thanks also to Hans-Peter Merkel for his tool list.
+  * Drop hdparm from GRML_FULL, GRML_MEDIUM and GRML_SMALL as it
+    is part of GRMLBASE already.
+
+ -- Michael Prokop <mika@grml.org>  Tue, 28 Jul 2009 14:55:25 +0200
 
 grml-live (0.9.18) unstable; urgency=low
 
diff --git a/etc/grml/fai/config/package_config/GRML_FORENSIC b/etc/grml/fai/config/package_config/GRML_FORENSIC
index 27f94d8..6e7c7c2 100644
--- a/etc/grml/fai/config/package_config/GRML_FORENSIC
+++ b/etc/grml/fai/config/package_config/GRML_FORENSIC
@@ -12,44 +12,73 @@ PACKAGES aptitude
 # http://wiki.debian.org/DebianForensics/TODO
 
 # forensic software:
+acl
 afflib
 autopsy
+bkhive
 chkrootkit
 chntpw
+clamav
+clamav-base
+clamav-freshclam
+clamtk
 cryptcat
 dcfldd
+dcraw
 ddrescue
 disktype
+dnsutils
 dsniff
 fdupes
+fdutils
 foremost
 galleta
 gpart
+gparted
 gphoto2
+grepmail
 grokevt
-hdparm
+hfsplus
+hfsutils
+hfsutils-tcltk
 hping3
 hwinfo
+iputils-arping
+iputils-tracepath
+jfsutils
+kpartx
 libewf1
 lshw
+lsscsi
+ltrace
 magicrescue
 mboxgrep
 md5deep
 memdump
+mii-diag
 missidentify
+mscompress
 netdiscover
 nmap
+odt2txt
+ophcrack
 outguess
+p7zip-full
+parted
 pasco
+rdd
 readpst
 recoverdm
 reglookup
 rifiuti
+rifiuti2
 rkhunter
+samdump2
 scalpel
 scrounge-ntfs
 sdd
 sleuthkit
+socat
 ssdeep
 tableau-parm
 tcpdump
@@ -57,16 +86,66 @@ tcpflow
 tcpreplay
 tcptrace
 tcptrack
+tcpxtract
+tct
 testdisk
+unhide
+untex
+vinetto
 wipe
+wireshark
+wv
 zfs-fuse
 
-# pdftk
+# system tools
+acpi
+bluez-utils
+cpufrequtils
+dc
+dvd+rw-tools
+os-prober
+readahead
+rpm
+sdparm
+sg3-utils
+smbclient
+whois
+
+# services
+apache2 apache2-utils
+at
+cups
+cups-pdf
+mysql-client
+pppconfig
+samba
+sqlite3
+uuid-runtime
+
+# desktop tools/stuff
+poppler-utils
+rdesktop
+time
+w3m
+wamerican
+wvdial
+
+# desktop
+#xfce4
+#xfce4-icon-theme
+# vs.
+#lxde
+
+# TODO
+# * pdftk
+# * vncviewer? (tsclient)
 
 # Packages which aren't (official) available (yet):
+# afflib         => on the way
 # air            =>
 # bmap           =>
 # carvefs        =>
+# chaosreader    => on the way
 # dc3dd          => #468958
 # e2recover      =>
 # fatback        =>
@@ -80,3 +159,4 @@ zfs-fuse
 # regviewer      =>
 # revit          => #469067
 # sha15deep      =>
+# xmount         => on the way
-- 
2.1.4