holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Some fixups for Shorewall/Shorewall-lite coexistence

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4041 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-09 17:57:56 +00:00
parent 403145c578
commit f6d157fe27
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shorewall-lite/shorewall-lite.spec
View File

@ -48,7 +48,7 @@ if [ $1 -eq 1 ]; then
fi
fi
[ -L /sbin/shorewall ] || ln -s /usr/share/shorewall-lite/shorewall /sbin/shorewall
[ -L /sbin/shorewall ] || [ -f /sbin/shorewall ] || ln -s /usr/share/shorewall-lite/shorewall /sbin/shorewall
%preun
@ -61,6 +61,12 @@ if [ $1 = 0 ]; then
fi
%triggerpostun -- shorewall-lite <= 3.2.0-0RC1
if [ -f /usr/share/shorewall-lite/shorewall ]; then
[ -L /sbin/shorewall ] || ln -s /usr/share/shorewall-lite/shorewall /sbin/shorewall
fi
%files
%defattr(0644,root,root,0755)
%attr(0755,root,root) %dir /etc/shorewall-lite

4
Shorewall-lite/shorewall.conf
View File

@ -1,10 +1,10 @@
###############################################################################
# /etc/shorewall/shorewall.conf V3.0 - Change the following variables to
# /etc/shorewall-lite/shorewall.conf V3.0 - Change the following variables to
# match your setup
#
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
#
# This file should be placed in /etc/shorewall
# This file should be placed in /etc/shorewall-lite
#
# (c) 2006 - Tom Eastep (teastep@shorewall.net)
#

4
Shorewall/compiler
View File

@ -8281,9 +8281,9 @@ __EOF__
__EOF__
else
cat >&3 << __EOF__
[ -z "\$IPTABLES\" ] && IPTABLES=\$(mywhich iptables 2> /dev/null)
[ -z "\$IPTABLES" ] && IPTABLES=\$(mywhich iptables 2> /dev/null)
[ -n \"$IPTABLES\" -a -e "\$IPTABLES" ] || startup_error "Can't find iptables executable"
[ -n "\$IPTABLES" -a -e "\$IPTABLES" ] || startup_error "Can't find iptables executable"
__EOF__
fi

8
Shorewall/shorewall.spec
View File

@ -48,7 +48,7 @@ if [ $1 -eq 1 ]; then
fi
fi
[ -L /sbin/shorewall ] || ln -s /usr/share/shorewall/shorewall /sbin/shorewall
[ -L /sbin/shorewall ] || [ -f /sbin/shorewall] || ln -s /usr/share/shorewall/shorewall /sbin/shorewall
%preun
@ -63,6 +63,12 @@ if [ $1 = 0 ]; then
fi
%triggerpostun -- shorewall <= 3.2.0-0RC1
if [ -f /usr/share/shorewall/shorewall ]; then
[ -L /sbin/shorewall ] || ln -s /usr/share/shorewall/shorewall /sbin/shorewall
fi
%files
%defattr(0644,root,root,0755)
%attr(0544,root,root) /etc/init.d/shorewall

2
tools/build/makeshorewall
View File

@ -59,7 +59,7 @@ DIR=$PWD
#
# location and options for GnuPG
#
GPG="/usr/bin/gpg -ab --batch --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key'"
GPG="/usr/bin/gpg -ab --no-use-agent --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key'"
################################################################################
# V A R I A B L E S
################################################################################