snort, remove perl-threaded from basic install

4 files changed, 36 insertions, 3 deletions

diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index a52d9df3..9f3cf53f 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -677,6 +677,41 @@ if($snort_arch_ck[0] == 'i386') {
 	
 	exec('/bin/chmod 755 /usr/local/bin/barnyard2');
 	
+	
+	/* install perl-threaded */
+	if(!file_exists('/root/tmp2'))
+	{
+		exec('/bin/mkdir -p /root/tmp2');
+	}
+	
+	chdir ("/root/tmp2");
+	
+	update_status(gettext("Installing perl-threaded for $snort_arch..."));
+	update_output_window(gettext("Please wait downloading..."));
+	if ($pfsense_stable == 'yes') {
+		exec('/usr/bin/fetch http://files.pfsense.org/packages/snort/7.3x86/perl-threaded-5.12.1_1.tbz');
+	}
+
+	if ($pfsense_stable == 'no' && $snort_arch == 'x86') {
+		exec('/usr/bin/fetch http://files.pfsense.org/packages/snort//8.1x86/perl-threaded-5.12.1_1.tbz');
+	}
+	
+	if ($pfsense_stable == 'no' && $snort_arch == 'x64') {
+		exec('/usr/bin/fetch http://files.pfsense.org/packages/snort/8.1x64/perl-threaded-5.12.1_1.tbz');
+	}
+
+	update_status(gettext("Installing perl-threaded for $snort_arch..."));
+	update_output_window(gettext("Please wait Installing..."));
+	if(!file_exists('/root/tmp2/perl-threaded-5.12.1_1.tbz')){
+		exec('/usr/sbin/pkg_add /root/tmp2/perl-threaded-5.12.1_1.tbz');
+	}
+	
+	if(!file_exists('/root/tmp2/')){
+		exec('/bin/rm -r /root/tmp2/');
+	}	
+	
+	update_output_window(gettext("Finnished Installing perl-threaded..."));	
+	
 	/* back to default */
 	chdir ("/root/");
 	
@@ -1755,6 +1790,7 @@ function snort_deinstall()
 	exec('rm -rf /usr/local/pkg/pf/snort*');
 
 	exec("cd /var/db/pkg && pkg_delete `ls | grep snort`");
+	exec("cd /var/db/pkg && pkg_delete `ls | grep perl-threaded`");
 	exec("cd /var/db/pkg && pkg_delete `ls | grep mysql-client-5.1.50_1`");
 	exec('rm -r /usr/local/bin/barnyard2');
 	
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 2a7b94a8..57a0bd97 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -406,7 +406,6 @@
       <category>Security</category>
       <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort/bin/7.3.x86/</depends_on_package_base_url>
 	  <depends_on_package>pcre-8.10.tbz</depends_on_package>
-	  <depends_on_package>perl-threaded-5.12.1_1.tbz</depends_on_package>
       <depends_on_package>mysql-client-5.1.50_1.tbz</depends_on_package>
 	  <depends_on_package>snort-2.8.6.1.tbz</depends_on_package>
       <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index aea54a04..6069d5d5 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -292,7 +292,6 @@
       <category>Security</category>
       <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort/bin/8.1x86/</depends_on_package_base_url>
 	  <depends_on_package>pcre-8.10.tbz</depends_on_package>
-	  <depends_on_package>perl-threaded-5.12.1_1.tbz</depends_on_package>
       <depends_on_package>mysql-client-5.1.50_1.tbz</depends_on_package>
 	  <depends_on_package>snort-2.8.6.1.tbz</depends_on_package>
 	  <build_port_path>/usr/ports/devel/pcre</build_port_path>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 8fab312b..52debed7 100755
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -309,7 +309,6 @@
       <category>Security</category>
       <depends_on_package_base_url>http://www.pfsense.com/packages/config/snort/bin/8.1x64/</depends_on_package_base_url>
 	  <depends_on_package>pcre-8.10.tbz</depends_on_package>
-	  <depends_on_package>perl-threaded-5.12.1_1.tbz</depends_on_package>
       <depends_on_package>mysql-client-5.1.50_1.tbz</depends_on_package>
 	  <depends_on_package>snort-2.8.6.1.tbz</depends_on_package>
 	  <build_port_path>/usr/ports/devel/pcre</build_port_path>