Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 3 Nov 2012 16:04:23 +0000 (17:04 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 3 Nov 2012 16:04:23 +0000 (17:04 +0100)
Conflicts:
make.sh

13 files changed:
config/rootfiles/common/daq
config/rootfiles/common/snort
config/rootfiles/core/64/exclude [new file with mode: 0644]
config/rootfiles/core/64/filelists/daq [new symlink]
config/rootfiles/core/64/filelists/files [new file with mode: 0644]
config/rootfiles/core/64/filelists/snort [new symlink]
config/rootfiles/core/64/meta [new file with mode: 0644]
config/rootfiles/core/64/update.sh [new file with mode: 0644]
config/snort/snort.conf
html/cgi-bin/ids.cgi
lfs/daq
lfs/snort
make.sh

index 0391a4b..e68cee4 100644 (file)
@@ -17,17 +17,19 @@ usr/lib/daq
 #usr/lib/daq/daq_nfq.so
 #usr/lib/daq/daq_pcap.la
 #usr/lib/daq/daq_pcap.so
-usr/lib/libdaq.a
-usr/lib/libdaq.la
-usr/lib/libdaq.so
-usr/lib/libdaq.so.0
-usr/lib/libdaq.so.0.0.1
-usr/lib/libdaq_static.a
-usr/lib/libdaq_static.la
-usr/lib/libdaq_static_modules.a
-usr/lib/libdaq_static_modules.la
-usr/lib/libsfbpf.a
-usr/lib/libsfbpf.la
-usr/lib/libsfbpf.so
-usr/lib/libsfbpf.so.0
-usr/lib/libsfbpf.so.0.0.1
+#usr/lib/libdaq.a
+#usr/lib/libdaq.la
+#usr/lib/libdaq.so
+#usr/lib/libdaq.so.1
+#usr/lib/libdaq.so.1.0.0
+#usr/lib/libdaq_static.a
+#usr/lib/libdaq_static.la
+#usr/lib/libdaq_static_modules.a
+#usr/lib/libdaq_static_modules.la
+#usr/lib/libsfbpf.a
+#usr/lib/libsfbpf.la
+#usr/lib/libsfbpf.so
+#usr/lib/libsfbpf.so.0
+#usr/lib/libsfbpf.so.0.0.1
+#usr/lib/libdaq.so.0
+#usr/lib/libdaq.so.0.0.1
index e07d6b5..90233a1 100644 (file)
@@ -7,7 +7,26 @@ etc/snort/unicode.map
 usr/bin/u2boat
 usr/bin/u2spewfoo
 #usr/include/snort
+#usr/include/snort/dynamic_output
+#usr/include/snort/dynamic_output/bitop.h
+#usr/include/snort/dynamic_output/ipv6_port.h
+#usr/include/snort/dynamic_output/obfuscation.h
+#usr/include/snort/dynamic_output/output_api.h
+#usr/include/snort/dynamic_output/output_common.h
+#usr/include/snort/dynamic_output/output_lib.h
+#usr/include/snort/dynamic_output/preprocids.h
+#usr/include/snort/dynamic_output/sfPolicy.h
+#usr/include/snort/dynamic_output/sf_dynamic_common.h
+#usr/include/snort/dynamic_output/sf_ip.h
+#usr/include/snort/dynamic_output/sf_protocols.h
+#usr/include/snort/dynamic_output/sf_snort_packet.h
+#usr/include/snort/dynamic_output/sfrt.h
+#usr/include/snort/dynamic_output/sfrt_dir.h
+#usr/include/snort/dynamic_output/sfrt_trie.h
+#usr/include/snort/dynamic_output/snort_debug.h
+#usr/include/snort/dynamic_output/stream_api.h
 #usr/include/snort/dynamic_preproc
+#usr/include/snort/dynamic_preproc/attribute_table_api.h
 #usr/include/snort/dynamic_preproc/bitop.h
 #usr/include/snort/dynamic_preproc/cpuclock.h
 #usr/include/snort/dynamic_preproc/idle_processing.h
@@ -30,6 +49,7 @@ usr/bin/u2spewfoo
 #usr/include/snort/dynamic_preproc/sf_preproc_info.h
 #usr/include/snort/dynamic_preproc/sf_protocols.h
 #usr/include/snort/dynamic_preproc/sf_sdlist_types.h
+#usr/include/snort/dynamic_preproc/sf_seqnums.h
 #usr/include/snort/dynamic_preproc/sf_snort_packet.h
 #usr/include/snort/dynamic_preproc/sf_snort_plugin_api.h
 #usr/include/snort/dynamic_preproc/sfcommon.h
@@ -44,58 +64,89 @@ usr/bin/u2spewfoo
 #usr/include/snort/dynamic_preproc/ssl.h
 #usr/include/snort/dynamic_preproc/str_search.h
 #usr/include/snort/dynamic_preproc/stream_api.h
-usr/lib/pkgconfig/snort.pc
-usr/lib/pkgconfig/snort_preproc.pc
+#usr/lib/pkgconfig/snort.pc
+#usr/lib/pkgconfig/snort_output.pc
+#usr/lib/pkgconfig/snort_preproc.pc
 #usr/lib/snort
+usr/lib/snort/dynamic_output
+#usr/lib/snort/dynamic_output/libsf_dynamic_output.a
+#usr/lib/snort/dynamic_output/libsf_dynamic_output.la
 usr/lib/snort/dynamic_preproc
 #usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.a
 #usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.la
 usr/lib/snort_dynamicengine
+#usr/lib/snort_dynamicengine/libsf_engine.a
 #usr/lib/snort_dynamicengine/libsf_engine.la
 #usr/lib/snort_dynamicengine/libsf_engine.so
 #usr/lib/snort_dynamicengine/libsf_engine.so.0
 #usr/lib/snort_dynamicengine/libsf_engine.so.0.0.0
 usr/lib/snort_dynamicpreprocessor
+#usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0
 #usr/lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.a
+#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.la
+#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.so
+#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.so.0
+#usr/lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.so.0
 #usr/lib/snort_dynamicpreprocessor/libsf_dns_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0
 #usr/lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.a
+#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.la
+#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.so
+#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.so.0
+#usr/lib/snort_dynamicpreprocessor/libsf_gtp_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so.0
 #usr/lib/snort_dynamicpreprocessor/libsf_imap_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.a
+#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.la
+#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.so
+#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.so.0
+#usr/lib/snort_dynamicpreprocessor/libsf_modbus_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so.0
 #usr/lib/snort_dynamicpreprocessor/libsf_pop_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so.0
 #usr/lib/snort_dynamicpreprocessor/libsf_reputation_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so.0
 #usr/lib/snort_dynamicpreprocessor/libsf_sdf_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so.0
 #usr/lib/snort_dynamicpreprocessor/libsf_sip_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so.0
 #usr/lib/snort_dynamicpreprocessor/libsf_smtp_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.so.0
 #usr/lib/snort_dynamicpreprocessor/libsf_ssh_preproc.so.0.0.0
+#usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.a
 #usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.la
 #usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.so
 #usr/lib/snort_dynamicpreprocessor/libsf_ssl_preproc.so.0
@@ -109,7 +160,7 @@ usr/sbin/snort
 #usr/share/doc/snort/NEWS
 #usr/share/doc/snort/PROBLEMS
 #usr/share/doc/snort/README
-#usr/share/doc/snort/README.ARUBA
+#usr/share/doc/snort/README.GTP
 #usr/share/doc/snort/README.PLUGINS
 #usr/share/doc/snort/README.PerfProfiling
 #usr/share/doc/snort/README.SMTP
@@ -121,10 +172,10 @@ usr/sbin/snort
 #usr/share/doc/snort/README.counts
 #usr/share/doc/snort/README.csv
 #usr/share/doc/snort/README.daq
-#usr/share/doc/snort/README.database
 #usr/share/doc/snort/README.dcerpc2
 #usr/share/doc/snort/README.decode
 #usr/share/doc/snort/README.decoder_preproc_rules
+#usr/share/doc/snort/README.dnp3
 #usr/share/doc/snort/README.dns
 #usr/share/doc/snort/README.event_queue
 #usr/share/doc/snort/README.filters
@@ -136,6 +187,7 @@ usr/sbin/snort
 #usr/share/doc/snort/README.imap
 #usr/share/doc/snort/README.ipip
 #usr/share/doc/snort/README.ipv6
+#usr/share/doc/snort/README.modbus
 #usr/share/doc/snort/README.multipleconfigs
 #usr/share/doc/snort/README.normalize
 #usr/share/doc/snort/README.pcap_readmode
@@ -153,6 +205,7 @@ usr/sbin/snort
 #usr/share/doc/snort/README.tag
 #usr/share/doc/snort/README.thresholding
 #usr/share/doc/snort/README.u2boat
+#usr/share/doc/snort/README.unified2
 #usr/share/doc/snort/README.variables
 #usr/share/doc/snort/TODO
 #usr/share/doc/snort/USAGE
diff --git a/config/rootfiles/core/64/exclude b/config/rootfiles/core/64/exclude
new file mode 100644 (file)
index 0000000..b6a8d1d
--- /dev/null
@@ -0,0 +1,13 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/core/64/filelists/daq b/config/rootfiles/core/64/filelists/daq
new file mode 120000 (symlink)
index 0000000..d0e0956
--- /dev/null
@@ -0,0 +1 @@
+../../../common/daq
\ No newline at end of file
diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/core/64/filelists/files
new file mode 100644 (file)
index 0000000..26308b4
--- /dev/null
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
diff --git a/config/rootfiles/core/64/filelists/snort b/config/rootfiles/core/64/filelists/snort
new file mode 120000 (symlink)
index 0000000..9406ce0
--- /dev/null
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/core/64/meta b/config/rootfiles/core/64/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/64/update.sh b/config/rootfiles/core/64/update.sh
new file mode 100644 (file)
index 0000000..00394d1
--- /dev/null
@@ -0,0 +1,82 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2012 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=64
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/snort stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/snort start
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#arch=`uname -m`
+#if [ ${arch::3} == "arm" ]; then
+#      depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1
+#      depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1
+#else
+#      depmod -a 2.6.32.45-ipfire     >/dev/null 2>&1
+#      depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#      depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+#fi
+
+
+#Rebuild initrd's because some compat-wireless modules are inside
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
index 0ce0140..ea9f81f 100644 (file)
@@ -42,7 +42,7 @@ ipvar FTP_SERVERS $HOME_NET
 ipvar SIP_SERVERS $HOME_NET
 
 # List of ports you run web servers on
-portvar HTTP_PORTS [80,81,311,444,591,593,901,1220,1414,1830,2301,2381,2809,3128,3702,5250,7001,7777,7779,8000,8008,8028,8080,8088,8118,8123,8180,8181,8243,8280,8888,9090,9091,9443,9999,11371]
+portvar HTTP_PORTS [80,81,311,444,591,593,901,1220,1414,1830,2301,2381,2809,3128,3702,5250,7001,7777,7779,8000,8008,8028,8080,8088,8118,8123,8180,8181,8243,8280,8888,9090,9091,9443,9999,11371,50002,55555]
 
 # List of ports you want to look for SHELLCODE on.
 portvar SHELLCODE_PORTS !80
@@ -59,6 +59,12 @@ portvar FTP_PORTS [21,2100,3535]
 # List of ports you run SIP servers on
 portvar SIP_PORTS [5060,5061,5600]
 
+# List of file data ports for file inspection
+portvar FILE_DATA_PORTS [$HTTP_PORTS,110,143]
+
+# List of GTP ports for GTP preprocessor
+portvar GTP_PORTS [2123,2152,3386]
+
 # other variables, these should not be modified
 ipvar AIM_SERVERS [64.12.24.0/23,64.12.28.0/23,64.12.161.0/24,64.12.163.0/24,64.12.200.0/24,205.188.3.0/24,205.188.5.0/24,205.188.7.0/24,205.188.9.0/24,205.188.153.0/24,205.188.179.0/24,205.188.248.0/24]
 
@@ -157,6 +163,13 @@ config detection: search-method ac-split search-optimize max-pattern-len 20
 # Configure the event queue.  For more information, see README.event_queue
 config event_queue: max_queue 8 log 3 order_events content_length
 
+###################################################
+## Configure GTP if it is to be used.
+## For more information, see README.GTP
+####################################################
+
+# config enable_gtp
+
 ###################################################
 # Per packet and rule latency enforcement
 # For more information see README.ppm
@@ -182,6 +195,12 @@ config event_queue: max_queue 8 log 3 order_events content_length
 #config profile_rules: print all, sort avg_ticks
 #config profile_preprocs: print all, sort avg_ticks
 
+###################################################
+# Configure protocol aware flushing
+# For more information see README.stream5
+###################################################
+config paf_max: 16000
+
 ###################################################
 # Step #4: Configure dynamic loaded libraries.  
 # For more information, see Snort Manual, Configuring Snort - Dynamic Modules
@@ -201,6 +220,9 @@ dynamicengine /usr/lib/snort_dynamicengine/libsf_engine.so
 # For more information, see the Snort Manual, Configuring Snort - Preprocessors
 ###################################################
 
+# GTP Control Channle Preprocessor. For more information, see README.GTP
+# preprocessor gtp: ports { 2123 3386 2152 }
+
 # Inline packet normalization. For more information, see README.normalize
 # Does nothing in IDS mode
 preprocessor normalize_ip4
@@ -228,7 +250,7 @@ preprocessor stream5_tcp: policy windows, detect_anomalies, require_3whs 180, \
         7000 8181 32770 32771 32772 32773 32774 32775 32776 32777 32778 32779, \
     ports both 80 81 311 443 465 563 591 593 636 901 989 992 993 994 995 1220 1414 1830 2301 2381 2809 3128 3702 5250 7907 7001 7802 7777 7779 \
         7801 7900 7901 7902 7903 7904 7905 7906 7908 7909 7910 7911 7912 7913 7914 7915 7916 \
-        7917 7918 7919 7920 8000 8008 8028 8080 8088 8118 8123 8180 8243 8280 8888 9090 9091 9443 9999 11371
+        7917 7918 7919 7920 8000 8008 8028 8080 8088 8118 8123 8180 8243 8280 8888 9090 9091 9443 9999 11371 50002 55555
 preprocessor stream5_udp: timeout 180
 
 # performance statistics.  For more information, see the Snort Manual, Configuring Snort - Preprocessors - Performance Monitor
@@ -237,6 +259,7 @@ preprocessor stream5_udp: timeout 180
 # HTTP normalization and anomaly detection.  For more information, see README.http_inspect
 preprocessor http_inspect: global iis_unicode_map unicode.map 1252 compress_depth 65535 decompress_depth 65535
 preprocessor http_inspect_server: server default \
+    http_methods { GET POST PUT SEARCH MKCOL COPY MOVE LOCK UNLOCK NOTIFY POLL BCOPY BDELETE BMOVE LINK UNLINK OPTIONS HEAD DELETE TRACE TRACK CONNECT SOURCE SUBSCRIBE UNSUBSCRIBE PROPFIND PROPPATCH BPROPFIND BPROPPATCH RPC_CONNECT PROXY_SUCCESS BITS_POST CCM_POST SMS_POST RPC_IN_DATA RPC_OUT_DATA RPC_ECHO_DATA } \
     chunk_length 500000 \
     server_flow_depth 0 \
     client_flow_depth 0 \
@@ -244,13 +267,16 @@ preprocessor http_inspect_server: server default \
     oversize_dir_length 500 \
     max_header_length 750 \
     max_headers 100 \
-    ports { 80 81 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702 5250 7001 7777 7779 8000 8008 8028 8080 8088 8118 8123 8180 8181 8243 8280 8888 9090 9091 9443 9999 11371 } \
+    max_spaces 200 \
+    small_chunk_length { 10 5 } \
+    ports { 80 81 311 591 593 901 1220 1414 1830 2301 2381 2809 3128 3702 5250 7001 7777 7779 8000 8008 8028 8080 8088 8118 8123 8180 8181 8243 8280 8888 9090 9091 9443 9999 11371 50002 55555 } \
     non_rfc_char { 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 } \
     enable_cookie \
     extended_response_inspection \
     inspect_gzip \
     normalize_utf \
     unlimited_decompress \
+    normalize_javascript \
     apache_whitespace no \
     ascii no \
     bare_byte no \
@@ -271,7 +297,7 @@ preprocessor rpc_decode: 111 32770 32771 32772 32773 32774 32775 32776 32777 327
 preprocessor bo
 
 # FTP / Telnet normalization and anomaly detection.  For more information, see README.ftptelnet
-preprocessor ftp_telnet: global inspection_type stateful encrypted_traffic no
+preprocessor ftp_telnet: global inspection_type stateful encrypted_traffic no check_encrypted
 preprocessor ftp_telnet_protocol: telnet \
     ayt_attack_thresh 20 \
     normalize ports { 23 } \
@@ -431,6 +457,14 @@ preprocessor pop: \
    bitenc_decode_depth 0 \
    uu_decode_depth 0
 
+# Modbus preprocessor. For more information see README.modbus
+preprocessor modbus: ports { 502 }
+
+# DNP3 preprocessor. For more information see README.dnp3
+preprocessor dnp3: ports { 20000 } \
+   memcap 262144 \
+   check_crc
+
 ###################################################
 # Step #6: Configure output plugins
 # For more information, see Snort Manual, Configuring Snort - Output Modules
index 31b8730..efbc3de 100644 (file)
@@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") {
 #######################  End added for snort rules control  #################################
 
 if ($snortsettings{'RULES'} eq 'subscripted') {
-       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2912_s.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931_s.tar.gz/$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
-       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2912.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931.tar.gz/$snortsettings{'OINKCODE'}";
 } else {
        $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz";
 }
diff --git a/lfs/daq b/lfs/daq
index df35661..a0f7b25 100644 (file)
--- a/lfs/daq
+++ b/lfs/daq
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.6.2
+VER        = 1.1.1
 
 THISAPP    = daq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6ea8aaa6f067f8b8ef6de45b95d55875
+$(DL_FILE)_MD5 = bc204ea09165b4ecbb1bb49c7c1a2ad4
 
 install : $(TARGET)
 
index 8b69397..98c232d 100644 (file)
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.1.2
+VER        = 2.9.3.1
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9e94f20b934566469c239966e1b41eba
+$(DL_FILE)_MD5 = b2102605a7ca023ad6a2429821061c29
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 59b8d51..55684d5 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
-CORE="63"                                                      # Core Level (Filename)
+CORE="64"                                                      # Core Level (Filename)
 PAKFIRE_CORE="63"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan