diff options
| -rw-r--r-- | config/dnsblacklist/dnsblacklist.inc | 7 | ||||
| -rw-r--r-- | config/dnsblacklist/dnsblacklist.tmp | 2 | ||||
| -rw-r--r-- | config/dnsblacklist/dnsblacklist.xml | 8 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 9 |
4 files changed, 11 insertions, 15 deletions
diff --git a/config/dnsblacklist/dnsblacklist.inc b/config/dnsblacklist/dnsblacklist.inc index 8b957776..4ef0a1d6 100644 --- a/config/dnsblacklist/dnsblacklist.inc +++ b/config/dnsblacklist/dnsblacklist.inc @@ -69,7 +69,6 @@ function phpservice_sync_package_php() function php_sync_package() { global $config; - phpservice_sync_package_php(); } @@ -119,17 +118,15 @@ function php_install_command() } -function deinstall_command() +function php_deinstall_command() { conf_mount_rw(); - config_lock(); $handle = popen("/usr/local/etc/rc.d/dnsblacklist.sh stop", "r"); unlink_if_exists("/usr/local/pkg/dnsblacklist.xml"); unlink_if_exists("/usr/local/pkg/dnsblacklist.inc"); - //unlink_if_exists("/usr/local/etc/rc.d/dnsblacklist.sh"); + exec("rm -R /usr/local/www/packages/dnsblacklist/blacklists"); exec("rm -R /usr/local/www/packages/dnsblacklist"); conf_mount_ro(); - config_unlock(); } ?>
\ No newline at end of file diff --git a/config/dnsblacklist/dnsblacklist.tmp b/config/dnsblacklist/dnsblacklist.tmp index 69ace333..a6d67bb1 100644 --- a/config/dnsblacklist/dnsblacklist.tmp +++ b/config/dnsblacklist/dnsblacklist.tmp @@ -143,7 +143,7 @@ else { <?php if ($savemsg_dnsb) print_info_box($savemsg_dnsb); ?>
Below is a scroll-box filled with categories you can select to be added to your blacklist. <br><br> Each category has a list of known domains/sites that will be denied access by users of this network.
-<br><br><i>(Note: Using all categories at once will require 300Mb of free memory. The <b>adult</b> category is rather memory intensive, requiring 200Mb together.)</i>
+<br><br><i>(Note: Using all categories at once will require 300Mb of free memory. The <b>adult</b> category is rather memory intensive, requiring 200Mb.)</i>
<br><br><br>
diff --git a/config/dnsblacklist/dnsblacklist.xml b/config/dnsblacklist/dnsblacklist.xml index 9082191c..1a51e1d4 100644 --- a/config/dnsblacklist/dnsblacklist.xml +++ b/config/dnsblacklist/dnsblacklist.xml @@ -7,7 +7,7 @@ /* $Id$ */ /* ========================================================================== */ /* - phpservice.xml + dnsblacklist.xml Copyright (C) 2009 Mark J Crane All rights reserved. */ @@ -41,12 +41,12 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>DNS Blacklist Settings</name> - <version>0.2</version> + <version>0.2.2</version> <title>Settings</title> <include_file>/usr/local/pkg/dnsblacklist.inc</include_file> <menu> <name>DNS Blacklist</name> - <tooltiptext>PHP Service settings.</tooltiptext> + <tooltiptext>DNS Blacklist settings.</tooltiptext> <section>Services</section> <configfile>dnsblacklist.xml</configfile> <url>/packages/dnsblacklist/dnsblacklist.php</url> @@ -105,6 +105,6 @@ php_install_command(); </custom_php_install_command> <custom_php_deinstall_command> - deinstall_command(); + php_deinstall_command(); </custom_php_deinstall_command> </packagegui>
\ No newline at end of file diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 7c239972..6c68c38f 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -117,7 +117,6 @@ <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> <configurationfile>freeswitch.xml</configurationfile> - <noembedded>true</noembedded> </package> <package> <name>FreeSWITCH Dev</name> @@ -239,7 +238,7 @@ <pkginfolink></pkginfolink> <config_file>http://www.pfsense.com/packages/config/dnsblacklist/dnsblacklist.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>markjcrane@gmail.com</maintainer> @@ -258,7 +257,7 @@ <depends_on_package>mysql-client-5.1.34.tbz</depends_on_package> <depends_on_package>snort-2.8.4.1_1.tbz</depends_on_package> <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file> - <version>2.8.4.1_4 pkg v.1.6</version> + <version>2.8.4.1_2 pkg v.1.6</version> <required_version>1.2.2</required_version> <status>Stable</status> <configurationfile>snort.xml</configurationfile> @@ -277,9 +276,9 @@ <depends_on_package>mysql-client-5.1.34.tbz</depends_on_package> <depends_on_package>snort-2.8.4.1_1.tbz</depends_on_package> <config_file>http://www.pfsense.com/packages/config/snort-dev/snort.xml</config_file> - <version>2.8.4.1_4 pkg v.1.7</version> + <version>2.8.4.1_2 RC5</version> <required_version>1.2.2</required_version> - <status>alpha</status> + <status>Stable</status> <configurationfile>snort.xml</configurationfile> <after_install_info>Please visit the Snort settings tab and enter your oinkid code. Afterwards visit the update rules tab to download the snort rules.</after_install_info> </package> |