This patch updates shorewall6-lite to current stable release 4.5.7 Please note:
The new package shorewall-core 4.5.7 is required by this shorewall-lite version and perlbase-digest. Signed-off-by: Edy Corak [email protected]
Index: Makefile =================================================================== --- Makefile (Revision 33271) +++ Makefile (Arbeitskopie) @@ -8,33 +8,39 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall6-lite -PKG_VERSION:=4.4.22.2 -PKG_DIRECTORY:=4.4.22 -PKG_RELEASE:=2 +PKG_VERSION:=4.5.7 +PKG_DIRECTORY:=4.5.7 +PKG_RELEASE:=1 -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_URL:=http://www.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \ + http://www1.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \ + http://slovakia.shorewall.net/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \ + http://shorewall.de/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \ + http://www.shorewall.com.au/4.5/shorewall-$(PKG_DIRECTORY)/ \ + http://shorewall.infohiiway.com/pub/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ \ + http://www.shorewall.com.ar/pub/shorewall/shorewall/4.5/shorewall-$(PKG_DIRECTORY)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=3ad7ba3790388bb562d3c937ba02fa31 +PKG_MD5SUM:=16a78da4e289e6e8e2f77224a8a94ab4 include $(INCLUDE_DIR)/package.mk define Package/shorewall6-lite SECTION:=ipv6 CATEGORY:=IPv6 - DEPENDS:=+ip +ip6tables + DEPENDS:=+ip +ip6tables +shorewall-core +perlbase-digest TITLE:=Shorewall6 Lite URL:=http://www.shorewall.net/ SUBMENU:=Firewall endef define Package/shorewall6-lite/description - Shoreline Firewall 6 Lite is an iptables-based firewall for Linux systems. + The Shoreline Firewall 6, is high-level tool for configuring Netfilter. + + Shorewall allows for central administration of multiple IPv6 firewalls + through use of Shorewall6 lite. The full Shorewall and Shorewall6 products + are installed on a central administrative system where compiled Shorewall + scripts are generated. These scripts are copied to the firewall systems + where they run under the control of Shorewall6-lite. endef define Package/shorewall6-lite/conffiles @@ -42,22 +48,24 @@ /etc/shorewall6-lite/vardir endef +CONFIGURE_ARGS += \ + vendor=linux + define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - PREFIX=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh + DESTDIR=$(PKG_INSTALL_DIR) $(PKG_BUILD_DIR)/install.sh endef define Package/shorewall6-lite/install $(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(INSTALL_DIR) $(1)/etc/shorewall6-lite + $(INSTALL_DIR) $(1)/etc/shorewall6-lite/state $(INSTALL_DIR) $(1)/usr/share $(INSTALL_BIN) ./files/shorewall-lite.init $(1)/etc/init.d/shorewall6-lite $(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall6-lite - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/shorewall6-lite $(1)/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/shorewall6-lite $(1)/sbin $(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall6-lite $(1)/usr/share + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall6-lite/shorecap $(1)/usr/share/shorewall6-lite $(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall6-lite $(CP) $(PKG_INSTALL_DIR)/etc/shorewall6-lite $(1)/etc $(CP) ./files/vardir $(1)/etc/shorewall6-lite Index: files/shorewall-lite.init =================================================================== --- files/shorewall-lite.init (Revision 33271) +++ files/shorewall-lite.init (Arbeitskopie) @@ -4,7 +4,7 @@ start() { touch /var/log/messages mkdir -p /var/lock/subsys - /sbin/shorewall6-lite -qq start -f + /sbin/shorewall6-lite -qq start } stop() { Index: patches/120-LOGFILE.patch =================================================================== --- patches/120-LOGFILE.patch (Revision 33271) +++ patches/120-LOGFILE.patch (Arbeitskopie) @@ -1,5 +1,5 @@ ---- a/shorewall6-lite.conf 2009-12-05 22:37:43.000000000 -0500 -+++ b/shorewall6-lite.conf 2009-12-05 22:37:51.000000000 -0500 +--- a/shorewall6-lite.conf 2012-08-19 15:43:25.000000000 +0200 ++++ b/shorewall6-lite.conf 2012-08-25 13:06:04.204100652 +0200 @@ -28,7 +28,7 @@ # L O G G I N G ############################################################################### @@ -7,4 +7,5 @@ -LOGFILE= +LOGFILE=/dev/null - + ############################################################################### + # 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 Index: patches/110-MODULESDIR.patch =================================================================== --- patches/110-MODULESDIR.patch (Revision 33271) +++ patches/110-MODULESDIR.patch (Arbeitskopie) @@ -1,20 +0,0 @@ ---- a/lib.common -+++ b/lib.common -@@ -292,7 +292,7 @@ - - [ -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:/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 -@@ -328,7 +328,7 @@ - [ -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:/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" Index: patches/100-shorewallrc.default.patch =================================================================== --- patches/100-shorewallrc.default.patch (Revision 0) +++ patches/100-shorewallrc.default.patch (Revision 0) @@ -0,0 +1,26 @@ +--- a/shorewallrc.default 2012-08-08 17:42:31.000000000 +0200 ++++ b/shorewallrc.default 2012-08-13 11:53:38.479048989 +0200 +@@ -2,7 +2,7 @@ + # Default Shorewall 4.5 rc file + # + HOST=linux #Generic Linux +-BUILD= #Default is to detect the build system ++BUILD=linux #Default is to detect the build system + PREFIX=/usr #Top-level directory for shared files, libraries, etc. + SHAREDIR=${PREFIX}/share #Directory for arch-neutral files. + LIBEXECDIR=${PREFIX}/share #Directory for executable scripts. +@@ -10,7 +10,7 @@ + CONFDIR=/etc #Directory where subsystem configurations are installed + SBINDIR=/sbin #Directory where system administration programs are installed + MANDIR=${PREFIX}/man #Directory where manpages are installed. +-INITDIR=etc/init.d #Directory where SysV init scripts are installed. ++INITDIR=/etc/init.d #Directory where SysV init scripts are installed. + INITFILE=$PRODUCT #Name of the product's installed SysV init script + INITSOURCE=init.sh #Name of the distributed file to be installed as the SysV init script + ANNOTATED= #If non-zero, annotated configuration files are installed +@@ -18,4 +18,4 @@ + SYSCONFFILE= #Name of the distributed file to be installed in $SYSCONFDIR + SYSCONFDIR= #Directory where SysV init parameter files are installed + SPARSE= #If non-empty, only install $PRODUCT/$PRODUCT.conf in $CONFDIR +-VARDIR=/var/lib #Directory where product variable data is stored. ++VARDIR=/etc/shorewall6-lite/state #Directory where product variable data is stored.
signature.asc
Description: Digital signature
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
