add dir canges to snort.xml plg_config.7.xml

2 files changed, 32 insertions, 17 deletions

diff --git a/config/snort-dev/snort.xml b/config/snort-dev/snort.xml
index c5e1f397..70739737 100644
--- a/config/snort-dev/snort.xml
+++ b/config/snort-dev/snort.xml
@@ -46,8 +46,8 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>Snort</name>
-	<version>2.8.4.1</version>
-	<title>Services: Snort 2.8.4.1 pkg v. 1.5</title>
+	<version>2.8.4.1_1</version>
+	<title>Services: Snort 2.8.4.1_1 pkg v. 1.6 Beta</title>
 	<include_file>/usr/local/pkg/snort.inc</include_file>
 	<menu>
 		<name>Snort</name>
@@ -106,77 +106,77 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/snort.inc</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/bin/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/bin/snort2c</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/bin/barnyard2</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/bin/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/bin/mons2c</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/bin/oinkmaster_contrib/create-sidmap.pl</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/snort_download_rules.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_download_rules.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/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/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/snort_rules_edit.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_rules_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/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/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/snort_whitelist.xml</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_whitelist.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/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/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/snort_check_for_rule_updates.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_check_for_rule_updates.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/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/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/snort_dynamic_ip_reload.php</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_dynamic_ip_reload.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/snort_advanced.xml</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_advanced.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/snort_define_servers.xml</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_define_servers.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/snort_threshold.xml</item>
+		<item>http://www.pfsense.com/packages/config/snort-dev/snort_threshold.xml</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 1101b235..ebfba29c 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -247,6 +247,21 @@
 	  <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>snort-dev</name>
+      <descr>WARNING; This is a dev branch of the snort package and may be unstable. Any bugs found please report to the Pfsense forums. </descr>
+      <category>Security</category>
+      <depends_on_package_base_url>http://files.pfsense.org/packages/70/All/</depends_on_package_base_url>
+	  <depends_on_package>libdnet-1.11_3.tbz</depends_on_package>
+	  <depends_on_package>pcre-7.9.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_1</version>
+      <required_version>1.2.2</required_version>
+      <status>Beta</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>
+    <package>
       <name>spamd</name>
       <website>http://www.openbsd.org/spamd/</website>
       <descr>Tarpits like spamd are fake SMTP servers, which accept connections but don't deliver mail. Instead, they keep the connections open and reply very slowly. If the peer is patient enough to actually complete the SMTP dialogue (which will take ten minutes or more), the tarpit returns a 'temporary error' code (4xx), which indicates that the mail could not be delivered successfully and that the sender should keep the mail in their queue and retry again later.</descr>