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

[PATCH] Shorewall-lite and shorewall6-lite upgraded to 4.4

Browse Source 
Upgrades shorewall to 4.4 and removes some packages useful only to shorewall 3.
Signed-off-by: Matthew King <matthew.king@monnsta.net>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@19191 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow
2010-01-17 17:33:30 +00:00
parent d70caff5e7
commit 23a3fbb01e
12 changed files with 46 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ipv6/shorewall6-lite/Makefile
View File

@ -8,19 +8,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall6-lite
PKG_VERSION:=4.2.11.2
PKG_VERSION_DIR:=4.2.11
PKG_VERSION:=4.4.5.4
PKG_DIRECTORY:=4.4.5
PKG_RELEASE:=1
PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ \
http://www1.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ \
http://slovakia.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ \
http://shorewall.de/pub/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ \
http://www.shorewall.com.au/4.2/shorewall-$(PKG_VERSION_DIR)/ \
http://shorewall.infohiiway.com/pub/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/ \
http://www.shorewall.com.ar/pub/shorewall/shorewall/4.2/shorewall-$(PKG_VERSION_DIR)/
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)/ \
http://slovakia.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
http://shorewall.de/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
http://www.shorewall.com.au/4.4/shorewall-$(PKG_DIRECTORY)/ \
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:=ade665881a4bb0b5592276e8d90c4681
PKG_MD5SUM:=498f622be657df38beec256876adabb6
include $(INCLUDE_DIR)/package.mk

8
ipv6/shorewall6-lite/patches/110-MODULESDIR.patch
View File

@ -4,8 +4,8 @@
[ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
- [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter
+ [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)
- [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched
+ [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched:/lib/modules/$(uname -r)
MODULES=$(lsmod | cut -d ' ' -f1)
for directory in $(split $MODULESDIR); do
@ -13,8 +13,8 @@
[ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ]
[ -z "$MODULESDIR" ] && \
- MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter
+ MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)
- MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched
+ MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched:/lib/modules/$(uname -r)
for directory in $(split $MODULESDIR); do
[ -d $directory ] && moduledirectories="$moduledirectories $directory"

23
ipv6/shorewall6-lite/patches/120-LOGFILE.patch
View File

@ -1,20 +1,11 @@
--- a/shorewall6-lite 2009-12-05 22:35:20.000000000 -0500
+++ b/shorewall6-lite 2009-12-05 22:35:27.000000000 -0500
@@ -95,7 +95,7 @@
if ( ps ax 2> /dev/null | grep -v grep | qt grep 'syslogd.*-C' ) ; then
LOGREAD="logread | tac"
- elif [ -f $LOGFILE ]; then
+ elif [ -r $LOGFILE ]; then
LOGREAD="tac $LOGFILE"
else
echo "LOGFILE ($LOGFILE) does not exist!" >&2
--- a/shorewall6-lite.conf 2009-12-05 22:37:43.000000000 -0500
+++ b/shorewall6-lite.conf 2009-12-05 22:37:51.000000000 -0500
@@ -46,4 +46,6 @@
RESTOREFILE=
@@ -28,7 +28,7 @@
# L O G G I N G
###############################################################################
-LOGFILE=
+LOGFILE=/dev/null
+
#LAST LINE -- DO NOT REMOVE
LOGFORMAT=

2
ipv6/shorewall6-lite/patches/130-portability.patch
View File

@ -1,6 +1,6 @@
--- a/install.sh
+++ b/install.sh
@@ -337,13 +337,15 @@ cd manpages
@@ -294,13 +294,15 @@ cd manpages
for f in *.5; do
gzip -c $f > $f.gz