diff --git a/Shorewall-core/COPYING b/Shorewall-core/COPYING new file mode 100644 index 000000000..2efa30e5e --- /dev/null +++ b/Shorewall-core/COPYING @@ -0,0 +1,341 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + 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, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/Shorewall-core/INSTALL b/Shorewall-core/INSTALL new file mode 100644 index 000000000..195ba27c2 --- /dev/null +++ b/Shorewall-core/INSTALL @@ -0,0 +1,24 @@ +Shoreline Firewall (Shorewall) Version 4 +----- ---- + +----------------------------------------------------------------------------- + + This program is free software; you can redistribute it and/or modify + it under the terms of Version 2 of the GNU General Public License + as published by the Free Software Foundation. + + 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +--------------------------------------------------------------------------- + +Please see http://www.shorewall.net/Install.htm for installation +instructions. + + diff --git a/Shorewall-core/install.sh b/Shorewall-core/install.sh new file mode 100755 index 000000000..933de2ed2 --- /dev/null +++ b/Shorewall-core/install.sh @@ -0,0 +1,278 @@ +#!/bin/sh +# +# Script to install Shoreline Firewall Core Modules +# +# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] +# +# (c) 2000-2011 - Tom Eastep (teastep@shorewall.net) +# +# Shorewall documentation is available at http://shorewall.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of Version 2 of the GNU General Public License +# as published by the Free Software Foundation. +# +# 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +VERSION=xxx #The Build script inserts the actual version + +usage() # $1 = exit status +{ + ME=$(basename $0) + echo "usage: $ME" + echo " $ME -v" + echo " $ME -h" + echo " $ME -s" + echo " $ME -f" + exit $1 +} + +split() { + local ifs + ifs=$IFS + IFS=: + set -- $1 + echo $* + IFS=$ifs +} + +qt() +{ + "$@" >/dev/null 2>&1 +} + +mywhich() { + local dir + + for dir in $(split $PATH); do + if [ -x $dir/$1 ]; then + echo $dir/$1 + return 0 + fi + done + + return 2 +} + +run_install() +{ + if ! install $*; then + echo + echo "ERROR: Failed to install $*" >&2 + exit 1 + fi +} + +cant_autostart() +{ + echo + echo "WARNING: Unable to configure shorewall to start automatically at boot" >&2 +} + +delete_file() # $1 = file to delete +{ + rm -f $1 +} + +install_file() # $1 = source $2 = target $3 = mode +{ + run_install $T $OWNERSHIP -m $3 $1 ${2} +} + +[ -n "$DESTDIR" ] || DESTDIR="$PREFIX" + +# +# Parse the run line +# +# ARGS is "yes" if we've already parsed an argument +# +T="-T" + +[ -n "${LIBEXEC:=/usr/share}" ] +[ -n "${PERLLIB:=/usr/share/shorewall}" ] +MACHOST= + +case "$LIBEXEC" in + /*) + ;; + *) + LIBEXEC=/usr/${LIBEXEC} + ;; +esac + +case "$PERLLIB" in + /*) + ;; + *) + PERLLIB=/usr/${PERLLIB} + ;; +esac + +INSTALLD='-D' + +case $(uname) in + CYGWIN*) + if [ -z "$DESTDIR" ]; then + DEST= + INIT= + fi + + OWNER=$(id -un) + GROUP=$(id -gn) + CYGWIN=Yes + ;; + Darwin) + if [ -z "$DESTDIR" ]; then + DEST= + INIT= + fi + + [ -z "$OWNER" ] && OWNER=root + [ -z "$GROUP" ] && GROUP=wheel + MAC=Yes + MACHOST=Yes + INSTALLD= + T= + ;; + *) + [ -z "$OWNER" ] && OWNER=root + [ -z "$GROUP" ] && GROUP=root + ;; +esac + +OWNERSHIP="-o $OWNER -g $GROUP" + +finished=0 + +while [ $finished -eq 0 ]; do + option=$1 + + case "$option" in + -*) + option=${option#-} + + while [ -n "$option" ]; do + case $option in + h) + usage 0 + ;; + v) + echo "Shorewall Firewall Installer Version $VERSION" + exit 0 + ;; + a*) + ANNOTATED=Yes + option=${option#a} + ;; + p*) + ANNOTATED= + option=${option#p} + ;; + *) + usage 1 + ;; + esac + done + + shift + ;; + *) + [ -n "$option" ] && usage 1 + finished=1 + ;; + esac +done + +PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin + +# +# Determine where to install the firewall script +# + +if [ -n "$DESTDIR" ]; then + if [ -z "$CYGWIN" ]; then + if [ `id -u` != 0 ] ; then + echo "Not setting file owner/group permissions, not running as root." + OWNERSHIP="" + fi + fi + + install -d $OWNERSHIP -m 755 ${DESTDIR}/sbin + install -d $OWNERSHIP -m 755 ${DESTDIR}${DEST} + + CYGWIN= + MAC= +else + if [ -n "$CYGWIN" ]; then + echo "Installing Cygwin-specific configuration..." + elif [ -n "$MAC" ]; then + echo "Installing Mac-specific configuration..." + else + if [ -f /etc/debian_version ]; then + echo "Installing Debian-specific configuration..." + DEBIAN=yes + elif [ -f /etc/redhat-release ]; then + echo "Installing Redhat/Fedora-specific configuration..." + FEDORA=yes + elif [ -f /etc/slackware-version ] ; then + echo "Installing Slackware-specific configuration..." + DEST="/etc/rc.d" + MANDIR="/usr/man" + SLACKWARE=yes + elif [ -f /etc/arch-release ] ; then + echo "Installing ArchLinux-specific configuration..." + DEST="/etc/rc.d" + INIT="shorewall" + ARCHLINUX=yes + fi + fi +fi + +# +# Change to the directory containing this script +# +cd "$(dirname $0)" + +echo "Installing Shorewall Core Version $VERSION" + +# +# Create /usr/share/shorewall +# +mkdir -p ${DESTDIR}${LIBEXEC}/shorewall +chmod 755 ${DESTDIR}/usr/share/shorewall +# +# Install wait4ifup +# +install_file wait4ifup ${DESTDIR}${LIBEXEC}/shorewall/wait4ifup 0755 + +echo +echo "wait4ifup installed in ${DESTDIR}${LIBEXEC}/shorewall/wait4ifup" + +# +# Install the libraries +# +for f in lib.* ; do + install_file $f ${DESTDIR}/usr/share/shorewall/$f 0644 + echo "Library ${f#*.} file installed as ${DESTDIR}/usr/share/shorewall/$f" +done +# +# Symbolically link 'functions' to lib.base +# +ln -sf lib.base ${DESTDIR}/usr/share/shorewall/functions +# +# Create the version file +# +echo "$VERSION" > ${DESTDIR}/usr/share/shorewall/coreversion +chmod 644 ${DESTDIR}/usr/share/shorewall/coreversion +# +# Report Success +# +echo "Shorewall Core Version $VERSION Installed" diff --git a/Shorewall/lib.base b/Shorewall-core/lib.base similarity index 99% rename from Shorewall/lib.base rename to Shorewall-core/lib.base index 5429bd51c..9ea992830 100644 --- a/Shorewall/lib.base +++ b/Shorewall-core/lib.base @@ -177,7 +177,7 @@ find_interface_by_mac() { done } -[ -z "$LEFTSHIFT" ] && . ${g_basedir}/lib.common +[ -z "$LEFTSHIFT" ] && . /usr/share/shorewall/lib.common # # Validate an IP address diff --git a/Shorewall/lib.cli b/Shorewall-core/lib.cli similarity index 98% rename from Shorewall/lib.cli rename to Shorewall-core/lib.cli index cf286d565..17279583b 100644 --- a/Shorewall/lib.cli +++ b/Shorewall-core/lib.cli @@ -510,14 +510,16 @@ version_command() { [ $# -gt 0 ] && usage 1 - echo $SHOREWALL_VERSION - if [ -n "$all" ]; then + echo "shorewall-core: $(cat /usr/share/shorewall/coreversion)" + for product in shorewall shorewall6 shorewall-lite shorewall6-lite shorewall-init; do - if [ $product != $g_program -a -f /usr/share/$product/version ]; then + if [ -f /usr/share/$product/version ]; then echo "$product: $(cat /usr/share/$product/version)" fi done + else + echo $SHOREWALL_VERSION fi } @@ -2858,7 +2860,51 @@ usage() # $1 = exit status exit $1 } +# +# This is the main entry point into the CLI. It directly handles all commands supported +# by both the full and lite versions. Note, however, that functions such as start_command() +# appear in both this library and it lib.cli-std. The ones in cli-std overload the ones +# here if that lib is loaded below. +# shorewall_cli() { + g_debugging= + + if [ $# -gt 0 ] && [ "x$1" = "xdebug" -o "x$1" = "xtrace" ]; then + g_debugging=$1 + shift + fi + + g_nolock= + + if [ $# -gt 0 ] && [ "$1" = "nolock" ]; then + g_nolock=nolock + shift + fi + + g_noroutes= + g_purge= + g_ipt_options="-nv" + g_fast= + g_verbose_offset=0 + g_use_verbosity= + g_debug= + g_export= + g_refreshchains=:none: + g_confess= + g_update= + g_convert= + g_annotate= + g_recovering= + g_timestamp= + g_libexec=/usr/share + g_perllib=/usr/share/shorewall + g_shorewalldir= + + VERBOSE= + VERBOSITY= + + [ -n "$g_lite" ] || . /usr/share/shorewall/lib.cli-std + finished=0 while [ $finished -eq 0 ]; do diff --git a/Shorewall/lib.common b/Shorewall-core/lib.common similarity index 100% rename from Shorewall/lib.common rename to Shorewall-core/lib.common diff --git a/Shorewall-core/uninstall.sh b/Shorewall-core/uninstall.sh new file mode 100755 index 000000000..f363fe591 --- /dev/null +++ b/Shorewall-core/uninstall.sh @@ -0,0 +1,84 @@ +#!/bin/sh +# +# Script to back uninstall Shoreline Firewall +# +# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] +# +# (c) 2000-2011 - Tom Eastep (teastep@shorewall.net) +# +# Shorewall documentation is available at http://www.shorewall.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of Version 2 of the GNU General Public License +# as published by the Free Software Foundation. +# +# 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Usage: +# +# You may only use this script to uninstall the version +# shown below. Simply run this script to remove Shorewall Firewall + +VERSION=xxx #The Build script inserts the actual version + +usage() # $1 = exit status +{ + ME=$(basename $0) + echo "usage: $ME" + exit $1 +} + +qt() +{ + "$@" >/dev/null 2>&1 +} + +restore_file() # $1 = file to restore +{ + if [ -f ${1}-shorewall.bkout ]; then + if (mv -f ${1}-shorewall.bkout $1); then + echo + echo "$1 restored" + else + exit 1 + fi + fi +} + +remove_file() # $1 = file to restore +{ + if [ -f $1 -o -L $1 ] ; then + rm -f $1 + echo "$1 Removed" + fi +} + +if [ -f /usr/share/shorewall/coreversion ]; then + INSTALLED_VERSION="$(cat /usr/share/shorewall/coreversion)" + if [ "$INSTALLED_VERSION" != "$VERSION" ]; then + echo "WARNING: Shorewall Core Version $INSTALLED_VERSION is installed" + echo " and this is the $VERSION uninstaller." + VERSION="$INSTALLED_VERSION" + fi +else + echo "WARNING: Shorewall Core Version $VERSION is not installed" + VERSION="" +fi + +[ -n "${LIBEXEC:=/usr/share}" ] +[ -n "${PERLLIB:=/usr/share/shorewall}" ] + +echo "Uninstalling Shorewall Core $VERSION" + +rm -rf /usr/share/shorewall + +echo "Shorewall Core Uninstalled" + + diff --git a/Shorewall/wait4ifup b/Shorewall-core/wait4ifup similarity index 100% rename from Shorewall/wait4ifup rename to Shorewall-core/wait4ifup diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 39a949c1e..9f1a51462 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -184,6 +184,11 @@ elif [ -f /etc/arch-release ] ; then fi if [ -z "$DESTDIR" ]; then + if [ ! -f /usr/share/shorewall/coreversion ]; then + echo "Shorewall-lite $VERSION requires Shorewall Core which does not appear to be installed" >&2 + exit 1 + fi + if [ -f /lib/systemd/system ]; then SYSTEMD=Yes fi @@ -202,6 +207,11 @@ echo "Installing Shorewall Lite Version $VERSION" # Check for /etc/shorewall-lite # if [ -z "$DESTDIR" -a -d /etc/shorewall-lite ]; then + if [ ! -f /usr/share/shorewall/coreversion ]; then + echo "Shorewall-lite $VERSION requires Shorewall Core which does not appear to be installed" >&2 + exit 1 + fi + [ -f /etc/shorewall-lite/shorewall.conf ] && \ mv -f /etc/shorewall-lite/shorewall.conf /etc/shorewall-lite/shorewall-lite.conf else @@ -390,6 +400,10 @@ if [ -z "$DESTDIR" ]; then ln -s ${DEST}/${INIT} /usr/share/shorewall-lite/init fi +delete_file ${DESTDIR}/usr/share/shorewall-lite/lib.common +delete_file ${DESTDIR}/usr/share/shorewall-lite/lib.cli +delete_file ${DESTDIR}/usr/share/shorewall-lite/wait4ifup + if [ -z "$DESTDIR" ]; then touch /var/log/shorewall-lite-init.log diff --git a/Shorewall-lite/lib.base b/Shorewall-lite/lib.base new file mode 100644 index 000000000..df6064fe8 --- /dev/null +++ b/Shorewall-lite/lib.base @@ -0,0 +1,34 @@ +# +# Shorewall 4.4 -- /usr/share/shorewall-lite/lib.base +# +# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] +# +# (c) 2011 - Tom Eastep (teastep@shorewall.net) +# +# Complete documentation is available at http://shorewall.net +# +# This program is free software; you can redisribute it and/or modify +# it under the terms of Version 2 of the GNU General Public License +# as published by the Free Software Foundation. +# +# 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# This library contains the code common to all Shorewall components. + +g_program=shorewall-lite +g_family=4 +g_basedir=/usr/share/shorewall + +[ -n "${VARDIR:=/var/lib/$g_program}" ] +[ -n "${SHAREDIR:=/usr/share/$g_program}" ] +[ -n "${CONFDIR:=/etc/$g_program}" ] + +. /usr/share/shorewall/lib.base + diff --git a/Shorewall6/wait4ifup b/Shorewall-lite/shorewall-lite similarity index 51% rename from Shorewall6/wait4ifup rename to Shorewall-lite/shorewall-lite index 60e17969d..b67fe8756 100755 --- a/Shorewall6/wait4ifup +++ b/Shorewall-lite/shorewall-lite @@ -1,12 +1,11 @@ #!/bin/sh # -# Shorewall6 interface helper utility - V4.2 +# Shorewall Lite Packet Filtering Firewall Control Program - V4.4 # # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # -# (c) 2007 - Tom Eastep (teastep@shorewall.net) -# -# This file is installed in /usr/share/shorewall/wait4ifup +# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011 - +# Tom Eastep (teastep@shorewall.net) # # Shorewall documentation is available at http://www.shorewall.net # @@ -23,38 +22,21 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# If an error occurs while starting or restarting the firewall, the -# firewall is automatically stopped. -# -# The firewall uses configuration files in /etc/shorewall/ - skeleton -# files is included with the firewall. -# -# wait4ifup [ ] +# For a list of supported commands, type 'shorewall help' or 'shorewall6 help' # +################################################################################################ +g_program=shorewall-lite +SHAREDIR=/usr/share/shorewall-lite +CONFDIR=/etc/shorewall-lite +g_product="Shorewall Lite" +g_family=4 +g_base=shorewall +g_tool=iptables +g_basedir=/usr/share/shorewall-lite +g_lite=Yes -interface_is_up() { - [ -n "$(ip link list dev $1 2> /dev/null | grep -e '[<,]UP[,>]')" ] -} - -case $# in - 1) - timeout=60 - ;; - 2) - timeout=$2 - ;; - *) - echo "usage: $(basename $0) [ ]" - exit 2 - ;; -esac - -while [ $timeout -gt 0 ]; do - interface_is_up $1 && exit 0 - sleep 1 - timeout=$(( $timeout - 1 )) +for library in base cli cli; do + . /usr/share/shorewall/lib.$library done -exit 1 - - +shorewall_cli $@ diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 7bba5ed7e..4b53ecfbd 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -289,6 +289,11 @@ else first_install="Yes" fi +if [ -z "${DESTDIR}" -a ! -f /usr/share/shorewall/coreversion ]; then + echo "Shorewall $VERSION requires Shorewall Core which does not appear to be installed" + exit 1 +fi + if [ -z "$CYGWIN" ]; then install_file shorewall ${DESTDIR}/sbin/shorewall 0755 echo "shorewall control program installed in ${DESTDIR}/sbin/shorewall" @@ -326,7 +331,7 @@ fi [ -n "$INIT" ] && echo "Shorewall script installed in ${DESTDIR}${DEST}/$INIT" # -# Create /etc/shorewall, /usr/share/shorewall and /var/shorewall if needed +# Create /etc/shorewall and /var/shorewall if needed # mkdir -p ${DESTDIR}/etc/shorewall mkdir -p ${DESTDIR}${LIBEXEC}/shorewall @@ -403,15 +408,6 @@ delete_file ${DESTDIR}/usr/share/shorewall/lib.tunnels delete_file ${DESTDIR}/usr/share/shorewall/prog.header delete_file ${DESTDIR}/usr/share/shorewall/prog.footer -# -# Install wait4ifup -# - -install_file wait4ifup ${DESTDIR}${LIBEXEC}/shorewall/wait4ifup 0755 - -echo -echo "wait4ifup installed in ${DESTDIR}${LIBEXEC}/shorewall/wait4ifup" - # # Install the policy file # @@ -919,10 +915,6 @@ for f in lib.* ; do fi done # -# Symbolically link 'functions' to lib.base -# -ln -sf lib.base ${DESTDIR}/usr/share/shorewall/functions -# # /usr/share/shorewall/Shorewall if needed # mkdir -p ${DESTDIR}/usr/share/shorewall/Shorewall diff --git a/Shorewall/shorewall b/Shorewall/shorewall index a16cbbe71..89c33e1dd 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -25,89 +25,17 @@ # For a list of supported commands, type 'shorewall help' or 'shorewall6 help' # ################################################################################################ -g_debugging= +g_program=shorewall +SHAREDIR=/usr/share/shorewall +CONFDIR=/etc/shorewall +g_product="Shorewall" +g_family=4 +g_tool= +g_basedir=/usr/share/shorewall +g_lite= -if [ $# -gt 0 ] && [ "x$1" = "xdebug" -o "x$1" = "xtrace" ]; then - g_debugging=$1 - shift -fi - -g_nolock= - -if [ $# -gt 0 ] && [ "$1" = "nolock" ]; then - g_nolock=nolock - shift -fi - -g_noroutes= -g_purge= -g_ipt_options="-nv" -g_fast= -g_verbose_offset=0 -g_use_verbosity= -g_debug= -g_export= -g_refreshchains=:none: -g_confess= -g_update= -g_convert= -g_annotate= -g_recovering= -g_timestamp= -g_libexec=/usr/share -g_perllib=/usr/share/shorewall -g_shorewalldir= - -VERBOSE= -VERBOSITY= - -g_program=$(basename $0) - -if [ $g_program = shorewall6 ]; then - SHAREDIR=/usr/share/shorewall6 - CONFDIR=/etc/shorewall6 - g_product="Shorewall6" - g_family=6 - g_tool= - g_basedir=/usr/share/shorewall - g_lite= -elif [ $g_program = shorewall6-lite ]; then - SHAREDIR=/usr/share/shorewall6-lite - CONFDIR=/etc/shorewall6-lite - g_product="Shorewall6 Lite" - g_family=6 - g_base=shorewall6 - g_tool=ip6tables - g_basedir=/usr/share/shorewall6-lite - g_lite=Yes -elif [ $g_program = shorewall-lite ]; then - SHAREDIR=/usr/share/shorewall-lite - CONFDIR=/etc/shorewall-lite - g_product="Shorewall Lite" - g_family=4 - g_base=shorewall - g_tool=iptables - g_basedir=/usr/share/shorewall-lite - g_lite=Yes -else - g_program=shorewall - SHAREDIR=/usr/share/shorewall - CONFDIR=/etc/shorewall - g_product="Shorewall" - g_family=4 - g_tool= - g_basedir=/usr/share/shorewall - g_lite= -fi - -if [ -z "$g_lite" ]; then - for library in base cli cli-std; do - . /usr/share/shorewall/lib.$library - done -else - for library in base cli; do - . ${SHAREDIR}/lib.$library - done -fi +for library in base cli; do + . /usr/share/shorewall/lib.$library +done shorewall_cli $@ diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index c765e0a8a..a342167b9 100755 --- a/Shorewall/uninstall.sh +++ b/Shorewall/uninstall.sh @@ -107,13 +107,24 @@ fi rm -f /sbin/shorewall rm -f /sbin/shorewall-*.bkout +rm -rf /usr/share/shorewall/version rm -rf /etc/shorewall rm -rf /etc/shorewall-*.bkout rm -rf /var/lib/shorewall rm -rf /var/lib/shorewall-*.bkout rm -rf $PERLLIB}/Shorewall/* rm -rf ${LIBEXEC}/shorewall -rm -rf /usr/share/shorewall +rm -rf /usr/share/shorewall/Macros +rm -rf /usr/share/shorewall/configfiles/ +rm -rf /usr/share/shorewall/Samples/ +rm -rf /usr/share/shorewall/Shorewall/ +rm -f /usr/share/shorewall/lib.cli-std +rm -f /usr/share/shorewall/compiler.pl +rm -f /usr/share/shorewall/prog.* +rm -f /usr/share/shorewall/module* +rm -f /usr/share/shorewall/helpers +rm -f /usr/share/shorewall/action* +rm -f /usr/share/shorewall/init rm -rf /usr/share/shorewall-*.bkout rm -rf /usr/share/man/man5/shorewall* rm -rf /usr/share/man/man8/shorewall* diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index e02de234c..d9c432680 100755 --- a/Shorewall6-lite/install.sh +++ b/Shorewall6-lite/install.sh @@ -183,6 +183,11 @@ elif [ -f /etc/arch-release ] ; then fi if [ -z "$DESTDIR" ]; then + if [ ! -f /usr/share/shorewall/coreversion ]; then + echo "Shorewall6-lite $VERSION requires Shorewall Core which does not appear to be installed" >&2 + exit 1 + fi + if [ -f /lib/systemd/system ]; then SYSTEMD=Yes fi @@ -201,6 +206,11 @@ echo "Installing Shorewall6 Lite Version $VERSION" # Check for /etc/shorewall6-lite # if [ -z "$DESTDIR" -a -d /etc/shorewall6-lite ]; then + if [ ! -f /usr/share/shorewall/coreversion ]; then + echo "Shorewall6-lite $VERSION requires Shorewall Core which does not appear to be installed" >&2 + exit 1 + fi + [ -f /etc/shorewall6-lite/shorewall.conf ] && \ mv -f /etc/shorewall6-lite/shorewall.conf /etc/shorewall6-lite/shorewall6-lite.conf else @@ -314,17 +324,6 @@ install_file shorecap ${DESTDIR}${LIBEXEC}/shorewall6-lite/shorecap 0755 echo echo "Capability file builder installed in ${DESTDIR}${LIBEXEC}/shorewall6-lite/shorecap" -# -# Install wait4ifup -# - -if [ -f wait4ifup ]; then - install_file wait4ifup ${DESTDIR}${LIBEXEC}/shorewall6-lite/wait4ifup 0755 - - echo - echo "wait4ifup installed in ${DESTDIR}${LIBEXEC}/shorewall6-lite/wait4ifup" -fi - # # Install the Modules files # @@ -389,6 +388,10 @@ if [ -z "$DESTDIR" ]; then ln -s ${DEST}/${INIT} /usr/share/shorewall6-lite/init fi +delete_file ${DESTDIR}/usr/share/shorewall6-lite/lib.common +delete_file ${DESTDIR}/usr/share/shorewall6-lite/lib.cli +delete_file ${DESTDIR}/usr/share/shorewall6-lite/wait4ifup + if [ -z "$DESTDIR" ]; then touch /var/log/shorewall6-lite-init.log diff --git a/Shorewall6-lite/lib.base b/Shorewall6-lite/lib.base new file mode 100644 index 000000000..e28c1827b --- /dev/null +++ b/Shorewall6-lite/lib.base @@ -0,0 +1,34 @@ +# +# Shorewall 4.4 -- /usr/share/shorewall6-lite/lib.base +# +# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] +# +# (c) 2011 - Tom Eastep (teastep@shorewall.net) +# +# Complete documentation is available at http://shorewall.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of Version 2 of the GNU General Public License +# as published by the Free Software Foundation. +# +# 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# This library contains the code common to all Shorewall components. + +g_program=shorewall6-lite +g_family=6 +g_basedir=/usr/share/shorewall + +[ -n "${VARDIR:=/var/lib/$g_program}" ] +[ -n "${SHAREDIR:=/usr/share/$g_program}" ] +[ -n "${CONFDIR:=/etc/$g_program}" ] + +. /usr/share/shorewall/lib.base + diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite new file mode 100755 index 000000000..76e2bca4b --- /dev/null +++ b/Shorewall6-lite/shorewall6-lite @@ -0,0 +1,42 @@ +#!/bin/sh +# +# Shorewall6 Lite Packet Filtering Firewall Control Program - V4.4 +# +# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] +# +# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011, 2012 - +# Tom Eastep (teastep@shorewall.net) +# +# Shorewall documentation is available at http://www.shorewall.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of Version 2 of the GNU General Public License +# as published by the Free Software Foundation. +# +# 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# For a list of supported commands, type 'shorewall help' or 'shorewall6 help' +# +################################################################################################ +g_program=shorewall6-lite +SHAREDIR=/usr/share/shorewall6-lite +CONFDIR=/etc/shorewall6-lite +g_product="Shorewall6 Lite" +g_family=6 +g_base=shorewall6 +g_tool=ip6tables +g_basedir=/usr/share/shorewall6-lite +g_lite=Yes + +for library in base cli; do + . /usr/share/shorewall/lib.$library +done + +shorewall_cli $@ diff --git a/Shorewall6/init.debian.sh b/Shorewall6/init.debian.sh index 1e1a9d8a9..1d74bf340 100755 --- a/Shorewall6/init.debian.sh +++ b/Shorewall6/init.debian.sh @@ -14,7 +14,7 @@ SRWL=/sbin/shorewall6 SRWL_OPTS="-tvv" -WAIT_FOR_IFUP=/usr/share/shorewall6/wait4ifup +WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup test -n ${INITLOG:=/var/log/shorewall6-init.log} test -x $SRWL || exit 0 diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 964598219..45319f67e 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -357,15 +357,7 @@ delete_file ${DESTDIR}/usr/share/shorewall6/lib.cli delete_file ${DESTDIR}/usr/share/shorewall6/lib.common delete_file ${DESTDIR}/usr/share/shorewall6/prog.header6 delete_file ${DESTDIR}/usr/share/shorewall6/prog.footer6 - -# -# Install wait4ifup -# - -install_file wait4ifup ${DESTDIR}${LIBEXEC}/shorewall6/wait4ifup 0755 - -echo -echo "wait4ifup installed in ${DESTDIR}${LIBEXEC}/shorewall6/wait4ifup" +delete_file ${DESTDIR}/usr/share/shorewall6/wait4ifup # # Install the Modules file diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 new file mode 100755 index 000000000..0ae617b53 --- /dev/null +++ b/Shorewall6/shorewall6 @@ -0,0 +1,41 @@ +#!/bin/sh +# +# Shorewall6 Packet Filtering Firewall Control Program - V4.4 +# +# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] +# +# (c) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011 - +# Tom Eastep (teastep@shorewall.net) +# +# Shorewall documentation is available at http://www.shorewall.net +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of Version 2 of the GNU General Public License +# as published by the Free Software Foundation. +# +# 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, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# For a list of supported commands, type 'shorewall help' or 'shorewall6 help' +# +################################################################################################ +g_program=shorewall6 +SHAREDIR=/usr/share/shorewall6 +CONFDIR=/etc/shorewall6 +g_product="Shorewall6" +g_family=6 +g_tool= +g_basedir=/usr/share/shorewall +g_lite= + +for library in base cli; do + . /usr/share/shorewall/lib.$library +done + +shorewall_cli $@