Update to be independant of countryipblocks site to relieve bandwidth

1 files changed, 200 insertions, 195 deletions

diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml
index c58fc917..a91a5ed7 100644
--- a/config/countryblock/countryblock.xml
+++ b/config/countryblock/countryblock.xml
@@ -1,195 +1,200 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">
-<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>
-<packagegui>
-	<copyright>
-	<![CDATA[
-/* $Id$ */
-/* ========================================================================== */
-/*
-	countryblock.xml
-	Copyright (C) 2010 Tom Schaefer
-	All rights reserved.
-                                                                              */
-/* ========================================================================== */
-/*
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-		this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-		notice, this list of conditions and the following disclaimer in the
-		documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-                                                                              */
-/* ========================================================================== */
-		]]>
-		</copyright>
-	<description>Country Block</description>
-	<requirements>Active Internet</requirements>
-	<faq>http://forum.pfsense.org/index.php/topic,25732.0.html</faq>
-	<name>Country Block Settings</name>
-	<version>0.1.9</version>
-	<title>Settings</title>
-	<include_file>/usr/local/pkg/countryblock.inc</include_file>
-	<menu>
-		<name>Country Block</name>
-		<tooltiptext>Country Block settings</tooltiptext>
-		<section>Firewall</section>
-		<configfile>countryblock.xml</configfile>
-		<url>/packages/countryblock/countryblock.php</url>
-	</menu>
-	<tabs>
-		<tab>
-			<text>Settings</text>
-			<url>/packages/countryblock/countryblock.php</url>
-			<active/>
-		</tab>
-	</tabs>
-	<configpath>installedpackages->package->$packagename->configuration->countryblock</configpath>	
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.inc</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/interfaces.txt</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.tmp</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/execute.sh</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.sh</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/index.tmp</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/ddaccordion.js</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/jquery.min.js</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/public_smo_scripts.js</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/titlebar.png</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/titlebar-active.png</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/purge.tmp</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/whitelist.tmp</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock_if.tmp</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/firewall_shaper.tmp</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/help.tmp</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/settings.tmp</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/class.phpmailer.tmp</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/class.smtp.tmp</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/email.tmp</item>
-	</additional_files_needed>
-	<fields>
-		<field>
-			<fielddescr>Variable One</fielddescr>
-			<fieldname>var1</fieldname>
-			<description>Enter the variable one here.</description>
-			<type>input</type>
-		</field>
-		<field>
-			<fielddescr>Variable Two</fielddescr>
-			<fieldname>var1</fieldname>
-			<description>Enter the variable one here.</description>
-			<type>input</type>
-		</field>
-	</fields>
-	<custom_add_php_command>
-	</custom_add_php_command>
-	<custom_php_resync_config_command>
-		php_sync_package_cb();
-	</custom_php_resync_config_command>
-	<custom_delete_php_command>    
-		php_sync_package_cb();
-	</custom_delete_php_command>
-	<custom_php_install_command>
-		php_install_command_cb();
-	</custom_php_install_command>
-	<custom_php_deinstall_command>
-		deinstall_command_cb();
-	</custom_php_deinstall_command>
-</packagegui>
+<?xml version="1.0" encoding="utf-8" ?>

+<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd">

+<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?>

+<packagegui>

+	<copyright>

+	<![CDATA[

+/* $Id$ */

+/* ========================================================================== */

+/*

+	countryblock.xml

+	Copyright (C) 2011 Tom Schaefer

+	All rights reserved.

+                                                                              */

+/* ========================================================================== */

+/*

+	Redistribution and use in source and binary forms, with or without

+	modification, are permitted provided that the following conditions are met:

+

+	1. Redistributions of source code must retain the above copyright notice,

+		this list of conditions and the following disclaimer.

+

+	2. Redistributions in binary form must reproduce the above copyright

+		notice, this list of conditions and the following disclaimer in the

+		documentation and/or other materials provided with the distribution.

+

+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,

+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY

+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,

+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+	POSSIBILITY OF SUCH DAMAGE.

+                                                                              */

+/* ========================================================================== */

+		]]>

+		</copyright>

+	<description>Country Block</description>

+	<requirements>Active Internet</requirements>

+	<faq>http://forum.pfsense.org/index.php/topic,25732.0.html</faq>

+	<name>Country Block Settings</name>

+	<version>0.2.0</version>

+	<title>Settings</title>

+	<include_file>/usr/local/pkg/countryblock.inc</include_file>

+	<menu>

+		<name>Country Block</name>

+		<tooltiptext>Country Block settings</tooltiptext>

+		<section>Firewall</section>

+		<configfile>countryblock.xml</configfile>

+		<url>/packages/countryblock/countryblock.php</url>

+	</menu>

+	<tabs>

+		<tab>

+			<text>Settings</text>

+			<url>/packages/countryblock/countryblock.php</url>

+			<active/>

+		</tab>

+	</tabs>

+	<configpath>installedpackages->package->$packagename->configuration->countryblock</configpath>	

+	<additional_files_needed>

+		<prefix>/usr/local/pkg/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.xml</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/usr/local/pkg/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.inc</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/interfaces.txt</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/execute.sh</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.sh</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/index.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/ddaccordion.js</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/jquery.min.js</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/public_smo_scripts.js</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/titlebar.png</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/titlebar-active.png</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/purge.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/whitelist.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/countryblock_if.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/firewall_shaper.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/help.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/settings.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/class.phpmailer.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/class.smtp.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/email.tmp</item>

+	</additional_files_needed>

+	<additional_files_needed>

+		<prefix>/tmp/</prefix>

+		<chmod>0755</chmod>

+		<item>http://www.pfsense.org/packages/config/countryblock/CIDR.tar.gz</item>

+	</additional_files_needed>

+	<fields>

+		<field>

+			<fielddescr>Variable One</fielddescr>

+			<fieldname>var1</fieldname>

+			<description>Enter the variable one here.</description>

+			<type>input</type>

+		</field>

+		<field>

+			<fielddescr>Variable Two</fielddescr>

+			<fieldname>var1</fieldname>

+			<description>Enter the variable one here.</description>

+			<type>input</type>

+		</field>

+	</fields>

+	<custom_add_php_command>

+	</custom_add_php_command>

+	<custom_php_resync_config_command>

+		php_sync_package_cb();

+	</custom_php_resync_config_command>

+	<custom_delete_php_command>    

+		php_sync_package_cb();

+	</custom_delete_php_command>

+	<custom_php_install_command>

+		php_install_command_cb();

+	</custom_php_install_command>

+	<custom_php_deinstall_command>

+		deinstall_command_cb();

+	</custom_php_deinstall_command>

+</packagegui>