From c24b3dd9af69f534d703fdf90b834a395fa19254 Mon Sep 17 00:00:00 2001
From: Ryan Wagoner <rsw686@pfsense.org>
Date: Sat, 2 Dec 2006 22:08:06 +0000
Subject: fix up and use imspector port

---
 packages/imspector/imspector.inc |  6 +++---
 packages/imspector/imspector.xml | 36 +-----------------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

(limited to 'packages')

diff --git a/packages/imspector/imspector.inc b/packages/imspector/imspector.inc
index 9b81a1a4..3e7d6822 100644
--- a/packages/imspector/imspector.inc
+++ b/packages/imspector/imspector.inc
@@ -61,7 +61,7 @@
 	function sync_package_imspector() {
 		global $config;
 		global $input_errors;
-		$configfile = "/usr/local/etc/imspector.conf";
+		$configfile = "/usr/local/etc/imspector/imspector.conf";
 		$proto="";
 		$pf_rules="";
 
@@ -120,7 +120,7 @@
 					$configtext .= "file_logging_dir=/var/log/imspector\n";
 					
 				if(imspector_config("filter_badwords")) 
-					$configtext .= "badwords_filename=/usr/local/etc/imspector.badwords\n";
+					$configtext .= "badwords_filename=/usr/local/etc/imspector/badwords.txt\n";
 					
 				if(imspector_config("log_mysql"))
 				{
@@ -129,7 +129,7 @@
 					$configtext .= "mysql_username=".imspector_config("mysql_username")."\n";
 					$configtext .= "mysql_password=".imspector_config("mysql_password")."\n";
 				}
-				
+
 				write_imspector_config($configfile,$configtext);					
 					
 				$stop = <<<EOD
diff --git a/packages/imspector/imspector.xml b/packages/imspector/imspector.xml
index 8757e2f8..e43bf63a 100644
--- a/packages/imspector/imspector.xml
+++ b/packages/imspector/imspector.xml
@@ -17,21 +17,6 @@
 		<chmod>0755</chmod>
 		<item>http://www.pfsense.org/packages/config/imspector/imspector.inc</item>
 	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/sbin/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/sbin/imspector</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/etc/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/imspector.badwords</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/lib/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/imspector/lib/libimspector.so</item>
-	</additional_files_needed>
 	<service>
 		<name>imspector</name>
 		<rcfile>imspector.sh</rcfile>
@@ -112,28 +97,9 @@
 		sync_package_imspector();
 	</custom_php_resync_config_command>    
 	<custom_php_install_command>
-		exec("mkdir -p /usr/local/lib/imspector");
-		exec("fetch -o /usr/local/lib/imspector/debugloggingplugin.so \
-			http://www.pfsense.com/packages/config/imspector/lib/debugloggingplugin.so");
-		exec("fetch -o /usr/local/lib/imspector/fileloggingplugin.so \
-			http://www.pfsense.com/packages/config/imspector/lib/fileloggingplugin.so");
-		exec("fetch -o /usr/local/lib/imspector/mysqlloggingplugin.so \
-			http://www.pfsense.com/packages/config/imspector/lib/mysqlloggingplugin.so");
-		exec("fetch -o /usr/local/lib/imspector/icqprotocolplugin.so \
-			http://www.pfsense.com/packages/config/imspector/lib/icqprotocolplugin.so");
-		exec("fetch -o /usr/local/lib/imspector/ircprotocolplugin.so \
-			http://www.pfsense.com/packages/config/imspector/lib/ircprotocolplugin.so");
-		exec("fetch -o /usr/local/lib/imspector/msnprotocolplugin.so \
-			http://www.pfsense.com/packages/config/imspector/lib/msnprotocolplugin.so");
-		exec("fetch -o /usr/local/lib/imspector/yahooprotocolplugin.so \
-			http://www.pfsense.com/packages/config/imspector/lib/yahooprotocolplugin.so");
-		exec("fetch -o /usr/local/lib/imspector/badwordscontentplugin.so \
-			http://www.pfsense.com/packages/config/imspector/lib/badwordscontentplugin.so");		
-		exec("chmod 755 /usr/local/lib/imspector/*");
+		sync_package_imspector();
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
 		exec("rm -f /usr/local/etc/rc.d/imspector*");
-		exec("rm -f /usr/local/etc/imspector.conf");
-		exec("rm -rf /usr/local/lib/imspector");
 	</custom_php_deinstall_command>
 </packagegui>
-- 
cgit v1.2.3