16 files changed, 67 insertions, 34 deletions
diff --git a/net-analyzer/angst/metadata.xml b/net-analyzer/angst/metadata.xml
index ed71c61c5906..ddc6d842ca82 100644
--- a/net-analyzer/angst/metadata.xml
+++ b/net-analyzer/angst/metadata.xml
@@ -1,6 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<longdescription>an active sniffer that provides methods for aggressive sniffing on switched LAN</longdescription>
+	<herd>netmon</herd>
+	<longdescription>an active sniffer that provides methods for aggressive sniffing on switched LAN</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">angst</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml
index 49bbe83e76c3..7a0a346c8528 100644
--- a/net-analyzer/chaosreader/metadata.xml
+++ b/net-analyzer/chaosreader/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>rainbow@irh.it</email>
-</maintainer>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>rainbow@irh.it</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">chaosreader</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/fping/metadata.xml b/net-analyzer/fping/metadata.xml
index ead1602383fa..59f49f012faf 100644
--- a/net-analyzer/fping/metadata.xml
+++ b/net-analyzer/fping/metadata.xml
@@ -1,6 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<longdescription>A utility to ping multiple hosts at once</longdescription>
+	<herd>netmon</herd>
+	<longdescription>A utility to ping multiple hosts at once</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">fping</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index 4f26acaf061a..166b8c794633 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -20,6 +20,6 @@ HTTP statistics for system administrators that require a visual server report on
 		<changelog>https://github.com/allinurl/goaccess/blob/master/ChangeLog</changelog>
 		<doc>http://goaccess.io/faq</doc>
 		<bugs-to>mailto:goaccess@prosoftcorp.com</bugs-to>
+		<remote-id type="sourceforge">goaccess</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/net-analyzer/gspoof/metadata.xml b/net-analyzer/gspoof/metadata.xml
index ff62877c67ae..5eb5554b735d 100644
--- a/net-analyzer/gspoof/metadata.xml
+++ b/net-analyzer/gspoof/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">gspoof</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
index 6bb89af4a7a4..209fa652c76e 100644
--- a/net-analyzer/icinga/metadata.xml
+++ b/net-analyzer/icinga/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">A rebuild of nagios from the ground up</longdescription>
@@ -15,5 +15,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">icinga/icinga-core</remote-id>
+		<remote-id type="sourceforge">icinga</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/ipband/metadata.xml b/net-analyzer/ipband/metadata.xml
index 03aa50bab7e3..dd948e670d5a 100644
--- a/net-analyzer/ipband/metadata.xml
+++ b/net-analyzer/ipband/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="sourceforge">ipband</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index 2bec3e9aa8b8..5ad5c8d0f325 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sysadmin</herd>
@@ -10,7 +10,7 @@
     Munin you can easily monitor the performance of your computers, networks,
     SANs, and quite possibly applications as well. It makes it easy to determine
     "what's different today" when a performance problem crops up. It makes it
-    easy to see how you're doing capacity wise on all limited resources. 
+    easy to see how you're doing capacity wise on all limited resources.
   </longdescription>
   <use>
     <flag name="mysql">
@@ -72,7 +72,7 @@
     <flag name="ipv6">
       Add support for IPv6 in munin-node. IPv6 support for the master
       is always enabled, but the node requires a newer version of
-      <pkg>dev-perl/net-server</pkg>, capable of listening to IPv6
+    <pkg>dev-perl/net-server</pkg>, capable of listening to IPv6
       sockets.
     </flag>
     <flag name="syslog">
@@ -87,4 +87,7 @@
       process the documentation sources.
     </flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">munin</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/netcat6/metadata.xml b/net-analyzer/netcat6/metadata.xml
index 03aa50bab7e3..0c7200267bf4 100644
--- a/net-analyzer/netcat6/metadata.xml
+++ b/net-analyzer/netcat6/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
+	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="sourceforge">netcat6</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/sguil-client/metadata.xml b/net-analyzer/sguil-client/metadata.xml
index f5369ffcdbd8..38e3121baec9 100644
--- a/net-analyzer/sguil-client/metadata.xml
+++ b/net-analyzer/sguil-client/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>
   <upstream>
     <remote-id type="github">bammv/sguil</remote-id>
+    <remote-id type="sourceforge">sguil</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/sguil-sensor/metadata.xml b/net-analyzer/sguil-sensor/metadata.xml
index f5369ffcdbd8..38e3121baec9 100644
--- a/net-analyzer/sguil-sensor/metadata.xml
+++ b/net-analyzer/sguil-sensor/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>
   <upstream>
     <remote-id type="github">bammv/sguil</remote-id>
+    <remote-id type="sourceforge">sguil</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/sguil-server/metadata.xml b/net-analyzer/sguil-server/metadata.xml
index f5369ffcdbd8..38e3121baec9 100644
--- a/net-analyzer/sguil-server/metadata.xml
+++ b/net-analyzer/sguil-server/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>
   <upstream>
     <remote-id type="github">bammv/sguil</remote-id>
+    <remote-id type="sourceforge">sguil</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml
index 4067dd20df33..35145f6cd8c3 100644
--- a/net-analyzer/tcpreplay/metadata.xml
+++ b/net-analyzer/tcpreplay/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>
@@ -9,12 +9,13 @@
   providing reliable and repeatible means for testing a variety of network
   devices such as switches, router, firewalls, network intrusion detection and
   prevention systems (IDS and IPS).
-</longdescription>
+  </longdescription>
   <use>
     <flag name="pcapnav">Enable if you want the jump to byte offset feature via <pkg>net-libs/libpcapnav</pkg></flag>
     <flag name="tcpdump">Use <pkg>net-analyzer/tcpdump</pkg> for packet decoding feature </flag>
   </use>
   <upstream>
     <remote-id type="github">appneta/tcpreplay</remote-id>
+    <remote-id type="sourceforge">tcpreplay</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/traceproto/metadata.xml b/net-analyzer/traceproto/metadata.xml
index 78692635ad22..3562dbf0cc59 100644
--- a/net-analyzer/traceproto/metadata.xml
+++ b/net-analyzer/traceproto/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>
+	<upstream>
+		<remote-id type="sourceforge">traceproto</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/w3af/metadata.xml b/net-analyzer/w3af/metadata.xml
index ea60feff633f..754512a6de54 100644
--- a/net-analyzer/w3af/metadata.xml
+++ b/net-analyzer/w3af/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
@@ -8,8 +8,9 @@
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
 	<longdescription lang="en">
-</longdescription>
+	</longdescription>
 	<upstream>
 		<remote-id type="github">andresriancho/w3af</remote-id>
+		<remote-id type="sourceforge">w3af</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/wapiti/metadata.xml b/net-analyzer/wapiti/metadata.xml
index bd38de902c9a..ce6c6fb75680 100644
--- a/net-analyzer/wapiti/metadata.xml
+++ b/net-analyzer/wapiti/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -10,4 +10,7 @@
 It performs black-box scans, i.e. it does not study the source code of the application but will scans the webpages of the deployed webapp, looking for scripts and forms where it can inject data.
 
 Once it gets this list, Wapiti acts like a fuzzer, injecting payloads to see if a script is vulnerable.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wapiti</remote-id>
+	</upstream>
 </pkgmetadata>