Reorganize our package list

1 files changed, 74 insertions, 42 deletions

diff --git a/fedora-livecd-security.ks b/fedora-livecd-security.ks
index d9a1bda..3d6a903 100644
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -9,9 +9,12 @@
 %include fedora-live-base.ks
 
 # --enforcing once rawhide is less broke
-selinux --permissive 
+#selinux --permissive 
 
 firewall --enabled
+
+# We do not want to touch the swap partition on the box we are running on,
+# to keep it forensically sound.
 bootloader --append noswap
 
 %packages
@@ -20,70 +23,87 @@ bootloader --append noswap
 -fedora-logos
 generic-logos
 
-gparted
-aide
-aircrack-ng
-airsnort
-argus
-chkrootkit
-clamav
-dd_rescue
-hexedit
+
+# Reconnaissance
+dsniff
 hping3
-john
-kismet
-lsof
-nbtscan
+nc6
+nc
 nessus-client
 nessus-gui
 nessus-server
-nc
-nc6
 ngrep
 nmap
 nmap-frontend
 p0f
-pscan
-rats
-rkhunter
-scanmem
 scanssh
-sectool-gui
-snort
 socat
-splint
 tcpdump
-testdisk
 tiger
-tripwire
 wireshark-gnome
 xprobe2
+nbtscan
 tcpxtract
+firewalk
+hunt
+halberd
+argus
+nbtscan
 ettercap
 ettercap-gtk
-nbtscan
-halberd
-hunt
-firewalk
-foremost
 iptraf
-tor
-flawfinder
-dsniff
 pcapdiff
-hydra
-labrea
-
-pads
-ntop
-honeyd
 picviz
-#inetiviz not yet available
 etherape
+
+# Forensics
+chkrootkit
+clamav
+dd_rescue
+gparted
+hexedit
+prelude-lml
+testdisk
+foremost
+sectool-gui
+rkhunter
+scanmem
+sleuthkit
+
+# Wireless
+aircrack-ng
+airsnort
+kismet
+
+# Code analysis
+splint
+pscan
+flawfinder
+rats
+
+# Intrusion detection
+snort
+aide
+tripwire
+labrea
+honeyd
+pads
 prewikka
 prelude-notify
 prelude-manager
-prelude-lml
+
+# Password cracking
+john
+
+# Anonymity
+tor
+
+# under review (#461385)
+#hydra
+
+# Useful tools
+lsof
+ntop
 
 # Other necessary components
 yum-fastestmirror
@@ -168,7 +188,7 @@ cat >> /home/fedora/.config/openbox/menu.xml << OBDONE
     <action name="Execute"><command>gnome-terminal -e "sh -c 'nessus; bash'"</command></action>
   </item>
   <item label="nmap">
-    <action name="Execute"><command>gnome-terminal -e "sh -c 'nmap; bash'"</command></action>
+    <action name="Execute"><command>gnome-terminal -e "sh -c 'nmapfe; bash'"</command></action>
   </item>
   <item label="p0f">
     <action name="Execute"><command>gnome-terminal -e "sh -c 'p0f -h; bash'"</command></action>
@@ -206,12 +226,18 @@ cat >> /home/fedora/.config/openbox/menu.xml << OBDONE
   <item label="halberd">
     <action name="Execute"><command>gnome-terminal -e "sh -c 'halberd; bash'"</command></action>
   </item>
+  <item label="iptraf">
+    <action name="Execute"><command>gnome-terminal -e "sh -c 'iptraf; bash'"</command></action>
+  </item>
 </menu>
 
 <menu id="forensics-menu" label="Forensics">
   <item label="chkrootkit">
     <action name="Execute"><command>gnome-terminal -e "sh -c 'chkrootkit; bash'"</command></action>
   </item>
+  <item label="rkhunter">
+    <action name="Execute"><command>gnome-terminal -e "sh -c 'rkhunter; bash'"</command></action>
+  </item>
   <item label="clamav">
     <action name="Execute"><command>gnome-terminal -e "sh -c 'clamscan; bash'"</command></action>
   </item>
@@ -260,6 +286,9 @@ cat >> /home/fedora/.config/openbox/menu.xml << OBDONE
   <item label="flawfinder">
     <action name="Execute"><command>gnome-terminal -e "sh -c 'flawfinder; bash'"</command></action>
   </item>
+  <item label="rats">
+    <action name="Execute"><command>gnome-terminal -e "rats; bash'"</command></action>
+  </item>
 </menu>
 
 <menu id="id-menu" label="Intrusion Detection">
@@ -272,6 +301,9 @@ cat >> /home/fedora/.config/openbox/menu.xml << OBDONE
   <item label="tripwire">
     <action name="Execute"><command>gnome-terminal -e "sh -c 'tripwire --help; bash'"</command></action>
   </item>
+  <item label="labrea">
+    <action name="Execute"><command>gnome-terminal -e "sh -c 'labrea; bash'"</command></action>
+  </item>
 </menu>
 
 <menu id="password-menu" label="Password Tools">