summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2011-07-29 10:48:07 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2011-07-29 10:48:07 +0200
commitbfea272382f6e779493580121db0f9b3f0eb5a98 (patch)
tree5ce881b3a818dfc3305ca62bd0e93eb044801f56
parent4ad9a0a2d5c93a1f520b6de4ae1e37cc3dd4948b (diff)
downloadptxdist-bfea272382f6e779493580121db0f9b3f0eb5a98.tar.gz
ptxdist-bfea272382f6e779493580121db0f9b3f0eb5a98.tar.xz
iptables: version bump 1.4.8 -> 1.4.12
-rw-r--r--rules/iptables.in19
-rw-r--r--rules/iptables.make22
2 files changed, 16 insertions, 25 deletions
diff --git a/rules/iptables.in b/rules/iptables.in
index bd59db090..1440c3820 100644
--- a/rules/iptables.in
+++ b/rules/iptables.in
@@ -22,17 +22,17 @@ config IPTABLES_INSTALL_IPV6_TOOLS
if IPTABLES_INSTALL_IPV6_TOOLS
-config IPTABLES_INSTALL_IP6TABLES_MULTI
+config IPTABLES_INSTALL_XTABLES_MULTI
bool
config IPTABLES_INSTALL_IP6TABLES
- select IPTABLES_INSTALL_IP6TABLES_MULTI
+ select IPTABLES_INSTALL_XTABLES_MULTI
bool "install ip6tables"
help
Install the IPv6 Version of iptables
config IPTABLES_INSTALL_IP6TABLES_RESTORE
- select IPTABLES_INSTALL_IP6TABLES_MULTI
+ select IPTABLES_INSTALL_XTABLES_MULTI
bool "install ip6tables-restore"
help
The ip6tables-restore command is used to restore
@@ -40,7 +40,7 @@ config IPTABLES_INSTALL_IP6TABLES_RESTORE
ip6tables-save command.
config IPTABLES_INSTALL_IP6TABLES_SAVE
- select IPTABLES_INSTALL_IP6TABLES_MULTI
+ select IPTABLES_INSTALL_XTABLES_MULTI
bool "install ip6tables-save"
help
The ip6tables-save command is a tool to save the current rule-set
@@ -55,17 +55,14 @@ config IPTABLES_INSTALL_IPV4_TOOLS
if IPTABLES_INSTALL_IPV4_TOOLS
-config IPTABLES_INSTALL_IPTABLES_MULTI
- bool
-
config IPTABLES_INSTALL_IPTABLES
- select IPTABLES_INSTALL_IPTABLES_MULTI
+ select IPTABLES_INSTALL_XTABLES_MULTI
bool "install iptables"
help
install the IPv4 Version of iptables
config IPTABLES_INSTALL_IPTABLES_RESTORE
- select IPTABLES_INSTALL_IPTABLES_MULTI
+ select IPTABLES_INSTALL_XTABLES_MULTI
bool "install iptables-restore"
help
The iptables-restore command is used to restore
@@ -73,7 +70,7 @@ config IPTABLES_INSTALL_IPTABLES_RESTORE
iptables-save command.
config IPTABLES_INSTALL_IPTABLES_SAVE
- select IPTABLES_INSTALL_IPTABLES_MULTI
+ select IPTABLES_INSTALL_XTABLES_MULTI
bool "install iptables-save"
help
The iptables-save command is a tool to save
@@ -83,7 +80,7 @@ config IPTABLES_INSTALL_IPTABLES_SAVE
endif
config IPTABLES_INSTALL_IPTABLES_XML
- select IPTABLES_INSTALL_IPTABLES_MULTI
+ select IPTABLES_INSTALL_XTABLES_MULTI
bool "install iptables-xml"
help
iptables-xml is used to convert the output of iptables-save into an
diff --git a/rules/iptables.make b/rules/iptables.make
index 9e6acb551..572b52119 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_IPTABLES) += iptables
#
# Paths and names
#
-IPTABLES_VERSION := 1.4.8
-IPTABLES_MD5 := 697ed89f37af4473a5f6349ba2700f2d
+IPTABLES_VERSION := 1.4.12
+IPTABLES_MD5 := d3f145c2c91daecbb4251bc79390b46c
IPTABLES := iptables-$(IPTABLES_VERSION)
IPTABLES_SUFFIX := tar.bz2
IPTABLES_URL := http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SUFFIX)
@@ -72,7 +72,7 @@ endif
$(STATEDIR)/iptables.install:
@$(call targetinfo)
@$(call install, IPTABLES)
- install $(IPTABLES_DIR)/iptables-apply $(IPTABLES_PKGDIR)/usr/sbin
+ install $(IPTABLES_DIR)/iptables/iptables-apply $(IPTABLES_PKGDIR)/usr/sbin
@$(touch)
@@ -93,12 +93,12 @@ $(STATEDIR)/iptables.targetinstall:
@$(call install_lib, iptables, 0, 0, 0644, libiptc)
@$(call install_lib, iptables, 0, 0, 0644, libxtables)
-# # IPv6 part
-ifdef PTXCONF_IPTABLES_INSTALL_IP6TABLES_MULTI
- @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/ip6tables-multi)
- @$(call install_lib, iptables, 0, 0, 0644, libip6tc)
+ifdef PTXCONF_IPTABLES_INSTALL_XTABLES_MULTI
+ @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/xtables-multi)
+ @$(call install_lib, iptables, 0, 0, 0644, libxtables)
endif
+# # IPv6 part
ifdef PTXCONF_IPTABLES_INSTALL_IP6TABLES
@$(call install_link, iptables, ip6tables-multi, /usr/sbin/ip6tables)
endif
@@ -119,13 +119,7 @@ ifdef PTXCONF_IPTABLES_INSTALL_IPV6_TOOLS
endif
-
# IPv4 part
-ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES_MULTI
- @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/iptables-multi)
- @$(call install_lib, iptables, 0, 0, 0644, libip4tc)
-endif
-
ifdef PTXCONF_IPTABLES_INSTALL_IPTABLES
@$(call install_link, iptables, iptables-multi, /usr/sbin/iptables)
endif
@@ -139,7 +133,7 @@ endif
# install all shared feature libraries to get full runtime support
ifdef PTXCONF_IPTABLES_INSTALL_IPV4_TOOLS
@cd $(IPTABLES_PKGDIR)/usr/lib && \
- for file in libipt_*.so libxt_*.so; do \
+ for file in libipt_*.so libxt_*.so libip4tc* ; do \
$(call install_copy, iptables, 0, 0, 0644, -,\
/usr/lib/$$file); \
done