From 4284281b0ecfc22081bf1ab3d96b4664bb3e8d7e Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 24 Oct 2010 13:20:25 +0000
Subject: [PATCH] [package] update shorewall-lite to 4.4.12.2

This simply updates shorewall-lite to the (at least near) current
4.4.12.2

Signed-off-by: Brian J. Murrell <brian <at> interlinx.bc.ca>

SVN-Revision: 23617
---
 net/shorewall-lite/Makefile                   |  7 ++++---
 net/shorewall-lite/patches/100-hostname.patch | 11 ----------
 .../patches/110-MODULESDIR.patch              |  4 ++--
 .../patches/130-portability.patch             | 20 -------------------
 4 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100644 net/shorewall-lite/patches/100-hostname.patch
 delete mode 100644 net/shorewall-lite/patches/130-portability.patch

diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile
index c0be48395c..4e874ba732 100644
--- a/net/shorewall-lite/Makefile
+++ b/net/shorewall-lite/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall-lite
-PKG_VERSION:=4.4.5.4
-PKG_DIRECTORY:=4.4.5
+PKG_VERSION:=4.4.12.2
+PKG_DIRECTORY:=4.4.12
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
@@ -20,7 +20,7 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIREC
 	http://shorewall.infohiiway.com/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
 	http://www.shorewall.com.ar/pub/shorewall/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=3e8fb21ccff0f2c7503d8c3bf8607dd7
+PKG_MD5SUM:=b030e988c36fc1ef8c0e27447faef2a6
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -49,6 +49,7 @@ endef
 define Package/shorewall-lite/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/lsm/script.d
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DIR) $(1)/etc/shorewall-lite
 	$(INSTALL_DIR) $(1)/usr/share
diff --git a/net/shorewall-lite/patches/100-hostname.patch b/net/shorewall-lite/patches/100-hostname.patch
deleted file mode 100644
index 97907fec8b..0000000000
--- a/net/shorewall-lite/patches/100-hostname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/shorewall-lite
-+++ b/shorewall-lite
-@@ -153,7 +153,7 @@
- 
-     export VERBOSE
- 
--    [ -n "${HOSTNAME:=$(hostname)}" ]
-+    [ -n "${HOSTNAME:=$(${SHAREDIR}/hostname)}" ]
- 
- }
- 
diff --git a/net/shorewall-lite/patches/110-MODULESDIR.patch b/net/shorewall-lite/patches/110-MODULESDIR.patch
index 08afb67dc2..a947709121 100644
--- a/net/shorewall-lite/patches/110-MODULESDIR.patch
+++ b/net/shorewall-lite/patches/110-MODULESDIR.patch
@@ -1,5 +1,5 @@
---- a/lib.base
-+++ b/lib.base
+--- a/lib.common
++++ b/lib.common
 @@ -220,7 +220,7 @@ reload_kernel_modules() {
  
      [ -z "$MODULESDIR" ] && \
diff --git a/net/shorewall-lite/patches/130-portability.patch b/net/shorewall-lite/patches/130-portability.patch
deleted file mode 100644
index 3bf7de2b08..0000000000
--- a/net/shorewall-lite/patches/130-portability.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/install.sh
-+++ b/install.sh
-@@ -295,13 +295,15 @@ cd manpages
- 
- for f in *.5; do
-     gzip -c $f > $f.gz
--    run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
-+    run_install -d ${PREFIX}/usr/share/man/man5
-+    run_install -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
-     echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man5/$f.gz"
- done
- 
- for f in *.8; do
-     gzip -c $f > $f.gz
--    run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
-+    run_install -d ${PREFIX}/usr/share/man/man8
-+    run_install -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
-     echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man8/$f.gz"
- done
- 
-- 
2.30.2