From 091995495e7f346a7eea76d3a03f9e6ac6074704 Mon Sep 17 00:00:00 2001
From: mcrane <mctch@yahoo.com>
Date: Mon, 5 Oct 2009 15:28:37 -0600
Subject: DNS Blacklist setting the correct configuration file on
 pkg_config.7.xml should fix the package uninstall problem.

---
 config/dnsblacklist/dnsblacklist.inc | 9 +--------
 config/dnsblacklist/dnsblacklist.xml | 4 ++--
 pkg_config.7.xml                     | 4 ++--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/config/dnsblacklist/dnsblacklist.inc b/config/dnsblacklist/dnsblacklist.inc
index 4ef0a1d6..c667e62a 100644
--- a/config/dnsblacklist/dnsblacklist.inc
+++ b/config/dnsblacklist/dnsblacklist.inc
@@ -57,13 +57,6 @@ function byte_convert( $bytes ) {
 }
 
  
-function phpservice_sync_package_php()
-{
-	global $config; 
-	conf_mount_rw();
-	config_unlock();
-	conf_mount_ro();
-}
 
 
 function php_sync_package() 
@@ -118,7 +111,7 @@ function php_install_command()
 }
 
 
-function php_deinstall_command() 
+function deinstall_command() 
 {
 	conf_mount_rw();
 	$handle = popen("/usr/local/etc/rc.d/dnsblacklist.sh stop", "r");
diff --git a/config/dnsblacklist/dnsblacklist.xml b/config/dnsblacklist/dnsblacklist.xml
index 1a51e1d4..3e8c1667 100644
--- a/config/dnsblacklist/dnsblacklist.xml
+++ b/config/dnsblacklist/dnsblacklist.xml
@@ -41,7 +41,7 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>DNS Blacklist Settings</name>
-	<version>0.2.2</version>
+	<version>0.2.3</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/dnsblacklist.inc</include_file>
 	<menu>
@@ -105,6 +105,6 @@
 		php_install_command();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
-		php_deinstall_command();
+		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 6c68c38f..d88714c0 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -238,11 +238,11 @@
       <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.2</version>
+      <version>0.2.3</version>
       <status>Beta</status>
       <required_version>1.2.2</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>
-      <configurationfile>denyhosts.xml</configurationfile>
+      <configurationfile>dnsblacklist.xml</configurationfile>
     </package>
     <package>
       <name>snort</name>
-- 
cgit v1.2.3