X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fshorewall%2FMakefile;h=46a81cdbfe7968eb61908966275f5c662ea93f1e;hp=58c7841707cbc8ae030c317397ebfd1d62406790;hb=ea662a790cdbf780e275dee80d36b68f06e823d2;hpb=a1a540707e515168a9980a87b8b824c1cc836648;ds=sidebyside

diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
index 58c7841707..46a81cdbfe 100644
--- a/net/shorewall/Makefile
+++ b/net/shorewall/Makefile
@@ -1,5 +1,5 @@
 # 
-# 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.
@@ -9,16 +9,12 @@
 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
 
@@ -27,11 +23,12 @@ define Package/shorewall
   CATEGORY:=Network
   DEPENDS:=+iptables
   TITLE:=Shorewall firewall
-  DESCRIPTION:=\
-	Shorewall Firewall is an iptables-based firewall for Linux.
   URL:=http://www.shorewall.net/
 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 +38,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