Update of /cvsroot/leaf/src/bering-uclibc/apps/shorewall
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18884

Modified Files:
        buildtool.cfg buildtool.mk 
Added Files:
        compiler 
Log Message:
new upstream version 3.2.4 (incl. errata)


Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/buildtool.cfg,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** buildtool.cfg       27 Aug 2006 18:21:06 -0000      1.8
--- buildtool.cfg       4 Oct 2006 17:23:26 -0000       1.9
***************
*** 5,11 ****
  </Server>
  
! <File shorewall-3.2.3.tgz>
        Server = shorewall-net
!       Directory = 3.2/shorewall-3.2.3
        Envname = SHOREWALL_SOURCE
  </File>
--- 5,11 ----
  </Server>
  
! <File shorewall-3.2.4.tgz>
        Server = shorewall-net
!       Directory = 3.2/shorewall-3.2.4
        Envname = SHOREWALL_SOURCE
  </File>
***************
*** 25,28 ****
--- 25,35 ----
  </File>
  
+ #3.2.4 errata
+ <File compiler>
+       Server = cvs-sourceforge
+       Revision = HEAD
+       Directory = shorewall
+ </File>
+ 
  # This patch provides the Bering-uClibc specific configuration defaults
  <File shorewall-config.diff>
***************
*** 52,57 ****
        <shorwall>
                packagename=shorwall
!               Version 3.2.3
!               Revision = 2
  
                Help <<EOF
--- 59,64 ----
        <shorwall>
                packagename=shorwall
!               Version 3.2.4
!               Revision = 1
  
                Help <<EOF

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/buildtool.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** buildtool.mk        16 Sep 2006 21:18:10 -0000      1.7
--- buildtool.mk        4 Oct 2006 17:23:26 -0000       1.8
***************
*** 9,19 ****
  TARGET_DIR=$(BT_BUILD_DIR)/shorewall
  
! SHOREWALL_DIR:=shorewall-3.2.3
  
  $(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  
  
--- 9,19 ----
  TARGET_DIR=$(BT_BUILD_DIR)/shorewall
  
! SHOREWALL_DIR:=shorewall-3.2.4
  
  $(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
+       cp -a compiler $(SHOREWALL_DIR)/compiler
        touch $(SHOREWALL_DIR)/.source  
  
***************
*** 32,36 ****
        rm -rf $(TARGET_DIR)/usr/share/shorewall/configfiles
        rm -rf $(TARGET_DIR)/etc/shorewall/Makefile
!       rm -rf $(TARGET_DIR)/usr/share/shorewall/xmodules
        touch $(SHOREWALL_DIR)/.build
  
--- 32,36 ----
        rm -rf $(TARGET_DIR)/usr/share/shorewall/configfiles
        rm -rf $(TARGET_DIR)/etc/shorewall/Makefile
! #     rm -rf $(TARGET_DIR)/usr/share/shorewall/xmodules
        touch $(SHOREWALL_DIR)/.build
  
***************
*** 51,54 ****
--- 51,55 ----
        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

--- NEW FILE: compiler ---
#!/bin/sh
#
#     The Shoreline Firewall (Shorewall) Packet Filtering Firewall Compiler - 
V3.2
#
#     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
#
#     (c) 1999,2000,2001,2002,2003,2004,2005,2006 - Tom Eastep ([EMAIL 
PROTECTED])
#
#     tcstart from tc4shorewall       Version 0.5
#     (c) 2005 Arne Bernin <[EMAIL PROTECTED]>
#     Modified by Tom Eastep for integration into the Shorewall distribution
#     published under GPL Version 2#
#
#       Complete documentation is available at http://shorewall.net
#
#       This program is free software; you can redistribute it and/or modify
#       it under the terms of Version 2 of the GNU General Public License
#       as published by the Free Software Foundation.
#
[...8299 lines suppressed...]
        [ $# -ne 2 ] && usage
        do_initialize
        compile_firewall $2
        ;;

    call)
        #
        # Undocumented way to call functions in ${SHAREDIR}/compiler directly
        #
        shift
        do_initialize
        EMPTY=
        $@
        ;;

    *)
        usage
        ;;

esac


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits

Reply via email to