Bring snort up to speed with 2.7. Submitted-by: shaddow501 via forum

2 files changed, 61 insertions, 6 deletions

diff --git a/packages/snort/snort.inc b/packages/snort/snort.inc
index 3fd8318f..7c441ab8 100644
--- a/packages/snort/snort.inc
+++ b/packages/snort/snort.inc
@@ -354,10 +354,20 @@ output alert_unified: filename alert
 
 #Flow and stream
 preprocessor flow: stats_interval 0 hash 2
-preprocessor frag2
-preprocessor stream4: disable_evasion_alerts,detect_scans
 
-preprocessor stream4_reassemble: both, ports all
+preprocessor frag3_global: max_frags 8192
+preprocessor frag3_engine
+preprocessor frag3_engine: policy last detect_anomalies
+#preprocessor frag2
+#preprocessor frag2
+#preprocessor stream4: disable_evasion_alerts,detect_scans
+preprocessor stream5_global: max_tcp 8192, track_tcp yes, \
+track_udp yes, track_icmp yes
+preprocessor stream5_tcp: policy BSD, ports both all, use_static_footprint_sizes
+preprocessor stream5_udp
+preprocessor stream5_icmp
+
+#preprocessor stream4_reassemble: both, ports all
 
 #XLink2State mini proc
 #preprocessor xlink2state: ports { 25 691 }
@@ -386,7 +396,52 @@ preprocessor http_inspect_server: server default \
 #Other preprocs
 preprocessor rpc_decode: 111 32771
 preprocessor bo
-preprocessor telnet_decode
+
+
+
+dynamicpreprocessor directory /usr/local/lib/snort/dynamicpreprocessor/
+dynamicpreprocessor file /usr/local/lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.so
+
+preprocessor ftp_telnet: global \
+inspection_type stateless
+preprocessor ftp_telnet_protocol: ftp server default \
+  ports { 21 } \
+  def_max_param_len 100 \
+  ftp_cmds { USER PASS ACCT CWD CDUP SMNT \
+    QUIT REIN PORT PASV TYPE STRU MODE RETR STOR STOU APPE ALLO REST \
+    RNFR RNTO ABOR DELE RMD MKD PWD LIST NLST SITE SYST STAT HELP NOOP } \
+  ftp_cmds { AUTH ADAT PROT PBSZ CONF ENC } \
+  ftp_cmds { FEAT OPTS } \
+  ftp_cmds { MDTM REST SIZE MLST MLSD } \
+  alt_max_param_len 0 { CDUP QUIT REIN PASV STOU ABOR PWD SYST NOOP } \
+  cmd_validity MODE < char SBC > \
+  cmd_validity STRU < char FRP > \
+  cmd_validity ALLO < int [ char R int ] > \
+  cmd_validity TYPE < { char AE [ char NTC ] | char I | char L [ number ] } > \
+  cmd_validity PORT < host_port > 
+
+preprocessor ftp_telnet_protocol: ftp client default \
+   max_resp_len 100
+
+#preprocessor telnet_decode
+
+
+dynamicpreprocessor file /usr/local/lib/snort/dynamicpreprocessor/libsf_smtp_preproc.so 
+
+
+preprocessor smtp: \
+  ports { 25 } \
+  inspection_type stateful \
+  normalize cmds \
+  normalize_cmds { EXPN VRFY RCPT } \
+  alt_max_command_line_len 260 { MAIL } \
+  alt_max_command_line_len 300 { RCPT } \
+  alt_max_command_line_len 500 { HELP HELO ETRN } \
+  alt_max_command_line_len 255 { EXPN VRFY }
+
+
+
+
 
 #sf Portscan
 preprocessor sfportscan: proto { all } \
@@ -612,4 +667,4 @@ function snort_advanced() {
 	sync_package_snort();
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/pkg_config.xml b/pkg_config.xml
index 6aa56205..730aacde 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -253,7 +253,7 @@
       <depends_on_package_base_url>http://www.pfsense.com/mirrors/packages/All/</depends_on_package_base_url>
       <depends_on_package>snort-2.7.0.1_1.tbz</depends_on_package>
       <config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
-      <version>2.7.0.1_2</version>
+      <version>2.7.0.1_3</version>
       <required_version>1.0</required_version>
       <status>STABLE</status>
       <configurationfile>snort.xml</configurationfile>