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

Modified Files:
        buildtool.cfg buildtool.mk shorewall-lrp.diff 
Log Message:
3.4.2 plus errata


Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/buildtool.cfg,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** buildtool.cfg       17 Mar 2007 14:56:05 -0000      1.21
--- buildtool.cfg       30 Apr 2007 17:14:41 -0000      1.22
***************
*** 5,14 ****
  </Server>
  
! <File shorewall-3.4.1.tgz>
        Server = shorewall-net
!       Directory = 3.4/shorewall-3.4.1
        Envname = SHOREWALL_SOURCE
  </File>
  
  
  <File buildtool.mk>
--- 5,32 ----
  </Server>
  
! <File shorewall-3.4.2.tgz>
        Server = shorewall-net
!       Directory = 3.4/shorewall-3.4.2
        Envname = SHOREWALL_SOURCE
  </File>
  
+ #3.4.2 errata
+ <File lib.config>
+       Server = shorewall-net
+       Directory = 3.4/shorewall-3.4.2/errata/Shorewall
+ </File>
+ <File lib.base>
+       Server = shorewall-net
+       Directory = 3.4/shorewall-3.4.2/errata/Shorewall
+ </File>
+ <File shorewall>
+       Server = shorewall-net
+       Directory = 3.4/shorewall-3.4.2/errata/Shorewall
+ </File>
+ <File lib.maclist>
+       Server = shorewall-net
+       Directory = 3.4/shorewall-3.4.2/errata/Shorewall
+ </File>
+ #3.4.2 errata
  
  <File buildtool.mk>
***************
*** 107,111 ****
        <shorwall-basic>
                packagename=shorwall
!               Version 3.4.1
                Revision = 1
  
--- 125,129 ----
        <shorwall-basic>
                packagename=shorwall
!               Version 3.4.2
                Revision = 1
  
***************
*** 133,137 ****
        </shorwall-basic>
        <shorwall-maclist>
!                       Version 3.4.1
                Revision = 1
  
--- 151,155 ----
        </shorwall-basic>
        <shorwall-maclist>
!                       Version 3.4.2
                Revision = 1
  
***************
*** 159,163 ****
  
        <shorwall-accounting>
!                       Version 3.4.1
                Revision = 1
  
--- 177,181 ----
  
        <shorwall-accounting>
!                       Version 3.4.2
                Revision = 1
  
***************
*** 185,189 ****
  
        <shorwall-providers>
!                       Version 3.4.1
                Revision = 1
  
--- 203,207 ----
  
        <shorwall-providers>
!                       Version 3.4.2
                Revision = 1
  
***************
*** 210,214 ****
        </shorwall-providers>
        <shorwall-dynamiczones>
!                       Version 3.4.1
                Revision = 1
  
--- 228,232 ----
        </shorwall-providers>
        <shorwall-dynamiczones>
!                       Version 3.4.2
                Revision = 1
  
***************
*** 235,239 ****
        </shorwall-dynamiczones>
        <shorwall-proxyarp>
!                       Version 3.4.1
                Revision = 1
  
--- 253,257 ----
        </shorwall-dynamiczones>
        <shorwall-proxyarp>
!                       Version 3.4.2
                Revision = 1
  
***************
*** 260,264 ****
        </shorwall-proxyarp>
        <shorwall-tunnels>
!                       Version 3.4.1
                Revision = 1
  
--- 278,282 ----
        </shorwall-proxyarp>
        <shorwall-tunnels>
!                       Version 3.4.2
                Revision = 1
  
***************
*** 285,289 ****
        </shorwall-tunnels>
        <shorwall-tcrules>
!                       Version 3.4.1
                Revision = 1
  
--- 303,307 ----
        </shorwall-tunnels>
        <shorwall-tcrules>
!                       Version 3.4.2
                Revision = 1
  
***************
*** 310,314 ****
        </shorwall-tcrules>
        <shorwall-tc>
!               Version 3.4.1
                Revision = 1
  
--- 328,332 ----
        </shorwall-tcrules>
        <shorwall-tc>
!               Version 3.4.2
                Revision = 1
  
***************
*** 337,341 ****
        <shorwall>
                packagename=shorwall
