Cleanup; Version bump bug 472434; Clearify init.d output bug 472790;

Remove keepdir/dodir bug 459316

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key BB80F419010E3EC3)

5 files changed, 29 insertions, 120 deletions

diff --git a/net-firewall/shorewall6-lite/ChangeLog b/net-firewall/shorewall6-lite/ChangeLog
index 900558d50d25..e8c2d37f5769 100644
--- a/net-firewall/shorewall6-lite/ChangeLog
+++ b/net-firewall/shorewall6-lite/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/shorewall6-lite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.55 2013/06/30 20:27:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/ChangeLog,v 1.56 2013/07/13 14:13:55 constanze Exp $
+
+*shorewall6-lite-4.5.18 (13 Jul 2013)
+
+  13 Jul 2013; Constanze Hausner <constanze@gentoo.org>
+  files/shorewall6-lite.initd, -shorewall6-lite-4.4.23.2.ebuild,
+  -shorewall6-lite-4.5.8.2.ebuild, -shorewall6-lite-4.5.11.2.ebuild,
+  +shorewall6-lite-4.5.18.ebuild:
+  Cleanup; Version bump bug #472434; Clearify init.d output bug #472790; Remove
+  keepdir/dodir bug #459316
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> shorewall6-lite-4.5.15.ebuild:
   Stable for x86, wrt bug #470544
diff --git a/net-firewall/shorewall6-lite/files/shorewall6-lite.initd b/net-firewall/shorewall6-lite/files/shorewall6-lite.initd
index a572b7e9b4a2..ae2d516b4297 100644
--- a/net-firewall/shorewall6-lite/files/shorewall6-lite.initd
+++ b/net-firewall/shorewall6-lite/files/shorewall6-lite.initd
@@ -1,11 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/files/shorewall6-lite.initd,v 1.2 2012/02/24 18:54:19 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/files/shorewall6-lite.initd,v 1.3 2013/07/13 14:13:55 constanze Exp $
 
 extra_commands="check clear"
 extra_started_commands="refresh reset"
 
+checkconfig() {
+	if [ ! -d /var/lock/subsys ] ; then
+		checkpath -d -m 755 /var/lock/subsys
+	fi
+}
+
 depend() {
 	need net
 	provide firewall
@@ -13,23 +19,25 @@ depend() {
 }
 
 start() {
-	ebegin "Starting firewall"
+	checkconfig
+	ebegin "Starting shorewall6-lite"
 	/sbin/shorewall6-lite -f start 1>/dev/null
 	eend $? 
 }
 
 stop() {
-	ebegin "Stopping firewall"
+	ebegin "Stopping shorewall6-lite"
 	/sbin/shorewall6-lite stop 1>/dev/null
 	eend $?
 }
 
 restart() {
+	checkconfig
 	# 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"
+	ebegin "Restarting shorewall6-lite"
 	if [ -f /var/lib/shorewall6-lite/restore ] ; then
 		/sbin/shorewall6-lite restore
 	else
@@ -42,7 +50,7 @@ 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"
+	ebegin "Clearing all shorewall6-lite rules and setting policy to ACCEPT"
 	/sbin/shorewall6-lite clear
 	eend $?
 }
@@ -50,7 +58,7 @@ clear() {
 reset() {
 	# reset the packet and byte counters in the firewall
 
-	ebegin "Resetting the packet and byte counters in the firewall"
+	ebegin "Resetting the packet and byte counters in the shorewall6-lite"
 	/sbin/shorewall6-lite reset
 	eend $?
 }
@@ -60,7 +68,7 @@ refresh() {
 	# interfaces, the black list, traffic control rules and 
 	# ECN control rules
 
-	ebegin "Refreshing firewall rules"
+	ebegin "Refreshing shorewall6-lite rules"
 	/sbin/shorewall6-lite refresh
 	eend $?
 }
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.23.2.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.4.23.2.ebuild
deleted file mode 100644
index 0cd8e440aeb8..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.4.23.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.4.23.2.ebuild,v 1.5 2012/01/23 13:41:01 klausman Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/6-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~sparc x86"
-IUSE="doc"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.11.2.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild
index dbf9d9b6fd51..30fec64e2f5a 100644
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.11.2.ebuild
+++ b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.11.2.ebuild,v 1.1 2013/01/18 12:19:55 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.18.ebuild,v 1.1 2013/07/13 14:13:55 constanze Exp $
 
 EAPI="4"
 
-inherit versionator linux-info
+inherit linux-info systemd versionator
 
 # Select version (stable, RC, Beta):
 MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
@@ -48,6 +48,7 @@ src_install() {
 	cd "${WORKDIR}/${P}"
 	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_newunit "${FILESDIR}"/shorewall6-lite.systemd 'shorewall6-lite.service' || die
 
 	dodoc changelog.txt releasenotes.txt
 	if use doc; then
diff --git a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.8.2.ebuild b/net-firewall/shorewall6-lite/shorewall6-lite-4.5.8.2.ebuild
deleted file mode 100644
index 5fa18071b6bb..000000000000
--- a/net-firewall/shorewall6-lite/shorewall6-lite-4.5.8.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall6-lite/shorewall6-lite-4.5.8.2.ebuild,v 1.6 2013/02/12 20:27:36 ago Exp $
-
-EAPI="4"
-
-inherit versionator linux-info
-
-# Select version (stable, RC, Beta):
-MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/6-lite/}"
-MY_P="${MY_PN}-${MY_PV_BASE}"
-MY_P_DOCS="${MY_PN}-docs-html-${PV}"
-
-DESCRIPTION="An iptables-based firewall whose config is handled by a normal Shorewall6."
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa sparc x86"
-IUSE="doc"
-
-RDEPEND=">=net-firewall/iptables-1.4.0
-	sys-apps/iproute2
-	=net-firewall/shorewall-core-${PV}"
-
-pkg_pretend() {
-	if kernel_is lt 2 6 25 ; then
-		die "${PN} requires at least kernel 2.6.25."
-	fi
-}
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/${PN}
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}