17 files changed, 106 insertions, 67 deletions
diff --git a/net-analyzer/arp-scan/metadata.xml b/net-analyzer/arp-scan/metadata.xml
index 74c2baebb4ec..2c12d90c2aae 100644
--- a/net-analyzer/arp-scan/metadata.xml
+++ b/net-analyzer/arp-scan/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>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">royhills/arp-scan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/cloudshark/metadata.xml b/net-analyzer/cloudshark/metadata.xml
index ea40f2783558..9dbf47570b16 100644
--- a/net-analyzer/cloudshark/metadata.xml
+++ b/net-analyzer/cloudshark/metadata.xml
@@ -1,10 +1,13 @@
-<?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 type="person">
-<email>zerochaos@gentoo.org</email>
-<name>Rick Farina</name>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="github">cloudshark/wireshark-plugin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/flent/metadata.xml b/net-analyzer/flent/metadata.xml
index c4bb72bc3114..d33bba3bd96b 100644
--- a/net-analyzer/flent/metadata.xml
+++ b/net-analyzer/flent/metadata.xml
@@ -1,11 +1,14 @@
-<?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 type="person">
-<email>zx2c4@gentoo.org</email>
-<name>Jason A. Donenfeld</name>
-</maintainer>
-<use>
-<flag name="plots">Enable drawing plots</flag>
-</use>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<use>
+		<flag name="plots">Enable drawing plots</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">tohojo/flent</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index 9bb61d3e0793..d71ec4559820 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>
 	<maintainer type="person">
@@ -25,5 +25,6 @@
 		<doc>http://goaccess.io/faq</doc>
 		<bugs-to>mailto:goaccess@prosoftcorp.com</bugs-to>
 		<remote-id type="github">allinurl/goaccess</remote-id>
+		<remote-id type="sourceforge">goaccess</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/hexinject/metadata.xml b/net-analyzer/hexinject/metadata.xml
index 4f674dbf4333..b4d8ef8ab509 100644
--- a/net-analyzer/hexinject/metadata.xml
+++ b/net-analyzer/hexinject/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 type="person">
@@ -16,4 +16,7 @@
 		<flag name="tools">Install hex2raw and prettypacket tools</flag>
 		<flag name="experimental">Install experimental packets.tcl</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/iptstate/metadata.xml b/net-analyzer/iptstate/metadata.xml
index 3209c1cb3921..bcd164dad76c 100644
--- a/net-analyzer/iptstate/metadata.xml
+++ b/net-analyzer/iptstate/metadata.xml
@@ -1,11 +1,12 @@
-<?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 type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">iptstate</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">iptstate</remote-id>
+		<remote-id type="github">jaymzh/iptstate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/ipv6toolkit/metadata.xml b/net-analyzer/ipv6toolkit/metadata.xml
index d6a6e9d55aba..65a725a606c7 100644
--- a/net-analyzer/ipv6toolkit/metadata.xml
+++ b/net-analyzer/ipv6toolkit/metadata.xml
@@ -1,11 +1,14 @@
-<?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 type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<longdescription>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>
 	The SI6 Networks' IPv6 toolkit is a set of IPv6 security/trouble-shooting tools, that can send arbitrary IPv6-based packets.
-</longdescription>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">fgont/ipv6toolkit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/nagios-check_rbl/metadata.xml b/net-analyzer/nagios-check_rbl/metadata.xml
index 05f386fee9e5..366e3f343c3c 100644
--- a/net-analyzer/nagios-check_rbl/metadata.xml
+++ b/net-analyzer/nagios-check_rbl/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 type="person">
@@ -6,7 +6,10 @@
     <name>Michael Orlitzky</name>
   </maintainer>
   <maintainer type="project">
-      <email>sysadmin@gentoo.org</email>
-      <name>Gentoo Sysadmin Project</name>
+    <email>sysadmin@gentoo.org</email>
+    <name>Gentoo Sysadmin Project</name>
   </maintainer>
-  </pkgmetadata>
+  <upstream>
+    <remote-id type="github">matteocorti/check_rbl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml
index eed08dce32e2..2837e2b7ed5c 100644
--- a/net-analyzer/nagios-core/metadata.xml
+++ b/net-analyzer/nagios-core/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 type="person">
@@ -29,5 +29,6 @@
   </use>
   <upstream>
     <remote-id type="github">NagiosEnterprises/nagioscore</remote-id>
+    <remote-id type="sourceforge">nagios</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/nethogs/metadata.xml b/net-analyzer/nethogs/metadata.xml
index 6e0d6d0e8c71..1b55544df345 100644
--- a/net-analyzer/nethogs/metadata.xml
+++ b/net-analyzer/nethogs/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 type="project">
@@ -12,8 +12,9 @@ process. NetHogs does not rely on a special kernel module to be loaded.
 If there's suddenly a lot of network traffic, you can fire up NetHogs and 
 immediately see which PID is causing this. This makes it easy to indentify 
 programs that have gone wild and are suddenly taking up your bandwidth.
-</longdescription>
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">nethogs</remote-id>
+		<remote-id type="github">raboof/nethogs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index 279edac1ab01..f6dc8af136ae 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/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 type="project">
@@ -16,5 +16,6 @@
   <longdescription>The nfdump tools collect and process netflow data on the command line</longdescription>
   <upstream>
     <remote-id type="sourceforge">nfdump</remote-id>
+    <remote-id type="github">phaag/nfdump</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index d5456af2ce71..78a202fbac8c 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/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 type="person">
@@ -14,4 +14,7 @@
 		<flag name="visual">Enable <pkg>dev-python/visual</pkg> support for 3d graphs</flag>
 		<flag name="tcpreplay">Enable <pkg>net-analyzer/tcpreplay</pkg> support for fast packet replay</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">secdev/scapy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/sec/metadata.xml b/net-analyzer/sec/metadata.xml
index c1f87513ea9f..2d02138ee2cb 100644
--- a/net-analyzer/sec/metadata.xml
+++ b/net-analyzer/sec/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 type="project">
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">simple-evcorr</remote-id>
+		<remote-id type="github">simple-evcorr/sec</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/sflowtool/metadata.xml b/net-analyzer/sflowtool/metadata.xml
index 789a44405524..66b83a2d79ef 100644
--- a/net-analyzer/sflowtool/metadata.xml
+++ b/net-analyzer/sflowtool/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>
   <maintainer type="project">
     <email>netmon@gentoo.org</email>
     <name>Gentoo network monitoring and analysis project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">sflow/sflowtool</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/slurm/metadata.xml b/net-analyzer/slurm/metadata.xml
index 74c2baebb4ec..7312d8a52540 100644
--- a/net-analyzer/slurm/metadata.xml
+++ b/net-analyzer/slurm/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>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mattthias/slurm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
index 74c2baebb4ec..12203e1a761b 100644
--- a/net-analyzer/ssldump/metadata.xml
+++ b/net-analyzer/ssldump/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>
-<maintainer type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">downloads</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 98ad8e5d5ad8..2d5b8e1103b2 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -1,12 +1,15 @@
-<?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 type="project">
-	<email>netmon@gentoo.org</email>
-	<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-	<flag name="smi">Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
-	<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="smi">Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
+		<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">the-tcpdump-group/tcpdump</remote-id>
+	</upstream>
 </pkgmetadata>