Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Kowis (1f394a09e4abe56cd988b4e60846fedc98e42ac2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Kowis (1f394a09e4abe56cd988b4e60846fedc98e42ac2)
  • Date: Thu, 13 Sep 2007 14:35:22 -0500

GIT changes to master grimoire by David Kowis <dkowis AT shlrm.org>:

dev/null |binary
net/iptables/CONFIGURE | 1
net/iptables/DETAILS | 20 ++++--------
net/iptables/HISTORY | 6 +++
net/iptables/PREPARE | 1
net/iptables/PRE_BUILD | 7 +++-
net/shorewall-common/BUILD | 1
net/shorewall-common/CONFLICTS | 1
net/shorewall-common/DEPENDS | 6 +++
net/shorewall-common/DETAILS | 38 +++++++++++++++++++++++
net/shorewall-common/FINAL | 3 +
net/shorewall-common/HISTORY | 4 ++
net/shorewall-common/INSTALL | 1
net/shorewall-common/PRE_BUILD | 6 +++
net/shorewall-common/init.d/shorewall | 47
+++++++++++++++++++++++++++++
net/shorewall-common/init.d/shorewall.conf | 5 +++
net/shorewall-common/shorewall.gpg.key |binary
net/shorewall-docs-html/BUILD | 1
net/shorewall-docs-html/DETAILS | 36 ++++++++++++++++++++++
net/shorewall-docs-html/HISTORY | 3 +
net/shorewall-docs-html/INSTALL | 3 +
net/shorewall-docs-html/shorewall.gpg.key |binary
net/shorewall-docs-xml/BUILD | 1
net/shorewall-docs-xml/DETAILS | 36 ++++++++++++++++++++++
net/shorewall-docs-xml/HISTORY | 3 +
net/shorewall-docs-xml/INSTALL | 3 +
net/shorewall-docs-xml/shorewall.gpg.key |binary
net/shorewall-lite/BUILD | 1
net/shorewall-lite/CONFLICTS | 1
net/shorewall-lite/DEPENDS | 3 +
net/shorewall-lite/DETAILS | 39 ++++++++++++++++++++++++
net/shorewall-lite/HISTORY | 4 ++
net/shorewall-lite/INSTALL | 1
net/shorewall-lite/PRE_BUILD | 6 +++
net/shorewall-lite/init.d/shorewall | 47
+++++++++++++++++++++++++++++
net/shorewall-lite/init.d/shorewall.conf | 5 +++
net/shorewall-lite/shorewall.gpg.key |binary
net/shorewall-perl/BUILD | 1
net/shorewall-perl/DEPENDS | 1
net/shorewall-perl/DETAILS | 40 ++++++++++++++++++++++++
net/shorewall-perl/HISTORY | 3 +
net/shorewall-perl/INSTALL | 1
net/shorewall-perl/shorewall.gpg.key |binary
net/shorewall-shell/BUILD | 1
net/shorewall-shell/DETAILS | 40 ++++++++++++++++++++++++
net/shorewall-shell/HISTORY | 3 +
net/shorewall-shell/INSTALL | 1
net/shorewall-shell/shorewall.gpg.key |binary
net/shorewall/DEPENDS | 6 +--
net/shorewall/DETAILS | 22 +------------
net/shorewall/FINAL | 3 -
net/shorewall/HISTORY | 5 +++
net/shorewall/INSTALL | 2 -
net/shorewall/PREPARE | 12 +++++++
net/shorewall/PRE_BUILD | 7 ----
net/shorewall/init.d/shorewall | 47
-----------------------------
net/shorewall/init.d/shorewall.conf | 5 ---
net/shorewall/shorewall.gpg.key | 0
58 files changed, 441 insertions(+), 99 deletions(-)

New commits:
commit 31201a1c71d095c259ad2534481329020425ac77
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

iptables: update grsec patch to 1.3.5, it also applies to 1.3.8 with a
small hax
Added the small hax ;)

commit d0e511abb75e92a4d00bad8fcbecf531b7e44bde
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall: Fixed PREPARE for reals this time

commit 9adc50bd20aa125fd03cb2ecc65a764e69fb22ae
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall: Had the wrong syntax for the PREPARE stuff

commit 9803d083415be2313f379143c1c99f93e9eafb26
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

Adding prepare

