Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/, net-dns/dnscrypt-proxy/files/
Date: Sat, 08 Apr 2017 21:24:18
Message-Id: 1491686641.77fd2070512923b418b55bdd45dca8cfc797332d.monsieurp@gentoo
1 commit: 77fd2070512923b418b55bdd45dca8cfc797332d
2 Author: soredake <fdsfgs <AT> krutt <DOT> org>
3 AuthorDate: Tue Mar 28 20:13:39 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 8 21:24:01 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fd2070
7
8 net-dns/dnscrypt-proxy: clean up old.
9
10 Closes: https://github.com/gentoo/gentoo/pull/4320
11
12 net-dns/dnscrypt-proxy/Manifest | 5 --
13 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.2.ebuild | 42 --------------
14 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.3.ebuild | 42 --------------
15 .../dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild | 57 -------------------
16 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild | 57 -------------------
17 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild | 57 -------------------
18 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.7.0.ebuild | 57 -------------------
19 .../files/dnscrypt-proxy.confd-1.6.0-r1 | 13 -----
20 .../files/dnscrypt-proxy.initd-1.6.0-r1 | 59 --------------------
21 .../files/dnscrypt-proxy.initd-1.6.1 | 64 ----------------------
22 10 files changed, 453 deletions(-)
23
24 diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
25 index abfc5a7fef2..ffe882a34a7 100644
26 --- a/net-dns/dnscrypt-proxy/Manifest
27 +++ b/net-dns/dnscrypt-proxy/Manifest
28 @@ -1,6 +1 @@
29 -DIST dnscrypt-proxy-1.4.2.tar.gz 1592962 SHA256 1d519068c30868bb60a151908f0e300a1754b234f7bc2ad1d749ad9d0d977076 SHA512 ecb81b5d20cf88a610421bb1266861a2f5dd34d0ce916c54507507ca5dbe5d9e49e95916f76fa7997b112860f2bc37793f075ed812c75b2904adf6cdf32cac17 WHIRLPOOL ddfa3da3de933f6cbb8721ccd6435e97b9e893d32311e1c3badbc23b6a0547b6cb0f8d6037baaf0027ca1eb972c4be167dc9ce56194f7f6fa54fac974ca0bd24
30 -DIST dnscrypt-proxy-1.4.3.tar.gz 1560345 SHA256 f10f10c18e25ced3c5ec5d0c4145d33270f9cfa991fd1b18d5d9af00e4d9b68e SHA512 3aae9f20bc06087b0860a24488bcda117010a34218d7aef3c68a0f155f8164ce06a88865a9caf1ce5c5eaa8588518ccc2c8a61a97cc39f527f7b2b14cdf8c118 WHIRLPOOL 49915b0f95d340828c79febc9b7d94c4f0c444e016b9f78d134e05f43945b446ab71bbc6a230d6e15d5f1f4c0b97d9f671b6001314cc157cdcd419b01bf23550
31 -DIST dnscrypt-proxy-1.6.0.tar.gz 1579293 SHA256 7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be SHA512 1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02 WHIRLPOOL b24eb58bca1ff8fa55fec3836399a3ee5c66823d8b459e5f8ce7aa653454407dc3b80d7dc050b76e5c0595fc0e2d854478a6f949ef859b149f6b20e127c98274
32 -DIST dnscrypt-proxy-1.6.1.tar.gz 1721006 SHA256 c519012a66f3ee30be02113d1e0139be08ccd2ec45ca4102eac35be731a65340 SHA512 8d49be73e4b2fe1131349846191f54c7f212ff301a6a6c2a77505225f81b0615e968c945013e732c4fce3b6090606245ec7343fb0d6145bb10b67dd4112d2367 WHIRLPOOL ca5a1c3792728ff54ee5e3c5a8815deb1ce2e1bdd016438ad0b84d89458064e0178df3c1dee77c8a685894092e48a305b521dc8e4bfc3cb40a0d7ac7e7e66d18
33 -DIST dnscrypt-proxy-1.7.0.tar.gz 1714401 SHA256 be9827f66401f38fd4bdb372046eff9b5802ab5f3d188878a0dcd7bd20074c09 SHA512 611d9cd9d9c086ec8e2b60f6c574451eae71ea07de85973049be7090cfbd8bf790d41f8a4a2b39d74091fba7091551967b93b85a8661c03ecad43d868df597a3 WHIRLPOOL 0c3902bfcc3571175f0f8638327cbaf5eada512565f214232732d14dc6a83f55a0babedd68007cbaeec1b584bcb1d3cc621df8b07638bacfe5893c6222d12997
34 DIST dnscrypt-proxy-1.9.4.tar.gz 1660333 SHA256 40543efbcd56033ac03a1edf4581305e8c9bed4579ac55e6279644f07c315307 SHA512 b19103dc39655f199c85ec69daab949d07adc12e64411d2323308afb398e6ac6563bbc17f2e317bfe1e6c95c810487d8d62da3f4c7f7257bdcf837cd0390bfb0 WHIRLPOOL 4e9494c2765ecf9d625f7b44c0f58c40e491e1334a58552111730ecd3b95cba10667b2bfa2b29e291ccfa97a5678bbbc398dd14e888914bfddc6f7e61bac4a3a
35
36 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.2.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.2.ebuild
37 deleted file mode 100644
38 index 36ff8103838..00000000000
39 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.2.ebuild
40 +++ /dev/null
41 @@ -1,42 +0,0 @@
42 -# Copyright 1999-2014 Gentoo Foundation
43 -# Distributed under the terms of the GNU General Public License v2
44 -
45 -EAPI=5
46 -
47 -inherit eutils systemd user
48 -
49 -DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
50 -HOMEPAGE="http://dnscrypt.org/"
51 -SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
52 -
53 -LICENSE="ISC"
54 -SLOT="0"
55 -KEYWORDS="~amd64 ~x86"
56 -IUSE="+plugins ldns systemd"
57 -
58 -DEPEND="dev-libs/libsodium
59 - ldns? ( net-libs/ldns )"
60 -RDEPEND="${DEPEND}
61 - systemd? ( sys-apps/systemd )"
62 -
63 -DOCS=( AUTHORS ChangeLog COPYING NEWS README.markdown README-PLUGINS.markdown
64 - TECHNOTES THANKS )
65 -
66 -pkg_setup() {
67 - enewgroup dnscrypt
68 - enewuser dnscrypt -1 -1 /var/empty dnscrypt
69 -}
70 -
71 -src_configure() {
72 - econf \
73 - $(use_enable plugins) \
74 - $(use_with systemd )
75 -}
76 -
77 -src_install() {
78 - default
79 -
80 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
81 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
82 - systemd_dounit "${FILESDIR}"/${PN}.service
83 -}
84
85 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.3.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.3.ebuild
86 deleted file mode 100644
87 index 5af435bbe77..00000000000
88 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.4.3.ebuild
89 +++ /dev/null
90 @@ -1,42 +0,0 @@
91 -# Copyright 1999-2015 Gentoo Foundation
92 -# Distributed under the terms of the GNU General Public License v2
93 -
94 -EAPI=5
95 -
96 -inherit eutils systemd user
97 -
98 -DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
99 -HOMEPAGE="http://dnscrypt.org/"
100 -SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
101 -
102 -LICENSE="ISC"
103 -SLOT="0"
104 -KEYWORDS="~amd64 ~x86"
105 -IUSE="+plugins ldns systemd"
106 -
107 -DEPEND="dev-libs/libsodium
108 - ldns? ( net-libs/ldns )"
109 -RDEPEND="${DEPEND}
110 - systemd? ( sys-apps/systemd )"
111 -
112 -DOCS=( AUTHORS ChangeLog COPYING NEWS README.markdown README-PLUGINS.markdown
113 - TECHNOTES THANKS )
114 -
115 -pkg_setup() {
116 - enewgroup dnscrypt
117 - enewuser dnscrypt -1 -1 /var/empty dnscrypt
118 -}
119 -
120 -src_configure() {
121 - econf \
122 - $(use_enable plugins) \
123 - $(use_with systemd )
124 -}
125 -
126 -src_install() {
127 - default
128 -
129 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
130 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
131 - systemd_dounit "${FILESDIR}"/${PN}.service
132 -}
133
134 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild
135 deleted file mode 100644
136 index 7935118328c..00000000000
137 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0-r1.ebuild
138 +++ /dev/null
139 @@ -1,57 +0,0 @@
140 -# Copyright 1999-2015 Gentoo Foundation
141 -# Distributed under the terms of the GNU General Public License v2
142 -
143 -EAPI=5
144 -
145 -inherit systemd user
146 -
147 -DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
148 -HOMEPAGE="http://dnscrypt.org/"
149 -SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
150 -
151 -LICENSE="ISC"
152 -SLOT="0"
153 -KEYWORDS="~amd64 ~x86"
154 -IUSE="+plugins systemd"
155 -
156 -CDEPEND="
157 - dev-libs/libsodium
158 - net-libs/ldns
159 - systemd? ( sys-apps/systemd )"
160 -RDEPEND="${CDEPEND}"
161 -DEPEND="${CDEPEND}
162 - virtual/pkgconfig"
163 -
164 -DOCS="AUTHORS ChangeLog NEWS README* TECHNOTES THANKS"
165 -
166 -pkg_setup() {
167 - enewgroup dnscrypt
168 - enewuser dnscrypt -1 -1 /var/empty dnscrypt
169 -}
170 -
171 -src_configure() {
172 - econf \
173 - $(use_enable plugins) \
174 - $(use_with systemd)
175 -}
176 -
177 -src_install() {
178 - default
179 -
180 - newinitd "${FILESDIR}"/${PN}.initd-1.6.0-r1 ${PN}
181 - newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
182 - systemd_dounit "${FILESDIR}"/${PN}.service
183 -}
184 -
185 -pkg_postinst() {
186 - elog "After starting the service you will need to update your"
187 - elog "/etc/resolv.conf and replace your current set of resolvers"
188 - elog "with:"
189 - elog
190 - elog "nameserver <DNSCRYPT_LOCALIP>"
191 - elog
192 - elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
193 - elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
194 - elog
195 - elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
196 -}
197
198 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild
199 deleted file mode 100644
200 index b1beb34c0c4..00000000000
201 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild
202 +++ /dev/null
203 @@ -1,57 +0,0 @@
204 -# Copyright 1999-2015 Gentoo Foundation
205 -# Distributed under the terms of the GNU General Public License v2
206 -
207 -EAPI=5
208 -
209 -inherit systemd user
210 -
211 -DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
212 -HOMEPAGE="http://dnscrypt.org/"
213 -SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
214 -
215 -LICENSE="ISC"
216 -SLOT="0"
217 -KEYWORDS="~amd64 ~x86"
218 -IUSE="+plugins systemd"
219 -
220 -CDEPEND="
221 - dev-libs/libsodium
222 - net-libs/ldns
223 - systemd? ( sys-apps/systemd )"
224 -RDEPEND="${CDEPEND}"
225 -DEPEND="${CDEPEND}
226 - virtual/pkgconfig"
227 -
228 -DOCS="AUTHORS ChangeLog NEWS README* TECHNOTES THANKS"
229 -
230 -pkg_setup() {
231 - enewgroup dnscrypt
232 - enewuser dnscrypt -1 -1 /var/empty dnscrypt
233 -}
234 -
235 -src_configure() {
236 - econf \
237 - $(use_enable plugins) \
238 - $(use_with systemd)
239 -}
240 -
241 -src_install() {
242 - default
243 -
244 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
245 - newconfd "${FILESDIR}"/${PN}.confd ${PN}
246 - systemd_dounit "${FILESDIR}"/${PN}.service
247 -}
248 -
249 -pkg_postinst() {
250 - elog "After starting the service you will need to update your"
251 - elog "/etc/resolv.conf and replace your current set of resolvers"
252 - elog "with:"
253 - elog
254 - elog "nameserver <DNSCRYPT_LOCALIP>"
255 - elog
256 - elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
257 - elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
258 - elog
259 - elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
260 -}
261
262 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild
263 deleted file mode 100644
264 index 142a3acf682..00000000000
265 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.1.ebuild
266 +++ /dev/null
267 @@ -1,57 +0,0 @@
268 -# Copyright 1999-2015 Gentoo Foundation
269 -# Distributed under the terms of the GNU General Public License v2
270 -
271 -EAPI=5
272 -
273 -inherit systemd user
274 -
275 -DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
276 -HOMEPAGE="http://dnscrypt.org/"
277 -SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz"
278 -
279 -LICENSE="ISC"
280 -SLOT="0"
281 -KEYWORDS="~amd64 ~x86"
282 -IUSE="+plugins systemd"
283 -
284 -CDEPEND="
285 - dev-libs/libsodium
286 - net-libs/ldns
287 - systemd? ( sys-apps/systemd )"
288 -RDEPEND="${CDEPEND}"
289 -DEPEND="${CDEPEND}
290 - virtual/pkgconfig"
291 -
292 -DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
293 -
294 -pkg_setup() {
295 - enewgroup dnscrypt
296 - enewuser dnscrypt -1 -1 /var/empty dnscrypt
297 -}
298 -
299 -src_configure() {
300 - econf \
301 - $(use_enable plugins) \
302 - $(use_with systemd)
303 -}
304 -
305 -src_install() {
306 - default
307 -
308 - newinitd "${FILESDIR}"/${PN}.initd-1.6.1 ${PN}
309 - newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
310 - systemd_dounit "${FILESDIR}"/${PN}.service
311 -}
312 -
313 -pkg_postinst() {
314 - elog "After starting the service you will need to update your"
315 - elog "/etc/resolv.conf and replace your current set of resolvers"
316 - elog "with:"
317 - elog
318 - elog "nameserver <DNSCRYPT_LOCALIP>"
319 - elog
320 - elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
321 - elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
322 - elog
323 - elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
324 -}
325
326 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.7.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.7.0.ebuild
327 deleted file mode 100644
328 index a136524376e..00000000000
329 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.7.0.ebuild
330 +++ /dev/null
331 @@ -1,57 +0,0 @@
332 -# Copyright 1999-2016 Gentoo Foundation
333 -# Distributed under the terms of the GNU General Public License v2
334 -
335 -EAPI=6
336 -
337 -inherit systemd user
338 -
339 -DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
340 -HOMEPAGE="https://dnscrypt.org/"
341 -SRC_URI="https://download.dnscrypt.org/${PN}/${P}.tar.gz"
342 -
343 -LICENSE="ISC"
344 -SLOT="0"
345 -KEYWORDS="~amd64 ~arm ~x86"
346 -IUSE="+plugins systemd"
347 -
348 -CDEPEND="
349 - dev-libs/libsodium
350 - net-libs/ldns
351 - systemd? ( sys-apps/systemd )"
352 -RDEPEND="${CDEPEND}"
353 -DEPEND="${CDEPEND}
354 - virtual/pkgconfig"
355 -
356 -DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
357 -
358 -pkg_setup() {
359 - enewgroup dnscrypt
360 - enewuser dnscrypt -1 -1 /var/empty dnscrypt
361 -}
362 -
363 -src_configure() {
364 - econf \
365 - $(use_enable plugins) \
366 - $(use_with systemd)
367 -}
368 -
369 -src_install() {
370 - default
371 -
372 - newinitd "${FILESDIR}"/${PN}.initd-1.6.1 ${PN}
373 - newconfd "${FILESDIR}"/${PN}.confd-1.6.0-r1 ${PN}
374 - systemd_dounit "${FILESDIR}"/${PN}.service
375 -}
376 -
377 -pkg_postinst() {
378 - elog "After starting the service you will need to update your"
379 - elog "/etc/resolv.conf and replace your current set of resolvers"
380 - elog "with:"
381 - elog
382 - elog "nameserver <DNSCRYPT_LOCALIP>"
383 - elog
384 - elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
385 - elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
386 - elog
387 - elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
388 -}
389
390 diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1
391 deleted file mode 100644
392 index 5b1b28dd5ab..00000000000
393 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-1.6.0-r1
394 +++ /dev/null
395 @@ -1,13 +0,0 @@
396 -DNSCRYPT_LOCALIP=127.0.0.1
397 -DNSCRYPT_LOCALPORT=53
398 -DNSCRYPT_USER=dnscrypt
399 -DNSCRYPT_OPTIONS="--ephemeral-keys"
400 -# Pick exactly ONE of the following sets:
401 -# option 1) selection from CSV file, uses the first column as the key
402 -DNSCRYPT_RESOLVER_NAME=cisco # Cisco OpenDNS
403 -DNSCRYPT_RESOLVERS_LIST=/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv
404 -# option 2) manually specified parameters
405 -#DNSCRYPT_RESOLVERIP=203.0.133.53
406 -#DNSCRYPT_RESOLVERPORT=443
407 -#DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.example.com
408 -#DNSCRYPT_PROVIDER_KEY=1234:5678:90AB:CDEF:DEAD:BEEF:CAFE:BEA7:1234:5678:90AB:CDEF:DEAD:BEEF:CAFE:BEA7
409
410 diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1
411 deleted file mode 100644
412 index db5e3223132..00000000000
413 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.0-r1
414 +++ /dev/null
415 @@ -1,59 +0,0 @@
416 -#!/sbin/openrc-run
417 -# Copyright 1999-2014 Gentoo Foundation
418 -# Distributed under the terms of the GNU General Public License v2
419 -
420 -DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-/var/log/dnscrypt-proxy.log}
421 -DNSCRYPT_RESOLVERS_LIST=${DNSCRYPT_RESOLVERS_LIST:-/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv}
422 -
423 -rundir=${rundir:-/var/run/dnscrypt-proxy}
424 -pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
425 -rundir=${rundir:-/var/run/dnscrypt-proxy}
426 -runas_user=${runas_user:-dnscrypt}
427 -runas_group=${runas_user:-dnscrypt}
428 -
429 -depend() {
430 - use net
431 - before dns
432 - after logger
433 -}
434 -
435 -start() {
436 - if [ ! -d "${rundir}" ]; then
437 - mkdir "${rundir}"
438 - if [ -n "${runas_user}" ]; then
439 - touch "${DNSCRYPT_LOGFILE}"
440 - chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
441 - chown -R ${runas_user}:${runas_group} "${rundir}"
442 - fi
443 - fi
444 -
445 - if [ -n "$DNSCRYPT_RESOLVER_NAME" -a -n "$DNSCRYPT_RESOLVERIP" ]; then
446 - eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
447 - return 1
448 - elif [ -n "$DNSCRYPT_RESOLVER_NAME" ]; then
449 - resolver_opts="--resolvers-list=${DNSCRYPT_RESOLVERS_LIST} --resolver-name=${DNSCRYPT_RESOLVER_NAME}"
450 - elif [ -n "$DNSCRYPT_RESOLVERIP" ]; then
451 - resolver_opts="--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} --provider-name=${DNSCRYPT_PROVIDER_NAME} --provider-key=${DNSCRYPT_PROVIDER_KEY}"
452 - else
453 - eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
454 - return 1
455 - fi
456 -
457 - ebegin "Starting dnscrypt-proxy"
458 - start-stop-daemon --start --quiet \
459 - --exec /usr/sbin/dnscrypt-proxy \
460 - -- \
461 - ${DNSCRYPT_OPTIONS} \
462 - --pidfile="${pidfile}" \
463 - --logfile="${DNSCRYPT_LOGFILE}" \
464 - --daemonize --user=${runas_user} \
465 - --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
466 - $resolver_opts
467 - eend $?
468 -}
469 -
470 -stop() {
471 - ebegin "Stopping dnscrypt-proxy"
472 - start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
473 - eend $?
474 -}
475
476 diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1
477 deleted file mode 100644
478 index 453ab0b3149..00000000000
479 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-1.6.1
480 +++ /dev/null
481 @@ -1,64 +0,0 @@
482 -#!/sbin/openrc-run
483 -# Copyright 1999-2014 Gentoo Foundation
484 -# Distributed under the terms of the GNU General Public License v2
485 -
486 -DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-syslog}
487 -DNSCRYPT_RESOLVERS_LIST=${DNSCRYPT_RESOLVERS_LIST:-/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv}
488 -
489 -rundir=${rundir:-/var/run/dnscrypt-proxy}
490 -pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
491 -rundir=${rundir:-/var/run/dnscrypt-proxy}
492 -runas_user=${runas_user:-dnscrypt}
493 -runas_group=${runas_user:-dnscrypt}
494 -
495 -depend() {
496 - use net
497 - before dns
498 - after logger
499 -}
500 -
501 -start() {
502 - if [ ! -d "${rundir}" ]; then
503 - mkdir "${rundir}"
504 - if [ -n "${runas_user}" ]; then
505 - touch "${DNSCRYPT_LOGFILE}"
506 - chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
507 - chown -R ${runas_user}:${runas_group} "${rundir}"
508 - fi
509 - fi
510 -
511 - if [ -n "$DNSCRYPT_RESOLVER_NAME" -a -n "$DNSCRYPT_RESOLVERIP" ]; then
512 - eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
513 - return 1
514 - elif [ -n "$DNSCRYPT_RESOLVER_NAME" ]; then
515 - resolver_opts="--resolvers-list=${DNSCRYPT_RESOLVERS_LIST} --resolver-name=${DNSCRYPT_RESOLVER_NAME}"
516 - elif [ -n "$DNSCRYPT_RESOLVERIP" ]; then
517 - resolver_opts="--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} --provider-name=${DNSCRYPT_PROVIDER_NAME} --provider-key=${DNSCRYPT_PROVIDER_KEY}"
518 - else
519 - eerror "You must set exactly one of DNSCRYPT_RESOLVER_NAME or DNSCRYPT_RESOLVERIP!"
520 - return 1
521 - fi
522 -
523 - if [[ "${DNSCRYPT_LOGFILE}" == "syslog" ]]; then
524 - logopt="--syslog"
525 - else
526 - logopt="--logfile='${DNSCRYPT_LOGFILE}'"
527 - fi
528 - ebegin "Starting dnscrypt-proxy"
529 - start-stop-daemon --start --quiet \
530 - --exec /usr/sbin/dnscrypt-proxy \
531 - -- \
532 - $logopt \
533 - --pidfile="${pidfile}" \
534 - --daemonize --user=${runas_user} \
535 - --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
536 - $resolver_opts \
537 - ${DNSCRYPT_OPTIONS}
538 - eend $?
539 -}
540 -
541 -stop() {
542 - ebegin "Stopping dnscrypt-proxy"
543 - start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
544 - eend $?
545 -}
Report Message
Find on MARC Find on Google Groups