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

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 30 insertions, 196 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/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index 517881fc6b8f..e0588494750a 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -4,29 +4,20 @@ Hash: SHA256
 AUX arno-iptables-firewall 403 SHA256 a345aaff1d7ab3c94bf67a653f4cb4bd6babc0b320874ed218f729402c1630c4 SHA512 0a32127ecdf36a2906ad3681afbace9ec0c3ebdc00ffd3f226f77c4ed7aa2217805fb2264ff92fb70b1525ac705a19f61002a0d5a2852078de4a025021e8db5a WHIRLPOOL 20090efbe04852499097c34e4e8ffdf3cb46fa4afe6cafa70b0c087d6c4e9cc85f826dcc9ab794f095aca34ab5aef194598c2a708d590a1d50688343cacafec5
 AUX arno-iptables-firewall.service 364 SHA256 520915c51d247ec88e9d494f1dfd0b10161373a1c859b363599d0f73cb4432ce SHA512 d4a649a4f017a604c28dbccb8e14b997a350cdf8f56ee52fd2ca8d802e48345f3eddf4cbece296779a72cfd4a32fd4119735d5a96846cf8929f4d49faac0d758 WHIRLPOOL 42dbed1b54fe89394aeea6c432cdffcb8c29565cdaa72357f80fa7158711f82763863085b7439f3fcc4d0f778ba8bc5b0ffc9da424861225a2a1a1a73414eb66
 AUX rc.firewall_replace_opts.patch 299 SHA256 73163088b2873a70bbc6dee814e260411ccee9cc0e8bd66e96da5e2def7dc7ed SHA512 eb5d266d4d7a48e5480268c6dc8da7ef242d45c4bdc537c3e81666d3d1720273bc21b325967b235765adf08ae5ddc6d6ab0ddce739aef811e02c16eac14d982c WHIRLPOOL 5b867e9b8844503c72739bebd4cff82271e54113b7d6e836c46e14af620cbd9609a9b8704b8f06ced13961c7cea2343b71254a73967d61ae828a79a2ac09bf9d
-DIST arno-iptables-firewall_1.9.2a.tar.gz 95858 SHA256 1412a28fafbe423d3e5bcf820c4f92265f01d38908eae0f3506e53b6d55a7906
-DIST arno-iptables-firewall_1.9.2d.tar.gz 97797 SHA256 2644299bffbf035bce28e5360a08941ce3fc773906fd7300e94cdf948cffd469
 DIST arno-iptables-firewall_2.0.1d.tar.gz 125329 SHA256 177343362063125985e8b0008fe69bc6ca8d3ba252cfa35a316e708f52fef9c6 SHA512 a99f4fcf4f84a47cc1bda26b39e4f3dc7e10b74f3aeaea8a2519bf18f43ff08ec0bfbd0f078ac36ce12da31d3ac0eabc51231b4559cadca13cd4d75e0940bf9d WHIRLPOOL 2dd56678015cf49ed9442c63c5455c70e72a6f252d9278a56ae1eaabda34d597c44f7fdb97695656882754776385778a5e67d83e7e35e4554e5765e3a0e68b13
