commit: f19bdf3ec00322110716de71bcce886e54c4bc3b
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 09:08:05 2018 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 09:08:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f19bdf3e
net-dns/bind: Cleanup + Update named.cache re bug 640774
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-dns/bind/Manifest | 1 -
net-dns/bind/bind-9.11.1_p1.ebuild | 426 -------------------------------------
net-dns/bind/files/named.cache-r3 | 6 +-
3 files changed, 3 insertions(+), 430 deletions(-)
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 2c7ff2a5ff4..255a899b17a 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,4 +1,3 @@
-DIST bind-9.11.1-P1.tar.gz 9745364 BLAKE2B
6f7ff5afd8478b95787848f315226b26b76e34ff594c604f18e2948617f04e7f8bf4568a225e3aa4c706c5d379b27e91a84831e0a3d1d1b0d15f02ba6772fc76
SHA512
5683ae7be264e11b5b2a843d216e3ca4959b7de109863d5435090b2e033d6c405689e4ce57385ca787b1c948f4437aea39b8d5164a1d347c167f87337e9fc760
DIST bind-9.11.1-P3.tar.gz 9749095 BLAKE2B
1b68b57b9aed1a5210464e9c47a4e0569f1932076c042a7096dc04f69b45da9df8b2d56ec0f1f0d0fb136e7f61a39b3cb20d1912075f3a4138cbdf47f859cf0a
SHA512
bf92ce1e07e5c84cc42b413bdbd3ad97f37712a6dc330dc10182992d948b7a393d5446efa188379b39020c34d810cebe2a7acccc9b8aa6bb564e1f3e6be42e96
DIST bind-9.11.2.tar.gz 9782180 BLAKE2B
e64a85126a0fd7c735a54ec2a3b9a260e3068571f16923365af636b7fdb686a378ec6782bfcfc0f25ec19792475a8bd24fdd34acf8b33456809ebc8b8eb562d0
SHA512
c837c0a360049b0077b155eede9b6a71f63d1caca2ddf20a8ab7860a1033a3750e49cd2804dcf8c43b0aef04bcea99422d1302b4eae1646eb69a5ae6d64625b9
DIST dyndns-samples.tbz2 22866 BLAKE2B
409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108
SHA512
83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
diff --git a/net-dns/bind/bind-9.11.1_p1.ebuild
b/net-dns/bind/bind-9.11.1_p1.ebuild
deleted file mode 100644
index eaa05818163..00000000000
--- a/net-dns/bind/bind-9.11.1_p1.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Re dlz/mysql and threads, needs to be verified..
-# MySQL uses thread local storage in its C api. Thus MySQL
-# requires that each thread of an application execute a MySQL
-# thread initialization to setup the thread local storage.
-# This is impossible to do safely while staying within the DLZ
-# driver API. This is a limitation caused by MySQL, and not the DLZ API.
-# Because of this BIND MUST only run with a single thread when
-# using the MySQL driver.
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib
db-use user systemd
-
-MY_PV="${PV/_p/-P}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SDB_LDAP_VER="1.1.0-fc14"
-
-RRL_PV="${MY_PV}"
-
-NSLINT_DIR="contrib/nslint-3.0a2/"
-
-# SDB-LDAP: http://bind9-ldap.bayour.com/
-
-DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
-HOMEPAGE="http://www.isc.org/software/bind";
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz
- doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
-# sdb-ldap? (
-#
http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
-# )"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi
idn ipv6
-json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux
ssl static-libs
-+threads urandom xml +zlib"
-# sdb-ldap - patch broken
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="postgres? ( dlz )
- berkdb? ( dlz )
- mysql? ( dlz !threads )
- odbc? ( dlz )
- ldap? ( dlz )
- gost? ( !libressl ssl )
- threads? ( caps )
- dnstap? ( threads )
- python? ( ${PYTHON_REQUIRED_USE} )"
-# sdb-ldap? ( dlz )
-
-DEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0[-bindist] )
- libressl? ( dev-libs/libressl )
- )
- mysql? ( >=virtual/mysql-4.0 )
- odbc? ( >=dev-db/unixODBC-2.2.6 )
- ldap? ( net-nds/openldap )
- idn? ( net-dns/idnkit )
- postgres? ( dev-db/postgresql:= )
- caps? ( >=sys-libs/libcap-2.1.0 )
- xml? ( dev-libs/libxml2 )
- geoip? ( >=dev-libs/geoip-1.4.6 )
- gssapi? ( virtual/krb5 )
- gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
- seccomp? ( sys-libs/libseccomp )
- json? ( dev-libs/json-c:= )
- lmdb? ( dev-db/lmdb )
- zlib? ( sys-libs/zlib )
- dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
- python? (
- ${PYTHON_DEPS}
- dev-python/ply[${PYTHON_USEDEP}]
- )"
-# sdb-ldap? ( net-nds/openldap )
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-bind )
- || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc
sys-process/fuser-bsd )"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-pkg_setup() {
- ebegin "Creating named group and user"
- enewgroup named 40
- enewuser named 40 -1 /etc/bind named
- eend ${?}
-}
-
-src_prepare() {
- # bug 600212
- epatch "${FILESDIR}"/${PN}-9.11.0_p5-dyndb-dlopen.patch
-
- # Adjusting PATHs in manpages
- for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
- sed -i \
- -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
- -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
- -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
- "${i}" || die "sed failed, ${i} doesn't exist"
- done
-
-# if use dlz; then
-# # sdb-ldap patch as per bug #160567
-# # Upstream URL: http://bind9-ldap.bayour.com/
-# # New patch take from bug 302735
-# if use sdb-ldap; then
-# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
-# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
-# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c}
bin/tools/
-# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c}
bin/tools/
-# fi
-# fi
-
- # should be installed by bind-tools
- sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
-
- # Disable tests for now, bug 406399
- sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
- if use nslint; then
- sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:'
${NSLINT_DIR}/nslint.{c,8} || die
- fi
-
- # bug #220361
- rm aclocal.m4
- rm -rf libtool.m4/
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
-
- if use urandom; then
- myconf="${myconf} --with-randomdev=/dev/urandom"
- else
- myconf="${myconf} --with-randomdev=/dev/random"
- fi
-
- use geoip && myconf="${myconf} --with-geoip"
-
- # bug #158664
-# gcc-specs-ssp && replace-flags -O[23s] -O
-
- # To include db.h from proper path
- use berkdb && append-flags "-I$(db_includedir)"
-
- export BUILD_CC=$(tc-getBUILD_CC)
- econf \
- --sysconfdir=/etc/bind \
- --localstatedir=/var \
- --with-libtool \
- --enable-full-report \
- --without-readline \
- $(use_enable caps linux-caps) \
- $(use_enable filter-aaaa) \
- $(use_enable fixed-rrset) \
- $(use_enable ipv6) \
- $(use_enable rpz rpz-nsdname) \
- $(use_enable rpz rpz-nsip) \
- $(use_enable seccomp) \
- $(use_enable threads) \
- $(use_with berkdb dlz-bdb) \
- $(use_with dlz dlopen) \
- $(use_with dlz dlz-filesystem) \
- $(use_with dlz dlz-stub) \
- $(use_with gost) \
- $(use_with gssapi) \
- $(use_with idn) \
- $(use_with json libjson) \
- $(use_with ldap dlz-ldap) \
- $(use_with mysql dlz-mysql) \
- $(use_with odbc dlz-odbc) \
- $(use_with postgres dlz-postgres) \
- $(use_with lmdb) \
- $(use_with python) \
- $(use_with ssl ecdsa) \
- $(use_with ssl openssl "${EPREFIX}"/usr) \
- $(use_with xml libxml2) \
- $(use_with zlib) \
- ${myconf}
-
- # $(use_enable static-libs static) \
-
- # bug #151839
- echo '#undef SO_BSDCOMPAT' >> config.h
-
- if use nslint; then
- cd $NSLINT_DIR
- econf
- fi
-}
-
-src_compile() {
- emake
-
- if use nslint; then
- emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- if use nslint; then
- cd $NSLINT_DIR
- dobin nslint
- doman nslint.8
- cd "${S}"
- fi
-
- dodoc CHANGES FAQ README
-
- if use idn; then
- dodoc contrib/idn/README.idnkit
- fi
-
- if use doc; then
- dodoc doc/arm/Bv9ARM.pdf
-
- docinto misc
- dodoc doc/misc/*
-
- # might a 'html' useflag make sense?
- docinto html
- dohtml -r doc/arm/*
-
- docinto contrib
- dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
-
- # some handy-dandy dynamic dns examples
- pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
- tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
- popd 1>/dev/null
- fi
-
- insinto /etc/bind
- newins "${FILESDIR}"/named.conf-r8 named.conf
-
- # ftp://ftp.rs.internic.net/domain/named.cache:
- insinto /var/bind
- newins "${FILESDIR}"/named.cache-r3 named.cache
-
- insinto /var/bind/pri
- newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
-
- newinitd "${FILESDIR}"/named.init-r13 named
- newconfd "${FILESDIR}"/named.confd-r7 named
-
- if use gost; then
- sed -i -e
's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/'
"${D}/etc/init.d/named" || die
- else
- sed -i -e
's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/'
"${D}/etc/init.d/named" || die
- fi
-
- newenvd "${FILESDIR}"/10bind.env 10bind
-
- # Let's get rid of those tools and their manpages since they're
provided by bind-tools
- rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
- rm -f "${D}"/usr/share/man/man8/nsupdate.8*
- rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate}
- rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate}
- for tool in dsfromkey importkey keyfromlabel keygen \
- revoke settime signzone verify; do
- rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}"
- rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8*
- done
-
- # bug 405251, library archives aren't properly handled by
--enable/disable-static
- if ! use static-libs; then
- find "${D}" -type f -name '*.a' -delete || die
- fi
-
- # bug 405251
- find "${D}" -type f -name '*.la' -delete || die
-
- if use python; then
- install_python_tools() {
- dosbin bin/python/dnssec-{checkds,coverage}
- }
- python_foreach_impl install_python_tools
-
- python_replicate_script "${D}usr/sbin/dnssec-checkds"
- python_replicate_script "${D}usr/sbin/dnssec-coverage"
- fi
-
- # bug 450406
- dosym named.cache /var/bind/root.cache
-
- dosym /var/bind/pri /etc/bind/pri
- dosym /var/bind/sec /etc/bind/sec
- dosym /var/bind/dyn /etc/bind/dyn
- keepdir /var/bind/{pri,sec,dyn}
-
- dodir /var/log/named
-
- fowners root:named /{etc,var}/bind /var/log/named
/var/bind/{sec,pri,dyn}
- fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone
/etc/bind/{bind.keys,named.conf}
- fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone
/etc/bind/{bind.keys,named.conf}
- fperms 0750 /etc/bind /var/bind/pri
- fperms 0770 /var/log/named /var/bind/{,sec,dyn}
-
- systemd_newunit "${FILESDIR}/named.service-r1" named.service
- systemd_dotmpfilesd "${FILESDIR}"/named.conf
- exeinto /usr/libexec
- doexe "${FILESDIR}/generate-rndc-key.sh"
-}
-
-pkg_postinst() {
- if [ ! -f '/etc/bind/rndc.key' ]; then
- if use urandom; then
- einfo "Using /dev/urandom for generating rndc.key"
- /usr/sbin/rndc-confgen -r /dev/urandom -a
- echo
- else
- einfo "Using /dev/random for generating rndc.key"
- /usr/sbin/rndc-confgen -a
- echo
- fi
- chown root:named /etc/bind/rndc.key
- chmod 0640 /etc/bind/rndc.key
- fi
-
- einfo
- einfo "You can edit /etc/conf.d/named to customize named settings"
- einfo
- use mysql || use postgres || use ldap && {
- elog "If your named depends on MySQL/PostgreSQL or LDAP,"
- elog "uncomment the specified rc_named_* lines in your"
- elog "/etc/conf.d/named config to ensure they'll start before
bind"
- einfo
- }
- einfo "If you'd like to run bind in a chroot AND this is a new"
- einfo "install OR your bind doesn't already run in a chroot:"
- einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
- einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
- einfo
-
- CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
- if [[ -n ${CHROOT} ]]; then
- elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of
the init-script got some major changes!"
- elog "To enable the old behaviour (without using mount)
uncomment the"
- elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
- elog "If you decide to use the new/default method, ensure to
make backup"
- elog "first and merge your existing configs/zones to /etc/bind
and"
- elog "/var/bind because bind will now mount the needed
directories into"
- elog "the chroot dir."
- fi
-}
-
-pkg_config() {
- CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
- CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
- CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
-
- if [[ -z "${CHROOT}" ]]; then
- eerror "This config script is designed to automate setting up"
- eerror "a chrooted bind/named. To do so, please first uncomment"
- eerror "and set the CHROOT variable in '/etc/conf.d/named'."
- die "Unset CHROOT"
- fi
- if [[ -d "${CHROOT}" ]]; then
- ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of
the init-script got some major changes!"
- ewarn "To enable the old behaviour (without using mount)
uncomment the"
- ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
- ewarn
- ewarn "${CHROOT} already exists... some things might become
overridden"
- ewarn "press CTRL+C if you don't want to continue"
- sleep 10
- fi
-
- echo; einfo "Setting up the chroot directory..."
-
- mkdir -m 0750 -p ${CHROOT}
- mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run}
- mkdir -m 0750 -p ${CHROOT}/etc/bind
- mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/
- # As of bind 9.8.0
- if has_version net-dns/bind[gost]; then
- if [ "$(get_libdir)" = "lib64" ]; then
- mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
- ln -s lib64 ${CHROOT}/usr/lib
- else
- mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
- fi
- fi
- chown root:named ${CHROOT} ${CHROOT}/var/{bind,log/named}
${CHROOT}/run/named/ ${CHROOT}/etc/bind
-
- mknod ${CHROOT}/dev/null c 1 3
- chmod 0666 ${CHROOT}/dev/null
-
- mknod ${CHROOT}/dev/zero c 1 5
- chmod 0666 ${CHROOT}/dev/zero
-
- if use urandom; then
- mknod ${CHROOT}/dev/urandom c 1 9
- chmod 0666 ${CHROOT}/dev/urandom
- else
- mknod ${CHROOT}/dev/random c 1 8
- chmod 0666 ${CHROOT}/dev/random
- fi
-
- if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
- cp -a /etc/bind ${CHROOT}/etc/
- cp -a /var/bind ${CHROOT}/var/
- fi
-
- if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
- mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
- fi
-
- elog "You may need to add the following line to your syslog-ng.conf:"
- elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
-}
diff --git a/net-dns/bind/files/named.cache-r3
b/net-dns/bind/files/named.cache-r3
index 198d1b39b9b..4fb2143df52 100644
--- a/net-dns/bind/files/named.cache-r3
+++ b/net-dns/bind/files/named.cache-r3
@@ -9,8 +9,8 @@
; on server FTP.INTERNIC.NET
; -OR- RS.INTERNIC.NET
;
-; last update: August 29, 2017
-; related version of root zone: 2017082901
+; last update: November 16, 2017
+; related version of root zone: 2017111601
;
; FORMERLY NS.INTERNIC.NET
;
@@ -21,7 +21,7 @@ A.ROOT-SERVERS.NET. 3600000 AAAA
2001:503:ba3e::2:30
; FORMERLY NS1.ISI.EDU
;
. 3600000 NS B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201
+B.ROOT-SERVERS.NET. 3600000 A 199.9.14.201
B.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:200::b
;
; FORMERLY C.PSI.NET
