[gentoo-commits] repo/gentoo:master commit in: net-misc/miniupnpd/, net-misc/miniupnpd/files/

[Michał Górny]

commit:     47fd8517c3d1af028f7caf8ba09fc9147f57fe3d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 07:18:17 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 07:39:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47fd8517

net-misc/miniupnpd: Invert boolean for calling iptables

The negative logic is confusing, and it would get even more confusing
with the incoming ip6tables and nftables support.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-misc/miniupnpd/files/miniupnpd-conf.d-r2        | 10 ++++++++++
 net-misc/miniupnpd/files/miniupnpd-init.d-r2        |  4 ++--
 net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
new file mode 100644
index 00000000000..2ebd8c56b57
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
@@ -0,0 +1,10 @@
+# /etc/conf.d/miniupnpd: Configuration for miniupnpd init script
+
+# extra arguments to be passed to the command
+#extra_args=""
+
+# the location of the configuration file
+#config_file="/etc/miniupnpd/miniupnpd.conf"
+
+# enable manipulating iptables on start/stop
+iptables_scripts=1

diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r2 b/net-misc/miniupnpd/files/miniupnpd-init.d-r2
index 2f9dc5fe6f3..8b9f0579f22 100644
--- a/net-misc/miniupnpd/files/miniupnpd-init.d-r2
+++ b/net-misc/miniupnpd/files/miniupnpd-init.d-r2
@@ -15,7 +15,7 @@ depend() {
 start_pre() {
 	local retval=0
 
-	if [ -z "${no_iptables_scripts}" ]; then
+	if [ -n "${iptables_scripts}" ]; then
 		/etc/miniupnpd/iptables_init.sh || retval=${?}
 	fi
 	
@@ -25,7 +25,7 @@ start_pre() {
 stop_post() {
 	local retval=0
 
-	if [ -z "${no_iptables_scripts}" ]; then
+	if [ -n "${iptables_scripts}" ]; then
 		/etc/miniupnpd/iptables_removeall.sh
 	fi
 

diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
index 0e787f99f32..30de1d75b8f 100644
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
@@ -56,7 +56,7 @@ src_install() {
 	emake PREFIX="${ED}" STRIP=true install
 
 	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d-r2 ${PN}
 }
 
 pkg_postinst() {