1 |
commit: 0ee20a4d2c987a374d7751091259e06caa6fc443 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 1 09:27:49 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 1 09:38:18 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee20a4d |
7 |
|
8 |
net-dns/dnscrypt-proxy: drop 2.0.45, 2.1.0 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-dns/dnscrypt-proxy/Manifest | 2 - |
13 |
.../dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild | 105 --------------------- |
14 |
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild | 105 --------------------- |
15 |
.../dnscrypt-proxy-2.0.45-config-full-paths.patch | 101 -------------------- |
16 |
4 files changed, 313 deletions(-) |
17 |
|
18 |
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest |
19 |
index 28b447df6e50..d719871447cd 100644 |
20 |
--- a/net-dns/dnscrypt-proxy/Manifest |
21 |
+++ b/net-dns/dnscrypt-proxy/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST dnscrypt-proxy-2.0.45.tar.gz 2721610 BLAKE2B cddeafec2a2fa8179b722a1b4fe8527bcb3991f5d9e04e31667ea8c38deda5b8c9a3c3a3c16e4e2f5d1bfdb5f8d540c6d61273c34df27f4a78215736b240846f SHA512 becfe3c2d4567725e6b7e973647163e32dd2eaae361087bb05c90b6ddc3b0db0891c2725f6b5c255b8965990832bad53bd6ef137be54a342f46594f3633fe47a |
24 |
-DIST dnscrypt-proxy-2.1.0.tar.gz 6248378 BLAKE2B 6b0db8eae8bd380634a86ee2026fb6a3f64d0874a77633f9b8ef46bd37601ebf8d9163516b5ccc371d5354023d5c5c542384718aa885dd1f99809a7b98df5de2 SHA512 201a2741f4703872901fa9c045323444d2939d662316e0026f7aa33c7136e45a564225106884ed80522be5247e128c70ced176c83333ddaacc66dc0f87c74029 |
25 |
DIST dnscrypt-proxy-2.1.1.tar.gz 6114345 BLAKE2B 9d68d94d1fc142d53ed74840080feca56d7abf606b8df9b2ebea7a69b75f13cdc93be53418e6101d30d31d6f4130b3794c1029a5972e129a4c06feeff7dd81e7 SHA512 1118d79aad8d3e3629616c203194a5346f00fcfe88783ebddc6f167d22a82006f26022e728c57905aa82997b87b77f0841f7c1b60e0f8e5335f9df142b759c21 |
26 |
|
27 |
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild |
28 |
deleted file mode 100644 |
29 |
index ffe2f5f05aa2..000000000000 |
30 |
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.45.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,105 +0,0 @@ |
33 |
-# Copyright 1999-2021 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
- |
38 |
-EGO_PN="github.com/DNSCrypt/${PN}" |
39 |
- |
40 |
-inherit fcaps go-module systemd |
41 |
- |
42 |
-if [[ ${PV} == 9999 ]]; then |
43 |
- inherit git-r3 |
44 |
- EGIT_REPO_URI="https://${EGO_PN}.git" |
45 |
-else |
46 |
- SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
47 |
- KEYWORDS="amd64 arm arm64 ppc64 x86" |
48 |
-fi |
49 |
- |
50 |
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" |
51 |
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" |
52 |
- |
53 |
-LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0" |
54 |
-SLOT="0" |
55 |
-IUSE="pie" |
56 |
- |
57 |
-BDEPEND=">=dev-lang/go-1.13" |
58 |
-RDEPEND=" |
59 |
- acct-group/dnscrypt-proxy |
60 |
- acct-user/dnscrypt-proxy |
61 |
-" |
62 |
- |
63 |
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) |
64 |
- |
65 |
-PATCHES=( |
66 |
- "${FILESDIR}/${PN}-2.0.45-config-full-paths.patch" |
67 |
-) |
68 |
- |
69 |
-src_compile() { |
70 |
- pushd "${PN}" >/dev/null || die |
71 |
- go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die |
72 |
- popd >/dev/null || die |
73 |
-} |
74 |
- |
75 |
-src_test() { |
76 |
- cd "${PN}" || die |
77 |
- go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests" |
78 |
-} |
79 |
- |
80 |
-src_install() { |
81 |
- pushd "${PN}" >/dev/null || die |
82 |
- |
83 |
- dobin dnscrypt-proxy |
84 |
- |
85 |
- insinto /etc/dnscrypt-proxy |
86 |
- newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml |
87 |
- doins example-{allowed,blocked}-{ips.txt,names.txt} |
88 |
- doins example-{cloaking-rules.txt,forwarding-rules.txt} |
89 |
- |
90 |
- popd >/dev/null || die |
91 |
- |
92 |
- insinto /usr/share/dnscrypt-proxy |
93 |
- doins -r "utils/generate-domains-blocklist/." |
94 |
- |
95 |
- newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy |
96 |
- newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy |
97 |
- |
98 |
- systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service |
99 |
- systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket |
100 |
- |
101 |
- insinto /etc/logrotate.d |
102 |
- newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy |
103 |
- |
104 |
- einstalldocs |
105 |
-} |
106 |
- |
107 |
-pkg_postinst() { |
108 |
- fcaps_pkg_postinst |
109 |
- |
110 |
- if ! use filecaps; then |
111 |
- ewarn "'filecaps' USE flag is disabled" |
112 |
- ewarn "${PN} will fail to listen on port 53" |
113 |
- ewarn "please do one the following:" |
114 |
- ewarn "1) re-enable 'filecaps'" |
115 |
- ewarn "2) change port to > 1024" |
116 |
- ewarn "3) configure to run ${PN} as root (not recommended)" |
117 |
- ewarn |
118 |
- fi |
119 |
- |
120 |
- if systemd_is_booted || has_version sys-apps/systemd; then |
121 |
- elog "Using systemd socket activation may cause issues with speed" |
122 |
- elog "latency and reliability of ${PN} and is discouraged by upstream" |
123 |
- elog "Existing installations advised to disable 'dnscrypt-proxy.socket'" |
124 |
- elog "It is disabled by default for new installations" |
125 |
- elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details" |
126 |
- elog |
127 |
- |
128 |
- fi |
129 |
- |
130 |
- elog "After starting the service you will need to update your" |
131 |
- elog "/etc/resolv.conf and replace your current set of resolvers" |
132 |
- elog "with:" |
133 |
- elog |
134 |
- elog "nameserver 127.0.0.1" |
135 |
- elog |
136 |
- elog "Also see https://github.com/DNSCrypt/${PN}/wiki" |
137 |
-} |
138 |
|
139 |
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild |
140 |
deleted file mode 100644 |
141 |
index 2f8f698a764a..000000000000 |
142 |
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.0.ebuild |
143 |
+++ /dev/null |
144 |
@@ -1,105 +0,0 @@ |
145 |
-# Copyright 1999-2021 Gentoo Authors |
146 |
-# Distributed under the terms of the GNU General Public License v2 |
147 |
- |
148 |
-EAPI=7 |
149 |
- |
150 |
-EGO_PN="github.com/DNSCrypt/${PN}" |
151 |
- |
152 |
-inherit fcaps go-module systemd |
153 |
- |
154 |
-if [[ ${PV} == 9999 ]]; then |
155 |
- inherit git-r3 |
156 |
- EGIT_REPO_URI="https://${EGO_PN}.git" |
157 |
-else |
158 |
- SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
159 |
- KEYWORDS="amd64 arm arm64 ppc64 x86" |
160 |
-fi |
161 |
- |
162 |
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" |
163 |
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" |
164 |
- |
165 |
-LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0" |
166 |
-SLOT="0" |
167 |
-IUSE="+pie" |
168 |
- |
169 |
-BDEPEND=">=dev-lang/go-1.13" |
170 |
-RDEPEND=" |
171 |
- acct-group/dnscrypt-proxy |
172 |
- acct-user/dnscrypt-proxy |
173 |
-" |
174 |
- |
175 |
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) |
176 |
- |
177 |
-PATCHES=( |
178 |
- "${FILESDIR}/${PN}-2.1.0-config-full-paths.patch" |
179 |
-) |
180 |
- |
181 |
-src_compile() { |
182 |
- pushd "${PN}" >/dev/null || die |
183 |
- go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die |
184 |
- popd >/dev/null || die |
185 |
-} |
186 |
- |
187 |
-src_test() { |
188 |
- cd "${PN}" || die |
189 |
- go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests" |
190 |
-} |
191 |
- |
192 |
-src_install() { |
193 |
- pushd "${PN}" >/dev/null || die |
194 |
- |
195 |
- dobin dnscrypt-proxy |
196 |
- |
197 |
- insinto /etc/dnscrypt-proxy |
198 |
- newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml |
199 |
- doins example-{allowed,blocked}-{ips.txt,names.txt} |
200 |
- doins example-{cloaking-rules.txt,forwarding-rules.txt} |
201 |
- |
202 |
- popd >/dev/null || die |
203 |
- |
204 |
- insinto /usr/share/dnscrypt-proxy |
205 |
- doins -r "utils/generate-domains-blocklist/." |
206 |
- |
207 |
- newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy |
208 |
- newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy |
209 |
- |
210 |
- systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service |
211 |
- systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket |
212 |
- |
213 |
- insinto /etc/logrotate.d |
214 |
- newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy |
215 |
- |
216 |
- einstalldocs |
217 |
-} |
218 |
- |
219 |
-pkg_postinst() { |
220 |
- fcaps_pkg_postinst |
221 |
- |
222 |
- if ! use filecaps; then |
223 |
- ewarn "'filecaps' USE flag is disabled" |
224 |
- ewarn "${PN} will fail to listen on port 53" |
225 |
- ewarn "please do one the following:" |
226 |
- ewarn "1) re-enable 'filecaps'" |
227 |
- ewarn "2) change port to > 1024" |
228 |
- ewarn "3) configure to run ${PN} as root (not recommended)" |
229 |
- ewarn |
230 |
- fi |
231 |
- |
232 |
- if systemd_is_booted || has_version sys-apps/systemd; then |
233 |
- elog "Using systemd socket activation may cause issues with speed" |
234 |
- elog "latency and reliability of ${PN} and is discouraged by upstream" |
235 |
- elog "Existing installations advised to disable 'dnscrypt-proxy.socket'" |
236 |
- elog "It is disabled by default for new installations" |
237 |
- elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details" |
238 |
- elog |
239 |
- |
240 |
- fi |
241 |
- |
242 |
- elog "After starting the service you will need to update your" |
243 |
- elog "/etc/resolv.conf and replace your current set of resolvers" |
244 |
- elog "with:" |
245 |
- elog |
246 |
- elog "nameserver 127.0.0.1" |
247 |
- elog |
248 |
- elog "Also see https://github.com/DNSCrypt/${PN}/wiki" |
249 |
-} |
250 |
|
251 |
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch |
252 |
deleted file mode 100644 |
253 |
index a871990deb9f..000000000000 |
254 |
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch |
255 |
+++ /dev/null |
256 |
@@ -1,101 +0,0 @@ |
257 |
---- a/dnscrypt-proxy/example-dnscrypt-proxy.toml |
258 |
-+++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml |
259 |
-@@ -157,7 +157,7 @@ keepalive = 30 |
260 |
- ## This file is different from other log files, and will not be |
261 |
- ## automatically rotated by the application. |
262 |
- |
263 |
--# log_file = 'dnscrypt-proxy.log' |
264 |
-+# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log' |
265 |
- |
266 |
- |
267 |
- ## When using a log file, only keep logs from the most recent launch. |
268 |
-@@ -438,7 +438,7 @@ cache_neg_max_ttl = 600 |
269 |
- ## Path to the query log file (absolute, or relative to the same directory as the config file) |
270 |
- ## Can be set to /dev/stdout in order to log to the standard output. |
271 |
- |
272 |
-- # file = 'query.log' |
273 |
-+ # file = '/var/log/dnscrypt-proxy/query.log' |
274 |
- |
275 |
- |
276 |
- ## Query log format (currently supported: tsv and ltsv) |
277 |
-@@ -464,7 +464,7 @@ cache_neg_max_ttl = 600 |
278 |
- |
279 |
- ## Path to the query log file (absolute, or relative to the same directory as the config file) |
280 |
- |
281 |
-- # file = 'nx.log' |
282 |
-+ # file = '/var/log/dnscrypt-proxy/nx.log' |
283 |
- |
284 |
- |
285 |
- ## Query log format (currently supported: tsv and ltsv) |
286 |
-@@ -499,7 +499,7 @@ cache_neg_max_ttl = 600 |
287 |
- |
288 |
- ## Optional path to a file logging blocked queries |
289 |
- |
290 |
-- # log_file = 'blocked-names.log' |
291 |
-+ # log_file = '/var/log/dnscrypt-proxy/blocked.log' |
292 |
- |
293 |
- |
294 |
- ## Optional log format: tsv or ltsv (default: tsv) |
295 |
-@@ -527,7 +527,7 @@ cache_neg_max_ttl = 600 |
296 |
- |
297 |
- ## Optional path to a file logging blocked queries |
298 |
- |
299 |
-- # log_file = 'blocked-ips.log' |
300 |
-+ # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log' |
301 |
- |
302 |
- |
303 |
- ## Optional log format: tsv or ltsv (default: tsv) |
304 |
-@@ -555,7 +555,7 @@ cache_neg_max_ttl = 600 |
305 |
- |
306 |
- ## Optional path to a file logging allowed queries |
307 |
- |
308 |
-- # log_file = 'allowed-names.log' |
309 |
-+ # log_file = '/var/log/dnscrypt-proxy/allowed-names.log' |
310 |
- |
311 |
- |
312 |
- ## Optional log format: tsv or ltsv (default: tsv) |
313 |
-@@ -583,7 +583,7 @@ cache_neg_max_ttl = 600 |
314 |
- |
315 |
- ## Optional path to a file logging allowed queries |
316 |
- |
317 |
-- # log_file = 'allowed-ips.log' |
318 |
-+ # log_file = '/var/log/dnscrypt-proxy/allowed-ips.log' |
319 |
- |
320 |
- ## Optional log format: tsv or ltsv (default: tsv) |
321 |
- |
322 |
-@@ -654,7 +654,7 @@ cache_neg_max_ttl = 600 |
323 |
- |
324 |
- [sources.'public-resolvers'] |
325 |
- urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://download.dnscrypt.net/resolvers-list/v3/public-resolvers.md'] |
326 |
-- cache_file = 'public-resolvers.md' |
327 |
-+ cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md' |
328 |
- minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' |
329 |
- refresh_delay = 72 |
330 |
- prefix = '' |
331 |
-@@ -663,7 +663,7 @@ cache_neg_max_ttl = 600 |
332 |
- |
333 |
- [sources.'relays'] |
334 |
- urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/relays.md'] |
335 |
-- cache_file = 'relays.md' |
336 |
-+ cache_file = '/var/cache/dnscrypt-proxy/relays.md' |
337 |
- minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' |
338 |
- refresh_delay = 72 |
339 |
- prefix = '' |
340 |
-@@ -673,7 +673,7 @@ cache_neg_max_ttl = 600 |
341 |
- # [sources.quad9-resolvers] |
342 |
- # urls = ['https://www.quad9.net/quad9-resolvers.md'] |
343 |
- # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN' |
344 |
-- # cache_file = 'quad9-resolvers.md' |
345 |
-+ # cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md' |
346 |
- # prefix = 'quad9-' |
347 |
- |
348 |
- ## Another example source, with resolvers censoring some websites not appropriate for children |
349 |
-@@ -681,7 +681,7 @@ cache_neg_max_ttl = 600 |
350 |
- |
351 |
- # [sources.'parental-control'] |
352 |
- # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://download.dnscrypt.net/resolvers-list/v3/parental-control.md'] |
353 |
-- # cache_file = 'parental-control.md' |
354 |
-+ # cache_file = '/var/cache/dnscrypt-proxy/parental-control.md' |
355 |
- # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' |
356 |
- |
357 |
- |