From 745d9c0717cc9bbf92e9d2a9fa48da7cc55ca3ba Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 2 Feb 2013 09:50:49 +0100 Subject: [PATCH] Revert "Revert "snort: Update to 2.9.4."" This reverts commit f17d112c0480e951771bdca5f5eace7592ecd2c2. --- config/rootfiles/common/daq | 6 +++--- config/rootfiles/common/snort | 4 +++- config/rootfiles/core/65/filelists/snort | 1 + html/cgi-bin/ids.cgi | 4 ++-- lfs/daq | 4 ++-- lfs/snort | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) create mode 120000 config/rootfiles/core/65/filelists/snort diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq index b23fd19139..10ec777b26 100644 --- 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.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 diff --git a/config/rootfiles/common/snort b/config/rootfiles/common/snort index 90233a181c..8404486533 100644 --- a/config/rootfiles/common/snort +++ b/config/rootfiles/common/snort @@ -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 index 0000000000..9406ce01c7 --- /dev/null +++ b/config/rootfiles/core/65/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index efbc3dedcd..c5fb4c6c76 100644 --- 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-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 a0f7b2523c..cac012bec4 100644 --- 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) diff --git a/lfs/snort b/lfs/snort index 98c232d0ef..950b319caf 100644 --- 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) -- 2.39.2