Merge commit 'origin/master'

diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk
index 87d0af1..21490c0 100644 (file)
--- a/coblitz-latest-tags.mk
+++ b/coblitz-latest-tags.mk
@@ -18,7 +18,7 @@ fprobe-ulog-SVNPATH           := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ul
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
 iptables-BUILD-FROM-SRPM        := yes # tmp
-iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-3
+iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-4
 iproute-BUILD-FROM-SRPM         := yes # tmp
 iproute2-GITPATH                := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 6946946..e4b0651 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -3,7 +3,7 @@
 ###
 linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-34
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-2
-iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-3
+iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-4
 iptables-BUILD-FROM-SRPM        := yes # tmp
 iproute-BUILD-FROM-SRPM := yes 
 iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index fe3f028..171caf0 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -10,7 +10,7 @@ endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-2
 iptables-BUILD-FROM-SRPM        := yes # tmp
-iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-3
+iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-4
 iproute-BUILD-FROM-SRPM                := yes  
 iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0
 ###

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 2d23ae8..97ffa83 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -2,7 +2,7 @@
 
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-34
 madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
-iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-3
+iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-4
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute-BUILD-FROM-SRPM := yes 
 iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 09633dc..a7fd87e 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -9,7 +9,7 @@ kernel-WHITELIST-RPMS   := kernel-devel,kernel-headers
 endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
-iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-3
+iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-4
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute-BUILD-FROM-SRPM := yes 
 iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0