Version bump to 2.0.1e; fixes bug #500114, proxied commit for Ferenc Erki. Removed old.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

4 files changed, 20 insertions, 177 deletions

diff --git a/net-firewall/arno-iptables-firewall/ChangeLog b/net-firewall/arno-iptables-firewall/ChangeLog
index 3265a2972af3..8ff287ca83fc 100644
--- a/net-firewall/arno-iptables-firewall/ChangeLog
+++ b/net-firewall/arno-iptables-firewall/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-firewall/arno-iptables-firewall
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/arno-iptables-firewall/ChangeLog,v 1.11 2014/01/26 11:03:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/arno-iptables-firewall/ChangeLog,v 1.12 2014/04/02 09:33:56 tomwij Exp $
+
+*arno-iptables-firewall-2.0.1e (02 Apr 2014)
+
+  02 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+  +arno-iptables-firewall-2.0.1e.ebuild, -arno-iptables-firewall-1.9.2a.ebuild,
+  -arno-iptables-firewall-1.9.2d.ebuild,
+  -arno-iptables-firewall-2.0.1d-r1.ebuild:
+  Version bump to 2.0.1e; fixes bug #500114, proxied commit for Ferenc Erki.
+  Removed old.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org>
   arno-iptables-firewall-2.0.1d-r2.ebuild:
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-1.9.2a.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-1.9.2a.ebuild
deleted file mode 100644
index 2f0046e23441..000000000000
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-1.9.2a.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/arno-iptables-firewall/arno-iptables-firewall-1.9.2a.ebuild,v 1.1 2009/07/03 15:49:32 darkside Exp $
-
-EAPI=1
-
-DESCRIPTION="Arno's iptables firewall script"
-HOMEPAGE="http://rocky.molphys.leidenuniv.nl/"
-SRC_URI="http://rocky.eld.leidenuniv.nl/iptables-firewall/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins"
-
-DEPEND=">=net-firewall/iptables-1.2.5"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_install() {
-	insinto /etc/arno-iptables-firewall
-
-	# update the default location of the environment script
-	sed -e 's:/usr/local/share/:/usr/share/:' \
-		etc/arno-iptables-firewall/firewall.conf > \
-		"${T}"/firewall.conf
-	doins "${T}"/firewall.conf
-	doins etc/arno-iptables-firewall/custom-rules
-
-	sed -e 's:local/::' \
-		contrib/Gentoo/firewall.conf > \
-		"${T}"/arno-iptables-firewall.confd
-	newconfd "${T}"/arno-iptables-firewall.confd arno-iptables-firewall
-	newinitd contrib/Gentoo/rc.firewall arno-iptables-firewall
-
-	dobin bin/arno-fwfilter
-	dosbin bin/arno-iptables-firewall
-
-	insinto /usr/share/arno-iptables-firewall/
-	doins share/arno-iptables-firewall/environment
-
-	if use plugins
-	then
-		insinto /etc/arno-iptables-firewall/plugins
-		doins etc/arno-iptables-firewall/plugins/*
-
-		insinto /usr/share/arno-iptables-firewall/plugins
-		doins share/arno-iptables-firewall/plugins/*.plugin
-
-		exeinto /usr/share/arno-iptables-firewall/plugins
-		doexe share/arno-iptables-firewall/plugins/dyndns-host-open-helper
-		doexe share/arno-iptables-firewall/plugins/traffic-accounting-helper
-		doexe share/arno-iptables-firewall/plugins/traffic-accounting-log-rotate
-		doexe share/arno-iptables-firewall/plugins/traffic-accounting-show
-
-		docinto plugins
-		dodoc share/arno-iptables-firewall/plugins/*.CHANGELOG
-	fi
-
-	dodoc CHANGELOG README
-
-	doman share/man/man1/arno-fwfilter.1 share/man/man8/arno-iptables-firewall.8
-}
-
-pkg_postinst () {
-	elog "You will need to configure /etc/${PN}/firewall.conf before using this"
-	elog "package.  To start the script, run:"
-	elog "  /etc/init.d/${PN} start"
-	echo
-	elog "If you want to start this script at boot, run:"
-	elog "  rc-update add ${PN} default"
-	echo
-	ewarn "When you start the firewall, the default is to,"
-	ewarn "DROP ALL existing connections! So be carefull when installing"
-	ewarn "on a remote host! There is a option to disable this behavior"
-	ewarn "for testting."
-	echo
-	ewarn "When you stop this script, all firewall rules are flushed!"
-	echo
-}
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-1.9.2d.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-1.9.2d.ebuild
deleted file mode 100644
index 5b41dfa6affe..000000000000
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-1.9.2d.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/arno-iptables-firewall/arno-iptables-firewall-1.9.2d.ebuild,v 1.1 2009/10/10 13:28:39 vostorga Exp $
-
-EAPI=1
-
-DESCRIPTION="Arno's iptables firewall script"
-HOMEPAGE="http://rocky.molphys.leidenuniv.nl/"
-SRC_URI="http://rocky.eld.leidenuniv.nl/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins"
-
-DEPEND=">=net-firewall/iptables-1.2.5"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_install() {
-	insinto /etc/arno-iptables-firewall
-
-	# update the default location of the environment script
-	sed -e 's:/usr/local/share/:/usr/share/:' \
-		etc/arno-iptables-firewall/firewall.conf > \
-		"${T}"/firewall.conf || die
-	doins "${T}"/firewall.conf || die
-	doins etc/arno-iptables-firewall/custom-rules || die
-
-	sed -e 's:local/::' \
-		contrib/Gentoo/firewall.conf > \
-		"${T}"/arno-iptables-firewall.confd || die
-	newconfd "${T}"/arno-iptables-firewall.confd arno-iptables-firewall \
-		|| die
-	newinitd contrib/Gentoo/rc.firewall arno-iptables-firewall || die
-
-	dobin bin/arno-fwfilter || die
-	dosbin bin/arno-iptables-firewall || die
-
-	insinto /usr/share/arno-iptables-firewall/
-	doins share/arno-iptables-firewall/environment || die
-
-	if use plugins
-	then
-		insinto /etc/arno-iptables-firewall/plugins
-		doins etc/arno-iptables-firewall/plugins/* || die
-
-		insinto /usr/share/arno-iptables-firewall/plugins
-		doins share/arno-iptables-firewall/plugins/*.plugin || die
-
-		exeinto /usr/share/arno-iptables-firewall/plugins
-		doexe share/arno-iptables-firewall/plugins/dyndns-host-open-helper \
-			|| die
-		doexe share/arno-iptables-firewall/plugins/traffic-accounting-helper \
-			|| die
-		doexe \
-			share/arno-iptables-firewall/plugins/traffic-accounting-log-rotate \
-			|| die
-		doexe \
-			share/arno-iptables-firewall/plugins/traffic-accounting-show || die
-
-		docinto plugins
-		dodoc share/arno-iptables-firewall/plugins/*.CHANGELOG || die
-	fi
-
-	dodoc CHANGELOG README || die "dodoc failed"
-
-	doman share/man/man1/arno-fwfilter.1 \
-		share/man/man8/arno-iptables-firewall.8 || die "doman failed"
-}
-
-pkg_postinst () {
-	elog "You will need to configure /etc/${PN}/firewall.conf before using this"
-	elog "package.  To start the script, run:"
-	elog "  /etc/init.d/${PN} start"
-	echo
-	elog "If you want to start this script at boot, run:"
-	elog "  rc-update add ${PN} default"
-	echo
-	ewarn "When you start the firewall, the default is to,"
-	ewarn "DROP ALL existing connections! So be carefull when installing"
-	ewarn "on a remote host! There is a option to disable this behavior"
-	ewarn "for testing."
-	echo
-	ewarn "When you stop this script, all firewall rules are flushed!"
-	echo
-}
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1d-r1.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild
index 99a23af84a21..acb4ee917390 100644
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1d-r1.ebuild
+++ b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1d-r1.ebuild,v 1.1 2013/05/18 09:09:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild,v 1.1 2014/04/02 09:33:56 tomwij Exp $
 
 EAPI=5
-
-inherit readme.gentoo
+inherit readme.gentoo systemd
 
 DESCRIPTION="Arno's iptables firewall script"
 HOMEPAGE="http://rocky.eld.leidenuniv.nl"
@@ -30,24 +29,28 @@ DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="You will need to configure /etc/${PN}/firewall.conf
 before using this package. To start the script, run:
 
-/etc/init.d/${PN} start
+/etc/init.d/${PN} start (for OpenRC)
+systemctl start ${PN} (for systemd)
 
 If you want to start this script at boot, run:
 
-rc-update add ${PN} default"
+rc-update add ${PN} default (for OpenRC)
+systemctl enable ${PN} (for systemd)"
 
 src_prepare() {
 	sed -i -e 's:/usr/local/share/:/usr/libexec/:' \
 		etc/"${PN}"/firewall.conf || die "Sed failed!"
+	sed -i -e 's:/usr/local/sbin/:/usr/sbin/:' \
+		lib/systemd/system/"${PN}.service" || die "Sed failed!"
 }
 
 src_install() {
-
 	insinto /etc/"${PN}"
 	doins etc/"${PN}"/firewall.conf
 	doins etc/"${PN}"/custom-rules
 
 	doinitd "${FILESDIR}/${PN}"
+	systemd_dounit lib/systemd/system/"${PN}.service"
 
 	dobin bin/arno-fwfilter
 	dosbin bin/"${PN}"