Revert "snort: Update to 2.9.4."

This reverts commit 7c8301fb8a501d03e47923bf7eb321330b663736.
reverted because sourcefire has not released the rules for
non-paying user yet. Will readded to IPFire 2.13 soon.

diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq
index 10ec777b266d3e3cf2693a3c73e5fb8c64f32473..b23fd1913929a2ee08210843104b5e87a0295a0c 100644 (file)
--- a/config/rootfiles/common/daq
+++ b/config/rootfiles/common/daq
@@ -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.2
-usr/lib/libdaq.so.2.0.0
+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

diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort
index 8404486533e062ffa2da128216971a4afc7880ff..90233a181cc12256a4369d6252773ffe249c1755 100644 (file)
--- a/config/rootfiles/common/snort
+++ b/config/rootfiles/common/snort
@@ -26,10 +26,9 @@ 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
@@ -179,7 +178,6 @@ 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
deleted file mode 120000 (symlink)
index 9406ce0..0000000
--- a/config/rootfiles/core/65/filelists/snort
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/snort
\ No newline at end of file

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index c5fb4c6c762150e95f2c40feed454e7319fc4b78..efbc3dedcd837a7a5144c6fa3945245875370292 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -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-294_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-294.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 cac012bec4b84416581f54bf2e921529453a318e..a0f7b2523cad5f03756f87710356cd47bcc0dd6b 100644 (file)
--- a/lfs/daq
+++ b/lfs/daq
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.0
+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 = a00855a153647df76d47f1ea454f74ae
+$(DL_FILE)_MD5 = bc204ea09165b4ecbb1bb49c7c1a2ad4
 
 install : $(TARGET)
 

diff --git a/lfs/snort b/lfs/snort
index 950b319caff5c31f0191e736e429c055bb30f358..98c232d0ef53ea4315789c96e35ec765d0c8eb3d 100644 (file)
--- a/lfs/snort
+++ b/lfs/snort
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.9.4
+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 = e79ee6b4fbb32edc5dfed2d7dfcc6813
+$(DL_FILE)_MD5 = b2102605a7ca023ad6a2429821061c29
 
 install : $(TARGET)