From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 6 Jul 2008 10:39:10 +0000 (+0000)
Subject: Upgrade shorewall (#3661)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=7575982a9fef4520e585a3623f6dba7dd7322fb6

Upgrade shorewall (#3661)

SVN-Revision: 11679
---

diff --git a/net/shorewall-common/Makefile b/net/shorewall-common/Makefile
index 47e6db2f61..95d4846b80 100644
--- a/net/shorewall-common/Makefile
+++ b/net/shorewall-common/Makefile
@@ -9,14 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall-common
-PKG_VERSION:=4.0.10.1
+PKG_VERSION:=4.0.12
 PKG_RELEASE:=1
-PKG_MD5SUM:=9f8fc4c977c8291736c3f750c52f4dc8
 
-# PKG_SOURCE_URL:=http://www1.shorewall.net/pub/shorewall/4.0/shorewall-$(PKG_VERSION)/
-# The source directory only goes to three levels of version number:
-PKG_SOURCE_URL:=http://www1.shorewall.net/pub/shorewall/4.0/shorewall-4.0.10
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.0/shorewall-$(PKG_VERSION)/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=556016e223fdd804e6c76218380165f9
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile
index f7197ec707..e89cde4dc6 100644
--- a/net/shorewall-lite/Makefile
+++ b/net/shorewall-lite/Makefile
@@ -1,9 +1,16 @@
+# 
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall-lite
-PKG_VERSION:=4.0.8
+PKG_VERSION:=4.0.12
 PKG_RELEASE:=1
-PKG_MD5SUM:=9eb449aed51d2f040c67baa23477b89c
 
 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.0/shorewall-$(PKG_VERSION)/ \
 	http://www1.shorewall.net/pub/shorewall/4.0/shorewall-$(PKG_VERSION)/ \
@@ -13,10 +20,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.0/shorewall-$(PKG_VERSI
 	http://shorewall.infohiiway.com/pub/shorewall/4.0/shorewall-$(PKG_VERSION)/ \
 	http://www.shorewall.com.ar/pub/shorewall/shorewall/4.0/shorewall-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=ab82b03f987f69536d305db40dc7692c
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/shorewall-lite/patches/100-hostname.patch b/net/shorewall-lite/patches/100-hostname.patch
index 29a57eb036..97907fec8b 100644
--- a/net/shorewall-lite/patches/100-hostname.patch
+++ b/net/shorewall-lite/patches/100-hostname.patch
@@ -1,6 +1,5 @@
-diff -Nru shorewall-lite-4.0.8.orig/shorewall-lite shorewall-lite-4.0.8/shorewall-lite
---- shorewall-lite-4.0.8.orig/shorewall-lite	2007-12-15 07:13:36.000000000 +0800
-+++ shorewall-lite-4.0.8/shorewall-lite	2008-01-26 18:05:13.000000000 +0800
+--- a/shorewall-lite
++++ b/shorewall-lite
 @@ -153,7 +153,7 @@
  
      export VERBOSE
diff --git a/net/shorewall-lite/patches/110-MODULESDIR.patch b/net/shorewall-lite/patches/110-MODULESDIR.patch
index ac763e2e88..46f3f9c020 100644
--- a/net/shorewall-lite/patches/110-MODULESDIR.patch
+++ b/net/shorewall-lite/patches/110-MODULESDIR.patch
@@ -1,6 +1,5 @@
-diff -Nru shorewall-lite-4.0.8.orig/lib.base shorewall-lite-4.0.8/lib.base
---- shorewall-lite-4.0.8.orig/lib.base	2008-01-26 05:40:32.000000000 +0800
-+++ shorewall-lite-4.0.8/lib.base	2008-01-26 18:08:32.000000000 +0800
+--- a/lib.base
++++ b/lib.base
 @@ -251,7 +251,7 @@
  
      [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
diff --git a/net/shorewall-shell/Makefile b/net/shorewall-shell/Makefile
index 1fc9cc6419..a4abbc8bb4 100644
--- a/net/shorewall-shell/Makefile
+++ b/net/shorewall-shell/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall-shell
-PKG_VERSION:=4.0.10
+PKG_VERSION:=4.0.12
 PKG_RELEASE:=1
-PKG_MD5SUM:=4d0655ab72309df95fd623790c732c96
 
 PKG_SOURCE_URL:=http://www1.shorewall.net/pub/shorewall/4.0/shorewall-$(PKG_VERSION)/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=8d804a29761636a9a17216ae2cd62fe6
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
index 425bb7dbbb..3a676812ec 100644
--- a/net/shorewall/Makefile
+++ b/net/shorewall/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall
-PKG_VERSION:=3.4.6
-PKG_RELEASE:=2
+PKG_VERSION:=3.4.8
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://www1.shorewall.net/pub/$(PKG_NAME)/3.4/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_MD5SUM:=ec6a8bd3d6d0468b6302a7725851c39b
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=9e56da17a2b6319d3d99c891f2dc1a60
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,7 +27,7 @@ define Package/shorewall
   SUBMENU:=firewall
 endef
 
-define define Package/shorewall/description
+define Package/shorewall/description
  Shorewall Firewall is an iptables-based firewall for Linux.
 endef
 
diff --git a/net/shorewall/patches/100-no_man.patch b/net/shorewall/patches/100-no_man.patch
index 0a2fabd9cd..efbd68323d 100644
--- a/net/shorewall/patches/100-no_man.patch
+++ b/net/shorewall/patches/100-no_man.patch
@@ -1,7 +1,5 @@
-Index: shorewall-3.4.6/install.sh
-===================================================================
---- shorewall-3.4.6.orig/install.sh	2007-09-04 21:51:24.000000000 +0200
-+++ shorewall-3.4.6/install.sh	2007-09-04 21:51:24.000000000 +0200
+--- a/install.sh
++++ b/install.sh
 @@ -676,28 +676,6 @@
  fi