74 files changed, 74 insertions, 81 deletions

diff --git a/config/orionids-dev/css/new_tab_menu.css b/config/snort-dev/css/new_tab_menu.css
index 1592be9f..1592be9f 100644
--- a/config/orionids-dev/css/new_tab_menu.css
+++ b/config/snort-dev/css/new_tab_menu.css
diff --git a/config/orionids-dev/css/style_snort2.css b/config/snort-dev/css/style_snort2.css
index 16b2e327..16b2e327 100644
--- a/config/orionids-dev/css/style_snort2.css
+++ b/config/snort-dev/css/style_snort2.css
diff --git a/config/orionids-dev/images/alert.jpg b/config/snort-dev/images/alert.jpg
index 96c24e35..96c24e35 100644
--- a/config/orionids-dev/images/alert.jpg
+++ b/config/snort-dev/images/alert.jpg
diff --git a/config/orionids-dev/images/arrow_down.png b/config/snort-dev/images/arrow_down.png
index 2c4e2793..2c4e2793 100644
--- a/config/orionids-dev/images/arrow_down.png
+++ b/config/snort-dev/images/arrow_down.png
diff --git a/config/orionids-dev/images/awesome-overlay-sprite.png b/config/snort-dev/images/awesome-overlay-sprite.png
index c3af7dd9..c3af7dd9 100644
--- a/config/orionids-dev/images/awesome-overlay-sprite.png
+++ b/config/snort-dev/images/awesome-overlay-sprite.png
diff --git a/config/orionids-dev/images/close_9x9.gif b/config/snort-dev/images/close_9x9.gif
index 326f5fa5..326f5fa5 100644
--- a/config/orionids-dev/images/close_9x9.gif
+++ b/config/snort-dev/images/close_9x9.gif
diff --git a/config/orionids-dev/images/controls.png b/config/snort-dev/images/controls.png
index e1e97982..e1e97982 100644
--- a/config/orionids-dev/images/controls.png
+++ b/config/snort-dev/images/controls.png
diff --git a/config/orionids-dev/images/down.gif b/config/snort-dev/images/down.gif
index 2b3c99fc..2b3c99fc 100644
--- a/config/orionids-dev/images/down.gif
+++ b/config/snort-dev/images/down.gif
diff --git a/config/orionids-dev/images/down2.gif b/config/snort-dev/images/down2.gif
index 71bf92eb..71bf92eb 100644
--- a/config/orionids-dev/images/down2.gif
+++ b/config/snort-dev/images/down2.gif
diff --git a/config/orionids-dev/images/footer.jpg b/config/snort-dev/images/footer.jpg
index 4af05707..4af05707 100644
--- a/config/orionids-dev/images/footer.jpg
+++ b/config/snort-dev/images/footer.jpg
diff --git a/config/orionids-dev/images/footer2.jpg b/config/snort-dev/images/footer2.jpg
index 3332e085..3332e085 100644
--- a/config/orionids-dev/images/footer2.jpg
+++ b/config/snort-dev/images/footer2.jpg
diff --git a/config/orionids-dev/images/icon-table-sort-asc.png b/config/snort-dev/images/icon-table-sort-asc.png
index 0c127919..0c127919 100644
--- a/config/orionids-dev/images/icon-table-sort-asc.png
+++ b/config/snort-dev/images/icon-table-sort-asc.png
diff --git a/config/orionids-dev/images/icon-table-sort-desc.png b/config/snort-dev/images/icon-table-sort-desc.png
index 5c52f2d0..5c52f2d0 100644
--- a/config/orionids-dev/images/icon-table-sort-desc.png
+++ b/config/snort-dev/images/icon-table-sort-desc.png
diff --git a/config/orionids-dev/images/icon-table-sort.png b/config/snort-dev/images/icon-table-sort.png
index 3cae604b..3cae604b 100644
--- a/config/orionids-dev/images/icon-table-sort.png
+++ b/config/snort-dev/images/icon-table-sort.png
diff --git a/config/orionids-dev/images/icon_excli.png b/config/snort-dev/images/icon_excli.png
index 4b54fa31..4b54fa31 100644
--- a/config/orionids-dev/images/icon_excli.png
+++ b/config/snort-dev/images/icon_excli.png
diff --git a/config/orionids-dev/images/loading.gif b/config/snort-dev/images/loading.gif
index cbc00f09..cbc00f09 100644
--- a/config/orionids-dev/images/loading.gif
+++ b/config/snort-dev/images/loading.gif
diff --git a/config/orionids-dev/images/logo.jpg b/config/snort-dev/images/logo.jpg
index fa01d818..fa01d818 100644
--- a/config/orionids-dev/images/logo.jpg
+++ b/config/snort-dev/images/logo.jpg
diff --git a/config/orionids-dev/images/logo22.png b/config/snort-dev/images/logo22.png
index 64ed9d75..64ed9d75 100644
--- a/config/orionids-dev/images/logo22.png
+++ b/config/snort-dev/images/logo22.png
diff --git a/config/orionids-dev/images/new_tab_menu.png b/config/snort-dev/images/new_tab_menu.png
index f0e4cbeb..f0e4cbeb 100644
--- a/config/orionids-dev/images/new_tab_menu.png
+++ b/config/snort-dev/images/new_tab_menu.png
diff --git a/config/orionids-dev/images/page_white_text.png b/config/snort-dev/images/page_white_text.png
index 813f712f..813f712f 100644
--- a/config/orionids-dev/images/page_white_text.png
+++ b/config/snort-dev/images/page_white_text.png
diff --git a/config/orionids-dev/images/progress_bar2.gif b/config/snort-dev/images/progress_bar2.gif
index 81766a93..81766a93 100644
--- a/config/orionids-dev/images/progress_bar2.gif
+++ b/config/snort-dev/images/progress_bar2.gif
diff --git a/config/orionids-dev/images/progressbar.gif b/config/snort-dev/images/progressbar.gif
index 6d167f5b..6d167f5b 100644
--- a/config/orionids-dev/images/progressbar.gif
+++ b/config/snort-dev/images/progressbar.gif
diff --git a/config/orionids-dev/images/top_modal_bar_lil.jpg b/config/snort-dev/images/top_modal_bar_lil.jpg
index f0049de8..f0049de8 100644
--- a/config/orionids-dev/images/top_modal_bar_lil.jpg
+++ b/config/snort-dev/images/top_modal_bar_lil.jpg
diff --git a/config/orionids-dev/images/transparent.gif b/config/snort-dev/images/transparent.gif
index e7ccd741..e7ccd741 100644
--- a/config/orionids-dev/images/transparent.gif
+++ b/config/snort-dev/images/transparent.gif
diff --git a/config/orionids-dev/images/transparentbg.png b/config/snort-dev/images/transparentbg.png
index 86918930..86918930 100644
--- a/config/orionids-dev/images/transparentbg.png
+++ b/config/snort-dev/images/transparentbg.png
diff --git a/config/orionids-dev/images/up.gif b/config/snort-dev/images/up.gif
index 89596771..89596771 100644
--- a/config/orionids-dev/images/up.gif
+++ b/config/snort-dev/images/up.gif
diff --git a/config/orionids-dev/images/up2.gif b/config/snort-dev/images/up2.gif
index 21c5a254..21c5a254 100644
--- a/config/orionids-dev/images/up2.gif
+++ b/config/snort-dev/images/up2.gif
diff --git a/config/orionids-dev/javascript/jquery-1.6.2.min.js b/config/snort-dev/javascript/jquery-1.6.2.min.js
index 48590ecb..48590ecb 100644
--- a/config/orionids-dev/javascript/jquery-1.6.2.min.js
+++ b/config/snort-dev/javascript/jquery-1.6.2.min.js
diff --git a/config/orionids-dev/javascript/jquery.form.js b/config/snort-dev/javascript/jquery.form.js
index 2b853df4..2b853df4 100644
--- a/config/orionids-dev/javascript/jquery.form.js
+++ b/config/snort-dev/javascript/jquery.form.js
diff --git a/config/orionids-dev/javascript/jquery.progressbar.min.js b/config/snort-dev/javascript/jquery.progressbar.min.js
index e85e1120..e85e1120 100644
--- a/config/orionids-dev/javascript/jquery.progressbar.min.js
+++ b/config/snort-dev/javascript/jquery.progressbar.min.js
diff --git a/config/orionids-dev/javascript/snort_globalsend.js b/config/snort-dev/javascript/snort_globalsend.js
index dc92efba..dc92efba 100644
--- a/config/orionids-dev/javascript/snort_globalsend.js
+++ b/config/snort-dev/javascript/snort_globalsend.js
diff --git a/config/orionids-dev/patches/SnortSam/TODAO.txt b/config/snort-dev/patches/SnortSam/TODAO.txt
index 3abf0303..3abf0303 100644
--- a/config/orionids-dev/patches/SnortSam/TODAO.txt
+++ b/config/snort-dev/patches/SnortSam/TODAO.txt
diff --git a/config/orionids-dev/patches/SnortSam/snortsam-2.8.6.1.diff b/config/snort-dev/patches/SnortSam/snortsam-2.8.6.1.diff
index 983165e1..983165e1 100644
--- a/config/orionids-dev/patches/SnortSam/snortsam-2.8.6.1.diff
+++ b/config/snort-dev/patches/SnortSam/snortsam-2.8.6.1.diff
diff --git a/config/orionids-dev/patches/inlinemode_options_flags.txt b/config/snort-dev/patches/inlinemode_options_flags.txt
index e69de29b..e69de29b 100644
--- a/config/orionids-dev/patches/inlinemode_options_flags.txt
+++ b/config/snort-dev/patches/inlinemode_options_flags.txt
diff --git a/config/orionids-dev/patches/spoink_patch/2.8.6/Makefile.am b/config/snort-dev/patches/spoink_patch/2.8.6/Makefile.am
index 0879c6e3..0879c6e3 100644
--- a/config/orionids-dev/patches/spoink_patch/2.8.6/Makefile.am
+++ b/config/snort-dev/patches/spoink_patch/2.8.6/Makefile.am
diff --git a/config/orionids-dev/patches/spoink_patch/2.8.6/Makefile.in b/config/snort-dev/patches/spoink_patch/2.8.6/Makefile.in
index 3f06cc31..3f06cc31 100644
--- a/config/orionids-dev/patches/spoink_patch/2.8.6/Makefile.in
+++ b/config/snort-dev/patches/spoink_patch/2.8.6/Makefile.in
diff --git a/config/orionids-dev/patches/spoink_patch/2.8.6/plugbase.c b/config/snort-dev/patches/spoink_patch/2.8.6/plugbase.c
index 31f381a8..31f381a8 100644
--- a/config/orionids-dev/patches/spoink_patch/2.8.6/plugbase.c
+++ b/config/snort-dev/patches/spoink_patch/2.8.6/plugbase.c
diff --git a/config/orionids-dev/patches/spoink_patch/2.8.6/util.c b/config/snort-dev/patches/spoink_patch/2.8.6/util.c
index b2d3b38b..b2d3b38b 100644
--- a/config/orionids-dev/patches/spoink_patch/2.8.6/util.c
+++ b/config/snort-dev/patches/spoink_patch/2.8.6/util.c
diff --git a/config/orionids-dev/patches/spoink_patch/spo_pf.c b/config/snort-dev/patches/spoink_patch/spo_pf.c
index 121920fc..121920fc 100644
--- a/config/orionids-dev/patches/spoink_patch/spo_pf.c
+++ b/config/snort-dev/patches/spoink_patch/spo_pf.c
diff --git a/config/orionids-dev/patches/spoink_patch/spo_pf.h b/config/snort-dev/patches/spoink_patch/spo_pf.h
index af07dacd..af07dacd 100644
--- a/config/orionids-dev/patches/spoink_patch/spo_pf.h
+++ b/config/snort-dev/patches/spoink_patch/spo_pf.h
diff --git a/config/orionids-dev/orion.xml b/config/snort-dev/snort.xml
index 2bf853f4..207fae8b 100644
--- a/config/orionids-dev/orion.xml
+++ b/config/snort-dev/snort.xml
@@ -54,8 +54,8 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>Orion</name>
-	<version>2.9.0.5</version>
-	<title>Services:2.9.0.5 pkg v. 2.0</title>
+	<version>2.9.1</version>
+	<title>Services:2.9.1 pkg v. 2.0</title>
 	<include_file>/usr/local/pkg/snort/snort_install.inc</include_file>
 	<menu>
 		<name>Orion</name>
