This patch updates shorewall-lite to stable release 4.4.27.3 and the lsm_script
Signed-off-by: Edy Corak i...@loenshotel.de
Index: files/shorewall-lite.init
===================================================================
--- files/shorewall-lite.init (Revision 32030)
+++ files/shorewall-lite.init (Arbeitskopie)
@@ -4,7 +4,7 @@
start() {
touch /var/log/messages
mkdir -p /var/lock/subsys
- /sbin/shorewall-lite -qq start -f
+ /sbin/shorewall-lite -qq start
}
stop() {
Index: files/lsm_script
===================================================================
--- files/lsm_script (Revision 32030)
+++ files/lsm_script (Arbeitskopie)
@@ -1,4 +1,10 @@
#!/bin/sh
+#
+# (C) 2009 Mika Ilmaranta <il...@nullnet.fi>
+# (C) 2009 Tom Eastep <teas...@shorewall.net>
+#
+# License: GPLv2
+#
STATE=${1}
NAME=${2}
@@ -15,19 +21,23 @@
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
+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
-echo $state > ${VARDIR}/${DEVICE}.status
+/sbin/shorewall-lite show routing >> /var/log/lsm
-/sbin/shorewall-lite restart -f >> /var/log/lsm 2>&1
-
-/sbin/shorewall-lite show routing >> /var/log/lsm
+exit 0
Index: patches/120-LOGFILE.patch
===================================================================
--- patches/120-LOGFILE.patch (Revision 32030)
+++ patches/120-LOGFILE.patch (Arbeitskopie)
@@ -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
Index: patches/110-MODULESDIR.patch
===================================================================
--- patches/110-MODULESDIR.patch (Revision 32030)
+++ patches/110-MODULESDIR.patch (Arbeitskopie)
@@ -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"
Index: Makefile
===================================================================
--- Makefile (Revision 32030)
+++ Makefile (Arbeitskopie)
@@ -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 @@
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
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
