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>
From ac83d42571620e02b8d4b55c550e34b05aea0f21 Mon Sep 17 00:00:00 2001 From: Brian J. Murrell <br...@interlinx.bc.ca> Date: Tue, 14 Sep 2010 11:17:32 -0400 Subject: [PATCH 1/2] update shorewall-lite to 4.4.12.2 Include support for calling shorewall-lite from LSM to shorewall-lite package. --- net/shorewall-lite/Makefile | 8 +++++--- net/shorewall-lite/patches/100-hostname.patch | 11 ----------- net/shorewall-lite/patches/110-MODULESDIR.patch | 4 ++-- net/shorewall-lite/patches/130-portability.patch | 20 -------------------- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 net/shorewall-lite/patches/100-hostname.patch delete mode 100644 net/shorewall-lite/patches/130-portability.patch diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile index c0be483..bc1ac86 100644 --- a/net/shorewall-lite/Makefile +++ b/net/shorewall-lite/Makefile @@ -8,8 +8,8 @@ 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)/ \ @@ -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:=3e8fb21ccff0f2c7503d8c3bf8607dd7 +PKG_MD5SUM:=b030e988c36fc1ef8c0e27447faef2a6 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 + $(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 @@ -57,6 +58,7 @@ define Package/shorewall-lite/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/shorewall-lite $(1)/sbin $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall-lite $(1)/usr/share $(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall-lite + $(INSTALL_BIN) ./files/lsm_script $(1)/etc/lsm/script.d/45_shorewall-lite $(CP) $(PKG_INSTALL_DIR)/etc/shorewall-lite $(1)/etc $(CP) ./files/vardir $(1)/etc/shorewall-lite endef diff --git a/net/shorewall-lite/patches/100-hostname.patch b/net/shorewall-lite/patches/100-hostname.patch deleted file mode 100644 index 97907fe..0000000 --- a/net/shorewall-lite/patches/100-hostname.patch +++ /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)}" ] - - } - diff --git a/net/shorewall-lite/patches/110-MODULESDIR.patch b/net/shorewall-lite/patches/110-MODULESDIR.patch index 08afb67..a947709 100644 --- a/net/shorewall-lite/patches/110-MODULESDIR.patch +++ b/net/shorewall-lite/patches/110-MODULESDIR.patch @@ -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" ] && \ diff --git a/net/shorewall-lite/patches/130-portability.patch b/net/shorewall-lite/patches/130-portability.patch deleted file mode 100644 index 3bf7de2..0000000 --- a/net/shorewall-lite/patches/130-portability.patch +++ /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 - -- 1.7.0.4
signature.asc
Description: This is a digitally signed message part
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
