1 |
commit: 3302f5bab7454f7dffde6902c97d5031d92d61e3 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 3 02:40:01 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 3 02:40:01 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3302f5ba |
7 |
|
8 |
net-dns/dnscrypt-proxy: add 2.1.2 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-dns/dnscrypt-proxy/Manifest | 1 + |
13 |
...oxy-9999.ebuild => dnscrypt-proxy-2.1.2.ebuild} | 21 +++-- |
14 |
net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild | 21 +++-- |
15 |
.../dnscrypt-proxy-2.1.2-config-full-paths.patch | 92 ++++++++++++++++++++++ |
16 |
4 files changed, 111 insertions(+), 24 deletions(-) |
17 |
|
18 |
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest |
19 |
index d719871447cd..076d965057a9 100644 |
20 |
--- a/net-dns/dnscrypt-proxy/Manifest |
21 |
+++ b/net-dns/dnscrypt-proxy/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
DIST dnscrypt-proxy-2.1.1.tar.gz 6114345 BLAKE2B 9d68d94d1fc142d53ed74840080feca56d7abf606b8df9b2ebea7a69b75f13cdc93be53418e6101d30d31d6f4130b3794c1029a5972e129a4c06feeff7dd81e7 SHA512 1118d79aad8d3e3629616c203194a5346f00fcfe88783ebddc6f167d22a82006f26022e728c57905aa82997b87b77f0841f7c1b60e0f8e5335f9df142b759c21 |
24 |
+DIST dnscrypt-proxy-2.1.2.tar.gz 6792121 BLAKE2B f6e69e9b7bba5bcaf49f710c78fc1b9607a8e791ad222da7af2a129de4807ecf87ddb7289aa79132a0d5ada588d2557beff618a79a341d168674bda7c8ba58ee SHA512 1b3598d60abc70141127aaaab5bf8bfaa76239d33e4220664dadd47f09544553e06eba6d82e5daf2c44c6da9c3c21c53683c2ff33db63257b782ad48c534bd54 |
25 |
|
26 |
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.2.ebuild |
27 |
similarity index 88% |
28 |
copy from net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild |
29 |
copy to net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.2.ebuild |
30 |
index 3e4c51ce549e..f80bcb78727b 100644 |
31 |
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild |
32 |
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.2.ebuild |
33 |
@@ -1,28 +1,25 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
+# Copyright 1999-2022 Gentoo Authors |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
-EAPI=7 |
39 |
- |
40 |
-EGO_PN="github.com/DNSCrypt/${PN}" |
41 |
+EAPI=8 |
42 |
|
43 |
inherit fcaps go-module systemd |
44 |
|
45 |
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" |
46 |
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" |
47 |
+ |
48 |
if [[ ${PV} == 9999 ]]; then |
49 |
+ EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git" |
50 |
inherit git-r3 |
51 |
- EGIT_REPO_URI="https://${EGO_PN}.git" |
52 |
else |
53 |
- SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
54 |
+ SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" |
55 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
56 |
fi |
57 |
|
58 |
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" |
59 |
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" |
60 |
- |
61 |
LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0" |
62 |
SLOT="0" |
63 |
IUSE="+pie" |
64 |
|
65 |
-BDEPEND=">=dev-lang/go-1.13" |
66 |
RDEPEND=" |
67 |
acct-group/dnscrypt-proxy |
68 |
acct-user/dnscrypt-proxy |
69 |
@@ -31,7 +28,7 @@ RDEPEND=" |
70 |
FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) |
71 |
|
72 |
PATCHES=( |
73 |
- "${FILESDIR}/${PN}-2.1.0-config-full-paths.patch" |
74 |
+ "${FILESDIR}"/${PN}-2.1.2-config-full-paths.patch |
75 |
) |
76 |
|
77 |
src_compile() { |
78 |
@@ -96,7 +93,7 @@ pkg_postinst() { |
79 |
fi |
80 |
|
81 |
elog "After starting the service you will need to update your" |
82 |
- elog "/etc/resolv.conf and replace your current set of resolvers" |
83 |
+ elog "${EROOT}/etc/resolv.conf and replace your current set of resolvers" |
84 |
elog "with:" |
85 |
elog |
86 |
elog "nameserver 127.0.0.1" |
87 |
|
88 |
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild |
89 |
index 3e4c51ce549e..f80bcb78727b 100644 |
90 |
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild |
91 |
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild |
92 |
@@ -1,28 +1,25 @@ |
93 |
-# Copyright 1999-2021 Gentoo Authors |
94 |
+# Copyright 1999-2022 Gentoo Authors |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
|
97 |
-EAPI=7 |
98 |
- |
99 |
-EGO_PN="github.com/DNSCrypt/${PN}" |
100 |
+EAPI=8 |
101 |
|
102 |
inherit fcaps go-module systemd |
103 |
|
104 |
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" |
105 |
+HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" |
106 |
+ |
107 |
if [[ ${PV} == 9999 ]]; then |
108 |
+ EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git" |
109 |
inherit git-r3 |
110 |
- EGIT_REPO_URI="https://${EGO_PN}.git" |
111 |
else |
112 |
- SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
113 |
+ SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" |
114 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
115 |
fi |
116 |
|
117 |
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" |
118 |
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" |
119 |
- |
120 |
LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0" |
121 |
SLOT="0" |
122 |
IUSE="+pie" |
123 |
|
124 |
-BDEPEND=">=dev-lang/go-1.13" |
125 |
RDEPEND=" |
126 |
acct-group/dnscrypt-proxy |
127 |
acct-user/dnscrypt-proxy |
128 |
@@ -31,7 +28,7 @@ RDEPEND=" |
129 |
FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) |
130 |
|
131 |
PATCHES=( |
132 |
- "${FILESDIR}/${PN}-2.1.0-config-full-paths.patch" |
133 |
+ "${FILESDIR}"/${PN}-2.1.2-config-full-paths.patch |
134 |
) |
135 |
|
136 |
src_compile() { |
137 |
@@ -96,7 +93,7 @@ pkg_postinst() { |
138 |
fi |
139 |
|
140 |
elog "After starting the service you will need to update your" |
141 |
- elog "/etc/resolv.conf and replace your current set of resolvers" |
142 |
+ elog "${EROOT}/etc/resolv.conf and replace your current set of resolvers" |
143 |
elog "with:" |
144 |
elog |
145 |
elog "nameserver 127.0.0.1" |
146 |
|
147 |
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.2-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.2-config-full-paths.patch |
148 |
new file mode 100644 |
149 |
index 000000000000..c5d7ed53f5f5 |
150 |
--- /dev/null |
151 |
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.2-config-full-paths.patch |
152 |
@@ -0,0 +1,92 @@ |
153 |
+--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml |
154 |
++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml |
155 |
+@@ -348,7 +348,7 @@ reject_ttl = 10 |
156 |
+ |
157 |
+ ## See the `example-forwarding-rules.txt` file for an example |
158 |
+ |
159 |
+-# forwarding_rules = 'forwarding-rules.txt' |
160 |
++# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt' |
161 |
+ |
162 |
+ |
163 |
+ |
164 |
+@@ -364,7 +364,7 @@ reject_ttl = 10 |
165 |
+ ## |
166 |
+ ## See the `example-cloaking-rules.txt` file for an example |
167 |
+ |
168 |
+-# cloaking_rules = 'cloaking-rules.txt' |
169 |
++# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt' |
170 |
+ |
171 |
+ ## TTL used when serving entries in cloaking-rules.txt |
172 |
+ |
173 |
+@@ -418,7 +418,7 @@ cache_neg_max_ttl = 600 |
174 |
+ ## check for connectivity and captive portals, along with hard-coded |
175 |
+ ## IP addresses to return. |
176 |
+ |
177 |
+-# map_file = 'example-captive-portals.txt' |
178 |
++# map_file = '/etc/dnscrypt-proxy/example-captive-portals.txt' |
179 |
+ |
180 |
+ |
181 |
+ |
182 |
+@@ -448,8 +448,8 @@ cache_neg_max_ttl = 600 |
183 |
+ ## Certificate file and key - Note that the certificate has to be trusted. |
184 |
+ ## See the documentation (wiki) for more information. |
185 |
+ |
186 |
+-# cert_file = 'localhost.pem' |
187 |
+-# cert_key_file = 'localhost.pem' |
188 |
++# cert_file = '/etc/dnscrypt-proxy/localhost.pem' |
189 |
++# cert_key_file = '/etc/dnscrypt-proxy/localhost.pem' |
190 |
+ |
191 |
+ |
192 |
+ |
193 |
+@@ -680,7 +680,7 @@ format = 'tsv' |
194 |
+ |
195 |
+ [sources.public-resolvers] |
196 |
+ 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'] |
197 |
+- cache_file = 'public-resolvers.md' |
198 |
++ cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md' |
199 |
+ minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' |
200 |
+ refresh_delay = 72 |
201 |
+ prefix = '' |
202 |
+@@ -689,7 +689,7 @@ format = 'tsv' |
203 |
+ |
204 |
+ [sources.relays] |
205 |
+ 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'] |
206 |
+- cache_file = 'relays.md' |
207 |
++ cache_file = '/var/cache/dnscrypt-proxy/relays.md' |
208 |
+ minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' |
209 |
+ refresh_delay = 72 |
210 |
+ prefix = '' |
211 |
+@@ -698,13 +698,13 @@ format = 'tsv' |
212 |
+ |
213 |
+ # [sources.odoh-servers] |
214 |
+ # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-servers.md'] |
215 |
+- # cache_file = 'odoh-servers.md' |
216 |
++ # cache_file = '/var/cache/dnscrypt-proxy/odoh-servers.md' |
217 |
+ # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' |
218 |
+ # refresh_delay = 24 |
219 |
+ # prefix = '' |
220 |
+ # [sources.odoh-relays] |
221 |
+ # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-relays.md'] |
222 |
+- # cache_file = 'odoh-relays.md' |
223 |
++ # cache_file = '/var/cache/dnscrypt-proxy/odoh-relays.md' |
224 |
+ # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' |
225 |
+ # refresh_delay = 24 |
226 |
+ # prefix = '' |
227 |
+@@ -714,7 +714,7 @@ format = 'tsv' |
228 |
+ # [sources.quad9-resolvers] |
229 |
+ # urls = ['https://www.quad9.net/quad9-resolvers.md'] |
230 |
+ # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN' |
231 |
+- # cache_file = 'quad9-resolvers.md' |
232 |
++ # cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md' |
233 |
+ # prefix = 'quad9-' |
234 |
+ |
235 |
+ ### Another example source, with resolvers censoring some websites not appropriate for children |
236 |
+@@ -722,7 +722,7 @@ format = 'tsv' |
237 |
+ |
238 |
+ # [sources.parental-control] |
239 |
+ # 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'] |
240 |
+- # cache_file = 'parental-control.md' |
241 |
++ # cache_file = '/var/cache/dnscrypt-proxy/parental-control.md' |
242 |
+ # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' |
243 |
+ |
244 |
+ |