Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/, net-dns/dnscrypt-proxy/
Date: Sun, 11 Feb 2018 21:21:28
Message-Id: 1518383612.4dee603320e14298cbf69488a2b8d1127c80b469.mgorny@gentoo
1 commit: 4dee603320e14298cbf69488a2b8d1127c80b469
2 Author: Georgy Yakovlev <ya <AT> sysdump <DOT> net>
3 AuthorDate: Sun Feb 11 06:46:45 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 11 21:13:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dee6033
7
8 net-dns/dnscrypt-proxy: drop old
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 net-dns/dnscrypt-proxy/Manifest | 1 -
13 .../dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild | 62 ----------------------
14 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd | 7 ---
15 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 47 ----------------
16 .../dnscrypt-proxy/files/dnscrypt-proxy.service | 20 -------
17 5 files changed, 137 deletions(-)
18
19 diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
20 index 659abf0ea05..ffe9265161e 100644
21 --- a/net-dns/dnscrypt-proxy/Manifest
22 +++ b/net-dns/dnscrypt-proxy/Manifest
23 @@ -1,2 +1 @@
24 -DIST dnscrypt-proxy-1.9.4.tar.gz 1660333 BLAKE2B 8b6fb85e8fb0784a4bc87f4d4b4af593cc78baa2e0f88e79183890cc62dcdc59755d31da76f4aa75807b6d4ef1491e81251307af01cab9e0d83699a255eb0379 SHA512 b19103dc39655f199c85ec69daab949d07adc12e64411d2323308afb398e6ac6563bbc17f2e317bfe1e6c95c810487d8d62da3f4c7f7257bdcf837cd0390bfb0
25 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
26
27 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild
28 deleted file mode 100644
29 index b8069db8ab6..00000000000
30 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild
31 +++ /dev/null
32 @@ -1,62 +0,0 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit systemd user
39 -
40 -DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
41 -HOMEPAGE="https://dnscrypt.org"
42 -SRC_URI="https://download.dnscrypt.org/${PN}/${P}.tar.gz"
43 -
44 -LICENSE="ISC"
45 -SLOT="0"
46 -KEYWORDS="~amd64 ~arm ~x86"
47 -IUSE="hardened libressl +plugins ssl systemd"
48 -
49 -RDEPEND="
50 - dev-libs/libsodium
51 - net-libs/ldns
52 - ssl? (
53 - !libressl? ( dev-libs/openssl:0= )
54 - libressl? ( dev-libs/libressl:0= )
55 - )
56 - systemd? ( sys-apps/systemd )"
57 -DEPEND="${RDEPEND}
58 - virtual/pkgconfig"
59 -
60 -DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
61 -
62 -pkg_setup() {
63 - enewgroup dnscrypt
64 - enewuser dnscrypt -1 -1 /var/empty dnscrypt
65 -}
66 -
67 -src_configure() {
68 - econf \
69 - $(use_enable hardened pie) \
70 - $(use_enable plugins) \
71 - $(use_enable ssl openssl) \
72 - $(use_with systemd)
73 -}
74 -
75 -src_install() {
76 - default
77 -
78 - newinitd "${FILESDIR}"/${PN}.initd ${PN}
79 - newconfd "${FILESDIR}"/${PN}.confd ${PN}
80 - systemd_dounit "${FILESDIR}"/${PN}.service
81 -}
82 -
83 -pkg_postinst() {
84 - elog "After starting the service you will need to update your"
85 - elog "/etc/resolv.conf and replace your current set of resolvers"
86 - elog "with:"
87 - elog
88 - elog "nameserver <DNSCRYPT_LOCALIP>"
89 - elog
90 - elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
91 - elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
92 - elog
93 - elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
94 -}
95
96 diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
97 deleted file mode 100644
98 index ceedd454b5f..00000000000
99 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
100 +++ /dev/null
101 @@ -1,7 +0,0 @@
102 -DNSCRYPT_LOCALIP=127.0.0.1
103 -DNSCRYPT_LOCALPORT=53
104 -DNSCRYPT_USER=dnscrypt
105 -DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.opendns.com
106 -DNSCRYPT_PROVIDER_KEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79
107 -DNSCRYPT_RESOLVERIP=208.67.220.220
108 -DNSCRYPT_RESOLVERPORT=443
109
110 diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
111 deleted file mode 100644
112 index 9b07d7d47d8..00000000000
113 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
114 +++ /dev/null
115 @@ -1,47 +0,0 @@
116 -#!/sbin/openrc-run
117 -# Copyright 1999-2014 Gentoo Foundation
118 -# Distributed under the terms of the GNU General Public License v2
119 -
120 -DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-/var/log/dnscrypt-proxy.log}
121 -
122 -rundir=${rundir:-/var/run/dnscrypt-proxy}
123 -pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
124 -rundir=${rundir:-/var/run/dnscrypt-proxy}
125 -runas_user=${runas_user:-dnscrypt}
126 -runas_group=${runas_user:-dnscrypt}
127 -
128 -depend() {
129 - use net
130 - before dns
131 - after logger
132 -}
133 -
134 -start() {
135 - if [ ! -d "${rundir}" ]; then
136 - mkdir "${rundir}"
137 - if [ -n "${runas_user}" ]; then
138 - touch "${DNSCRYPT_LOGFILE}"
139 - chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
140 - chown -R ${runas_user}:${runas_group} "${rundir}"
141 - fi
142 - fi
143 -
144 - ebegin "Starting dnscrypt-proxy"
145 - start-stop-daemon --start --quiet \
146 - --exec /usr/sbin/dnscrypt-proxy \
147 - -- \
148 - --pidfile="${pidfile}" \
149 - --logfile="${DNSCRYPT_LOGFILE}" \
150 - --daemonize --user=${runas_user} \
151 - --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
152 - --resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
153 - --provider-name=${DNSCRYPT_PROVIDER_NAME} \
154 - --provider-key=${DNSCRYPT_PROVIDER_KEY}
155 - eend $?
156 -}
157 -
158 -stop() {
159 - ebegin "Stopping dnscrypt-proxy"
160 - start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
161 - eend $?
162 -}
163
164 diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
165 deleted file mode 100644
166 index 4403254280a..00000000000
167 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
168 +++ /dev/null
169 @@ -1,20 +0,0 @@
170 -[Unit]
171 -Description=A tool for securing communications between a client and a DNS resolver
172 -
173 -[Service]
174 -Type=simple
175 -PIDFile=/var/run/dnscrypt-proxy.pid
176 -EnvironmentFile=/etc/conf.d/dnscrypt-proxy
177 -ExecStartPre=/bin/rm -f /var/run/dnscrypt-proxy.pid
178 -ExecStart=/usr/sbin/dnscrypt-proxy \
179 - --pidfile=/var/run/dnscrypt-proxy.pid \
180 - --logfile=/var/log/dnscrypt-proxy.log \
181 - --local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
182 - --resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
183 - --provider-name=${DNSCRYPT_PROVIDER_NAME} \
184 - --provider-key=${DNSCRYPT_PROVIDER_KEY} \
185 - --user=${DNSCRYPT_USER}
186 -Restart=on-abort
187 -
188 -[Install]
189 -WantedBy=multi-user.target