diff options
| author | Thomas Schaefer <tom@tomschaefer.org> | 2011-08-27 15:25:01 -0400 |
|---|---|---|
| committer | Thomas Schaefer <tom@tomschaefer.org> | 2011-08-27 15:25:01 -0400 |
| commit | e967cd04876a291bf2f59252a78a3b3c8e709115 (patch) | |
| tree | 539cfc3bb9d7cc0402d9d7a6a8b64a236da19ecb | |
| parent | 443807503c7f274eea8302e7db0f442fe5e90e23 (diff) | |
| download | pfsense-packages-e967cd04876a291bf2f59252a78a3b3c8e709115.tar.gz pfsense-packages-e967cd04876a291bf2f59252a78a3b3c8e709115.tar.bz2 pfsense-packages-e967cd04876a291bf2f59252a78a3b3c8e709115.zip | |
changed CIDR.tar.gz URL to github (To my personal repo) and corrected uninstall bug
| -rw-r--r-- | config/countryblock/countryblock.inc | 5 | ||||
| -rw-r--r-- | config/countryblock/countryblock.xml | 4 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc index f8335d53..36bf9aeb 100644 --- a/config/countryblock/countryblock.inc +++ b/config/countryblock/countryblock.inc @@ -103,8 +103,8 @@ function php_install_command_cb() exec("cp /tmp/interfaces.txt /usr/local/www/packages/countryblock/interfaces.txt"); unlink_if_exists("/tmp/interfaces.txt"); - exec("cp /tmp/CIDR.php /usr/local/www/packages/countryblock/CIDR.tar.gz"); - unlink_if_exists("/tmp/CIDR.php"); + exec("cp /tmp/CIDR.tar.gz /usr/local/www/packages/countryblock/CIDR.tar.gz"); + unlink_if_exists("/tmp/CIDR.tar.gz"); exec("tar xzf /usr/local/www/packages/countryblock/CIDR.tar.gz -C /usr/local/www/packages/countryblock/CIDR"); exec("rm /usr/local/www/packages/countryblock/CIDR.tar.gz"); @@ -127,6 +127,7 @@ function deinstall_command_cb() exec("rm -R /usr/local/www/packages/countryblock/countryblocks"); exec("rm -R /usr/local/www/packages/countryblock"); exec("rm /usr/local/etc/rc.d/countryblock.sh"); + exec("rm /usr/local/pkg/pf/countryblock.sh"); exec("pfctl -t countryblock -T kill"); exec("sed -i -e '/countryblock/d' /tmp/rules.debug"); exec("pfctl -o basic -f /tmp/rules.debug"); diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml index daee679b..933ab535 100644 --- a/config/countryblock/countryblock.xml +++ b/config/countryblock/countryblock.xml @@ -41,7 +41,7 @@ <requirements>Active Internet</requirements> <faq>http://forum.pfsense.org/index.php/topic,25732.0.html</faq> <name>Country Block Settings</name> - <version>0.2.1</version> + <version>0.2.2</version> <title>Settings</title> <include_file>/usr/local/pkg/countryblock.inc</include_file> <menu> @@ -167,7 +167,7 @@ <additional_files_needed> <prefix>/tmp/</prefix> <chmod>0755</chmod> - <item>http://tomschaefer.org/pfsense/repo/countryblock/CIDR.php</item> + <item>https://raw.github.com/tommyboy180/pfsense-bin/2812cb9e1c9357bbf2027eff82096773bc4ddc5d/countryblock/CIDR.tar.gz</item> </additional_files_needed> <fields> <field> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 8cdd8ba4..6cc923de 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -23,7 +23,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/countryblock/countryblock.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.2.1</version> + <version>0.2.2</version> <status>Beta</status> <required_version>1.2.2</required_version> <maintainer>tom@tomschaefer.org</maintainer> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index c30fa21f..6e841c1f 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -52,7 +52,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/countryblock/countryblock.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.2.1</version> + <version>0.2.2</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org</maintainer> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 24e68686..f5fdbda5 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -89,7 +89,7 @@ <pkginfolink>http://forum.pfsense.org/index.php/topic,25732.0.html</pkginfolink> <config_file>http://pfsense.org/packages/config/countryblock/countryblock.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> - <version>0.2.1</version> + <version>0.2.2</version> <status>Beta</status> <required_version>2.0</required_version> <maintainer>tom@tomschaefer.org</maintainer> |