main/shorewall-{common,shell}: remove

shell based shorewall is no longer maintained by upstream. We drop
support for it.

11 files changed, 0 insertions, 359 deletions

diff --git a/main/shorewall-common/APKBUILD b/main/shorewall-common/APKBUILD
deleted file mode 100644
index 57eb97f521..0000000000
--- a/main/shorewall-common/APKBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=shorewall-common
-pkgver=4.2.11
-pkgrel=3
-pkgdesc="Shoreline Firewall is an iptables-based firewall for Linux."
-url="http://www.shorewall.net/"
-arch="noarch"
-license="GPL-2"
-depends="iptables iproute2"
-subpackages="$pkgname-doc"
-source="http://www1.shorewall.net/pub/shorewall/4.2/shorewall-$pkgver/shorewall-common-$pkgver.tar.bz2
-	shorewall-common-ipset.patch
-	shorewall-iptables-deprecated.patch
-	shorewall.initd
-	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	return 0
-}
-
-package() {
-	cd "$_builddir"
-	PREFIX="${pkgdir}" ./install.sh || return 1
-	install -Dm755 "$srcdir"/shorewall.initd "$pkgdir"/etc/init.d/shorewall
-}
-md5sums="4da98c58a00f1cf1d8c31bdb5db40e96  shorewall-common-4.2.11.tar.bz2
-3b120e6e040bd7d8fc85cf30dfeb32a0  shorewall-common-ipset.patch
-575c645d8b880f29e483b9a4933ac59d  shorewall-iptables-deprecated.patch
-4b55b9b0484c880b0b9562bd4ded1d0a  shorewall.initd"
diff --git a/main/shorewall-common/shorewall-common-ipset.patch b/main/shorewall-common/shorewall-common-ipset.patch
deleted file mode 100644
index 8c6ff72aac..0000000000
--- a/main/shorewall-common/shorewall-common-ipset.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- shorewall-common-4.2.11.orig/lib.cli
-+++ shorewall-common-4.2.11/lib.cli
-@@ -315,8 +315,6 @@
- 					grep 'loadmodule ip_set' ${VARDIR}/.modules >> $f
- 					echo "__EOF__" >> $f
- 					echo  >> $f
--					echo "ipset -U :all: :all:" >> $f
--					echo "ipset -U :all: :default:" >> $f
- 					echo "ipset -F" >> $f
- 					echo "ipset -X" >> $f
- 					echo "ipset -R << __EOF__" >> $f
---- shorewall-common-4.2.11.orig/lib.config
-+++ shorewall-common-4.2.11/lib.config
-@@ -884,7 +884,7 @@
- 	    ;;
-     esac
- 
--    echo "--set ${setname#+} $options"
-+    echo "--match-set ${setname#+} $options"
- }
- 
- #
diff --git a/main/shorewall-common/shorewall-iptables-deprecated.patch b/main/shorewall-common/shorewall-iptables-deprecated.patch
deleted file mode 100644
index eff0511a00..0000000000
--- a/main/shorewall-common/shorewall-iptables-deprecated.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./lib.config.orig
-+++ ./lib.config
-@@ -924,6 +924,9 @@
- 	+*)
- 	    echo "-m set $(get_set_flags $1 src)"
- 	    ;;
-+	!*)
-+	    echo "! -s ${1#!}"
-+	    ;;
- 	*)
- 	    echo "-s $1"
- 	    ;;
-@@ -951,6 +954,9 @@
- 	    ;;
- 	+*)
- 	    echo "-m set $(get_set_flags $1 dst)"
-+	    ;;
-+	!*)
-+	    echo "! -d ${1#!}"
- 	    ;;
- 	*)
- 	    echo "-d $1"
diff --git a/main/shorewall-common/shorewall.initd b/main/shorewall-common/shorewall.initd
deleted file mode 100644
index db89daec81..0000000000
--- a/main/shorewall-common/shorewall.initd
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/files/shorewall.initd,v 1.1 2009/10/09 12:22:43 pva Exp $
-
-extra_commands="clear reset check"
-extra_started_commands="refresh"
-
-depend() {
-	need net
-	provide firewall
-	after ulogd
-}
-
-start() {
-	ebegin "Starting firewall"
-	/sbin/shorewall -f start 1>/dev/null
-	eend $? 
-}
-
-stop() {
-	ebegin "Stopping firewall"
-	/sbin/shorewall stop 1>/dev/null
-	eend $?
-}
-
-restart() {
-	# shorewall comes with its own control script that includes a
-	# restart function, so refrain from calling svc_stop/svc_start
-	# here.  Note that this comment is required to fix bug 55576;
-	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
-	ebegin "Restarting firewall"
-	/sbin/shorewall status >/dev/null
-	if [ $? != 0 ] ; then
-	    svc_start
-	else
-	    if [ -f /var/lib/shorewall/restore ] ; then
-		/sbin/shorewall restore
-	    else
-		/sbin/shorewall restart 1>/dev/null
-	    fi
-	fi
-	eend $?
-}
-
-clear() {
-	# clear will remove all the rules and bring the system to an unfirewalled
-	# state. (21 Nov 2004 eldad)
-
-	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
-	/sbin/shorewall clear && mark_service_stopped "${SVCNAME}"
-	eend $?
-}
-
-reset() {
-	# reset the packet and byte counters in the firewall
-
-	ebegin "Resetting the packet and byte counters in the firewall"
-	/sbin/shorewall reset
-	eend $?
-}
-
-refresh() {
-	# refresh the rules involving the broadcast addresses of firewall 
-	# interfaces, the black list, traffic control rules and 
-	# ECN control rules
-
-	ebegin "Refreshing firewall rules"
-	/sbin/shorewall refresh
-	eend $?
-}
-
-check() {
-	# perform cursory validation of the zones, interfaces, hosts, rules
-	# and policy files. CAUTION: does not parse and validate the generated 
-	# iptables commands.
-
-	ebegin "Checking configuration files"
-	/sbin/shorewall check
-	eend $?
-}
diff --git a/main/shorewall-shell/APKBUILD b/main/shorewall-shell/APKBUILD
deleted file mode 100644
index 8e087b1f4e..0000000000
--- a/main/shorewall-shell/APKBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=shorewall-shell
-_v=4.2.11
-pkgver=4.2.11
-pkgrel=6
-pkgdesc="Shoreline Firewall shell-based compiler."
-url="http://www.shorewall.net/"
-arch="noarch"
-license="GPL-2"
-depends="shorewall-common"
-#subpackages="$pkgname-doc"
-source="http://www.shorewall.net/pub/shorewall/${_v%.*}/shorewall-$_v/$pkgname-$pkgver.tar.bz2
-	shorewall-policyrouting.patch
-	shorewall-shell-ipset.patch
-	shorewall-shell-providers-gateway-none.patch
-	shorewall-shell-rp_filter.patch
-	restore-default-route.patch
-	redirect-excludes.patch
-	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-	PREFIX="$pkgdir" ./install.sh || return 1
-}
-
-md5sums="518a7f389a6f606c109acb7dfbe18372  shorewall-shell-4.2.11.tar.bz2
-64c01bc4f57203fb877bb334994eac38  shorewall-policyrouting.patch
-79745ea284a08cb167b9a356ee0bff3b  shorewall-shell-ipset.patch
-0c6106a8cbb95d21c0c878a6235a65ac  shorewall-shell-providers-gateway-none.patch
-d5eadb6be45aa41f80669452baa853a6  shorewall-shell-rp_filter.patch
-c971270086d5de15327f498d1be64fcb  restore-default-route.patch
-90e54cbb55213a2b3dcb6f57d20d1490  redirect-excludes.patch"
diff --git a/main/shorewall-shell/redirect-excludes.patch b/main/shorewall-shell/redirect-excludes.patch
deleted file mode 100644
index 9230576bdb..0000000000
--- a/main/shorewall-shell/redirect-excludes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./lib.nat.orig
-+++ ./lib.nat
-@@ -683,10 +683,10 @@
- 	    fi
- 	    ;;
- 	!*)
--	    if [ $(list_count $addr) -gt 1 ]; then
-+#	    if [ $(list_count $addr) -gt 1 ]; then
- 		excludedests="${addr#\!}"
- 		addr=
--	    fi
-+#	    fi
- 	    ;;
-     esac
- 
diff --git a/main/shorewall-shell/restore-default-route.patch b/main/shorewall-shell/restore-default-route.patch
deleted file mode 100644
index 8640589420..0000000000
--- a/main/shorewall-shell/restore-default-route.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./lib.providers.orig
-+++ ./lib.providers
-@@ -378,7 +378,9 @@
- #
- # Capture the default route(s) if we don't have it (them) already.
- #
--[ -f \${VARDIR}/default_route ] || ip route list | grep -E '^\s*(default |nexthop )' > \${VARDIR}/default_route
-+if [ "\$RESTORE_DEFAULT_ROUTE" != "No" ] && ! [ -f \${VARDIR}/default_route ]; then
-+	ip route list | grep -E '^\s*(default |nexthop )' > \${VARDIR}/default_route
-+fi
- #
- # Initialize the file that holds 'undo' commands
- #
diff --git a/main/shorewall-shell/shorewall-policyrouting.patch b/main/shorewall-shell/shorewall-policyrouting.patch
deleted file mode 100644
index 26399108e3..0000000000
--- a/main/shorewall-shell/shorewall-policyrouting.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- old/lib.providers
-+++ new/lib.providers
-@@ -141,7 +141,7 @@
- # Add Provider $table ($number)
- #
- __EOF__
--	save_command "if interface_is_usable $interface; then"
-+	save_command "if [ -n \"$interface\" ] && interface_is_usable \"$interface\"; then"
- 	save_indent1="$INDENT"
- 	INDENT="$INDENT    "
- 
-@@ -283,7 +283,14 @@
-     INDENT="$save_indent1"
-     save_command else
- 
--    if [ -n "$optional" ]; then
-+    if [ "${interface:--}" = "-" -a "${duplicate:--}" = "-" -a "${gateway:--}" = "-" -a "${options:--}" = "-" -a "${copy:--}" = "-" ]; then
-+        indent >&3 << __EOF__
-+
-+progress_message "   Provider $table ($number) Added"
-+
-+__EOF__
-+
-+    elif [ -n "$optional" ]; then
- 	save_command "    error_message \"WARNING: Interface $interface is not configured -- Provider $table ($number) not Added\""
- 	save_command "    ${iface}_up="
-     else
-@@ -316,10 +323,6 @@
- 	[ "x$source"   = x- ] && source=
- 	[ "x$dest"     = x- ] && dest= || dest="to $dest"
- 
--	[ -n "${source}${dest}" ] || fatal_error "You must specify either the source or destination in an rt rule: \"$rule\""
--
--	[ -n "${dest:=to 0.0.0.0/0}" ]
--
- 	if [ -n "$source" ]; then
- 	    case $source in
- 		*:*)
-@@ -332,8 +335,6 @@
- 		    source="iif $source"
- 		    ;;
- 	    esac
--	else
--	    source='from 0.0.0.0/0'
- 	fi
- 
- 	case "$priority" in
diff --git a/main/shorewall-shell/shorewall-shell-ipset.patch b/main/shorewall-shell/shorewall-shell-ipset.patch
deleted file mode 100644
index 247eb83d35..0000000000
--- a/main/shorewall-shell/shorewall-shell-ipset.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./compiler
-+++ ./compiler
-@@ -5627,8 +5627,6 @@
- 
- if [ -f \$f ]; then
-     progress_message2 "Restoring IPSETS..."
--    ipset -U :all: :all:
--    ipset -U :all: :default:
-     ipset -F
-     ipset -X
-     ipset -R < \$f
-
diff --git a/main/shorewall-shell/shorewall-shell-providers-gateway-none.patch b/main/shorewall-shell/shorewall-shell-providers-gateway-none.patch
deleted file mode 100644
index 53459ab5f5..0000000000
--- a/main/shorewall-shell/shorewall-shell-providers-gateway-none.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- /usr/share/shorewall-shell/lib.providers
-+++ ./lib.providers
-@@ -149,11 +149,13 @@
- 
- 	save_command "${iface}_up=Yes"
- 
--	save_command "qt ip route flush table $number"
-+	if [ "x$gateway" != "xnone" ]; then
-+	    save_command "qt ip route flush table $number"
- 
--	indent >&3 << __EOF__
-+	    indent >&3 << __EOF__
- echo "qt ip route flush table $number" >> \${VARDIR}/undo_routing
- __EOF__
-+	fi
- 
- 	if [ "x${duplicate:=-}" != x- ]; then
- 	    if [ "x${copy:=-}" != "x-" ]; then
-@@ -183,6 +185,8 @@
- fi
- 
- __EOF__
-+	elif [ "x$gateway" = "xnone" ]; then
-+	    gateway=
- 	elif [ "x$gateway" != "x-" -a -n "$gateway" ]; then
- 	    indent >&3 << __EOF__
- run_ip route replace $gateway src \$(find_first_interface_address $interface) dev $interface table $number
---- ./lib.providers.orig
-+++ ./lib.providers
-@@ -408,7 +408,7 @@
- 	    save_command "#"
- 	    save_command "# We don't have any 'balance' providers so we retore any default route that we've saved"
- 	    save_command "#"
--	    save_command restore_default_route
-+#	    save_command restore_default_route
- 	fi
- 
- 	save_command "if [ -w /etc/iproute2/rt_tables ]; then"
---- ./lib.providers.orig
-+++ ./lib.providers
-@@ -267,7 +267,7 @@
-     rulenum=\$((\$rulenum + 1))
- done
- __EOF__
--	elif [ -n "$DELETE_THEN_ADD" ]; then
-+	elif [ -n "$DELETE_THEN_ADD" ] && [ -n "$gateway" ]; then
- 	    indent >&3 << __EOF__
- 
- find_interface_addresses $interface | while read address; do
diff --git a/main/shorewall-shell/shorewall-shell-rp_filter.patch b/main/shorewall-shell/shorewall-shell-rp_filter.patch
deleted file mode 100644
index 0e3174c92c..0000000000
--- a/main/shorewall-shell/shorewall-shell-rp_filter.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./compiler.orig
-+++ ./compiler
-@@ -3991,12 +3991,12 @@
- __EOF__
- 	done
- 
--	save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter"
--
- 	if [ "$ROUTE_FILTER" = yes ]; then
- 	    save_command "echo 1 > /proc/sys/net/ipv4/conf/default/rp_filter"
-+	    save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter"
- 	elif [ "$ROUTE_FILTER" = no ]; then
- 	    save_command "echo 0 > /proc/sys/net/ipv4/conf/default/rp_filter"
-+	    save_command "echo 0 > /proc/sys/net/ipv4/conf/all/rp_filter"
- 	fi
- 
- 	save_command "[ -n \"\$NOROUTES\" ] || ip route flush cache"