gentoo resync : 04.08.2018

5 files changed, 100 insertions, 3 deletions

diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 65de999fa010..dda68c7cc117 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/arno-iptables-firewall/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index ae09e244c21d..52e1b446ba32 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -1,6 +1,8 @@
 AUX arno-iptables-firewall 404 BLAKE2B 20ae4750d99c8edd3edf4f0e96354aa6a3f0df151bbbfe46f27fa3b1e0c8aaa5bdd7e3292b2e1fc1b5c735ae2b3d512117a5457b42593848829cc2808e7b6ec7 SHA512 3491c556150ac4c39447f17cb48caa2542c42c632d960f604ccdd475cbec239b8fec8523606c146427e644a929b2c5522f3c21a47712fd67880ac3815d3ab983
 DIST arno-iptables-firewall-2.0.2a.tar.gz 138141 BLAKE2B 1dad35b86ff5d93991b01ed0b3f4cd61eeab0d896b7c270d809600de972cae13828f192e8962199563b7ebf55f961a4cd96af9b15234e504df23615827aec638 SHA512 56ba669101375cccd29183e7069198f27d0656021310a90a82cb03ce417d4dec241084f3332f57d52f889b125836a6a08bb116453aaa9a4c3860204e109322e5
+DIST arno-iptables-firewall-2.0.3.tar.gz 139445 BLAKE2B 57dade49a4aaacb1354129efeb5ca013060d51baa8c23dea1fc326e52a693c7137047883ea7bbca6cc3221f70a83f7283123a345e22ceac4bb99d3b43410b65d SHA512 c88a560d4c0a2644dd1ec35e0a6e2b1883e52dc6c71075207c3b98a59964a4be3787620e9414ad5e926bddb9dbc7c2674fd8687828526c35f0fb4a53a05aa929
 DIST arno-iptables-firewall_2.0.1e.tar.gz 126238 BLAKE2B 0c8263004d2294f6eedd7f40e6c339da3a57db803ce1d064ac0bf4a3d2191b26fcd0b59185e51240bd0378365f9ca115c80c5edc256aa68359728c960ab8e6e3 SHA512 244b3bbf08b2d97128908aece487388bb71ced002cc129885144f4eacf9cf6053c9eb1225a1cd33fdefc502f1e6822a85710d35a7884e99cfde35d34f3fd4f70
 EBUILD arno-iptables-firewall-2.0.1e.ebuild 2345 BLAKE2B 2e3044adbfa8caad15e4795acc57ad135a645418ef8ebeaf2f3553296ce17a89fa3ce58bbb8fd1f4aac60ac4fe7fd82423036640e350994ad3a43b5fe92510c9 SHA512 9392101cb729e11ed1aaa688b96489241cfe4d9e08038b787a6793f292ca9f2c5fe0c03e93f87a6f8c1bac9ef191bb92ca28a41598165762ee9a0ad20263033b
 EBUILD arno-iptables-firewall-2.0.2a.ebuild 2435 BLAKE2B 12ef96ffecffab0b9f9034cc83ffacb2b94f2b0970b1c6a73556d21b593889f0220de84a4d8dd7f2e23ca9de5c3e155353d21ab33680f41d748eb83d22e0f8f2 SHA512 9d487e6bc4ec2b355989775c05040e89edf9b2e276977b063557458ad168a957b0a85061ea50ffa0f13f67c928bdb910bd072184963ebfc0612bf0a8b27ee0a2
