Hi Tom,

In shorewall6-lite-5.0.2-RC1/uninstall.sh:
The "=" is missing on line 172!
So the line should look like:
FIREWALL=$(readlink ${SHAREDIR}/shorewall6-lite/init)

--
I have also added "6" on line 156, 148, 152:
echo ... Shorewall6 lite ... instead of echo ... Shorewall lite ...

Modified uninstall.sh attached!

-Matt

On 6 Nov 2015 at 20:57, Tom Eastep wrote:

> Shorewall 5.0.2 RC 1 is now available for testing.
> 
> Problems corrected since Beta 2:
> 
> 1)  Previously, if LOCKFILE specified a file in a directory other than
>      $VARDIR, and that directory did not exist, it was not created
>      automatically.
> 
> New Features since Beta 2:
> 
> The following feature has been extended.
> 
> 1)  Support for OpenWRT versions BB and later has been added. Included
>      in this support are:
> 
>      - The log display commands (show log, logwatch, etc.) no longer
>        depend on the 'tac' utility (although it will be used if it is
>        installed).
> 
>      - Shorewall-core's 'configure' script detects OpenWRT and accepts
>        HOST=openwrt as an argument.
> 
>      - Shorewall-core, Shorewall-lite and Shoreawll6-lite installers
>        support openwrt. Additionally, those installers no longer depend
>        on the 'install' utility.
> 
>      - Shorewall[6]-lite will use OpenWRT's 'lock' utility to create the
>        LOCKFILE.
> 
>      A special thanks to Matt Darfeuille for his help in making this
>      support possible.
> 
> Thank you for testing,
> 
> -Tom
> -- 
> Tom Eastep        \ When I die, I want to go like my Grandfather who
> Shoreline,         \ died peacefully in his sleep. Not screaming like
> Washington, USA     \ all of the passengers in his car
> http://shorewall.net \________________________________________________
> 
> ------------------------------------------------------------------------------
> _______________________________________________
> Shorewall-users mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/shorewall-users





-------------- Enclosure number 1 ----------------
#!/bin/sh
#
# Script to back uninstall Shoreline Firewall 6 Lite
#
#     (c) 2000-2014 - Tom Eastep ([email protected])
#
#       Shorewall documentation is available at http://shorewall.sourceforge.net
#
#       This program is part of Shorewall.
#
#       This program is free software; you can redistribute it and/or modify
#       it under the terms of the GNU General Public License as published by the
#       Free Software Foundation, either version 2 of the license or, at your
#       option, any later version.
#
#       This program is distributed in the hope that it will be useful,
#       but WITHOUT ANY WARRANTY; without even the implied warranty of
#       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#       GNU General Public License for more details.
#
#       You should have received a copy of the GNU General Public License
#       along with this program; if not, see <http://www.gnu.org/licenses/>.
#
#    Usage:
#
#       You may only use this script to uninstall the version
#       shown below. Simply run this script to remove Shorewall Firewall

VERSION=5.0.2-RC1
PRODUCT=shorewall6-lite

usage() # $1 = exit status
{
    ME=$(basename $0)
    echo "usage: $ME [ <shorewallrc file> ]"
    exit $1
}

fatal_error()
{
    echo "   ERROR: $@" >&2
    exit 1
}

qt()
{
    "$@" >/dev/null 2>&1
}

split() {
    local ifs
    ifs=$IFS
    IFS=:
    set -- $1
    echo $*
    IFS=$ifs
}

mywhich() {
    local dir

    for dir in $(split $PATH); do
        if [ -x $dir/$1 ]; then
            return 0
        fi
    done

    return 2
}

remove_file() # $1 = file to restore
{
    if [ -f $1 -o -L $1 ] ; then
        rm -f $1
        echo "$1 Removed"
    fi
}

finished=0
configure=1

