shorewall-shell: deprecated in favour of shorewall-common

9 files changed, 31 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 03e7465002..1821823fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 	* collab/gupnp-tools: new spell, GNU UPnP tools
 	* collab/gupnp-ui: new spell, GNU UPnP GUI
 	* net/shorewall-perl: deprecated in favour of shorewall-common
+	* net/shorewall-shell: deprecated in favour of shorewall-common
 
 2009-10-06  Treeve Jelbert <treeve@sourcemage.org>
 	* devel/generatorrunner: new spell, supercedes boostpythongenerator
diff --git a/net/shorewall-shell/DEPENDS b/net/shorewall-shell/DEPENDS
new file mode 100755
index 0000000000..1a9ea50115
--- /dev/null
+++ b/net/shorewall-shell/DEPENDS
@@ -0,0 +1 @@
+depends shorewall-common
diff --git a/net/shorewall-shell/DETAILS b/net/shorewall-shell/DETAILS
index 8e630eb225..b633c8b1dd 100755
--- a/net/shorewall-shell/DETAILS
+++ b/net/shorewall-shell/DETAILS
@@ -1,23 +1,7 @@
            SPELL=shorewall-shell
-         VERSION=4.2.9
-         MAINVER=${VERSION:0:3}
-         RELEASE=shorewall-${VERSION}
-          SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SPELL-$VERSION.tar.bz2.asc
-   SOURCE_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE
-   SOURCE_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
-   SOURCE_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
-   SOURCE_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE
-  SOURCE2_URL[0]=ftp://slovakia.shorewall.net/mirror/shorewall/$MAINVER/$RELEASE/$SOURCE2
-  SOURCE2_URL[1]=ftp://www.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
-  SOURCE2_URL[2]=http://shorewall.de/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
-  SOURCE2_URL[3]=ftp://www1.shorewall.net/pub/shorewall/$MAINVER/$RELEASE/$SOURCE2
-  SOURCE2_IGNORE=signature
-      SOURCE_GPG="shorewall.gpg:${SOURCE2}"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+         VERSION=deprecated
         WEB_SITE=http://www.shorewall.net/
          ENTERED=20070902
-      LICENSE[0]=GPL
         KEYWORDS="firewall net"
            SHORT="A high-level tool for configuring Netfilter."
 cat << EOF
diff --git a/net/shorewall-shell/HISTORY b/net/shorewall-shell/HISTORY
index bc3c08d469..60d01b62b2 100644
--- a/net/shorewall-shell/HISTORY
+++ b/net/shorewall-shell/HISTORY
@@ -1,3 +1,6 @@
+2009-10-08 Arjan Bouter <abouter@sourcemage.org>
+	* deprecated spell in favour of shorewall-common
+
 2009-07-25 Arjan Bouter <abouter@sourcemage.org>
         * PROVIDES: added, provide SHOREWALL_COMPILER
 
diff --git a/net/shorewall-shell/INSTALL b/net/shorewall-shell/INSTALL
index b816bbc66b..27ba77ddaf 100755
--- a/net/shorewall-shell/INSTALL
+++ b/net/shorewall-shell/INSTALL
@@ -1 +1 @@
-PREFIX="$INSTALL_ROOT"  ./install.sh
+true
diff --git a/net/shorewall-shell/PREPARE b/net/shorewall-shell/PREPARE
new file mode 100755
index 0000000000..820dc6cf07
--- /dev/null
+++ b/net/shorewall-shell/PREPARE
@@ -0,0 +1,21 @@
+message "shorewall-shell is deprecated and no longer available upstream." &&
+message "switching to shorewall-common"
+echo << EOF
+If you are currently using Shorewall-shell:
+
+    a) In shorewall.conf, if you have specified
+       "SHOREWALL_COMPILER=shell" then you must either:
+
+       -  change that specification to "SHOREWALL_COMPILER=perl"; or
+       -  change that specification to "SHOREWALL_COMPILER="; or
+       -  delete the specification altogether.
+
+       Failure to do so will result in the following warning:
+
+       WARNING: SHOREWALL_COMPILER=shell ignored. Shorewall-shell
+                support has been removed in this release.
+
+    b) Review the migration issues at
+       http://www.shorewall.net/LennyToSqueeze.html and make changes as
+       required.
+EOF
diff --git a/net/shorewall-shell/PRE_BUILD b/net/shorewall-shell/PRE_BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/net/shorewall-shell/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/shorewall-shell/REPAIR^all^TRIGGERS b/net/shorewall-shell/REPAIR^all^TRIGGERS
new file mode 100755
index 0000000000..6afb62fc3c
--- /dev/null
+++ b/net/shorewall-shell/REPAIR^all^TRIGGERS
@@ -0,0 +1 @@
+on_cast $SPELL dispel_self
diff --git a/net/shorewall-shell/TRIGGERS b/net/shorewall-shell/TRIGGERS
new file mode 100755
index 0000000000..6afb62fc3c
--- /dev/null
+++ b/net/shorewall-shell/TRIGGERS
@@ -0,0 +1 @@
+on_cast $SPELL dispel_self