+EBUILD arno-iptables-firewall-2.0.3.ebuild 2414 BLAKE2B cf30e0a8c5090684c6d4226d7066a1672a26e01173f1e3579068701d988356c02b091215f3e827aa332f79f5f71fdf37e882698e3a6f1ac9a2b347d1e423cabf SHA512 e92a736cd8299c972ed12d15fc098323be5a10a4c6d52b6d6dd8b7c721e80f83d360d86b0647a7084896cd297827642325d04813e9a9543eeb328a4e5c0cd6c0
 MISC metadata.xml 423 BLAKE2B 5d1e73ade844870734bfcef03b2955e201f1e8679add93edd74b8cc91840ca7824fd33c674ed2327c2c102166830937af13033380d56bed00c497098faa846d0 SHA512 4d3402711020fd7ddecf5eae405bf4f72246347ea887f2f803c317c8b2d94ff830f68cf39e97526522f2d30845d95319e117efd49f06f685c046d0752c67546a
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.3.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.3.ebuild
new file mode 100644
index 000000000000..939a095dd94b
--- /dev/null
+++ b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit readme.gentoo-r1 systemd eapi7-ver
+
+DESCRIPTION="Arno's iptables firewall script"
+HOMEPAGE="http://rocky.eld.leidenuniv.nl"
+
+MY_PV=$(ver_rs 3 -)
+MY_PV=${MY_PV/rc/RC}
+SRC_URI="https://github.com/${PN}/aif/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins"
+
+# sys-apps/coreutils dependency wrt
+# https://bugs.gentoo.org/show_bug.cgi?id=448716
+
+DEPEND=""
+RDEPEND="net-firewall/ipset
+	net-firewall/iptables
+	>=sys-apps/coreutils-8.21
+	sys-apps/iproute2
+	plugins? ( net-dns/bind-tools )"
+
+S="${WORKDIR}/aif-${MY_PV}"
+
+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 (for OpenRC)
+systemctl start ${PN} (for systemd)
+
+If you want to start this script at boot, run:
+
+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!"
+	eapply_user
+}
+
+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}"
+
+	insinto /usr/libexec/"${PN}"
+	doins share/"${PN}"/environment
+
+	dodoc CHANGELOG README
+	readme.gentoo_create_doc
+
+	if use plugins
+	then
+		insinto /etc/"${PN}"/plugins
+		doins etc/"${PN}"/plugins/*
+
+		insinto /usr/libexec/"${PN}"/plugins
+		doins share/"${PN}"/plugins/*.plugin
+
+		exeinto /usr/libexec/"${PN}"/plugins
+		doexe share/"${PN}"/plugins/dyndns-host-open-helper
+		doexe share/"${PN}"/plugins/traffic-accounting-helper
+		doexe share/"${PN}"/plugins/traffic-accounting-log-rotate
+		doexe share/"${PN}"/plugins/traffic-accounting-show
+
+		docinto plugins
+		dodoc share/"${PN}"/plugins/*.CHANGELOG
+	fi
+
+	doman share/man/man1/arno-fwfilter.1 \
+		share/man/man8/"${PN}".8
+}
+
+pkg_postinst () {
+	ewarn "When you stop this script, all firewall rules are flushed!"
+	ewarn "Make sure to not use multiple firewall scripts simultaneously"
+	ewarn "unless you know what you are doing!"
+	readme.gentoo_print_elog
+}
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 361218f0d226..d96251dd5ea6 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -7,5 +7,5 @@ DIST ipset-6.34.tar.bz2 547940 BLAKE2B a42ad1b0af07250ecae645424d6a9564f16a388da
 EBUILD ipset-6.29.ebuild 2961 BLAKE2B 0dc2faad4795f837c731bfb80a2925c0d7a6e4415130291330a042f0e5d7aa3ccfd0b553bd5ef838405d617d875623202b53b86e5da0d55da3f69dab923ee371 SHA512 c11c5a7b9c56b00d1ae60328d31c6415238b680329d2d1b7be591cd0d6c383029fe07e4305e6bb6e2780205bc4525c2f39bb106a6d3a8c542cf4ea8c00839ccd
 EBUILD ipset-6.30.ebuild 2888 BLAKE2B 05654ce7430037c17fd9ea5fd42804397750a9091bfdea063001001370c6264de3006af3853d60eca5a6ffa90cf509f83c8721d141b4f604cc45c25f29f27d52 SHA512 abd9526b8b6576ed497a8679a903b34fe7330343b91c925bebb2be9a2efaea32472384ed3a6b74cb7b59ddcac5bd865594690597492c78853895f2afc5197efd
 EBUILD ipset-6.32.ebuild 2888 BLAKE2B 05654ce7430037c17fd9ea5fd42804397750a9091bfdea063001001370c6264de3006af3853d60eca5a6ffa90cf509f83c8721d141b4f604cc45c25f29f27d52 SHA512 abd9526b8b6576ed497a8679a903b34fe7330343b91c925bebb2be9a2efaea32472384ed3a6b74cb7b59ddcac5bd865594690597492c78853895f2afc5197efd
-EBUILD ipset-6.34.ebuild 3002 BLAKE2B 3dd200a82c8f72a1131fdbd3fcb8cab2c3ab190889797af630be9b72edec82207d259d0c51c9511e225e3a45f618ad33397e149d6fa58860d15999365149b1ac SHA512 db4e8118760b495a148f8aa20ef57250aff62b7fce4617f6c8f3774e412fb648cfe84ba43f574727666a34ad497bc36fc93b88baff5b19b120e30c8222601de6
+EBUILD ipset-6.34.ebuild 3007 BLAKE2B e39e4e2e8d31d333364ed22ba11db1e8dfac476716ec1631b409ae19d5114f0b16f8d25fc82314e7b4afdf0a2536097f6e0101d6687171157167466e67db3dee SHA512 94827fe7e36189e965ac275c6edf3761bdb8c7d1ac78adf8978e0b6113437bc9670923647e9ac87ac575be8a568f9b0f9c86b5db033e45e30c6fbe525bc7e031
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-firewall/ipset/ipset-6.34.ebuild b/net-firewall/ipset/ipset-6.34.ebuild
index 98a8e3e335b6..789330f6423a 100644
--- a/net-firewall/ipset/ipset-6.34.ebuild
+++ b/net-firewall/ipset/ipset-6.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 
 RDEPEND=">=net-firewall/iptables-1.4.7
 	net-libs/libmnl"