Added scripts to /usr/local/pkg/pf

9 files changed, 12 insertions, 9 deletions

diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc
index 25077311..f7f9e33d 100644
--- a/config/countryblock/countryblock.inc
+++ b/config/countryblock/countryblock.inc
@@ -82,6 +82,7 @@ function php_install_command_cb()
 	unlink_if_exists("/tmp/settings.tmp");
 	//Get scripts
 	exec("cp /tmp/countryblock.sh /usr/local/etc/rc.d/countryblock.sh");
+	exec("cp /tmp/countryblock.sh /usr/local/pkg/pf/countryblock.sh");
 	unlink_if_exists("/tmp/countryblock.sh");
 	exec("cp /tmp/execute.sh /usr/local/www/packages/countryblock/execute.sh");
 	unlink_if_exists("/tmp/execute.sh");
diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml
index a91a5ed7..57751376 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.0</version>

+	<version>0.2.1</version>

 	<title>Settings</title>

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

 	<menu>

diff --git a/config/ipblocklist/7/ipblocklist.inc b/config/ipblocklist/7/ipblocklist.inc
index d331dcc8..c3f5e4af 100755
--- a/config/ipblocklist/7/ipblocklist.inc
+++ b/config/ipblocklist/7/ipblocklist.inc
@@ -93,6 +93,7 @@ function php_install_command_ip()
 	exec("cp /tmp/convert-execute.sh /usr/local/www/packages/ipblocklist/convert-execute.sh");
 	unlink_if_exists("/tmp/convert-execute.sh");
 	exec("cp /tmp/IP-Blocklist.sh /usr/local/etc/rc.d/IP-Blocklist.sh");
+	exec("cp /tmp/IP-Blocklist.sh /usr/local/pkg/pf/IP-Blocklist.sh");
 	unlink_if_exists("/tmp/IP-Blocklist.sh");
 	//Touch files
 	exec("touch /usr/local/www/packages/ipblocklist/wlists.txt");
diff --git a/config/ipblocklist/7/ipblocklist.xml b/config/ipblocklist/7/ipblocklist.xml
index a2a910a3..5189fd5e 100755
--- a/config/ipblocklist/7/ipblocklist.xml
+++ b/config/ipblocklist/7/ipblocklist.xml
@@ -41,7 +41,7 @@
 	<requirements>perl</requirements>
 	<faq>http://forum.pfsense.org/index.php/topic,24769.0.html</faq>
 	<name>IP Blocklist Settings</name>
-	<version>0.3.1</version>
+	<version>0.3.2</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/ipblocklist.inc</include_file>
 	<menu>
diff --git a/config/ipblocklist/8/ipblocklist.inc b/config/ipblocklist/8/ipblocklist.inc
index 4becef12..fca77379 100755
--- a/config/ipblocklist/8/ipblocklist.inc
+++ b/config/ipblocklist/8/ipblocklist.inc
@@ -94,6 +94,7 @@ function php_install_command_ip()
 	exec("cp /tmp/convert-execute.sh /usr/local/www/packages/ipblocklist/convert-execute.sh");
 	unlink_if_exists("/tmp/convert-execute.sh");
 	exec("cp /tmp/IP-Blocklist.sh /usr/local/etc/rc.d/IP-Blocklist.sh");
+	exec("cp /tmp/IP-Blocklist.sh /usr/local/pkg/pf/IP-Blocklist.sh");
 	unlink_if_exists("/tmp/IP-Blocklist.sh");
 	//Touch files
 	exec("touch /usr/local/www/packages/ipblocklist/wlists.txt");
diff --git a/config/ipblocklist/8/ipblocklist.xml b/config/ipblocklist/8/ipblocklist.xml
index 9d8cbc0f..99fba793 100755
--- a/config/ipblocklist/8/ipblocklist.xml
+++ b/config/ipblocklist/8/ipblocklist.xml
@@ -41,7 +41,7 @@
 	<requirements>perl</requirements>
 	<faq>http://forum.pfsense.org/index.php/topic,24769.0.html</faq>
 	<name>IP Blocklist Settings</name>
-	<version>0.3.1</version>
+	<version>0.3.2</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/ipblocklist.inc</include_file>
 	<menu>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index ecaabf2b..a3bfb9e5 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.0</version>
+		<version>0.2.1</version>
 		<status>Beta</status>
 		<required_version>1.2.2</required_version>
 		<maintainer>tom@tomschaefer.org</maintainer>
@@ -37,7 +37,7 @@
 		<pkginfolink>http://forum.pfsense.org/index.php/topic,24769.0.html</pkginfolink>
 		<config_file>http://pfsense.org/packages/config/ipblocklist/7/ipblocklist.xml</config_file>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-		<version>0.3.1</version>
+		<version>0.3.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 e594f801..d127ffea 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -39,7 +39,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.0</version>
+		<version>0.2.1</version>
 		<status>Beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>tom@tomschaefer.org</maintainer>
@@ -53,7 +53,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.1</version>
+		<version>0.3.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 55a1827d..f556dd01 100755
--- 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.0</version>
+		<version>0.2.1</version>
 		<status>Beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>tom@tomschaefer.org</maintainer>
@@ -103,7 +103,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.1</version>
+		<version>0.3.2</version>
 		<status>Beta</status>
 		<required_version>2.0</required_version>
 		<maintainer>tom@tomschaefer.org</maintainer>