!               Version 3.4.1
                Revision = 1
  
--- 355,359 ----
        <shorwall>
                packagename=shorwall
!               Version 3.4.2
                Revision = 1
  

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/buildtool.mk,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** buildtool.mk        17 Mar 2007 14:56:05 -0000      1.21
--- buildtool.mk        30 Apr 2007 17:14:41 -0000      1.22
***************
*** 9,13 ****
  TARGET_DIR=$(BT_BUILD_DIR)/shorewall
  
! SHOREWALL_DIR:=shorewall-3.4.1
  
  $(SHOREWALL_DIR)/.source:
--- 9,13 ----
  TARGET_DIR=$(BT_BUILD_DIR)/shorewall
  
! SHOREWALL_DIR:=shorewall-3.4.2
  
  $(SHOREWALL_DIR)/.source:
***************
*** 19,22 ****
--- 19,28 ----
  $(SHOREWALL_DIR)/.build: $(SHOREWALL_DIR)/.source
        chmod 755 ./stripscript.pl
+ #errata
+       cp lib.base $(SHOREWALL_DIR)    
+       cp lib.config $(SHOREWALL_DIR)  
+       cp lib.maclist $(SHOREWALL_DIR) 
+       cp shorewall $(SHOREWALL_DIR)   
+ 
        ./stripscript.pl $(SHOREWALL_DIR)/firewall
  #     ./stripscript.pl $(SHOREWALL_DIR)/shorewall.conf

Index: shorewall-lrp.diff
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/shorewall-lrp.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shorewall-lrp.diff  27 Jan 2007 18:09:13 -0000      1.2
--- shorewall-lrp.diff  30 Apr 2007 17:14:41 -0000      1.3
***************
*** 78,114 ****
   BRIDGING=No
   
- diff -urN shorewall-3.4.0-Beta3.orig/install.sh 
shorewall-3.4.0-Beta3/install.sh
- --- shorewall-3.4.0-Beta3.orig/install.sh     2007-01-22 17:04:11.000000000 
+0100
- +++ shorewall-3.4.0-Beta3/install.sh  2007-01-22 22:18:25.000000000 +0100
- @@ -673,29 +673,6 @@
-      ln -s ${DEST}/${INIT} /usr/share/shorewall/init
-  fi
-  
- -#
- -# Install the Man Pages
- -#
- -
- -rm -f *.gz
- -
- -cd manpages
- -
- -for f in *.5; do
- -    gzip $f
- -    run_install -D  -m 0444 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
- -    echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
- -done
- -
- -for f in *.8; do
- -    gzip $f
- -    run_install -D  -m 0444 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
- -    echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
- -done
- -
- -cd ..
- -
- -echo "Man Pages Installed"
-  
-  #
-  # Install the firewall script
  diff -urN shorewall-3.4.0-Beta3.orig/init.debian.sh 
shorewall-3.4.0-Beta3/init.debian.sh
  --- shorewall-3.4.0-Beta3.orig/init.debian.sh 2006-06-12 19:48:20.000000000 
+0200
--- 78,81 ----
***************
*** 224,225 ****
--- 191,225 ----
   }
   
+ diff -urN shorewall-3.4.2.orig/install.sh shorewall-3.4.2/install.sh
+ --- shorewall-3.4.2.orig/install.sh   2007-04-02 01:33:26.000000000 +0200
+ +++ shorewall-3.4.2/install.sh        2007-04-30 19:00:56.000000000 +0200
+ @@ -674,29 +674,6 @@
+  fi
+  
+  #
+ -# Install the Man Pages
+ -#
+ -
+ -cd manpages
+ -
+ -rm -f *.gz
+ -
+ -for f in *.5; do
+ -    gzip $f
+ -    run_install -D  -m 0444 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
+ -    echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
+ -done
+ -
+ -for f in *.8; do
+ -    gzip $f
+ -    run_install -D  -m 0444 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
+ -    echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
+ -done
+ -
+ -cd ..
+ -
+ -echo "Man Pages Installed"
+ -
+  #
+  # Install the firewall script
+  #


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits

Reply via email to