| 1 |
commit: 198b4ec0e6d0d24464a31896012aa358c8beb941 |
| 2 |
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 30 10:00:21 2019 +0000 |
| 4 |
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 30 10:02:12 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=198b4ec0 |
| 7 |
|
| 8 |
net-dns/dnsdist: added useflags bug 672516 and initscript changes |
| 9 |
|
| 10 |
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
net-dns/dnsdist/{dnsdist-1.3.3.ebuild => dnsdist-1.3.3-r1.ebuild} | 7 +++++-- |
| 14 |
net-dns/dnsdist/dnsdist-9999.ebuild | 7 +++++-- |
| 15 |
net-dns/dnsdist/files/dnsdist.initd | 8 ++++---- |
| 16 |
3 files changed, 14 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-dns/dnsdist/dnsdist-1.3.3.ebuild b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild |
| 19 |
similarity index 97% |
| 20 |
rename from net-dns/dnsdist/dnsdist-1.3.3.ebuild |
| 21 |
rename to net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild |
| 22 |
index b13e2bdae49..ed3b96e1ed6 100644 |
| 23 |
--- a/net-dns/dnsdist/dnsdist-1.3.3.ebuild |
| 24 |
+++ b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild |
| 25 |
@@ -28,7 +28,7 @@ IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test" |
| 26 |
REQUIRED_USE="dnscrypt? ( ssl ) |
| 27 |
gnutls? ( ssl )" |
| 28 |
|
| 29 |
-DEPEND=" |
| 30 |
+RDEPEND=" |
| 31 |
>=dev-libs/boost-1.35:= |
| 32 |
dev-libs/libedit:= |
| 33 |
fstrm? ( dev-libs/fstrm:= ) |
| 34 |
@@ -45,11 +45,14 @@ DEPEND=" |
| 35 |
systemd? ( sys-apps/systemd:0= ) |
| 36 |
" |
| 37 |
|
| 38 |
-RDEPEND="${DEPEND}" |
| 39 |
+DEPEND="${RDEPEND} |
| 40 |
+ virtual/pkgconfig |
| 41 |
+" |
| 42 |
|
| 43 |
[[ ${PV} == 9999 ]] && DEPEND+=" |
| 44 |
app-text/pandoc |
| 45 |
dev-util/ragel |
| 46 |
+ dev-python/virtualenv |
| 47 |
" |
| 48 |
|
| 49 |
src_prepare() { |
| 50 |
|
| 51 |
diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild b/net-dns/dnsdist/dnsdist-9999.ebuild |
| 52 |
index b13e2bdae49..ed3b96e1ed6 100644 |
| 53 |
--- a/net-dns/dnsdist/dnsdist-9999.ebuild |
| 54 |
+++ b/net-dns/dnsdist/dnsdist-9999.ebuild |
| 55 |
@@ -28,7 +28,7 @@ IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test" |
| 56 |
REQUIRED_USE="dnscrypt? ( ssl ) |
| 57 |
gnutls? ( ssl )" |
| 58 |
|
| 59 |
-DEPEND=" |
| 60 |
+RDEPEND=" |
| 61 |
>=dev-libs/boost-1.35:= |
| 62 |
dev-libs/libedit:= |
| 63 |
fstrm? ( dev-libs/fstrm:= ) |
| 64 |
@@ -45,11 +45,14 @@ DEPEND=" |
| 65 |
systemd? ( sys-apps/systemd:0= ) |
| 66 |
" |
| 67 |
|
| 68 |
-RDEPEND="${DEPEND}" |
| 69 |
+DEPEND="${RDEPEND} |
| 70 |
+ virtual/pkgconfig |
| 71 |
+" |
| 72 |
|
| 73 |
[[ ${PV} == 9999 ]] && DEPEND+=" |
| 74 |
app-text/pandoc |
| 75 |
dev-util/ragel |
| 76 |
+ dev-python/virtualenv |
| 77 |
" |
| 78 |
|
| 79 |
src_prepare() { |
| 80 |
|
| 81 |
diff --git a/net-dns/dnsdist/files/dnsdist.initd b/net-dns/dnsdist/files/dnsdist.initd |
| 82 |
index bfeef82d46f..17c86ca431d 100644 |
| 83 |
--- a/net-dns/dnsdist/files/dnsdist.initd |
| 84 |
+++ b/net-dns/dnsdist/files/dnsdist.initd |
| 85 |
@@ -1,5 +1,5 @@ |
| 86 |
#!/sbin/openrc-run |
| 87 |
-# Copyright 1999-2017 Gentoo Foundation |
| 88 |
+# Copyright 1999-2019 Gentoo Authors |
| 89 |
# Distributed under the terms of the GNU General Public License v2 |
| 90 |
|
| 91 |
extra_commands="configcheck" |
| 92 |
@@ -25,14 +25,14 @@ depend() { |
| 93 |
} |
| 94 |
|
| 95 |
start() { |
| 96 |
- checkpath -q -d ${PIDDIR} -o ${DNSDIST_USER}:${DNSDIST_GROUP} |
| 97 |
+ checkpath -q -d ${PIDDIR} -o ${DNSDIST_USER}:${DNSDIST_GROUP} |
| 98 |
|
| 99 |
configcheck || return 1 |
| 100 |
|
| 101 |
ebegin "Starting dnsdist (${DNSDIST_INSTANCE})" |
| 102 |
start-stop-daemon --start --exec $DNSDIST --pidfile ${PIDFILE} \ |
| 103 |
- -- -d -p ${PIDFILE} -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \ |
| 104 |
- -C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS} |
| 105 |
+ -b -- -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \ |
| 106 |
+ -C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS} |
| 107 |
eend $? |
| 108 |
} |
Archives