Updated init script with simplified dependencies addresses security bug #288992 by Hugo Mildenberger.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 160 insertions, 2 deletions

diff --git a/net-firewall/shorewall6/ChangeLog b/net-firewall/shorewall6/ChangeLog
index 9c7bc9d6b89c..d37bb08a131d 100644
--- a/net-firewall/shorewall6/ChangeLog
+++ b/net-firewall/shorewall6/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/shorewall6
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.11 2009/10/09 12:31:12 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/ChangeLog,v 1.12 2010/04/13 13:29:57 chainsaw Exp $
+
+*shorewall6-4.2.11-r1 (13 Apr 2010)
+
+  13 Apr 2010; <chainsaw@gentoo.org> +files/shorewall6.initd2,
+  +shorewall6-4.2.11-r1.ebuild:
+  Updated init script with simplified dependencies addresses security bug
+  #288992 by Hugo Mildenberger.
 
 *shorewall6-4.4.2 (09 Oct 2009)
 
diff --git a/net-firewall/shorewall6/files/shorewall6.initd2 b/net-firewall/shorewall6/files/shorewall6.initd2
new file mode 100644
index 000000000000..804e040794ab
--- /dev/null
+++ b/net-firewall/shorewall6/files/shorewall6.initd2
@@ -0,0 +1,79 @@
+#!/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/shorewall6/files/shorewall6.initd2,v 1.1 2010/04/13 13:29:58 chainsaw Exp $
+
+opts="start stop restart clear reset refresh check"
+
+depend() {
+	before net
+	provide firewall
+}
+
+start() {
+	ebegin "Starting firewall"
+	/sbin/shorewall6 -f start 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping firewall"
+	/sbin/shorewall6 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/shorewall6 status >/dev/null
+	if [ $? != 0 ] ; then
+	    svc_start
+	else
+	    if [ -f /var/lib/shorewall6/restore ] ; then
+		/sbin/shorewall6 restore
+	    else
+		/sbin/shorewall6 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/shorewall6 clear
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in the firewall"
+	/sbin/shorewall6 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/shorewall6 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/shorewall6 check
+	eend $?
+}
diff --git a/net-firewall/shorewall6/shorewall6-4.2.11-r1.ebuild b/net-firewall/shorewall6/shorewall6-4.2.11-r1.ebuild
new file mode 100644
index 000000000000..46ee41808a2e
--- /dev/null
+++ b/net-firewall/shorewall6/shorewall6-4.2.11-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6/shorewall6-4.2.11-r1.ebuild,v 1.1 2010/04/13 13:29:57 chainsaw Exp $
+
+inherit versionator linux-info
+
+# Select version (stable, RC, Beta, upstream patched):
+MY_PV_TREE=$(get_version_component_range 1-2)	# for devel versions use "development/$(get_version_component_range 1-2)"
+MY_P_BETA=""      				# stable or experimental (eg. "-RC1" or "-Beta4")
+MY_PV_BASE=$(get_version_component_range 1-3)	# which shorewall-common to use
+
+MY_PN="${PN/6/}"
+MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
+
+DESCRIPTION="Shoreline Firewall with IPv6 support."
+HOMEPAGE="http://www.shorewall.net/"
+SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc64 ~x86"
+
+IUSE="doc"
+
+DEPEND=">=net-firewall/iptables-1.4.0
+	sys-apps/iproute2
+	>=net-firewall/shorewall-perl-${MY_PV_BASE}
+	dev-perl/Socket6
+	!<net-firewall/shorewall-4.0"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if kernel_is lt 2 6 25 ; then
+		die "${PN} requires at least kernel 2.6.25."
+	fi
+}
+
+src_compile() {
+	einfo "Nothing to compile."
+}
+
+src_install() {
+	keepdir /var/lib/${PN}
+
+	cd "${WORKDIR}/${P}${MY_P_BETA}"
+	PREFIX="${D}" ./install.sh || die "install.sh failed"
+
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN} || die "doinitd failed"
+
+	dodoc releasenotes.txt
+	if use doc; then
+		cp -pR Samples6 "${D}/usr/share/doc/${PF}"
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Documentation is available at http://www.shorewall.net"
+	einfo "There are man pages for ${PN}(8)."
+	einfo "For additional information, see"
+	einfo "http://www.shorewall.net/IPV6Support.html"
+	use doc && einfo "Sample configuration files are in /usr/share/doc/${PF}."
+	einfo
+	elog "If you wish to include DNS names in your IPv6 configuration files,"
+	elog "you must have Perl 5.10 and must emerge dev-perl/Socket6."
+	einfo
+	einfo "Please read the included release notes for more information."
+	einfo
+	einfo "Known problems:"
+	einfo "http://www.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
+	einfo
+}