From 8763102262a7406ba55b12f612bad1e75c956d97 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 28 May 2018 18:56:25 +0200
Subject: [PATCH] Update Security Lab section

---
 comps-f29.xml.in | 50 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/comps-f29.xml.in b/comps-f29.xml.in
index a9520c5e..e3ed2427 100644
--- a/comps-f29.xml.in
+++ b/comps-f29.xml.in
@@ -5288,6 +5288,7 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">ArpON</packagereq>
       <packagereq type="default">afftools</packagereq>
       <packagereq type="default">aide</packagereq>
       <packagereq type="default">aircrack-ng</packagereq>
@@ -5295,48 +5296,64 @@
       <packagereq type="default">argus</packagereq>
       <packagereq type="default">argus-clients</packagereq>
       <packagereq type="default">arp-scan</packagereq>
-      <packagereq type="default">ArpON</packagereq>
       <packagereq type="default">bannergrab</packagereq>
       <packagereq type="default">binwalk</packagereq>
       <packagereq type="default">bkhive</packagereq>
+      <packagereq type="default">bmon</packagereq>
       <packagereq type="default">bonesi</packagereq>
       <packagereq type="default">bro</packagereq>
+      <packagereq type="default">captcp</packagereq>
       <packagereq type="default">chkrootkit</packagereq>
+      <packagereq type="default">ciphertest</packagereq>
       <packagereq type="default">cmospwd</packagereq>
       <packagereq type="default">cowpatty</packagereq>
       <packagereq type="default">dc3dd</packagereq>
+      <packagereq type="default">dcfldd</packagereq>
       <packagereq type="default">ddrescue</packagereq>
       <packagereq type="default">dhcping</packagereq>
+      <packagereq type="default">dislocker</packagereq>
       <packagereq type="default">dnsenum</packagereq>
       <packagereq type="default">dnsmap</packagereq>
       <packagereq type="default">dnstop</packagereq>
       <packagereq type="default">dnstracer</packagereq>
       <packagereq type="default">driftnet</packagereq>
       <packagereq type="default">dsniff</packagereq>
+      <packagereq type="default">dstat</packagereq>
       <packagereq type="default">echoping</packagereq>
       <packagereq type="default">etherape</packagereq>
       <packagereq type="default">ettercap</packagereq>
+      <packagereq type="default">ewftools</packagereq>
       <packagereq type="default">examiner</packagereq>
+      <packagereq type="default">extundelete</packagereq>
       <packagereq type="default">firewalk</packagereq>
+      <packagereq type="default">firstaidkit-gui</packagereq>
+      <packagereq type="default">firstaidkit-plugin-all</packagereq>
       <packagereq type="default">flawfinder</packagereq>
       <packagereq type="default">foremost</packagereq>
+      <packagereq type="default">fpdns</packagereq>
       <packagereq type="default">fping</packagereq>
       <packagereq type="default">goaccess</packagereq>
       <packagereq type="default">gparted</packagereq>
       <packagereq type="default">halberd</packagereq>
+      <packagereq type="default">hans</packagereq>
       <packagereq type="default">hexedit</packagereq>
       <packagereq type="default">hfsutils</packagereq>
       <packagereq type="default">horst</packagereq>
       <packagereq type="default">hping3</packagereq>
       <packagereq type="default">ht</packagereq>
+      <packagereq type="default">htop</packagereq>
+      <packagereq type="default">httpd-tools</packagereq>
       <packagereq type="default">httpie</packagereq>
       <packagereq type="default">httping</packagereq>
+      <packagereq type="default">httpress</packagereq>
       <packagereq type="default">httpry</packagereq>
       <packagereq type="default">httrack</packagereq>
       <packagereq type="default">hunt</packagereq>
       <packagereq type="default">hydra</packagereq>
       <packagereq type="default">iftop</packagereq>
+      <packagereq type="default">ike-scan</packagereq>
       <packagereq type="default">inception</packagereq>
+      <packagereq type="default">inxi</packagereq>
       <packagereq type="default">iperf</packagereq>
       <packagereq type="default">iptraf-ng</packagereq>
       <packagereq type="default">irssi</packagereq>
@@ -5349,6 +5366,7 @@
       <packagereq type="default">lynis</packagereq>
       <packagereq type="default">macchanger</packagereq>
       <packagereq type="default">masscan</packagereq>
+      <packagereq type="default">mausezahn</packagereq>
       <packagereq type="default">mc</packagereq>
       <packagereq type="default">mcabber</packagereq>
       <packagereq type="default">medusa</packagereq>
@@ -5356,20 +5374,25 @@
       <packagereq type="default">mutt</packagereq>
       <packagereq type="default">nano</packagereq>
       <packagereq type="default">nbtscan</packagereq>
+      <packagereq type="default">nc</packagereq>
+      <packagereq type="default">nc6</packagereq>
       <packagereq type="default">ncrack</packagereq>
       <packagereq type="default">nebula</packagereq>
       <packagereq type="default">net-snmp</packagereq>
       <packagereq type="default">net-snmp-utils</packagereq>
+      <packagereq type="default">netactview</packagereq>
+      <packagereq type="default">netdisco</packagereq>
       <packagereq type="default">nethogs</packagereq>
       <packagereq type="default">netsed</packagereq>
       <packagereq type="default">netsniff-ng</packagereq>
