[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ce0e83b3badfd2b4048762ffffc8041c7f92cb19
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via ce0e83b3badfd2b4048762ffffc8041c7f92cb19 (commit) from 535732392737e14f44a1595feafcb844396a7cc1 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit ce0e83b3badfd2b4048762ffffc8041c7f92cb19 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jun 14 19:00:26 2010 +0200
Replaced snort gpl community rules by emergingthreats.net rules.
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/ids.cgi | 7 ++++++- langs/de/cgi-bin/de.pl | 4 ++-- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- src/initscripts/init.d/snort | 8 ++++++++ 6 files changed, 19 insertions(+), 6 deletions(-)
Difference in files: diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 02e0adf..353643d 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -268,7 +268,7 @@ if ($snortsettings{'RULES'} eq 'subscripted') { $url="http://dl.snort.org/reg-rules/snortrules-snapshot-2860.tar.gz?oink_code=$sno..."; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings%7B%27OINKCODE%27%..."; } else { - $url="http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rul..."; + $url="http://www.emergingthreats.net/rules/emerging.rules.tar.gz"; }
if ($snortsettings{'ACTION'} eq $Lang::tr{'save'} && $snortsettings{'ACTION2'} eq "snort" ) @@ -559,6 +559,11 @@ if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable foreach my $rulefile (sort keys(%snortrules)) { my $rulechecked = '';
+ # Hide inkompatible Block rules + if ($rulefile =~'-BLOCK.rules') { + next; + } + # Check if reached half-way through rule file rules to start new column if ($ruledisplaycnt > $rulecnt) { print "</TABLE></TD><TD VALIGN='TOP'><TABLE>"; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 00f95f2..9572e7a 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -483,7 +483,7 @@ 'clock last synchronized at' => 'Die Uhr wurde zuletzt synchronisiert um', 'comment' => 'Kommentar', 'common name' => 'Gemeinsamer Name', -'community rules' => 'Snort GPL Community Rules', +'community rules' => 'Emergingthreats.net Community Rules', 'comp-lzo' => 'LZO-Kompression', 'compression' => 'Kompression:', 'computer to modem rate' => 'Übertragungsrate zwischen Computer und Modem:', @@ -919,7 +919,7 @@ 'intrusion detection' => 'Einbruchdetektierung', 'intrusion detection system' => 'Intrusion Detection System', 'intrusion detection system log viewer' => 'Betrachter der IDS-Logfiles', -'intrusion detection system rules' => 'Íntrusion Detection System Regeln', +'intrusion detection system rules' => 'Intrusion Detection System Regeln', 'intrusion detection system2' => 'Intrusion Detection System:', 'invalid broadcast ip' => 'Ungültige Broadcast-IP', 'invalid cache size' => 'Ungültige Cache-Größe.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index dab1b94..9e00a60 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -507,7 +507,7 @@ 'clock last synchronized at' => 'Clock was last synchronized at', 'comment' => 'Description:', 'common name' => 'Common name', -'community rules' => 'Snort GPL Community Rules', +'community rules' => 'Emergingthreats.net Community Rules', 'comp-lzo' => 'LZO-Compression:', 'compression' => 'Compression:', 'computer to modem rate' => 'Computer to modem rate:', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index dab1b94..9e00a60 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -507,7 +507,7 @@ 'clock last synchronized at' => 'Clock was last synchronized at', 'comment' => 'Description:', 'common name' => 'Common name', -'community rules' => 'Snort GPL Community Rules', +'community rules' => 'Emergingthreats.net Community Rules', 'comp-lzo' => 'LZO-Compression:', 'compression' => 'Compression:', 'computer to modem rate' => 'Computer to modem rate:', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 7c8c4f7..4f8a7b9 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -507,7 +507,7 @@ 'clock last synchronized at' => 'Clock was last synchronized at', 'comment' => 'Description:', 'common name' => 'Common name', -'community rules' => 'Snort GPL Community Rules', +'community rules' => 'Emergingthreats.net Community Rules', 'comp-lzo' => 'LZO-Compression:', 'compression' => 'Compression:', 'computer to modem rate' => 'Computer to modem rate:', diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort index 981362a..2e2f4f2 100644 --- a/src/initscripts/init.d/snort +++ b/src/initscripts/init.d/snort @@ -62,6 +62,14 @@ fi
case "$1" in start) + # Disable incompatible rules + for file in $(ls /etc/snort/rules/*.rules); do + sed -i 's|^alert.*
git＠ipfire.org