bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shorewall-lite: update to 4.4.27.3

Browse Source 
This patch updates shorewall-lite to stable release 4.4.27.3 and the lsm_script

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

git-svn-id: svn://svn.openwrt.org/openwrt/packages@32441 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-06-18 23:49:27 +00:00
parent 329ffddd3a
commit 79adecf11f
5 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/shorewall-lite/Makefile
View File

@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-lite
PKG_VERSION:=4.4.24
PKG_DIRECTORY:=4.4.24
PKG_RELEASE:=1
PKG_VERSION:=4.4.27.3
PKG_DIRECTORY:=4.4.27
PKG_RELEASE:=4
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:=b2b8accd7b87b9d9d091d72c290813c3
PKG_MD5SUM:=40be496c0d512d885b7b0f64204bc235
include $(INCLUDE_DIR)/package.mk

28
net/shorewall-lite/files/lsm_script
View File

@ -1,4 +1,10 @@
#!/bin/sh
#
# (C) 2009 Mika Ilmaranta <ilmis@nullnet.fi>
# (C) 2009 Tom Eastep <teastep@shorewall.net>
#
# License: GPLv2
#
STATE=${1}
NAME=${2}
@ -15,19 +21,23 @@ CONS_MISS=${12}
AVG_RTT=${13}
if [ -f /usr/share/shorewall-lite/lib.base ]; then
VARDIR=/var/lib/shorewall-lite
STATEDIR=/etc/shorewall-lite
VARDIR=/var/lib/shorewall-lite
STATEDIR=/etc/shorewall-lite
else
VARDIR=/var/lib/shorewall
STATEDIR=/etc/shorewall
VARDIR=/var/lib/shorewall
STATEDIR=/etc/shorewall
fi
[ -f ${STATEDIR}/vardir ] && . ${STATEDIR}/vardir
[ ${STATE} = up ] && state=0 || state=1
echo $state > ${VARDIR}/${DEVICE}.status
/sbin/shorewall-lite restart -f >> /var/log/lsm 2>&1
if [ ${STATE} = up ]; then
echo 0 > ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
${VARDIR}/firewall enable ${DEVICE}
else
echo 1 > ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier
${VARDIR}/firewall disable ${DEVICE}
fi
/sbin/shorewall-lite show routing >> /var/log/lsm
exit 0

2
net/shorewall-lite/files/shorewall-lite.init
View File

@ -4,7 +4,7 @@ START=46
start() {
touch /var/log/messages
mkdir -p /var/lock/subsys
/sbin/shorewall-lite -qq start -f
/sbin/shorewall-lite -qq start
}
stop() {

18
net/shorewall-lite/patches/110-MODULESDIR.patch
View File

@ -1,20 +1,20 @@
--- a/lib.common
+++ b/lib.common
@@ -273,7 +273,7 @@ reload_kernel_modules() {
--- a/lib.common 2012-01-21 14:21:50.000000000 +0100
+++ b/lib.common 2012-06-03 11:52:35.115967105 +0200
@@ -328,7 +328,7 @@
[ -z "$MODULESDIR" ] && \
uname=$(uname -r) && \
- MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
+ MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname
- MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
+ MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname
MODULES=$(lsmod | cut -d ' ' -f1)
[ -d /sys/module/ ] || MODULES=$(lsmod | cut -d ' ' -f1)
@@ -312,7 +312,7 @@ load_kernel_modules() # $1 = Yes, if we
@@ -367,7 +367,7 @@
[ -z "$MODULESDIR" ] && \
uname=$(uname -r) && \
- MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
+ MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname
- MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset
+ MODULESDIR=/lib/modules/$uname/kernel/net/ipv${g_family}/netfilter:/lib/modules/$uname/kernel/net/netfilter:/lib/modules/$uname/kernel/net/sched:/lib/modules/$uname/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname
for directory in $(split $MODULESDIR); do
[ -d $directory ] && moduledirectories="$moduledirectories $directory"

8
net/shorewall-lite/patches/120-LOGFILE.patch
View File

@ -1,5 +1,5 @@
--- a/shorewall-lite.conf 2009-12-05 22:37:43.000000000 -0500
+++ b/shorewall-lite.conf 2009-12-05 22:37:51.000000000 -0500
--- a/shorewall-lite.conf 2012-01-20 16:30:06.000000000 +0100
+++ b/shorewall-lite.conf 2012-06-03 11:46:48.389503776 +0200
@@ -28,7 +28,7 @@
# L O G G I N G
###############################################################################
@ -7,5 +7,5 @@
-LOGFILE=
+LOGFILE=/dev/null
LOGFORMAT=
###############################################################################
# L O C A T I O N O F F I L E S A N D D I R E C T O R I E S