* iptables: version bump, removed non-existing extensions

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8797 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 11 insertions, 191 deletions

diff --git a/rules/iptables.make b/rules/iptables.make
index e1ca1366e..2f95e685c 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 2004 by Robert Schwebel
 # Copyright (C) 2007 by Carsten Schlote, konzeptpark
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_IPTABLES) += iptables
 #
 # Paths and names
 #
-IPTABLES_VERSION	= 1.3.8
+IPTABLES_VERSION	= 1.4.1.1
 IPTABLES		= iptables-$(IPTABLES_VERSION)
 IPTABLES_SUFFIX		= tar.bz2
 IPTABLES_URL		= http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SUFFIX)
@@ -62,9 +62,17 @@ iptables_prepare: $(STATEDIR)/iptables.prepare
 IPTABLES_PATH	=  PATH=$(CROSS_PATH)
 IPTABLES_ENV 	=  $(CROSS_ENV)
 
+#
+# autoconf
+#
+IPTABLES_AUTOCONF =  $(CROSS_AUTOCONF_USR)
+
 $(STATEDIR)/iptables.prepare: $(iptables_prepare_deps_default)
 	@$(call targetinfo, $@)
 	@$(call clean, $(IPTABLES_DIR)/config.cache)
+	cd $(IPTABLES_DIR) && \
+		$(IPTABLES_PATH) $(IPTABLES_ENV) \
+		./configure $(IPTABLES_AUTOCONF)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
@@ -131,34 +139,14 @@ ifdef PTXCONF_IPTABLES_INSTALL_libipt_ah
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ah.so, /usr/lib/iptables/libipt_ah.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_CLASSIFY
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_CLASSIFY.so, /usr/lib/iptables/libipt_CLASSIFY.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_CLUSTERIP
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_CLUSTERIP.so, /usr/lib/iptables/libipt_CLUSTERIP.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_comment
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_comment.so, /usr/lib/iptables/libipt_comment.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_connbytes
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_connbytes.so, /usr/lib/iptables/libipt_connbytes.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_connmark
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_connmark.so, /usr/lib/iptables/libipt_connmark.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_CONNMARK
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_CONNMARK.so, /usr/lib/iptables/libipt_CONNMARK.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_conntrack
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_conntrack.so, /usr/lib/iptables/libipt_conntrack.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_dccp
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_dccp.so, /usr/lib/iptables/libipt_dccp.so, n)
 endif
@@ -171,14 +159,6 @@ ifdef PTXCONF_IPTABLES_INSTALL_libipt_DNAT
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_DNAT.so, /usr/lib/iptables/libipt_DNAT.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_dscp
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_dscp.so, /usr/lib/iptables/libipt_dscp.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_DSCP
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_DSCP.so, /usr/lib/iptables/libipt_DSCP.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_ecn
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ecn.so, /usr/lib/iptables/libipt_ecn.so, n)
 endif
@@ -187,50 +167,14 @@ ifdef PTXCONF_IPTABLES_INSTALL_libipt_ECN
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ECN.so, /usr/lib/iptables/libipt_ECN.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_esp
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_esp.so, /usr/lib/iptables/libipt_esp.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_hashlimit
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_hashlimit.so, /usr/lib/iptables/libipt_hashlimit.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_helper
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_helper.so, /usr/lib/iptables/libipt_helper.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_icmp
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_icmp.so, /usr/lib/iptables/libipt_icmp.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_iprange
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_iprange.so, /usr/lib/iptables/libipt_iprange.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_length
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_length.so, /usr/lib/iptables/libipt_length.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_limit
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_limit.so, /usr/lib/iptables/libipt_limit.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_LOG
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_LOG.so, /usr/lib/iptables/libipt_LOG.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_mac
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_mac.so, /usr/lib/iptables/libipt_mac.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_mark
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_mark.so, /usr/lib/iptables/libipt_mark.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_MARK
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_MARK.so, /usr/lib/iptables/libipt_MARK.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_MASQUERADE
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_MASQUERADE.so, /usr/lib/iptables/libipt_MASQUERADE.so, n)
 endif
@@ -239,10 +183,6 @@ ifdef PTXCONF_IPTABLES_INSTALL_libipt_MIRROR
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_MIRROR.so, /usr/lib/iptables/libipt_MIRROR.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_multiport
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_multiport.so, /usr/lib/iptables/libipt_multiport.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_NETMAP
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_NETMAP.so, /usr/lib/iptables/libipt_NETMAP.so, n)
 endif
@@ -251,26 +191,6 @@ ifdef PTXCONF_IPTABLES_INSTALL_libipt_NFLOG
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_NFLOG.so, /usr/lib/iptables/libipt_NFLOG.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_NFQUEUE
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_NFQUEUE.so, /usr/lib/iptables/libipt_NFQUEUE.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_NOTRACK
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_NOTRACK.so, /usr/lib/iptables/libipt_NOTRACK.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_owner
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_owner.so, /usr/lib/iptables/libipt_owner.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_physdev
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_physdev.so, /usr/lib/iptables/libipt_physdev.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_pkttype
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_pkttype.so, /usr/lib/iptables/libipt_pkttype.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_policy
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_policy.so, /usr/lib/iptables/libipt_policy.so, n)
 endif
