Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-dns
diff options
context:
space:
mode:
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/bind/ChangeLog9
-rw-r--r--net-dns/bind/bind-9.8.6.ebuild (renamed from net-dns/bind/bind-9.8.5_p2.ebuild)16
-rw-r--r--net-dns/bind/bind-9.9.4.ebuild430
-rw-r--r--net-dns/bind/files/named.conf-r5172
-rw-r--r--net-dns/bind/metadata.xml1
5 files changed, 448 insertions, 180 deletions
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index d975e51b51f3..9ce4f55216ea 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-dns/bind
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.472 2013/09/03 14:13:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.473 2013/10/13 15:07:21 idl0r Exp $
+
+*bind-9.9.4 (13 Oct 2013)
+*bind-9.8.6 (13 Oct 2013)
+
+ 13 Oct 2013; Christian Ruppert <idl0r@gentoo.org> -bind-9.8.5_p2.ebuild,
+ +bind-9.8.6.ebuild, +bind-9.9.4.ebuild, -files/named.conf-r5, metadata.xml:
+ Bump, fixes bug 483754 and bug 485802
03 Sep 2013; Agostino Sarubbo <ago@gentoo.org> -bind-9.9.2_p2.ebuild,
-files/bind-9.9.2_p1-libxml.patch:
diff --git a/net-dns/bind/bind-9.8.5_p2.ebuild b/net-dns/bind/bind-9.8.6.ebuild
index a9e0804e1e5b..360ca3533055 100644
--- a/net-dns/bind/bind-9.8.5_p2.ebuild
+++ b/net-dns/bind/bind-9.8.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.5_p2.ebuild,v 1.1 2013/07/29 19:31:14 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.8.6.ebuild,v 1.1 2013/10/13 15:07:21 idl0r Exp $
# Re dlz/mysql and threads, needs to be verified..
# MySQL uses thread local storage in its C api. Thus MySQL
@@ -11,7 +11,7 @@
# Because of this BIND MUST only run with a single thread when
# using the MySQL driver.
-EAPI="4"
+EAPI="5"
inherit eutils autotools toolchain-funcs flag-o-matic multilib db-use user
@@ -126,12 +126,13 @@ src_prepare() {
if use geoip; then
cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
-# sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
-# -e 's:RELEASEVER=:RELEASEVER=1:' \
-# ${GEOIP_PATCH_A} || die
- sed -i -e 's:RELEASEVER=1:RELEASEVER=2:' \
+ sed -i -e 's:^ PATCHVER=3: PATCHVER=6:' \
+ -e 's:^ RELEASETYPE=-P: RELEASETYPE=:' \
+ -e 's:RELEASEVER=1:RELEASEVER=:' \
${GEOIP_PATCH_A} || die
- epatch ${GEOIP_PATCH_A}
+# sed -i -e 's:RELEASEVER=1:RELEASEVER=2:' \
+# ${GEOIP_PATCH_A} || die
+ epatch -F0 ${GEOIP_PATCH_A}
fi
if use rrl; then
@@ -175,6 +176,7 @@ src_configure() {
--sysconfdir=/etc/bind \
--localstatedir=/var \
--with-libtool \
+ --enable-full-report \
$(use_enable threads) \
$(use_with dlz dlopen) \
$(use_with dlz dlz-filesystem) \
diff --git a/net-dns/bind/bind-9.9.4.ebuild b/net-dns/bind/bind-9.9.4.ebuild
new file mode 100644
index 000000000000..4d76c2acf035
--- /dev/null
+++ b/net-dns/bind/bind-9.9.4.ebuild
@@ -0,0 +1,430 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.4.ebuild,v 1.1 2013/10/13 15:07:21 idl0r Exp $
+
+# 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_DEPEND="python? 2:2.7 3"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit python 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"
+
+# bind-9.8.0-P1-geoip-1.3.patch
+GEOIP_PV=1.3
+#GEOIP_PV_AGAINST="${MY_PV}"
+GEOIP_PV_AGAINST="9.9.2"
+GEOIP_P="bind-${GEOIP_PV_AGAINST}-geoip-${GEOIP_PV}"
+GEOIP_PATCH_A="${GEOIP_P}.patch"
+GEOIP_DOC_A="bind-geoip-1.3-readme.txt"
+GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/"
+
+RRL_PV="${MY_PV}"
+
+# GeoIP: http://bind-geoip.googlecode.com/
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+# geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A}
+# ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} )
+
+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 )
+ geoip? ( ${GEOIP_SRC_URI_BASE}/files/${GEOIP_DOC_A}
+ http://dev.gentoo.org/~idl0r/${P}-geoip.patch )
+ sdb-ldap? (
+ http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+ )"
+
+LICENSE="ISC BSD BSD-2 HPND JNIC openssl"
+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"
+IUSE="berkdb caps dlz doc filter-aaaa fixed-rrset geoip gost gssapi idn ipv6
+ldap mysql odbc postgres python rpz rrl sdb-ldap selinux ssl static-libs threads
+urandom xml"
+# 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 )
+ sdb-ldap? ( dlz )
+ gost? ( ssl )
+ threads? ( caps )"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g[-bindist] )
+ mysql? ( >=virtual/mysql-4.0 )
+ odbc? ( >=dev-db/unixODBC-2.2.6 )
+ ldap? ( net-nds/openldap )
+ idn? ( net-dns/idnkit )
+ postgres? ( dev-db/postgresql-base )
+ caps? ( >=sys-libs/libcap-2.1.0 )
+ xml? ( dev-libs/libxml2 )
+ geoip? ( >=dev-libs/geoip-1.4.6 )
+ gssapi? ( virtual/krb5 )
+ sdb-ldap? ( net-nds/openldap )
+ gost? ( >=dev-libs/openssl-1.0.0[-bindist] )
+ python? ( virtual/python-argparse )"
+
+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}"
+
+pkg_setup() {
+ ebegin "Creating named group and user"
+ enewgroup named 40
+ enewuser named 40 -1 /etc/bind named
+ eend ${?}
+
+ if use python; then
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # 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
+ # bind fails to reconnect to MySQL5 databases, bug #180720, patch by Nicolas Brousse
+ # (http://www.shell-tips.com/2007/09/04/bind-950-patch-dlz-mysql-5-for-auto-reconnect/)
+ if use mysql && has_version ">=dev-db/mysql-5"; then
+ epatch "${FILESDIR}"/bind-dlzmysql5-reconnect.patch
+ fi
+
+ if use odbc; then
+ epatch "${FILESDIR}/${PN}-9.7.3-odbc-dlz-detect.patch"
+ fi
+
+ # 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) ::g" bin/Makefile.in || die
+
+ if use geoip; then
+# cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die
+# sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \
+# -e 's:RELEASEVER=:RELEASEVER=2:' \
+# ${GEOIP_PATCH_A} || die
+# sed -i -e 's:^ PATCHVER=2: PATCHVER=4:' ${GEOIP_PATCH_A} || die
+# epatch -F0 ${GEOIP_PATCH_A}
+ epatch -F0 "${DISTDIR}/${P}-geoip.patch"
+ fi
+
+ # Disable tests for now, bug 406399
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+ # 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 \
+ $(use_enable threads) \
+ $(use_with dlz dlopen) \
+ $(use_with dlz dlz-filesystem) \
+ $(use_with dlz dlz-stub) \
+ $(use_with postgres dlz-postgres) \
+ $(use_with mysql dlz-mysql) \
+ $(use_with berkdb dlz-bdb) \
+ $(use_with ldap dlz-ldap) \
+ $(use_with odbc dlz-odbc) \
+ $(use_with ssl openssl "${EPREFIX}"/usr) \
+ $(use_with ssl ecdsa) \
+ $(use_with idn) \
+ $(use_enable ipv6) \
+ $(use_with xml libxml2) \
+ $(use_enable xml newstats) \
+ $(use_with gssapi) \
+ $(use_enable rpz rpz-nsip) \
+ $(use_enable rpz rpz-nsdname) \
+ $(use_enable caps linux-caps) \
+ $(use_with gost) \
+ $(use_enable filter-aaaa) \
+ $(use_enable fixed-rrset) \
+ $(use_enable rrl) \
+ $(use_with python) \
+ --without-readline \
+ ${myconf}
+
+ # $(use_enable static-libs static) \
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ 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/named-bootconf/named-bootconf.sh \
+ contrib/nanny/nanny.pl
+
+ # 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
+
+ use geoip && dodoc "${DISTDIR}"/${GEOIP_DOC_A}
+
+ insinto /etc/bind
+ newins "${FILESDIR}"/named.conf-r6 named.conf
+
+ # ftp://ftp.rs.internic.net/domain/named.cache:
+ insinto /var/bind
+ doins "${FILESDIR}"/named.cache
+
+ insinto /var/bind/pri
+ newins "${FILESDIR}"/127.zone-r1 127.zone
+ newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+ newinitd "${FILESDIR}"/named.init-r12 named
+ newconfd "${FILESDIR}"/named.confd-r6 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/{dnssec-keygen,nsupdate}.8*
+ rm -f "${D}"/usr/bin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+ rm -f "${D}"/usr/sbin/{dig,host,nslookup,dnssec-keygen,nsupdate}
+
+ # bug 405251, library archives aren't properly handled by --enable/disable-static
+ if ! use static-libs; then
+ find "${D}" -type f -name '*.la' -delete || die
+ fi
+
+ if use python; then
+ install_python_tools() {
+ python_convert_shebangs $PYTHON_ABI bin/python/dnssec-checkds bin/python/dnssec-coverage
+ exeinto /usr/sbin
+ newexe bin/python/dnssec-checkds dnssec-checkds-${PYTHON_ABI}
+ newexe bin/python/dnssec-coverage dnssec-coverage-${PYTHON_ABI}
+ }
+ python_execute_function install_python_tools
+
+ rm -f "${D}/usr/sbin/dnssec-"{checkds,coverage}
+ python_generate_wrapper_scripts "${D}usr/sbin/dnssec-checkds"
+ python_generate_wrapper_scripts "${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/{run,log}/named
+
+ fowners root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}
+ fowners root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0750 /etc/bind /var/bind/pri
+ fperms 0770 /var/{run,log}/named /var/bind/{,sec,dyn}
+
+ systemd_dounit "${FILESDIR}/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
+
+ ewarn
+ ewarn "NOTE: /var/bind/named.ca has been renamed to /var/bind/named.cache"
+ ewarn "you may need to fix your named.conf!"
+ ewarn
+ ewarn "NOTE: If you upgrade from <net-dns/bind-9.4.3_p5-r1, you may encounter permission problems"
+ ewarn "To fix the permissions do:"
+ ewarn "chown root:named /{etc,var}/bind /var/{run,log}/named /var/bind/{sec,pri,dyn}"
+ ewarn "chown root:named /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
+ ewarn "chmod 0640 /var/bind/named.cache /var/bind/pri/{127,localhost}.zone /etc/bind/{bind.keys,named.conf}"
+ ewarn "chmod 0750 /etc/bind /var/bind/pri"
+ ewarn "chmod 0770 /var/{run,log}/named /var/bind/{,sec,dyn}"
+ ewarn
+}
+
+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/{run,log}}
+ mkdir -m 0750 -p ${CHROOT}/etc/bind
+ mkdir -m 0770 -p ${CHROOT}/var/{bind,{run,log}/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,{run,log}/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.conf-r5 b/net-dns/bind/files/named.conf-r5
deleted file mode 100644
index aab639f5982d..000000000000
--- a/net-dns/bind/files/named.conf-r5
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Refer to the named.conf(5) and named(8) man pages, and the documentation
- * in /usr/share/doc/bind-9 for more details.
- * Online versions of the documentation can be found here:
- * http://www.isc.org/software/bind/documentation
- *
- * If you are going to set up an authoritative server, make sure you
- * understand the hairy details of how DNS works. Even with simple mistakes,
- * you can break connectivity for affected parties, or cause huge amounts of
- * useless Internet traffic.
- */
-
-acl "xfer" {
- /* Deny transfers by default except for the listed hosts.
- * If we have other name servers, place them here.
- */
- none;
-};
-
-/*
- * You might put in here some ips which are allowed to use the cache or
- * recursive queries
- */
-acl "trusted" {
- 127.0.0.0/8;
- ::1/128;
-};
-
-options {
- directory "/var/bind";
- pid-file "/var/run/named/named.pid";
-
- /* https://www.isc.org/solutions/dlv >=bind-9.7.x only */
- //bindkeys-file "/etc/bind/bind.keys";
-
- listen-on-v6 { ::1; };
- listen-on { 127.0.0.1; };
-
- allow-query {
- /*
- * Accept queries from our "trusted" ACL. We will
- * allow anyone to query our master zones below.
- * This prevents us from becoming a free DNS server
- * to the masses.
- */
- trusted;
- };
-
- allow-query-cache {
- /* Use the cache for the "trusted" ACL. */
- trusted;
- };
-
- allow-recursion {
- /* Only trusted addresses are allowed to use recursion. */
- trusted;
- };
-
- allow-transfer {
- /* Zone tranfers are denied by default. */
- none;
- };
-
- allow-update {
- /* Don't allow updates, e.g. via nsupdate. */
- none;
- };
-
- /*
- * If you've got a DNS server around at your upstream provider, enter its
- * IP address here, and enable the line below. This will make you benefit
- * from its cache, thus reduce overall DNS traffic in the Internet.
- *
- * Uncomment the following lines to turn on DNS forwarding, and change
- * and/or update the forwarding ip address(es):
- */
-/*
- forward first;
- forwarders {
- // 123.123.123.123; // Your ISP NS
- // 124.124.124.124; // Your ISP NS
- // 4.2.2.1; // Level3 Public DNS
- // 4.2.2.2; // Level3 Public DNS
- 8.8.8.8; // Google Open DNS
- 8.8.4.4; // Google Open DNS
- };
-
-*/
-
- //dnssec-enable yes;
- //dnssec-validation yes;
-
- /*
- * As of bind 9.8.0:
- * "If the root key provided has expired,
- * named will log the expiration and validation will not work."
- */
- //dnssec-validation auto;
-
- /* if you have problems and are behind a firewall: */
- //query-source address * port 53;
-};
-
-/*
-logging {
- channel default_log {
- file "/var/log/named/named.log" versions 5 size 50M;
- print-time yes;
- print-severity yes;
- print-category yes;
- };
-
- category default { default_log; };
- category general { default_log; };
-};
-*/
-
-include "/etc/bind/rndc.key";
-controls {
- inet 127.0.0.1 port 953 allow { 127.0.0.1/32; ::1/128; } keys { "rndc-key"; };
-};
-
-zone "." in {
- type hint;
- file "/var/bind/root.cache";
-};
-
-zone "localhost" IN {
- type master;
- file "pri/localhost.zone";
- notify no;
-};
-
-zone "127.in-addr.arpa" IN {
- type master;
- file "pri/127.zone";
- notify no;
-};
-
-/*
- * Briefly, a zone which has been declared delegation-only will be effectively
- * limited to containing NS RRs for subdomains, but no actual data beyond its
- * own apex (for example, its SOA RR and apex NS RRset). This can be used to
- * filter out "wildcard" or "synthesized" data from NAT boxes or from
- * authoritative name servers whose undelegated (in-zone) data is of no
- * interest.
- * See http://www.isc.org/software/bind/delegation-only for more info
- */
-
-//zone "COM" { type delegation-only; };
-//zone "NET" { type delegation-only; };
-
-//zone "YOUR-DOMAIN.TLD" {
-// type master;
-// file "/var/bind/pri/YOUR-DOMAIN.TLD.zone";
-// allow-query { any; };
-// allow-transfer { xfer; };
-//};
-
-//zone "YOUR-SLAVE.TLD" {
-// type slave;
-// file "/var/bind/sec/YOUR-SLAVE.TLD.zone";
-// masters { <MASTER>; };
-
- /* Anybody is allowed to query but transfer should be controlled by the master. */
-// allow-query { any; };
-// allow-transfer { none; };
-
- /* The master should be the only one who notifies the slaves, shouldn't it? */
-// allow-notify { <MASTER>; };
-// notify no;
-//};
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index c169b1c7b07f..150a951b3167 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -9,6 +9,7 @@
<use>
<flag name="dlz">Enables dynamic loaded zones, 3rd party extension</flag>
<flag name="filter-aaaa">Enable filtering of AAAA records over IPv4</flag>
+ <flag name="fixed-rrset">Enables fixed rrset-order option</flag>
<flag name="gost">Enables gost OpenSSL engine support</flag>
<flag name="gssapi">Enable gssapi support</flag>
<flag name="rpz">Enable response policy rewriting (rpz)</flag>