-EBUILD arno-iptables-firewall-1.9.2a.ebuild 2596 SHA256 2f95f61a49838eabccac7ec23e349a49977c299bfb99734a83bf5aeed28b3659 SHA512 4eb492d50e1262808a9b70726fb10939ba4f298e6e1d545fac41598bf53a80a6e0ae2ff4444f9b60b06fe030312f75930e9c841dfe6a58f7c971da09cd02dec0 WHIRLPOOL ae41b57611deac699843e2f9eb22af50af4dddda3ef0c868772b87b8d32418c0a93cbd4507bca7d702872701d6dcd1bb3e40a339edc84ccc45f36264ccf9ae40
-EBUILD arno-iptables-firewall-1.9.2d.ebuild 2772 SHA256 3cfbe389ad801ee33f4f78f3fddbb34c1e89adf39653be96708910d137753b85 SHA512 5ee67c3b389cc837d0ae60db5dcfd30edcb92c33f3b60b0b61f915134776dc91560a8052ffa7b3d2f0bad11514086aeb7102d8f8f109365ab3ef3bd5b8d9883d WHIRLPOOL ed745351c17184f6f59e8e9d81711f8c319d1a63ce597f1c7026336b08c99fd26edf7f12a0587d7a1501f77f7e516afa796640619e90ecaac146b935ad311610
-EBUILD arno-iptables-firewall-2.0.1d-r1.ebuild 2239 SHA256 cf75acd6e8414d4d496485ebbae1a4ca1a08af5a75aa49b0cdebb429e512c3d6 SHA512 15dd2a7049d7e11e787778682f99aba6799d289f255a2b49b68c3d48d9a22752f671bc644d9627559ed3baa6e9d6f3479ab8b23ac9d6386f28abdf93aaf35f5f WHIRLPOOL 305f2f4d38557a6c106fb1127c83d2138de210b21eccd53b6a6309087a84caf5d7dde11196ffccf8ceef67871ca4c1e5bb5f6a8b51913167333e210d92b968f9
+DIST arno-iptables-firewall_2.0.1e.tar.gz 126238 SHA256 fa7b865e5d9b8e077cba73b2f28695a2fd691092a0a7f9e1c16ee369fc27fe43 SHA512 244b3bbf08b2d97128908aece487388bb71ced002cc129885144f4eacf9cf6053c9eb1225a1cd33fdefc502f1e6822a85710d35a7884e99cfde35d34f3fd4f70 WHIRLPOOL f6c1b5ade8b4acdcc4c8e90e19a84335c3932d2a58bbba2221a91b7cbd228c4d6072af6e21836314d86ef005780b47c5ce85198219b345116af529178e2133c1
 EBUILD arno-iptables-firewall-2.0.1d-r2.ebuild 2382 SHA256 a877ce083b2cbadb0c8c724e6ed6fa72c733612c0baa71137076d4152d24d351 SHA512 25a3f9bc67dfc8cb2ccea82757e0a1b4a8e78327aa2d452a76b2b70b0cb1a54696f980c5c72e8f1e9f564ae142715eb5279cef6c1f656ef424270e7ebf66d25d WHIRLPOOL a8c0e2a99ae811bf207196ef6a8cb434fb6003a226245efbfb1cf7569cd774b8b124a0590c941eab0610996b61ce7ba99c4e194f8a1cd1e5087ee39bb7f80f31
-MISC ChangeLog 2424 SHA256 5c4dac91484bf92c8c3ef110d1d59c1de229b92b764bfa7987974bbf8bad2d0f SHA512 b8d5e8a0c9b22c71628d565e6f478f87acf38f6fc2331c03d137387e08774dbd72a30531d6ebf48cd5568f2c304d1f3af7443afef240b8f92c461d8c3ecfc07f WHIRLPOOL 9d98f8e7bf93c542f7c4fee0c8b4954bcf991779902d93e241633f63e5658ddedc0595a53db0b326c0e583c1b8c73b8d753d7a17cff83aa7540e3b3ca23cc383
+EBUILD arno-iptables-firewall-2.0.1e.ebuild 2494 SHA256 4e6ce1b1dcdf133a93dd3f5098f99e53c73a46432d42c66b53ff0cd014f91cfb SHA512 37f30ed2843ce69fa42fa5a854e419a4f640eb6762a3dbd24858852d41bd3cd202bcae3eb5478c85cff9bb48e67a1975459c545273ac2d2859dc3b4f08267b77 WHIRLPOOL fb770ac75a5fee811975c00957bca1c2a40e449432996108a5196b50ef0f79301dec4f4dfcb99e34cfae7114ae7220f3c039c206646ae0f257fad81e95ea20d0
+MISC ChangeLog 2778 SHA256 ba13ba1213d10756e40c408dca63f056038c63b69c3b1d11f4ddc57b95112ed5 SHA512 0e537fc3b3e4643fd2dbccfc72d5ee3cc71b0b75e23b75143cf924f28c4557e3831ce6f469c3545be7d1deab3e7d039361dca81a1cb249e0cea4db5348706d37 WHIRLPOOL 9102faa9e005020ec32d8c0ec996aa777dd94c75579085df49a3486eff0da3995d6e77989f74471e805f8c9e257bfaed2586f05aa7b0eb1715eb7eb1dead80f9
 MISC metadata.xml 327 SHA256 51bfcccddfa15dee0e7319ea4ec01fd810be47612abba45196558ad492dfe966 SHA512 aca4ad309dddc381e87586be74ec5aed21caf525ebdbce48c452b7ac9701b36dc756cf6fb48b790ca8bc81332803e92ed63ac30d0a21a5f2bdd56cb4a76e5e0a WHIRLPOOL 1c15aa80e063313cffcc77ac63d3e58fadf4e5abfe75addf2d28991e6bb5f1b259735e1a7668717de7618a2e9b59df98cd173e49803bb0669624db006d8a401e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5OuLAAoJELp701BxlEWfKgwQAMaamjwr6PD0srT3YhYE6kQs
