20 files changed, 33 insertions, 114 deletions
diff --git a/net-analyzer/barnyard/metadata.xml b/net-analyzer/barnyard/metadata.xml
index 28ebb113d63d..0c6631479adc 100644
--- a/net-analyzer/barnyard/metadata.xml
+++ b/net-analyzer/barnyard/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription>Unified alert/log spool reader and output handler for Snort! This program decouples output overhead from the Snort network intrusion detection system and allows Snort to run at full speed.</longdescription>
+<herd>netmon</herd>
+<longdescription>Fast output system for Snort</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/honeyd/metadata.xml b/net-analyzer/honeyd/metadata.xml
index a138bfa46aa6..cd092f88a270 100644
--- a/net-analyzer/honeyd/metadata.xml
+++ b/net-analyzer/honeyd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-<longdescription>Honeyd is a small daemon that creates virtual hosts on a network.</longdescription>
+<herd>netmon</herd>
+<longdescription>Honeyd is a small daemon that creates virtual hosts on a network</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ipac-ng/metadata.xml b/net-analyzer/ipac-ng/metadata.xml
index 0529f8a3c7f8..f6c770bde4d8 100644
--- a/net-analyzer/ipac-ng/metadata.xml
+++ b/net-analyzer/ipac-ng/metadata.xml
@@ -2,10 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
-<longdescription>IP accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like MRTG.</longdescription>
+<longdescription>ip accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like mrtg</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/iplog/metadata.xml b/net-analyzer/iplog/metadata.xml
index 577c9834431a..9fe62327fd13 100644
--- a/net-analyzer/iplog/metadata.xml
+++ b/net-analyzer/iplog/metadata.xml
@@ -2,10 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
-<longdescription>iplog is a TCP/IP traffic logger.</longdescription>
+<longdescription>iplog is a TCP/IP traffic logger</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nagios/metadata.xml b/net-analyzer/nagios/metadata.xml
index 2d3d8a2c9243..d734cf5d5e5e 100644
--- a/net-analyzer/nagios/metadata.xml
+++ b/net-analyzer/nagios/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
+  <email>eldad@gentoo.org</email>
+  <name>Eldad Zack</name>
 </maintainer>
-<longdescription>The Nagios metapackage - merge this to pull install all of the nagios packages.</longdescription>
+<longdescription>Nagios is a host and service monitor designed to inform you of network problems before your clients, end-users or managers do. It has been designed to run under the Linux operating system, but works fine under most *NIX variants as well. The monitoring daemon runs intermittent checks on hosts and services you specify using external "plugins" which return status information to Nagios. When problems are encountered, the daemon can send notifications out to administrative contacts in a variety of different ways (email, instant message, SMS, etc.). Current status information, historical logs, and reports can all be accessed via a web browser.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/netwox/metadata.xml b/net-analyzer/netwox/metadata.xml
index bc8add436336..ee899a6c83fe 100644
--- a/net-analyzer/netwox/metadata.xml
+++ b/net-analyzer/netwox/metadata.xml
@@ -2,10 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
 <longdescription>Toolbox of over 400 utilities for testing Ethernet/IP networks</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ntop/metadata.xml b/net-analyzer/ntop/metadata.xml
