From: jow Date: Sat, 4 Feb 2012 20:25:59 +0000 (+0000) Subject: [packages_10.03.2] shorewall-lite: merge r28574, r28576 X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=fb33321578db4d9d5d2903f2ba3eece10a102aeb;p=10.03%2Fpackages.git [packages_10.03.2] shorewall-lite: merge r28574, r28576 git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30117 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile index 9a9ce6c..9ae6698 100644 --- 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 a947709..bdb5de2 100644 --- 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) && \