while [ $finished -eq 0 ]; do
    option=$1

    case "$option" in
        -*)
            option=${option#-}

            while [ -n "$option" ]; do
                case $option in
                    h)
                        usage 0
                        ;;
                    v)
                        echo "$Product Firewall Installer Version $VERSION"
                        exit 0
                        ;;
                    n*)
                        configure=0
                        option=${option#n}
                        ;;
                    *)
                        usage 1
                        ;;
                esac
            done

            shift
            ;;
        *)
            finished=1
            ;;
    esac
done
#
# Read the RC file
#
if [ $# -eq 0 ]; then
    if [ -f ./shorewallrc ]; then
        . ./shorewallrc
    elif [ -f ~/.shorewallrc ]; then
        . ~/.shorewallrc || exit 1
        file=./.shorewallrc
    elif [ -f /usr/share/shorewall/shorewallrc ]; then
        . /usr/share/shorewall/shorewallrc
    else
        fatal_error "No configuration file specified and 
/usr/share/shorewall/shorewallrc not found"
    fi
elif [ $# -eq 1 ]; then
    file=$1
    case $file in
        /*|.*)
            ;;
        *)
            file=./$file
            ;;
    esac

    . $file
else
    usage 1
fi

if [ -f ${SHAREDIR}/shorewall6-lite/version ]; then
    INSTALLED_VERSION="$(cat ${SHAREDIR}/shorewall6-lite/version)"
    if [ "$INSTALLED_VERSION" != "$VERSION" ]; then
        echo "WARNING: Shorewall6 Lite Version $INSTALLED_VERSION is installed"
        echo "         and this is the $VERSION uninstaller."
        VERSION="$INSTALLED_VERSION"
    fi
else
    echo "WARNING: Shorewall6 Lite Version $VERSION is not installed"
    VERSION=""
fi

echo "Uninstalling Shorewall6 Lite $VERSION"

[ -n "$SANDBOX" ] && configure=0

if [ $configure -eq 1 ]; then
    if qt ip6tables -L shorewall -n && [ ! -f ${SBINDIR}/shorewall6 ]; then
        ${SBINDIR}/shorewall6-lite clear
    fi
fi

if [ -f ${SHAREDIR}/shorewall6-lite/init ]; then
    if [ $HOST = openwrt ]; then
        if [ $configure -eq 1 ] && /etc/init.d/shorewall6-lite enabled; then
            /etc/init.d/shorewall6-lite disable
        fi
        
        FIREWALL=$(readlink ${SHAREDIR}/shorewall6-lite/init)
    else
        FIREWALL=$(readlink -m -q ${SHAREDIR}/shorewall6-lite/init)
    fi
elif [ -n "$INITFILE" ]; then
    FIREWALL=${INITDIR}/${INITFILE}
fi

if [ -f "$FIREWALL" ]; then
    if [ $configure -eq 1 ]; then
        if mywhich updaterc.d ; then
            updaterc.d shorewall6-lite remove
        elif mywhich insserv ; then
            insserv -r $FIREWALL
        elif mywhich chkconfig ; then
            chkconfig --del $(basename $FIREWALL)
        elif mywhich systemctl ; then
            systemctl disable shorewall6-lite
        fi
    fi

    remove_file $FIREWALL
fi

if [ -n "$SYSTEMD" ]; then
    [ $configure -eq 1 ] && systemctl disable ${PRODUCT}
    rm -f $SYSTEMD/shorewall6-lite.service
fi

rm -f ${SBINDIR}/shorewall6-lite
rm -rf ${CONFDIR}/shorewall6-lite
rm -rf ${VARDIR}/shorewall6-lite
rm -rf ${SHAREDIR}/shorewall6-lite
rm -rf ${LIBEXECDIR}/shorewall6-lite
rm -f  ${CONFDIR}/logrotate.d/shorewall6-lite
rm -f  ${SYSCONFDIR}/shorewall6-lite
[ -n "$SYSTEMD" ] && rm -f  ${SYSTEMD}/shorewall6-lite.service

rm -f ${MANDIR}/man5/shorewall6-lite*
rm -f ${MANDIR}/man8/shorewall6-lite*

echo "Shorewall6 Lite Uninstalled"

------------------------------------------------------------------------------
_______________________________________________
Shorewall-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-users

Reply via email to