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

Modified Files:
        buildtool.cfg buildtool.mk 
Added Files:
        compiler functions 
Log Message:
include errata for 3.2.7


--- NEW FILE: functions ---
#!/bin/sh
#
# Shorewall 3.2 -- /usr/share/shorewall/functions
#
#     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])
#
#       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.
#
#       This program is distributed in the hope that it will be useful,
#       but WITHOUT ANY WARRANTY; without even the implied warranty of
#       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#       GNU General Public License for more details.
#
[...3159 lines suppressed...]
    strip_file hosts
    #
    # Check out the user's shell
    #
    [ -n "${SHOREWALL_SHELL:=/bin/sh}" ]

    temp=$(decodeaddr 192.168.1.1)
    if [ $(encodeaddr $temp) != 192.168.1.1 ]; then
        fatal_error "Shell $SHOREWALL_SHELL is broken and may not be used with 
Shorewall"
    fi

    if [ -z "$KLUDGEFREE" ]; then
        rm -f $TMP_DIR/physdev
        rm -f $TMP_DIR/iprange
    fi

    qt mywhich awk && HAVEAWK=Yes || HAVEAWK=
}

SHOREWALL_LIBRARY=Loaded

Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/buildtool.cfg,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** buildtool.cfg       19 Dec 2006 12:28:19 -0000      1.13
--- buildtool.cfg       15 Jan 2007 13:45:43 -0000      1.14
***************
*** 11,14 ****
--- 11,28 ----
  </File>
  
+ #3.2.7 errata
+ <File compiler>
+       Server = cvs-sourceforge
+       Revision = HEAD
+       Directory = shorewall
+ </File>
+ 
+ <File functions>
+       Server = cvs-sourceforge
+       Revision = HEAD
+       Directory = shorewall
+ </File>
+ 
+ 
  <File buildtool.mk>
        Server = cvs-sourceforge
***************
*** 53,57 ****
                packagename=shorwall
                Version 3.2.7
!               Revision = 1
  
                Help <<EOF
--- 67,71 ----
                packagename=shorwall
                Version 3.2.7
!               Revision = 2
  
                Help <<EOF

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/buildtool.mk,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** buildtool.mk        19 Dec 2006 12:28:19 -0000      1.12
--- buildtool.mk        15 Jan 2007 13:45:43 -0000      1.13
***************
*** 15,18 ****
--- 15,22 ----
        cat $(SHOREWALL_LRP_DIFF)       | patch -d $(SHOREWALL_DIR) -p1
        cat $(SHOREWALL_CONFIG_DIFF)    | patch -d $(SHOREWALL_DIR) -p1
+ 
+ #errata
+       cp -a compiler $(SHOREWALL_DIR)/compiler
+       cp -a functions $(SHOREWALL_DIR)/functions
  #     cat $(SHOREWALL_PATCH_1)        | patch -d $(SHOREWALL_DIR)
  
***************
*** 26,29 ****
--- 30,35 ----
        ./stripscript.pl $(SHOREWALL_DIR)/functions
        ./stripscript.pl $(SHOREWALL_DIR)/shorewall
+ 
+       cp init.sh $(SHOREWALL_DIR)
        mkdir -p $(TARGET_DIR)
        (cd $(SHOREWALL_DIR); env PREFIX=$(TARGET_DIR) ./install.sh)

--- 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.
#
[...8439 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