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 109a1ec7d488dbb36c236f9d9cd0629764c52e17 (commit) via 58d2aa5582cdf2c6f99071178be09fd2cee1ff73 (commit) via c7bfbdc2ef1c29d357c5d0def038637b8c9c7387 (commit) from beb726d82b7705190288b26a743665b50bba99ea (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 109a1ec7d488dbb36c236f9d9cd0629764c52e17 Merge: 58d2aa5 beb726d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jan 31 23:09:22 2011 +0100

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

commit 58d2aa5582cdf2c6f99071178be09fd2cee1ff73 Merge: 24c0b6a c7bfbdc Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jan 31 23:09:04 2011 +0100

Merge branch 'core45'

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/45/update.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh index 64be6d3..228ada4 100644 --- a/config/rootfiles/core/45/update.sh +++ b/config/rootfiles/core/45/update.sh @@ -48,6 +48,10 @@ extract_files sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp fcrontab /var/tmp/root.tmp

+# Disable snort packet decoding alerts +sed -i "s|#config disable_decode_alerts|config disable_decode_alerts|g" /etc/snort/snort.conf +sed -i "s|#config disable_tcpopt_alerts|config disable_tcpopt_alerts|g" /etc/snort/snort.conf + # #Start services echo Starting Proxy

hooks/post-receive -- IPFire 2.x development tree