[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bef4096f65580b95f
From:       git () ipfire ! org (Christian Schmidt)
Date:       2010-08-27 18:04:45
Message-ID: 20100827180445.DFDB120351 () argus ! ipfire ! org
[Download RAW message or body]

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  bef4096f65580b95f585194c0341a08e6efcb77c (commit)
       via  e050adc8c1ef7082c0d26fab4b999f83d35db303 (commit)
      from  363a19ee8c387706bc6a6a7c1a9f822e68d6f7dc (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 bef4096f65580b95f585194c0341a08e6efcb77c
Author: Christian Schmidt <christian.schmidt at ipfire.org>
Date:   Fri Aug 27 20:04:09 2010 +0200

    This fixes bug #0000707 new extra chain for guardian.

commit e050adc8c1ef7082c0d26fab4b999f83d35db303
Author: Christian Schmidt <christian.schmidt at ipfire.org>
Date:   Fri Aug 27 20:03:44 2010 +0200

    Added a new chain for guardian blocks.

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

Summary of changes:
 config/guardian/guardian_block.sh        |    2 +-
 config/guardian/guardian_unblock.sh      |    2 +-
 config/rootfiles/core/40/filelists/files |    1 +
 lfs/guardian                             |    2 +-
 src/initscripts/init.d/firewall          |    2 ++
 5 files changed, 6 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/guardian/guardian_block.sh b/config/guardian/guardian_block.sh
index bc344d1..0a44325 100644
--- a/config/guardian/guardian_block.sh
+++ b/config/guardian/guardian_block.sh
@@ -8,4 +8,4 @@
 # done inside guardian itself.
 source=$1
 
-/sbin/iptables -I INPUT -s $source -j DROP
+/sbin/iptables -I GUARDIANINPUT -s $source -j DROP
diff --git a/config/guardian/guardian_unblock.sh b/config/guardian/guardian_unblock.sh
index 5e0b379..e0d3b5d 100644
--- a/config/guardian/guardian_unblock.sh
+++ b/config/guardian/guardian_unblock.sh
@@ -6,4 +6,4 @@
 # and the script will issue a command to remove the block that was created with # block.sh address. 
 source=$1
 
-/sbin/iptables -D INPUT -s $source -j DROP
+/sbin/iptables -D GUARDIANINPUT -s $source -j DROP
diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files
index dcb7b79..7375f0f 100644
--- a/config/rootfiles/core/40/filelists/files
+++ b/config/rootfiles/core/40/filelists/files
@@ -6,6 +6,7 @@ var/ipfire/langs/es.pl
 var/ipfire/langs/fr.pl
 var/ipfire/dhcp/dhcpd.conf.local
 etc/rc.d/init.d/dnsmasq
+etc/rc.d/init.d/firewall
 etc/rc.d/init.d/functions
 srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/dhcp.cgi
diff --git a/lfs/guardian b/lfs/guardian
index e08a469..65f14cb 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -30,7 +30,7 @@ THISAPP    = guardian-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = guardian
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index a2b3fd0..c38cce5 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -140,6 +140,8 @@ case "$1" in
 	# CUSTOM chains, can be used by the users themselves
 	/sbin/iptables -N CUSTOMINPUT
 	/sbin/iptables -A INPUT -j CUSTOMINPUT
+	/sbin/iptables -N GUARDIANINPUT
+	/sbin/iptables -A INPUT -j GUARDIANINPUT
 	/sbin/iptables -N CUSTOMFORWARD
 	/sbin/iptables -A FORWARD -j CUSTOMFORWARD
 	/sbin/iptables -N CUSTOMOUTPUT


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

[prev in list] [next in list] [prev in thread] [next in thread]