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
Show Stats 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

52
net/shorewall-common/Makefile
View File

@ -1,52 +0,0 @@
#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-common
PKG_VERSION:=4.2.7
PKG_RELEASE:=1
PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_MD5SUM:=47f51b083bdea3904ffaf3a3c9317526
include $(INCLUDE_DIR)/package.mk
define Package/shorewall-common
SECTION:=net
CATEGORY:=Network
DEPENDS:=+shorewall-shell
TITLE:=Shorewall
URL:=http://www.shorewall.net/
SUBMENU:=firewall
PKGARCH:=all
endef
define Package/shorewall-common/description
Shorewall Firewall is an iptables-based firewall for Linux.
endef
define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
PREFIX=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
endef
define Package/shorewall-common/install
$(INSTALL_DIR) $(1)/sbin
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/usr/share
$(INSTALL_DIR) $(1)/bin
$(INSTALL_BIN) ./files/shorewall.init $(1)/etc/init.d/shorewall
$(INSTALL_BIN) ./files/hostname $(1)/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/shorewall $(1)/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall $(1)/usr/share
$(CP) $(PKG_INSTALL_DIR)/etc/shorewall $(1)/etc
endef
$(eval $(call BuildPackage,shorewall-common))

2
net/shorewall-common/files/hostname
View File

@ -1,2 +0,0 @@
#!/bin/sh
cat /proc/sys/kernel/hostname

31
net/shorewall-common/files/shorewall.init
View File

@ -1,31 +0,0 @@
#!/bin/sh /etc/rc.common
START=46
start() {
touch /var/log/messages
mkdir -p /var/lock/subsys
/sbin/shorewall -f start 1>/dev/null &
}
stop() {
/sbin/shorewall stop 1>/dev/null
}
restart() {
if [ -f /var/lib/shorewall/restore ] ; then
/sbin/shorewall restore
else
/sbin/shorewall restart 1>/dev/null
fi
}
refresh() {
/sbin/shorewall refresh
}
check() {
/sbin/shorewall check
}
reset() {
/sbin/shorewall reset
}

19
net/shorewall-lite/Makefile
View File

@ -8,18 +8,19 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-lite
PKG_VERSION:=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)/ \
http://www1.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/ \
http://slovakia.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/ \
http://shorewall.de/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/ \
http://www.shorewall.com.au/4.2/shorewall-$(PKG_VERSION)/ \
http://shorewall.infohiiway.com/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/ \
http://www.shorewall.com.ar/pub/shorewall/shorewall/4.2/shorewall-$(PKG_VERSION)/
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:=cb34824f076fdff6b7457d85e124ea74
PKG_MD5SUM:=3e8fb21ccff0f2c7503d8c3bf8607dd7
include $(INCLUDE_DIR)/package.mk

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

@ -1,20 +1,20 @@
--- a/lib.base
+++ b/lib.base
@@ -267,7 +267,7 @@ reload_kernel_modules() {
@@ -220,7 +220,7 @@ reload_kernel_modules() {
[ -z "$MODULESDIR" ] && \
uname=$(uname -r) && \
- MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/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/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname
- 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
MODULES=$(lsmod | cut -d ' ' -f1)
@@ -306,7 +306,7 @@ load_kernel_modules() # $1 = Yes, if we
@@ -259,7 +259,7 @@ load_kernel_modules() # $1 = Yes, if we
[ -z "$MODULESDIR" ] && \
uname=$(uname -r) && \
- MODULESDIR=/lib/modules/$uname/kernel/net/ipv4/netfilter:/lib/modules/$uname/kernel/net/netfilter:/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/extra:/lib/modules/$uname/extra/ipset:/lib/modules/$uname
- 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
for directory in $(split $MODULESDIR); do
[ -d $directory ] && moduledirectories="$moduledirectories $directory"

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

@ -1,20 +1,11 @@
--- a/shorewall-lite 2009-12-05 22:35:20.000000000 -0500
+++ b/shorewall-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/shorewall-lite.conf 2009-12-05 22:37:43.000000000 -0500
+++ b/shorewall-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
net/shorewall-lite/patches/120-portability.patch → net/shorewall-lite/patches/130-portability.patch
View File

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

44
net/shorewall-shell/Makefile
View File

@ -1,44 +0,0 @@
#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=shorewall-shell
PKG_VERSION:=4.2.7
PKG_RELEASE:=1
PKG_SOURCE_URL:=http://www1.shorewall.net/pub/shorewall/4.2/shorewall-$(PKG_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_MD5SUM:=c5555ef10e493af3d3ad40785bf33caa
include $(INCLUDE_DIR)/package.mk
define Package/shorewall-shell
SECTION:=net
CATEGORY:=Network
DEPENDS:=+iptables +iptables-mod-extra +ip
TITLE:=Shorewall Shell
URL:=http://www.shorewall.net/
SUBMENU:=firewall
endef
define Package/shorewall-shell/description
Shoreline Firewall shell-based compiler.
endef
define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
PREFIX=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh
endef
define Package/shorewall-shell/install
$(INSTALL_DIR) $(1)/usr/share
$(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall-shell $(1)/usr/share
endef
$(eval $(call BuildPackage,shorewall-shell))