Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/miniupnpd/, net-misc/miniupnpd/files/
Date: Sun, 30 Jun 2019 07:39:41
Message-Id: 1561880357.139c59e8efd24827e28abe21b2053a591ca082f4.mgorny@gentoo
1 commit: 139c59e8efd24827e28abe21b2053a591ca082f4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 30 07:27:47 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 30 07:39:17 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=139c59e8
7
8 net-misc/miniupnpd: Support running ip6tables setup scripts
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 net-misc/miniupnpd/files/miniupnpd-conf.d-r2 | 3 +++
13 net-misc/miniupnpd/files/miniupnpd-init.d-r2 | 8 +++++++-
14 net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild | 6 +++++-
15 3 files changed, 15 insertions(+), 2 deletions(-)
16
17 diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
18 index 2ebd8c56b57..d0f5ce40cdc 100644
19 --- a/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
20 +++ b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2
21 @@ -8,3 +8,6 @@
22
23 # enable manipulating iptables on start/stop
24 iptables_scripts=1
25 +
26 +# enable manipulating ip6tables on start/stop
27 +ip6tables_scripts=1
28
29 diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r2 b/net-misc/miniupnpd/files/miniupnpd-init.d-r2
30 index 8b9f0579f22..4671ba067c4 100644
31 --- a/net-misc/miniupnpd/files/miniupnpd-init.d-r2
32 +++ b/net-misc/miniupnpd/files/miniupnpd-init.d-r2
33 @@ -9,7 +9,7 @@ command_args="-f ${config_file:-/etc/miniupnpd/miniupnpd.conf} ${extra_args}"
34
35 depend() {
36 need net
37 - use iptables minissdpd
38 + use iptables ip6tables minissdpd
39 }
40
41 start_pre() {
42 @@ -18,6 +18,9 @@ start_pre() {
43 if [ -n "${iptables_scripts}" ]; then
44 /etc/miniupnpd/iptables_init.sh || retval=${?}
45 fi
46 + if [ -n "${ip6tables_scripts}" ]; then
47 + /etc/miniupnpd/ip6tables_init.sh || retval=${?}
48 + fi
49
50 return ${retval}
51 }
52 @@ -28,6 +31,9 @@ stop_post() {
53 if [ -n "${iptables_scripts}" ]; then
54 /etc/miniupnpd/iptables_removeall.sh
55 fi
56 + if [ -n "${ip6tables_scripts}" ]; then
57 + /etc/miniupnpd/ip6tables_removeall.sh
58 + fi
59
60 return ${retval}
61 }
62
63 diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
64 index 30de1d75b8f..3aaa9a02a94 100644
65 --- a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
66 +++ b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild
67 @@ -55,8 +55,12 @@ src_compile() {
68 src_install() {
69 emake PREFIX="${ED}" STRIP=true install
70
71 + local confd_seds=( -e ': noop' )
72 + use ipv6 || confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
73 +
74 newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
75 - newconfd "${FILESDIR}"/${PN}-conf.d-r2 ${PN}
76 + newconfd - ${PN} < <(sed "${confd_seds[@]}" \
77 + "${FILESDIR}"/${PN}-conf.d-r2 || die)
78 }
79
80 pkg_postinst() {