[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. fac3861429d1b4c57c18ff13236d363d87fd31c0

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3696 bytes --]

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  fac3861429d1b4c57c18ff13236d363d87fd31c0 (commit)
       via  39962c6e3d83f88f63587f0ce2c1fb8c8cd7f2e1 (commit)
      from  7506baa2ebd5a6ceb92596f463f493f45a97661c (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 fac3861429d1b4c57c18ff13236d363d87fd31c0
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Thu Dec 12 15:44:45 2013 +0100

    Firewall: Bugfix: in /etc/init.d/firewall the REDNAT chain was affected BEFORE NAT_SOURCE. Outgoing SNAT rules where not working though

commit 39962c6e3d83f88f63587f0ce2c1fb8c8cd7f2e1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Dec 16 12:28:08 2013 +0100

    iptables: Update to 1.4.21.

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

Summary of changes:
 config/rootfiles/common/iptables | 1 +
 lfs/iptables                     | 4 ++--
 src/initscripts/init.d/firewall  | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
index 9077830..a0f1290 100644
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -76,6 +76,7 @@ lib/xtables
 #lib/xtables/libxt_RATEEST.so
 #lib/xtables/libxt_SECMARK.so
 #lib/xtables/libxt_SET.so
+#lib/xtables/libxt_SYNPROXY.so
 #lib/xtables/libxt_TCPMSS.so
 #lib/xtables/libxt_TCPOPTSTRIP.so
 #lib/xtables/libxt_TEE.so
diff --git a/lfs/iptables b/lfs/iptables
index f3fb708..5a1764b 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.20
+VER        = 1.4.21
 
 THISAPP    = iptables-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -49,7 +49,7 @@ libnetfilter_queue-1.0.1.tar.bz2	= $(URL_IPFIRE)/libnetfilter_queue-1.0.1.tar.bz
 libnetfilter_conntrack-1.0.2.tar.bz2	= $(URL_IPFIRE)/libnetfilter_conntrack-1.0.2.tar.bz2
 libnetfilter_cttimeout-1.0.0.tar.bz2	= $(URL_IPFIRE)/libnetfilter_cttimeout-1.0.0.tar.bz2
 
-$(DL_FILE)_MD5 = 387b92d3efcf4f07fe31c3bf0f1d18f5
+$(DL_FILE)_MD5 = 536d048c8e8eeebcd9757d0863ebb0c0
 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
 libnfnetlink-1.0.0.tar.bz2_MD5 = 016fdec8389242615024c529acc1adb8
 libnetfilter_queue-1.0.1.tar.bz2_MD5 = 08b968cb2d36c24deb7f26a69f5d8602
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 37ef351..f23f7f4 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -177,6 +177,10 @@ iptables_init() {
 	/sbin/iptables -N FORWARDFW
 	/sbin/iptables -A FORWARD -j FORWARDFW
 
+	# SNAT rules
+	/sbin/iptables -t nat -N NAT_SOURCE
+	/sbin/iptables -t nat -A POSTROUTING -j NAT_SOURCE
+
 	# RED chain, used for the red interface
 	/sbin/iptables -N REDINPUT
 	/sbin/iptables -A INPUT -j REDINPUT
@@ -195,10 +199,6 @@ iptables_init() {
 	/sbin/iptables -t nat -N NAT_DESTINATION
 	/sbin/iptables -t nat -A PREROUTING -j NAT_DESTINATION
 
-	# SNAT rules
-	/sbin/iptables -t nat -N NAT_SOURCE
-	/sbin/iptables -t nat -A POSTROUTING -j NAT_SOURCE
-
 	# upnp chain for our upnp daemon
 	/sbin/iptables -t nat -N UPNPFW
 	/sbin/iptables -t nat -A PREROUTING -j UPNPFW


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