gentoo resync : 15.01.2020

4 files changed, 17 insertions, 102 deletions

diff --git a/net-firewall/arno-iptables-firewall/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index eec6186d4799..2d5bad82459f 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -1,8 +1,6 @@
 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 2227 BLAKE2B 9033d3fb372461bb7f711a604b12d2f12f79fd7421e4fcbbfb9306675cbc95db3362ceb421973b4ee4c06a2b1898c84a8038e2fdcee519086b6d08196bfc04c6 SHA512 aed017650ce04dfff747602c33bd9dcfdd73990fee4dd015609baf4f46e447255922c8247933565a6d656d86a590dc4ec0903302cdb0da2033351d298166ab02
-EBUILD arno-iptables-firewall-2.0.2a.ebuild 2435 BLAKE2B 12ef96ffecffab0b9f9034cc83ffacb2b94f2b0970b1c6a73556d21b593889f0220de84a4d8dd7f2e23ca9de5c3e155353d21ab33680f41d748eb83d22e0f8f2 SHA512 9d487e6bc4ec2b355989775c05040e89edf9b2e276977b063557458ad168a957b0a85061ea50ffa0f13f67c928bdb910bd072184963ebfc0612bf0a8b27ee0a2
+DIST arno-iptables-firewall-2.1.0.tar.gz 140015 BLAKE2B 46ff89db6928bd4f86a5b26a06fa1ab2a88ecc5043f6f92543151c3ca6b74d9704c4b7046e1c5e1371e0b5de552e414cbe0524305947b026ec7953f9d779055d SHA512 b59644e78f281dacdd32045254be15dbd31ecb5f2b26d88a3c9bab60aaf19ea879d87127040db5f72292668e22026d982c17d3ad34c83da16720cdbccebdd07f
 EBUILD arno-iptables-firewall-2.0.3.ebuild 2412 BLAKE2B 1430a24434888fdab011a4af6f84db467da9dfd62f3383643045015b9ab362f27a3db90b7d6ea815fbe7b1146b3336c0fd447f231f1259f77a7278bf6984b920 SHA512 de9daecb896725649cf7d263f87ca8f1da6dd56fd0a81657635c995491fdd929cea19c6be8f4e1b1b4ce009c50b2bb89f999f5047a570368e68b0e5bdff63f28
-MISC metadata.xml 423 BLAKE2B 5d1e73ade844870734bfcef03b2955e201f1e8679add93edd74b8cc91840ca7824fd33c674ed2327c2c102166830937af13033380d56bed00c497098faa846d0 SHA512 4d3402711020fd7ddecf5eae405bf4f72246347ea887f2f803c317c8b2d94ff830f68cf39e97526522f2d30845d95319e117efd49f06f685c046d0752c67546a
+EBUILD arno-iptables-firewall-2.1.0.ebuild 2421 BLAKE2B e6223f6361a3c7d5b7b4dbc03139eebd6c980f9e2b9a93a28da3c7a6ba096b0f4bdc44a032305ee6680ee54f10e04c638204eff3d8b5275e7a8ea14243406c34 SHA512 eaf77b34a8060a1d6cec2432796afb5a1b2520f666cc1735378e9ee20fe283edb916a18d35995f5a32b12bf1affeeaccee39474e1f278d6af9714387b1cf0a09
+MISC metadata.xml 515 BLAKE2B c904370936eddef69630141ec61bdfe911a29bdc2425238b2a973ffcb89702183e0e36c42799cfc6cfaae403bdfb5a8fcefa1a576dd6a547a6b161ca9a967464 SHA512 c0d63d340e8fa318e276d3bd2e526dfa2dd5e8d810a75d75301cef8983d5bc851aae90e7f29685f8c2c21c21fadfa1c3d033156d44fb289eb9890465ea49e3bf
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild
deleted file mode 100644
index 9659d70d0b5f..000000000000
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.1e.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit readme.gentoo systemd
-
-DESCRIPTION="Arno's iptables firewall script"
-HOMEPAGE="http://rocky.eld.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=""
-RDEPEND="net-firewall/iptables
-	>sys-apps/coreutils-8.20-r1
-	sys-apps/iproute2
-	plugins? ( net-dns/bind-tools )"
-
-S="${WORKDIR}/${PN}_${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!"
-}
-
-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/arno-iptables-firewall/arno-iptables-firewall-2.0.2a.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.0.ebuild
index b7750479cd0a..b5cdcda849b2 100644
--- a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.0.2a.ebuild
+++ b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.0.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit readme.gentoo-r1 systemd versionator
+EAPI=7
+inherit readme.gentoo-r1 systemd
 
 DESCRIPTION="Arno's iptables firewall script"
-HOMEPAGE="http://rocky.eld.leidenuniv.nl"
+HOMEPAGE="https://rocky.eld.leidenuniv.nl"
 
-MY_PV=$(replace_version_separator 3 -)
+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
+IUSE="+plugins rsyslog"
 
 DEPEND=""
 RDEPEND="net-firewall/ipset
 	net-firewall/iptables
-	>=sys-apps/coreutils-8.21
+	sys-apps/coreutils
 	sys-apps/iproute2
 	plugins? ( net-dns/bind-tools )"
 
@@ -83,6 +80,12 @@ src_install() {
 		dodoc share/"${PN}"/plugins/*.CHANGELOG
 	fi
 
+	if use rsyslog
+	then
+		insinto /etc/rsyslog.d
+		newins etc/rsyslog.d/"${PN}".conf 60-"${PN}".conf
+	fi
+
 	doman share/man/man1/arno-fwfilter.1 \
 		share/man/man8/"${PN}".8
 }
diff --git a/net-firewall/arno-iptables-firewall/metadata.xml b/net-firewall/arno-iptables-firewall/metadata.xml
index 46b4fd2b7b23..5f877c6af9c9 100644
--- a/net-firewall/arno-iptables-firewall/metadata.xml
+++ b/net-firewall/arno-iptables-firewall/metadata.xml
@@ -11,5 +11,6 @@
 </maintainer>
 <use>
 	<flag name="plugins">Install optional plugins</flag>
+	<flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
 </use>
 </pkgmetadata>