commit 78c798d8e72dd21ff30fff549324b5913bdefee4
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-common: Moved the docs depends to the shorewall spell

commit f8bee7d7341d5a7e55c72af0a285a7e7202c6f27
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall: Transforming the spell into a profile spell
Makes casting shorewall still work, and will still work for upgrades

commit 5fe013da2d4de751fbf2e4b134d8156fee11f0b7
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-common: making it conflict with shorewall-lite

commit ac523934cb11285af7a50b103263bfbddd817e0c
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-lite: dOH! needs to be executable

commit 4ea8275e0bde62b95605b112629e8a889e5f1bf9
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-lite: adding a conflicts with shorewall-common

commit 0a9b8cab167b1a96ed9b330205ad68eb0ed20bb2
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-docs-html: fixing RELEASE variable

commit 194a466238df6164b081c46b773df23489f121cf
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-common: fixing RELEASE variable

commit 4e4b6c8c144911bbb9ad413dbd4d770c437f8314
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-docs-xml: Fixing RELEASE variable

commit 4ad4119d8a613530186ecb107ef1b45767d499c8
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-perl: fixing RELEASE variable

commit 7af9d00102b9189dacab7e645edfec7fc8e06aca
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-shell: fixing RELEASE variable

commit 7aea0ad403c37743b50b29125bd996d680d2ef21
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-lite: DOH! fixing RELEASE value so it can download

commit 68db0aa08aea8aecd894f13d7441e9ebf3bd4924
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-lite: fixing download URLs

commit 7c51a181dd82ec72e762eeb10460faeede7d17fa
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-docs-xml: Fixing download URLs

commit 02ce1f5f84ca76bbe172d16860200a2d7e9d01ce
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-docs-html: fixing download URLs

commit ee9a35e2e1ed272dde4ee8e55558cfd685a02339
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-shell: fixing download URLs

commit 26dca87c85b79feb616fa0da075f37bd8cab7ce3
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-common: fixing SOURCE_URLs

commit a67ae9effe636582de652c6b49b629c3156a85d4
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-perl: fixed the download URLs

commit 2786f54bfdae7c5517bda3ab6cefea4f22c1c831
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-perl: only needs to depend on perl

commit 5e2a24c710f8b5cc3f24c8c860961b395d9ee9e0
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

shorewall-shell: heh, don't need to depend on all this.

commit 3c916efec6b9016a2bff41f6955ad72e6965d44d
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

Adding spell shorewall-lite

commit c5f2929fb864a92c210285be1bda7faaa36821e3
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

Adding spell shorewall-docs-xml

commit f28b7b4c3263b4841278f9e2fc5dcc7ec54e71ea
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

Adding spell shorewall-docs-html

commit dfeeeb68e243cc58e10c2914cd8d2703f1e3420a
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

Adding spell shorewall-perl

commit 0d5e22d0c6941edb37db67459a7fc70527575b25
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

Adding spell shorewall-shell

commit 64d0ec1ec14f9e28c854aec4544721f0d1e9a6b2
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

Adding spell shorewall-common

diff --git a/net/iptables/CONFIGURE b/net/iptables/CONFIGURE
new file mode 100755
index 0000000..cc8b9d7
--- /dev/null
+++ b/net/iptables/CONFIGURE
@@ -0,0 +1 @@
+config_query GRSECPATCH "Apply grsecurity patch (adds stealth target)?" n
diff --git a/net/iptables/DETAILS b/net/iptables/DETAILS
index 93dd4a3..deaaa50 100755
--- a/net/iptables/DETAILS
+++ b/net/iptables/DETAILS
@@ -1,17 +1,5 @@
SPELL=iptables
-if [ "${GRSEC_PATCH}" == "y" ]
-then
- VERSION=1.2.11
-
- SOURCE3=grsecurity-$VERSION-$SPELL.patch
- SOURCE4=$SOURCE3.sign
- SOURCE3_URL=http://www.grsecurity.org/${SOURCE3}
- SOURCE4_URL=http://www.grsecurity.org/${SOURCE4}
- SOURCE3_GPG=grsecurity.gpg:$SOURCE4
- SOURCE4_IGNORE=signature
-else
VERSION=1.3.8
-fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL=http://www.iptables.org/projects/$SPELL/files/$SOURCE
@@ -19,6 +7,14 @@ fi
SOURCE_GPG=iptables.gpg:$SOURCE2
SOURCE2_IGNORE=signature

