1 |
commit: 47fd8517c3d1af028f7caf8ba09fc9147f57fe3d |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 30 07:18:17 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 30 07:39:16 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47fd8517 |
7 |
|
8 |
net-misc/miniupnpd: Invert boolean for calling iptables |
9 |
|
10 |
The negative logic is confusing, and it would get even more confusing |
11 |
with the incoming ip6tables and nftables support. |
12 |
|
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
net-misc/miniupnpd/files/miniupnpd-conf.d-r2 | 10 ++++++++++ |
16 |
net-misc/miniupnpd/files/miniupnpd-init.d-r2 | 4 ++-- |
17 |
net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild | 2 +- |
18 |
3 files changed, 13 insertions(+), 3 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 |
21 |
new file mode 100644 |
22 |
index 00000000000..2ebd8c56b57 |
23 |
--- /dev/null |
24 |
+++ b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 |
25 |
@@ -0,0 +1,10 @@ |
26 |
+# /etc/conf.d/miniupnpd: Configuration for miniupnpd init script |
27 |
+ |
28 |
+# extra arguments to be passed to the command |
29 |
+#extra_args="" |
30 |
+ |
31 |
+# the location of the configuration file |
32 |
+#config_file="/etc/miniupnpd/miniupnpd.conf" |
33 |
+ |
34 |
+# enable manipulating iptables on start/stop |
35 |
+iptables_scripts=1 |
36 |
|
37 |
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r2 b/net-misc/miniupnpd/files/miniupnpd-init.d-r2 |
38 |
index 2f9dc5fe6f3..8b9f0579f22 100644 |
39 |
--- a/net-misc/miniupnpd/files/miniupnpd-init.d-r2 |
40 |
+++ b/net-misc/miniupnpd/files/miniupnpd-init.d-r2 |
41 |
@@ -15,7 +15,7 @@ depend() { |
42 |
start_pre() { |
43 |
local retval=0 |
44 |
|
45 |
- if [ -z "${no_iptables_scripts}" ]; then |
46 |
+ if [ -n "${iptables_scripts}" ]; then |
47 |
/etc/miniupnpd/iptables_init.sh || retval=${?} |
48 |
fi |
49 |
|
50 |
@@ -25,7 +25,7 @@ start_pre() { |
51 |
stop_post() { |
52 |
local retval=0 |
53 |
|
54 |
- if [ -z "${no_iptables_scripts}" ]; then |
55 |
+ if [ -n "${iptables_scripts}" ]; then |
56 |
/etc/miniupnpd/iptables_removeall.sh |
57 |
fi |
58 |
|
59 |
|
60 |
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild |
61 |
index 0e787f99f32..30de1d75b8f 100644 |
62 |
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild |
63 |
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild |
64 |
@@ -56,7 +56,7 @@ src_install() { |
65 |
emake PREFIX="${ED}" STRIP=true install |
66 |
|
67 |
newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} |
68 |
- newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN} |
69 |
+ newconfd "${FILESDIR}"/${PN}-conf.d-r2 ${PN} |
70 |
} |
71 |
|
72 |
pkg_postinst() { |