@@ -64,8 +64,8 @@
 		<url>/snort/snort_interfaces.php</url>
 	</menu>
 	<service>
-		<name>orion</name>
-		<rcfile>orion.sh</rcfile>
+		<name>snort</name>
+		<rcfile>snort.sh</rcfile>
 		<executable>snort</executable>
 		<description>Snort is the most widely deployed IDS/IPS technology worldwide.</description>
 	</service>
@@ -74,167 +74,167 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/orion.xml</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snortDB</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snortDB</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snortDBrules</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snortDBrules</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snortDBtemp</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snortDBtemp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_build.inc</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_build.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_download_rules.inc</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_download_rules.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_gui.inc</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_gui.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_head.inc</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_head.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_headbase.inc</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_headbase.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_install.inc</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_install.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_new.inc</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_new.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_alerts.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_alerts.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_barnyard.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_barnyard.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_blocked.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_blocked.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_define_servers.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_define_servers.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_download_updates.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_download_updates.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_help_info.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_help_info.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_interfaces.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_interfaces.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_interfaces_edit.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_interfaces_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_interfaces_global.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_interfaces_global.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_interfaces_rules.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_interfaces_rules.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_interfaces_rules_edit.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_interfaces_rules_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_interfaces_suppress.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_interfaces_suppress.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_interfaces_suppress_edit.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_interfaces_suppress_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_interfaces_whitelist.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_interfaces_whitelist.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_interfaces_whitelist_edit.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_interfaces_whitelist_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_json_get.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_json_get.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_json_post.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_json_post.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_preprocessors.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_preprocessors.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_rules.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_rules.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_rulesets.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_rulesets.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_rules_ips.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_rules_ips.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/snort/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/orionids-dev/snort_rulesets_ips.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_rulesets_ips.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/bin/</prefix>
diff --git a/config/orionids-dev/snortDB b/config/snort-dev/snortDB
index c685a368..c685a368 100644
--- a/config/orionids-dev/snortDB
+++ b/config/snort-dev/snortDB
diff --git a/config/orionids-dev/snortDBrules b/config/snort-dev/snortDBrules
index 829a589b..829a589b 100644
--- a/config/orionids-dev/snortDBrules
+++ b/config/snort-dev/snortDBrules
diff --git a/config/orionids-dev/snortDBtemp b/config/snort-dev/snortDBtemp
index 56ab2842..56ab2842 100644
--- a/config/orionids-dev/snortDBtemp
+++ b/config/snort-dev/snortDBtemp
diff --git a/config/orionids-dev/snort_alerts.php b/config/snort-dev/snort_alerts.php
index 3cb79c5c..3cb79c5c 100644
--- a/config/orionids-dev/snort_alerts.php
+++ b/config/snort-dev/snort_alerts.php
diff --git a/config/orionids-dev/snort_barnyard.php b/config/snort-dev/snort_barnyard.php
index 1cd2113b..1cd2113b 100644
--- a/config/orionids-dev/snort_barnyard.php
+++ b/config/snort-dev/snort_barnyard.php
diff --git a/config/orionids-dev/snort_blocked.php b/config/snort-dev/snort_blocked.php
index fdc12480..fdc12480 100644
--- a/config/orionids-dev/snort_blocked.php
+++ b/config/snort-dev/snort_blocked.php
diff --git a/config/orionids-dev/snort_build.inc b/config/snort-dev/snort_build.inc
index 2c18d3d3..2c18d3d3 100644
--- a/config/orionids-dev/snort_build.inc
+++ b/config/snort-dev/snort_build.inc
diff --git a/config/orionids-dev/snort_define_servers.php b/config/snort-dev/snort_define_servers.php
index 05e7709e..05e7709e 100644
--- a/config/orionids-dev/snort_define_servers.php
+++ b/config/snort-dev/snort_define_servers.php
diff --git a/config/orionids-dev/snort_download_rules.inc b/config/snort-dev/snort_download_rules.inc
index 8953a65c..8953a65c 100644
--- a/config/orionids-dev/snort_download_rules.inc
+++ b/config/snort-dev/snort_download_rules.inc
diff --git a/config/orionids-dev/snort_download_updates.php b/config/snort-dev/snort_download_updates.php
index 445671bd..445671bd 100644
--- a/config/orionids-dev/snort_download_updates.php
+++ b/config/snort-dev/snort_download_updates.php
diff --git a/config/orionids-dev/snort_gui.inc b/config/snort-dev/snort_gui.inc
index d0a778ae..d0a778ae 100644
--- a/config/orionids-dev/snort_gui.inc
+++ b/config/snort-dev/snort_gui.inc
diff --git a/config/orionids-dev/snort_head.inc b/config/snort-dev/snort_head.inc
index 2d5aadaa..2d5aadaa 100644
--- a/config/orionids-dev/snort_head.inc
+++ b/config/snort-dev/snort_head.inc
diff --git a/config/orionids-dev/snort_headbase.inc b/config/snort-dev/snort_headbase.inc
index 33bbd0ee..33bbd0ee 100644
--- a/config/orionids-dev/snort_headbase.inc
+++ b/config/snort-dev/snort_headbase.inc
diff --git a/config/orionids-dev/snort_help_info.php b/config/snort-dev/snort_help_info.php
index 616133ae..616133ae 100644
--- a/config/orionids-dev/snort_help_info.php
+++ b/config/snort-dev/snort_help_info.php
diff --git a/config/orionids-dev/snort_install.inc b/config/snort-dev/snort_install.inc
index 59fdd2e6..b227b347 100644
--- a/config/orionids-dev/snort_install.inc
+++ b/config/snort-dev/snort_install.inc
@@ -226,39 +226,39 @@ function snort_postinstall()
 	exec('/bin/mkdir -p /usr/local/www/snort/javascript');
 
 	chdir ("/usr/local/www/snort/css/");
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/css/style_snort2.css');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/css/new_tab_menu.css');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/css/style_snort2.css');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/css/new_tab_menu.css');
 	chdir ("/usr/local/www/snort/images/");
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/alert.jpg');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/arrow_down.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/awesome-overlay-sprite.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/controls.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/down.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/down2.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/footer.jpg');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/footer2.jpg');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/icon-table-sort-asc.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/icon-table-sort-desc.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/icon-table-sort.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/icon_excli.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/loading.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/logo.jpg');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/logo22.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/page_white_text.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/transparent.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/transparentbg.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/up.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/up2.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/close_9x9.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/new_tab_menu.png');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/progress_bar2.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/progressbar.gif');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/images/top_modal_bar_lil.jpg');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/alert.jpg');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/arrow_down.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/awesome-overlay-sprite.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/controls.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/down.gif');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/down2.gif');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/footer.jpg');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/footer2.jpg');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/icon-table-sort-asc.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/icon-table-sort-desc.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/icon-table-sort.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/icon_excli.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/loading.gif');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/logo.jpg');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/logo22.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/page_white_text.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/transparent.gif');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/transparentbg.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/up.gif');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/up2.gif');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/close_9x9.gif');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/new_tab_menu.png');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/progress_bar2.gif');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/progressbar.gif');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/images/top_modal_bar_lil.jpg');
 	chdir ("/usr/local/www/snort/javascript/");
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/javascript/jquery-1.6.2.min.js');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/javascript/jquery.form.js');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/javascript/snort_globalsend.js');
-	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/orionids-dev/javascript/jquery.progressbar.min.js');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/javascript/jquery-1.6.2.min.js');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/javascript/jquery.form.js');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/javascript/snort_globalsend.js');
+	exec('/usr/bin/fetch http://www.pfsense.com/packages/config/snort-dev/javascript/jquery.progressbar.min.js');
 
 	/* back to default */
 	chdir ('/root/');
