From bddf78ded5c3dcccfc788942258cc03e46ebef07 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 20 May 2009 13:40:42 -0700 Subject: [PATCH] Missing user exists from Shorewall6 --- Shorewall/install.sh | 10 +++---- Shorewall6/clear | 13 +++++++++ Shorewall6/install.sh | 45 +++++++++++++++++++++++++++++++ Shorewall6/isusable | 23 ++++++++++++++++ Shorewall6/refresh | 13 +++++++++ Shorewall6/refreshed | 13 +++++++++ Shorewall6/shorewall6.spec | 55 ++------------------------------------ Shorewall6/tcclear | 13 +++++++++ 8 files changed, 127 insertions(+), 58 deletions(-) create mode 100644 Shorewall6/clear create mode 100644 Shorewall6/isusable create mode 100644 Shorewall6/refresh create mode 100644 Shorewall6/refreshed create mode 100644 Shorewall6/tcclear diff --git a/Shorewall/install.sh b/Shorewall/install.sh index a1e3f2938..d90d410ea 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -607,7 +607,7 @@ run_install $OWNERSHIP -m 0644 configfiles/clear ${PREFIX}/usr/share/shorewall/c if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/clear ]; then run_install $OWNERSHIP -m 0600 configfiles/clear ${PREFIX}/etc/shorewall/clear - echo "Restored file installed as ${PREFIX}/etc/shorewall/clear" + echo "Clear file installed as ${PREFIX}/etc/shorewall/clear" fi # # Install the Isusable file @@ -616,7 +616,7 @@ run_install $OWNERSHIP -m 0644 configfiles/isusable ${PREFIX}/usr/share/shorewal if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/isusable ]; then run_install $OWNERSHIP -m 0600 configfiles/isusable ${PREFIX}/etc/shorewall/isusable - echo "Restored file installed as ${PREFIX}/etc/shorewall/isusable" + echo "Isusable file installed as ${PREFIX}/etc/shorewall/isusable" fi # # Install the Refresh file @@ -625,7 +625,7 @@ run_install $OWNERSHIP -m 0644 configfiles/refresh ${PREFIX}/usr/share/shorewall if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/refresh ]; then run_install $OWNERSHIP -m 0600 configfiles/refresh ${PREFIX}/etc/shorewall/refresh - echo "Restored file installed as ${PREFIX}/etc/shorewall/refresh" + echo "Refresh file installed as ${PREFIX}/etc/shorewall/refresh" fi # # Install the Refreshed file @@ -634,7 +634,7 @@ run_install $OWNERSHIP -m 0644 configfiles/refreshed ${PREFIX}/usr/share/shorewa if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/refreshed ]; then run_install $OWNERSHIP -m 0600 configfiles/refreshed ${PREFIX}/etc/shorewall/refreshed - echo "Restored file installed as ${PREFIX}/etc/shorewall/refreshed" + echo "Refreshed file installed as ${PREFIX}/etc/shorewall/refreshed" fi # # Install the Tcclear file @@ -643,7 +643,7 @@ run_install $OWNERSHIP -m 0644 configfiles/tcclear ${PREFIX}/usr/share/shorewall if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall/tcclear ]; then run_install $OWNERSHIP -m 0600 configfiles/tcclear ${PREFIX}/etc/shorewall/tcclear - echo "Restored file installed as ${PREFIX}/etc/shorewall/tcclear" + echo "Tcclear file installed as ${PREFIX}/etc/shorewall/tcclear" fi # # Install the Standard Actions file diff --git a/Shorewall6/clear b/Shorewall6/clear new file mode 100644 index 000000000..2b3fd6a2e --- /dev/null +++ b/Shorewall6/clear @@ -0,0 +1,13 @@ +# +# Shorewall6 version 4 - clear File +# +# /etc/shorewall6/clear +# +# Add commands below that you want to be executed after Shorewall6 +# has processed the 'clear' command. +# +# See http://shorewall.net/shorewall_extension_scripts.htm for additional +# information. +# +############################################################################### +#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 3bc82a0ba..ca545b125 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -506,6 +506,51 @@ if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/restored ]; then echo "Restored file installed as ${PREFIX}/etc/shorewall6/restored" fi # +# Install the Clear file +# +run_install $OWNERSHIP -m 0644 configfiles/clear ${PREFIX}/usr/share/shorewall6/configfiles/clear + +if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/clear ]; then + run_install $OWNERSHIP -m 0600 configfiles/clear ${PREFIX}/etc/shorewall6/clear + echo "Clear file installed as ${PREFIX}/etc/shorewall6/clear" +fi +# +# Install the Isusable file +# +run_install $OWNERSHIP -m 0644 configfiles/isusable ${PREFIX}/usr/share/shorewall6/configfiles/isusable + +if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/isusable ]; then + run_install $OWNERSHIP -m 0600 configfiles/isusable ${PREFIX}/etc/shorewall6/isusable + echo "Isusable file installed as ${PREFIX}/etc/shorewall/isusable" +fi +# +# Install the Refresh file +# +run_install $OWNERSHIP -m 0644 configfiles/refresh ${PREFIX}/usr/share/shorewall6/configfiles/refresh + +if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/refresh ]; then + run_install $OWNERSHIP -m 0600 configfiles/refresh ${PREFIX}/etc/shorewall6/refresh + echo "Refresh file installed as ${PREFIX}/etc/shorewall6/refresh" +fi +# +# Install the Refreshed file +# +run_install $OWNERSHIP -m 0644 configfiles/refreshed ${PREFIX}/usr/share/shorewall6/configfiles/refreshed + +if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/refreshed ]; then + run_install $OWNERSHIP -m 0600 configfiles/refreshed ${PREFIX}/etc/shorewall6/refreshed + echo "Refreshed file installed as ${PREFIX}/etc/shorewall6/refreshed" +fi +# +# Install the Tcclear file +# +run_install $OWNERSHIP -m 0644 configfiles/tcclear ${PREFIX}/usr/share/shorewall6/configfiles/tcclear + +if [ -z "$CYGWIN" -a ! -f ${PREFIX}/etc/shorewall6/tcclear ]; then + run_install $OWNERSHIP -m 0600 configfiles/tcclear ${PREFIX}/etc/shorewall6/tcclear + echo "Tcclear file installed as ${PREFIX}/etc/shorewall6/tcclear" +fi +# # Install the Standard Actions file # install_file actions.std ${PREFIX}/usr/share/shorewall6/actions.std 0644 diff --git a/Shorewall6/isusable b/Shorewall6/isusable new file mode 100644 index 000000000..63bcc6694 --- /dev/null +++ b/Shorewall6/isusable @@ -0,0 +1,23 @@ +# +# Shorewall6 version 4 - isusable File +# +# /etc/shorewall6/isusable +# +# This script is called when Shorewall6 is attempting to determine +# if an interface named in /etc/shorewall/providers is usable. +# +# The script is invoked inside a function that accepts an interface +# name as a single argument. The file below is designed to work with +# both swping and lsm as described at http://www.shorewall.net/MultiISP.html +# +# See http://shorewall.net/shorewall_extension_scripts.htm for additional +# information. +# +############################################################################### +local status=0 + +[ -f ${VARDIR}/${1}.status ] && status=$(cat ${VARDIR}/${1}.status) + +return $status + +#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE diff --git a/Shorewall6/refresh b/Shorewall6/refresh new file mode 100644 index 000000000..cf5fa587e --- /dev/null +++ b/Shorewall6/refresh @@ -0,0 +1,13 @@ +# +# Shorewall6 version 4 - refresh File +# +# /etc/shorewall6/refresh +# +# Add commands below that you want to be executed before Shorewall6 +# has processed the 'refresh' command. +# +# See http://shorewall.net/shorewall_extension_scripts.htm for additional +# information. +# +############################################################################### +#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE diff --git a/Shorewall6/refreshed b/Shorewall6/refreshed new file mode 100644 index 000000000..0cf34265e --- /dev/null +++ b/Shorewall6/refreshed @@ -0,0 +1,13 @@ +# +# Shorewall6 version 4 - refreshed File +# +# /etc/shorewall6/refreshed +# +# Add commands below that you want to be executed after Shorewall6 +# has processed the 'refresh' command. +# +# See http://shorewall.net/shorewall_extension_scripts.htm for additional +# information. +# +############################################################################### +#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index 200fe0501..8a61044db 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -66,32 +66,7 @@ fi %attr(0755,root,root) %dir /usr/share/shorewall6 %attr(0755,root,root) %dir /usr/share/shorewall6/configfiles %attr(0700,root,root) %dir /var/lib/shorewall6 -%attr(0644,root,root) %config(noreplace) /etc/shorewall6/shorewall6.conf -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/zones -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/policy -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/interfaces -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/rules -%attr(0644,root,root) %config(noreplace) /etc/shorewall6/params -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/routestopped -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/maclist -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/tcrules -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/tos -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/tunnels -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/hosts -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/blacklist -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/init -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/start -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/stop -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/stopped -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/accounting -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/actions -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/started -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/restored -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/providers -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/route_rules -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/tcclasses -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/tcdevices -%attr(0600,root,root) %config(noreplace) /etc/shorewall6/notrack +%attr(0644,root,root) %config(noreplace) /etc/shorewall6/* %attr(0600,root,root) /etc/shorewall6/Makefile %attr(0755,root,root) /sbin/shorewall6 @@ -110,33 +85,7 @@ fi %attr(0644,root,root) /usr/share/shorewall6/configpath %attr(0755,root,root) /usr/share/shorewall6/wait4ifup -%attr(0644,root,root) /usr/share/shorewall6/configfiles/shorewall6.conf -%attr(0644,root,root) /usr/share/shorewall6/configfiles/zones -%attr(0644,root,root) /usr/share/shorewall6/configfiles/policy -%attr(0644,root,root) /usr/share/shorewall6/configfiles/interfaces -%attr(0644,root,root) /usr/share/shorewall6/configfiles/rules -%attr(0644,root,root) /usr/share/shorewall6/configfiles/params -%attr(0644,root,root) /usr/share/shorewall6/configfiles/routestopped -%attr(0644,root,root) /usr/share/shorewall6/configfiles/maclist -%attr(0644,root,root) /usr/share/shorewall6/configfiles/tcrules -%attr(0644,root,root) /usr/share/shorewall6/configfiles/tos -%attr(0644,root,root) /usr/share/shorewall6/configfiles/tunnels -%attr(0644,root,root) /usr/share/shorewall6/configfiles/hosts -%attr(0644,root,root) /usr/share/shorewall6/configfiles/blacklist -%attr(0644,root,root) /usr/share/shorewall6/configfiles/init -%attr(0644,root,root) /usr/share/shorewall6/configfiles/start -%attr(0644,root,root) /usr/share/shorewall6/configfiles/stop -%attr(0644,root,root) /usr/share/shorewall6/configfiles/stopped -%attr(0644,root,root) /usr/share/shorewall6/configfiles/accounting -%attr(0644,root,root) /usr/share/shorewall6/configfiles/actions -%attr(0644,root,root) /usr/share/shorewall6/configfiles/started -%attr(0644,root,root) /usr/share/shorewall6/configfiles/restored -%attr(0644,root,root) /usr/share/shorewall6/configfiles/providers -%attr(0644,root,root) /usr/share/shorewall6/configfiles/route_rules -%attr(0644,root,root) /usr/share/shorewall6/configfiles/tcclasses -%attr(0644,root,root) /usr/share/shorewall6/configfiles/tcdevices -%attr(0644,root,root) /usr/share/shorewall6/configfiles/notrack -%attr(0644,root,root) /usr/share/shorewall6/configfiles/Makefile +%attr(0644,root,root) /usr/share/shorewall6/configfiles/* %attr(0644,root,root) %{_mandir}/man5/* %attr(0644,root,root) %{_mandir}/man8/shorewall6.8.gz diff --git a/Shorewall6/tcclear b/Shorewall6/tcclear new file mode 100644 index 000000000..e9433168f --- /dev/null +++ b/Shorewall6/tcclear @@ -0,0 +1,13 @@ +# +# Shorewall6 version 4 - tcclear File +# +# /etc/shorewall6/tcclear +# +# Add commands below that you want to be executed before Shorewall6 +# clears the traffic shaping configuration. +# +# See http://shorewall.net/shorewall_extension_scripts.htm for additional +# information. +# +############################################################################### +#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE