[package] update shorewall-lite to 4.4.12.2
authorFlorian Fainelli <florian@openwrt.org>
Sun, 24 Oct 2010 13:20:25 +0000 (13:20 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Sun, 24 Oct 2010 13:20:25 +0000 (13:20 +0000)
This simply updates shorewall-lite to the (at least near) current
4.4.12.2

Signed-off-by: Brian J. Murrell <brian <at> interlinx.bc.ca>
SVN-Revision: 23617

net/shorewall-lite/Makefile
net/shorewall-lite/patches/100-hostname.patch [deleted file]
net/shorewall-lite/patches/110-MODULESDIR.patch
net/shorewall-lite/patches/130-portability.patch [deleted file]

index c0be48395c8252ec7448088a5df0b94eb11f38fc..4e874ba732fd8e0b1003e7870d677c68b013f08f 100644 (file)
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall-lite
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall-lite
-PKG_VERSION:=4.4.5.4
-PKG_DIRECTORY:=4.4.5
+PKG_VERSION:=4.4.12.2
+PKG_DIRECTORY:=4.4.12
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://www.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
        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:=3e8fb21ccff0f2c7503d8c3bf8607dd7
+PKG_MD5SUM:=b030e988c36fc1ef8c0e27447faef2a6
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -49,6 +49,7 @@ endef
 define Package/shorewall-lite/install
        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_DIR) $(1)/etc/init.d
 define Package/shorewall-lite/install
        $(INSTALL_DIR) $(1)/sbin
        $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_DIR) $(1)/etc/lsm/script.d
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
        $(INSTALL_DIR) $(1)/etc/shorewall-lite
        $(INSTALL_DIR) $(1)/usr/share
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
        $(INSTALL_DIR) $(1)/etc/shorewall-lite
        $(INSTALL_DIR) $(1)/usr/share
diff --git a/net/shorewall-lite/patches/100-hostname.patch b/net/shorewall-lite/patches/100-hostname.patch
deleted file mode 100644 (file)
index 97907fe..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/shorewall-lite
-+++ b/shorewall-lite
-@@ -153,7 +153,7 @@
-     export VERBOSE
--    [ -n "${HOSTNAME:=$(hostname)}" ]
-+    [ -n "${HOSTNAME:=$(${SHAREDIR}/hostname)}" ]
- }
index 08afb67dc233d96bdd85c58221bb9b61d23dc8c9..a947709121e6e7cee0e995db44b0ac79d10d0029 100644 (file)
@@ -1,5 +1,5 @@
---- a/lib.base
-+++ b/lib.base
+--- a/lib.common
++++ b/lib.common
 @@ -220,7 +220,7 @@ reload_kernel_modules() {
  
      [ -z "$MODULESDIR" ] && \
 @@ -220,7 +220,7 @@ reload_kernel_modules() {
  
      [ -z "$MODULESDIR" ] && \
diff --git a/net/shorewall-lite/patches/130-portability.patch b/net/shorewall-lite/patches/130-portability.patch
deleted file mode 100644 (file)
index 3bf7de2..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/install.sh
-+++ b/install.sh
-@@ -295,13 +295,15 @@ cd manpages
- for f in *.5; do
-     gzip -c $f > $f.gz
--    run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
-+    run_install -d ${PREFIX}/usr/share/man/man5
-+    run_install -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
-     echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man5/$f.gz"
- done
- for f in *.8; do
-     gzip -c $f > $f.gz
--    run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
-+    run_install -d ${PREFIX}/usr/share/man/man8
-+    run_install -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
-     echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man8/$f.gz"
- done