Fix/relocate a bunch of missing files/dependencies for binaries that were removed from git but lingered on www rather than files.

11 files changed, 62 insertions, 50 deletions

diff --git a/config/dashboard/dashboard.xml b/config/dashboard/dashboard.xml
index 7177eed6..c09a2eda 100644
--- a/config/dashboard/dashboard.xml
+++ b/config/dashboard/dashboard.xml
@@ -57,7 +57,7 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/dashboard/binaries/widgets.tgz</item>
+		<item>http://files.pfsense.org/packages/widgets.tgz</item>
 	</additional_files_needed>
 	<custom_php_install_command>
 		dashboard_install();
diff --git a/config/dnsblacklist/dnsblacklist.xml b/config/dnsblacklist/dnsblacklist.xml
index 1b7c29e5..52c59b35 100644
--- a/config/dnsblacklist/dnsblacklist.xml
+++ b/config/dnsblacklist/dnsblacklist.xml
@@ -77,7 +77,7 @@
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/dnsblacklist/blacklists.tar.gz</item>
+		<item>http://files.pfsense.org/packages/blacklists.tar.gz</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/config/lcdproc/lcdproc.xml b/config/lcdproc/lcdproc.xml
index bc03b761..32a8f900 100644
--- a/config/lcdproc/lcdproc.xml
+++ b/config/lcdproc/lcdproc.xml
@@ -38,22 +38,22 @@
 	    <chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/lcdproc/bin/nexcom.so</item>
+		<item>http://files.pfsense.org/packages/lcdproc/nexcom.so</item>
 	    <prefix>/usr/local/lib/lcdproc/</prefix>
 	    <chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/lcdproc/bin/SureElec.so</item>
+		<item>http://files.pfsense.org/packages/lcdproc/SureElec.so</item>
 	    <prefix>/usr/local/lib/lcdproc/</prefix>
 	    <chmod>0755</chmod>
 	</additional_files_needed>	
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/lcdproc/bin/picolcd.so</item>
+		<item>http://files.pfsense.org/packages/lcdproc/picolcd.so</item>
 	    <prefix>/usr/local/lib/lcdproc/</prefix>
 	    <chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/lcdproc/bin/libusb.so.2</item>
+		<item>http://files.pfsense.org/packages/lcdproc/libusb.so.2</item>
 	    <prefix>/usr/local/lib/lcdproc/</prefix>
 	    <chmod>0755</chmod>
 	</additional_files_needed>
