[packages_10.03.2] shorewall-lite: merge r28574, r28576

SVN-Revision: 30117

diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile
index 9a9ce6ca55055468bdd824ac6b76d23f2a2b6ffe..9ae669826c11802292bfa1dcf06fd733062cb40b 100644 (file)
--- a/net/shorewall-lite/Makefile
+++ b/net/shorewall-lite/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall-lite
-PKG_VERSION:=4.4.12.2
-PKG_DIRECTORY:=4.4.12
-PKG_RELEASE:=2
+PKG_VERSION:=4.4.24
+PKG_DIRECTORY:=4.4.24
+PKG_RELEASE:=1
 
 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,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:=b030e988c36fc1ef8c0e27447faef2a6
+PKG_MD5SUM:=b2b8accd7b87b9d9d091d72c290813c3
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/shorewall-lite/patches/110-MODULESDIR.patch b/net/shorewall-lite/patches/110-MODULESDIR.patch
index a947709121e6e7cee0e995db44b0ac79d10d0029..bdb5de2377fec0fb19c38b02b6d6ee0ef3f963b6 100644 (file)
--- a/net/shorewall-lite/patches/110-MODULESDIR.patch
+++ b/net/shorewall-lite/patches/110-MODULESDIR.patch
@@ -1,6 +1,6 @@
 --- a/lib.common
 +++ b/lib.common
-@@ -220,7 +220,7 @@ reload_kernel_modules() {
+@@ -273,7 +273,7 @@ reload_kernel_modules() {
  
      [ -z "$MODULESDIR" ] && \
        uname=$(uname -r) && \
@@ -9,7 +9,7 @@
  
      MODULES=$(lsmod | cut -d ' ' -f1)
  
-@@ -259,7 +259,7 @@ load_kernel_modules() # $1 = Yes, if we
+@@ -312,7 +312,7 @@ load_kernel_modules() # $1 = Yes, if we
  
      [ -z "$MODULESDIR" ] && \
        uname=$(uname -r) && \