Revert "Revert "snort: Update to 2.9.4.""
authorArne Fitzenreiter <Arne_F@ipfire.org>
Sat, 2 Feb 2013 08:50:49 +0000 (09:50 +0100)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Sat, 2 Feb 2013 08:50:49 +0000 (09:50 +0100)
This reverts commit f17d112c0480e951771bdca5f5eace7592ecd2c2.

config/rootfiles/common/daq
config/rootfiles/common/snort
config/rootfiles/core/65/filelists/snort [new symlink]
html/cgi-bin/ids.cgi
lfs/daq
lfs/snort

index b23fd19..10ec777 100644 (file)
@@ -1,4 +1,4 @@
-usr/bin/daq-modules-config
+#usr/bin/daq-modules-config
 #usr/include/daq.h
 #usr/include/daq_api.h
 #usr/include/daq_common.h
@@ -20,8 +20,8 @@ usr/lib/daq
 #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.so.2
+usr/lib/libdaq.so.2.0.0
 #usr/lib/libdaq_static.a
 #usr/lib/libdaq_static.la
 #usr/lib/libdaq_static_modules.a
index 90233a1..8404486 100644 (file)
@@ -26,9 +26,10 @@ usr/bin/u2spewfoo
 #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/file_api.h
+#usr/include/snort/dynamic_preproc/file_lib.h
 #usr/include/snort/dynamic_preproc/idle_processing.h
 #usr/include/snort/dynamic_preproc/ipv6_port.h
 #usr/include/snort/dynamic_preproc/mempool.h
@@ -178,6 +179,7 @@ usr/sbin/snort
 #usr/share/doc/snort/README.dnp3
 #usr/share/doc/snort/README.dns
 #usr/share/doc/snort/README.event_queue
+#usr/share/doc/snort/README.file
 #usr/share/doc/snort/README.filters
 #usr/share/doc/snort/README.flowbits
 #usr/share/doc/snort/README.frag3
diff --git a/config/rootfiles/core/65/filelists/snort b/config/rootfiles/core/65/filelists/snort
new file mode 120000 (symlink)
index 0000000..9406ce0
--- /dev/null
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file
index efbc3de..c5fb4c6 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-2931_s.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-294_s.tar.gz/$snortsettings{'OINKCODE'}";
 } elsif ($snortsettings{'RULES'} eq 'registered') {
-       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2931.tar.gz/$snortsettings{'OINKCODE'}";
+       $url=" http://www.snort.org/reg-rules/snortrules-snapshot-294.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 a0f7b25..cac012b 100644 (file)
--- a/lfs/daq
+++ b/lfs/daq
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.1
+VER        = 2.0.0
 
 THISAPP    = daq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bc204ea09165b4ecbb1bb49c7c1a2ad4
+$(DL_FILE)_MD5 = a00855a153647df76d47f1ea454f74ae
 
 install : $(TARGET)
 
index 98c232d..950b319 100644 (file)
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.3.1
+VER        = 2.9.4
 
 THISAPP    = snort-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b2102605a7ca023ad6a2429821061c29
+$(DL_FILE)_MD5 = e79ee6b4fbb32edc5dfed2d7dfcc6813
 
 install : $(TARGET)