+ GRSECVERSION=1.3.5
+ SOURCE3=grsecurity-$SPELL-$GRSECVERSION.patch
+ SOURCE4=$SOURCE3.sign
+ SOURCE3_URL=http://www.grsecurity.org/${SOURCE3}
+ SOURCE4_URL=http://www.grsecurity.org/${SOURCE4}
+ SOURCE3_GPG=grsecurity.gpg:$SOURCE4
+ SOURCE4_IGNORE=signature
+
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.iptables.org/projects/iptables/index.html
ENTERED=20010922
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index dc82c62..25ce579 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,9 @@
+2007-09-13 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: grsec patch to 1.3.5
+ * PREPARE: removed
+ * CONFIGURE: added question for grsec patch
+ * PRE_BUILD: applies grsec patch, and fix the makefile fuzz
+
2007-06-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.3.8
* iptables.gpg: updated from 0xCA9A8D5B to 0x2D0987E6
diff --git a/net/iptables/PREPARE b/net/iptables/PREPARE
deleted file mode 100755
index dcd8d8d..0000000
--- a/net/iptables/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query GRSEC_PATCH "Would you like to add the grsecurity patch
(iptables version 1.2.x instead of 1.3.x will be used)?" n
diff --git a/net/iptables/PRE_BUILD b/net/iptables/PRE_BUILD
index 73ebfed..b852c2e 100755
--- a/net/iptables/PRE_BUILD
+++ b/net/iptables/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
-if [ "$GRSEC_PATCH" == "y" ]
+if [ "$GRSECPATCH" == "y" ]
then
unpack_file 3 &&
- patch -p0 <${SOURCE_CACHE}/$SOURCE3
+ cd $SOURCE_DIRECTORY &&
+ patch -p1 <${SOURCE_CACHE}/$SOURCE3
+ message "Ignore the patch failure, it's just a Makefile issue, fixed
it with sed" &&
+ sed -i -e "s/PF_EXT_SLIB:=ah/PF_EXT_SLIB:=stealth ah/"
extensions/Makefile
fi
diff --git a/net/shorewall-common/BUILD b/net/shorewall-common/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-common/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-common/CONFLICTS b/net/shorewall-common/CONFLICTS
new file mode 100755
index 0000000..ccb8609
--- /dev/null
+++ b/net/shorewall-common/CONFLICTS
@@ -0,0 +1 @@
+conflicts shorewall-lite
diff --git a/net/shorewall-common/DEPENDS b/net/shorewall-common/DEPENDS
new file mode 100755
index 0000000..ac5521d
--- /dev/null
+++ b/net/shorewall-common/DEPENDS
@@ -0,0 +1,6 @@
+message "You need one of the compilers" &&
+optional_depends shorewall-perl "" "" "for the perl compiler (reccomended)"
&&
+optional_depends shorewall-shell "" "" "for the shell compiler" &&
+depends iproute2 &&
+depends iptables &&
+depends SYSTEM-LOGGER
diff --git a/net/shorewall-common/DETAILS b/net/shorewall-common/DETAILS
new file mode 100755
index 0000000..08745b3
--- /dev/null
+++ b/net/shorewall-common/DETAILS
@@ -0,0 +1,38 @@
+ SPELL=shorewall-common
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+This is only one part of the entire shorewall system. You need this and a
+engine. Try shorewall-perl, unless you can't stand perl (it's lots faster).
+
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-common/FINAL b/net/shorewall-common/FINAL
new file mode 100755
index 0000000..b04e1d1
--- /dev/null
+++ b/net/shorewall-common/FINAL
@@ -0,0 +1,3 @@
+message "\n${MESSAGE_COLOR}If this is your first install, you will need"
\
+ "to edit the files in \n/etc/shorewall/ to configure the firewall"
\
+ "settings.${DEFAULT_COLOR}\n"
diff --git a/net/shorewall-common/HISTORY b/net/shorewall-common/HISTORY
new file mode 100644
index 0000000..8800af6
--- /dev/null
+++ b/net/shorewall-common/HISTORY
@@ -0,0 +1,4 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, PRE_BUILD, INSTALL, DEPENDS: created this spell
+ to replace existing shorewall spell
+ * CONFLICTS: conflicts with shorewall-lite
diff --git a/net/shorewall-common/INSTALL b/net/shorewall-common/INSTALL
new file mode 100755
index 0000000..b816bbc
--- /dev/null
+++ b/net/shorewall-common/INSTALL
@@ -0,0 +1 @@
+PREFIX="$INSTALL_ROOT" ./install.sh
diff --git a/net/shorewall-common/PRE_BUILD b/net/shorewall-common/PRE_BUILD
new file mode 100755
index 0000000..c7a1074
--- /dev/null
+++ b/net/shorewall-common/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Disable init script install
+sed -i "s/install_file_with_backup init.*/true/" install.sh &&
+sed -i "s/ln -s.*init.*/true/" install.sh
diff --git a/net/shorewall-common/init.d/shorewall
b/net/shorewall-common/init.d/shorewall
new file mode 100644
index 0000000..3379f8f
--- /dev/null
+++ b/net/shorewall-common/init.d/shorewall
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+RUNLEVEL=3
+PROGRAM=/sbin/shorewall
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/shorewall
+
+start()
+{
+ # Shorewall needs /var/log/messages to exist
+ if [[ ! -f /var/log/messages ]]
+ then
+ touch /var/log/messages
+ fi &&
+ # Create shorewall log file if it doesn't exist
+ if [[ ! -f $SHOREWALL_LOG ]]
+ then
+ touch $SHOREWALL_LOG
+ fi &&
+ # Shorewall needs subsys
+ if [[ ! -d /var/lock/subsys/ ]]
+ then
+ mkdir -p /var/lock/subsys/
+ fi &&
+ echo Starting Shorewall... &&
+ ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
+ ( unset -f echo; ${PROGRAM} start >> $SHOREWALL_LOG 2>&1 ; )
+}
+
+stop()
+{
+ echo Stopping Shorewall... &&
+ ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
+ ( unset -f echo; ${PROGRAM} stop >> $SHOREWALL_LOG 2>&1 ; )
+}
+
+status()
+{
+ ( unset -f echo; ${PROGRAM} status ; )
+}
+
+reload()
+{
+ ( unset -f echo; ${PROGRAM} refresh ; )
+}
diff --git a/net/shorewall-common/init.d/shorewall.conf
b/net/shorewall-common/init.d/shorewall.conf
new file mode 100644
index 0000000..e1b712f
--- /dev/null
+++ b/net/shorewall-common/init.d/shorewall.conf
@@ -0,0 +1,5 @@
+# Full path to the log file.
+SHOREWALL_LOG=/var/log/shorewall.log
+
+# As described in 'man date'. The value must begin with a + symbol.
+DATE_FORMAT="+%F %T"
diff --git a/net/shorewall-common/shorewall.gpg.key
b/net/shorewall-common/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-common/shorewall.gpg.key differ
diff --git a/net/shorewall-docs-html/BUILD b/net/shorewall-docs-html/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-docs-html/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-docs-html/DETAILS b/net/shorewall-docs-html/DETAILS
new file mode 100755
index 0000000..b066915
--- /dev/null
+++ b/net/shorewall-docs-html/DETAILS
@@ -0,0 +1,36 @@
+ SPELL=shorewall-docs-html
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+This is just the html documentation for shorewall.
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-docs-html/HISTORY b/net/shorewall-docs-html/HISTORY
new file mode 100644
index 0000000..d15a1ec
--- /dev/null
+++ b/net/shorewall-docs-html/HISTORY
@@ -0,0 +1,3 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, INSTALL: created this spell
+ to replace existing shorewall spell
diff --git a/net/shorewall-docs-html/INSTALL b/net/shorewall-docs-html/INSTALL
new file mode 100755
index 0000000..3af32ab
--- /dev/null
+++ b/net/shorewall-docs-html/INSTALL
@@ -0,0 +1,3 @@
+cd $SOURCE_DIRECTORY &&
+mkdir -p $INSTALL_ROOT/usr/share/doc/shorewall/html &&
+cp -av * $INSTALL_ROOT/usr/share/doc/shorewall/html/.
diff --git a/net/shorewall-docs-html/shorewall.gpg.key
b/net/shorewall-docs-html/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-docs-html/shorewall.gpg.key differ
diff --git a/net/shorewall-docs-xml/BUILD b/net/shorewall-docs-xml/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-docs-xml/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-docs-xml/DETAILS b/net/shorewall-docs-xml/DETAILS
new file mode 100755
index 0000000..f8b13d9
--- /dev/null
+++ b/net/shorewall-docs-xml/DETAILS
@@ -0,0 +1,36 @@
+ SPELL=shorewall-docs-xml
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+This is just the xml documentation for shorewall.
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-docs-xml/HISTORY b/net/shorewall-docs-xml/HISTORY
new file mode 100644
index 0000000..d15a1ec
--- /dev/null
+++ b/net/shorewall-docs-xml/HISTORY
@@ -0,0 +1,3 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, INSTALL: created this spell
+ to replace existing shorewall spell
diff --git a/net/shorewall-docs-xml/INSTALL b/net/shorewall-docs-xml/INSTALL
new file mode 100755
index 0000000..b9bb9e8
--- /dev/null
+++ b/net/shorewall-docs-xml/INSTALL
@@ -0,0 +1,3 @@
+cd $SOURCE_DIRECTORY &&
+mkdir -p $INSTALL_ROOT/usr/share/doc/shorewall/xml &&
+cp -av * $INSTALL_ROOT/usr/share/doc/shorewall/xml/.
diff --git a/net/shorewall-docs-xml/shorewall.gpg.key
b/net/shorewall-docs-xml/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-docs-xml/shorewall.gpg.key differ
diff --git a/net/shorewall-lite/BUILD b/net/shorewall-lite/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-lite/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-lite/CONFLICTS b/net/shorewall-lite/CONFLICTS
new file mode 100755
index 0000000..bc392f7
--- /dev/null
+++ b/net/shorewall-lite/CONFLICTS
@@ -0,0 +1 @@
+conflicts shorewall-common
diff --git a/net/shorewall-lite/DEPENDS b/net/shorewall-lite/DEPENDS
new file mode 100755
index 0000000..dbeb825
--- /dev/null
+++ b/net/shorewall-lite/DEPENDS
@@ -0,0 +1,3 @@
+depends iproute2 &&
+depends iptables &&
+depends SYSTEM-LOGGER
diff --git a/net/shorewall-lite/DETAILS b/net/shorewall-lite/DETAILS
new file mode 100755
index 0000000..05d8d53
--- /dev/null
+++ b/net/shorewall-lite/DETAILS
@@ -0,0 +1,39 @@
+ SPELL=shorewall-lite
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+This is the shorewall-lite package. It can function on its own, but only to
run
+compiled scripts. The scripts must be compiled on a different machine.
+Ref: http://www.shorewall.net/CompiledPrograms.html#Lite
+
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-lite/HISTORY b/net/shorewall-lite/HISTORY
new file mode 100644
index 0000000..383e500
--- /dev/null
+++ b/net/shorewall-lite/HISTORY
@@ -0,0 +1,4 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, PRE_BUILD, INSTALL, DEPENDS: created this spell
+ to replace existing shorewall spell
+ * CONFLICTS: conflicts with shorewall-common
diff --git a/net/shorewall-lite/INSTALL b/net/shorewall-lite/INSTALL
new file mode 100755
index 0000000..b816bbc
--- /dev/null
+++ b/net/shorewall-lite/INSTALL
@@ -0,0 +1 @@
+PREFIX="$INSTALL_ROOT" ./install.sh
diff --git a/net/shorewall-lite/PRE_BUILD b/net/shorewall-lite/PRE_BUILD
new file mode 100755
index 0000000..c7a1074
--- /dev/null
+++ b/net/shorewall-lite/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+# Disable init script install
+sed -i "s/install_file_with_backup init.*/true/" install.sh &&
+sed -i "s/ln -s.*init.*/true/" install.sh
diff --git a/net/shorewall-lite/init.d/shorewall
b/net/shorewall-lite/init.d/shorewall
new file mode 100644
index 0000000..3379f8f
--- /dev/null
+++ b/net/shorewall-lite/init.d/shorewall
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+RUNLEVEL=3
+PROGRAM=/sbin/shorewall
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/shorewall
+
+start()
+{
+ # Shorewall needs /var/log/messages to exist
+ if [[ ! -f /var/log/messages ]]
+ then
+ touch /var/log/messages
+ fi &&
+ # Create shorewall log file if it doesn't exist
+ if [[ ! -f $SHOREWALL_LOG ]]
+ then
+ touch $SHOREWALL_LOG
+ fi &&
+ # Shorewall needs subsys
+ if [[ ! -d /var/lock/subsys/ ]]
+ then
+ mkdir -p /var/lock/subsys/
+ fi &&
+ echo Starting Shorewall... &&
+ ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
+ ( unset -f echo; ${PROGRAM} start >> $SHOREWALL_LOG 2>&1 ; )
+}
+
+stop()
+{
+ echo Stopping Shorewall... &&
+ ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
+ ( unset -f echo; ${PROGRAM} stop >> $SHOREWALL_LOG 2>&1 ; )
+}
+
+status()
+{
+ ( unset -f echo; ${PROGRAM} status ; )
+}
+
+reload()
+{
+ ( unset -f echo; ${PROGRAM} refresh ; )
+}
diff --git a/net/shorewall-lite/init.d/shorewall.conf
b/net/shorewall-lite/init.d/shorewall.conf
new file mode 100644
index 0000000..e1b712f
--- /dev/null
+++ b/net/shorewall-lite/init.d/shorewall.conf
@@ -0,0 +1,5 @@
+# Full path to the log file.
+SHOREWALL_LOG=/var/log/shorewall.log
+
+# As described in 'man date'. The value must begin with a + symbol.
+DATE_FORMAT="+%F %T"
diff --git a/net/shorewall-lite/shorewall.gpg.key
b/net/shorewall-lite/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-lite/shorewall.gpg.key differ
diff --git a/net/shorewall-perl/BUILD b/net/shorewall-perl/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-perl/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-perl/DEPENDS b/net/shorewall-perl/DEPENDS
new file mode 100755
index 0000000..1dd0168
--- /dev/null
+++ b/net/shorewall-perl/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/net/shorewall-perl/DETAILS b/net/shorewall-perl/DETAILS
new file mode 100755
index 0000000..75da237
--- /dev/null
+++ b/net/shorewall-perl/DETAILS
@@ -0,0 +1,40 @@
+ SPELL=shorewall-perl
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+You need the shorewall-common package to actually do anything. This is just
+a compiler.
+This is only one part of the entire shorewall system. This is the reccomended
+compiler, because it's nice and fast :D
+
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-perl/HISTORY b/net/shorewall-perl/HISTORY
new file mode 100644
index 0000000..66886ec
--- /dev/null
+++ b/net/shorewall-perl/HISTORY
@@ -0,0 +1,3 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, INSTALL, DEPENDS: created this spell
+ to replace existing shorewall spell
diff --git a/net/shorewall-perl/INSTALL b/net/shorewall-perl/INSTALL
new file mode 100755
index 0000000..b816bbc
--- /dev/null
+++ b/net/shorewall-perl/INSTALL
@@ -0,0 +1 @@
+PREFIX="$INSTALL_ROOT" ./install.sh
diff --git a/net/shorewall-perl/shorewall.gpg.key
b/net/shorewall-perl/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-perl/shorewall.gpg.key differ
diff --git a/net/shorewall-shell/BUILD b/net/shorewall-shell/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/shorewall-shell/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-shell/DETAILS b/net/shorewall-shell/DETAILS
new file mode 100755
index 0000000..37434e4
--- /dev/null
+++ b/net/shorewall-shell/DETAILS
@@ -0,0 +1,40 @@
+ SPELL=shorewall-shell
+ VERSION=4.0.3
+ MAINVER=${VERSION:0:3}
+ RELEASE=shorewall-$VERSION
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SPELL-$VERSION.tar.bz2.asc
+
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+ SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
+
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[1]=http://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[3]=http://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://www.shorewall.net/
+ ENTERED=20070902
+ LICENSE[0]=GPL
+ KEYWORDS="firewall net"
+ SHORT="A high-level tool for configuring Netfilter."
+cat << EOF
+You need the shorewall-common package to actually do anything. This is just
+a compiler.
+This is only one part of the entire shorewall system. This is one of the
+compilers, shorewall-perl is reccomended over this, as it's faster.
+
+The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
+tool for configuring Netfilter. You describe your firewall/gateway
+requirements using entries in a set of configuration files. Shorewall reads
+those configuration files and with the help of the iptables utility,
Shorewall
+configures Netfilter to match your requirements. Shorewall can be used on a
+dedicated firewall system, a multi-function gateway/router/server or on a
+standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
+compatibility mode and can thus take advantage of Netfilter's connection
state
+tracking capabilities.
+EOF
diff --git a/net/shorewall-shell/HISTORY b/net/shorewall-shell/HISTORY
new file mode 100644
index 0000000..66886ec
--- /dev/null
+++ b/net/shorewall-shell/HISTORY
@@ -0,0 +1,3 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS, BUILD, INSTALL, DEPENDS: created this spell
+ to replace existing shorewall spell
diff --git a/net/shorewall-shell/INSTALL b/net/shorewall-shell/INSTALL
new file mode 100755
index 0000000..b816bbc
--- /dev/null
+++ b/net/shorewall-shell/INSTALL
@@ -0,0 +1 @@
+PREFIX="$INSTALL_ROOT" ./install.sh
diff --git a/net/shorewall-shell/shorewall.gpg.key
b/net/shorewall-shell/shorewall.gpg.key
new file mode 100644
index 0000000..7aaeeb4
Binary files /dev/null and b/net/shorewall-shell/shorewall.gpg.key differ
diff --git a/net/shorewall/DEPENDS b/net/shorewall/DEPENDS
index dbeb825..b0d7f0c 100755
--- a/net/shorewall/DEPENDS
+++ b/net/shorewall/DEPENDS
@@ -1,3 +1,3 @@
-depends iproute2 &&
-depends iptables &&
-depends SYSTEM-LOGGER
+depends shorewall-common &&
+optional_depends shorewall-docs-html "" "" "for html documentation" &&
+optional_depends shorewall-docs-xml "" "" "for xml documentation"
diff --git a/net/shorewall/DETAILS b/net/shorewall/DETAILS
index 53fd681..cd06abf 100755
--- a/net/shorewall/DETAILS
+++ b/net/shorewall/DETAILS
@@ -1,23 +1,5 @@
SPELL=shorewall
- VERSION=3.4.5
- MAINVER=${VERSION:0:3}
- RELEASE=$SPELL-$VERSION
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SPELL-$VERSION.tar.bz2.asc
-
SOURCE_URL[0]=http://slovakia.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
-
SOURCE_URL[1]=http://www.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
- SOURCE_URL[2]=http://shorewall.de/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
-
SOURCE_URL[3]=http://www1.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
-
SOURCE_URL[4]=http://shorewall.viisage.com/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE
-
SOURCE_URL[5]=http://www.shorewall.com.ar/pub/$SPELL/$SPELL/$MAINVER/$RELEASE/$SOURCE
-
SOURCE2_URL[0]=http://slovakia.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
-
SOURCE2_URL[1]=http://www.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
- SOURCE2_URL[2]=http://shorewall.de/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
-
SOURCE2_URL[3]=http://www1.shorewall.net/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
-
SOURCE2_URL[4]=http://shorewall.viisage.com/pub/$SPELL/$MAINVER/$RELEASE/$SOURCE2
-
SOURCE2_URL[5]=http://www.shorewall.com.ar/pub/$SPELL/$SPELL/$MAINVER/$RELEASE/$SOURCE2
- SOURCE2_IGNORE=signature
- SOURCE_GPG="shorewall.gpg.key:${SOURCE2}"
+ VERSION=4.0.3
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.shorewall.net/
ENTERED=20020513
@@ -25,6 +7,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="firewall net"
SHORT="A high-level tool for configuring Netfilter."
cat << EOF
+This is a roll up package so that you can still cast "shorewall" to get it
+all installed easily.
The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
tool for configuring Netfilter. You describe your firewall/gateway
requirements using entries in a set of configuration files. Shorewall reads
diff --git a/net/shorewall/FINAL b/net/shorewall/FINAL
deleted file mode 100755
index b04e1d1..0000000
--- a/net/shorewall/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-message "\n${MESSAGE_COLOR}If this is your first install, you will need"
\
- "to edit the files in \n/etc/shorewall/ to configure the firewall"
\
- "settings.${DEFAULT_COLOR}\n"
diff --git a/net/shorewall/HISTORY b/net/shorewall/HISTORY
index b947aff..5300b87 100644
--- a/net/shorewall/HISTORY
+++ b/net/shorewall/HISTORY
@@ -1,3 +1,8 @@
+2007-09-02 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: to version 4.0.3 and turned into a spell to just cast
+ the correct packages
+ * PRE_BUILD, INSTALL: made to do nothing
+
2007-07-19 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 3.4.5.
* services: Deleted, not needed anymore.
diff --git a/net/shorewall/INSTALL b/net/shorewall/INSTALL
index b816bbc..27ba77d 100755
--- a/net/shorewall/INSTALL
+++ b/net/shorewall/INSTALL
@@ -1 +1 @@
-PREFIX="$INSTALL_ROOT" ./install.sh
+true
diff --git a/net/shorewall/PREPARE b/net/shorewall/PREPARE
new file mode 100755
index 0000000..9bff15c
--- /dev/null
+++ b/net/shorewall/PREPARE
@@ -0,0 +1,12 @@
+if [[ "$(installed_version shorewall)" =~ 3.* ]]; then
+message "${ERROR_COLLOR}There is a high potential for breakage in this
upgrade" &&
+message "It will NOT be installed unattendedly. It is the spell author's" &&
+message "reccomendation that you take a few hours to go through this
upgrade.${DEFAULT_COLOR}" &&
+unset SHOREWALL_GOT_TIME &&
+config_query SHOREWALL_GOT_TIME "Do you have a few hours?" n
+fi &&
+
+if [[ "$SHOREWALL_GOT_TIME" == "n" ]]; then
+ return 1
+fi
+
diff --git a/net/shorewall/PRE_BUILD b/net/shorewall/PRE_BUILD
index c7a1074..27ba77d 100755
--- a/net/shorewall/PRE_BUILD
+++ b/net/shorewall/PRE_BUILD
@@ -1,6 +1 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-# Disable init script install
-sed -i "s/install_file_with_backup init.*/true/" install.sh &&
-sed -i "s/ln -s.*init.*/true/" install.sh
+true
diff --git a/net/shorewall/init.d/shorewall b/net/shorewall/init.d/shorewall
deleted file mode 100644
index 3379f8f..0000000
--- a/net/shorewall/init.d/shorewall
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-RUNLEVEL=3
-PROGRAM=/sbin/shorewall
-NEEDS="+network +remote_fs"
-
-. /etc/init.d/smgl_init
-. /etc/sysconfig/shorewall
-
-start()
-{
- # Shorewall needs /var/log/messages to exist
- if [[ ! -f /var/log/messages ]]
- then
- touch /var/log/messages
- fi &&
- # Create shorewall log file if it doesn't exist
- if [[ ! -f $SHOREWALL_LOG ]]
- then
- touch $SHOREWALL_LOG
- fi &&
- # Shorewall needs subsys
- if [[ ! -d /var/lock/subsys/ ]]
- then
- mkdir -p /var/lock/subsys/
- fi &&
- echo Starting Shorewall... &&
- ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
- ( unset -f echo; ${PROGRAM} start >> $SHOREWALL_LOG 2>&1 ; )
-}
-
-stop()
-{
- echo Stopping Shorewall... &&
- ( unset -f echo; date "$DATE_FORMAT" >> $SHOREWALL_LOG 2>&1 ; ) &&
- ( unset -f echo; ${PROGRAM} stop >> $SHOREWALL_LOG 2>&1 ; )
-}
-
-status()
-{
- ( unset -f echo; ${PROGRAM} status ; )
-}
-
-reload()
-{
- ( unset -f echo; ${PROGRAM} refresh ; )
-}
diff --git a/net/shorewall/init.d/shorewall.conf
b/net/shorewall/init.d/shorewall.conf
deleted file mode 100644
index e1b712f..0000000
--- a/net/shorewall/init.d/shorewall.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Full path to the log file.
-SHOREWALL_LOG=/var/log/shorewall.log
-
-# As described in 'man date'. The value must begin with a + symbol.
-DATE_FORMAT="+%F %T"
diff --git a/net/shorewall/shorewall.gpg.key b/net/shorewall/shorewall.gpg.key
deleted file mode 100644
index 7aaeeb4..0000000
Binary files a/net/shorewall/shorewall.gpg.key and /dev/null differ




Archive powered by MHonArc 2.6.24.

Top of Page