Update of /cvsroot/leaf/src/bering-uclibc4/source/shorewall6
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21496
Modified Files:
buildtool.cfg buildtool.mk shorewall6-lrp.diff
Added Files:
shorewall6-4.4.14.tgz
Log Message:
new upstream version 4.4.14
make /etc/init.d/shorewall aware of OPTIONS in /etc/default/shorewall
fix bug during boot (disable VERBOSITY)
Index: shorewall6-lrp.diff
===================================================================
RCS file:
/cvsroot/leaf/src/bering-uclibc4/source/shorewall6/shorewall6-lrp.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shorewall6-lrp.diff 31 Jul 2010 19:10:40 -0000 1.1
--- shorewall6-lrp.diff 29 Oct 2010 15:29:34 -0000 1.2
***************
*** 1,6 ****
! diff -urN shorewall6-4.4.10.2.orig/init.debian.sh
shorewall6-4.4.10.2/init.debian.sh
! --- shorewall6-4.4.10.2.orig/init.debian.sh 2010-06-25 20:16:06.000000000
+0200
! +++ shorewall6-4.4.10.2/init.debian.sh 2010-06-27 22:09:37.000000000
+0200
! @@ -1,76 +1,15 @@
#!/bin/sh
-### BEGIN INIT INFO
--- 1,45 ----
! diff -urN shorewall6-4.4.10.2.orig/shorewall6.conf
shorewall6-4.4.10.2/shorewall6.conf
! --- shorewall6-4.4.10.2.orig/shorewall6.conf 2010-07-07 19:19:54.000000000
+0200
! +++ shorewall6-4.4.10.2/shorewall6.conf 2010-07-31 19:25:36.873214208
+0200
! @@ -10,7 +10,7 @@
! # S T A R T U P E N A B L E D
!
###############################################################################
!
! -STARTUP_ENABLED=No
! +STARTUP_ENABLED=Yes
!
!
###############################################################################
! # V E R B O S I T Y
! @@ -22,7 +22,7 @@
! # L O G G I N G
!
###############################################################################
!
! -LOGFILE=/var/log/messages
! +LOGFILE=/var/log/shorewall6.log
!
! STARTUP_LOG=/var/log/shorewall6-init.log
!
! @@ -60,7 +60,7 @@
!
! SHOREWALL_SHELL=/bin/sh
!
! -SUBSYSLOCK=/var/lock/subsys/shorewall
! +SUBSYSLOCK=/var/run/shorewall6
!
! MODULESDIR=
!
! @@ -91,7 +91,7 @@
! # F I R E W A L L O P T I O N S
!
###############################################################################
!
! -IP_FORWARDING=Off
! +IP_FORWARDING=On
!
! TC_ENABLED=No
!
! diff -urN shorewall6-4.4.14.orig/init.debian.sh
shorewall6-4.4.14/init.debian.sh
! --- shorewall6-4.4.14.orig/init.debian.sh 2010-10-28 20:41:38.000000000
+0200
! +++ shorewall6-4.4.14/init.debian.sh 2010-10-29 17:23:38.192581151 +0200
! @@ -1,76 +1,16 @@
#!/bin/sh
-### BEGIN INIT INFO
***************
*** 29,32 ****
--- 68,72 ----
- exit 1;
-}
+ +VERBOSE=
-if [ "$(id -u)" != "0" ]
***************
*** 85,89 ****
wait_for_pppd () {
if [ "$wait_interface" != "" ]
! @@ -86,32 +25,28 @@
shorewall6_start () {
echo -n "Starting \"Shorewall6 firewall\": "
--- 125,129 ----
wait_for_pppd () {
if [ "$wait_interface" != "" ]
! @@ -86,32 +26,28 @@
shorewall6_start () {
echo -n "Starting \"Shorewall6 firewall\": "
***************
*** 103,107 ****
- fi
- return 0
! + $SRWL clear 2>&1 && echo "done." || echo_notdone
+ return 0
}
--- 143,147 ----
- fi
- return 0
! + $SRWL $OPTIONS clear 2>&1 && echo "done." || echo_notdone
+ return 0
}
***************
*** 119,163 ****
echo -n "Refreshing \"Shorewall6 firewall\": "
- $SRWL $SRWL_OPTS refresh >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL refresh 2>&1 && echo "done." || echo_notdone
return 0
}
- diff -urN shorewall6-4.4.10.2.orig/shorewall6.conf
shorewall6-4.4.10.2/shorewall6.conf
- --- shorewall6-4.4.10.2.orig/shorewall6.conf 2010-07-07 19:19:54.000000000
+0200
- +++ shorewall6-4.4.10.2/shorewall6.conf 2010-07-31 19:25:36.873214208
+0200
- @@ -10,7 +10,7 @@
- # S T A R T U P E N A B L E D
-
###############################################################################
-
- -STARTUP_ENABLED=No
- +STARTUP_ENABLED=Yes
-
-
###############################################################################
- # V E R B O S I T Y
- @@ -22,7 +22,7 @@
- # L O G G I N G
-
###############################################################################
-
- -LOGFILE=/var/log/messages
- +LOGFILE=/var/log/shorewall6.log
-
- STARTUP_LOG=/var/log/shorewall6-init.log
-
- @@ -60,7 +60,7 @@
-
- SHOREWALL_SHELL=/bin/sh
-
- -SUBSYSLOCK=/var/lock/subsys/shorewall
- +SUBSYSLOCK=/var/run/shorewall6
-
- MODULESDIR=
-
- @@ -91,7 +91,7 @@
- # F I R E W A L L O P T I O N S
-
###############################################################################
-
- -IP_FORWARDING=Off
- +IP_FORWARDING=On
-
- TC_ENABLED=No
-
--- 159,164 ----
echo -n "Refreshing \"Shorewall6 firewall\": "
- $SRWL $SRWL_OPTS refresh >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $OPTIONS refresh 2>&1 && echo "done." || echo_notdone
return 0
}
--- NEW FILE: shorewall6-4.4.14.tgz ---
(This appears to be a binary file; contents omitted.)
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall6/buildtool.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.mk 27 Sep 2010 07:24:57 -0000 1.3
--- buildtool.mk 29 Oct 2010 15:29:34 -0000 1.4
***************
*** 9,13 ****
TARGET_DIR=$(BT_BUILD_DIR)/shorewall6
! SHOREWALL_DIR:=shorewall6-4.4.13.1
$(SHOREWALL_DIR)/.source:
--- 9,13 ----
TARGET_DIR=$(BT_BUILD_DIR)/shorewall6
! SHOREWALL_DIR:=shorewall6-4.4.14
$(SHOREWALL_DIR)/.source:
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall6/buildtool.cfg,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildtool.cfg 4 Oct 2010 18:36:30 -0000 1.5
--- buildtool.cfg 29 Oct 2010 15:29:34 -0000 1.6
***************
*** 1,3 ****
! <File shorewall6-4.4.13.1.tgz>
Server = cvs4-sourceforge
Directory = shorewall6
--- 1,3 ----
! <File shorewall6-4.4.14.tgz>
Server = cvs4-sourceforge
Directory = shorewall6
***************
*** 32,36 ****
<shorwall6>
packagename=shorwall6
! Version 4.4.13.1
Revision = 1
--- 32,36 ----
<shorwall6>
packagename=shorwall6
! Version 4.4.14
Revision = 1
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