diff --git a/config/phpsysinfo/phpsysinfo.xml b/config/phpsysinfo/phpsysinfo.xml
index 3cbe4a5b..116643a4 100644
--- a/config/phpsysinfo/phpsysinfo.xml
+++ b/config/phpsysinfo/phpsysinfo.xml
@@ -75,7 +75,7 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/phpsysinfo/bin/phpsysinfo-2.5.4.tar.gz</item>
+		<item>http://files.pfsense.org/packages/phpsysinfo-2.5.4.tar.gz</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc
index a5b8c4e2..651b79b2 100644
--- a/config/vhosts/vhosts.inc
+++ b/config/vhosts/vhosts.inc
@@ -736,31 +736,31 @@ function vhosts_install_command() {
 	if(stristr(php_uname('r'), '7.2') == TRUE) {
 		if (!file_exists('/usr/local/php5')) {
 			chdir('/usr/local/');
-			exec ("fetch http://www.pfsense.com/packages/config/vhosts/freebsd7.2/php5.tar.gz");
+			exec ("fetch http://files.pfsense.org/packages/7/vhosts/php5.tar.gz");
 			exec("tar zxvf /usr/local/php5.tar.gz -C /usr/local/");
 			exec("rm /usr/local/php5.tar.gz");
 		}
 		if (!file_exists('/usr/local/lib/libxml2.so.5')) {
 			chdir('/usr/local/lib/');
-			exec ("fetch http://www.pfsense.com/packages/config/vhosts/freebsd7.2/usr.local.lib/libxml2.so.5");
+			exec ("fetch http://files.pfsense.org/packages/7/vhosts/usr.local.lib/libxml2.so.5");
 		}
 		if (!file_exists('/usr/local/lib/libxml2.so')) {
 			chdir('/usr/local/lib/');
-			exec ("fetch http://www.pfsense.com/packages/config/vhosts/freebsd7.2/usr.local.lib/libxml2.so");
+			exec ("fetch http://files.pfsense.org/packages/7/vhosts/usr.local.lib/libxml2.so");
 		}
 		if (!file_exists('/usr/local/lib/libxml2.la')) {
 			chdir('/usr/local/lib/');
-			exec ("fetch http://www.pfsense.com/packages/config/vhosts/freebsd7.2/usr.local.lib/libxml2.la");
+			exec ("fetch http://files.pfsense.org/packages/7/vhosts/usr.local.lib/libxml2.la");
 		}
 		if (!file_exists('/usr/local/lib/libxml2.a')) {
 			chdir('/usr/local/lib/');
-			exec ("fetch http://www.pfsense.com/packages/config/vhosts/freebsd7.2/usr.local.lib/lib/libxml2.a");
+			exec ("fetch http://files.pfsense.org/packages/7/vhosts/usr.local.lib/lib/libxml2.a");
 		}
 	}
 	if(stristr(php_uname('r'), '8.1') == TRUE) {
 		if (!file_exists('/usr/local/php5')) {
 			chdir('/usr/local/');
-			exec ("fetch http://www.pfsense.com/packages/config/vhosts/freebsd8.0/php5.tar.gz");
+			exec ("fetch http://files.pfsense.org/packages/8/vhosts/php5.tar.gz");
 			exec("tar zxvf /usr/local/php5.tar.gz -C /usr/local/");
 			exec("rm /usr/local/php5.tar.gz");
 		}
diff --git a/config/vnstat/vnstat.xml b/config/vnstat/vnstat.xml
index 2a0c06f5..63a121a0 100644
--- a/config/vnstat/vnstat.xml
+++ b/config/vnstat/vnstat.xml
@@ -25,7 +25,7 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat/bin/vnstat_php_frontend-1.4.1.tar.gz</item>
+		<item>http://files.pfsense.org/packages/7/vnstat/vnstat_php_frontend-1.4.1.tar.gz</item>
 	</additional_files_needed>
 	<custom_php_resync_config_command></custom_php_resync_config_command>
 	<custom_php_install_command>vnstat_install_config();</custom_php_install_command>
diff --git a/config/vnstat2/vnstat2.xml b/config/vnstat2/vnstat2.xml
index 08bfc91d..25cd0bcb 100644
--- a/config/vnstat2/vnstat2.xml
+++ b/config/vnstat2/vnstat2.xml
@@ -48,7 +48,7 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/bin/vnstat_php_frontend-1.4.1.tar.gz</item>
+		<item>http://files.pfsense.org/packages/8/vnstat/vnstat_php_frontend-1.4.1.tar.gz</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
@@ -68,22 +68,22 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/bin/diag_vnstat.abc</item>
+		<item>http://files.pfsense.org/packages/8/vnstat/diag_vnstat.abc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/bin/diag_vnstat2.abc</item>
+		<item>http://files.pfsense.org/packages/8/vnstat/diag_vnstat2.abc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/bin/vnstat2_img.abc</item>
+		<item>http://files.pfsense.org/packages/8/vnstat/vnstat2_img.abc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.com/packages/config/vnstat2/bin/vnstati.abc</item>
+		<item>http://files.pfsense.org/packages/8/vnstat/vnstati.abc</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 057630c8..30316a74 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -452,7 +452,7 @@
       <descr>A console-based network traffic monitor + vnstat PHP frontend</descr>
       <pkginfolink>http://forum.pfsense.org/index.php/topic,14179.0.html</pkginfolink>
       <category>Network Management</category>
-	  <depends_on_package_base_url>http://www.pfsense.com/packages/config/vnstat/bin/</depends_on_package_base_url>
+	  <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
 	  <depends_on_package>vnstat-1.6_3.tbz</depends_on_package>
       <version>1.6.3</version>
       <status>Stable</status>
@@ -470,7 +470,7 @@
       <version>2.5.4</version>
       <status>Beta</status>
       <required_version>1.0</required_version>
-      <depends_on_package_base_url>http://www.pfsense.com/packages/config/phpsysinfo/bin/</depends_on_package_base_url>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
       <depends_on_package>mbmon-205_4.tbz</depends_on_package>
       <config_file>http://www.pfsense.com/packages/config/phpsysinfo/phpsysinfo.xml</config_file>
       <configurationfile>phpsysinfo.xml</configurationfile>
@@ -632,7 +632,7 @@
       <website>http://dmr.ath.cx/net/darkstat/</website>
       <descr>darkstat is a network statistics gatherer. It's a packet sniffer that runs as a background process on a cable/DSL router, gathers all sorts of statistics about network usage, and serves them over HTTP.</descr>
       <category>Network Management</category>
-      <depends_on_package_base_url>http://www.pfsense.com/packages/config/darkstat/bin/</depends_on_package_base_url>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
       <depends_on_package>darkstat-3.0.712.tbz</depends_on_package>
       <depends_on_package>gettext-0.17_1.tbz</depends_on_package>
       <version>3.0.712</version>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 09e4f973..71e36fba 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -61,20 +61,6 @@
 		<configurationfile>filer.xml</configurationfile>
 	</package>
 	<package>
-		<name>IP-Blocklist</name>
-		<website/>
-		<descr>IP-Blocklist is PeerGuardian2 but on pfsense. This package has been replaced by pfblocker. &lt;u&gt;This is a legacy app&lt;/u&gt;</descr>
-		<category>Firewall</category>
-		<pkginfolink>http://forum.pfsense.org/index.php/topic,24769.0.html</pkginfolink>
-		<config_file>http://www.pfsense.com/packages/config/ipblocklist/8/ipblocklist.xml</config_file>
-		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<version>0.3.5</version>
-		<status>Beta</status>
-		<required_version>1.2.2</required_version>
-		<maintainer>tom@tomschaefer.org</maintainer>
-		<configurationfile>ipblocklist.xml</configurationfile>
-	</package>
-	<package>
 		<name>Country Block</name>
 		<website/>
 		<descr>Block countries - This has been replaced by pfblocker. &lt;u&gt;This is a legacy app&lt;/u&gt;</descr>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 77234f33..2435ae6b 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -61,20 +61,6 @@
 		<configurationfile>filer.xml</configurationfile>
 	</package>
 	<package>
-		<name>IP-Blocklist</name>
-		<website/>
-		<descr>IP-Blocklist is PeerGuardian2 but on pfsense. This package has been replaced by pfblocker. &lt;u&gt;This is a legacy app&lt;/u&gt;</descr>
-		<category>Firewall</category>
-		<pkginfolink>http://forum.pfsense.org/index.php/topic,24769.0.html</pkginfolink>
-		<config_file>http://www.pfsense.com/packages/config/ipblocklist/8/ipblocklist.xml</config_file>
-		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<version>0.3.5</version>
-		<status>Beta</status>
-		<required_version>1.2.2</required_version>
-		<maintainer>tom@tomschaefer.org</maintainer>
-		<configurationfile>ipblocklist.xml</configurationfile>
-	</package>
-	<package>
 		<name>Country Block</name>
 		<website/>
 		<descr>Block countries - This has been replaced by pfblocker. &lt;u&gt;This is a legacy app&lt;/u&gt;</descr>
diff --git a/pkg_config.xsl b/pkg_config.xsl
new file mode 100644
index 00000000..d5df5626
--- /dev/null
+++ b/pkg_config.xsl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+   <xsl:output method="html" encoding="UTF-8" indent="yes"/>
+   <xsl:template match="pfsensepkgs">
+       <html>
+           <head>
+               <title>pfSense Open Source Firewall Distribution - Packages</title>
+               <link rel="shortcut icon" href="http://www.pfsense.org/images/favicon.ico"/>
+
+               <link rel="stylesheet" href="templates/modular_plazza/css/template_css.css" type="text/css"/>
+               <link rel="stylesheet" href="templates/modular_plazza/css/sfish.css" type="text/css"/>
+           </head>
+           <body class="bodies">
+               <h2>pfSense Package list</h2>
+               <xsl:apply-templates/>
+           </body>
+       </html>
+   </xsl:template>
+
+   <xsl:template match="packages">
+       <xsl:for-each-group select="package" group-by="category">
+           <h3>
+               Category: <xsl:value-of select="current-grouping-key()"/>
+           </h3>
+           <xsl:for-each select="current-group()">
+               <h4>
+                   <xsl:value-of select="name"/>
+               </h4>
+               <span class="version">Version <xsl:value-of select="version"/> </span>
+               <xsl:choose>
+                   <xsl:when test="status = 'ALPHA'"><span style="color:red">alpha</span></xsl:when>
+                   <xsl:when test="status = 'BETA'"><span style="color:blue">beta</span></xsl:when>
+                   <xsl:otherwise><span style="color:green"><xsl:value-of select="status"/></span></xsl:otherwise>
+               </xsl:choose>
+               <br/>
+               <xsl:value-of select="descr" disable-output-escaping="yes"/>
+           </xsl:for-each>
+       </xsl:for-each-group>
+   </xsl:template>
+</xsl:stylesheet>