Update of /cvsroot/leaf/src/bering-uclibc/apps/shorewall
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29304
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
patch-3.2.6-2.diff
Log Message:
new upstream version 3.2.6
--- NEW FILE: patch-3.2.6-2.diff ---
--- ../../../tags/3.2.6/Shorewall/install.sh 2006-11-18 12:49:52.000000000
-0800
+++ install.sh 2006-11-18 14:53:14.000000000 -0800
@@ -187,16 +187,6 @@
OWNERSHIP="-o $OWNER -g $GROUP"
-if [ -d /etc/apt -a -e /usr/bin/dpkg ]; then
- DEBIAN=yes
-elif [ -f /etc/slackware-version ] ; then
- DEST="/etc/rc.d"
- INIT="rc.firewall"
-elif [ -f /etc/arch-release ] ; then
- DEST="/etc/rc.d"
- INIT="shorewall"
- ARCHLINUX=yes
-fi
if [ -n "$PREFIX" ]; then
if [ `id -u` != 0 ] ; then
echo "Not setting file owner/group permissions, not running as
root."
@@ -205,6 +195,15 @@
install -d $OWNERSHIP -m 755 ${PREFIX}/sbin
install -d $OWNERSHIP -m 755 ${PREFIX}${DEST}
+elif [ -d /etc/apt -a -e /usr/bin/dpkg ]; then
+ DEBIAN=yes
+elif [ -f /etc/slackware-version ] ; then
+ DEST="/etc/rc.d"
+ INIT="rc.firewall"
+elif [ -f /etc/arch-release ] ; then
+ DEST="/etc/rc.d"
+ INIT="shorewall"
+ ARCHLINUX=yes
fi
#
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/buildtool.cfg,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** buildtool.cfg 31 Oct 2006 11:57:00 -0000 1.10
--- buildtool.cfg 19 Nov 2006 14:35:08 -0000 1.11
***************
*** 5,11 ****
</Server>
! <File shorewall-3.2.5.tgz>
Server = shorewall-net
! Directory = 3.2/shorewall-3.2.5
Envname = SHOREWALL_SOURCE
</File>
--- 5,11 ----
</Server>
! <File shorewall-3.2.6.tgz>
Server = shorewall-net
! Directory = 3.2/shorewall-3.2.6
Envname = SHOREWALL_SOURCE
</File>
***************
*** 25,33 ****
</File>
! #3.2.5 errata
! <File compiler>
Server = cvs-sourceforge
Revision = HEAD
Directory = shorewall
</File>
--- 25,35 ----
</File>
! #3.2.6 errata
! <File patch-3.2.6-2.diff>
Server = cvs-sourceforge
Revision = HEAD
Directory = shorewall
+ Envname = SHOREWALL_PATCH_1
+
</File>
***************
*** 59,63 ****
<shorwall>
packagename=shorwall
! Version 3.2.5
Revision = 1
--- 61,65 ----
<shorwall>
packagename=shorwall
! Version 3.2.6
Revision = 1
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/buildtool.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** buildtool.mk 31 Oct 2006 11:57:00 -0000 1.9
--- buildtool.mk 19 Nov 2006 14:35:08 -0000 1.10
***************
*** 9,13 ****
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-3.2.5
$(SHOREWALL_DIR)/.source:
--- 9,13 ----
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-3.2.6
$(SHOREWALL_DIR)/.source:
***************
*** 15,19 ****
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
--- 15,21 ----
cat $(SHOREWALL_LRP_DIFF) | patch -d $(SHOREWALL_DIR) -p1
cat $(SHOREWALL_CONFIG_DIFF) | patch -d $(SHOREWALL_DIR) -p1
! cat $(SHOREWALL_PATCH_1) | patch -d $(SHOREWALL_DIR)
!
! # cp -a compiler $(SHOREWALL_DIR)/compiler
touch $(SHOREWALL_DIR)/.source
-------------------------------------------------------------------------
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
