1 |
commit: dd2e21b35b50caece13fff09204c090ecf88aff9 |
2 |
Author: Sven Wegener <swegener <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 3 22:38:23 2017 +0000 |
4 |
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 3 22:38:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd2e21b3 |
7 |
|
8 |
net-dns/pdns: Cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
11 |
|
12 |
net-dns/pdns/Manifest | 1 - |
13 |
net-dns/pdns/files/CVE-2017-15091-4.0.4.patch | 30 ----- |
14 |
net-dns/pdns/pdns-4.0.4-r1.ebuild | 157 -------------------------- |
15 |
net-dns/pdns/pdns-4.0.4.ebuild | 153 ------------------------- |
16 |
4 files changed, 341 deletions(-) |
17 |
|
18 |
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest |
19 |
index 5f74be659aa..59f3e99cdf8 100644 |
20 |
--- a/net-dns/pdns/Manifest |
21 |
+++ b/net-dns/pdns/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST pdns-4.0.4.tar.bz2 1320327 BLAKE2B 5c11a0245408f8448b41ed4229718e6f7244e0c8f36b60b07c280f82c7dea0065cce93c3814b3a396666be8d3b012ad4eb646cf55f531d22ce325190e0fd6e22 SHA512 4ef4705cd990b03976775167c7c37850d45907e198549feda5f5701172e008e3f1f74a35a9bebdb24b63dec15ff63cb2cc9dfc8f92e4e1012e0539c5a88b845b |
24 |
DIST pdns-4.0.5.tar.bz2 1323468 BLAKE2B 7e10cc98177bfa4f81888e2598ab4f0ce83ee45e6349372c065940424a74015302da879536dea8346fe7b86f35c0524a5449489bdf71d1a091b7c6a82fac4b6f SHA512 4b0fa932c1d9caf35b988916447aa21c64ebe2a58bdd84417cf09321a21b264cf1057206dc6993a45a3b591eb1dfa49463710c06b6bdfaf6fb17ae6dec6086d9 |
25 |
DIST pdns-4.1.0.tar.bz2 1116905 BLAKE2B 91ec0f0cfa70966ff71dfb6302ed01355120ca1429d3c610c4abfb1b964cff78a6332700991bc259387e9095be03d3850da41750e93bb3ffe3db0e23562d156c SHA512 4b2b42f4893f8aac3cf07a6c8a3c999cb728a5907a710f1a5c9c8d08377ecb63e202e5eececbefc069c8f1d97a29b2aa607da7cf2bcc6335a72222418e409e77 |
26 |
|
27 |
diff --git a/net-dns/pdns/files/CVE-2017-15091-4.0.4.patch b/net-dns/pdns/files/CVE-2017-15091-4.0.4.patch |
28 |
deleted file mode 100644 |
29 |
index a9506af8ef9..00000000000 |
30 |
--- a/net-dns/pdns/files/CVE-2017-15091-4.0.4.patch |
31 |
+++ /dev/null |
32 |
@@ -1,30 +0,0 @@ |
33 |
-diff -ru pdns-4.0.4.orig/pdns/ws-auth.cc pdns-4.0.4/pdns/ws-auth.cc |
34 |
---- pdns-4.0.4.orig/pdns/ws-auth.cc 2017-06-22 22:07:25.000000000 +0200 |
35 |
-+++ pdns-4.0.4/pdns/ws-auth.cc 2017-11-02 18:07:20.986764858 +0100 |
36 |
-@@ -860,7 +860,7 @@ |
37 |
- static void apiServerZoneAxfrRetrieve(HttpRequest* req, HttpResponse* resp) { |
38 |
- DNSName zonename = apiZoneIdToName(req->parameters["id"]); |
39 |
- |
40 |
-- if(req->method != "PUT") |
41 |
-+ if(req->method != "PUT" || ::arg().mustDo("api-readonly")) |
42 |
- throw HttpMethodNotAllowedException(); |
43 |
- |
44 |
- UeberBackend B; |
45 |
-@@ -879,7 +879,7 @@ |
46 |
- static void apiServerZoneNotify(HttpRequest* req, HttpResponse* resp) { |
47 |
- DNSName zonename = apiZoneIdToName(req->parameters["id"]); |
48 |
- |
49 |
-- if(req->method != "PUT") |
50 |
-+ if(req->method != "PUT" || ::arg().mustDo("api-readonly")) |
51 |
- throw HttpMethodNotAllowedException(); |
52 |
- |
53 |
- UeberBackend B; |
54 |
-@@ -1191,7 +1191,7 @@ |
55 |
- } |
56 |
- |
57 |
- void apiServerCacheFlush(HttpRequest* req, HttpResponse* resp) { |
58 |
-- if(req->method != "PUT") |
59 |
-+ if(req->method != "PUT" || ::arg().mustDo("api-readonly")) |
60 |
- throw HttpMethodNotAllowedException(); |
61 |
- |
62 |
- DNSName canon = apiNameToDNSName(req->getvars["domain"]); |
63 |
|
64 |
diff --git a/net-dns/pdns/pdns-4.0.4-r1.ebuild b/net-dns/pdns/pdns-4.0.4-r1.ebuild |
65 |
deleted file mode 100644 |
66 |
index 9fa2350de53..00000000000 |
67 |
--- a/net-dns/pdns/pdns-4.0.4-r1.ebuild |
68 |
+++ /dev/null |
69 |
@@ -1,157 +0,0 @@ |
70 |
-# Copyright 1999-2017 Gentoo Foundation |
71 |
-# Distributed under the terms of the GNU General Public License v2 |
72 |
- |
73 |
-EAPI="6" |
74 |
- |
75 |
-inherit eutils multilib user toolchain-funcs versionator |
76 |
- |
77 |
-DESCRIPTION="The PowerDNS Daemon" |
78 |
-HOMEPAGE="https://www.powerdns.com/" |
79 |
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" |
80 |
- |
81 |
-LICENSE="GPL-2" |
82 |
-SLOT="0" |
83 |
-KEYWORDS="~amd64 ~x86" |
84 |
- |
85 |
-# other possible flags: |
86 |
-# db2: we lack the dep |
87 |
-# oracle: dito (need Oracle Client Libraries) |
88 |
-# xdb: (almost) dead, surely not supported |
89 |
- |
90 |
-IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test" |
91 |
- |
92 |
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )" |
93 |
- |
94 |
-RDEPEND=" |
95 |
- libressl? ( dev-libs/libressl:= ) |
96 |
- !libressl? ( dev-libs/openssl:= ) |
97 |
- >=dev-libs/boost-1.35:= |
98 |
- botan? ( =dev-libs/botan-1.10*[threads] ) |
99 |
- lua? ( dev-lang/lua:= ) |
100 |
- luajit? ( dev-lang/luajit:= ) |
101 |
- mysql? ( virtual/mysql ) |
102 |
- postgres? ( dev-db/postgresql:= ) |
103 |
- ldap? ( >=net-nds/openldap-2.0.27-r4 ) |
104 |
- sqlite? ( dev-db/sqlite:3 ) |
105 |
- opendbx? ( dev-db/opendbx ) |
106 |
- geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip ) |
107 |
- tinydns? ( >=dev-db/tinycdb-0.77 ) |
108 |
- protobuf? ( dev-libs/protobuf )" |
109 |
-DEPEND="${RDEPEND} |
110 |
- virtual/pkgconfig |
111 |
- doc? ( app-doc/doxygen )" |
112 |
- |
113 |
-S="${WORKDIR}"/${P/_/-} |
114 |
- |
115 |
-PATCHES=( |
116 |
- "${FILESDIR}"/CVE-2017-15091-4.0.4.patch |
117 |
-) |
118 |
- |
119 |
-src_configure() { |
120 |
- local dynmodules="pipe bind" # the default backends, always enabled |
121 |
- |
122 |
- #use db2 && dynmodules+=" db2" |
123 |
- use ldap && dynmodules+=" ldap" |
124 |
- use lua && dynmodules+=" lua" |
125 |
- use mydns && dynmodules+=" mydns" |
126 |
- use mysql && dynmodules+=" gmysql" |
127 |
- use opendbx && dynmodules+=" opendbx" |
128 |
- #use oracle && dynmodules+=" goracle oracle" |
129 |
- use postgres && dynmodules+=" gpgsql" |
130 |
- use remote && dynmodules+=" remote" |
131 |
- use sqlite && dynmodules+=" gsqlite3" |
132 |
- use tinydns && dynmodules+=" tinydns" |
133 |
- use geoip && dynmodules+=" geoip" |
134 |
- #use xdb && dynmodules+=" xdb" |
135 |
- |
136 |
- econf \ |
137 |
- --disable-static \ |
138 |
- --sysconfdir=/etc/powerdns \ |
139 |
- --libdir=/usr/$(get_libdir)/powerdns \ |
140 |
- --with-modules= \ |
141 |
- --with-dynmodules="${dynmodules}" \ |
142 |
- --with-pgsql-includes=/usr/include \ |
143 |
- --with-pgsql-lib=/usr/$(get_libdir) \ |
144 |
- --with-mysql-lib=/usr/$(get_libdir) \ |
145 |
- $(use_enable botan botan1.10) \ |
146 |
- $(use_enable debug verbose-logging) \ |
147 |
- $(use_enable test unit-tests) \ |
148 |
- $(use_enable tools) \ |
149 |
- $(use_enable systemd) \ |
150 |
- $(use_with lua) \ |
151 |
- $(use_with luajit) \ |
152 |
- $(use_with protobuf) \ |
153 |
- ${myconf} |
154 |
-} |
155 |
- |
156 |
-src_compile() { |
157 |
- default |
158 |
- use doc && emake -C codedocs codedocs |
159 |
-} |
160 |
- |
161 |
-src_install() { |
162 |
- default |
163 |
- |
164 |
- mv "${D}"/etc/powerdns/pdns.conf{-dist,} |
165 |
- |
166 |
- fperms 0700 /etc/powerdns |
167 |
- fperms 0600 /etc/powerdns/pdns.conf |
168 |
- |
169 |
- # set defaults: setuid=pdns, setgid=pdns |
170 |
- sed -i \ |
171 |
- -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \ |
172 |
- "${D}"/etc/powerdns/pdns.conf |
173 |
- |
174 |
- newinitd "${FILESDIR}"/pdns-r1 pdns |
175 |
- |
176 |
- keepdir /var/empty |
177 |
- |
178 |
- use doc && dohtml -r codedocs/html/. |
179 |
- |
180 |
- # Install development headers |
181 |
- insinto /usr/include/pdns |
182 |
- doins pdns/*.hh |
183 |
- insinto /usr/include/pdns/backends/gsql |
184 |
- doins pdns/backends/gsql/*.hh |
185 |
- |
186 |
- if use ldap ; then |
187 |
- insinto /etc/openldap/schema |
188 |
- doins "${FILESDIR}"/dnsdomain2.schema |
189 |
- fi |
190 |
- |
191 |
- prune_libtool_files --all |
192 |
-} |
193 |
- |
194 |
-pkg_preinst() { |
195 |
- enewgroup pdns |
196 |
- enewuser pdns -1 -1 /var/empty pdns |
197 |
-} |
198 |
- |
199 |
-pkg_postinst() { |
200 |
- elog "PowerDNS provides multiple instances support. You can create more instances" |
201 |
- elog "by symlinking the pdns init script to another name." |
202 |
- elog |
203 |
- elog "The name must be in the format pdns.<suffix> and PowerDNS will use the" |
204 |
- elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default." |
205 |
- |
206 |
- if use ldap ; then |
207 |
- ewarn "The official LDAP backend module is only compile-tested by upstream." |
208 |
- ewarn "Try net-dns/pdns-ldap-backend if you have problems with it." |
209 |
- fi |
210 |
- |
211 |
- local old |
212 |
- for old in ${REPLACING_VERSIONS}; do |
213 |
- version_compare ${old} 3.2 |
214 |
- [[ $? -eq 1 ]] || continue |
215 |
- |
216 |
- ewarn "To fix a security bug (bug #458018) had the following" |
217 |
- ewarn "files/directories the world-readable bit removed (if set):" |
218 |
- ewarn " ${EPREFIX}/etc/powerdns" |
219 |
- ewarn " ${EPREFIX}/etc/powerdns/pdns.conf" |
220 |
- ewarn "Check if this is correct for your setup" |
221 |
- ewarn "This is a one-time change and will not happen on subsequent updates." |
222 |
- chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf} |
223 |
- |
224 |
- break |
225 |
- done |
226 |
-} |
227 |
|
228 |
diff --git a/net-dns/pdns/pdns-4.0.4.ebuild b/net-dns/pdns/pdns-4.0.4.ebuild |
229 |
deleted file mode 100644 |
230 |
index 43c8063885e..00000000000 |
231 |
--- a/net-dns/pdns/pdns-4.0.4.ebuild |
232 |
+++ /dev/null |
233 |
@@ -1,153 +0,0 @@ |
234 |
-# Copyright 1999-2017 Gentoo Foundation |
235 |
-# Distributed under the terms of the GNU General Public License v2 |
236 |
- |
237 |
-EAPI="6" |
238 |
- |
239 |
-inherit eutils multilib user toolchain-funcs versionator |
240 |
- |
241 |
-DESCRIPTION="The PowerDNS Daemon" |
242 |
-HOMEPAGE="https://www.powerdns.com/" |
243 |
-SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" |
244 |
- |
245 |
-LICENSE="GPL-2" |
246 |
-SLOT="0" |
247 |
-KEYWORDS="amd64 x86" |
248 |
- |
249 |
-# other possible flags: |
250 |
-# db2: we lack the dep |
251 |
-# oracle: dito (need Oracle Client Libraries) |
252 |
-# xdb: (almost) dead, surely not supported |
253 |
- |
254 |
-IUSE="botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test" |
255 |
- |
256 |
-REQUIRED_USE="mydns? ( mysql ) ?? ( lua luajit )" |
257 |
- |
258 |
-RDEPEND=" |
259 |
- libressl? ( dev-libs/libressl:= ) |
260 |
- !libressl? ( dev-libs/openssl:= ) |
261 |
- >=dev-libs/boost-1.35:= |
262 |
- botan? ( =dev-libs/botan-1.10*[threads] ) |
263 |
- lua? ( dev-lang/lua:= ) |
264 |
- luajit? ( dev-lang/luajit:= ) |
265 |
- mysql? ( virtual/mysql ) |
266 |
- postgres? ( dev-db/postgresql:= ) |
267 |
- ldap? ( >=net-nds/openldap-2.0.27-r4 ) |
268 |
- sqlite? ( dev-db/sqlite:3 ) |
269 |
- opendbx? ( dev-db/opendbx ) |
270 |
- geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip ) |
271 |
- tinydns? ( >=dev-db/tinycdb-0.77 ) |
272 |
- protobuf? ( dev-libs/protobuf )" |
273 |
-DEPEND="${RDEPEND} |
274 |
- virtual/pkgconfig |
275 |
- doc? ( app-doc/doxygen )" |
276 |
- |
277 |
-S="${WORKDIR}"/${P/_/-} |
278 |
- |
279 |
-src_configure() { |
280 |
- local dynmodules="pipe bind" # the default backends, always enabled |
281 |
- |
282 |
- #use db2 && dynmodules+=" db2" |
283 |
- use ldap && dynmodules+=" ldap" |
284 |
- use lua && dynmodules+=" lua" |
285 |
- use mydns && dynmodules+=" mydns" |
286 |
- use mysql && dynmodules+=" gmysql" |
287 |
- use opendbx && dynmodules+=" opendbx" |
288 |
- #use oracle && dynmodules+=" goracle oracle" |
289 |
- use postgres && dynmodules+=" gpgsql" |
290 |
- use remote && dynmodules+=" remote" |
291 |
- use sqlite && dynmodules+=" gsqlite3" |
292 |
- use tinydns && dynmodules+=" tinydns" |
293 |
- use geoip && dynmodules+=" geoip" |
294 |
- #use xdb && dynmodules+=" xdb" |
295 |
- |
296 |
- econf \ |
297 |
- --disable-static \ |
298 |
- --sysconfdir=/etc/powerdns \ |
299 |
- --libdir=/usr/$(get_libdir)/powerdns \ |
300 |
- --with-modules= \ |
301 |
- --with-dynmodules="${dynmodules}" \ |
302 |
- --with-pgsql-includes=/usr/include \ |
303 |
- --with-pgsql-lib=/usr/$(get_libdir) \ |
304 |
- --with-mysql-lib=/usr/$(get_libdir) \ |
305 |
- $(use_enable botan botan1.10) \ |
306 |
- $(use_enable debug verbose-logging) \ |
307 |
- $(use_enable test unit-tests) \ |
308 |
- $(use_enable tools) \ |
309 |
- $(use_enable systemd) \ |
310 |
- $(use_with lua) \ |
311 |
- $(use_with luajit) \ |
312 |
- $(use_with protobuf) \ |
313 |
- ${myconf} |
314 |
-} |
315 |
- |
316 |
-src_compile() { |
317 |
- default |
318 |
- use doc && emake -C codedocs codedocs |
319 |
-} |
320 |
- |
321 |
-src_install() { |
322 |
- default |
323 |
- |
324 |
- mv "${D}"/etc/powerdns/pdns.conf{-dist,} |
325 |
- |
326 |
- fperms 0700 /etc/powerdns |
327 |
- fperms 0600 /etc/powerdns/pdns.conf |
328 |
- |
329 |
- # set defaults: setuid=pdns, setgid=pdns |
330 |
- sed -i \ |
331 |
- -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \ |
332 |
- "${D}"/etc/powerdns/pdns.conf |
333 |
- |
334 |
- newinitd "${FILESDIR}"/pdns-r1 pdns |
335 |
- |
336 |
- keepdir /var/empty |
337 |
- |
338 |
- use doc && dohtml -r codedocs/html/. |
339 |
- |
340 |
- # Install development headers |
341 |
- insinto /usr/include/pdns |
342 |
- doins pdns/*.hh |
343 |
- insinto /usr/include/pdns/backends/gsql |
344 |
- doins pdns/backends/gsql/*.hh |
345 |
- |
346 |
- if use ldap ; then |
347 |
- insinto /etc/openldap/schema |
348 |
- doins "${FILESDIR}"/dnsdomain2.schema |
349 |
- fi |
350 |
- |
351 |
- prune_libtool_files --all |
352 |
-} |
353 |
- |
354 |
-pkg_preinst() { |
355 |
- enewgroup pdns |
356 |
- enewuser pdns -1 -1 /var/empty pdns |
357 |
-} |
358 |
- |
359 |
-pkg_postinst() { |
360 |
- elog "PowerDNS provides multiple instances support. You can create more instances" |
361 |
- elog "by symlinking the pdns init script to another name." |
362 |
- elog |
363 |
- elog "The name must be in the format pdns.<suffix> and PowerDNS will use the" |
364 |
- elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default." |
365 |
- |
366 |
- if use ldap ; then |
367 |
- ewarn "The official LDAP backend module is only compile-tested by upstream." |
368 |
- ewarn "Try net-dns/pdns-ldap-backend if you have problems with it." |
369 |
- fi |
370 |
- |
371 |
- local old |
372 |
- for old in ${REPLACING_VERSIONS}; do |
373 |
- version_compare ${old} 3.2 |
374 |
- [[ $? -eq 1 ]] || continue |
375 |
- |
376 |
- ewarn "To fix a security bug (bug #458018) had the following" |
377 |
- ewarn "files/directories the world-readable bit removed (if set):" |
378 |
- ewarn " ${EPREFIX}/etc/powerdns" |
379 |
- ewarn " ${EPREFIX}/etc/powerdns/pdns.conf" |
380 |
- ewarn "Check if this is correct for your setup" |
381 |
- ewarn "This is a one-time change and will not happen on subsequent updates." |
382 |
- chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf} |
383 |
- |
384 |
- break |
385 |
- done |
386 |
-} |