Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/bind/
Date: Fri, 31 Jul 2020 16:12:02
Message-Id: 1596211863.ff54c59aa9230c4634330ad28ec6123dd54dae7e.zlogene@gentoo
1 commit: ff54c59aa9230c4634330ad28ec6123dd54dae7e
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 31 16:11:03 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 31 16:11:03 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff54c59a
7
8 net-dns/bind: Drop old
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 net-dns/bind/Manifest | 1 -
14 net-dns/bind/bind-9.16.3.ebuild | 376 ----------------------------------------
15 2 files changed, 377 deletions(-)
16
17 diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
18 index e16303da1b8..1cae5c453c6 100644
19 --- a/net-dns/bind/Manifest
20 +++ b/net-dns/bind/Manifest
21 @@ -1,4 +1,3 @@
22 DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
23 -DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df
24 DIST bind-9.16.4.tar.xz 3465172 BLAKE2B 0787920793798ecc5d3197e1e51d41c14170f25608077af8275fd60502e2a6f5365670ca9e611a94a53517b6a0bd55cbb37ac37a4f01063fc409def4e34c39a8 SHA512 b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860
25 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
26
27 diff --git a/net-dns/bind/bind-9.16.3.ebuild b/net-dns/bind/bind-9.16.3.ebuild
28 deleted file mode 100644
29 index e524cc62351..00000000000
30 --- a/net-dns/bind/bind-9.16.3.ebuild
31 +++ /dev/null
32 @@ -1,376 +0,0 @@
33 -# Copyright 1999-2020 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -# Re dlz/mysql and threads, needs to be verified..
37 -# MySQL uses thread local storage in its C api. Thus MySQL
38 -# requires that each thread of an application execute a MySQL
39 -# thread initialization to setup the thread local storage.
40 -# This is impossible to do safely while staying within the DLZ
41 -# driver API. This is a limitation caused by MySQL, and not the DLZ API.
42 -# Because of this BIND MUST only run with a single thread when
43 -# using the MySQL driver.
44 -
45 -EAPI=7
46 -
47 -PYTHON_COMPAT=( python3_7 )
48 -
49 -inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
50 -
51 -MY_PV="${PV/_p/-P}"
52 -MY_PV="${MY_PV/_rc/rc}"
53 -MY_P="${PN}-${MY_PV}"
54 -
55 -SDB_LDAP_VER="1.1.0-fc14"
56 -
57 -RRL_PV="${MY_PV}"
58 -
59 -# SDB-LDAP: http://bind9-ldap.bayour.com/
60 -
61 -DESCRIPTION="Berkeley Internet Name Domain - Name Server"
62 -HOMEPAGE="https://www.isc.org/software/bind"
63 -SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
64 - doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
65 -# sdb-ldap? (
66 -# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
67 -# )"
68 -
69 -LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
70 -SLOT="0"
71 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
72 -# -berkdb by default re bug 602682
73 -IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
74 -json ldap libressl lmdb mysql odbc postgres python selinux static-libs
75 -urandom xml +zlib"
76 -# sdb-ldap - patch broken
77 -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
78 -
79 -REQUIRED_USE="
80 - ?? ( geoip geoip2 )
81 - postgres? ( dlz )
82 - berkdb? ( dlz )
83 - mysql? ( dlz )
84 - odbc? ( dlz )
85 - ldap? ( dlz )
86 - dnsrps? ( dlz )
87 - python? ( ${PYTHON_REQUIRED_USE} )"
88 -
89 -DEPEND="!libressl? ( dev-libs/openssl:=[-bindist] )
90 - libressl? ( dev-libs/libressl:= )
91 - mysql? ( dev-db/mysql-connector-c:0= )
92 - odbc? ( >=dev-db/unixODBC-2.2.6 )
93 - ldap? ( net-nds/openldap )
94 - postgres? ( dev-db/postgresql:= )
95 - caps? ( >=sys-libs/libcap-2.1.0 )
96 - xml? ( dev-libs/libxml2 )
97 - geoip? ( >=dev-libs/geoip-1.4.6 )
98 - geoip2? ( dev-libs/libmaxminddb )
99 - gssapi? ( virtual/krb5 )
100 - json? ( dev-libs/json-c:= )
101 - lmdb? ( dev-db/lmdb )
102 - zlib? ( sys-libs/zlib )
103 - dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
104 - python? (
105 - ${PYTHON_DEPS}
106 - dev-python/ply[${PYTHON_USEDEP}]
107 - )
108 - dev-libs/libuv:="
109 -
110 -RDEPEND="${DEPEND}
111 - selinux? ( sec-policy/selinux-bind )
112 - sys-process/psmisc"
113 -
114 -S="${WORKDIR}/${MY_P}"
115 -
116 -# bug 479092, requires networking
117 -# bug 710840, cmocka fails LDFLAGS='-Wl,-O1'
118 -RESTRICT="test"
119 -
120 -pkg_setup() {
121 - ebegin "Creating named group and user"
122 - enewgroup named 40
123 - enewuser named 40 -1 /etc/bind named
124 - eend ${?}
125 -}
126 -
127 -src_prepare() {
128 - default
129 -
130 - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir) -ldl"
131 -
132 - # Adjusting PATHs in manpages
133 - for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
134 - sed -i \
135 - -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
136 - -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
137 - -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
138 - "${i}" || die "sed failed, ${i} doesn't exist"
139 - done
140 -
141 -# if use dlz; then
142 -# # sdb-ldap patch as per bug #160567
143 -# # Upstream URL: http://bind9-ldap.bayour.com/
144 -# # New patch take from bug 302735
145 -# if use sdb-ldap; then
146 -# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
147 -# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
148 -# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
149 -# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
150 -# fi
151 -# fi
152 -
153 - # should be installed by bind-tools
154 - sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
155 -
156 - # Disable tests for now, bug 406399
157 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
158 -
159 - # bug #220361
160 - rm aclocal.m4 || die
161 - rm -rf libtool.m4/ || die
162 - eautoreconf
163 -}
164 -
165 -src_configure() {
166 - local myeconfargs=(
167 - --prefix="${EPREFIX}"/usr
168 - --sysconfdir=/etc/bind
169 - --localstatedir=/var
170 - --with-libtool
171 - --enable-full-report
172 - --without-readline
173 - --with-openssl="${EPREFIX}"/usr
174 - --without-cmocka
175 - $(use_enable caps linux-caps)
176 - $(use_enable dnsrps)
177 - $(use_enable dnstap)
178 - $(use_enable fixed-rrset)
179 - # $(use_enable static-libs static)
180 - $(use_with berkdb dlz-bdb)
181 - $(use_with dlz dlopen)
182 - $(use_with dlz dlz-filesystem)
183 - $(use_with dlz dlz-stub)
184 - $(use_with gssapi)
185 - $(use_with json json-c)
186 - $(use_with ldap dlz-ldap)
187 - $(use_with mysql dlz-mysql)
188 - $(use_with odbc dlz-odbc)
189 - $(use_with postgres dlz-postgres)
190 - $(use_with lmdb)
191 - $(use_with python)
192 - $(use_with xml libxml2)
193 - $(use_with zlib)
194 - )
195 -
196 - use geoip && myeconfargs+=( --with-geoip )
197 - use geoip2 && myeconfargs+=( --with-geoip2 )
198 -
199 - # bug #158664
200 -# gcc-specs-ssp && replace-flags -O[23s] -O
201 -
202 - # To include db.h from proper path
203 - use berkdb && append-flags "-I$(db_includedir)"
204 -
205 - export BUILD_CC=$(tc-getBUILD_CC)
206 - econf "${myeconfargs[@]}"
207 -
208 - # bug #151839
209 - echo '#undef SO_BSDCOMPAT' >> config.h
210 -}
211 -
212 -src_install() {
213 - default
214 -
215 - dodoc CHANGES README
216 -
217 - if use doc; then
218 - dodoc doc/arm/Bv9ARM.pdf
219 -
220 - docinto misc
221 - dodoc -r doc/misc/
222 -
223 - # might a 'html' useflag make sense?
224 - docinto html
225 - dodoc -r doc/arm/
226 -
227 - docinto contrib
228 - dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
229 -
230 - # some handy-dandy dynamic dns examples
231 - pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
232 - tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
233 - popd 1>/dev/null || die
234 - fi
235 -
236 - insinto /etc/bind
237 - newins "${FILESDIR}"/named.conf-r8 named.conf
238 -
239 - # ftp://ftp.rs.internic.net/domain/named.cache:
240 - insinto /var/bind
241 - newins "${FILESDIR}"/named.cache-r3 named.cache
242 -
243 - insinto /var/bind/pri
244 - newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
245 -
246 - newinitd "${FILESDIR}"/named.init-r13 named
247 - newconfd "${FILESDIR}"/named.confd-r7 named
248 -
249 - newenvd "${FILESDIR}"/10bind.env 10bind
250 -
251 - # Let's get rid of those tools and their manpages since they're provided by bind-tools
252 - rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die
253 - rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
254 - rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
255 - rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
256 - for tool in dsfromkey importkey keyfromlabel keygen \
257 - revoke settime signzone verify; do
258 - rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
259 - rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
260 - done
261 -
262 - # bug 405251, library archives aren't properly handled by --enable/disable-static
263 - if ! use static-libs; then
264 - find "${ED}" -type f -name '*.a' -delete || die
265 - fi
266 -
267 - # bug 405251
268 - find "${ED}" -type f -name '*.la' -delete || die
269 -
270 - if use python; then
271 - install_python_tools() {
272 - dosbin bin/python/dnssec-{checkds,coverage}
273 - }
274 - python_foreach_impl install_python_tools
275 -
276 - python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
277 - python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
278 - fi
279 -
280 - # bug 450406
281 - dosym named.cache /var/bind/root.cache
282 -
283 - dosym ../../var/bind/pri /etc/bind/pri
284 - dosym ../../var/bind/sec /etc/bind/sec
285 - dosym ../../var/bind/dyn /etc/bind/dyn
286 - keepdir /var/bind/{pri,sec,dyn}
287 -
288 - dodir /var/log/named
289 -
290 - fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
291 - fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
292 - fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
293 - fperms 0750 /etc/bind /var/bind/pri
294 - fperms 0770 /var/log/named /var/bind/{,sec,dyn}
295 -
296 - systemd_newunit "${FILESDIR}/named.service-r1" named.service
297 - systemd_dotmpfilesd "${FILESDIR}"/named.conf
298 - exeinto /usr/libexec
299 - doexe "${FILESDIR}/generate-rndc-key.sh"
300 -}
301 -
302 -pkg_postinst() {
303 - if [ ! -f '/etc/bind/rndc.key' ]; then
304 - if use urandom; then
305 - einfo "Using /dev/urandom for generating rndc.key"
306 - /usr/sbin/rndc-confgen -r /dev/urandom -a
307 - echo
308 - else
309 - einfo "Using /dev/random for generating rndc.key"
310 - /usr/sbin/rndc-confgen -a
311 - echo
312 - fi
313 - chown root:named /etc/bind/rndc.key || die
314 - chmod 0640 /etc/bind/rndc.key || die
315 - fi
316 -
317 - einfo
318 - einfo "You can edit /etc/conf.d/named to customize named settings"
319 - einfo
320 - use mysql || use postgres || use ldap && {
321 - elog "If your named depends on MySQL/PostgreSQL or LDAP,"
322 - elog "uncomment the specified rc_named_* lines in your"
323 - elog "/etc/conf.d/named config to ensure they'll start before bind"
324 - einfo
325 - }
326 - einfo "If you'd like to run bind in a chroot AND this is a new"
327 - einfo "install OR your bind doesn't already run in a chroot:"
328 - einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
329 - einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
330 - einfo
331 -
332 - CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
333 - if [[ -n ${CHROOT} ]]; then
334 - elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
335 - elog "To enable the old behaviour (without using mount) uncomment the"
336 - elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
337 - elog "If you decide to use the new/default method, ensure to make backup"
338 - elog "first and merge your existing configs/zones to /etc/bind and"
339 - elog "/var/bind because bind will now mount the needed directories into"
340 - elog "the chroot dir."
341 - fi
342 -}
343 -
344 -pkg_config() {
345 - CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
346 - CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
347 - CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
348 -
349 - if [[ -z "${CHROOT}" ]]; then
350 - eerror "This config script is designed to automate setting up"
351 - eerror "a chrooted bind/named. To do so, please first uncomment"
352 - eerror "and set the CHROOT variable in '/etc/conf.d/named'."
353 - die "Unset CHROOT"
354 - fi
355 - if [[ -d "${CHROOT}" ]]; then
356 - ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
357 - ewarn "To enable the old behaviour (without using mount) uncomment the"
358 - ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
359 - ewarn
360 - ewarn "${CHROOT} already exists... some things might become overridden"
361 - ewarn "press CTRL+C if you don't want to continue"
362 - sleep 10
363 - fi
364 -
365 - echo; einfo "Setting up the chroot directory..."
366 -
367 - mkdir -m 0750 -p ${CHROOT} || die
368 - mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
369 - mkdir -m 0750 -p ${CHROOT}/etc/bind || die
370 - mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
371 -
372 - chown root:named \
373 - ${CHROOT} \
374 - ${CHROOT}/var/{bind,log/named} \
375 - ${CHROOT}/run/named/ \
376 - ${CHROOT}/etc/bind \
377 - || die
378 -
379 - mknod ${CHROOT}/dev/null c 1 3 || die
380 - chmod 0666 ${CHROOT}/dev/null || die
381 -
382 - mknod ${CHROOT}/dev/zero c 1 5 || die
383 - chmod 0666 ${CHROOT}/dev/zero || die
384 -
385 - if use urandom; then
386 - mknod ${CHROOT}/dev/urandom c 1 9 || die
387 - chmod 0666 ${CHROOT}/dev/urandom || die
388 - else
389 - mknod ${CHROOT}/dev/random c 1 8 || die
390 - chmod 0666 ${CHROOT}/dev/random || die
391 - fi
392 -
393 - if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
394 - cp -a /etc/bind ${CHROOT}/etc/ || die
395 - cp -a /var/bind ${CHROOT}/var/ || die
396 - fi
397 -
398 - if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
399 - if use geoip; then
400 - mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
401 - elif use geoip2; then
402 - mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
403 - fi
404 - fi
405 -
406 - elog "You may need to add the following line to your syslog-ng.conf:"
407 - elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
408 -}