holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Remove unused RUNLEVELS variable from the install scripts.

Browse Source 
Add some documentation

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-06-01 07:12:19 -07:00
parent fe55fa0f31
commit 91840acb18
7 changed files with 77 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall-init/install.sh
View File

@ -93,7 +93,6 @@ install_file() # $1 = source $2 = target $3 = mode
#
# DEST is the SysVInit script directory
# INIT is the name of the script in the $DEST directory
# RUNLEVELS is the chkconfig parmeters for firewall
# ARGS is "yes" if we've already parsed an argument
#
ARGS=""
@ -106,10 +105,6 @@ if [ -z "$INIT" ] ; then
INIT="shorewall-init"
fi
if [ -z "$RUNLEVELS" ] ; then
RUNLEVELS=""
fi
while [ $# -gt 0 ] ; do
case "$1" in
-h|help|?)

5
Shorewall-lite/install.sh
View File

@ -92,7 +92,6 @@ install_file() # $1 = source $2 = target $3 = mode
#
# DEST is the SysVInit script directory
# INIT is the name of the script in the $DEST directory
# RUNLEVELS is the chkconfig parmeters for firewall
# ARGS is "yes" if we've already parsed an argument
#
ARGS=""
@ -105,10 +104,6 @@ if [ -z "$INIT" ] ; then
INIT="shorewall-lite"
fi
if [ -z "$RUNLEVELS" ] ; then
RUNLEVELS=""
fi
while [ $# -gt 0 ] ; do
case "$1" in
-h|help|?)

2
Shorewall/changelog.txt
View File

@ -12,6 +12,8 @@ Changes in Shorewall 4.4.10
6) Correct Optimization issue
7) Rename PREFIX to DESTDIR in install scripts
Changes in Shorewall 4.4.9
1) Auto-detection of bridges.

5
Shorewall/install.sh
View File

@ -92,7 +92,6 @@ install_file() # $1 = source $2 = target $3 = mode
#
# DEST is the SysVInit script directory
# INIT is the name of the script in the $DEST directory
# RUNLEVELS is the chkconfig parmeters for firewall
# ARGS is "yes" if we've already parsed an argument
#
ARGS=""
@ -106,10 +105,6 @@ if [ -z "$INIT" ] ; then
INIT="shorewall"
fi
if [ -z "$RUNLEVELS" ] ; then
RUNLEVELS=""
fi
SPARSE=
MANDIR=${MANDIR:-"/usr/share/man"}
INSTALLD='-D'

5
Shorewall6-lite/install.sh
View File

@ -92,7 +92,6 @@ install_file() # $1 = source $2 = target $3 = mode
#
# DEST is the SysVInit script directory
# INIT is the name of the script in the $DEST directory
# RUNLEVELS is the chkconfig parmeters for firewall
# ARGS is "yes" if we've already parsed an argument
#
ARGS=""
@ -105,10 +104,6 @@ if [ -z "$INIT" ] ; then
INIT="shorewall6-lite"
fi
if [ -z "$RUNLEVELS" ] ; then
RUNLEVELS=""
fi
while [ $# -gt 0 ] ; do
case "$1" in
-h|help|?)

5
Shorewall6/install.sh
View File

@ -92,7 +92,6 @@ install_file() # $1 = source $2 = target $3 = mode
#
# DEST is the SysVInit script directory
# INIT is the name of the script in the $DEST directory
# RUNLEVELS is the chkconfig parmeters for firewall
# ARGS is "yes" if we've already parsed an argument
#
ARGS=""
@ -105,10 +104,6 @@ if [ -z "$INIT" ] ; then
INIT="shorewall6"
fi
if [ -z "$RUNLEVELS" ] ; then
RUNLEVELS=""
fi
DEBIAN=
CYGWIN=
MAC=

89
docs/Build.xml
View File