+      <packagereq type="default">nfspy</packagereq>
       <packagereq type="default">nfswatch</packagereq>
       <packagereq type="default">ngrep</packagereq>
+      <packagereq type="default">nicstat</packagereq>
       <packagereq type="default">nikto</packagereq>
       <packagereq type="default">nload</packagereq>
       <packagereq type="default">nmap</packagereq>
       <packagereq type="default">nmap-frontend</packagereq>
-      <packagereq type="default">nmap-ncat</packagereq>
       <packagereq type="default">nmbscan</packagereq>
       <packagereq type="default">ntfs-3g</packagereq>
       <packagereq type="default">ntfsprogs</packagereq>
@@ -5379,6 +5402,7 @@
       <packagereq type="default">onesixtyone</packagereq>
       <packagereq type="default">openssh</packagereq>
       <packagereq type="default">openvas-cli</packagereq>
+      <packagereq type="default">openvas-gsa</packagereq>
       <packagereq type="default">openvas-scanner</packagereq>
       <packagereq type="default">ophcrack</packagereq>
       <packagereq type="default">p0f</packagereq>
@@ -5386,24 +5410,33 @@
       <packagereq type="default">pads</packagereq>
       <packagereq type="default">paris-traceroute</packagereq>
       <packagereq type="default">pcapdiff</packagereq>
+      <packagereq type="default">pcapfix</packagereq>
       <packagereq type="default">pdfcrack</packagereq>
+      <packagereq type="default">picviz-gui</packagereq>
       <packagereq type="default">powertop</packagereq>
-      <packagereq type="default">proxychains</packagereq>
+      <packagereq type="default">proxychains-ng</packagereq>
+      <packagereq type="default">psad</packagereq>
       <packagereq type="default">pscan</packagereq>
       <packagereq type="default">pwgen</packagereq>
       <packagereq type="default">pyrit</packagereq>
       <packagereq type="default">raddump</packagereq>
       <packagereq type="default">ratproxy</packagereq>
       <packagereq type="default">rats</packagereq>
+      <packagereq type="default">reaver</packagereq>
       <packagereq type="default">rkhunter</packagereq>
       <packagereq type="default">safecopy</packagereq>
       <packagereq type="default">samdump2</packagereq>
       <packagereq type="default">scalpel</packagereq>
       <packagereq type="default">scamper</packagereq>
       <packagereq type="default">scanmem</packagereq>
+      <packagereq type="default">scap-security-guide</packagereq>
+      <packagereq type="default">scap-workbench</packagereq>
       <packagereq type="default">scapy</packagereq>
       <packagereq type="default">screen</packagereq>
       <packagereq type="default">scrub</packagereq>
+      <packagereq type="default">sectool-gui</packagereq>
+      <packagereq type="default">security-menus</packagereq>
+      <packagereq type="default">setools-gui</packagereq>
       <packagereq type="default">siege</packagereq>
       <packagereq type="default">sing</packagereq>
       <packagereq type="default">sipp</packagereq>
@@ -5413,9 +5446,11 @@
       <packagereq type="default">slowhttptest</packagereq>
       <packagereq type="default">snmpcheck</packagereq>
       <packagereq type="default">socat</packagereq>
+      <packagereq type="default">sockperf</packagereq>
       <packagereq type="default">splint</packagereq>
       <packagereq type="default">sqlninja</packagereq>
       <packagereq type="default">srm</packagereq>
+      <packagereq type="default">sshscan</packagereq>
       <packagereq type="default">ssldump</packagereq>
       <packagereq type="default">sslscan</packagereq>
       <packagereq type="default">sslsplit</packagereq>
@@ -5423,7 +5458,9 @@
       <packagereq type="default">subnetcalc</packagereq>
       <packagereq type="default">sucrack</packagereq>
       <packagereq type="default">swaks</packagereq>
-      <packagereq type="default">tcpcopy</packagereq>
+      <packagereq type="default">sysstat</packagereq>
+      <packagereq type="default">sysstat</packagereq>
+      <packagereq type="default">tcpcrypt</packagereq>
       <packagereq type="default">tcpdump</packagereq>
       <packagereq type="default">tcpflow</packagereq>
       <packagereq type="default">tcpick</packagereq>
@@ -5434,11 +5471,14 @@
       <packagereq type="default">tcpxtract</packagereq>
       <packagereq type="default">telnet</packagereq>
       <packagereq type="default">testdisk</packagereq>
+      <packagereq type="default">thc-ipv6</packagereq>
+      <packagereq type="default">tlssled</packagereq>
       <packagereq type="default">trafshow</packagereq>
       <packagereq type="default">tripwire</packagereq>
       <packagereq type="default">unhide</packagereq>
       <packagereq type="default">unicornscan</packagereq>
       <packagereq type="default">uperf</packagereq>
+      <packagereq type="default">usbsniff</packagereq>
       <packagereq type="default">vim-enhanced</packagereq>
       <packagereq type="default">vnstat</packagereq>
       <packagereq type="default">wavemon</packagereq>
@@ -5449,8 +5489,8 @@
       <packagereq type="default">wipe</packagereq>
       <packagereq type="default">wireshark</packagereq>
       <packagereq type="default">wireshark-gtk</packagereq>
-      <packagereq type="default">xmount</packagereq>
       <packagereq type="default">yersinia</packagereq>
+      <packagereq type="default">yum-utils</packagereq>
       <packagereq type="default">zmap</packagereq>
     </packagelist>
   </group>