diff --git a/config/orionids-dev/snort_interfaces.php b/config/snort-dev/snort_interfaces.php
index beb50f83..beb50f83 100644
--- a/config/orionids-dev/snort_interfaces.php
+++ b/config/snort-dev/snort_interfaces.php
diff --git a/config/orionids-dev/snort_interfaces_edit.php b/config/snort-dev/snort_interfaces_edit.php
index ade5ade8..ade5ade8 100644
--- a/config/orionids-dev/snort_interfaces_edit.php
+++ b/config/snort-dev/snort_interfaces_edit.php
diff --git a/config/orionids-dev/snort_interfaces_global.php b/config/snort-dev/snort_interfaces_global.php
index fd9d27d4..fd9d27d4 100644
--- a/config/orionids-dev/snort_interfaces_global.php
+++ b/config/snort-dev/snort_interfaces_global.php
diff --git a/config/orionids-dev/snort_interfaces_rules.php b/config/snort-dev/snort_interfaces_rules.php
index 12f9cec0..12f9cec0 100644
--- a/config/orionids-dev/snort_interfaces_rules.php
+++ b/config/snort-dev/snort_interfaces_rules.php
diff --git a/config/orionids-dev/snort_interfaces_rules_edit.php b/config/snort-dev/snort_interfaces_rules_edit.php
index be6467bc..be6467bc 100644
--- a/config/orionids-dev/snort_interfaces_rules_edit.php
+++ b/config/snort-dev/snort_interfaces_rules_edit.php
diff --git a/config/orionids-dev/snort_interfaces_suppress.php b/config/snort-dev/snort_interfaces_suppress.php
index 977dcf2d..977dcf2d 100644
--- a/config/orionids-dev/snort_interfaces_suppress.php
+++ b/config/snort-dev/snort_interfaces_suppress.php
diff --git a/config/orionids-dev/snort_interfaces_suppress_edit.php b/config/snort-dev/snort_interfaces_suppress_edit.php
index e9f23254..e9f23254 100644
--- a/config/orionids-dev/snort_interfaces_suppress_edit.php
+++ b/config/snort-dev/snort_interfaces_suppress_edit.php
diff --git a/config/orionids-dev/snort_interfaces_whitelist.php b/config/snort-dev/snort_interfaces_whitelist.php
index 3167b65f..3167b65f 100644
--- a/config/orionids-dev/snort_interfaces_whitelist.php
+++ b/config/snort-dev/snort_interfaces_whitelist.php
diff --git a/config/orionids-dev/snort_interfaces_whitelist_edit.php b/config/snort-dev/snort_interfaces_whitelist_edit.php
index dbdbb649..dbdbb649 100644
--- a/config/orionids-dev/snort_interfaces_whitelist_edit.php
+++ b/config/snort-dev/snort_interfaces_whitelist_edit.php
diff --git a/config/orionids-dev/snort_json_get.php b/config/snort-dev/snort_json_get.php
index 92058a75..92058a75 100644
--- a/config/orionids-dev/snort_json_get.php
+++ b/config/snort-dev/snort_json_get.php
diff --git a/config/orionids-dev/snort_json_post.php b/config/snort-dev/snort_json_post.php
index 418a90be..418a90be 100644
--- a/config/orionids-dev/snort_json_post.php
+++ b/config/snort-dev/snort_json_post.php
diff --git a/config/orionids-dev/snort_new.inc b/config/snort-dev/snort_new.inc
index b9fc2322..b9fc2322 100644
--- a/config/orionids-dev/snort_new.inc
+++ b/config/snort-dev/snort_new.inc
diff --git a/config/orionids-dev/snort_preprocessors.php b/config/snort-dev/snort_preprocessors.php
index d99f7f75..d99f7f75 100644
--- a/config/orionids-dev/snort_preprocessors.php
+++ b/config/snort-dev/snort_preprocessors.php
diff --git a/config/orionids-dev/snort_rules.php b/config/snort-dev/snort_rules.php
index fd102538..fd102538 100644
--- a/config/orionids-dev/snort_rules.php
+++ b/config/snort-dev/snort_rules.php
diff --git a/config/orionids-dev/snort_rules_ips.php b/config/snort-dev/snort_rules_ips.php
index d026b566..d026b566 100644
--- a/config/orionids-dev/snort_rules_ips.php
+++ b/config/snort-dev/snort_rules_ips.php
diff --git a/config/orionids-dev/snort_rulesets.php b/config/snort-dev/snort_rulesets.php
index a2e4f7f3..a2e4f7f3 100644
--- a/config/orionids-dev/snort_rulesets.php
+++ b/config/snort-dev/snort_rulesets.php
diff --git a/config/orionids-dev/snort_rulesets_ips.php b/config/snort-dev/snort_rulesets_ips.php
index abac2b6b..abac2b6b 100644
--- a/config/orionids-dev/snort_rulesets_ips.php
+++ b/config/snort-dev/snort_rulesets_ips.php
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 7d3f8de9..ebfb02f4 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -330,23 +330,16 @@
 		<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>
 	<package>
