From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 4 Feb 2012 18:13:18 +0000 (+0000)
Subject: [packages_10.03.2] shorewall6-lite: merge r28058, r28059, r28060
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=2201f54c63826c29da11689669c16e22453d42a4

[packages_10.03.2] shorewall6-lite: merge r28058, r28059, r28060

SVN-Revision: 30034
---

diff --git a/ipv6/shorewall6-lite/Makefile b/ipv6/shorewall6-lite/Makefile
index 59afd8b1ab..e082b8981a 100644
--- a/ipv6/shorewall6-lite/Makefile
+++ b/ipv6/shorewall6-lite/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall6-lite
-PKG_VERSION:=4.4.5.4
-PKG_DIRECTORY:=4.4.5
-PKG_RELEASE:=1
+PKG_VERSION:=4.4.22.2
+PKG_DIRECTORY:=4.4.22
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
 	http://www1.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
@@ -20,17 +20,17 @@ 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
 
 define Package/shorewall6-lite
   SECTION:=ipv6
   CATEGORY:=IPv6
-  DEPENDS:=+ip +ip6tables +ip6tables-utils
+  DEPENDS:=+ip +ip6tables
   TITLE:=Shorewall6 Lite
   URL:=http://www.shorewall.net/
-  SUBMENU:=firewall
+  SUBMENU:=Firewall
 endef
 
 define Package/shorewall6-lite/description
diff --git a/ipv6/shorewall6-lite/patches/100-hostname.patch b/ipv6/shorewall6-lite/patches/100-hostname.patch
deleted file mode 100644
index f901cb67f2..0000000000
--- 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 4f424da20a..cb01e8c33e 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 53db5d7a51..7fc11cd48d 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 87a696b88d..0000000000
--- 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
-