From: Björn R. <br...@us...> - 2009-10-26 09:12:52
|
Update of /cvsroot/devil-linux/build/scripts In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3092 Modified Files: shorewall Log Message: shorewall version 4.4 now only supports the perl-compiler Index: shorewall =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/shorewall,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- shorewall 18 Oct 2009 13:41:06 -0000 1.10 +++ shorewall 26 Oct 2009 09:12:41 -0000 1.11 @@ -30,33 +30,36 @@ case $1 in install ) - if [ "$CONFIG_SHOREWALL" = "y" ]; then - rm -rf $TMPDIR || exit 1 - mkdir -p $TMPDIR || exit 1 + # shorewall 4.4 now only supports perl-compilter + if [ "$CONFIG_PERL" = "y" ]; then + if [ "$CONFIG_SHOREWALL" = "y" ]; then + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 - # Install shorewall into $TMPDIR - PREFIX=$TMPDIR ./install.sh || exit 1 + # Install shorewall into $TMPDIR + PREFIX=$TMPDIR ./install.sh || exit 1 - # Create the directories for /var - mkdir -p $CDDIR/var/lib/shorewall + # Create the directories for /var + mkdir -p $CDDIR/var/lib/shorewall - # Copy all the shorewall files to the appropriate directories on the cd - copy_docs $TMPDIR || exit 1 - cp -dbvR $TMPDIR/etc $ETCDIR/ || exit 1 - rm -rf $TMPDIR/etc || exit 1 - cp -dpvR $TMPDIR/* $CDDIR/ || exit 1 - mv $CDDIR/usr/share/shorewall/modules $ETCDIR/etc/shorewall/ || exit 1 - ln -sf /etc/shorewall/modules $CDDIR/usr/share/shorewall/modules || exit 1 + # Copy all the shorewall files to the appropriate directories on the cd + copy_docs $TMPDIR || exit 1 + cp -dbvR $TMPDIR/etc $ETCDIR/ || exit 1 + rm -rf $TMPDIR/etc || exit 1 + cp -dpvR $TMPDIR/* $CDDIR/ || exit 1 + mv $CDDIR/usr/share/shorewall/modules $ETCDIR/etc/shorewall/ || exit 1 + ln -sf /etc/shorewall/modules $CDDIR/usr/share/shorewall/modules || exit 1 - # Copy our own startup script into /etc/init.d - cp $MYDIR/scripts/shorewall $ETCDIR/etc/init.d/ - rm -rf $TMPDIR || exit 1 + # Copy our own startup script into /etc/init.d + cp $MYDIR/scripts/shorewall $ETCDIR/etc/init.d/ + rm -rf $TMPDIR || exit 1 - # Create the shorewall option in the config file - echo "# Start $MYNAME?" >> $CONFIGFILE - echo "START_SHOREWALL=no" >> $CONFIGFILE - echo >> $CONFIGFILE - echo "HELP_SHOREWALL=\"SHOREWALL is an alternate firewall creation script (www.shorewall.net)\"" >> $SOFTWAREHELP + # Create the shorewall option in the config file + echo "# Start $MYNAME?" >> $CONFIGFILE + echo "START_SHOREWALL=no" >> $CONFIGFILE + echo >> $CONFIGFILE + echo "HELP_SHOREWALL=\"SHOREWALL is an alternate firewall creation script (www.shorewall.net)\"" >> $SOFTWAREHELP + fi fi ;; |