1 |
commit: 47033ea393993395b38465b0054d7e85e45ca04a |
2 |
Author: John Helmert III <ajak <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 31 01:47:14 2022 +0000 |
4 |
Commit: John Helmert III <ajak <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 31 01:47:35 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47033ea3 |
7 |
|
8 |
net-dns/bind-tools: cleanup alongside bind cleanup |
9 |
|
10 |
Signed-off-by: John Helmert III <ajak <AT> gentoo.org> |
11 |
|
12 |
net-dns/bind-tools/Manifest | 5 - |
13 |
net-dns/bind-tools/bind-tools-9.16.27.ebuild | 152 -------------------- |
14 |
net-dns/bind-tools/bind-tools-9.16.29-r1.ebuild | 156 -------------------- |
15 |
net-dns/bind-tools/bind-tools-9.16.30.ebuild | 156 -------------------- |
16 |
net-dns/bind-tools/bind-tools-9.16.31.ebuild | 157 --------------------- |
17 |
net-dns/bind-tools/bind-tools-9.16.32.ebuild | 157 --------------------- |
18 |
.../bind-tools-9.16.29-fortify-source-3.patch | 35 ----- |
19 |
7 files changed, 818 deletions(-) |
20 |
|
21 |
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest |
22 |
index e3e798fba869..d1b69114006f 100644 |
23 |
--- a/net-dns/bind-tools/Manifest |
24 |
+++ b/net-dns/bind-tools/Manifest |
25 |
@@ -1,6 +1 @@ |
26 |
-DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf SHA512 5c71f228db83aa8cc9e65466d6e5afca4a9f80c693358111a003fe09e1a14522175eb2b6a0f11e2a2cd4fdba01f2ae315de52e394a441b3861ca2a011e02af62 |
27 |
-DIST bind-9.16.29.tar.xz 5088348 BLAKE2B 17ee1443926327c30f1d5820110b01a193c53eb24e23385b713217a4e49d9c2b5ddb6e1c49cb80d2c9083c71ce7872a26fe3597209f2e3215e6cc7e930e68004 SHA512 b4acbafed370438ac53e73468ccb5ea5745a1c8f764dd96f9c9a027594a3b7ce0d486e7f01138b39795b456265e0e6116cd76e44f5a3329687cd718550ca79fb |
28 |
-DIST bind-9.16.30.tar.xz 5086288 BLAKE2B 35fe14b58a018df25563e58a9632b4431f740bc7a708eb823117541548d23b1855e43058cf7323361ca904d5e59d687e282abb73dc8b617e4eb25ef113168e93 SHA512 cc9bcbedf63c2efe0a23f14db3e57fdae46f0509aac58e5840a6805ce4fbd76cad5bfde4d461442adb88c4d947f8d79bf979aeb24aeb9303b6adc8d169b7118c |
29 |
-DIST bind-9.16.31.tar.xz 5087424 BLAKE2B 75c9038c00fe289161a15a8e4fdadaef5a6a7f3ca03068ec24e82aa9f30ac82d0ded9cf73df83219058cd81b198ea8f561211a323e31b41407294f6932dc61d3 SHA512 8577b4d021a5a763b8669d59ef6c3499238e87657ca94ccfc530cb9a7a215ee3682002aa6141f5731154cbc43e0e6094372961468811a68bbd2a37e20e287c7e |
30 |
-DIST bind-9.16.32.tar.xz 5091860 BLAKE2B df6f2c878138015da580dfaf0e16b5a97b11ead9f99c1425a09da8484954196ea3dafb828ac3ab386200ce2b180646c7eb1e0e62a84c153162270a4a1e19a5fc SHA512 99abedf055901b43e1a85c448ee4c2dd731b7ab77de1454b73c8f9df816aa32262e70e23a8112959d94be990fd4f1c48c36611657ba745670141a7447fd53316 |
31 |
DIST bind-9.16.33.tar.xz 5092516 BLAKE2B 4246b61ce91af3d494ace4b8065b4c0043b2cfaf28c6de326691a969837e7d1cfbc0dac6b1e1a5182fc32af68048abcfa1202d00022951f3caa13afb03ebeb69 SHA512 43fd2cea52dfd1115a4cca83830ab5b93208be401cdbbdff2bbf204b8f0d99fb434ad3156d3a21649488cc904ae09f145feba97b9b6918b0cf063ff5e2b10af5 |
32 |
|
33 |
diff --git a/net-dns/bind-tools/bind-tools-9.16.27.ebuild b/net-dns/bind-tools/bind-tools-9.16.27.ebuild |
34 |
deleted file mode 100644 |
35 |
index a928124efddb..000000000000 |
36 |
--- a/net-dns/bind-tools/bind-tools-9.16.27.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,152 +0,0 @@ |
39 |
-# Copyright 1999-2022 Gentoo Authors |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=7 |
43 |
- |
44 |
-inherit autotools flag-o-matic toolchain-funcs |
45 |
- |
46 |
-MY_PN=${PN//-tools} |
47 |
-MY_PV=${PV/_p/-P} |
48 |
-MY_PV=${MY_PV/_rc/rc} |
49 |
-MY_P="${MY_PN}-${MY_PV}" |
50 |
- |
51 |
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" |
52 |
-HOMEPAGE="https://www.isc.org/software/bind" |
53 |
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" |
54 |
- |
55 |
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" |
56 |
-SLOT="0" |
57 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
58 |
-IUSE="+caps doc gssapi idn ipv6 libedit readline xml" |
59 |
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 |
60 |
- |
61 |
-COMMON_DEPEND=" |
62 |
- dev-libs/libuv:= |
63 |
- caps? ( sys-libs/libcap ) |
64 |
- dev-libs/openssl:= |
65 |
- xml? ( dev-libs/libxml2 ) |
66 |
- idn? ( net-dns/libidn2:= ) |
67 |
- gssapi? ( virtual/krb5 ) |
68 |
- libedit? ( dev-libs/libedit ) |
69 |
- !libedit? ( |
70 |
- readline? ( sys-libs/readline:= ) |
71 |
- ) |
72 |
-" |
73 |
-DEPEND="${COMMON_DEPEND}" |
74 |
-RDEPEND="${COMMON_DEPEND}" |
75 |
- |
76 |
-# sphinx required for man-page and html creation |
77 |
-BDEPEND=" |
78 |
- doc? ( dev-python/sphinx ) |
79 |
- virtual/pkgconfig |
80 |
-" |
81 |
- |
82 |
-S="${WORKDIR}/${MY_P}" |
83 |
- |
84 |
-# bug 479092, requires networking |
85 |
-RESTRICT="test" |
86 |
- |
87 |
-src_prepare() { |
88 |
- default |
89 |
- |
90 |
- export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" |
91 |
- |
92 |
- # Disable tests for now, bug 406399 |
93 |
- sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die |
94 |
- |
95 |
- # Do not disable thread local storage on Solaris, it works with our |
96 |
- # toolchain, and it breaks further configure checks |
97 |
- sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die |
98 |
- |
99 |
- # bug #220361 |
100 |
- rm aclocal.m4 || die |
101 |
- rm -rf libtool.m4/ || die |
102 |
- |
103 |
- eautoreconf |
104 |
-} |
105 |
- |
106 |
-src_configure() { |
107 |
- local myeconfargs=( |
108 |
- --localstatedir="${EPREFIX}"/var |
109 |
- --without-python |
110 |
- --without-libjson |
111 |
- --without-zlib |
112 |
- --without-lmdb |
113 |
- --without-maxminddb |
114 |
- --disable-geoip |
115 |
- --with-openssl="${ESYSROOT}"/usr |
116 |
- $(use_with idn libidn2 "${ESYSROOT}"/usr) |
117 |
- $(use_with xml libxml2) |
118 |
- $(use_with gssapi) |
119 |
- $(use_with readline) |
120 |
- $(use_enable caps linux-caps) |
121 |
- AR="$(type -P $(tc-getAR))" |
122 |
- ) |
123 |
- |
124 |
- # bug 607400 |
125 |
- if use libedit ; then |
126 |
- myeconfargs+=( --with-readline=-ledit ) |
127 |
- elif use readline ; then |
128 |
- myeconfargs+=( --with-readline=-lreadline ) |
129 |
- else |
130 |
- myeconfargs+=( --without-readline ) |
131 |
- fi |
132 |
- |
133 |
- # bug 344029 |
134 |
- append-cflags "-DDIG_SIGCHASE" |
135 |
- |
136 |
- # to expose CMSG_* macros from sys/sockets.h |
137 |
- [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" |
138 |
- |
139 |
- # localstatedir for nsupdate -l, bug 395785 |
140 |
- tc-export BUILD_CC |
141 |
- econf "${myeconfargs[@]}" |
142 |
- |
143 |
- # bug #151839 |
144 |
- echo '#undef SO_BSDCOMPAT' >> config.h |
145 |
-} |
146 |
- |
147 |
-src_compile() { |
148 |
- local AR=$(tc-getAR) |
149 |
- |
150 |
- emake AR="${AR}" -C lib/ |
151 |
- emake AR="${AR}" -C bin/delv/ |
152 |
- emake AR="${AR}" -C bin/dig/ |
153 |
- emake AR="${AR}" -C bin/nsupdate/ |
154 |
- emake AR="${AR}" -C bin/dnssec/ |
155 |
- emake -C doc/man/ man $(usev doc) |
156 |
-} |
157 |
- |
158 |
-src_install() { |
159 |
- local man_dir="${S}/doc/man" |
160 |
- local html_dir="${man_dir}/_build/html" |
161 |
- |
162 |
- dodoc README CHANGES |
163 |
- |
164 |
- cd "${S}"/bin/delv || die |
165 |
- dobin delv |
166 |
- doman ${man_dir}/delv.1 |
167 |
- |
168 |
- cd "${S}"/bin/dig || die |
169 |
- dobin dig host nslookup |
170 |
- doman ${man_dir}/{dig,host,nslookup}.1 |
171 |
- |
172 |
- cd "${S}"/bin/nsupdate || die |
173 |
- dobin nsupdate |
174 |
- doman ${man_dir}/nsupdate.1 |
175 |
- if use doc; then |
176 |
- docinto html |
177 |
- dodoc ${html_dir}/nsupdate.html |
178 |
- fi |
179 |
- |
180 |
- cd "${S}"/bin/dnssec || die |
181 |
- for tool in dsfromkey importkey keyfromlabel keygen \ |
182 |
- revoke settime signzone verify; do |
183 |
- dobin dnssec-"${tool}" |
184 |
- doman ${man_dir}/dnssec-"${tool}".8 |
185 |
- if use doc; then |
186 |
- docinto html |
187 |
- dodoc ${html_dir}/dnssec-"${tool}".html |
188 |
- fi |
189 |
- done |
190 |
-} |
191 |
|
192 |
diff --git a/net-dns/bind-tools/bind-tools-9.16.29-r1.ebuild b/net-dns/bind-tools/bind-tools-9.16.29-r1.ebuild |
193 |
deleted file mode 100644 |
194 |
index 6ab46c310694..000000000000 |
195 |
--- a/net-dns/bind-tools/bind-tools-9.16.29-r1.ebuild |
196 |
+++ /dev/null |
197 |
@@ -1,156 +0,0 @@ |
198 |
-# Copyright 1999-2022 Gentoo Authors |
199 |
-# Distributed under the terms of the GNU General Public License v2 |
200 |
- |
201 |
-EAPI=7 |
202 |
- |
203 |
-inherit autotools flag-o-matic toolchain-funcs |
204 |
- |
205 |
-MY_PN=${PN//-tools} |
206 |
-MY_PV=${PV/_p/-P} |
207 |
-MY_PV=${MY_PV/_rc/rc} |
208 |
-MY_P="${MY_PN}-${MY_PV}" |
209 |
- |
210 |
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" |
211 |
-HOMEPAGE="https://www.isc.org/software/bind" |
212 |
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" |
213 |
- |
214 |
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" |
215 |
-SLOT="0" |
216 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
217 |
-IUSE="+caps doc gssapi idn ipv6 libedit readline xml" |
218 |
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 |
219 |
- |
220 |
-COMMON_DEPEND=" |
221 |
- dev-libs/libuv:= |
222 |
- caps? ( sys-libs/libcap ) |
223 |
- dev-libs/openssl:= |
224 |
- xml? ( dev-libs/libxml2 ) |
225 |
- idn? ( net-dns/libidn2:= ) |
226 |
- gssapi? ( virtual/krb5 ) |
227 |
- libedit? ( dev-libs/libedit ) |
228 |
- !libedit? ( |
229 |
- readline? ( sys-libs/readline:= ) |
230 |
- ) |
231 |
-" |
232 |
-DEPEND="${COMMON_DEPEND}" |
233 |
-RDEPEND="${COMMON_DEPEND}" |
234 |
- |
235 |
-# sphinx required for man-page and html creation |
236 |
-BDEPEND=" |
237 |
- doc? ( dev-python/sphinx ) |
238 |
- virtual/pkgconfig |
239 |
-" |
240 |
- |
241 |
-S="${WORKDIR}/${MY_P}" |
242 |
- |
243 |
-# bug 479092, requires networking |
244 |
-RESTRICT="test" |
245 |
- |
246 |
-PATCHES=( |
247 |
- "${FILESDIR}"/${P}-fortify-source-3.patch |
248 |
-) |
249 |
- |
250 |
-src_prepare() { |
251 |
- default |
252 |
- |
253 |
- export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" |
254 |
- |
255 |
- # Disable tests for now, bug 406399 |
256 |
- sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die |
257 |
- |
258 |
- # Do not disable thread local storage on Solaris, it works with our |
259 |
- # toolchain, and it breaks further configure checks |
260 |
- sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die |
261 |
- |
262 |
- # bug #220361 |
263 |
- rm aclocal.m4 || die |
264 |
- rm -rf libtool.m4/ || die |
265 |
- |
266 |
- eautoreconf |
267 |
-} |
268 |
- |
269 |
-src_configure() { |
270 |
- local myeconfargs=( |
271 |
- --localstatedir="${EPREFIX}"/var |
272 |
- --without-python |
273 |
- --without-libjson |
274 |
- --without-zlib |
275 |
- --without-lmdb |
276 |
- --without-maxminddb |
277 |
- --disable-geoip |
278 |
- --with-openssl="${ESYSROOT}"/usr |
279 |
- $(use_with idn libidn2 "${ESYSROOT}"/usr) |
280 |
- $(use_with xml libxml2) |
281 |
- $(use_with gssapi) |
282 |
- $(use_with readline) |
283 |
- $(use_enable caps linux-caps) |
284 |
- AR="$(type -P $(tc-getAR))" |
285 |
- ) |
286 |
- |
287 |
- # bug 607400 |
288 |
- if use libedit ; then |
289 |
- myeconfargs+=( --with-readline=-ledit ) |
290 |
- elif use readline ; then |
291 |
- myeconfargs+=( --with-readline=-lreadline ) |
292 |
- else |
293 |
- myeconfargs+=( --without-readline ) |
294 |
- fi |
295 |
- |
296 |
- # bug 344029 |
297 |
- append-cflags "-DDIG_SIGCHASE" |
298 |
- |
299 |
- # to expose CMSG_* macros from sys/sockets.h |
300 |
- [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" |
301 |
- |
302 |
- # localstatedir for nsupdate -l, bug 395785 |
303 |
- tc-export BUILD_CC |
304 |
- econf "${myeconfargs[@]}" |
305 |
- |
306 |
- # bug #151839 |
307 |
- echo '#undef SO_BSDCOMPAT' >> config.h |
308 |
-} |
309 |
- |
310 |
-src_compile() { |
311 |
- local AR=$(tc-getAR) |
312 |
- |
313 |
- emake AR="${AR}" -C lib/ |
314 |
- emake AR="${AR}" -C bin/delv/ |
315 |
- emake AR="${AR}" -C bin/dig/ |
316 |
- emake AR="${AR}" -C bin/nsupdate/ |
317 |
- emake AR="${AR}" -C bin/dnssec/ |
318 |
- emake -C doc/man/ man $(usev doc) |
319 |
-} |
320 |
- |
321 |
-src_install() { |
322 |
- local man_dir="${S}/doc/man" |
323 |
- local html_dir="${man_dir}/_build/html" |
324 |
- |
325 |
- dodoc README CHANGES |
326 |
- |
327 |
- cd "${S}"/bin/delv || die |
328 |
- dobin delv |
329 |
- doman ${man_dir}/delv.1 |
330 |
- |
331 |
- cd "${S}"/bin/dig || die |
332 |
- dobin dig host nslookup |
333 |
- doman ${man_dir}/{dig,host,nslookup}.1 |
334 |
- |
335 |
- cd "${S}"/bin/nsupdate || die |
336 |
- dobin nsupdate |
337 |
- doman ${man_dir}/nsupdate.1 |
338 |
- if use doc; then |
339 |
- docinto html |
340 |
- dodoc ${html_dir}/nsupdate.html |
341 |
- fi |
342 |
- |
343 |
- cd "${S}"/bin/dnssec || die |
344 |
- for tool in dsfromkey importkey keyfromlabel keygen \ |
345 |
- revoke settime signzone verify; do |
346 |
- dobin dnssec-"${tool}" |
347 |
- doman ${man_dir}/dnssec-"${tool}".8 |
348 |
- if use doc; then |
349 |
- docinto html |
350 |
- dodoc ${html_dir}/dnssec-"${tool}".html |
351 |
- fi |
352 |
- done |
353 |
-} |
354 |
|
355 |
diff --git a/net-dns/bind-tools/bind-tools-9.16.30.ebuild b/net-dns/bind-tools/bind-tools-9.16.30.ebuild |
356 |
deleted file mode 100644 |
357 |
index 777764136be4..000000000000 |
358 |
--- a/net-dns/bind-tools/bind-tools-9.16.30.ebuild |
359 |
+++ /dev/null |
360 |
@@ -1,156 +0,0 @@ |
361 |
-# Copyright 1999-2022 Gentoo Authors |
362 |
-# Distributed under the terms of the GNU General Public License v2 |
363 |
- |
364 |
-EAPI=8 |
365 |
- |
366 |
-inherit autotools flag-o-matic multiprocessing toolchain-funcs |
367 |
- |
368 |
-MY_PN=${PN//-tools} |
369 |
-MY_PV=${PV/_p/-P} |
370 |
-MY_PV=${MY_PV/_rc/rc} |
371 |
-MY_P="${MY_PN}-${MY_PV}" |
372 |
- |
373 |
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" |
374 |
-HOMEPAGE="https://www.isc.org/software/bind" |
375 |
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" |
376 |
- |
377 |
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" |
378 |
-SLOT="0" |
379 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
380 |
-IUSE="+caps doc gssapi idn ipv6 libedit readline test xml" |
381 |
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 |
382 |
-RESTRICT="!test? ( test )" |
383 |
- |
384 |
-COMMON_DEPEND=" |
385 |
- dev-libs/libuv:= |
386 |
- dev-libs/openssl:= |
387 |
- caps? ( sys-libs/libcap ) |
388 |
- xml? ( dev-libs/libxml2 ) |
389 |
- idn? ( net-dns/libidn2:= ) |
390 |
- gssapi? ( virtual/krb5 ) |
391 |
- libedit? ( dev-libs/libedit ) |
392 |
- !libedit? ( |
393 |
- readline? ( sys-libs/readline:= ) |
394 |
- ) |
395 |
-" |
396 |
-DEPEND="${COMMON_DEPEND}" |
397 |
-RDEPEND="${COMMON_DEPEND}" |
398 |
- |
399 |
-# sphinx required for man-page and html creation |
400 |
-BDEPEND=" |
401 |
- virtual/pkgconfig |
402 |
- doc? ( dev-python/sphinx ) |
403 |
- test? ( |
404 |
- dev-util/cmocka |
405 |
- dev-util/kyua |
406 |
- ) |
407 |
-" |
408 |
- |
409 |
-S="${WORKDIR}/${MY_P}" |
410 |
- |
411 |
-src_prepare() { |
412 |
- default |
413 |
- |
414 |
- append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)" |
415 |
- |
416 |
- # Do not disable thread local storage on Solaris, it works with our |
417 |
- # toolchain, and it breaks further configure checks |
418 |
- sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die |
419 |
- |
420 |
- # bug #220361 |
421 |
- rm aclocal.m4 || die |
422 |
- rm -rf libtool.m4/ || die |
423 |
- |
424 |
- eautoreconf |
425 |
-} |
426 |
- |
427 |
-src_configure() { |
428 |
- local myeconfargs=( |
429 |
- --localstatedir="${EPREFIX}"/var |
430 |
- --without-python |
431 |
- --without-libjson |
432 |
- --without-zlib |
433 |
- --without-lmdb |
434 |
- --without-maxminddb |
435 |
- --disable-geoip |
436 |
- --with-openssl="${ESYSROOT}"/usr |
437 |
- $(use_with idn libidn2 "${ESYSROOT}"/usr) |
438 |
- $(use_with xml libxml2) |
439 |
- $(use_with gssapi) |
440 |
- $(use_with readline) |
441 |
- $(use_enable caps linux-caps) |
442 |
- AR="$(type -P $(tc-getAR))" |
443 |
- ) |
444 |
- |
445 |
- # bug 607400 |
446 |
- if use libedit ; then |
447 |
- myeconfargs+=( --with-readline=-ledit ) |
448 |
- elif use readline ; then |
449 |
- myeconfargs+=( --with-readline=-lreadline ) |
450 |
- else |
451 |
- myeconfargs+=( --without-readline ) |
452 |
- fi |
453 |
- |
454 |
- # bug #344029 |
455 |
- append-cflags "-DDIG_SIGCHASE" |
456 |
- |
457 |
- # to expose CMSG_* macros from sys/sockets.h |
458 |
- [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" |
459 |
- |
460 |
- # localstatedir for nsupdate -l, bug #395785 |
461 |
- tc-export BUILD_CC |
462 |
- econf "${myeconfargs[@]}" |
463 |
- |
464 |
- # bug #151839 |
465 |
- echo '#undef SO_BSDCOMPAT' >> config.h || die |
466 |
-} |
467 |
- |
468 |
-src_compile() { |
469 |
- local AR="$(tc-getAR)" |
470 |
- |
471 |
- emake AR="${AR}" -C lib/ |
472 |
- emake AR="${AR}" -C bin/delv/ |
473 |
- emake AR="${AR}" -C bin/dig/ |
474 |
- emake AR="${AR}" -C bin/nsupdate/ |
475 |
- emake AR="${AR}" -C bin/dnssec/ |
476 |
- emake -C doc/man/ man $(usev doc) |
477 |
-} |
478 |
- |
479 |
-src_test() { |
480 |
- # system tests ('emake test') require network configuration for IPs etc |
481 |
- TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit |
482 |
-} |
483 |
- |
484 |
-src_install() { |
485 |
- local man_dir="${S}/doc/man" |
486 |
- local html_dir="${man_dir}/_build/html" |
487 |
- |
488 |
- dodoc README CHANGES |
489 |
- |
490 |
- cd "${S}"/bin/delv || die |
491 |
- dobin delv |
492 |
- doman ${man_dir}/delv.1 |
493 |
- |
494 |
- cd "${S}"/bin/dig || die |
495 |
- dobin dig host nslookup |
496 |
- doman ${man_dir}/{dig,host,nslookup}.1 |
497 |
- |
498 |
- cd "${S}"/bin/nsupdate || die |
499 |
- dobin nsupdate |
500 |
- doman ${man_dir}/nsupdate.1 |
501 |
- if use doc; then |
502 |
- docinto html |
503 |
- dodoc ${html_dir}/nsupdate.html |
504 |
- fi |
505 |
- |
506 |
- cd "${S}"/bin/dnssec || die |
507 |
- for tool in dsfromkey importkey keyfromlabel keygen \ |
508 |
- revoke settime signzone verify; do |
509 |
- dobin dnssec-"${tool}" |
510 |
- doman ${man_dir}/dnssec-"${tool}".8 |
511 |
- if use doc; then |
512 |
- docinto html |
513 |
- dodoc ${html_dir}/dnssec-"${tool}".html |
514 |
- fi |
515 |
- done |
516 |
-} |
517 |
|
518 |
diff --git a/net-dns/bind-tools/bind-tools-9.16.31.ebuild b/net-dns/bind-tools/bind-tools-9.16.31.ebuild |
519 |
deleted file mode 100644 |
520 |
index 4a9cc94b8e64..000000000000 |
521 |
--- a/net-dns/bind-tools/bind-tools-9.16.31.ebuild |
522 |
+++ /dev/null |
523 |
@@ -1,157 +0,0 @@ |
524 |
-# Copyright 1999-2022 Gentoo Authors |
525 |
-# Distributed under the terms of the GNU General Public License v2 |
526 |
- |
527 |
-EAPI=8 |
528 |
- |
529 |
-inherit autotools flag-o-matic multiprocessing toolchain-funcs |
530 |
- |
531 |
-MY_PN=${PN//-tools} |
532 |
-MY_PV=${PV/_p/-P} |
533 |
-MY_PV=${MY_PV/_rc/rc} |
534 |
-MY_P="${MY_PN}-${MY_PV}" |
535 |
- |
536 |
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" |
537 |
-HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9" |
538 |
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" |
539 |
- |
540 |
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" |
541 |
-SLOT="0" |
542 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
543 |
-IUSE="+caps doc gssapi idn libedit readline test xml" |
544 |
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 |
545 |
-RESTRICT="!test? ( test )" |
546 |
- |
547 |
-COMMON_DEPEND=" |
548 |
- dev-libs/libuv:= |
549 |
- dev-libs/openssl:= |
550 |
- caps? ( sys-libs/libcap ) |
551 |
- xml? ( dev-libs/libxml2 ) |
552 |
- idn? ( net-dns/libidn2:= ) |
553 |
- gssapi? ( virtual/krb5 ) |
554 |
- libedit? ( dev-libs/libedit ) |
555 |
- !libedit? ( |
556 |
- readline? ( sys-libs/readline:= ) |
557 |
- ) |
558 |
-" |
559 |
-DEPEND="${COMMON_DEPEND}" |
560 |
-RDEPEND="${COMMON_DEPEND}" |
561 |
- |
562 |
-# sphinx required for man-page and html creation |
563 |
-BDEPEND=" |
564 |
- virtual/pkgconfig |
565 |
- doc? ( dev-python/sphinx ) |
566 |
- test? ( |
567 |
- dev-util/cmocka |
568 |
- dev-util/kyua |
569 |
- ) |
570 |
-" |
571 |
- |
572 |
-S="${WORKDIR}/${MY_P}" |
573 |
- |
574 |
-src_prepare() { |
575 |
- default |
576 |
- |
577 |
- append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)" |
578 |
- |
579 |
- # Do not disable thread local storage on Solaris, it works with our |
580 |
- # toolchain, and it breaks further configure checks |
581 |
- sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die |
582 |
- |
583 |
- # bug #220361 |
584 |
- rm aclocal.m4 || die |
585 |
- rm -rf libtool.m4/ || die |
586 |
- |
587 |
- eautoreconf |
588 |
-} |
589 |
- |
590 |
-src_configure() { |
591 |
- local myeconfargs=( |
592 |
- --localstatedir="${EPREFIX}"/var |
593 |
- --without-python |
594 |
- --without-libjson |
595 |
- --without-zlib |
596 |
- --without-lmdb |
597 |
- --without-maxminddb |
598 |
- --disable-geoip |
599 |
- --with-openssl="${ESYSROOT}"/usr |
600 |
- $(use_with idn libidn2 "${ESYSROOT}"/usr) |
601 |
- $(use_with xml libxml2) |
602 |
- $(use_with gssapi) |
603 |
- $(use_with readline) |
604 |
- $(use_enable caps linux-caps) |
605 |
- AR="$(type -P $(tc-getAR))" |
606 |
- ) |
607 |
- |
608 |
- # bug 607400 |
609 |
- if use libedit ; then |
610 |
- myeconfargs+=( --with-readline=-ledit ) |
611 |
- elif use readline ; then |
612 |
- myeconfargs+=( --with-readline=-lreadline ) |
613 |
- else |
614 |
- myeconfargs+=( --without-readline ) |
615 |
- fi |
616 |
- |
617 |
- # bug #344029 |
618 |
- append-cflags "-DDIG_SIGCHASE" |
619 |
- |
620 |
- # to expose CMSG_* macros from sys/sockets.h |
621 |
- [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" |
622 |
- |
623 |
- # localstatedir for nsupdate -l, bug #395785 |
624 |
- tc-export BUILD_CC |
625 |
- econf "${myeconfargs[@]}" |
626 |
- |
627 |
- # bug #151839 |
628 |
- echo '#undef SO_BSDCOMPAT' >> config.h || die |
629 |
-} |
630 |
- |
631 |
-src_compile() { |
632 |
- local AR="$(tc-getAR)" |
633 |
- |
634 |
- emake AR="${AR}" -C lib/ |
635 |
- emake AR="${AR}" -C bin/delv/ |
636 |
- emake AR="${AR}" -C bin/dig/ |
637 |
- emake AR="${AR}" -C bin/nsupdate/ |
638 |
- emake AR="${AR}" -C bin/dnssec/ |
639 |
- emake -C doc/man/ man $(usev doc) |
640 |
-} |
641 |
- |
642 |
-src_test() { |
643 |
- # system tests ('emake test') require network configuration for IPs etc |
644 |
- # so we run the unit tests instead. |
645 |
- TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit |
646 |
-} |
647 |
- |
648 |
-src_install() { |
649 |
- local man_dir="${S}/doc/man" |
650 |
- local html_dir="${man_dir}/_build/html" |
651 |
- |
652 |
- dodoc README CHANGES |
653 |
- |
654 |
- cd "${S}"/bin/delv || die |
655 |
- dobin delv |
656 |
- doman ${man_dir}/delv.1 |
657 |
- |
658 |
- cd "${S}"/bin/dig || die |
659 |
- dobin dig host nslookup |
660 |
- doman ${man_dir}/{dig,host,nslookup}.1 |
661 |
- |
662 |
- cd "${S}"/bin/nsupdate || die |
663 |
- dobin nsupdate |
664 |
- doman ${man_dir}/nsupdate.1 |
665 |
- if use doc; then |
666 |
- docinto html |
667 |
- dodoc ${html_dir}/nsupdate.html |
668 |
- fi |
669 |
- |
670 |
- cd "${S}"/bin/dnssec || die |
671 |
- for tool in dsfromkey importkey keyfromlabel keygen \ |
672 |
- revoke settime signzone verify; do |
673 |
- dobin dnssec-"${tool}" |
674 |
- doman ${man_dir}/dnssec-"${tool}".8 |
675 |
- if use doc; then |
676 |
- docinto html |
677 |
- dodoc ${html_dir}/dnssec-"${tool}".html |
678 |
- fi |
679 |
- done |
680 |
-} |
681 |
|
682 |
diff --git a/net-dns/bind-tools/bind-tools-9.16.32.ebuild b/net-dns/bind-tools/bind-tools-9.16.32.ebuild |
683 |
deleted file mode 100644 |
684 |
index 4a9cc94b8e64..000000000000 |
685 |
--- a/net-dns/bind-tools/bind-tools-9.16.32.ebuild |
686 |
+++ /dev/null |
687 |
@@ -1,157 +0,0 @@ |
688 |
-# Copyright 1999-2022 Gentoo Authors |
689 |
-# Distributed under the terms of the GNU General Public License v2 |
690 |
- |
691 |
-EAPI=8 |
692 |
- |
693 |
-inherit autotools flag-o-matic multiprocessing toolchain-funcs |
694 |
- |
695 |
-MY_PN=${PN//-tools} |
696 |
-MY_PV=${PV/_p/-P} |
697 |
-MY_PV=${MY_PV/_rc/rc} |
698 |
-MY_P="${MY_PN}-${MY_PV}" |
699 |
- |
700 |
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" |
701 |
-HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9" |
702 |
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" |
703 |
- |
704 |
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" |
705 |
-SLOT="0" |
706 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
707 |
-IUSE="+caps doc gssapi idn libedit readline test xml" |
708 |
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 |
709 |
-RESTRICT="!test? ( test )" |
710 |
- |
711 |
-COMMON_DEPEND=" |
712 |
- dev-libs/libuv:= |
713 |
- dev-libs/openssl:= |
714 |
- caps? ( sys-libs/libcap ) |
715 |
- xml? ( dev-libs/libxml2 ) |
716 |
- idn? ( net-dns/libidn2:= ) |
717 |
- gssapi? ( virtual/krb5 ) |
718 |
- libedit? ( dev-libs/libedit ) |
719 |
- !libedit? ( |
720 |
- readline? ( sys-libs/readline:= ) |
721 |
- ) |
722 |
-" |
723 |
-DEPEND="${COMMON_DEPEND}" |
724 |
-RDEPEND="${COMMON_DEPEND}" |
725 |
- |
726 |
-# sphinx required for man-page and html creation |
727 |
-BDEPEND=" |
728 |
- virtual/pkgconfig |
729 |
- doc? ( dev-python/sphinx ) |
730 |
- test? ( |
731 |
- dev-util/cmocka |
732 |
- dev-util/kyua |
733 |
- ) |
734 |
-" |
735 |
- |
736 |
-S="${WORKDIR}/${MY_P}" |
737 |
- |
738 |
-src_prepare() { |
739 |
- default |
740 |
- |
741 |
- append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)" |
742 |
- |
743 |
- # Do not disable thread local storage on Solaris, it works with our |
744 |
- # toolchain, and it breaks further configure checks |
745 |
- sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die |
746 |
- |
747 |
- # bug #220361 |
748 |
- rm aclocal.m4 || die |
749 |
- rm -rf libtool.m4/ || die |
750 |
- |
751 |
- eautoreconf |
752 |
-} |
753 |
- |
754 |
-src_configure() { |
755 |
- local myeconfargs=( |
756 |
- --localstatedir="${EPREFIX}"/var |
757 |
- --without-python |
758 |
- --without-libjson |
759 |
- --without-zlib |
760 |
- --without-lmdb |
761 |
- --without-maxminddb |
762 |
- --disable-geoip |
763 |
- --with-openssl="${ESYSROOT}"/usr |
764 |
- $(use_with idn libidn2 "${ESYSROOT}"/usr) |
765 |
- $(use_with xml libxml2) |
766 |
- $(use_with gssapi) |
767 |
- $(use_with readline) |
768 |
- $(use_enable caps linux-caps) |
769 |
- AR="$(type -P $(tc-getAR))" |
770 |
- ) |
771 |
- |
772 |
- # bug 607400 |
773 |
- if use libedit ; then |
774 |
- myeconfargs+=( --with-readline=-ledit ) |
775 |
- elif use readline ; then |
776 |
- myeconfargs+=( --with-readline=-lreadline ) |
777 |
- else |
778 |
- myeconfargs+=( --without-readline ) |
779 |
- fi |
780 |
- |
781 |
- # bug #344029 |
782 |
- append-cflags "-DDIG_SIGCHASE" |
783 |
- |
784 |
- # to expose CMSG_* macros from sys/sockets.h |
785 |
- [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" |
786 |
- |
787 |
- # localstatedir for nsupdate -l, bug #395785 |
788 |
- tc-export BUILD_CC |
789 |
- econf "${myeconfargs[@]}" |
790 |
- |
791 |
- # bug #151839 |
792 |
- echo '#undef SO_BSDCOMPAT' >> config.h || die |
793 |
-} |
794 |
- |
795 |
-src_compile() { |
796 |
- local AR="$(tc-getAR)" |
797 |
- |
798 |
- emake AR="${AR}" -C lib/ |
799 |
- emake AR="${AR}" -C bin/delv/ |
800 |
- emake AR="${AR}" -C bin/dig/ |
801 |
- emake AR="${AR}" -C bin/nsupdate/ |
802 |
- emake AR="${AR}" -C bin/dnssec/ |
803 |
- emake -C doc/man/ man $(usev doc) |
804 |
-} |
805 |
- |
806 |
-src_test() { |
807 |
- # system tests ('emake test') require network configuration for IPs etc |
808 |
- # so we run the unit tests instead. |
809 |
- TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit |
810 |
-} |
811 |
- |
812 |
-src_install() { |
813 |
- local man_dir="${S}/doc/man" |
814 |
- local html_dir="${man_dir}/_build/html" |
815 |
- |
816 |
- dodoc README CHANGES |
817 |
- |
818 |
- cd "${S}"/bin/delv || die |
819 |
- dobin delv |
820 |
- doman ${man_dir}/delv.1 |
821 |
- |
822 |
- cd "${S}"/bin/dig || die |
823 |
- dobin dig host nslookup |
824 |
- doman ${man_dir}/{dig,host,nslookup}.1 |
825 |
- |
826 |
- cd "${S}"/bin/nsupdate || die |
827 |
- dobin nsupdate |
828 |
- doman ${man_dir}/nsupdate.1 |
829 |
- if use doc; then |
830 |
- docinto html |
831 |
- dodoc ${html_dir}/nsupdate.html |
832 |
- fi |
833 |
- |
834 |
- cd "${S}"/bin/dnssec || die |
835 |
- for tool in dsfromkey importkey keyfromlabel keygen \ |
836 |
- revoke settime signzone verify; do |
837 |
- dobin dnssec-"${tool}" |
838 |
- doman ${man_dir}/dnssec-"${tool}".8 |
839 |
- if use doc; then |
840 |
- docinto html |
841 |
- dodoc ${html_dir}/dnssec-"${tool}".html |
842 |
- fi |
843 |
- done |
844 |
-} |
845 |
|
846 |
diff --git a/net-dns/bind-tools/files/bind-tools-9.16.29-fortify-source-3.patch b/net-dns/bind-tools/files/bind-tools-9.16.29-fortify-source-3.patch |
847 |
deleted file mode 100644 |
848 |
index d084d6e62ce8..000000000000 |
849 |
--- a/net-dns/bind-tools/files/bind-tools-9.16.29-fortify-source-3.patch |
850 |
+++ /dev/null |
851 |
@@ -1,35 +0,0 @@ |
852 |
-https://gitlab.isc.org/isc-projects/bind9/-/commit/b6670787d25743ddf39dfe8e615828efc928f50d |
853 |
-https://gitlab.isc.org/isc-projects/bind9/-/issues/3351 |
854 |
-https://bugs.gentoo.org/847295 |
855 |
- |
856 |
-From: Evan Hunt <each@×××.org> |
857 |
-Date: Fri, 13 May 2022 19:59:58 -0700 |
858 |
-Subject: [PATCH] prevent a possible buffer overflow in configuration check |
859 |
- |
860 |
-corrected code that could have allowed a buffer overfow while |
861 |
-parsing named.conf. |
862 |
- |
863 |
-(cherry picked from commit 921043b54161c7a3e6dc4036b038ca4dbc5fe472) |
864 |
---- a/lib/bind9/check.c |
865 |
-+++ b/lib/bind9/check.c |
866 |
-@@ -2500,8 +2500,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, |
867 |
- } else if (dns_name_isula(zname)) { |
868 |
- ula = true; |
869 |
- } |
870 |
-- tmp += strlen(tmp); |
871 |
- len -= strlen(tmp); |
872 |
-+ tmp += strlen(tmp); |
873 |
- (void)snprintf(tmp, len, "%u/%s", zclass, |
874 |
- (ztype == CFG_ZONE_INVIEW) ? target |
875 |
- : (viewname != NULL) ? viewname |
876 |
-@@ -3247,8 +3247,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, |
877 |
- char *tmp = keydirbuf; |
878 |
- size_t len = sizeof(keydirbuf); |
879 |
- dns_name_format(zname, keydirbuf, sizeof(keydirbuf)); |
880 |
-- tmp += strlen(tmp); |
881 |
- len -= strlen(tmp); |
882 |
-+ tmp += strlen(tmp); |
883 |
- (void)snprintf(tmp, len, "/%s", (dir == NULL) ? "(null)" : dir); |
884 |
- tresult = keydirexist(zconfig, (const char *)keydirbuf, |
885 |
- kaspname, keydirs, logctx, mctx); |
886 |
-GitLab |