IPFire-SCM June 2010

ipfire-scm@lists.ipfire.org

1 participants
87 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ed51f39bcadab76339c6731922a98822e26da3f4
by git＠ipfire.org 16 Jun '10

16 Jun '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 405401cba4cdc65b411474c9f7c628c490aed9db
by git＠ipfire.org 16 Jun '10

16 Jun '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 19a1dfbc7148b67f718afdd14e3c75dcf6ff17f2
by git＠ipfire.org 15 Jun '10

15 Jun '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ce0e83b3badfd2b4048762ffffc8041c7f92cb19
by git＠ipfire.org 14 Jun '10

14 Jun '10

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(a)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=$sn…'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz"; } else { - $url="http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Ru…"; + $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.*!\[\$DNS_SERVERS|#&|g' $file + sed -i 's|^alert.*!\$SSH_PORTS|#&|g' $file + sed -i 's|^alert.*!\$HOME_NET|#&|g' $file + sed -i 's|^alert.*!\$SQL_SERVERS|#&|g' $file + done + for DEVICE in $DEVICES; do boot_mesg "Starting Intrusion Detection System on $DEVICE..." /usr/sbin/snort -c /etc/snort/snort.conf -i $DEVICE -D -l /var/log/snort --create-pidfile --nolock-pidfile --pid-path /var/run/ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 535732392737e14f44a1595feafcb844396a7cc1
by git＠ipfire.org 14 Jun '10

14 Jun '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7f7a897ae4c1899d89ab62744869180bc46755fa
by git＠ipfire.org 13 Jun '10

13 Jun '10

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 3.x development tree". The branch, master has been updated via 7f7a897ae4c1899d89ab62744869180bc46755fa (commit) via 9e42c68ccd33ce471b14d48842c129421f1d6090 (commit) via 55703686f02eae5801874d5070e6373c967f27d4 (commit) from 920306ed5c25f95aeb7ed86498b120a4114bc00b (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 7f7a897ae4c1899d89ab62744869180bc46755fa Merge: 920306ed5c25f95aeb7ed86498b120a4114bc00b 9e42c68ccd33ce471b14d48842c129421f1d6090 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 12 00:50:46 2010 +0200 Merge commit 'stevee/initscripts' into next commit 9e42c68ccd33ce471b14d48842c129421f1d6090 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Jun 11 17:23:48 2010 +0200 initscript: cleanfs, pre-start script should only be script. commit 55703686f02eae5801874d5070e6373c967f27d4 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Jun 11 17:07:12 2010 +0200 acpid: Add upstart job file. ----------------------------------------------------------------------- Summary of changes: pkgs/core/acpid/acpid.init | 8 ++++++++ pkgs/core/initscripts/init/cleanfs.conf | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) create mode 100644 pkgs/core/acpid/acpid.init Difference in files: diff --git a/pkgs/core/acpid/acpid.init b/pkgs/core/acpid/acpid.init new file mode 100644 index 0000000..2ee510b --- /dev/null +++ b/pkgs/core/acpid/acpid.init @@ -0,0 +1,8 @@ +description "Start the ACPI daemon" +author "IPFire Team" + +start on stopped mountfs +stop on shutdown or reboot + +exec /usr/sbin/acpid -f +respawn diff --git a/pkgs/core/initscripts/init/cleanfs.conf b/pkgs/core/initscripts/init/cleanfs.conf index 43a70d8..c0f5606 100644 --- a/pkgs/core/initscripts/init/cleanfs.conf +++ b/pkgs/core/initscripts/init/cleanfs.conf @@ -3,6 +3,6 @@ author "IPFire Team" start on stopping mountfs -pre-start script +script rm -rf /tmp/* /var/{lock,run}/* end script hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. b86d9c0a17ef31d3ddbc87be83703bac1d2a432b
by git＠ipfire.org 13 Jun '10

13 Jun '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f370c68ce3e5b4abf3efaa0a3a3d48269c28ed61
by git＠ipfire.org 13 Jun '10

13 Jun '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9ed81c4116805d454563e95e29cf8bec38105ce4
by git＠ipfire.org 13 Jun '10

13 Jun '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1fe0b6bd6ccdaedd807d4ef9060441f9223d71f6
by git＠ipfire.org 13 Jun '10

13 Jun '10

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2010