From 4be2e57505b9210494eef0498b68788cc0a561e2 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 15 Nov 2008 12:34:27 +0000
Subject: [PATCH] Update shorewall to 4.2.1 and fix hostname usage (#4162)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@13218 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 net/shorewall-common/Makefile       |  6 +++---
 net/shorewall-common/files/hostname | 12 +-----------
 net/shorewall-shell/Makefile        |  6 +++---
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/net/shorewall-common/Makefile b/net/shorewall-common/Makefile
index 951b4c791..a9a749150 100644
--- a/net/shorewall-common/Makefile
+++ b/net/shorewall-common/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall-common
-PKG_VERSION:=4.0.13
+PKG_VERSION:=4.2.1
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.0/shorewall-$(PKG_VERSION)/
+PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=b14dcfcfd9fab234f401e32ecdb2b368
+PKG_MD5SUM:=cd90a367f687977a13403bd5249a6639
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/shorewall-common/files/hostname b/net/shorewall-common/files/hostname
index 1fe1e5295..42e164371 100644
--- a/net/shorewall-common/files/hostname
+++ b/net/shorewall-common/files/hostname
@@ -1,12 +1,2 @@
 #!/bin/sh
-
-. /etc/functions.sh
-hostname="OpenWrt"
-config_cb () {
-	echo a $1
-	config_get hostname "$1" hostname
-	echo b $hostname
-}
-config_load "system"
-
-echo "$hostname"
+cat /proc/sys/kernel/hostname
diff --git a/net/shorewall-shell/Makefile b/net/shorewall-shell/Makefile
index 6de9c0570..447b52ea5 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.13
+PKG_VERSION:=4.2.1
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=http://www1.shorewall.net/pub/shorewall/4.0/shorewall-$(PKG_VERSION)/
+PKG_SOURCE_URL:=http://www1.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=938f12b6f9345bd1ff820185548a86c3
+PKG_MD5SUM:=7790bb23c7df834549f4f4ec195f37ee
 
 include $(INCLUDE_DIR)/package.mk