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@gentoo.org>

diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
new file mode 100644 (file)
index 0000000..2ebd8c5
--- /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 2f9dc5fe6f3cc6278b8a9f37afcb4ba2a85662a8..8b9f0579f223bc1831dda97c3bb8061c4b65fb3f 100644 (file)
--- 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 0e787f99f32d6a63ce084b497ac794953ae9180f..30de1d75b8f04a717dc6afe04a6c01f63824c6cb 100644 (file)
--- 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() {