@@ -299,22 +219,10 @@ ifdef PTXCONF_IPTABLES_INSTALL_libipt_SAME
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_SAME.so, /usr/lib/iptables/libipt_SAME.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_sctp
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_sctp.so, /usr/lib/iptables/libipt_sctp.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_SNAT
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_SNAT.so, /usr/lib/iptables/libipt_SNAT.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_standard
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_standard.so, /usr/lib/iptables/libipt_standard.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_state
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_state.so, /usr/lib/iptables/libipt_state.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_statistic
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_statistic.so, /usr/lib/iptables/libipt_statistic.so, n)
 endif
@@ -323,26 +231,6 @@ ifdef PTXCONF_IPTABLES_INSTALL_libipt_string
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_string.so, /usr/lib/iptables/libipt_string.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_tcpmss
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_tcpmss.so, /usr/lib/iptables/libipt_tcpmss.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_TCPMSS
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TCPMSS.so, /usr/lib/iptables/libipt_TCPMSS.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_tcp
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_tcp.so, /usr/lib/iptables/libipt_tcp.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_tos
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_tos.so, /usr/lib/iptables/libipt_tos.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_TOS
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TOS.so, /usr/lib/iptables/libipt_TOS.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_ttl
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ttl.so, /usr/lib/iptables/libipt_ttl.so, n)
 endif
@@ -351,10 +239,6 @@ ifdef PTXCONF_IPTABLES_INSTALL_libipt_TTL
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_TTL.so, /usr/lib/iptables/libipt_TTL.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libipt_udp
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_udp.so, /usr/lib/iptables/libipt_udp.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libipt_ULOG
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libipt_ULOG.so, /usr/lib/iptables/libipt_ULOG.so, n)
 endif
@@ -369,14 +253,6 @@ ifdef PTXCONF_IPTABLES_INSTALL_libip6t_ah
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_ah.so, /usr/lib/iptables/libip6t_ah.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_connmark
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_connmark.so, /usr/lib/iptables/libip6t_connmark.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_CONNMARK
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_CONNMARK.so, /usr/lib/iptables/libip6t_CONNMARK.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_esp
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_esp.so, /usr/lib/iptables/libip6t_esp.so, n)
 endif
@@ -409,54 +285,18 @@ ifdef PTXCONF_IPTABLES_INSTALL_libip6t_ipv6header
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_ipv6header.so, /usr/lib/iptables/libip6t_ipv6header.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_length
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_length.so, /usr/lib/iptables/libip6t_length.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_limit
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_limit.so, /usr/lib/iptables/libip6t_limit.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_LOG
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_LOG.so, /usr/lib/iptables/libip6t_LOG.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_mac
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_mac.so, /usr/lib/iptables/libip6t_mac.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_mark
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_mark.so, /usr/lib/iptables/libip6t_mark.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_MARK
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_MARK.so, /usr/lib/iptables/libip6t_MARK.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_mh
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_mh.so, /usr/lib/iptables/libip6t_mh.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_multiport
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_multiport.so, /usr/lib/iptables/libip6t_multiport.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_NFLOG
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_NFLOG.so, /usr/lib/iptables/libip6t_NFLOG.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_NFQUEUE
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_NFQUEUE.so, /usr/lib/iptables/libip6t_NFQUEUE.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_owner
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_owner.so, /usr/lib/iptables/libip6t_owner.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_physdev
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_physdev.so, /usr/lib/iptables/libip6t_physdev.so, n)
-endif
-
 ifdef PTXCONF_IPTABLES_INSTALL_libip6t_policy
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_policy.so, /usr/lib/iptables/libip6t_policy.so, n)
 endif
@@ -473,27 +313,7 @@ ifdef PTXCONF_IPTABLES_INSTALL_libip6t_sctp
 	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_sctp.so, /usr/lib/iptables/libip6t_sctp.so, n)
 endif
 
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_standard
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_standard.so, /usr/lib/iptables/libip6t_standard.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_state
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_state.so, /usr/lib/iptables/libip6t_state.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_TCPMSS
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_TCPMSS.so, /usr/lib/iptables/libip6t_TCPMSS.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_tcp
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_tcp.so, /usr/lib/iptables/libip6t_tcp.so, n)
-endif
-
-ifdef PTXCONF_IPTABLES_INSTALL_libip6t_udp
-	@$(call install_copy, iptables, 0, 0, 0755, $(IPTABLES_DIR)/extensions/libip6t_udp.so, /usr/lib/iptables/libip6t_udp.so, n)
-endif
-
-	@$(call install_finish, iptables)	
+	@$(call install_finish, iptables)
 
 	@$(call touch, $@)