aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfig/ipblocklist/8/ipblocklist.inc9
-rwxr-xr-xconfig/ipblocklist/8/ipblocklist.tmp2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 9 insertions, 6 deletions
diff --git a/config/ipblocklist/8/ipblocklist.inc b/config/ipblocklist/8/ipblocklist.inc
index 003f28bf..d3d5e1cd 100755
--- a/config/ipblocklist/8/ipblocklist.inc
+++ b/config/ipblocklist/8/ipblocklist.inc
@@ -55,10 +55,12 @@ function php_install_command_ip()
//install PERL
+ exec("setenv PACKAGESITE \"ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-8-stable/Latest/\"");
exec("pkg_add -r perl");
exec("pkg_add -r p5-Net-CIDR");
- exec("pkg_add -r compat7x-i386.tbz");
- exec("pkg_add -r compat6x-i386.tbz");
+ //exec("pkg_add -r compat7x-i386.tbz");
+ //exec("pkg_add -r compat6x-i386.tbz");
+ exec("rehash");
//rename PHP files from .tmp to .php
exec("cp /tmp/lists.txt /usr/local/www/packages/ipblocklist/lists.txt");
@@ -121,11 +123,12 @@ function deinstall_command_ip()
$handle = popen("/usr/local/etc/rc.d/ipblocklist.sh stop", "r");
unlink_if_exists("/usr/local/pkg/ipblocklist.xml");
unlink_if_exists("/usr/local/pkg/ipblocklist.inc");
+ unlink_if_exists("/usr/local/pkg/pf/IP-Blocklist.sh");
exec("rm -R /usr/local/www/packages/ipblocklist/ipblocklists");
exec("rm -R /usr/local/www/packages/ipblocklist");
exec("rm /usr/local/etc/rc.d/IP-Blocklist.sh");
exec("pfctl -t ipblocklist -T kill");
- exec("ipfw -f flush");
+ //exec("ipfw -f flush");
conf_mount_ro();
}
diff --git a/config/ipblocklist/8/ipblocklist.tmp b/config/ipblocklist/8/ipblocklist.tmp
index ffbfdc57..02f67c05 100755
--- a/config/ipblocklist/8/ipblocklist.tmp
+++ b/config/ipblocklist/8/ipblocklist.tmp
@@ -62,7 +62,7 @@ if (count($_POST)>0) {
//echo "disabled";
$config['installedpackages']['ipblocklist_settings']['config'][0]['enable'] = 0;
//Clear Lists
- mwexec("ipfw -f flush");
+ //mwexec("ipfw -f flush");
mwexec("pfctl -t ipblocklist -T kill");
mwexec("rm -R /usr/local/www/packages/ipblocklist/lists");
mwexec("sed -i -e '/ipblocklist/d' /tmp/rules.debug");
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 3c78440e..eb22da6f 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -66,7 +66,7 @@
<pkginfolink>http://forum.pfsense.org/index.php/topic,24769.0.html</pkginfolink>
<config_file>http://pfsense.org/packages/config/ipblocklist/8/ipblocklist.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
- <version>0.3.3</version>
+ <version>0.3.4</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 8e0c6c0d..67662bd5 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -122,7 +122,7 @@
<pkginfolink>http://forum.pfsense.org/index.php/topic,24769.0.html</pkginfolink>
<config_file>http://pfsense.org/packages/config/ipblocklist/8/ipblocklist.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <version>0.3.3</version>
+ <version>0.3.4</version>
<status>Beta</status>
<required_version>2.0</required_version>
<maintainer>tom@tomschaefer.org</maintainer>