-lKN6hyL8aTFq/5m+p1orF09gTVoA4Hb3tG4O/QlvPeSHDHzbwBU2GN1JXH3WIa/g
-Ud9AAl5BADZOYd20S+CyRoaMTR0dYXKQp3gm3WDjd5BZf/gYkSAKzSzG171smaaL
-d097jbGGRtnFUHWRWxaawyIDt92hyHH3ZNm2pb8IxqQFAXPLrNvrTVZB/31Hc7Yk
-yv/zTJH1b0WaMUdtJamyn572XoFPRJ4bFgvwCviuK7yEzr+LvUaDC2DFVrm2WHTy
-APoeYkDdWQ2nPuxLwK0lvcozku7jXAp95glW9a7laTL0jbh27987gCKw1ZmKQqEH
-Lpvl6tg7pNR7icVA8+9tlVE/K4IpzlyHWj9fbsjAAsasn+nez1nTWxEhTlQ59Gwe
-Xz+ISTMV4RzDm9tnkZFrC5tLZbRqppAKvsUET1lnpoOIy5JDZ+fjUD/PAWNNq4qo
-Kb/SJ2B764ktEJdaKN36YRGYaEJtg65W+MVhlezCu1xb8Z5NU14cncqDBU3ipZ08
-iPj3MEzVxjNmITThGZogQYYeHGoaY7OOKeLm8EbRJwKsVlu8J50tuTcNgsaMPSTv
-ndw3wRVsywBSiyIiDn1MH45ZMFL6dcPFh5HlFy1zDDAyaSXnKSPiuOFCBmFVJLxB
-FbbBX803pmIMAor8UBpP
-=SmVd
+iQEcBAEBCAAGBQJTO9lsAAoJEJWyH81tNOV9j2oIAIPFD2o8VG1xG0i0jsffnXz1
+1PyKln5jyXPtkcsChz/MCkk61JEakOR8m0HBOJW4JkiN8ASLzz0ZoeZh4Yx1RNTx
+8jSR0LbCoie9vf3Lg2kUjHb2lM7qOWkpTIRyEndgT2CA8a8sjJahtt4Ut82Ikgpe
+uJ9C9MOk8nUdLRYfKjbEEwGr1yY8az4yGfGIMqOclL6JyFaLQ2RxCuf3FB70gCKz
+3DdzxgQzfWigac66ijUV0N2ZXSO9NVCdNXYqh4uuQ4togR7CayCXBm37GkJJIi4q
+fEGi42mcN/JNRJt3edbgOvYDTjNp0JweMH/ZHUUqH3sERFvCFjUxtEyaIoCVdAI=
+=/kLK
 -----END PGP SIGNATURE-----
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}"