index 053268dcc646..957191d63d3b 100644
--- a/net-analyzer/ntop/metadata.xml
+++ b/net-analyzer/ntop/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-	<longdescription>ntop is a unix tool that shows network usage like top</longdescription>
+<herd>netmon</herd>
+<longdescription>tool that shows network usage like top</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/piwi/metadata.xml b/net-analyzer/piwi/metadata.xml
index 6357ad3d5191..d027fdb1ff6d 100644
--- a/net-analyzer/piwi/metadata.xml
+++ b/net-analyzer/piwi/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription>(Prelude|Perl) IDS Web Interface</longdescription>
+<herd>netmon</herd>
+<longdescription>(Prelude|Perl) IDS Web Interface</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/portmon/metadata.xml b/net-analyzer/portmon/metadata.xml
index 8125a76971ee..55b1e0c4efaf 100644
--- a/net-analyzer/portmon/metadata.xml
+++ b/net-analyzer/portmon/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-<longdescription>Portmon is a netwok service monitoring daemon.</longdescription>
+<herd>netmon</herd>
+<longdescription>Portmon is a network service monitoring daemon.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/prelude-nagios/metadata.xml b/net-analyzer/prelude-nagios/metadata.xml
index 6245ff0760ff..618dd0f6f59a 100644
--- a/net-analyzer/prelude-nagios/metadata.xml
+++ b/net-analyzer/prelude-nagios/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+<herd>netmon</herd>
+<longdescription>Plugin for Nagios to talk with Prelude</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/prelude-nids/metadata.xml b/net-analyzer/prelude-nids/metadata.xml
index 6245ff0760ff..3a7135b72b64 100644
--- a/net-analyzer/prelude-nids/metadata.xml
+++ b/net-analyzer/prelude-nids/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+<herd>netmon</herd>
+<longdescription>Prelude-IDS NIDS</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index 0c0bf794ff1f..2f8d88528124 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-<longdescription>RRD is the Acronym for Round Robin Database. RRD is a system to store and display time-series data (i.e. network bandwidth, machine-room temperature, server load average). It stores the data in a very compact way that will not expand over time, and it presents useful graphs by processing the data to enforce a certain data density. It can be used either via simple wrapper scripts (from shell or Perl) or via frontends that poll network devices and put a friendly user interface on it.</longdescription>
+<herd>netmon</herd>
+<longdescription>A system to store and display time-series data</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/siphon/metadata.xml b/net-analyzer/siphon/metadata.xml
index 2b7f2476c3de..7b7dc6840d0c 100644
--- a/net-analyzer/siphon/metadata.xml
+++ b/net-analyzer/siphon/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-<longdescription>Siphon is a portable passive network mapping suite.</longdescription>
+<herd>netmon</herd>
+<longdescription>A portable passive network mapping suite</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index 044668bd27b8..259c0281470b 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-<longdescription>Snort is a lightweight network intrusion detection system, capable of performing real-time traffic analysis and packet logging on IP networks. It can perform protocol analysis, content searching/matching and can be used to detect a variety of attacks and probes, such as buffer overflows, stealth port scans, CGI attacks, SMB probes, OS fingerprinting attempts, and much more. Snort uses a flexible rule based language to describe traffic that it should collect or pass, and a modular detection engine. Snort has a real-time alerting capability, with alert mechanisms for syslog, a user specified file, or a UNIX socket.</longdescription>
+<herd>netmon</herd>
+<longdescription>Libpcap-based packet sniffer/logger/lightweight IDS</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/snort_inline/metadata.xml b/net-analyzer/snort_inline/metadata.xml
index 8c316b1d972c..7aab9f44ac60 100644
--- a/net-analyzer/snort_inline/metadata.xml
+++ b/net-analyzer/snort_inline/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-<longdescription>snort_inline is basically a modified version of Snort that accepts packets from iptables, via libipq, instead of libpcap. It then uses new rule types (drop, sdrop, reject) to tell iptables whether the packet should be dropped, rejected, modified, or allowed to pass based on a snort rule set.  Think of this as an Intrusion Prevention System (IPS) that uses existing Intrusion Detection System (IDS) signatures to make decisions on packets that traverse snort_inline.</longdescription>
+<herd>netmon</herd>
+<longdescription>Intrusion Prevention System (IPS) based on Snort</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/snorticus/metadata.xml b/net-analyzer/snorticus/metadata.xml
index 84307dec76ac..d0837c33fff7 100644
--- a/net-analyzer/snorticus/metadata.xml
+++ b/net-analyzer/snorticus/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-<longdescription>Snorticus is a collection of shell scripts designed to allow easy managment of Snort sensors.</longdescription>
+<herd>netmon</herd>
+<longdescription>Snorticus is a collection of shell scripts designed to allow easy management of Snort sensors.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/snortsnarf/metadata.xml b/net-analyzer/snortsnarf/metadata.xml
index 5fbadc0be4bc..6ce79711d93c 100644
--- a/net-analyzer/snortsnarf/metadata.xml
+++ b/net-analyzer/snortsnarf/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
+<herd>netmon</herd>
 <longdescription>Snort Snarf parses Snort log files, and converts them into easy-to-read HTML files.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/tcpslice/metadata.xml b/net-analyzer/tcpslice/metadata.xml
index e83b8244f654..fbd8ee1e200a 100644
--- a/net-analyzer/tcpslice/metadata.xml
+++ b/net-analyzer/tcpslice/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
+<herd>netmon</herd>
 <longdescription>Tcpslice is a program for extracting portions of packet-trace files generated using tcpdump's -w flag. It can also be used to glue together pcap dump files.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/tcptrace/metadata.xml b/net-analyzer/tcptrace/metadata.xml
index 08819a22c2fa..d98f14a37840 100644
--- a/net-analyzer/tcptrace/metadata.xml
+++ b/net-analyzer/tcptrace/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-	<longdescription>tcptrace is a tool written by  Shawn Ostermann at Ohio University, for analysis of TCP dump files. It can take as input the files produced by several popular packet-capture programs, including tcpdump, snoop, etherpeek, HP Net Metrix, and WinDump. tcptrace  can produce several different types of output containing information on each connection seen, such as elapsed time, bytes and segments sent and recieved, retransmissions, round trip times, window advertisements, throughput, and more. It can also produce a number of graphs for further analysis.</longdescription>
+<herd>netmon</herd>
+<longdescription>A Tool for analyzing network packet dumps</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ttt/metadata.xml b/net-analyzer/ttt/metadata.xml
index 8c8ed01b61b6..72e3648cc5f2 100644
--- a/net-analyzer/ttt/metadata.xml
+++ b/net-analyzer/ttt/metadata.xml
@@ -2,10 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
 <longdescription>Tele Traffic Taper (ttt) - Real-time Graphical Remote Traffic Monitor</longdescription>
 </pkgmetadata>