Add missing iptables-mod-extra dependency to shorewall packages (#3201)

[openwrt/svn-archive/archive.git] / net / shorewall / Makefile

diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
index 7e485c37e756fade11ddde0dbb0bc54077bbe7f0..425bb7dbbba1184f45a1ac9bb5188b62b413fa02 100644 (file)
--- a/net/shorewall/Makefile
+++ b/net/shorewall/Makefile
@@ -1,37 +1,35 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall
-PKG_VERSION:=3.4.3
-PKG_RELEASE:=1
-PKG_MD5SUM:=4ac779d02d4befc72a0ce1534fbb328d
+PKG_VERSION:=3.4.6
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://www1.shorewall.net/pub/$(PKG_NAME)/3.4/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=ec6a8bd3d6d0468b6302a7725851c39b
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/shorewall
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+iptables
+  DEPENDS:=+iptables +iptables-mod-extra
   TITLE:=Shorewall firewall
-  DESCRIPTION:=\
-       Shorewall Firewall is an iptables-based firewall for Linux.
   URL:=http://www.shorewall.net/
+  SUBMENU:=firewall
 endef
 
+define define Package/shorewall/description
+ Shorewall Firewall is an iptables-based firewall for Linux.
+endef
 
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
@@ -41,10 +39,10 @@ endef
 
 define Package/shorewall/install
        $(INSTALL_DIR) $(1)/sbin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/$(PKG_NAME) $(1)/sbin
        $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
        $(INSTALL_DIR) $(1)/usr/share
-       $(INSTALL_BIN) ./files/shorewall.init $(1)/etc/init.d/shorewall
-       $(CP) $(PKG_INSTALL_DIR)/sbin/shorewall $(1)/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall $(1)/usr/share
        $(CP) $(PKG_INSTALL_DIR)/etc/shorewall $(1)/etc
 endef