diff --git a/Shorewall/install.sh b/Shorewall/install.sh index f3dd4a1c5..b646cc0f6 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -332,21 +332,15 @@ if [ -n "$DESTDIR" ]; then fi if [ -n "$ANNOTATED" ]; then - mkdir annotated/ - cp configfiles/* annotated/ - for f in annotated/*.annotated; do - mv $f ${f%.annotated} - done - - CONFIGFILES=annotated + suffix=.annotated else - CONFIGFILES=configfiles + suffix= fi # # Install the config file # if [ ! -f ${DESTDIR}/etc/shorewall/shorewall.conf ]; then - run_install $OWNERSHIP -m 0644 $CONFIGFILES/shorewall.conf ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0644 configfiles/shorewall.conf${suffix} ${DESTDIR}/etc/shorewall/shorewall.conf if [ -n "$DEBIAN" ]; then # @@ -364,10 +358,11 @@ fi # # Install the zones file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/zones ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/zones ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/zones.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/zones ]; then - run_install $OWNERSHIP -m 0644 $CONFIGFILES/zones ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0644 configfiles/zones${suffix} ${DESTDIR}/etc/shorewall/zones echo "Zones file installed as ${DESTDIR}/etc/shorewall/zones" fi @@ -397,112 +392,124 @@ echo "wait4ifup installed in ${DESTDIR}${LIBEXEC}/shorewall/wait4ifup" # # Install the policy file # -install_file $CONFIGFILES/policy ${DESTDIR}/usr/share/shorewall/configfiles/policy 0644 +install_file -m 0644 configfiles/policy ${DESTDIR}/usr/share/shorewall/ +install_file -m 0644 configfiles/policy.annotated ${DESTDIR}/usr/share/shorewall/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/policy ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/policy ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/policy${suffix} ${DESTDIR}/etc/shorewall/policy echo "Policy file installed as ${DESTDIR}/etc/shorewall/policy" fi # # Install the interfaces file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/interfaces ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/interfaces ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/interfaces.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/interfaces ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/interfaces ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/interfaces${suffix} ${DESTDIR}/etc/shorewall/interfaces echo "Interfaces file installed as ${DESTDIR}/etc/shorewall/interfaces" fi # # Install the hosts file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/hosts ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/hosts ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/host.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/hosts ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/hosts ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/hosts${suffix} ${DESTDIR}/etc/shorewall/hosts echo "Hosts file installed as ${DESTDIR}/etc/shorewall/hosts" fi # # Install the rules file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/rules ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/rules ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/rules.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/rules ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/rules ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/rules${suffix} ${DESTDIR}/etc/shorewall/rules echo "Rules file installed as ${DESTDIR}/etc/shorewall/rules" fi # # Install the NAT file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/nat ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/nat ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/nat.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/nat ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/nat ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/nat${suffix} ${DESTDIR}/etc/shorewall/nat echo "NAT file installed as ${DESTDIR}/etc/shorewall/nat" fi # # Install the NETMAP file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/netmap ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/netmap ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/netmap.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/netmap ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/netmap ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/netmap${suffix} ${DESTDIR}/etc/shorewall/netmap echo "NETMAP file installed as ${DESTDIR}/etc/shorewall/netmap" fi # # Install the Parameters file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/params ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/params ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/params.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -f ${DESTDIR}/etc/shorewall/params ]; then chmod 0644 ${DESTDIR}/etc/shorewall/params else - run_install $OWNERSHIP -m 0644 $CONFIGFILES/params ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0644 configfiles/params${suffix} ${DESTDIR}/etc/shorewall/params echo "Parameter file installed as ${DESTDIR}/etc/shorewall/params" fi # # Install the proxy ARP file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/proxyarp ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/proxyarp ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/proxyarp.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/proxyarp ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/proxyarp ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/proxyarp${suffix} ${DESTDIR}/etc/shorewall/proxyarp echo "Proxy ARP file installed as ${DESTDIR}/etc/shorewall/proxyarp" fi # # Install the Stopped Routing file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/routestopped ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/routestopped ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/routestopped.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/routestopped ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/routestopped ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/routestopped${suffix} ${DESTDIR}/etc/shorewall/routestopped echo "Stopped Routing file installed as ${DESTDIR}/etc/shorewall/routestopped" fi # # Install the Mac List file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/maclist ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/maclist ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/maclist.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/maclist ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/maclist ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/maclist${suffix} ${DESTDIR}/etc/shorewall/maclist echo "MAC list file installed as ${DESTDIR}/etc/shorewall/maclist" fi # # Install the Masq file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/masq ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/masq ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/masq.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/masq ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/masq ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/masq${suffix} ${DESTDIR}/etc/shorewall/masq echo "Masquerade file installed as ${DESTDIR}/etc/shorewall/masq" fi # # Install the Notrack file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/notrack ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/notrack ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/notrack.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/notrack ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/notrack ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/notrack${suffix} ${DESTDIR}/etc/shorewall/notrack echo "Notrack file installed as ${DESTDIR}/etc/shorewall/notrack" fi # @@ -525,67 +532,73 @@ echo "Helper modules file installed as ${DESTDIR}/usr/share/shorewall/helpers" # # Install the TC Rules file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/tcrules ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcrules ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcrules.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/tcrules ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/tcrules ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/tcrules${suffix} ${DESTDIR}/etc/shorewall/tcrules echo "TC Rules file installed as ${DESTDIR}/etc/shorewall/tcrules" fi # # Install the TC Interfaces file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/tcinterfaces ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcinterfaces ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcinterfaces.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/tcinterfaces ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/tcinterfaces ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/tcinterfaces${suffix} ${DESTDIR}/etc/shorewall/tcinterfaces echo "TC Interfaces file installed as ${DESTDIR}/etc/shorewall/tcinterfaces" fi # # Install the TC Priority file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/tcpri ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcpri ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcpri.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/tcpri ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/tcpri ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/tcpri${suffix} ${DESTDIR}/etc/shorewall/tcpri echo "TC Priority file installed as ${DESTDIR}/etc/shorewall/tcpri" fi # # Install the TOS file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/tos ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tos ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tos.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/tos ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/tos ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/tos${suffix} ${DESTDIR}/etc/shorewall/tos echo "TOS file installed as ${DESTDIR}/etc/shorewall/tos" fi # # Install the Tunnels file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/tunnels ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tunnels ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tunnel.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/tunnels ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/tunnels ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/tunnels${suffix} ${DESTDIR}/etc/shorewall/tunnels echo "Tunnels file installed as ${DESTDIR}/etc/shorewall/tunnels" fi # # Install the blacklist file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/blacklist ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/blacklist ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/blacklist.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/blacklist ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/blacklist ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/blacklist${suffix} ${DESTDIR}/etc/shorewall/blacklist echo "Blacklist file installed as ${DESTDIR}/etc/shorewall/blacklist" fi # # Install the findgw file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/findgw ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/findgw ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/findgw ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/findgw ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/findgw ${DESTDIR}/etc/shorewall echo "Find GW file installed as ${DESTDIR}/etc/shorewall/findgw" fi # @@ -610,60 +623,66 @@ delete_file ${DESTDIR}/usr/share/shorewall/xmodules # # Install the Providers file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/providers ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/providers ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/providers.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/providers ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/providers ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/providers${suffix} ${DESTDIR}/etc/shorewall/providers echo "Providers file installed as ${DESTDIR}/etc/shorewall/providers" fi # # Install the Route Rules file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/route_rules ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/route_rules ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/route_rules.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/route_rules ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/route_rules ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/route_rules${suffix} ${DESTDIR}/etc/shorewall/route_rules echo "Routing rules file installed as ${DESTDIR}/etc/shorewall/route_rules" fi # # Install the tcclasses file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/tcclasses ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcclasses ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcclasses.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/tcclasses ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/tcclasses ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/tcclasses${suffix} ${DESTDIR}/etc/shorewall/tcclasses echo "TC Classes file installed as ${DESTDIR}/etc/shorewall/tcclasses" fi # # Install the tcdevices file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/tcdevices ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcdevices ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcdevices.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/tcdevices ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/tcdevices ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/tcdevices${suffix} ${DESTDIR}/etc/shorewall/tcdevices echo "TC Devices file installed as ${DESTDIR}/etc/shorewall/tcdevices" fi # # Install the tcfilters file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/tcfilters ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcfilters ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcfilters.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/tcfilters ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/tcfilters ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/tcfilters.${suffix} ${DESTDIR}/etc/shorewall/tcfilters echo "TC Filters file installed as ${DESTDIR}/etc/shorewall/tcfilters" fi # # Install the secmarks file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/secmarks ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/secmarks ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/secmarks.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/secmarks ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/secmarks ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/secmarks${suffix} ${DESTDIR}/etc/shorewall/secmarks echo "Secmarks file installed as ${DESTDIR}/etc/shorewall/secmarks" fi @@ -675,145 +694,147 @@ echo "Default config path file installed as ${DESTDIR}/usr/share/shorewall/confi # # Install the init file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/init ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/init ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/init ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/init ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/init ${DESTDIR}/etc/shorewall echo "Init file installed as ${DESTDIR}/etc/shorewall/init" fi # # Install the initdone file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/initdone ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/initdone ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/initdone ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/initdone ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/initdone ${DESTDIR}/etc/shorewall echo "Initdone file installed as ${DESTDIR}/etc/shorewall/initdone" fi # # Install the start file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/start ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/start ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/start ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/start ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/start ${DESTDIR}/etc/shorewall echo "Start file installed as ${DESTDIR}/etc/shorewall/start" fi # # Install the stop file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/stop ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/stop ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/stop ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/stop ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/stop ${DESTDIR}/etc/shorewall echo "Stop file installed as ${DESTDIR}/etc/shorewall/stop" fi # # Install the stopped file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/stopped ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/stopped ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/stopped ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/stopped ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/stopped ${DESTDIR}/etc/shorewall echo "Stopped file installed as ${DESTDIR}/etc/shorewall/stopped" fi # # Install the ECN file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/ecn ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/ecn ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/ecn.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/ecn ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/ecn ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/ecn${suffix} ${DESTDIR}/etc/shorewall/ecn echo "ECN file installed as ${DESTDIR}/etc/shorewall/ecn" fi # # Install the Accounting file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/accounting ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/accounting ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/accounting.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/accounting ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/accounting ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/accounting${suffix} ${DESTDIR}/etc/shorewall/accounting echo "Accounting file installed as ${DESTDIR}/etc/shorewall/accounting" fi # # Install the private library file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/lib.private ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/lib.private ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/lib.private ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/lib.private ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/lib.private ${DESTDIR}/etc/shorewall echo "Private library file installed as ${DESTDIR}/etc/shorewall/lib.private" fi # # Install the Started file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/started ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/started ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/started ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/started ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/started ${DESTDIR}/etc/shorewall echo "Started file installed as ${DESTDIR}/etc/shorewall/started" fi # # Install the Restored file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/restored ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/restored ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/restored ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/restored ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/restored ${DESTDIR}/etc/shorewall echo "Restored file installed as ${DESTDIR}/etc/shorewall/restored" fi # # Install the Clear file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/clear ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/clear ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/clear ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/clear ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/clear ${DESTDIR}/etc/shorewall echo "Clear file installed as ${DESTDIR}/etc/shorewall/clear" fi # # Install the Isusable file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/isusable ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/isusable ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/isusable ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/isusable ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/isusable ${DESTDIR}/etc/shorewall echo "Isusable file installed as ${DESTDIR}/etc/shorewall/isusable" fi # # Install the Refresh file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/refresh ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/refresh ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/refresh ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/refresh ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/refresh ${DESTDIR}/etc/shorewall echo "Refresh file installed as ${DESTDIR}/etc/shorewall/refresh" fi # # Install the Refreshed file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/refreshed ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/refreshed ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/refreshed ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/refreshed ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/refreshed ${DESTDIR}/etc/shorewall echo "Refreshed file installed as ${DESTDIR}/etc/shorewall/refreshed" fi # # Install the Tcclear file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/tcclear ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/tcclear ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/tcclear ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/tcclear ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/tcclear ${DESTDIR}/etc/shorewall echo "Tcclear file installed as ${DESTDIR}/etc/shorewall/tcclear" fi # # Install the Scfilter file # -run_install $OWNERSHIP -m 644 $CONFIGFILES/scfilter ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 644 configfiles/scfilter ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/scfilter ]; then - run_install $OWNERSHIP -m 0600 $CONFIGFILES/scfilter ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0600 configfiles/scfilter ${DESTDIR}/etc/shorewall echo "Scfilter file installed as ${DESTDIR}/etc/shorewall/scfilter" fi # @@ -825,15 +846,14 @@ echo "Standard actions file installed as ${DESTDIR}/usr/shared/shorewall/actions # # Install the Actions file # -run_install $OWNERSHIP -m 0644 $CONFIGFILES/actions ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/actions ${DESTDIR}/usr/share/shorewall/configfiles +run_install $OWNERSHIP -m 0644 configfiles/actions.annotated ${DESTDIR}/usr/share/shorewall/configfiles if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall/actions ]; then - run_install $OWNERSHIP -m 0644 $CONFIGFILES/actions ${DESTDIR}/etc/shorewall + run_install $OWNERSHIP -m 0644 configfiles/actions${suffix} ${DESTDIR}/etc/shorewall/actions echo "Actions file installed as ${DESTDIR}/etc/shorewall/actions" fi -rm -rf annotated/ - # # Install the Makefiles # diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index fa374efb4..332a5b66f 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -376,21 +376,18 @@ run_install $OWNERSHIP -m 0644 configfiles/shorewall6.conf ${DESTDIR}/ run_install $OWNERSHIP -m 0644 configfiles/shorewall6.conf.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/shorewall6.conf.annotated if [ -n "$ANNOTATED" ]; then - mkdir annotated - cp configfiles/* annotated/ - cd annotated - for f in *.annotated; do - mv -f $f ${f%.annotated} - done + suffix=.annotated else - cd configfiles + suffix= fi + +cd $configfiles # # Install the config file # if [ ! -f ${DESTDIR}/etc/shorewall6/shorewall6.conf ]; then - run_install $OWNERSHIP -m 0644 shorewall6.conf ${DESTDIR}/etc/shorewall6/shorewall6.conf + run_install $OWNERSHIP -m 0644 shorewall6.conf${suffix} ${DESTDIR}/etc/shorewall6/shorewall6.conf if [ -n "$DEBIAN" ] && mywhich perl; then # @@ -420,193 +417,213 @@ fi # # Install the zones file # -run_install $OWNERSHIP -m 0644 zones ${DESTDIR}/usr/share/shorewall6/configfiles/zones +run_install $OWNERSHIP -m 0644 zones ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 zones.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/zones ]; then - run_install $OWNERSHIP -m 0644 zones ${DESTDIR}/etc/shorewall6/zones + run_install $OWNERSHIP -m 0644 zones${suffix} ${DESTDIR}/etc/shorewall6/zones echo "Zones file installed as ${DESTDIR}/etc/shorewall6/zones" fi # # Install the policy file # -run_install $OWNERSHIP -m 0644 policy ${DESTDIR}/usr/share/shorewall6/configfiles/policy +run_install $OWNERSHIP -m 0644 policy ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 policy.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/policy ]; then - run_install $OWNERSHIP -m 0600 policy ${DESTDIR}/etc/shorewall6/policy + run_install $OWNERSHIP -m 0600 policy${suffix} ${DESTDIR}/etc/shorewall6/policy echo "Policy file installed as ${DESTDIR}/etc/shorewall6/policy" fi # # Install the interfaces file # -run_install $OWNERSHIP -m 0644 interfaces ${DESTDIR}/usr/share/shorewall6/configfiles/interfaces +run_install $OWNERSHIP -m 0644 interfaces ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 interfaces.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/interfaces ]; then - run_install $OWNERSHIP -m 0600 interfaces ${DESTDIR}/etc/shorewall6/interfaces + run_install $OWNERSHIP -m 0600 interfaces${suffix} ${DESTDIR}/etc/shorewall6/interfaces echo "Interfaces file installed as ${DESTDIR}/etc/shorewall6/interfaces" fi # # Install the hosts file # -run_install $OWNERSHIP -m 0644 hosts ${DESTDIR}/usr/share/shorewall6/configfiles/hosts +run_install $OWNERSHIP -m 0644 hosts ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 hosts.$annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/hosts ]; then - run_install $OWNERSHIP -m 0600 hosts ${DESTDIR}/etc/shorewall6/hosts + run_install $OWNERSHIP -m 0600 hosts${suffix} ${DESTDIR}/etc/shorewall6/hosts echo "Hosts file installed as ${DESTDIR}/etc/shorewall6/hosts" fi # # Install the rules file # -run_install $OWNERSHIP -m 0644 rules ${DESTDIR}/usr/share/shorewall6/configfiles/rules +run_install $OWNERSHIP -m 0644 rules ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 rules.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/rules ]; then - run_install $OWNERSHIP -m 0600 rules ${DESTDIR}/etc/shorewall6/rules + run_install $OWNERSHIP -m 0600 rule${suffix} ${DESTDIR}/etc/shorewall6/rules echo "Rules file installed as ${DESTDIR}/etc/shorewall6/rules" fi # # Install the Parameters file # -run_install $OWNERSHIP -m 0644 params ${DESTDIR}/usr/share/shorewall6/configfiles/params +run_install $OWNERSHIP -m 0644 params ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 params.suffix ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -f ${DESTDIR}/etc/shorewall6/params ]; then chmod 0644 ${DESTDIR}/etc/shorewall6/params else - run_install $OWNERSHIP -m 0644 params ${DESTDIR}/etc/shorewall6/params + run_install $OWNERSHIP -m 0644 params${suffix} ${DESTDIR}/etc/shorewall6/params echo "Parameter file installed as ${DESTDIR}/etc/shorewall6/params" fi # # Install the Stopped Routing file # -run_install $OWNERSHIP -m 0644 routestopped ${DESTDIR}/usr/share/shorewall6/configfiles/routestopped +run_install $OWNERSHIP -m 0644 routestopped ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 routestopped.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/routestopped ]; then - run_install $OWNERSHIP -m 0600 routestopped ${DESTDIR}/etc/shorewall6/routestopped + run_install $OWNERSHIP -m 0600 routestopped${suffix} ${DESTDIR}/etc/shorewall6/routestopped echo "Stopped Routing file installed as ${DESTDIR}/etc/shorewall6/routestopped" fi # # Install the Mac List file # -run_install $OWNERSHIP -m 0644 maclist ${DESTDIR}/usr/share/shorewall6/configfiles/maclist +run_install $OWNERSHIP -m 0644 maclist ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 maclist.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/maclist ]; then - run_install $OWNERSHIP -m 0600 maclist ${DESTDIR}/etc/shorewall6/maclist + run_install $OWNERSHIP -m 0600 maclist${suffix} ${DESTDIR}/etc/shorewall6/maclist echo "MAC list file installed as ${DESTDIR}/etc/shorewall6/maclist" fi # # Install the TC Rules file # -run_install $OWNERSHIP -m 0644 tcrules ${DESTDIR}/usr/share/shorewall6/configfiles/tcrules +run_install $OWNERSHIP -m 0644 tcrules ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 tcrules.suffix ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/tcrules ]; then - run_install $OWNERSHIP -m 0600 tcrules ${DESTDIR}/etc/shorewall6/tcrules + run_install $OWNERSHIP -m 0600 tcrules${suffix} ${DESTDIR}/etc/shorewall6/tcrules echo "TC Rules file installed as ${DESTDIR}/etc/shorewall6/tcrules" fi # # Install the TC Interfaces file # -run_install $OWNERSHIP -m 0644 tcinterfaces ${DESTDIR}/usr/share/shorewall6/configfiles/tcinterfaces +run_install $OWNERSHIP -m 0644 tcinterfaces ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 tcinterfaces.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/tcinterfaces ]; then - run_install $OWNERSHIP -m 0600 tcinterfaces ${DESTDIR}/etc/shorewall6/tcinterfaces + run_install $OWNERSHIP -m 0600 tcinterfaces${suffix} ${DESTDIR}/etc/shorewall6/tcinterfaces echo "TC Interfaces file installed as ${DESTDIR}/etc/shorewall6/tcinterfaces" fi # # Install the TC Priority file # -run_install $OWNERSHIP -m 0644 tcpri ${DESTDIR}/usr/share/shorewall6/configfiles/tcpri +run_install $OWNERSHIP -m 0644 tcpri ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 tcpri.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/tcpri ]; then - run_install $OWNERSHIP -m 0600 tcpri ${DESTDIR}/etc/shorewall6/tcpri + run_install $OWNERSHIP -m 0600 tcpri${suffix} ${DESTDIR}/etc/shorewall6/tcpri echo "TC Priority file installed as ${DESTDIR}/etc/shorewall6/tcpri" fi # # Install the TOS file # -run_install $OWNERSHIP -m 0644 tos ${DESTDIR}/usr/share/shorewall6/configfiles/tos +run_install $OWNERSHIP -m 0644 tos ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 tos.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/tos ]; then - run_install $OWNERSHIP -m 0600 tos ${DESTDIR}/etc/shorewall6/tos + run_install $OWNERSHIP -m 0600 tos${suffix} ${DESTDIR}/etc/shorewall6/tos echo "TOS file installed as ${DESTDIR}/etc/shorewall6/tos" fi # # Install the Tunnels file # -run_install $OWNERSHIP -m 0644 tunnels ${DESTDIR}/usr/share/shorewall6/configfiles/tunnels +run_install $OWNERSHIP -m 0644 tunnels ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 tunnels.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/tunnels ]; then - run_install $OWNERSHIP -m 0600 tunnels ${DESTDIR}/etc/shorewall6/tunnels + run_install $OWNERSHIP -m 0600 tunnels${suffix} ${DESTDIR}/etc/shorewall6/tunnels echo "Tunnels file installed as ${DESTDIR}/etc/shorewall6/tunnels" fi # # Install the blacklist file # -run_install $OWNERSHIP -m 0644 blacklist ${DESTDIR}/usr/share/shorewall6/configfiles/blacklist +run_install $OWNERSHIP -m 0644 blacklist ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 blacklist.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/blacklist ]; then - run_install $OWNERSHIP -m 0600 blacklist ${DESTDIR}/etc/shorewall6/blacklist + run_install $OWNERSHIP -m 0600 blacklist${suffix} ${DESTDIR}/etc/shorewall6/blacklist echo "Blacklist file installed as ${DESTDIR}/etc/shorewall6/blacklist" fi # # Install the Providers file # -run_install $OWNERSHIP -m 0644 providers ${DESTDIR}/usr/share/shorewall6/configfiles/providers +run_install $OWNERSHIP -m 0644 providers ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 providers.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/providers ]; then - run_install $OWNERSHIP -m 0600 providers ${DESTDIR}/etc/shorewall6/providers + run_install $OWNERSHIP -m 0600 providers${suffix} ${DESTDIR}/etc/shorewall6/providers echo "Providers file installed as ${DESTDIR}/etc/shorewall6/providers" fi # # Install the Route Rules file # -run_install $OWNERSHIP -m 0644 route_rules ${DESTDIR}/usr/share/shorewall6/configfiles/route_rules +run_install $OWNERSHIP -m 0644 route_rules ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 route_rules.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/route_rules ]; then - run_install $OWNERSHIP -m 0600 route_rules ${DESTDIR}/etc/shorewall6/route_rules + run_install $OWNERSHIP -m 0600 route_rules${suffix} ${DESTDIR}/etc/shorewall6/route_rules echo "Routing rules file installed as ${DESTDIR}/etc/shorewall6/route_rules" fi # # Install the tcclasses file # -run_install $OWNERSHIP -m 0644 tcclasses ${DESTDIR}/usr/share/shorewall6/configfiles/tcclasses +run_install $OWNERSHIP -m 0644 tcclasses ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 tcclasses.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/tcclasses ]; then - run_install $OWNERSHIP -m 0600 tcclasses ${DESTDIR}/etc/shorewall6/tcclasses + run_install $OWNERSHIP -m 0600 tcclasses${suffix} ${DESTDIR}/etc/shorewall6/tcclasses echo "TC Classes file installed as ${DESTDIR}/etc/shorewall6/tcclasses" fi # # Install the tcdevices file # -run_install $OWNERSHIP -m 0644 tcdevices ${DESTDIR}/usr/share/shorewall6/configfiles/tcdevices +run_install $OWNERSHIP -m 0644 tcdevices ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 tcdevices.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/tcdevices ]; then - run_install $OWNERSHIP -m 0600 tcdevices ${DESTDIR}/etc/shorewall6/tcdevices + run_install $OWNERSHIP -m 0600 tcdevices${suffix} ${DESTDIR}/etc/shorewall6/tcdevices echo "TC Devices file installed as ${DESTDIR}/etc/shorewall6/tcdevices" fi # # Install the tcfilters file # -run_install $OWNERSHIP -m 0644 tcfilters ${DESTDIR}/usr/share/shorewall6/configfiles/tcfilters +run_install $OWNERSHIP -m 0644 tcfilters ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 tcfilters.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/tcfilters ]; then - run_install $OWNERSHIP -m 0600 tcfilters ${DESTDIR}/etc/shorewall6/tcfilters + run_install $OWNERSHIP -m 0600 tcfilters${suffix} ${DESTDIR}/etc/shorewall6/tcfilters echo "TC Filters file installed as ${DESTDIR}/etc/shorewall6/tcfilters" fi # # Install the Notrack file # -run_install $OWNERSHIP -m 0644 notrack ${DESTDIR}/usr/share/shorewall6/configfiles/notrack +run_install $OWNERSHIP -m 0644 notrack ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 notrack.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/notrack ]; then - run_install $OWNERSHIP -m 0600 notrack ${DESTDIR}/etc/shorewall6/notrack + run_install $OWNERSHIP -m 0600 notrack${suffix} ${DESTDIR}/etc/shorewall6/notrack echo "Notrack file installed as ${DESTDIR}/etc/shorewall6/notrack" fi @@ -649,10 +666,11 @@ fi # # Install the Accounting file # -run_install $OWNERSHIP -m 0644 accounting ${DESTDIR}/usr/share/shorewall6/configfiles/accounting +run_install $OWNERSHIP -m 0644 accounting ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 accounting.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/accounting ]; then - run_install $OWNERSHIP -m 0600 accounting ${DESTDIR}/etc/shorewall6/accounting + run_install $OWNERSHIP -m 0600 accounting${suffix} ${DESTDIR}/etc/shorewall6/accounting echo "Accounting file installed as ${DESTDIR}/etc/shorewall6/accounting" fi # @@ -712,10 +730,11 @@ fi # # Install the Tcclear file # -run_install $OWNERSHIP -m 0644 tcclear ${DESTDIR}/usr/share/shorewall6/configfiles/tcclear +run_install $OWNERSHIP -m 0644 tcclear ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 tcclear.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/tcclear ]; then - run_install $OWNERSHIP -m 0600 tcclear ${DESTDIR}/etc/shorewall6/tcclear + run_install $OWNERSHIP -m 0600 tcclear${suffix} ${DESTDIR}/etc/shorewall6/tcclear echo "Tcclear file installed as ${DESTDIR}/etc/shorewall6/tcclear" fi # @@ -731,36 +750,37 @@ fi # # Install the Providers file # -run_install $OWNERSHIP -m 0644 providers ${DESTDIR}/usr/share/shorewall6/configfiles/providers +run_install $OWNERSHIP -m 0644 providers ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 providers.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/providers ]; then - run_install $OWNERSHIP -m 0600 providers ${DESTDIR}/etc/shorewall6/providers + run_install $OWNERSHIP -m 0600 providers${suffix} ${DESTDIR}/etc/shorewall6/providers echo "Providers file installed as ${DESTDIR}/etc/shorewall6/providers" fi # # Install the Proxyndp file # -run_install $OWNERSHIP -m 0644 proxyndp ${DESTDIR}/usr/share/shorewall6/configfiles/proxyndp +run_install $OWNERSHIP -m 0644 proxyndp ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 proxyndp.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/proxyndp ]; then - run_install $OWNERSHIP -m 0600 proxyndp ${DESTDIR}/etc/shorewall6/proxyndp + run_install $OWNERSHIP -m 0600 proxyndp${suffix} ${DESTDIR}/etc/shorewall6/proxyndp echo "Proxyndp file installed as ${DESTDIR}/etc/shorewall6/proxyndp" fi # # Install the Actions file # -run_install $OWNERSHIP -m 0644 actions ${DESTDIR}/usr/share/shorewall6/configfiles/actions +run_install $OWNERSHIP -m 0644 actions ${DESTDIR}/usr/share/shorewall6/configfiles/ +run_install $OWNERSHIP -m 0644 actions.annotated ${DESTDIR}/usr/share/shorewall6/configfiles/ if [ -z "$SPARSE" -a ! -f ${DESTDIR}/etc/shorewall6/actions ]; then - run_install $OWNERSHIP -m 0644 actions ${DESTDIR}/etc/shorewall6/actions + run_install $OWNERSHIP -m 0644 actions${suffix} ${DESTDIR}/etc/shorewall6/actions echo "Actions file installed as ${DESTDIR}/etc/shorewall6/actions" fi cd .. -rm -rf annotated/ - # # Install the Makefiles #