Add weechat, a lightweight IRC client, thanks kolter !

[openwrt.git] / package / iptables / Makefile

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index ed46df2..f16ac8b 100644 (file)
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iptables
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iptables

-PKG_VERSION:=1.3.4
+PKG_VERSION:=1.3.5

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=fdff8abe890807968226b0c374335305
+PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5

 
 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
        ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
 
 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
        ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \


@@ -21,8 +21,8 @@ define IPKG_plugin_template
 
 $$(IPKG_$(1)):
        install -m0755 -d $$(IDIR_$(1))/usr/lib/iptables
 
 $$(IPKG_$(1)):
        install -m0755 -d $$(IDIR_$(1))/usr/lib/iptables

-       for m in $(2); do \
-               cp -fpR $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \
+       for m in $$(patsubst xt_%,ipt_%,$(2)); do \
+               $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \

        done
        @[ -z "$(3)" ] || $(MAKE) $(3)
        $(RSTRIP) $$(IDIR_$(1))
        done
        @[ -z "$(3)" ] || $(MAKE) $(3)
        $(RSTRIP) $$(IDIR_$(1))


@@ -72,11 +72,18 @@ $(PKG_BUILD_DIR)/.built:
        touch $@
                
 $(IPKG_IPTABLES):
        touch $@
                
 $(IPKG_IPTABLES):

+       install -d -m0755 $(IDIR_IPTABLES)/etc/config
+       install -m0644 ./files/firewall.config $(IDIR_IPTABLES)/etc/config/firewall
+       install -d -m0755 $(IDIR_IPTABLES)/etc/init.d
+       install -m0755 ./files/firewall.init $(IDIR_IPTABLES)/etc/init.d/S45firewall
+       install -m0755 ./files/firewall.user $(IDIR_IPTABLES)/etc/
+       install -d -m0755 $(IDIR_IPTABLES)/usr/lib
+       install -m0644 ./files/firewall.awk $(IDIR_IPTABLES)/usr/lib

        install -d -m0755 $(IDIR_IPTABLES)/usr/sbin
        install -d -m0755 $(IDIR_IPTABLES)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/
+       $(CP) $(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 ; \
        install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \

-               cp -fpR $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \
+               $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN:xt_%=ipt_%)) $(IDIR_IPTABLES)/usr/lib/iptables/ \

        )
        $(RSTRIP) $(IDIR_IPTABLES)
        $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR)
        )
        $(RSTRIP) $(IDIR_IPTABLES)
        $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR)


@@ -86,29 +93,29 @@ $(IPKG_IPTABLES_EXTRA):
 
 $(IPKG_IPTABLES_UTILS):
        install -d -m0755 $(IDIR_IPTABLES_UTILS)/usr/sbin
 
 $(IPKG_IPTABLES_UTILS):
        install -d -m0755 $(IDIR_IPTABLES_UTILS)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin/

        $(RSTRIP) $(IDIR_IPTABLES_UTILS)
        $(IPKG_BUILD) $(IDIR_IPTABLES_UTILS) $(PACKAGE_DIR)
 
 $(IPKG_IP6TABLES):
        install -d -m0755 $(IDIR_IP6TABLES)/usr/sbin
        $(RSTRIP) $(IDIR_IPTABLES_UTILS)
        $(IPKG_BUILD) $(IDIR_IPTABLES_UTILS) $(PACKAGE_DIR)
 
 $(IPKG_IP6TABLES):
        install -d -m0755 $(IDIR_IP6TABLES)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/

        install -d -m0755 $(IDIR_IP6TABLES)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \
        install -d -m0755 $(IDIR_IP6TABLES)/usr/lib/iptables
        (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \

-               cp -fpR libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \
+               $(CP) libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \

        )
        $(RSTRIP) $(IDIR_IP6TABLES)
        $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        )
        $(RSTRIP) $(IDIR_IP6TABLES)
        $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/

        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/

 
 layer7-install:
        mkdir -p $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols
 
 layer7-install:
        mkdir -p $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols

-       cp files/l7/*.pat $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols/
+       $(CP) files/l7/*.pat $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols/

 
 install-dev: $(STAGING_DIR)/usr/lib/libipq.a
 
 
 install-dev: $(STAGING_DIR)/usr/lib/libipq.a