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)

6 files changed, 31 insertions, 126 deletions

diff --git a/net-firewall/shorewall-lite/ChangeLog b/net-firewall/shorewall-lite/ChangeLog
index 18937efc8182..1c0800372d8d 100644
--- a/net-firewall/shorewall-lite/ChangeLog
+++ b/net-firewall/shorewall-lite/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/shorewall-lite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.126 2013/06/30 20:29:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/ChangeLog,v 1.127 2013/07/13 14:10:42 constanze Exp $
+
+*shorewall-lite-4.5.18 (13 Jul 2013)
+
+  13 Jul 2013; Constanze Hausner <constanze@gentoo.org>
+  -files/shorewall-lite-4.4.20.3_installer-path.patch,
+  -shorewall-lite-4.4.23.2.ebuild, -shorewall-lite-4.5.8.2.ebuild,
+  -shorewall-lite-4.5.11.2.ebuild, +shorewall-lite-4.5.18.ebuild,
+  files/shorewall-lite:
+  Cleanup; Version bump bug #472434; Clearify init.d output bug #472790; Remove
+  keepdir/dodir bug #459316
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> shorewall-lite-4.5.15.ebuild:
   Stable for ppc64, wrt bug #470544
diff --git a/net-firewall/shorewall-lite/files/shorewall-lite b/net-firewall/shorewall-lite/files/shorewall-lite
index cf759a312765..907b6a4c538c 100755
--- a/net-firewall/shorewall-lite/files/shorewall-lite
+++ b/net-firewall/shorewall-lite/files/shorewall-lite
@@ -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/shorewall-lite/files/shorewall-lite,v 1.2 2012/02/24 18:52:52 constanze Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/files/shorewall-lite,v 1.3 2013/07/13 14:10:42 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 shorewall-lite"
 	/sbin/shorewall-lite -f start 1>/dev/null
 	eend $? 
 }
 
 stop() {
-	ebegin "Stopping firewall"
+	ebegin "Stopping shorewall-lite"
 	/sbin/shorewall-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 shorewall-lite"
 	if [ -f /var/lib/shorewall-lite/restore ] ; then
 		/sbin/shorewall-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 shorewall-lite rules and setting policy to ACCEPT"
 	/sbin/shorewall-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 shorewall-lite"
 	/sbin/shorewall-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 shorewall-lite rules"
 	/sbin/shorewall-lite refresh
 	eend $?
 }
diff --git a/net-firewall/shorewall-lite/files/shorewall-lite-4.4.20.3_installer-path.patch b/net-firewall/shorewall-lite/files/shorewall-lite-4.4.20.3_installer-path.patch
deleted file mode 100644
index 11849a7a9ce7..000000000000
--- a/net-firewall/shorewall-lite/files/shorewall-lite-4.4.20.3_installer-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- shorewall-lite-4.4.20.3/install.sh	2011-06-10 15:04:11.000000000 +0200
-+++ install.sh	2011-06-14 12:09:52.000000000 +0200
-@@ -199,7 +199,7 @@
-     rm -rf ${DESTDIR}/etc/shorewall-lite
-     rm -rf ${DESTDIR}/usr/share/shorewall-lite
-     rm -rf ${DESTDIR}/var/lib/shorewall-lite
--    [ "$LIBEXEC" = share ] || rm -rf /usr/share/shorewall-lite/shorecap /usr/share/shorecap
-+    [ "$LIBEXEC" = /usr/share ] || rm -rf /usr/share/shorewall-lite/shorecap /usr/share/shorecap
- fi
- 
- #
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.4.23.2.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.4.23.2.ebuild
deleted file mode 100644
index 0e1cdc963cd4..000000000000
--- a/net-firewall/shorewall-lite/shorewall-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/shorewall-lite/shorewall-lite-4.4.23.2.ebuild,v 1.8 2012/06/26 04:37:40 zmedico Exp $
-
-EAPI="4"
-
-inherit eutils 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)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-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 Shorewall."
-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 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2"
-
-src_prepare() {
-	    epatch "${FILESDIR}/shorewall-lite-4.4.20.3_installer-path.patch"
-		epatch_user
-}
-
-src_compile() {
-	# The default make command does not work as expected
-	:
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}"
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.11.2.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.18.ebuild
index b6763841b695..468d6416bfb8 100644
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.11.2.ebuild
+++ b/net-firewall/shorewall-lite/shorewall-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/shorewall-lite/shorewall-lite-4.5.11.2.ebuild,v 1.8 2013/03/31 15:01:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-lite/shorewall-lite-4.5.18.ebuild,v 1.1 2013/07/13 14:10:42 constanze Exp $
 
 EAPI="4"
 
-inherit versionator
+inherit 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)"
@@ -21,7 +21,7 @@ SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.b
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND="net-firewall/iptables
@@ -42,6 +42,7 @@ src_install() {
 	cd "${WORKDIR}/${P}"
 	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
 	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
+	systemd_newunit "${FILESDIR}"/shorewall-lite.systemd 'shorewall-lite.service' || die
 
 	dodoc changelog.txt releasenotes.txt
 	if use doc; then
diff --git a/net-firewall/shorewall-lite/shorewall-lite-4.5.8.2.ebuild b/net-firewall/shorewall-lite/shorewall-lite-4.5.8.2.ebuild
deleted file mode 100644
index bd25ffd3c003..000000000000
--- a/net-firewall/shorewall-lite/shorewall-lite-4.5.8.2.ebuild
+++ /dev/null
@@ -1,51 +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/shorewall-lite/shorewall-lite-4.5.8.2.ebuild,v 1.8 2013/02/12 20:27:04 ago Exp $
-
-EAPI="4"
-
-inherit 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)"
-MY_PV_BASE=$(get_version_component_range 1-3)
-
-MY_PN="${PN/-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 Shorewall."
-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 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2
-	=net-firewall/shorewall-core-${PV}"
-
-src_configure() {
-	:;
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	keepdir /var/lib/shorewall-lite
-
-	cd "${WORKDIR}/${P}"
-	DESTDIR="${D}" ./install.sh "${FILESDIR}"/shorewallrc_new || die "install.sh failed"
-	newinitd "${FILESDIR}/shorewall-lite" shorewall-lite
-
-	dodoc changelog.txt releasenotes.txt
-	if use doc; then
-		cd "${WORKDIR}/${MY_P_DOCS}"
-		dohtml -r *
-	fi
-}