qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-02 12:17:29 +03:00
Code

iptables: libiptc.so is only a compatibility stub, split the package into libip4tc and libip6tc and adjust dependencies

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26292 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-03-25 18:02:51 +00:00
parent 597d73f857
commit f17e4f81ac
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
package/iptables/Makefile
View File

@ -47,7 +47,7 @@ define Package/iptables
$(call Package/iptables/Default) $(call Package/iptables/Default)
TITLE:=IPv4 firewall administration tool TITLE:=IPv4 firewall administration tool
MENU:=1 MENU:=1
DEPENDS+= +kmod-ipt-core +libiptc +libxtables DEPENDS+= +kmod-ipt-core +libip4tc +libxtables
endef endef
define Package/iptables/description define Package/iptables/description
@ -237,7 +237,7 @@ endef
define Package/ip6tables define Package/ip6tables
$(call Package/iptables/Default) $(call Package/iptables/Default)
DEPENDS:=+kmod-ip6tables +libiptc +libxtables DEPENDS:=+kmod-ip6tables +libip6tc +libxtables
CATEGORY:=IPv6 CATEGORY:=IPv6
TITLE:=IPv6 firewall administration tool TITLE:=IPv6 firewall administration tool
MENU:=1 MENU:=1
@ -254,7 +254,22 @@ define Package/libiptc
$(call Package/iptables/Default) $(call Package/iptables/Default)
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=IPv4/IPv6 firewall - shared libiptc library DEPENDS:=+libip4tc +libip6tc
TITLE:=IPv4/IPv6 firewall - shared libiptc library (compatibility stub)
endef
define Package/libip4tc
$(call Package/iptables/Default)
SECTION:=libs
CATEGORY:=Libraries
TITLE:=IPv4 firewall - shared libiptc library
endef
define Package/libip6tc
$(call Package/iptables/Default)
SECTION:=libs
CATEGORY:=Libraries
TITLE:=IPv6 firewall - shared libiptc library
endef endef
define Package/libxtables define Package/libxtables
@ -352,7 +367,17 @@ endef
define Package/libiptc/install define Package/libiptc/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so* $(1)/usr/lib/
endef
define Package/libip4tc/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libip4tc.so* $(1)/usr/lib/
endef
define Package/libip6tc/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libip6tc.so* $(1)/usr/lib/
endef endef
define Package/libxtables/install define Package/libxtables/install
@ -402,5 +427,7 @@ $(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m)))
$(eval $(call BuildPackage,ip6tables)) $(eval $(call BuildPackage,ip6tables))
$(eval $(call BuildPackage,ip6tables-utils)) $(eval $(call BuildPackage,ip6tables-utils))
$(eval $(call BuildPackage,libiptc)) $(eval $(call BuildPackage,libiptc))
$(eval $(call BuildPackage,libip4tc))
$(eval $(call BuildPackage,libip6tc))
$(eval $(call BuildPackage,libxtables)) $(eval $(call BuildPackage,libxtables))
$(eval $(call BuildPackage,libipq)) $(eval $(call BuildPackage,libipq))