@ -165,7 +165,7 @@
<variablelist>
<varlistentry>
<term>rpmbuild (I use rpm version 4.4.2.3-20.3)</term>
<term>rpmbuild</term>
<listitem>
<para>Required to build the RPM packages.</para>
@ -173,7 +173,7 @@
</varlistentry>
<varlistentry>
<term>xsltproc (libxslt -- I use version 1.1.24-19.1)</term>
<term>xsltproc (libxslt)</term>
<listitem>
<para>Required to convert the XML documents to other
@ -182,8 +182,7 @@
</varlistentry>
<varlistentry>
<term>Docbook XSL Stylesheets (I use docbook-xsl-stylesheets version
1.74.0-1.35)</term>
<term>Docbook XSL Stylesheets</term>
<listitem>
<para>Required to convert the XML documents to other
@ -192,7 +191,7 @@
</varlistentry>
<varlistentry>
<term>Perl (I use Perl 5.10.0-62.17.1)</term>
<term>Perl</term>
<listitem>
<para>Required to massage some of the config files.</para>
@ -200,15 +199,11 @@
</varlistentry>
<varlistentry>
<term>xmlto (I use version 0.0.18-182.27)</term>
<term>xmlto</term>
<listitem>
<para>Required to convert the XML manpages to manpages. Note that
not all versions of xmlto will work (those released by Debian and
Ubuntu, for example, do <emphasis>not</emphasis> work). If you
find that xmlto fails, install
tools<filename>/build/xmlto</filename> in <filename
class="directory">/usr/local/bin</filename>.</para>
<para>Required to convert the XML manpages to manpages. Be sure
that you have a recent version; I use 0.0.23.</para>
</listitem>
</varlistentry>
</variablelist>
@ -260,7 +255,7 @@
<term>GIT</term>
<listitem>
<para>Shorewall GIT repository</para>
<para>Shorewall GIT repository.</para>
</listitem>
</varlistentry>
</variablelist>
@ -312,6 +307,14 @@
</listitem>
</varlistentry>
<varlistentry>
<term>i</term>
<listitem>
<para>Build the shorewall-init package.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>l</term>
@ -384,7 +387,7 @@
against 4.2.7:</para>
<blockquote>
<para><command>build44 -trSc 4.3.7.1 4.3.7</command></para>
<para><command>build44 -trc 4.3.7.1 4.3.7</command></para>
</blockquote>
</section>
@ -429,6 +432,14 @@
</listitem>
</varlistentry>
<varlistentry>
<term>i</term>
<listitem>
<para>Upload the shorewall-init package.</para>
</listitem>
</varlistentry>
<varlistentry>
<term>6</term>
@ -469,5 +480,55 @@
<para><command>upload44 -c 4.3.7.3</command></para>
</blockquote>
</section>
<section>
<title>install.sh files</title>
<para>Each product includes an install script
(<filename>install.sh</filename>) that may be used to install the
product on a machine or into a directory. </para>
<para>By default, the scripts install the corresponding product into
"/'; you can direct them to install into an empty existing directory by
setting an environmental variable:</para>
<itemizedlist>
<listitem>
<para>DESTDIR (release 4.4.10 and later)</para>
</listitem>
<listitem>
<para>PREFIX (all releases)</para>
</listitem>
</itemizedlist>
<para>There are a number of other environmental variables that you can
set to cause the directory to be populated for a particular target
environment:</para>
<itemizedlist>
<listitem>
<para>DEBIAN - Debian-based systems (Debian, Ubuntu, etc.)</para>
</listitem>
<listitem>
<para>SUSE - SEL and OpenSuSE</para>
</listitem>
<listitem>
<para>REDHAT - RHEL, CentOS, Foobar, etc.</para>
</listitem>
<listitem>
<para>MAC - Apple MacIntosh (Shorewall and Shorewall6 packages
only)</para>
</listitem>
<listitem>
<para>CYGWIN - Cygwin under Windows (Shorewall and Shorewall6
packages only)</para>
</listitem>
</itemizedlist>
</section>
</section>
</article>