Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/
Date: Wed, 04 Jan 2017 16:05:33
Message-Id: 1483545890.90c5f36896f7e820d8f08b0f32fdc5bed76f5a24.mjo@gentoo
1 commit: 90c5f36896f7e820d8f08b0f32fdc5bed76f5a24
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 4 16:04:28 2017 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 4 16:04:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c5f368
7
8 net-dns/djbdns: remove two unused revisions.
9
10 Package-Manager: portage-2.3.0
11
12 net-dns/djbdns/Manifest | 1 -
13 net-dns/djbdns/djbdns-1.05-r29.ebuild | 146 --------------------------------
14 net-dns/djbdns/djbdns-1.05-r31.ebuild | 152 ----------------------------------
15 3 files changed, 299 deletions(-)
16
17 diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
18 index 91dd57c..3b69a67 100644
19 --- a/net-dns/djbdns/Manifest
20 +++ b/net-dns/djbdns/Manifest
21 @@ -1,4 +1,3 @@
22 DIST djbdns-1.05-man.tar.gz 17170 SHA256 ba1c58f14bc928908d8618230f400d73cfe2200ed800a272b63048e3e50be569 SHA512 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183 WHIRLPOOL b611e37e7422a4ae405fa15a4b9ff7eb8d0007d81310d044bc1982fe70dada1e4646cf22832e8e5320bae8d2e328eb87d59eb51c3d390f1089f30548053b839b
23 -DIST djbdns-1.05-test25.diff.bz2 20376 SHA256 28c88de08822894cf252e54ed3be9abfdf4f492644ff74a7c479340bdce051ea SHA512 41cca597dba971010b9844071e0349d3a4b25cc4b144e12721b0bc8250589fb374e40ece8908f1081762597048179b1177e88b9a5f97be0b47b63e3183e654bb WHIRLPOOL d531001511ead02f51558909b13e14734f013213e0f13ec7589876878928bd4057f917e004e8d37955c2965aeba5d92a9fc481f2f9ac48c08edaeb9bb9b821d9
24 DIST djbdns-1.05-test27.diff.bz2 20695 SHA256 0de38133336016d5a9159d0fe1beaea809e2229820256af114cbf911f04f202a SHA512 e5acf26ff353ae20b6c2186140255bf0ae478a75a9946163d4474a003afbf8c2f47e61a12fc3ed4b9eff17ec8732e9d91bfbb10fb2762310b067180b6d471ba0 WHIRLPOOL 5c89691836a349553531816a8b4c5b6edc18c2c0a1cf8309b67344ad04c9575fbc5f9d79dcf156aeb692ccd7a6fbd2ce2838fb2fd7b85bd6cd0693a9f657e66e
25 DIST djbdns-1.05.tar.gz 85648 SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48 SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9 WHIRLPOOL 0fb67d19fcbf1cf21debcedfd3456d9cb9160079631ae1995e94aa9db3969ae02927f215ee8a5f03b34a6523cb9e3abebabf23e08e95eb1efdb626eb8b10312f
26
27 diff --git a/net-dns/djbdns/djbdns-1.05-r29.ebuild b/net-dns/djbdns/djbdns-1.05-r29.ebuild
28 deleted file mode 100644
29 index 14e4a29..00000000
30 --- a/net-dns/djbdns/djbdns-1.05-r29.ebuild
31 +++ /dev/null
32 @@ -1,146 +0,0 @@
33 -# Copyright 1999-2014 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI=5
38 -inherit eutils flag-o-matic readme.gentoo toolchain-funcs user
39 -
40 -DESCRIPTION="Collection of DNS client/server software"
41 -HOMEPAGE="http://cr.yp.to/djbdns.html"
42 -IPV6_PATCH="test25"
43 -
44 -SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
45 - http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
46 - ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
47 -
48 -SLOT="0"
49 -LICENSE="public-domain"
50 -KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
51 -IUSE="ipv6 selinux"
52 -
53 -DEPEND="!app-doc/djbdns-man"
54 -RDEPEND="${DEPEND}
55 - sys-apps/ucspi-tcp
56 - virtual/daemontools
57 - selinux? ( sec-policy/selinux-djbdns )"
58 -
59 -src_prepare() {
60 - epatch \
61 - "${FILESDIR}/headtail.patch" \
62 - "${FILESDIR}/dnsroots.patch" \
63 - "${FILESDIR}/dnstracesort.patch" \
64 - "${FILESDIR}/string_length_255.patch"
65 -
66 - # Fix CVE2009-0858
67 - epatch "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
68 -
69 - if use ipv6; then
70 - elog 'At present dnstrace does NOT support IPv6. It will'\
71 - 'be compiled without IPv6 support.'
72 -
73 - # Create a separate copy of the source tree for dnstrace.
74 - cp -pR "${S}" "${S}-noipv6" || die
75 -
76 - # The big ipv6 patch.
77 - epatch "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
78 -
79 - # Fix CVE2008-4392 (ipv6)
80 - epatch \
81 - "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-${IPV6_PATCH}.patch" \
82 - "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
83 - "${FILESDIR}/makefile-parallel-${IPV6_PATCH}.patch"
84 -
85 - cd "${S}-noipv6" || die
86 - fi
87 -
88 - # Fix CVE2008-4392 (no ipv6)
89 - epatch \
90 - "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch" \
91 - "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
92 -
93 - # Later versions of the ipv6 patch include this, but even if
94 - # USE=ipv6, we're in the ${S}-noipv6 directory at this point.
95 - epatch "${FILESDIR}/${PV}-errno.patch"
96 -
97 - epatch_user
98 -}
99 -
100 -src_compile() {
101 - echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
102 - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
103 - echo "/usr" > conf-home || die
104 - emake
105 -
106 - # If djbdns is compiled with IPv6 support, it breaks dnstrace.
107 - # Therefore we must compile dnstrace separately without IPv6
108 - # support.
109 - if use ipv6; then
110 - elog 'Compiling dnstrace without ipv6 support'
111 - cp conf-cc conf-ld conf-home "${S}-noipv6/" || die
112 - cd "${S}-noipv6" || die
113 - emake dnstrace
114 - fi
115 -}
116 -
117 -src_install() {
118 - insinto /etc
119 - doins dnsroots.global
120 -
121 - into /usr
122 - dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
123 - *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
124 - dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
125 -
126 - if use ipv6; then
127 - dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
128 - fi
129 -
130 - dodoc CHANGES README
131 -
132 - cd "${WORKDIR}/${PN}-man" || die
133 - doman *.1 *.5 *.8
134 -
135 - readme.gentoo_create_doc
136 -}
137 -
138 -pkg_preinst() {
139 - # The nofiles group is no longer provided by baselayout.
140 - # Share it with qmail if possible.
141 - enewgroup nofiles 200
142 -
143 - enewuser dnscache -1 -1 -1 nofiles
144 - enewuser dnslog -1 -1 -1 nofiles
145 - enewuser tinydns -1 -1 -1 nofiles
146 -}
147 -
148 -DISABLE_AUTOFORMATTING=1
149 -FORCE_PRINT_ELOG=1 # remove after this message sees the stable tree
150 -DOC_CONTENTS='
151 -The dnscache-setup, tinydns-setup, and djbdns-setup programs have
152 -been removed to follow upstream more closely. To configure djbdns,
153 -please follow the instructions at,
154 -
155 - http://cr.yp.to/djbdns.html
156 -
157 -Of particular interest are,
158 -
159 - axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html
160 - dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html
161 - tinydns : http://cr.yp.to/djbdns/run-server.html
162 -
163 -Portage has created users for axfrdns, dnscache, and tinydns; the
164 -commands to configure these programs are,
165 -
166 - 1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip
167 - 2. dnscache-conf dnscache dnslog /var/dnscache $ip
168 - 3. tinydns-conf tinydns dnslog /var/tinydns $ip
169 -
170 -(replace $ip with the ip address on which the server will run).
171 -
172 -If you wish to configure rbldns or walldns, you will need to create
173 -those users yourself (although you should still use the "dnslog"
174 -user for the logs):
175 -
176 - 4. rbldns-conf $username dnslog /var/rbldns $ip $base
177 - 5. walldns-conf $username dnslog /var/walldns $ip
178 -'
179
180 diff --git a/net-dns/djbdns/djbdns-1.05-r31.ebuild b/net-dns/djbdns/djbdns-1.05-r31.ebuild
181 deleted file mode 100644
182 index 83d3925..00000000
183 --- a/net-dns/djbdns/djbdns-1.05-r31.ebuild
184 +++ /dev/null
185 @@ -1,152 +0,0 @@
186 -# Copyright 1999-2016 Gentoo Foundation
187 -# Distributed under the terms of the GNU General Public License v2
188 -# $Id$
189 -
190 -EAPI=6
191 -inherit flag-o-matic readme.gentoo-r1 toolchain-funcs user
192 -
193 -DESCRIPTION="Collection of DNS client/server software"
194 -HOMEPAGE="http://cr.yp.to/djbdns.html"
195 -IPV6_PATCH="test27"
196 -
197 -SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
198 - http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
199 - ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
200 -
201 -SLOT="0"
202 -LICENSE="public-domain"
203 -KEYWORDS="alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
204 -IUSE="ipv6 selinux"
205 -
206 -DEPEND=""
207 -RDEPEND="sys-apps/ucspi-tcp
208 - virtual/daemontools
209 - selinux? ( sec-policy/selinux-djbdns )"
210 -
211 -src_unpack(){
212 - # Unpack both djbdns and its man pages to separate directories.
213 - default
214 -
215 - # Now move the man pages under ${S} so that user patches can be
216 - # applied to them as well in src_prepare().
217 - mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
218 -}
219 -
220 -src_prepare() {
221 - eapply \
222 - "${FILESDIR}/headtail-r1.patch" \
223 - "${FILESDIR}/dnsroots.patch" \
224 - "${FILESDIR}/dnstracesort.patch" \
225 - "${FILESDIR}/string_length_255.patch" \
226 - "${FILESDIR}/srv_record_support.patch" \
227 - "${FILESDIR}/increase-cname-recustion-depth.patch"
228 -
229 - # Fix CVE2009-0858
230 - eapply "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
231 -
232 - if use ipv6; then
233 - elog 'At present dnstrace does NOT support IPv6. It will'\
234 - 'be compiled without IPv6 support.'
235 -
236 - # Create a separate copy of the source tree for dnstrace.
237 - cp -pR "${S}" "${S}-noipv6" || die
238 -
239 - # The big ipv6 patch.
240 - eapply "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
241 -
242 - # Fix CVE2008-4392 (ipv6)
243 - eapply \
244 - "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch" \
245 - "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
246 - "${FILESDIR}/makefile-parallel-test25.patch"
247 -
248 - cd "${S}-noipv6" || die
249 - fi
250 -
251 - # Fix CVE2008-4392 (no ipv6)
252 - eapply \
253 - "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch" \
254 - "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
255 -
256 - # Later versions of the ipv6 patch include this, but even if
257 - # USE=ipv6, we're in the ${S}-noipv6 directory at this point.
258 - eapply "${FILESDIR}/${PV}-errno-r1.patch"
259 -
260 - eapply_user
261 -}
262 -
263 -src_compile() {
264 - echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
265 - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
266 - echo "/usr" > conf-home || die
267 - emake
268 -
269 - # If djbdns is compiled with IPv6 support, it breaks dnstrace.
270 - # Therefore we must compile dnstrace separately without IPv6
271 - # support.
272 - if use ipv6; then
273 - elog 'Compiling dnstrace without ipv6 support'
274 - cp conf-cc conf-ld conf-home "${S}-noipv6/" || die
275 - cd "${S}-noipv6" || die
276 - emake dnstrace
277 - fi
278 -}
279 -
280 -src_install() {
281 - insinto /etc
282 - doins dnsroots.global
283 -
284 - into /usr
285 - dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
286 - *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
287 - dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
288 -
289 - if use ipv6; then
290 - dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
291 - fi
292 -
293 - dodoc CHANGES README
294 -
295 - doman man/*.[158]
296 -
297 - readme.gentoo_create_doc
298 -}
299 -
300 -pkg_preinst() {
301 - # The nofiles group is no longer provided by baselayout.
302 - # Share it with qmail if possible.
303 - enewgroup nofiles 200
304 -
305 - enewuser dnscache -1 -1 -1 nofiles
306 - enewuser dnslog -1 -1 -1 nofiles
307 - enewuser tinydns -1 -1 -1 nofiles
308 -}
309 -
310 -DISABLE_AUTOFORMATTING=1
311 -DOC_CONTENTS='
312 -To configure djbdns, please follow the instructions at,
313 -
314 - http://cr.yp.to/djbdns.html
315 -
316 -Of particular interest are,
317 -
318 - axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html
319 - dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html
320 - tinydns : http://cr.yp.to/djbdns/run-server.html
321 -
322 -Portage has created users for axfrdns, dnscache, and tinydns; the
323 -commands to configure these programs are,
324 -
325 - 1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip
326 - 2. dnscache-conf dnscache dnslog /var/dnscache $ip
327 - 3. tinydns-conf tinydns dnslog /var/tinydns $ip
328 -
329 -(replace $ip with the ip address on which the server will run).
330 -
331 -If you wish to configure rbldns or walldns, you will need to create
332 -those users yourself (although you should still use the "dnslog"
333 -user for the logs):
334 -
335 - 4. rbldns-conf $username dnslog /var/rbldns $ip $base
336 - 5. walldns-conf $username dnslog /var/walldns $ip
337 -'