[leaf-commits] src/bering-uclibc4/source/shorewall-lite buildtool.cfg, 1.3, 1.4 buildtool.mk, 1.2, 1.3 common.cfg, 1.1, 1.2 init.leaf, 1.1, 1.2

Update of /cvsroot/leaf/src/bering-uclibc4/source/shorewall-lite
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13648

Modified Files:
	buildtool.cfg buildtool.mk common.cfg init.leaf 
Log Message:
improve setup


Index: init.leaf
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall-lite/init.leaf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** init.leaf	30 Nov 2010 14:46:12 -0000	1.1
--- init.leaf	4 Dec 2010 22:07:38 -0000	1.2
***************
*** 9,15 ****
  # /etc/default/shorewall
  
! if [ -f "/etc/default/shorewall" ]
  then
! 	. /etc/default/shorewall
  fi
  
--- 9,15 ----
  # /etc/default/shorewall
  
! if [ -f "/etc/default/shorewall-lite" ]
  then
! 	. /etc/default/shorewall-lite
  fi
  

Index: common.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall-lite/common.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** common.cfg	30 Nov 2010 14:46:12 -0000	1.1
--- common.cfg	4 Dec 2010 22:07:38 -0000	1.2
***************
*** 13,19 ****
  			</File>
  			<File>
! 				Filename    = usr/share/shorewall-lite/
! 				Type	    = local
  			</File>
  			<File>
  				Filename    = usr/share/shorewall-lite/wait4ifup
--- 13,27 ----
  			</File>
  			<File>
! 				Target       = sbin/shorewall-lite
! 				Filename     = sbin/shorewall
! 				Type	     = link
! 			</File>
! 
! 
! 			<File>
! 				Filename    = usr/share/shorewall-lite/ 
! 				Type        = local
  			</File>
+ 
  			<File>
  				Filename    = usr/share/shorewall-lite/wait4ifup
***************
*** 69,72 ****
--- 77,81 ----
  				Filename    = var/lib/shorewall-lite/
  				Type	    = directory
+ 				Type        = local
  			</File>
  			<File>
***************
*** 78,83 ****
  				Type        = local
  			</File>
  			<File>
! 				Filename    = etc/shorewall/
! 				Type	    = local
  			</File>
--- 87,97 ----
  				Type        = local
  			</File>
+ 
  			<File>
! 				Filename    = etc/shorewall-lite/shorewall-lite.conf
! 				Source      = etc/shorewall-lite/shorewall-lite.conf
! 				Description = Config    Shorewall-lite Global Parameters
! 				Type        = binary
! 				Type        = conf
! 				Type        = local
  			</File>

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall-lite/buildtool.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.mk	1 Dec 2010 15:45:17 -0000	1.2
--- buildtool.mk	4 Dec 2010 22:07:38 -0000	1.3
***************
*** 13,29 ****
  $(SHOREWALL_DIR)/.source:
  	zcat $(SHOREWALL_SOURCE) | tar -xvf -
- #	cat $(SHOREWALL_LRP_DIFF)	| patch -d $(SHOREWALL_DIR) -p1
- #	cat $(SHOREWALL_CONFIG_DIFF)	| patch -d $(SHOREWALL_DIR) -p1
  	touch $(SHOREWALL_DIR)/.source
  
- #errata
- #	cp compiler $(SHOREWALL_DIR)	
  
  $(SHOREWALL_DIR)/.build: $(SHOREWALL_DIR)/.source
- #	cp $(SHOREWALL_DIR)/init.debian.sh $(SHOREWALL_DIR)/init.sh
  	mkdir -p $(TARGET_DIR)
  	(cd $(SHOREWALL_DIR); env PREFIX=$(TARGET_DIR) ./install.sh)
  	
- #	chmod 755 $(TARGET_DIR)/usr/share/shorewall/firewall
  	mkdir -p $(TARGET_DIR)/etc/default
  	install -c $(SHOREWALL_DEFAULT) $(TARGET_DIR)/etc/default/shorewall-lite
--- 13,23 ----
***************
*** 44,54 ****
  
  stageclean:
! 	rm -f  $(BT_STAGING_DIR)/etc/init.d/shorewall
! 	rm -f  $(BT_STAGING_DIR)/etc/default/shorewall
! 	rm -f  $(BT_STAGING_DIR)/sbin/shorewall
! 	rm -rf $(BT_STAGING_DIR)/etc/shorewall
! 	rm -rf $(BT_STAGING_DIR)/usr/share/shorewall
! 	rm -rf $(BT_STAGING_DIR)/var/lib/shorewall
! 	rm -rf $(BT_STAGING_DIR)/var/state/shorewall
  
  srcclean: clean
--- 38,48 ----
  
  stageclean:
! 	rm -f  $(BT_STAGING_DIR)/etc/init.d/shorewall-lite
! 	rm -f  $(BT_STAGING_DIR)/etc/default/shorewall-lite
! #	rm -f  $(BT_STAGING_DIR)/sbin/shorewall
! #	rm -rf $(BT_STAGING_DIR)/etc/shorewall
! #	rm -rf $(BT_STAGING_DIR)/usr/share/shorewall
! #	rm -rf $(BT_STAGING_DIR)/var/lib/shorewall
! #	rm -rf $(BT_STAGING_DIR)/var/state/shorewall
  
  srcclean: clean

Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall-lite/buildtool.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.cfg	3 Dec 2010 07:11:40 -0000	1.3
--- buildtool.cfg	4 Dec 2010 22:07:38 -0000	1.4
***************
*** 44,47 ****
--- 44,48 ----
  		Shoreline Firewall (Shorewall) 
  		This is the lite version of shorewall.
+ 		shorewall-lite does not require perl to be installed on the router.
  		Homepage: http://www.shorewall.net
  		Requires: iptables.lrp 


------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly 
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus 
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d