1 |
commit: 465561b4e37470c6e4ff297aabdaa074b5661fdc |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 25 14:24:35 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 25 14:25:05 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465561b4 |
7 |
|
8 |
net-dns/bind-tools: Bump to versions 9.11.4_p2 and 9.12.2_p2 |
9 |
|
10 |
as requested by idl0r. |
11 |
|
12 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
13 |
|
14 |
net-dns/bind-tools/Manifest | 2 + |
15 |
net-dns/bind-tools/bind-tools-9.11.4_p2.ebuild | 139 +++++++++++++++++++ |
16 |
net-dns/bind-tools/bind-tools-9.12.2_p2.ebuild | 150 +++++++++++++++++++++ |
17 |
.../files/bind-tools-9.5.0_p1-lwconfig.patch | 4 +- |
18 |
4 files changed, 293 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest |
21 |
index 19378dcdefd..a8de3d4e0f4 100644 |
22 |
--- a/net-dns/bind-tools/Manifest |
23 |
+++ b/net-dns/bind-tools/Manifest |
24 |
@@ -1,3 +1,5 @@ |
25 |
DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597 |
26 |
+DIST bind-9.11.4_p2.tar.gz 9617963 BLAKE2B 409cad7e0976f2e46406d45e87241d61d4d4f00bf08442c4dddbad490ea3d6e42eaad5851fddb83c61a897689a8fdba0cd920aaa0d36329868d26100ba48f946 SHA512 6c01810526fc40485a6c0403d1ddc3b76d2e59b3426b5789436bd671f158d2fa0ea7c0aef2de81998ec715dabd06683fed7b17224d5c794c61e7100a69d4cb60 |
27 |
DIST bind-9.12.1.tar.gz 9302783 BLAKE2B 731ce67acb22f72e54de1122c5d5c3c1f0663c400bdff9545578a45e5fe3094c6d754351e57dd5c52cdfe1528305dfde25eba7382a723a60b8bfdfeebb9536cd SHA512 701e34a0a3313568c8e5cf76668fefc2a1fceb2ade0de201b8f678401569f1c622c3d1657a71772fa3298efc8b3cdefe974d98432c0087e8b45af3d50a4262fb |
28 |
DIST bind-9.12.2_p1.tar.gz 9429002 BLAKE2B 1460b4583a28df21490f71993c8cd595dd8f8ee76727cc8798ee34a6deb1f5a4d39706ec2833a42a7e63ce0dcad917ca975c7d725fc179e2dd0450d8d683ceb4 SHA512 22ce084179439518f7d82f0b80544db929bb4ec71d0e7bd7edad9ae915c903300837d6ead698c9fc23741796f0ba9ed3aa384b752ff65c3b9b20c8969d351cba |
29 |
+DIST bind-9.12.2_p2.tar.gz 9422128 BLAKE2B c7d56f025f381a0136aa67ccd49a3254fcfe566d5e3601410e5cada26ccab32a901fe6e14bc14e6e287fa2b3904a4eee8e3ef63329f9bc4cb11f204590ff3623 SHA512 458adf6b3d0df286e7d345a21c40b639efcb275e76f9e0bf4e40a5d76dcac875016324393e129f29397be326d1017367c506ec9cbb35871c98fad4281bc4e05a |
30 |
|
31 |
diff --git a/net-dns/bind-tools/bind-tools-9.11.4_p2.ebuild b/net-dns/bind-tools/bind-tools-9.11.4_p2.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000000..667408e82ee |
34 |
--- /dev/null |
35 |
+++ b/net-dns/bind-tools/bind-tools-9.11.4_p2.ebuild |
36 |
@@ -0,0 +1,139 @@ |
37 |
+# Copyright 1999-2018 Gentoo Authors |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+ |
40 |
+EAPI=7 |
41 |
+ |
42 |
+inherit eutils autotools flag-o-matic toolchain-funcs |
43 |
+ |
44 |
+MY_PN=${PN//-tools} |
45 |
+MY_PV=${PV/_p/-P} |
46 |
+MY_PV=${MY_PV/_rc/rc} |
47 |
+MY_P="${MY_PN}-${MY_PV}" |
48 |
+ |
49 |
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" |
50 |
+HOMEPAGE="http://www.isc.org/software/bind" |
51 |
+SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.tar.gz" |
52 |
+ |
53 |
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" |
54 |
+SLOT="0" |
55 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
56 |
+IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml" |
57 |
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 |
58 |
+ |
59 |
+REQUIRED_USE="gost? ( !libressl ssl )" |
60 |
+ |
61 |
+CDEPEND=" |
62 |
+ ssl? ( |
63 |
+ !libressl? ( dev-libs/openssl:0= ) |
64 |
+ libressl? ( dev-libs/libressl ) |
65 |
+ ) |
66 |
+ gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) |
67 |
+ xml? ( dev-libs/libxml2 ) |
68 |
+ idn? ( <net-dns/idnkit-2:= ) |
69 |
+ gssapi? ( virtual/krb5 ) |
70 |
+ readline? ( sys-libs/readline:0= ) |
71 |
+ seccomp? ( sys-libs/libseccomp )" |
72 |
+DEPEND="${CDEPEND} |
73 |
+ virtual/pkgconfig" |
74 |
+RDEPEND="${CDEPEND} |
75 |
+ !<net-dns/bind-9.10.2" |
76 |
+ |
77 |
+S="${WORKDIR}/${MY_P}" |
78 |
+ |
79 |
+# bug 479092, requires networking |
80 |
+RESTRICT="test" |
81 |
+ |
82 |
+PATCHES=( |
83 |
+ "${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247 |
84 |
+) |
85 |
+ |
86 |
+src_prepare() { |
87 |
+ default |
88 |
+ |
89 |
+ # Disable tests for now, bug 406399 |
90 |
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die |
91 |
+ |
92 |
+ # bug #220361 |
93 |
+ rm aclocal.m4 |
94 |
+ rm -rf libtool.m4/ |
95 |
+ |
96 |
+ mv configure.in configure.ac || die # configure.in is deprecated |
97 |
+ eautoreconf |
98 |
+} |
99 |
+ |
100 |
+src_configure() { |
101 |
+ local myeconfargs=( |
102 |
+ --localstatedir=/var |
103 |
+ --without-python |
104 |
+ --without-libjson |
105 |
+ --without-zlib |
106 |
+ --without-lmdb |
107 |
+ --disable-openssl-version-check |
108 |
+ $(use_enable ipv6) |
109 |
+ $(use_with idn) |
110 |
+ $(usex idn --with-idnlib=-lidnkit '') |
111 |
+ $(use_enable seccomp) |
112 |
+ $(use_with ssl openssl) |
113 |
+ $(use_with xml libxml2) |
114 |
+ $(use_with gssapi) |
115 |
+ $(use_with readline) |
116 |
+ $(use_with gost) |
117 |
+ ) |
118 |
+ |
119 |
+ if use urandom; then |
120 |
+ myeconfargs+=( --with-randomdev=/dev/urandom ) |
121 |
+ else |
122 |
+ myeconfargs+=( --with-randomdev=/dev/random ) |
123 |
+ fi |
124 |
+ |
125 |
+ # bug 344029 |
126 |
+ append-cflags "-DDIG_SIGCHASE" |
127 |
+ |
128 |
+ # localstatedir for nsupdate -l, bug 395785 |
129 |
+ tc-export BUILD_CC |
130 |
+ econf "${myeconfargs[@]}" |
131 |
+ |
132 |
+ # bug #151839 |
133 |
+ echo '#undef SO_BSDCOMPAT' >> config.h |
134 |
+} |
135 |
+ |
136 |
+src_compile() { |
137 |
+ local AR=$(tc-getAR) |
138 |
+ |
139 |
+ emake AR="${AR}" -C lib/ |
140 |
+ emake AR="${AR}" -C bin/delv/ |
141 |
+ emake AR="${AR}" -C bin/dig/ |
142 |
+ emake AR="${AR}" -C bin/nsupdate/ |
143 |
+ emake AR="${AR}" -C bin/dnssec/ |
144 |
+} |
145 |
+ |
146 |
+src_install() { |
147 |
+ dodoc README CHANGES |
148 |
+ |
149 |
+ cd "${S}"/bin/delv || die |
150 |
+ dobin delv |
151 |
+ doman delv.1 |
152 |
+ |
153 |
+ cd "${S}"/bin/dig || die |
154 |
+ dobin dig host nslookup |
155 |
+ doman {dig,host,nslookup}.1 |
156 |
+ |
157 |
+ cd "${S}"/bin/nsupdate || die |
158 |
+ dobin nsupdate |
159 |
+ doman nsupdate.1 |
160 |
+ if use doc; then |
161 |
+ docinto html |
162 |
+ dodoc nsupdate.html |
163 |
+ fi |
164 |
+ |
165 |
+ cd "${S}"/bin/dnssec || die |
166 |
+ for tool in dsfromkey importkey keyfromlabel keygen \ |
167 |
+ revoke settime signzone verify; do |
168 |
+ dobin dnssec-"${tool}" |
169 |
+ doman dnssec-"${tool}".8 |
170 |
+ if use doc; then |
171 |
+ docinto html |
172 |
+ dodoc dnssec-"${tool}".html |
173 |
+ fi |
174 |
+ done |
175 |
+} |
176 |
|
177 |
diff --git a/net-dns/bind-tools/bind-tools-9.12.2_p2.ebuild b/net-dns/bind-tools/bind-tools-9.12.2_p2.ebuild |
178 |
new file mode 100644 |
179 |
index 00000000000..19907a9f7c3 |
180 |
--- /dev/null |
181 |
+++ b/net-dns/bind-tools/bind-tools-9.12.2_p2.ebuild |
182 |
@@ -0,0 +1,150 @@ |
183 |
+# Copyright 1999-2018 Gentoo Authors |
184 |
+# Distributed under the terms of the GNU General Public License v2 |
185 |
+ |
186 |
+EAPI=7 |
187 |
+ |
188 |
+inherit eutils autotools flag-o-matic toolchain-funcs |
189 |
+ |
190 |
+MY_PN=${PN//-tools} |
191 |
+MY_PV=${PV/_p/-P} |
192 |
+MY_PV=${MY_PV/_rc/rc} |
193 |
+MY_P="${MY_PN}-${MY_PV}" |
194 |
+ |
195 |
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" |
196 |
+HOMEPAGE="http://www.isc.org/software/bind" |
197 |
+SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.tar.gz" |
198 |
+ |
199 |
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" |
200 |
+SLOT="0" |
201 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
202 |
+IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml" |
203 |
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 |
204 |
+ |
205 |
+REQUIRED_USE="gost? ( !libressl ssl ) |
206 |
+ idn? ( !libidn2 ) |
207 |
+ libidn2? ( !idn )" |
208 |
+ |
209 |
+CDEPEND=" |
210 |
+ ssl? ( |
211 |
+ !libressl? ( dev-libs/openssl:0= ) |
212 |
+ libressl? ( dev-libs/libressl:= ) |
213 |
+ ) |
214 |
+ gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] ) |
215 |
+ xml? ( dev-libs/libxml2 ) |
216 |
+ idn? ( <net-dns/idnkit-2:= ) |
217 |
+ libidn2? ( net-dns/libidn2 ) |
218 |
+ gssapi? ( virtual/krb5 ) |
219 |
+ libedit? ( dev-libs/libedit ) |
220 |
+ !libedit? ( |
221 |
+ readline? ( sys-libs/readline:0= ) |
222 |
+ ) |
223 |
+ seccomp? ( sys-libs/libseccomp )" |
224 |
+DEPEND="${CDEPEND} |
225 |
+ virtual/pkgconfig" |
226 |
+RDEPEND="${CDEPEND} |
227 |
+ !<net-dns/bind-9.10.2" |
228 |
+ |
229 |
+S="${WORKDIR}/${MY_P}" |
230 |
+ |
231 |
+# bug 479092, requires networking |
232 |
+RESTRICT="test" |
233 |
+ |
234 |
+src_prepare() { |
235 |
+ default |
236 |
+ |
237 |
+ # Disable tests for now, bug 406399 |
238 |
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die |
239 |
+ |
240 |
+ # bug #220361 |
241 |
+ rm aclocal.m4 |
242 |
+ rm -rf libtool.m4/ |
243 |
+ |
244 |
+ mv configure.in configure.ac || die # configure.in is deprecated |
245 |
+ eautoreconf |
246 |
+} |
247 |
+ |
248 |
+src_configure() { |
249 |
+ local myeconfargs=( |
250 |
+ --localstatedir="${EPREFIX}"/var |
251 |
+ --without-python |
252 |
+ --without-libjson |
253 |
+ --without-zlib |
254 |
+ --without-lmdb |
255 |
+ $(use_enable ipv6) |
256 |
+ $(use_with idn idnkit) |
257 |
+ $(usex idn --with-idnlib=-lidnkit '') |
258 |
+ $(use_with libidn2) |
259 |
+ $(use_enable seccomp) |
260 |
+ $(use_with ssl openssl "${EPREFIX}"/usr) |
261 |
+ $(use_with xml libxml2) |
262 |
+ $(use_with gssapi) |
263 |
+ $(use_with readline) |
264 |
+ $(use_with gost) |
265 |
+ ) |
266 |
+ |
267 |
+ if use urandom; then |
268 |
+ myeconfargs+=( --with-randomdev=/dev/urandom ) |
269 |
+ else |
270 |
+ myeconfargs+=( --with-randomdev=/dev/random ) |
271 |
+ fi |
272 |
+ |
273 |
+ # bug 607400 |
274 |
+ if use libedit ; then |
275 |
+ myeconfargs+=( --with-readline=-ledit ) |
276 |
+ elif use readline ; then |
277 |
+ myeconfargs+=( --with-readline=-lreadline ) |
278 |
+ else |
279 |
+ myeconfargs+=( --without-readline ) |
280 |
+ fi |
281 |
+ |
282 |
+ # bug 344029 |
283 |
+ append-cflags "-DDIG_SIGCHASE" |
284 |
+ |
285 |
+ # localstatedir for nsupdate -l, bug 395785 |
286 |
+ tc-export BUILD_CC |
287 |
+ econf "${myeconfargs[@]}" |
288 |
+ |
289 |
+ # bug #151839 |
290 |
+ echo '#undef SO_BSDCOMPAT' >> config.h |
291 |
+} |
292 |
+ |
293 |
+src_compile() { |
294 |
+ local AR=$(tc-getAR) |
295 |
+ |
296 |
+ emake AR="${AR}" -C lib/ |
297 |
+ emake AR="${AR}" -C bin/delv/ |
298 |
+ emake AR="${AR}" -C bin/dig/ |
299 |
+ emake AR="${AR}" -C bin/nsupdate/ |
300 |
+ emake AR="${AR}" -C bin/dnssec/ |
301 |
+} |
302 |
+ |
303 |
+src_install() { |
304 |
+ dodoc README CHANGES |
305 |
+ |
306 |
+ cd "${S}"/bin/delv || die |
307 |
+ dobin delv |
308 |
+ doman delv.1 |
309 |
+ |
310 |
+ cd "${S}"/bin/dig || die |
311 |
+ dobin dig host nslookup |
312 |
+ doman {dig,host,nslookup}.1 |
313 |
+ |
314 |
+ cd "${S}"/bin/nsupdate || die |
315 |
+ dobin nsupdate |
316 |
+ doman nsupdate.1 |
317 |
+ if use doc; then |
318 |
+ docinto html |
319 |
+ dodoc nsupdate.html |
320 |
+ fi |
321 |
+ |
322 |
+ cd "${S}"/bin/dnssec || die |
323 |
+ for tool in dsfromkey importkey keyfromlabel keygen \ |
324 |
+ revoke settime signzone verify; do |
325 |
+ dobin dnssec-"${tool}" |
326 |
+ doman dnssec-"${tool}".8 |
327 |
+ if use doc; then |
328 |
+ docinto html |
329 |
+ dodoc dnssec-"${tool}".html |
330 |
+ fi |
331 |
+ done |
332 |
+} |
333 |
|
334 |
diff --git a/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch b/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch |
335 |
index 7aa1d16e92c..ba615d5ac6e 100644 |
336 |
--- a/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch |
337 |
+++ b/net-dns/bind-tools/files/bind-tools-9.5.0_p1-lwconfig.patch |
338 |
@@ -1,5 +1,5 @@ |
339 |
---- lib/lwres/lwconfig.c.old 2007-06-20 01:47:22.000000000 +0200 |
340 |
-+++ lib/lwres/lwconfig.c 2008-06-15 02:57:02.000000000 +0200 |
341 |
+--- a/lib/lwres/lwconfig.c |
342 |
++++ b/lib/lwres/lwconfig.c |
343 |
@@ -175,13 +175,8 @@ |
344 |
REQUIRE(buffer != NULL); |
345 |
REQUIRE(size > 0U); |