From 54db73e4bad635220fd085c5a560ca63bdd326a4 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 20 Aug 2011 11:26:49 +0000
Subject: [PATCH] [package] shorewall6-lite: update to 4.4.22.2

Signed-off-by: Edy Corak info@loenshotel.de

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28058 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 ipv6/shorewall6-lite/Makefile                 |  6 +++---
 .../patches/100-hostname.patch                | 11 ----------
 .../patches/110-MODULESDIR.patch              |  8 ++++----
 .../shorewall6-lite/patches/120-LOGFILE.patch |  3 +--
 .../patches/130-portability.patch             | 20 -------------------
 5 files changed, 8 insertions(+), 40 deletions(-)
 delete mode 100644 ipv6/shorewall6-lite/patches/100-hostname.patch
 delete mode 100644 ipv6/shorewall6-lite/patches/130-portability.patch

diff --git a/ipv6/shorewall6-lite/Makefile b/ipv6/shorewall6-lite/Makefile
index 59afd8b1a..a076bd3db 100644
--- a/ipv6/shorewall6-lite/Makefile
+++ b/ipv6/shorewall6-lite/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall6-lite
-PKG_VERSION:=4.4.5.4
-PKG_DIRECTORY:=4.4.5
+PKG_VERSION:=4.4.22.2
+PKG_DIRECTORY:=4.4.22
 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:=498f622be657df38beec256876adabb6
+PKG_MD5SUM:=3ad7ba3790388bb562d3c937ba02fa31
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/ipv6/shorewall6-lite/patches/100-hostname.patch b/ipv6/shorewall6-lite/patches/100-hostname.patch
deleted file mode 100644
index f901cb67f..000000000
--- a/ipv6/shorewall6-lite/patches/100-hostname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/shorewall6-lite
-+++ b/shorewall6-lite
-@@ -153,7 +153,7 @@
- 
-     export VERBOSE
- 
--    [ -n "${HOSTNAME:=$(hostname)}" ]
-+    [ -n "${HOSTNAME:=$(${SHAREDIR}/hostname)}" ]
- 
- }
- 
diff --git a/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch b/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch
index 4f424da20..cb01e8c33 100644
--- a/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch
+++ b/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch
@@ -1,6 +1,6 @@
---- a/lib.base
-+++ b/lib.base
-@@ -260,7 +260,7 @@
+--- a/lib.common
++++ b/lib.common
+@@ -292,7 +292,7 @@
  
      [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
  
@@ -9,7 +9,7 @@
      MODULES=$(lsmod | cut -d ' ' -f1)
  
      for directory in $(split $MODULESDIR); do
-@@ -296,7 +296,7 @@
+@@ -328,7 +328,7 @@
      [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
  
      [ -z "$MODULESDIR" ] && \
diff --git a/ipv6/shorewall6-lite/patches/120-LOGFILE.patch b/ipv6/shorewall6-lite/patches/120-LOGFILE.patch
index 53db5d7a5..7fc11cd48 100644
--- a/ipv6/shorewall6-lite/patches/120-LOGFILE.patch
+++ b/ipv6/shorewall6-lite/patches/120-LOGFILE.patch
@@ -7,5 +7,4 @@
 -LOGFILE=
 +LOGFILE=/dev/null
  
- LOGFORMAT=
- 
+
diff --git a/ipv6/shorewall6-lite/patches/130-portability.patch b/ipv6/shorewall6-lite/patches/130-portability.patch
deleted file mode 100644
index 87a696b88..000000000
--- a/ipv6/shorewall6-lite/patches/130-portability.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/install.sh
-+++ b/install.sh
-@@ -294,13 +294,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
-