snort stable snort dev, mirror packages

7 files changed, 59 insertions, 36 deletions

diff --git a/config/snort-dev/bin/oinkmaster_contrib/create-sidmap.pl b/config/snort-dev/bin/oinkmaster_contrib/create-sidmap.pl
index e1ce12ab..26a9040c 100644
--- a/config/snort-dev/bin/oinkmaster_contrib/create-sidmap.pl
+++ b/config/snort-dev/bin/oinkmaster_contrib/create-sidmap.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
 
 # $Id: create-sidmap.pl,v 1.21 2005/12/31 13:42:46 andreas_o Exp $ #
 
diff --git a/config/snort-dev/snort.inc b/config/snort-dev/snort.inc
index 107dfb3e..a5e2425b 100644
--- a/config/snort-dev/snort.inc
+++ b/config/snort-dev/snort.inc
@@ -80,12 +80,10 @@ function sync_package_snort()
 	exec("/bin/mkdir -p /usr/local/etc/snort/rules");
 	exec("/bin/cp /usr/local/etc/snort/unicode.map-sample /usr/local/etc/snort/unicode.map");
 	exec("/bin/cp /usr/local/etc/snort/classification.config-sample /usr/local/etc/snort/classification.config");
-	exec("/bin/cp /usr/local/etc/snort/gen-msg.map-sample /usr/local/etc/snort/gen-msg.map");
 	exec("/bin/cp /usr/local/etc/snort/generators-sample /usr/local/etc/snort/generators");
 	exec("/bin/cp /usr/local/etc/snort/reference.config-sample /usr/local/etc/snort/reference.config");
 	exec("/bin/cp /usr/local/etc/snort/sid-msg.map-sample /usr/local/etc/snort/sid-msg.map");
 	exec("/bin/cp /usr/local/etc/snort/sid-sample /usr/local/etc/snort/sid");
-	exec("/bin/cp /usr/local/etc/snort/threshold.conf-sample /usr/local/etc/snort/threshold.conf");
 	exec("/bin/cp /usr/local/etc/snort/unicode.map-sample /usr/local/etc/snort/unicode.map");
 	exec("/bin/rm -f /usr/local/etc/rc.d/snort");
 	
diff --git a/config/snort-dev/snort.xml b/config/snort-dev/snort.xml
index 3f6f91c8..a6f2ffa1 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_2</version>
-	<title>Services: Snort 2.8.4.1_2 pkg v. 1.6</title>
+	<version>2.8.4.1_3</version>
+	<title>Services: Snort 2.8.4.1_3 pkg v. 1.7 alpha</title>
 	<include_file>/usr/local/pkg/snort.inc</include_file>
 	<menu>
 		<name>Snort</name>