-		<name>Orion-ids-dev</name>
+		<name>snort-dev</name>
 		<pkginfolink>http://forum.pfsense.org/index.php/topic,16847.0.html</pkginfolink>
 		<website>http://www.snort.org</website>
-		<descr>Testing Install Only, Currently Broken as of 06232011</descr>
-		<category>Security</category>
-		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package>perl-5.12.4.tbz</depends_on_package>
-		<depends_on_package>snortsam-2.70.tbz</depends_on_package>
-		<depends_on_package>snort-2.9.0.5.tbz</depends_on_package>
-		<build_port_path>/usr/ports/security/snort</build_port_path>
-		<build_port_path>/usr/ports/security/snortsam</build_port_path>
-		<build_options>WITH_IPV6=true WITH_MPLS=true WITH_GRE=true WITHOUT_TARGETBASED=true WITH_DECODERPRE=true WITH_ZLIB=true WITH_NORMALIZER=true WITH_REACT=true WITH_PERFPROFILE=true WITH_FLEXRESP3=true WITHOUT_MYSQL=true WITHOUT_ODBC=true WITHOUT_POSTGRESQL=true WITHOUT_PRELUDE=true WITH_SNORTSAM=true WITH_PFSENSE=true</build_options>		
-		<config_file>http://www.pfsense.com/packages/config/orionids-dev/orion.xml</config_file>
-		<version>2.9.0.5 pkg v. 2.0</version>
+		<descr>Testing Install Only, Currently Broken as of 09212011</descr>
+		<category>Security</category>	
+		<config_file>http://www.pfsense.com/packages/config/snort-dev/snort.xml</config_file>
+		<version>2.9.1 pkg v. 2.0</version>
 		<required_version>2.0</required_version>
 		<status>UnStable</status>
-		<configurationfile>/orion.xml</configurationfile>
+		<configurationfile>/snort.xml</configurationfile>
 		<after_install_info></after_install_info>
 	</package>
 	<package>