mark b44 as broken, it doesn't build anymore due to SSB changes apparently (closes...

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index cee5c60..8f24a3b 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -40,7 +40,7 @@ $(call Package/iptables/Default)
 endef
 
 define Package/iptables/conffiles
-/etc/config/firewall
+/etc/firewall.config
 /etc/firewall.user
 endef
 
@@ -97,8 +97,10 @@ define Package/iptables-mod-ipopt/description
  - libipt_ecn/ECN
  - libipt_length
  - libipt_mac
- - libipt_tos/TOS
+ - libipt_mark/MARK
+ - libipt_statistic
  - libipt_tcpmms
+ - libipt_tos/TOS
  - libipt_ttl/TTL
  - libipt_unclean 
 endef
@@ -114,6 +116,7 @@ define Package/iptables-mod-ipsec/description
  Includes: 
  - libipt_ah
  - libipt_esp
+ - libipt_policy
 endef
 
 define Package/iptables-mod-nat
@@ -232,28 +235,16 @@ define Build/InstallDev
        $(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(1)/usr/lib
 endef
 
-define Build/UninstallDev
-       rm -rf $(1)/usr/include/libipq.h
-       rm -rf $(1)/usr/include/libipulog
-       rm -rf $(1)/usr/include/libipq
-       rm -rf $(1)/usr/include/libiptc
-       rm -rf $(1)/usr/include/linux/netfilter*
-       rm -rf $(1)/usr/include/iptables*
-       rm -rf $(1)/usr/include/ip6tables*
-       rm -rf $(1)/usr/lib/libipq.a
-       rm -rf $(1)/usr/lib/libiptc.a
-endef
-
 define Package/iptables/install
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall
+       $(INSTALL_DATA) ./files/firewall.config $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall
        $(INSTALL_BIN) ./files/firewall.user $(1)/etc/
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_DATA) ./files/firewall.awk $(1)/usr/lib
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(1)/usr/lib/iptables/ \
@@ -262,12 +253,12 @@ endef
 
 define Package/iptables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/
 endef
 
 define Package/ip6tables/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
                $(CP) libip6t_*.so $(1)/usr/lib/iptables/ \
@@ -276,7 +267,7 @@ endef
 
 define Package/ip6tables-utils/install
        $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables-{save,restore} $(1)/usr/sbin/
 endef
 
 define BuildPlugin