From: nico Date: Sat, 12 Nov 2005 11:53:55 +0000 (+0000) Subject: port iptables fix introduced by changeset:2447 to trunk X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=80accc63e96d4e269cabc6089b102b3d88482e9d port iptables fix introduced by changeset:2447 to trunk git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2448 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f54481c05b..cdbb866a09 100644 --- a/package/iptables/Makefile +++ b/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/target/linux/netfilter.mk b/target/linux/netfilter.mk index 433c386d6e..6375a71f21 100644 --- a/target/linux/netfilter.mk +++ b/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