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, fifteen has been updated via 1ad5c2fa0713024dce7c14c7b5bd008e3f128cf3 (commit) via 8ecb64505dc79a02c6599bd728f8393eb1146da9 (commit) from 8789de86786951f4a6e8f625a4f8ebdb5b6727c4 (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 1ad5c2fa0713024dce7c14c7b5bd008e3f128cf3 Merge: 8789de8 8ecb645 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 23 14:59:56 2013 +0100

Merge remote-tracking branch 'amarx/firewall-beta10' into fifteen

commit 8ecb64505dc79a02c6599bd728f8393eb1146da9 Author: Alexander Marx amarx@ipfire.org Date: Mon Dec 23 14:52:33 2013 +0100

Firewall: Edited update.sh for fifteen core update

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

Summary of changes: config/rootfiles/core/fifteen/update.sh | 5 +++++ 1 file changed, 5 insertions(+)

Difference in files: diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh index 229fc2e..c2c58f6 100644 --- a/config/rootfiles/core/fifteen/update.sh +++ b/config/rootfiles/core/fifteen/update.sh @@ -52,6 +52,11 @@ rm -f /etc/rc.d/init.d/networking/red.up/26-xtaccess # Remove old CGI files rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi

+# Generate chains for new firewall +/sbin/iptables -N INPUTFW +/sbin/iptables -N FORWARDFW +/sbin/iptables -N OUTGOINGFW + # Convert firewall configuration /usr/sbin/convert-xtaccess /usr/sbin/convert-outgoingfw

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