From 4ce9c9b7624f847ca492488d2fdf6b2ba9af7b25 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 12 Nov 2005 11:53:55 +0000 Subject: port iptables fix introduced by changeset:2447 to trunk git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2448 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/iptables/Makefile | 2 +- openwrt/target/linux/netfilter.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'openwrt') diff --git a/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile index f54481c05..cdbb866a0 100644 --- a/openwrt/package/iptables/Makefile +++ b/openwrt/package/iptables/Makefile @@ -75,7 +75,7 @@ $(IPKG_IPTABLES): cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y) ipt_standard) $(IDIR_IPTABLES)/usr/lib/iptables/ \ + cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) diff --git a/openwrt/target/linux/netfilter.mk b/openwrt/target/linux/netfilter.mk index 433c386d6..6375a71f2 100644 --- a/openwrt/target/linux/netfilter.mk +++ b/openwrt/target/linux/netfilter.mk @@ -71,7 +71,7 @@ IPKG_KMOD_IPT_ULOG-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG # IPKG_IPTABLES-y := ipt_standard -IPKG_IPTABLES-y := ipt_icmp ipt_tcp ipt_udp +IPKG_IPTABLES-y += ipt_icmp ipt_tcp ipt_udp IPKG_IPTABLES_MOD_CONNTRACK-m := IPKG_IPTABLES_MOD_CONNTRACK-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark -- cgit v1.2.3