From 9a4df0fac8039199b01c0d291a8c714ac5394755 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 14 Mar 2013 15:07:33 -0700 Subject: [PATCH 1/3] Don't delete the user's tcstart file. Signed-off-by: Tom Eastep --- Shorewall/install.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Shorewall/install.sh b/Shorewall/install.sh index ffdeac4e6..64a0b4d18 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -739,12 +739,6 @@ if [ -f findgw ]; then fi fi -# -# Delete the tcstart file -# - -delete_file ${DESTDIR}${SHAREDIR}/$PRODUCT/tcstart - # # Delete the Limits Files # From b27e5f43784f4aaaa437fb9ac28845192a008858 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 15 Mar 2013 11:14:44 -0700 Subject: [PATCH 2/3] Correct installation of /sbin/ifup-local and /sbin/ifdown-local Signed-off-by: Tom Eastep --- Shorewall-init/install.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 9e362c7f0..1f779a347 100755 --- a/Shorewall-init/install.sh +++ b/Shorewall-init/install.sh @@ -391,11 +391,23 @@ case $HOST in fi ;; redhat) - if [ -f ${DESTDIR}${SBINDIR}/ifup-local -o -f ${DESTDIR}${SBINDIR}/ifdown-local ]; then - echo "WARNING: ${SBINDIR}/ifup-local and/or ${SBINDIR}/ifdown-local already exist; up/down events will not be handled" - elif [ -z "$DESTDIR" ]; then - install_file ifupdown ${DESTDIR}${SBINDIR}/ifup-local 0544 - install_file ifupdown ${DESTDIR}${SBINDIR}/ifdown-local 0544 + if [ -z "$DESTDIR" ]; then + install_local= + + if [ -f ${SBINDIR}/ifup-local -o -f ${SBINDIR}/ifdown-local ]; then + if ! fgrep -q Shorewall-based ${SBINDIR}/ifup-local || ! fgrep -q Shorewall-based ${SBINDIR}/ifdown-local; then + echo "WARNING: ${SBINDIR}/ifup-local and/or ${SBINDIR}/ifdown-local already exist; up/down events will not be handled" + else + install_local=Yes + fi + else + install_local=Yes + fi + + if [ -n "$install_local" ]; then + install_file ifupdown ${DESTDIR}${SBINDIR}/ifup-local 0544 + install_file ifupdown ${DESTDIR}${SBINDIR}/ifdown-local 0544 + fi fi ;; esac From 3ac683565058d67ac1d8daddc05c90b39ce6bd92 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 21 Mar 2013 11:30:59 -0700 Subject: [PATCH 3/3] Handle IPv6 /32 networks correctly. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/IPAddrs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/IPAddrs.pm b/Shorewall/Perl/Shorewall/IPAddrs.pm index 5be1796ed..73de45ae5 100644 --- a/Shorewall/Perl/Shorewall/IPAddrs.pm +++ b/Shorewall/Perl/Shorewall/IPAddrs.pm @@ -690,7 +690,7 @@ sub validate_6net( $$ ) { assert( ! $allow_name ); ( $net , $vlsm ); } elsif ( valid_6address ( $net ) ) { - $vlsm == 32 ? $net : "$net/$vlsm"; + $vlsm == 128 ? $net : "$net/$vlsm"; } else { $net; }