Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/
Date: Wed, 29 Apr 2020 10:16:05
Message-Id: 1588155343.94d50a6f90f50fae4e9b68dc1d57cb37587b75c0.juippis@gentoo
1 commit: 94d50a6f90f50fae4e9b68dc1d57cb37587b75c0
2 Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info>
3 AuthorDate: Wed Apr 29 01:26:11 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 29 10:15:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d50a6f
7
8 net-dns/dnscrypt-proxy: cleanup old
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 net-dns/dnscrypt-proxy/Manifest | 2 -
15 .../dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild | 101 ---------------------
16 .../dnscrypt-proxy/dnscrypt-proxy-2.0.39.ebuild | 99 --------------------
17 3 files changed, 202 deletions(-)
18
19 diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
20 index 054695abc37..9c319f51eda 100644
21 --- a/net-dns/dnscrypt-proxy/Manifest
22 +++ b/net-dns/dnscrypt-proxy/Manifest
23 @@ -1,4 +1,2 @@
24 -DIST dnscrypt-proxy-2.0.33.tar.gz 2723092 BLAKE2B 26ed819f264c1a536b2e47d9ffa412097eba5c9597ad2a5e7ff7a485ad660aeb882c5ce527bb072a5f7b5782387ce1b72cc74400973f9cebd66a50bd2308d830 SHA512 5c6eb655aa70457889253cbf630e7e37011a461a7f181f0a667694d53146ad9dee88bbbf80c7db3187bba0054af2a63b7b5be1a229800b2566a9758e9d047429
25 -DIST dnscrypt-proxy-2.0.39.tar.gz 2814424 BLAKE2B 59be804a9c9641dd43e6b49e95c58c7d20dfdc940f2279a47a9ced707d1bbe64b1864c65feab2cada6c12945567ffd93478bd0a8129d40ea65c0fef50e5e90e4 SHA512 d4eacd8d1989b99d9932d66ef609948558af26f9db1fc37acd6b5609e2a410d20828e32f2b79f2f9fbdf822998af641aec20128e4c58233663929106e29d8e24
26 DIST dnscrypt-proxy-2.0.41.tar.gz 2323421 BLAKE2B 572a0ad15df6c40d1738b296972584f5d8fe382ca3c0a05b4fc74e986e767a058227dda2127c843127bc0b90e8b7bbe17a5eaee42175f0b77e21160ac63f7a88 SHA512 26be163daa03633f2d76f1121fb1987e0155613bd84cbb2aad2ba0eedbd35ec0b393d1c1a0aaba47968b3a08bd0273ad929a164695ce35d2ebe05ce3b5f5dfd1
27 DIST dnscrypt-proxy-2.0.42.tar.gz 2324442 BLAKE2B 8444eca1fc2bfc6029c1848bbeb77697b9b9c228c1bd0d17ed357b73667524c7052b33410a92847743533c3712f749fd93dbac46a81da48dae367e2a515cad8c SHA512 093b07ee8eb44c1264e6ea4b60ad32e0221b1b02c1d61f142b1fbf37dc5181533cc3c5d6e7468d0f7488611de4620947684269da9f08f21da0aa501ba70be711
28
29 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
30 deleted file mode 100644
31 index 357e2fb1bc9..00000000000
32 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.33.ebuild
33 +++ /dev/null
34 @@ -1,101 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -EGO_PN="github.com/jedisct1/${PN}"
41 -
42 -inherit fcaps golang-build systemd
43 -
44 -if [[ ${PV} == 9999 ]]; then
45 - inherit git-r3
46 - EGIT_REPO_URI="https://${EGO_PN}.git"
47 -else
48 - SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
49 - KEYWORDS="amd64 ~arm ~ppc64 ~x86"
50 -fi
51 -
52 -DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
53 -HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
54 -
55 -LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
56 -SLOT="0"
57 -IUSE="pie"
58 -
59 -DEPEND=">=dev-lang/go-1.12"
60 -
61 -RDEPEND="
62 - acct-group/dnscrypt-proxy
63 - acct-user/dnscrypt-proxy
64 -"
65 -
66 -FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
67 -PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
68 -
69 -src_prepare() {
70 - default
71 - # Create directory structure suitable for building
72 - mkdir -p "src/${EGO_PN%/*}" || die
73 - # fixes $GOPATH/go.mod exists but should not
74 - rm go.mod || die
75 - mv "${PN}" "src/${EGO_PN}" || die
76 - mv "vendor" "src/${EGO_PN}" || die
77 -}
78 -
79 -src_configure() {
80 - EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
81 -}
82 -
83 -src_install() {
84 - dobin dnscrypt-proxy
85 -
86 - insinto /etc/dnscrypt-proxy
87 - newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
88 - doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
89 - doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
90 -
91 - insinto /usr/share/dnscrypt-proxy
92 - doins -r "utils/generate-domains-blacklists/."
93 -
94 - newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
95 - newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
96 - systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
97 - systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
98 -
99 - insinto /etc/logrotate.d
100 - newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
101 -
102 - einstalldocs
103 -}
104 -
105 -pkg_postinst() {
106 - fcaps_pkg_postinst
107 -
108 - if ! use filecaps; then
109 - ewarn "'filecaps' USE flag is disabled"
110 - ewarn "${PN} will fail to listen on port 53"
111 - ewarn "please do one the following:"
112 - ewarn "1) re-enable 'filecaps'"
113 - ewarn "2) change port to > 1024"
114 - ewarn "3) configure to run ${PN} as root (not recommended)"
115 - ewarn
116 - fi
117 -
118 - if systemd_is_booted || has_version sys-apps/systemd; then
119 - elog "Using systemd socket activation may cause issues with speed"
120 - elog "latency and reliability of ${PN} and is discouraged by upstream"
121 - elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
122 - elog "It is disabled by default for new installations"
123 - elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
124 - elog
125 -
126 - fi
127 -
128 - elog "After starting the service you will need to update your"
129 - elog "/etc/resolv.conf and replace your current set of resolvers"
130 - elog "with:"
131 - elog
132 - elog "nameserver 127.0.0.1"
133 - elog
134 - elog "Also see https://github.com/jedisct1/${PN}/wiki"
135 -}
136
137 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.39.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.39.ebuild
138 deleted file mode 100644
139 index 99b2bf98d0e..00000000000
140 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.39.ebuild
141 +++ /dev/null
142 @@ -1,99 +0,0 @@
143 -# Copyright 1999-2020 Gentoo Authors
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI=7
147 -
148 -EGO_PN="github.com/jedisct1/${PN}"
149 -
150 -inherit fcaps go-module systemd
151 -
152 -if [[ ${PV} == 9999 ]]; then
153 - inherit git-r3
154 - EGIT_REPO_URI="https://${EGO_PN}.git"
155 -else
156 - SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
157 - KEYWORDS="amd64 ~arm ~ppc64 ~x86"
158 -fi
159 -
160 -DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
161 -HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
162 -
163 -LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
164 -SLOT="0"
165 -IUSE="pie"
166 -
167 -BDEPEND=">=dev-lang/go-1.13"
168 -
169 -RDEPEND="
170 - acct-group/dnscrypt-proxy
171 - acct-user/dnscrypt-proxy
172 -"
173 -
174 -FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
175 -PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
176 -
177 -src_compile() {
178 - pushd "${PN}" >/dev/null || die
179 - go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
180 - popd >/dev/null || die
181 -}
182 -
183 -src_install() {
184 - pushd "${PN}" >/dev/null || die
185 -
186 - dobin dnscrypt-proxy
187 -
188 - insinto /etc/dnscrypt-proxy
189 - newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
190 - doins example-{blacklist.txt,whitelist.txt}
191 - doins example-{cloaking-rules.txt,forwarding-rules.txt}
192 -
193 - popd >/dev/null || die
194 -
195 - insinto /usr/share/dnscrypt-proxy
196 - doins -r "utils/generate-domains-blacklists/."
197 -
198 - newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
199 - newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
200 -
201 - systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
202 - systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
203 -
204 - insinto /etc/logrotate.d
205 - newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
206 -
207 - einstalldocs
208 -}
209 -
210 -pkg_postinst() {
211 - fcaps_pkg_postinst
212 - go-module_pkg_postinst
213 -
214 - if ! use filecaps; then
215 - ewarn "'filecaps' USE flag is disabled"
216 - ewarn "${PN} will fail to listen on port 53"
217 - ewarn "please do one the following:"
218 - ewarn "1) re-enable 'filecaps'"
219 - ewarn "2) change port to > 1024"
220 - ewarn "3) configure to run ${PN} as root (not recommended)"
221 - ewarn
222 - fi
223 -
224 - if systemd_is_booted || has_version sys-apps/systemd; then
225 - elog "Using systemd socket activation may cause issues with speed"
226 - elog "latency and reliability of ${PN} and is discouraged by upstream"
227 - elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
228 - elog "It is disabled by default for new installations"
229 - elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
230 - elog
231 -
232 - fi
233 -
234 - elog "After starting the service you will need to update your"
235 - elog "/etc/resolv.conf and replace your current set of resolvers"
236 - elog "with:"
237 - elog
238 - elog "nameserver 127.0.0.1"
239 - elog
240 - elog "Also see https://github.com/jedisct1/${PN}/wiki"
241 -}