projects / openwrt / svn-archive / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 11860ac)
shorewall-lite: update to 4.4.27.3
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 18 Jun 2012 23:49:27 +0000 (23:49 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 18 Jun 2012 23:49:27 +0000 (23:49 +0000)
This patch updates shorewall-lite to stable release 4.4.27.3 and the lsm_script

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

net/shorewall-lite/Makefile patch | blob | history
net/shorewall-lite/files/lsm_script patch | blob | history
net/shorewall-lite/files/shorewall-lite.init patch | blob | history
net/shorewall-lite/patches/110-MODULESDIR.patch patch | blob | history
net/shorewall-lite/patches/120-LOGFILE.patch patch | blob | history

diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile
index 9ae669826c11802292bfa1dcf06fd733062cb40b..3611624066b96131d9ea165ee06b5d9657712275 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.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
 
diff --git a/net/shorewall-lite/files/lsm_script b/net/shorewall-lite/files/lsm_script
index f0ccb341730414125a8e4b0e50f5bcc0ea801d59..e8310a31f1de42047f3521657dfbb6a42bc2ddc3 100644 (file)
--- a/net/shorewall-lite/files/lsm_script
+++ b/net/shorewall-lite/files/lsm_script
@@ -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
diff --git a/net/shorewall-lite/files/shorewall-lite.init b/net/shorewall-lite/files/shorewall-lite.init
index fb081f3c5ce0df00d2c33581415f86cadbee8e80..777683a89a9638b982a45dc147e42ff1dbfa17a9 100644 (file)
--- a/net/shorewall-lite/files/shorewall-lite.init
+++ b/net/shorewall-lite/files/shorewall-lite.init
@@ -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() {
diff --git a/net/shorewall-lite/patches/110-MODULESDIR.patch b/net/shorewall-lite/patches/110-MODULESDIR.patch
index bdb5de2377fec0fb19c38b02b6d6ee0ef3f963b6..e499d1c08e5f58baf7eced88e2de1712e3b8e0b8 100644 (file)
--- a/net/shorewall-lite/patches/110-MODULESDIR.patch
+++ b/net/shorewall-lite/patches/110-MODULESDIR.patch
@@ -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"
diff --git a/net/shorewall-lite/patches/120-LOGFILE.patch b/net/shorewall-lite/patches/120-LOGFILE.patch
index 5a70fd4debc048c8e22b56feb47fa9ea68bb2214..70c625657f41df557b4a3db6d513d648b1d2518d 100644 (file)
--- a/net/shorewall-lite/patches/120-LOGFILE.patch
+++ b/net/shorewall-lite/patches/120-LOGFILE.patch
@@ -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
OpenWrt package feed branches, manually converted from SVN.