diff --git a/config/snort-dev/snort_download_rules.php b/config/snort-dev/snort_download_rules.php
index 8eca3d34..5e2b9888 100644
--- a/config/snort-dev/snort_download_rules.php
+++ b/config/snort-dev/snort_download_rules.php
@@ -2,7 +2,7 @@
 /* $Id$ */
 /*
 	snort_rulesets.php
-	Copyright (C) 2006 Scott Ullrich
+	Copyright (C) 2006 Scott Ullrich and Robert Zelaya
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -697,8 +697,8 @@ if ($snort_md5_check_ok != on || $emerg_md5_check_chk_ok != on || $pfsense_md5_c
 	exec("/bin/cp {$snortdir}/reference.config {$snortdir_wan}");
 	exec("/bin/cp {$snortdir}/sid {$snortdir_wan}");
 	exec("/bin/cp {$snortdir}/sid-msg.map {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/snort.conf {$snortdir_wan}");
-	exec("/bin/cp {$snortdir}/threshold.conf {$snortdir_wan}");
+//	exec("/bin/cp {$snortdir}/snort.conf {$snortdir_wan}");
+//	exec("/bin/cp {$snortdir}/threshold.conf {$snortdir_wan}");
 	exec("/bin/cp {$snortdir}/unicode.map {$snortdir_wan}");
 
 } else {
@@ -706,7 +706,7 @@ if ($snort_md5_check_ok != on || $emerg_md5_check_chk_ok != on || $pfsense_md5_c
 		update_output_window(gettext("May take a while..."));
 
 		exec("/bin/cp {$snortdir}/classification.config {$snortdir_wan}");
-//		exec("/bin/cp {$snortdir}/gen-msg.map {$snortdir_wan}");
+		exec("/bin/cp {$snortdir}/gen-msg.map {$snortdir_wan}");
 		exec("/bin/cp {$snortdir}/generators {$snortdir_wan}");
 		exec("/bin/cp {$snortdir}/reference.config {$snortdir_wan}");
 		exec("/bin/cp {$snortdir}/sid {$snortdir_wan}");
diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index 2370be0e..83ac38f0 100644
--- a/config/snort/snort.xml
+++ b/config/snort/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_1</version>
-	<title>Services: Snort 2.8.4.1_2 pkg v. 1.6</title>
+	<version>2.8.4.1_3</version>
+	<title>Services: Snort 2.8.4.1_3 pkg v. 1.6</title>
 	<include_file>/usr/local/pkg/snort.inc</include_file>
 	<menu>
 		<name>Snort</name>
@@ -107,87 +107,87 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort.inc</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/bin/barnyard2</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/bin/oinkmaster_contrib/create-sidmap.pl</item>
+		<item>http://www.pfsense.com/packages/config/snort/bin/oinkmaster_contrib/create-sidmap.pl</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/bin/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/bin/oinkmaster_contrib/oinkmaster.pl</item>
+		<item>http://www.pfsense.com/packages/config/snort/bin/oinkmaster_contrib/oinkmaster.pl</item>
 	</additional_files_needed>	
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_download_rules.php</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/snort_rules.php</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/snort_rules_edit.php</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/snort_rulesets.php</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/snort_whitelist.xml</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/snort_blocked.php</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/snort_check_for_rule_updates.php</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/snort_alerts.php</item>
+		<item>http://www.pfsense.com/packages/config/snort/snort_alerts.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/pf/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/snort_dynamic_ip_reload.php</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/snort_advanced.xml</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/snort_define_servers.xml</item>
+		<item>http://www.pfsense.com/packages/config/snort/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-dev/snort_threshold.xml</item>
+		<item>http://www.pfsense.com/packages/config/snort/snort_threshold.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort-dev/pfsense_rules/local.rules</item>
+		<item>http://www.pfsense.com/packages/config/snort/pfsense_rules/local.rules</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 2556a471..e7b5acda 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -257,7 +257,7 @@
       <depends_on_package>mysql-client-5.1.34.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/snort.xml</config_file>
-      <version>2.8.4.1_2 pkg v.1.6</version>
+      <version>2.8.4.1_3 pkg v.1.6</version>
       <required_version>1.2.2</required_version>
       <status>Stable</status>
       <configurationfile>snort.xml</configurationfile>
@@ -276,9 +276,9 @@
 	  <depends_on_package>mysql-client-5.1.34.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_2 RC5</version>
+      <version>2.8.4.1_3 pkg v.1.7</version>
       <required_version>1.2.2</required_version>
-      <status>Stable</status>
+      <status>alpha</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>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b39e64fb..a5ffef3a 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -181,18 +181,43 @@
     </package>
     <package>
       <name>snort</name>
-      <descr>Snort is a libpcap-based packet sniffer/logger which can be used as a lightweight network intrusion detection system. It features rules based logging and can perform content searching/matching in addition to being used to detect a variety of other attacks and probes, such as buffer overflows, stealth port scans, CGI attacks, SMB probes, and much more.</descr>
+	  <pkginfolink>http://forum.pfsense.org/index.php/topic,16847.0.html</pkginfolink>
+      <website>http://www.snort.org</website>
+      <descr>Used by fortune 500 companies and goverments Snort is the most widely deployed IDS/IPS technology worldwide. It features rules based logging and can perform content searching/matching in addition to being used to detect a variety of other attacks and probes, such as buffer overflows, stealth port scans, CGI attacks, SMB probes, and much more.</descr>
       <category>Security</category>
-      <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <depends_on_package>snort-2.8.2.1.tbz</depends_on_package>
+      <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>perl-5.8.9_3.tbz</depends_on_package>
+      <depends_on_package>mysql-client-5.1.34.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/snort.xml</config_file>
-      <version>2.8.2.6_2</version>
-      <required_version>1.2</required_version>
+      <version>2.8.4.1_3 pkg v.1.6</version>
+      <required_version>1.2.2</required_version>
       <status>Stable</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>snort-dev</name>
+	  <pkginfolink>http://forum.pfsense.org/index.php/topic,16847.0.html</pkginfolink>
+      <website>http://www.snort.org</website>
+      <descr>WARNING; This is a dev branch of the snort package and may be unstable. Any bugs found please report to the Pfsense forums. RC5 very stable and testers needed. </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>perl-5.8.9_3.tbz</depends_on_package>
+	  <depends_on_package>mysql-client-5.1.34.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_3 pkg v.1.7</version>
+      <required_version>1.2.2</required_version>
+      <status>alpha</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>