7 files changed, 54 insertions, 33 deletions
diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
index 43ff75467369..f55cac0eeaac 100644
--- a/net-analyzer/fail2ban/metadata.xml
+++ b/net-analyzer/fail2ban/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="github">fail2ban/fail2ban</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-analyzer/icinga-web/metadata.xml b/net-analyzer/icinga-web/metadata.xml
index eef21637f5f4..273bfa64d015 100644
--- a/net-analyzer/icinga-web/metadata.xml
+++ b/net-analyzer/icinga-web/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>
@@ -13,5 +13,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">icinga</remote-id>
+		<remote-id type="github">icinga/icinga-web</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index 3f16cd231530..1eb83338d309 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -1,13 +1,16 @@
-<?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>prometheanfire@gentoo.org</email>
-<name>Matthew Thode</name>
-</maintainer>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
 	<use>
 		<flag name="classicui">Adds support for the old interface</flag>
 		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">Icinga/icinga2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/sancp/metadata.xml b/net-analyzer/sancp/metadata.xml
index 6252f401e616..a28ee98aa544 100644
--- a/net-analyzer/sancp/metadata.xml
+++ b/net-analyzer/sancp/metadata.xml
@@ -1,6 +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>netmon</herd>
-<use><flag name='sguil'>Enable sguil (The Analyst Console for Network Security Monitoring) support</flag></use>
+	<herd>netmon</herd>
+	<use>
+		<flag name="sguil">Enable sguil (The Analyst Console for Network Security Monitoring) support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sancp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml
index b5008345f9c7..6aca467cb11d 100644
--- a/net-analyzer/testssl/metadata.xml
+++ b/net-analyzer/testssl/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>
@@ -7,4 +7,7 @@
 	<use>
 		<flag name="bundled-openssl">Install precompiled versions of OpenSSL for greater testing coverage</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">drwetter/testssl.sh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index ab30633da967..9e9161be1ecc 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -1,27 +1,30 @@
-<?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>mattm@gentoo.org</email>
-<name>Matthew Marlowe</name>
-</maintainer>
-<longdescription>
+	<maintainer>
+		<email>mattm@gentoo.org</email>
+		<name>Matthew Marlowe</name>
+	</maintainer>
+	<longdescription>
 ZABBIX is software for monitoring of your applications, network and servers.
 ZABBIX supports both polling and trapping techniques to collect data from
 monitored hosts. A flexible notification mechanism allows easy and quickly
 configure different types of notifications for pre-defined events.
-</longdescription>
-<use>
-	<flag name='agent'>Enable zabbix agent (for to-be-monitored machines)</flag>
-	<flag name='frontend'>Enable zabbix web frontend</flag>
-	<flag name='ipv6'>Turn on support of IPv6</flag>
-	<flag name='proxy'>Enable proxy support</flag>
-	<flag name='openipmi'>Enable openipmi things</flag>
-	<flag name='server'>Enable zabbix server</flag>
-	<flag name='ssh'>SSH v2 based checks</flag>
-	<flag name='odbc'>Enable Database Monitor and use UnixODBC Library by default</flag>
-	<flag name='static'>Build statically linked binaries</flag>
-	<flag name='java'>Enable Zabbix Java JMX Management Gateway</flag>
-	<flag name='libxml2'>Use libxml2 client library</flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="agent">Enable zabbix agent (for to-be-monitored machines)</flag>
+		<flag name="frontend">Enable zabbix web frontend</flag>
+		<flag name="ipv6">Turn on support of IPv6</flag>
+		<flag name="proxy">Enable proxy support</flag>
+		<flag name="openipmi">Enable openipmi things</flag>
+		<flag name="server">Enable zabbix server</flag>
+		<flag name="ssh">SSH v2 based checks</flag>
+		<flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag>
+		<flag name="static">Build statically linked binaries</flag>
+		<flag name="java">Enable Zabbix Java JMX Management Gateway</flag>
+		<flag name="libxml2">Use libxml2 client library</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">prdownloads</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index 8fbea4056e31..4bf43259e07f 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/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>
@@ -14,11 +14,14 @@ of gigabit Ethernet.
 ZMap can be used to study protocol adoption over time, monitor service 
 availability, and help us better understand large systems distributed 
 across the Internet.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="redis">
 		Add support for storing in a redis DB via <pkg>dev-libs/hiredis</pkg>
 	</flag>
     <flag name="json">Add support to store results JSON based</flag>
   </use>
+  <upstream>
+    <remote-id type="github">zmap/zmap</remote-id>
+  </upstream>
 </pkgmetadata>