extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-25 12:13:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply Paul Traina's patch for install.sh

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2046 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-04-11 20:39:36 +00:00
parent 72444c98cc
commit af18505e6f
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall2/changelog.txt
View File

@ -8,6 +8,8 @@ Changes in 2.2.4
4) Report Owner Match capability 4) Report Owner Match capability
5) Add Paul Traina's patch to install.sh.
Changes in 2.2.3 Changes in 2.2.3
1) Added the 'continue' extension script. 1) Added the 'continue' extension script.

71
Shorewall2/install.sh
View File

@ -76,7 +76,7 @@ delete_file() # $1 = file to delete
install_file_with_backup() # $1 = source $2 = target $3 = mode install_file_with_backup() # $1 = source $2 = target $3 = mode
{ {
backup_file $2 backup_file $2
run_install -o $OWNER -g $GROUP -m $3 $1 ${2} run_install $OWNERSHIP -m $3 $1 ${2}
} }
# #
@ -133,9 +133,16 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
# #
DEBIAN= DEBIAN=
OWNERSHIP="-o $OWNER -g $GROUP"
if [ -n "$PREFIX" ]; then if [ -n "$PREFIX" ]; then
install -d -o $OWNER -g $GROUP -m 755 ${PREFIX}/sbin if [ `id -u` != 0 ] ; then
install -d -o $OWNER -g $GROUP -m 755 ${PREFIX}${DEST} echo "Not setting file owner/group permissions, not running as root."
OWNERSHIP=""
fi
install -d $OWNERSHIP -m 755 ${PREFIX}/sbin
install -d $OWNERSHIP -m 755 ${PREFIX}${DEST}
elif [ -d /etc/apt -a -e /usr/bin/dpkg ]; then elif [ -d /etc/apt -a -e /usr/bin/dpkg ]; then
DEBIAN=yes DEBIAN=yes
fi fi
@ -185,7 +192,7 @@ mkdir -p ${PREFIX}/var/lib/shorewall
if [ -f ${PREFIX}/etc/shorewall/shorewall.conf ]; then if [ -f ${PREFIX}/etc/shorewall/shorewall.conf ]; then
backup_file /etc/shorewall/shorewall.conf backup_file /etc/shorewall/shorewall.conf
else else
run_install -o $OWNER -g $GROUP -m 0744 shorewall.conf ${PREFIX}/etc/shorewall/shorewall.conf run_install $OWNERSHIP -m 0744 shorewall.conf ${PREFIX}/etc/shorewall/shorewall.conf
echo echo
echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf" echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf"
fi fi
@ -195,7 +202,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/zones ]; then if [ -f ${PREFIX}/etc/shorewall/zones ]; then
backup_file /etc/shorewall/zones backup_file /etc/shorewall/zones
else else
run_install -o $OWNER -g $GROUP -m 0744 zones ${PREFIX}/etc/shorewall/zones run_install $OWNERSHIP -m 0744 zones ${PREFIX}/etc/shorewall/zones
echo echo
echo "Zones file installed as ${PREFIX}/etc/shorewall/zones" echo "Zones file installed as ${PREFIX}/etc/shorewall/zones"
fi fi
@ -232,7 +239,7 @@ delete_file icmp.def
if [ -f ${PREFIX}/etc/shorewall/policy ]; then if [ -f ${PREFIX}/etc/shorewall/policy ]; then
backup_file /etc/shorewall/policy backup_file /etc/shorewall/policy
else else
run_install -o $OWNER -g $GROUP -m 0600 policy ${PREFIX}/etc/shorewall/policy run_install $OWNERSHIP -m 0600 policy ${PREFIX}/etc/shorewall/policy
echo echo
echo "Policy file installed as ${PREFIX}/etc/shorewall/policy" echo "Policy file installed as ${PREFIX}/etc/shorewall/policy"
fi fi
@ -242,7 +249,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/interfaces ]; then if [ -f ${PREFIX}/etc/shorewall/interfaces ]; then
backup_file /etc/shorewall/interfaces backup_file /etc/shorewall/interfaces
else else
run_install -o $OWNER -g $GROUP -m 0600 interfaces ${PREFIX}/etc/shorewall/interfaces run_install $OWNERSHIP -m 0600 interfaces ${PREFIX}/etc/shorewall/interfaces
echo echo
echo "Interfaces file installed as ${PREFIX}/etc/shorewall/interfaces" echo "Interfaces file installed as ${PREFIX}/etc/shorewall/interfaces"
fi fi
@ -252,7 +259,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/ipsec ]; then if [ -f ${PREFIX}/etc/shorewall/ipsec ]; then
backup_file /etc/shorewall/ipsec backup_file /etc/shorewall/ipsec
else else
run_install -o $OWNER -g $GROUP -m 0600 ipsec ${PREFIX}/etc/shorewall/ipsec run_install $OWNERSHIP -m 0600 ipsec ${PREFIX}/etc/shorewall/ipsec
echo echo
echo "Ipsec file installed as ${PREFIX}/etc/shorewall/ipsec" echo "Ipsec file installed as ${PREFIX}/etc/shorewall/ipsec"
fi fi
@ -262,7 +269,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/hosts ]; then if [ -f ${PREFIX}/etc/shorewall/hosts ]; then
backup_file /etc/shorewall/hosts backup_file /etc/shorewall/hosts
else else
run_install -o $OWNER -g $GROUP -m 0600 hosts ${PREFIX}/etc/shorewall/hosts run_install $OWNERSHIP -m 0600 hosts ${PREFIX}/etc/shorewall/hosts
echo echo
echo "Hosts file installed as ${PREFIX}/etc/shorewall/hosts" echo "Hosts file installed as ${PREFIX}/etc/shorewall/hosts"
fi fi
@ -272,7 +279,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/rules ]; then if [ -f ${PREFIX}/etc/shorewall/rules ]; then
backup_file /etc/shorewall/rules backup_file /etc/shorewall/rules
else else
run_install -o $OWNER -g $GROUP -m 0600 rules ${PREFIX}/etc/shorewall/rules run_install $OWNERSHIP -m 0600 rules ${PREFIX}/etc/shorewall/rules
echo echo
echo "Rules file installed as ${PREFIX}/etc/shorewall/rules" echo "Rules file installed as ${PREFIX}/etc/shorewall/rules"
fi fi
@ -282,7 +289,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/nat ]; then if [ -f ${PREFIX}/etc/shorewall/nat ]; then
backup_file /etc/shorewall/nat backup_file /etc/shorewall/nat
else else
run_install -o $OWNER -g $GROUP -m 0600 nat ${PREFIX}/etc/shorewall/nat run_install $OWNERSHIP -m 0600 nat ${PREFIX}/etc/shorewall/nat
echo echo
echo "NAT file installed as ${PREFIX}/etc/shorewall/nat" echo "NAT file installed as ${PREFIX}/etc/shorewall/nat"
fi fi
@ -292,7 +299,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/netmap ]; then if [ -f ${PREFIX}/etc/shorewall/netmap ]; then
backup_file /etc/shorewall/netmap backup_file /etc/shorewall/netmap
else else
run_install -o $OWNER -g $GROUP -m 0600 netmap ${PREFIX}/etc/shorewall/netmap run_install $OWNERSHIP -m 0600 netmap ${PREFIX}/etc/shorewall/netmap
echo echo
echo "NETMAP file installed as ${PREFIX}/etc/shorewall/netmap" echo "NETMAP file installed as ${PREFIX}/etc/shorewall/netmap"
fi fi
@ -302,7 +309,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/params ]; then if [ -f ${PREFIX}/etc/shorewall/params ]; then
backup_file /etc/shorewall/params backup_file /etc/shorewall/params
else else
run_install -o $OWNER -g $GROUP -m 0600 params ${PREFIX}/etc/shorewall/params run_install $OWNERSHIP -m 0600 params ${PREFIX}/etc/shorewall/params
echo echo
echo "Parameter file installed as ${PREFIX}/etc/shorewall/params" echo "Parameter file installed as ${PREFIX}/etc/shorewall/params"
fi fi
@ -312,7 +319,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/proxyarp ]; then if [ -f ${PREFIX}/etc/shorewall/proxyarp ]; then
backup_file /etc/shorewall/proxyarp backup_file /etc/shorewall/proxyarp
else else
run_install -o $OWNER -g $GROUP -m 0600 proxyarp ${PREFIX}/etc/shorewall/proxyarp run_install $OWNERSHIP -m 0600 proxyarp ${PREFIX}/etc/shorewall/proxyarp
echo echo
echo "Proxy ARP file installed as ${PREFIX}/etc/shorewall/proxyarp" echo "Proxy ARP file installed as ${PREFIX}/etc/shorewall/proxyarp"
fi fi
@ -322,7 +329,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/routestopped ]; then if [ -f ${PREFIX}/etc/shorewall/routestopped ]; then
backup_file /etc/shorewall/routestopped backup_file /etc/shorewall/routestopped
else else
run_install -o $OWNER -g $GROUP -m 0600 routestopped ${PREFIX}/etc/shorewall/routestopped run_install $OWNERSHIP -m 0600 routestopped ${PREFIX}/etc/shorewall/routestopped
echo echo
echo "Stopped Routing file installed as ${PREFIX}/etc/shorewall/routestopped" echo "Stopped Routing file installed as ${PREFIX}/etc/shorewall/routestopped"
fi fi
@ -332,7 +339,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/maclist ]; then if [ -f ${PREFIX}/etc/shorewall/maclist ]; then
backup_file /etc/shorewall/maclist backup_file /etc/shorewall/maclist
else else
run_install -o $OWNER -g $GROUP -m 0600 maclist ${PREFIX}/etc/shorewall/maclist run_install $OWNERSHIP -m 0600 maclist ${PREFIX}/etc/shorewall/maclist
echo echo
echo "MAC list file installed as ${PREFIX}/etc/shorewall/maclist" echo "MAC list file installed as ${PREFIX}/etc/shorewall/maclist"
fi fi
@ -342,7 +349,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/masq ]; then if [ -f ${PREFIX}/etc/shorewall/masq ]; then
backup_file /etc/shorewall/masq backup_file /etc/shorewall/masq
else else
run_install -o $OWNER -g $GROUP -m 0600 masq ${PREFIX}/etc/shorewall/masq run_install $OWNERSHIP -m 0600 masq ${PREFIX}/etc/shorewall/masq
echo echo
echo "Masquerade file installed as ${PREFIX}/etc/shorewall/masq" echo "Masquerade file installed as ${PREFIX}/etc/shorewall/masq"
fi fi
@ -352,7 +359,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/modules ]; then if [ -f ${PREFIX}/etc/shorewall/modules ]; then
backup_file /etc/shorewall/modules backup_file /etc/shorewall/modules
else else
run_install -o $OWNER -g $GROUP -m 0600 modules ${PREFIX}/etc/shorewall/modules run_install $OWNERSHIP -m 0600 modules ${PREFIX}/etc/shorewall/modules
echo echo
echo "Modules file installed as ${PREFIX}/etc/shorewall/modules" echo "Modules file installed as ${PREFIX}/etc/shorewall/modules"
fi fi
@ -362,7 +369,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/tcrules ]; then if [ -f ${PREFIX}/etc/shorewall/tcrules ]; then
backup_file /etc/shorewall/tcrules backup_file /etc/shorewall/tcrules
else else
run_install -o $OWNER -g $GROUP -m 0600 tcrules ${PREFIX}/etc/shorewall/tcrules run_install $OWNERSHIP -m 0600 tcrules ${PREFIX}/etc/shorewall/tcrules
echo echo
echo "TC Rules file installed as ${PREFIX}/etc/shorewall/tcrules" echo "TC Rules file installed as ${PREFIX}/etc/shorewall/tcrules"
fi fi
@ -373,7 +380,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/tos ]; then if [ -f ${PREFIX}/etc/shorewall/tos ]; then
backup_file /etc/shorewall/tos backup_file /etc/shorewall/tos
else else
run_install -o $OWNER -g $GROUP -m 0600 tos ${PREFIX}/etc/shorewall/tos run_install $OWNERSHIP -m 0600 tos ${PREFIX}/etc/shorewall/tos
echo echo
echo "TOS file installed as ${PREFIX}/etc/shorewall/tos" echo "TOS file installed as ${PREFIX}/etc/shorewall/tos"
fi fi
@ -383,7 +390,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/tunnels ]; then if [ -f ${PREFIX}/etc/shorewall/tunnels ]; then
backup_file /etc/shorewall/tunnels backup_file /etc/shorewall/tunnels
else else
run_install -o $OWNER -g $GROUP -m 0600 tunnels ${PREFIX}/etc/shorewall/tunnels run_install $OWNERSHIP -m 0600 tunnels ${PREFIX}/etc/shorewall/tunnels
echo echo
echo "Tunnels file installed as ${PREFIX}/etc/shorewall/tunnels" echo "Tunnels file installed as ${PREFIX}/etc/shorewall/tunnels"
fi fi
@ -393,7 +400,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/blacklist ]; then if [ -f ${PREFIX}/etc/shorewall/blacklist ]; then
backup_file /etc/shorewall/blacklist backup_file /etc/shorewall/blacklist
else else
run_install -o $OWNER -g $GROUP -m 0600 blacklist ${PREFIX}/etc/shorewall/blacklist run_install $OWNERSHIP -m 0600 blacklist ${PREFIX}/etc/shorewall/blacklist
echo echo
echo "Blacklist file installed as ${PREFIX}/etc/shorewall/blacklist" echo "Blacklist file installed as ${PREFIX}/etc/shorewall/blacklist"
fi fi
@ -428,7 +435,7 @@ echo " Default config path file installed as ${PREFIX}/usr/share/shorewall/confi
if [ -f ${PREFIX}/etc/shorewall/init ]; then if [ -f ${PREFIX}/etc/shorewall/init ]; then
backup_file /etc/shorewall/init backup_file /etc/shorewall/init
else else
run_install -o $OWNER -g $GROUP -m 0600 init ${PREFIX}/etc/shorewall/init run_install $OWNERSHIP -m 0600 init ${PREFIX}/etc/shorewall/init
echo echo
echo "Init file installed as ${PREFIX}/etc/shorewall/init" echo "Init file installed as ${PREFIX}/etc/shorewall/init"
fi fi
@ -438,7 +445,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/initdone ]; then if [ -f ${PREFIX}/etc/shorewall/initdone ]; then
backup_file /etc/shorewall/initdone backup_file /etc/shorewall/initdone
else else
run_install -o $OWNER -g $GROUP -m 0600 initdone ${PREFIX}/etc/shorewall/initdone run_install $OWNERSHIP -m 0600 initdone ${PREFIX}/etc/shorewall/initdone
echo echo
echo "Initdone file installed as ${PREFIX}/etc/shorewall/initdone" echo "Initdone file installed as ${PREFIX}/etc/shorewall/initdone"
fi fi
@ -448,7 +455,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/start ]; then if [ -f ${PREFIX}/etc/shorewall/start ]; then
backup_file /etc/shorewall/start backup_file /etc/shorewall/start
else else
run_install -o $OWNER -g $GROUP -m 0600 start ${PREFIX}/etc/shorewall/start run_install $OWNERSHIP -m 0600 start ${PREFIX}/etc/shorewall/start
echo echo
echo "Start file installed as ${PREFIX}/etc/shorewall/start" echo "Start file installed as ${PREFIX}/etc/shorewall/start"
fi fi
@ -458,7 +465,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/stop ]; then if [ -f ${PREFIX}/etc/shorewall/stop ]; then
backup_file /etc/shorewall/stop backup_file /etc/shorewall/stop
else else
run_install -o $OWNER -g $GROUP -m 0600 stop ${PREFIX}/etc/shorewall/stop run_install $OWNERSHIP -m 0600 stop ${PREFIX}/etc/shorewall/stop
echo echo
echo "Stop file installed as ${PREFIX}/etc/shorewall/stop" echo "Stop file installed as ${PREFIX}/etc/shorewall/stop"
fi fi
@ -468,7 +475,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/stopped ]; then if [ -f ${PREFIX}/etc/shorewall/stopped ]; then
backup_file /etc/shorewall/stopped backup_file /etc/shorewall/stopped
else else
run_install -o $OWNER -g $GROUP -m 0600 stopped ${PREFIX}/etc/shorewall/stopped run_install $OWNERSHIP -m 0600 stopped ${PREFIX}/etc/shorewall/stopped
echo echo
echo "Stopped file installed as ${PREFIX}/etc/shorewall/stopped" echo "Stopped file installed as ${PREFIX}/etc/shorewall/stopped"
fi fi
@ -478,7 +485,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/ecn ]; then if [ -f ${PREFIX}/etc/shorewall/ecn ]; then
backup_file /etc/shorewall/ecn backup_file /etc/shorewall/ecn
else else
run_install -o $OWNER -g $GROUP -m 0600 ecn ${PREFIX}/etc/shorewall/ecn run_install $OWNERSHIP -m 0600 ecn ${PREFIX}/etc/shorewall/ecn
echo echo
echo "ECN file installed as ${PREFIX}/etc/shorewall/ecn" echo "ECN file installed as ${PREFIX}/etc/shorewall/ecn"
fi fi
@ -488,7 +495,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/accounting ]; then if [ -f ${PREFIX}/etc/shorewall/accounting ]; then
backup_file /etc/shorewall/accounting backup_file /etc/shorewall/accounting
else else
run_install -o $OWNER -g $GROUP -m 0600 accounting ${PREFIX}/etc/shorewall/accounting run_install $OWNERSHIP -m 0600 accounting ${PREFIX}/etc/shorewall/accounting
echo echo
echo "Accounting file installed as ${PREFIX}/etc/shorewall/accounting" echo "Accounting file installed as ${PREFIX}/etc/shorewall/accounting"
fi fi
@ -498,7 +505,7 @@ fi
if [ -f ${PREFIX}/etc/shorewall/continue ]; then if [ -f ${PREFIX}/etc/shorewall/continue ]; then
backup_file /etc/shorewall/continue backup_file /etc/shorewall/continue
else else
run_install -o $OWNER -g $GROUP -m 0600 continue ${PREFIX}/etc/shorewall/continue run_install $OWNERSHIP -m 0600 continue ${PREFIX}/etc/shorewall/continue
echo echo
echo "Continue file installed as ${PREFIX}/etc/shorewall/continue" echo "Continue file installed as ${PREFIX}/etc/shorewall/continue"
fi fi
@ -525,7 +532,7 @@ echo "Standard actions file installed as ${PREFIX}/etc/shorewall/actions.std"
if [ -f ${PREFIX}/etc/shorewall/actions ]; then if [ -f ${PREFIX}/etc/shorewall/actions ]; then
backup_file /etc/shorewall/actions backup_file /etc/shorewall/actions
else else
run_install -o $OWNER -g $GROUP -m 0600 actions ${PREFIX}/etc/shorewall/actions run_install $OWNERSHIP -m 0600 actions ${PREFIX}/etc/shorewall/actions
echo echo
echo "Actions file installed as ${PREFIX}/etc/shorewall/actions" echo "Actions file installed as ${PREFIX}/etc/shorewall/actions"
fi fi
@ -566,7 +573,7 @@ install_file_with_backup firewall ${PREFIX}/usr/share/shorewall/firewall 0544
if [ -z "$PREFIX" -a -n "$first_install" ]; then if [ -z "$PREFIX" -a -n "$first_install" ]; then
if [ -n "$DEBIAN" ]; then if [ -n "$DEBIAN" ]; then
run_install -o $OWNER -g $GROUP -m 0644 default.debian /etc/default/shorewall run_install $OWNERSHIP -m 0644 default.debian /etc/default/shorewall
ln -s ../init.d/shorewall /etc/rcS.d/S40shorewall ln -s ../init.d/shorewall /etc/rcS.d/S40shorewall
echo echo
echo "shorewall will start automatically at boot" echo "shorewall will start automatically at boot"