Index: head/dns/bind9-devel/Makefile =================================================================== --- head/dns/bind9-devel/Makefile (revision 487358) +++ head/dns/bind9-devel/Makefile (revision 487359) @@ -1,275 +1,286 @@ # $FreeBSD$ # pkg-help formatted with fmt 59 63 PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 1 .else # XXX: correct version # dns/bind9xx here -PORTREVISION= 1 +PORTREVISION= 2 .endif CATEGORIES= dns net ipv6 # XXX: put the ISC master_site #MASTER_SITES= ISC/bind9/${ISCVERSION} MASTER_SITES= LOCAL/mat/bind .if defined(BIND_TOOLS_SLAVE) PKGNAMESUFFIX= -tools .else PKGNAMESUFFIX= 9-devel .endif # XXX: correct DISTNAME. #DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org .if defined(BIND_TOOLS_SLAVE) COMMENT= Command line tools from BIND: delv, dig, host, nslookup... .else COMMENT= BIND DNS suite with updated DNSSEC and DNS64 .endif LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libxml2.so:textproc/libxml2 # XXX: remove tar:bz2 USES= compiler:c11 cpe libedit ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like ISCVERSION= 9.13.4a0.2018.12.10 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 GL_COMMIT= e5da71f746f11cc8df458d41d97d9f9c4a9a318d CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} .if ${ISCVERSION:M*-*} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ - --disable-symtable \ --with-libxml2=${LOCALBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --with-openssl=${OPENSSLBASE} \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb # XXX: Add -devel CONFLICTS= bind99 bind910 bind911 bind912 bind913 .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared # XXX: Change to the correct version CONFLICTS+= bind9-devel .else USE_RC_SUBR= named SUB_FILES= pkg-message named.conf CONFLICTS+= bind-tools PORTDOCS= * .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON PYTHON OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11 .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ START_LATE TUNING_LARGE TCP_FASTOPEN OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB .endif # BIND_TOOLS_SLAVE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SUB= yes CRYPTO_DESC= Choose which crypto engine to use DLZ_BDB_DESC= DLZ BDB driver DLZ_DESC= Dynamically Loadable Zones DLZ_FILESYSTEM_DESC= DLZ filesystem driver DLZ_LDAP_DESC= DLZ LDAP driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_STUB_DESC= DLZ stub driver DNSTAP_DESC= Provides fast passive logging of DNS messages FIXED_RRSET_DESC= Enable fixed rrset ordering GEOIP_DESC= Allow geographically based ACL. GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable LARGE_FILE_DESC= 64-bit file support LMDB_DESC= Use LMDB for zone management MINCACHE_DESC= Use the mincachettl patch NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) PORTREVISION_DESC= Show PORTREVISION in the version string PYTHON_DESC= Build with Python utilities QUERYTRACE_DESC= Enable the very verbose query tracelogging RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation START_LATE_DESC= Start BIND late in the boot process (see help) TCP_FASTOPEN_DESC= RFC 7413 support TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes DLZ_BDB_USES= bdb DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes DLZ_LDAP_USE= openldap=yes DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_USES= mysql DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes DLZ_POSTGRESQL_USES= pgsql DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP GSSAPI_BASE_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi IDN_CONFIGURE_OFF= --without-libidn2 IDN_CONFIGURE_ON= --with-libidn2=${LOCALBASE} ${ICONV_CONFIGURE_BASE} IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_USES= iconv JSON_CONFIGURE_WITH= libjson=${LOCALBASE} JSON_LIB_DEPENDS= libjson-c.so:devel/json-c LARGE_FILE_CONFIGURE_ENABLE= largefile LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_USES= python QUERYTRACE_CONFIGURE_ENABLE= querytrace RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ NAMED_BEFORE="LOGIN" START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ NAMED_BEFORE="SERVERS" TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen TUNING_LARGE_CONFIGURE_ON= --with-tuning=large TUNING_LARGE_CONFIGURE_OFF= --with-tuning=default .include + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-symtable +.else +CONFIGURE_ARGS+= --disable-symtable +.endif + +.if ${SSL_DEFAULT} == base +SUB_LIST+= ENGINES=/usr/lib/engines +.else +SUB_LIST+= ENGINES=${LOCALBASE}/lib/engines +.endif # XXX: Remove post-extract: echo "SRCID=${GL_COMMIT}" > ${WRKSRC}/srcid # XXX: Remove first REINPLACE_CMD post-patch: @${REINPLACE_CMD} -e '/RELEASETYPE=/s#$$#-${GL_COMMIT}#' \ ${WRKSRC}/version .if defined(BIND_TOOLS_SLAVE) @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ -e 's#isc-config.sh installdirs#installdirs#' \ -e 's#.*INSTALL.*isc-config.*##' \ -e 's#.*INSTALL.*bind.keys.*##' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \ -e 's#^ .*check confgen ##' \ ${WRKSRC}/bin/Makefile.in .else . for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} . endfor .endif .if !defined(BIND_TOOLS_SLAVE) . if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ ${WRKSRC}/version . endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} . for i in dynamic master slave working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i . endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .endif # BIND_TOOLS_SLAVE # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} .include Index: head/dns/bind9-devel/files/named.in =================================================================== --- head/dns/bind9-devel/files/named.in (revision 487358) +++ head/dns/bind9-devel/files/named.in (revision 487359) @@ -1,435 +1,451 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: named # REQUIRE: %%NAMED_REQUIRE%% # BEFORE: %%NAMED_BEFORE%% # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable BIND: # named_enable (bool): Run named, the DNS server (or NO). # named_program (str): Path to named, if you want a different one. # named_conf (str): Path to the configuration file # named_flags (str): Use this for flags OTHER than -u and -c # named_uid (str): User to run named as # named_chrootdir (str): Chroot directory (or "" not to auto-chroot it) # Historically, was /var/named # named_chroot_autoupdate (bool): Automatically install/update chrooted # components of named. # named_symlink_enable (bool): Symlink the chrooted pid file # named_wait (bool): Wait for working name service before exiting # named_wait_host (str): Hostname to check if named_wait is enabled # named_auto_forward (str): Set up forwarders from /etc/resolv.conf # named_auto_forward_only (str): Do "forward only" instead of "forward first" %%NATIVE_PKCS11%%# named_pkcs11_engine (str): Path to the PKCS#11 library to use. # . /etc/rc.subr name=named desc="named BIND startup script" rcvar=named_enable load_rc_config ${name} extra_commands=reload start_precmd=named_prestart start_postcmd=named_poststart reload_cmd=named_reload stop_cmd=named_stop stop_postcmd=named_poststop named_enable=${named_enable:-"NO"} named_program=${named_program:-"%%PREFIX%%/sbin/named"} named_conf=${named_conf:-"%%ETCDIR%%/named.conf"} named_flags=${named_flags:-""} named_uid=${named_uid:-"bind"} named_chrootdir=${named_chrootdir:-""} named_chroot_autoupdate=${named_chroot_autoupdate:-"YES"} named_symlink_enable=${named_symlink_enable:-"YES"} named_wait=${named_wait:-"NO"} named_wait_host=${named_wait_host:-"localhost"} named_auto_forward=${named_auto_forward:-"NO"} named_auto_forward_only=${named_auto_forward_only:-"NO"} %%NATIVE_PKCS11%%named_pkcs11_engine=${named_pkcs11_engine:-""} # Not configuration variables but having them here keeps rclint happy required_dirs="${named_chrootdir}" _named_confdirroot="${named_conf%/*}" _named_confdir="${named_chrootdir}${_named_confdirroot}" _named_program_root="${named_program%/sbin/named}" -_openssl_engines="%%LOCALBASE%%/lib/engines" +_openssl_engines="%%ENGINES%%" # Needed if named.conf and rndc.conf are moved or if rndc.conf is used rndc_conf=${rndc_conf:-"$_named_confdir/rndc.conf"} rndc_key=${rndc_key:-"$_named_confdir/rndc.key"} # If running in a chroot cage, ensure that the appropriate files # exist inside the cage, as well as helper symlinks into the cage # from outside. # # As this is called after the is_running and required_dir checks # are made in run_rc_command(), we can safely assume ${named_chrootdir} # exists and named isn't running at this point (unless forcestart # is used). # chroot_autoupdate() { local file # If it's the first time around, fiddle with things and move the # current configuration to the chroot. if [ -d ${_named_confdirroot} -a ! -d ${_named_confdir} ]; then warn "named chroot: Moving current configuration in the chroot!" install -d ${_named_confdir%/*} mv ${_named_confdirroot} ${_named_confdir} fi # Create (or update) the chroot directory structure # if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.dist ]; then mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.dist \ -p ${named_chrootdir} else warn "%%PREFIX%%/etc/mtree/BIND.chroot.dist missing," warn "${named_chrootdir} directory structure not updated" fi if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.local.dist ]; then mkdir -p ${named_chrootdir}%%PREFIX%% mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.local.dist \ -p ${named_chrootdir}%%PREFIX%% else warn "%%PREFIX%%/etc/mtree/BIND.chroot.local.dist missing," warn "${named_chrootdir}%%PREFIX%% directory structure not updated" fi # Create (or update) the configuration directory symlink # if [ ! -L "${_named_confdirroot}" ]; then if [ -d "${_named_confdirroot}" ]; then warn "named chroot: ${_named_confdirroot} is a directory!" elif [ -e "${_named_confdirroot}" ]; then warn "named chroot: ${_named_confdirroot} exists!" else ln -s ${_named_confdir} ${_named_confdirroot} fi else # Make sure it points to the right place. ln -shf ${_named_confdir} ${_named_confdirroot} fi # Mount a devfs in the chroot directory if needed # if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then umount ${named_chrootdir}/dev 2>/dev/null devfs_domount ${named_chrootdir}/dev devfsrules_hide_all devfs -m ${named_chrootdir}/dev rule apply path null unhide devfs -m ${named_chrootdir}/dev rule apply path random unhide else if [ -c ${named_chrootdir}/dev/null -a \ -c ${named_chrootdir}/dev/random ]; then info "named chroot: using pre-mounted devfs." else err 1 "named chroot: devfs cannot be mounted from " \ "within a jail. Thus a chrooted named cannot " \ "be run from within a jail. Either mount the " \ "devfs with null and random from the host, or " \ "run named without chrooting it, set " \ "named_chrootdir=\"\" in /etc/rc.conf." fi fi - # If OpenSSL from ports, then the engines should be present in the - # chroot, named loads them after chrooting. + # The OpenSSL engines should be present in the chroot, named loads them + # after chrooting. if [ -d ${_openssl_engines} ]; then - # FIXME when 8.4 is gone see if - # security.jail.param.allow.mount.nullfs can be used. - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ]; then - mkdir -p ${named_chrootdir}${_openssl_engines} + mkdir -p ${named_chrootdir}${_openssl_engines} + if can_mount nullfs ; then mount -t nullfs ${_openssl_engines} ${named_chrootdir}${_openssl_engines} else warn "named chroot: cannot nullfs mount OpenSSL" \ "engines into the chroot, will copy the shared" \ "libraries instead." - mkdir -p ${named_chrootdir}${_openssl_engines} cp -f ${_openssl_engines}/*.so ${named_chrootdir}${_openssl_engines} fi fi # Copy and/or update key files to the chroot /etc # for file in localtime protocols services; do if [ -r /etc/${file} ] && \ ! cmp -s /etc/${file} "${named_chrootdir}/etc/${file}"; then cp -p /etc/${file} "${named_chrootdir}/etc/${file}" fi done } # Make symlinks to the correct pid file # make_symlinks() { checkyesno named_symlink_enable && ln -fs "${named_chrootdir}${pidfile}" ${pidfile} && ln -fs "${named_chrootdir}${sessionkeyfile}" ${sessionkeyfile} } named_poststart() { make_symlinks if checkyesno named_wait; then until ${_named_program_root}/bin/host ${named_wait_host} >/dev/null 2>&1; do echo " Waiting for nameserver to resolve ${named_wait_host}" sleep 1 done fi } named_reload() { # This is a one line function, but ${named_program} is not defined early # enough to be there when the reload_cmd variable is defined up there. rndc reload } find_pidfile() { if get_pidfile_from_conf pid-file ${named_conf}; then pidfile="${_pidfile_from_conf}" else pidfile="/var/run/named/pid" fi } find_sessionkeyfile() { if get_pidfile_from_conf session-keyfile ${named_conf}; then sessionkeyfile="${_pidfile_from_conf}" else sessionkeyfile="/var/run/named/session.key" fi } named_stop() { find_pidfile # This duplicates an undesirably large amount of code from the stop # routine in rc.subr in order to use rndc to shut down the process, # and to give it a second chance in case rndc fails. rc_pid=$(check_pidfile ${pidfile} ${command}) if [ -z "${rc_pid}" ]; then [ -n "${rc_fast}" ] && return 0 _run_rc_notrunning return 1 fi echo 'Stopping named.' if rndc stop; then wait_for_pids ${rc_pid} else echo -n 'rndc failed, trying kill: ' kill -TERM ${rc_pid} wait_for_pids ${rc_pid} fi } named_poststop() { - if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then + if [ -n "${named_chrootdir}" ]; then # if using OpenSSL from ports, unmount OpenSSL engines, if they # were not mounted but only copied, do nothing. - if [ -d ${_openssl_engines} -a \( `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 \) ]; then - umount ${named_chrootdir}${_openssl_engines} + if [ -d ${_openssl_engines} ]; then + if can_mount nullfs; then + umount ${named_chrootdir}${_openssl_engines} + fi fi - # unmount /dev - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then - umount ${named_chrootdir}/dev 2>/dev/null || true - else - warn "named chroot:" \ - "cannot unmount devfs from inside jail!" + if [ -c ${named_chrootdir}/dev/null ]; then + # unmount /dev + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then + umount ${named_chrootdir}/dev 2>/dev/null || true + else + warn "named chroot:" \ + "cannot unmount devfs from inside jail!" + fi fi fi +} + +can_mount() +{ + local kld + kld=$1 + if ! load_kld $kld; then + return 1 + fi + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ] || + [ `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ] || + [ `${SYSCTL_N} security.jail.mount_${kld}_allowed` -eq 1 ] ; then + return 0 + fi + return 1 } create_file() { if [ -e "$1" ]; then unlink $1 fi install -o root -g wheel -m 0644 /dev/null $1 } rndc() { if [ -z "${rndc_flags}" ]; then if [ -s "${rndc_conf}" ] ; then rndc_flags="-c ${rndc_conf}" elif [ -s "${rndc_key}" ] ; then rndc_flags="-k ${rndc_key}" else rndc_flags="" fi fi ${_named_program_root}/sbin/rndc ${rndc_flags} "$@" } named_prestart() { find_pidfile find_sessionkeyfile if [ -n "${named_pidfile}" ]; then warn 'named_pidfile: now determined from the conf file' fi if [ -n "${named_sessionkeyfile}" ]; then warn 'named_sessionkeyfile: now determined from the conf file' fi piddir=`/usr/bin/dirname ${pidfile}` if [ ! -d ${piddir} ]; then install -d -o ${named_uid} -g ${named_uid} ${piddir} fi sessionkeydir=`/usr/bin/dirname ${sessionkeyfile}` if [ ! -d ${sessionkeydir} ]; then install -d -o ${named_uid} -g ${named_uid} ${sessionkeydir} fi command_args="-u ${named_uid:=root} -c ${named_conf} ${command_args}" %%NATIVE_PKCS11%% if [ -z "${named_pkcs11_engine}"]; then %%NATIVE_PKCS11%% err 3 "named_pkcs11_engine has to be set to the PKCS#11 engine's library you want to use" %%NATIVE_PKCS11%% elif [ ! -f ${named_pkcs11_engine} ]; then %%NATIVE_PKCS11%% err 3 "named_pkcs11_engine the PKCS#11 engine's library you want to use doesn't exist" %%NATIVE_PKCS11%% else %%NATIVE_PKCS11%% mkdir -p ${named_chrootdir}${named_pkcs11_engine%/*} %%NATIVE_PKCS11%% cp -p ${named_pkcs11_engine} ${named_chrootdir}${named_pkcs11_engine} %%NATIVE_PKCS11%% command_args="-E ${named_pkcs11_engine} ${command_args}" %%NATIVE_PKCS11%% fi local line nsip firstns # Is the user using a sandbox? # if [ -n "${named_chrootdir}" ]; then rc_flags="${rc_flags} -t ${named_chrootdir}" checkyesno named_chroot_autoupdate && chroot_autoupdate case "${altlog_proglist}" in *named*) ;; *) warn 'Using chroot without setting altlog_proglist, logging may not' warn 'work correctly. Run sysrc altlog_proglist+=named' ;; esac else named_symlink_enable=NO fi # Create an rndc.key file for the user if none exists # confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \ -c ${_named_confdir}/rndc.key" if [ -s "${_named_confdir}/rndc.conf" ]; then unset confgen_command fi if [ -s "${_named_confdir}/rndc.key" ]; then case `stat -f%Su ${_named_confdir}/rndc.key` in root|${named_uid}) ;; *) ${confgen_command} ;; esac else ${confgen_command} fi local checkconf checkconf="${_named_program_root}/sbin/named-checkconf" if ! checkyesno named_chroot_autoupdate && [ -n "${named_chrootdir}" ]; then checkconf="${checkconf} -t ${named_chrootdir}" fi # Create a forwarder configuration based on /etc/resolv.conf if checkyesno named_auto_forward; then if [ ! -s /etc/resolv.conf ]; then warn "named_auto_forward enabled, but no /etc/resolv.conf" # Empty the file in case it is included in named.conf [ -s "${_named_confdir}/auto_forward.conf" ] && create_file ${_named_confdir}/auto_forward.conf ${checkconf} ${named_conf} || err 3 'named-checkconf for ${named_conf} failed' return fi create_file /var/run/naf-resolv.conf create_file /var/run/auto_forward.conf echo ' forwarders {' > /var/run/auto_forward.conf while read line; do case "${line}" in 'nameserver '*|'nameserver '*) nsip=${line##nameserver[ ]} if [ -z "${firstns}" ]; then if [ ! "${nsip}" = '127.0.0.1' ]; then echo 'nameserver 127.0.0.1' echo " ${nsip};" >> /var/run/auto_forward.conf fi firstns=1 else [ "${nsip}" = '127.0.0.1' ] && continue echo " ${nsip};" >> /var/run/auto_forward.conf fi ;; esac echo ${line} done < /etc/resolv.conf > /var/run/naf-resolv.conf echo ' };' >> /var/run/auto_forward.conf echo '' >> /var/run/auto_forward.conf if checkyesno named_auto_forward_only; then echo " forward only;" >> /var/run/auto_forward.conf else echo " forward first;" >> /var/run/auto_forward.conf fi if cmp -s /etc/resolv.conf /var/run/naf-resolv.conf; then unlink /var/run/naf-resolv.conf else [ -e /etc/resolv.conf ] && unlink /etc/resolv.conf mv /var/run/naf-resolv.conf /etc/resolv.conf fi if cmp -s ${_named_confdir}/auto_forward.conf \ /var/run/auto_forward.conf; then unlink /var/run/auto_forward.conf else [ -e "${_named_confdir}/auto_forward.conf" ] && unlink ${_named_confdir}/auto_forward.conf mv /var/run/auto_forward.conf \ ${_named_confdir}/auto_forward.conf fi else # Empty the file in case it is included in named.conf [ -s "${_named_confdir}/auto_forward.conf" ] && create_file ${_named_confdir}/auto_forward.conf fi ${checkconf} ${named_conf} || err 3 "named-checkconf for ${named_conf} failed" } run_rc_command "$1" Index: head/dns/bind911/Makefile =================================================================== --- head/dns/bind911/Makefile (revision 487358) +++ head/dns/bind911/Makefile (revision 487359) @@ -1,246 +1,251 @@ # $FreeBSD$ # pkg-help formatted with fmt 59 63 PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 911 DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org COMMENT= BIND DNS suite with updated DNSSEC and DNS64 LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libxml2.so:textproc/libxml2 USES= cpe libedit # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.5 +ISCVERSION= 9.11.5-P1 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} .if ${ISCVERSION:M*-*} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ - --disable-symtable \ --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --with-gost=no \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb CONFLICTS= bind-tools bind99 bind910 bind912 bind913 bind9-devel SUB_FILES= pkg-message named.conf USE_RC_SUBR= named MAKE_JOBS_UNSAFE= yes PORTDOCS= * OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON \ DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN \ FILTER_AAAA OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \ RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ START_LATE TUNING_LARGE TCP_FASTOPEN OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SUB= yes CRYPTO_DESC= Choose which crypto engine to use DLZ_BDB_DESC= DLZ BDB driver DLZ_DESC= Dynamically Loadable Zones DLZ_FILESYSTEM_DESC= DLZ filesystem driver DLZ_LDAP_DESC= DLZ LDAP driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_STUB_DESC= DLZ stub driver DNSTAP_DESC= Provides fast passive logging of DNS messages FILTER_AAAA_DESC= Enable filtering of AAAA records FIXED_RRSET_DESC= Enable fixed rrset ordering GEOIP_DESC= Allow geographically based ACL. GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable LARGE_FILE_DESC= 64-bit file support LMDB_DESC= Use LMDB for zone management MINCACHE_DESC= Use the mincachettl patch NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) PORTREVISION_DESC= Show PORTREVISION in the version string PYTHON_DESC= Build with Python utilities QUERYTRACE_DESC= Enable the very verbose query tracelogging RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation SSL_DESC= Build with OpenSSL (Required for DNSSEC) START_LATE_DESC= Start BIND late in the boot process (see help) TCP_FASTOPEN_DESC= RFC 7413 support TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes DLZ_BDB_USES= bdb DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes DLZ_LDAP_USE= openldap=yes DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_PREVENTS= THREADS DLZ_MYSQL_USES= mysql DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes DLZ_POSTGRESQL_USES= pgsql DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_IMPLIES= THREADS DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP GSSAPI_BASE_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi IDN_CONFIGURE_OFF= --without-libidn2 IDN_CONFIGURE_ON= --with-libidn2=${LOCALBASE} ${ICONV_CONFIGURE_BASE} IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_USES= iconv IPV6_CONFIGURE_ENABLE= ipv6 JSON_CONFIGURE_WITH= libjson=${LOCALBASE} JSON_LIB_DEPENDS= libjson-c.so:devel/json-c LARGE_FILE_CONFIGURE_ENABLE= largefile LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 NATIVE_PKCS11_IMPLIES= THREADS PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_USES= python QUERYTRACE_CONFIGURE_ENABLE= querytrace RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_USES= ssl START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ NAMED_BEFORE="LOGIN" START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ NAMED_BEFORE="SERVERS" THREADS_CONFIGURE_ENABLE= threads TUNING_LARGE_IMPLIES= THREADS TUNING_LARGE_CONFIGURE_ON= --with-tuning=large TUNING_LARGE_CONFIGURE_OFF= --with-tuning=default .include + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-symtable +.else +CONFIGURE_ARGS+= --disable-symtable +.endif .if ${SSL_DEFAULT} == base SUB_LIST+= ENGINES=/usr/lib/engines .else SUB_LIST+= ENGINES=${LOCALBASE}/lib/engines .endif post-patch: .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} .endfor .if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ ${WRKSRC}/version .endif post-patch-TCP_FASTOPEN-off: @${REINPLACE_CMD} -e 's/#define ISC_PLATFORM_HAVETFO 1/#undef ISC_PLATFORM_HAVETFO/' ${WRKSRC}/configure post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} .for i in dynamic master slave working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i .endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES \ ${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR} # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} .include Index: head/dns/bind911/distinfo =================================================================== --- head/dns/bind911/distinfo (revision 487358) +++ head/dns/bind911/distinfo (revision 487359) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540325506 -SHA256 (bind-9.11.5.tar.gz) = a4cae11dad954bdd4eb592178f875bfec09fcc7e29fe0f6b7a4e5b5c6bc61322 -SIZE (bind-9.11.5.tar.gz) = 8810710 +TIMESTAMP = 1544687911 +SHA256 (bind-9.11.5-P1.tar.gz) = 6cd6dbf016569f12d4a0ed629e44e895d9ed41c6908274ed2e617666c5491928 +SIZE (bind-9.11.5-P1.tar.gz) = 8814650 Index: head/dns/bind911/files/named.in =================================================================== --- head/dns/bind911/files/named.in (revision 487358) +++ head/dns/bind911/files/named.in (revision 487359) @@ -1,435 +1,451 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: named # REQUIRE: %%NAMED_REQUIRE%% # BEFORE: %%NAMED_BEFORE%% # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable BIND: # named_enable (bool): Run named, the DNS server (or NO). # named_program (str): Path to named, if you want a different one. # named_conf (str): Path to the configuration file # named_flags (str): Use this for flags OTHER than -u and -c # named_uid (str): User to run named as # named_chrootdir (str): Chroot directory (or "" not to auto-chroot it) # Historically, was /var/named # named_chroot_autoupdate (bool): Automatically install/update chrooted # components of named. # named_symlink_enable (bool): Symlink the chrooted pid file # named_wait (bool): Wait for working name service before exiting # named_wait_host (str): Hostname to check if named_wait is enabled # named_auto_forward (str): Set up forwarders from /etc/resolv.conf # named_auto_forward_only (str): Do "forward only" instead of "forward first" %%NATIVE_PKCS11%%# named_pkcs11_engine (str): Path to the PKCS#11 library to use. # . /etc/rc.subr name=named desc="named BIND startup script" rcvar=named_enable load_rc_config ${name} extra_commands=reload start_precmd=named_prestart start_postcmd=named_poststart reload_cmd=named_reload stop_cmd=named_stop stop_postcmd=named_poststop named_enable=${named_enable:-"NO"} named_program=${named_program:-"%%PREFIX%%/sbin/named"} named_conf=${named_conf:-"%%ETCDIR%%/named.conf"} named_flags=${named_flags:-""} named_uid=${named_uid:-"bind"} named_chrootdir=${named_chrootdir:-""} named_chroot_autoupdate=${named_chroot_autoupdate:-"YES"} named_symlink_enable=${named_symlink_enable:-"YES"} named_wait=${named_wait:-"NO"} named_wait_host=${named_wait_host:-"localhost"} named_auto_forward=${named_auto_forward:-"NO"} named_auto_forward_only=${named_auto_forward_only:-"NO"} %%NATIVE_PKCS11%%named_pkcs11_engine=${named_pkcs11_engine:-""} # Not configuration variables but having them here keeps rclint happy required_dirs="${named_chrootdir}" _named_confdirroot="${named_conf%/*}" _named_confdir="${named_chrootdir}${_named_confdirroot}" _named_program_root="${named_program%/sbin/named}" _openssl_engines="%%ENGINES%%" # Needed if named.conf and rndc.conf are moved or if rndc.conf is used rndc_conf=${rndc_conf:-"$_named_confdir/rndc.conf"} rndc_key=${rndc_key:-"$_named_confdir/rndc.key"} # If running in a chroot cage, ensure that the appropriate files # exist inside the cage, as well as helper symlinks into the cage # from outside. # # As this is called after the is_running and required_dir checks # are made in run_rc_command(), we can safely assume ${named_chrootdir} # exists and named isn't running at this point (unless forcestart # is used). # chroot_autoupdate() { local file # If it's the first time around, fiddle with things and move the # current configuration to the chroot. if [ -d ${_named_confdirroot} -a ! -d ${_named_confdir} ]; then warn "named chroot: Moving current configuration in the chroot!" install -d ${_named_confdir%/*} mv ${_named_confdirroot} ${_named_confdir} fi # Create (or update) the chroot directory structure # if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.dist ]; then mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.dist \ -p ${named_chrootdir} else warn "%%PREFIX%%/etc/mtree/BIND.chroot.dist missing," warn "${named_chrootdir} directory structure not updated" fi if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.local.dist ]; then mkdir -p ${named_chrootdir}%%PREFIX%% mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.local.dist \ -p ${named_chrootdir}%%PREFIX%% else warn "%%PREFIX%%/etc/mtree/BIND.chroot.local.dist missing," warn "${named_chrootdir}%%PREFIX%% directory structure not updated" fi # Create (or update) the configuration directory symlink # if [ ! -L "${_named_confdirroot}" ]; then if [ -d "${_named_confdirroot}" ]; then warn "named chroot: ${_named_confdirroot} is a directory!" elif [ -e "${_named_confdirroot}" ]; then warn "named chroot: ${_named_confdirroot} exists!" else ln -s ${_named_confdir} ${_named_confdirroot} fi else # Make sure it points to the right place. ln -shf ${_named_confdir} ${_named_confdirroot} fi # Mount a devfs in the chroot directory if needed # if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then umount ${named_chrootdir}/dev 2>/dev/null devfs_domount ${named_chrootdir}/dev devfsrules_hide_all devfs -m ${named_chrootdir}/dev rule apply path null unhide devfs -m ${named_chrootdir}/dev rule apply path random unhide else if [ -c ${named_chrootdir}/dev/null -a \ -c ${named_chrootdir}/dev/random ]; then info "named chroot: using pre-mounted devfs." else err 1 "named chroot: devfs cannot be mounted from " \ "within a jail. Thus a chrooted named cannot " \ "be run from within a jail. Either mount the " \ "devfs with null and random from the host, or " \ "run named without chrooting it, set " \ "named_chrootdir=\"\" in /etc/rc.conf." fi fi # The OpenSSL engines should be present in the chroot, named loads them # after chrooting. if [ -d ${_openssl_engines} ]; then - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ] || - [ `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ] || - [ `${SYSCTL_N} security.jail.mount_nullfs_allowed` -eq 1 ] ; then - mkdir -p ${named_chrootdir}${_openssl_engines} + mkdir -p ${named_chrootdir}${_openssl_engines} + if can_mount nullfs ; then mount -t nullfs ${_openssl_engines} ${named_chrootdir}${_openssl_engines} else warn "named chroot: cannot nullfs mount OpenSSL" \ "engines into the chroot, will copy the shared" \ "libraries instead." - mkdir -p ${named_chrootdir}${_openssl_engines} cp -f ${_openssl_engines}/*.so ${named_chrootdir}${_openssl_engines} fi fi # Copy and/or update key files to the chroot /etc # for file in localtime protocols services; do if [ -r /etc/${file} ] && \ ! cmp -s /etc/${file} "${named_chrootdir}/etc/${file}"; then cp -p /etc/${file} "${named_chrootdir}/etc/${file}" fi done } # Make symlinks to the correct pid file # make_symlinks() { checkyesno named_symlink_enable && ln -fs "${named_chrootdir}${pidfile}" ${pidfile} && ln -fs "${named_chrootdir}${sessionkeyfile}" ${sessionkeyfile} } named_poststart() { make_symlinks if checkyesno named_wait; then until ${_named_program_root}/bin/host ${named_wait_host} >/dev/null 2>&1; do echo " Waiting for nameserver to resolve ${named_wait_host}" sleep 1 done fi } named_reload() { # This is a one line function, but ${named_program} is not defined early # enough to be there when the reload_cmd variable is defined up there. rndc reload } find_pidfile() { if get_pidfile_from_conf pid-file ${named_conf}; then pidfile="${_pidfile_from_conf}" else pidfile="/var/run/named/pid" fi } find_sessionkeyfile() { if get_pidfile_from_conf session-keyfile ${named_conf}; then sessionkeyfile="${_pidfile_from_conf}" else sessionkeyfile="/var/run/named/session.key" fi } named_stop() { find_pidfile # This duplicates an undesirably large amount of code from the stop # routine in rc.subr in order to use rndc to shut down the process, # and to give it a second chance in case rndc fails. rc_pid=$(check_pidfile ${pidfile} ${command}) if [ -z "${rc_pid}" ]; then [ -n "${rc_fast}" ] && return 0 _run_rc_notrunning return 1 fi echo 'Stopping named.' if rndc stop; then wait_for_pids ${rc_pid} else echo -n 'rndc failed, trying kill: ' kill -TERM ${rc_pid} wait_for_pids ${rc_pid} fi } named_poststop() { - if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then + if [ -n "${named_chrootdir}" ]; then # if using OpenSSL from ports, unmount OpenSSL engines, if they # were not mounted but only copied, do nothing. - if [ -d ${_openssl_engines} -a \( `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 \) ]; then - umount ${named_chrootdir}${_openssl_engines} + if [ -d ${_openssl_engines} ]; then + if can_mount nullfs; then + umount ${named_chrootdir}${_openssl_engines} + fi fi - # unmount /dev - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then - umount ${named_chrootdir}/dev 2>/dev/null || true - else - warn "named chroot:" \ - "cannot unmount devfs from inside jail!" + if [ -c ${named_chrootdir}/dev/null ]; then + # unmount /dev + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then + umount ${named_chrootdir}/dev 2>/dev/null || true + else + warn "named chroot:" \ + "cannot unmount devfs from inside jail!" + fi fi fi +} + +can_mount() +{ + local kld + kld=$1 + if ! load_kld $kld; then + return 1 + fi + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ] || + [ `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ] || + [ `${SYSCTL_N} security.jail.mount_${kld}_allowed` -eq 1 ] ; then + return 0 + fi + return 1 } create_file() { if [ -e "$1" ]; then unlink $1 fi install -o root -g wheel -m 0644 /dev/null $1 } rndc() { if [ -z "${rndc_flags}" ]; then if [ -s "${rndc_conf}" ] ; then rndc_flags="-c ${rndc_conf}" elif [ -s "${rndc_key}" ] ; then rndc_flags="-k ${rndc_key}" else rndc_flags="" fi fi ${_named_program_root}/sbin/rndc ${rndc_flags} "$@" } named_prestart() { find_pidfile find_sessionkeyfile if [ -n "${named_pidfile}" ]; then warn 'named_pidfile: now determined from the conf file' fi if [ -n "${named_sessionkeyfile}" ]; then warn 'named_sessionkeyfile: now determined from the conf file' fi piddir=`/usr/bin/dirname ${pidfile}` if [ ! -d ${piddir} ]; then install -d -o ${named_uid} -g ${named_uid} ${piddir} fi sessionkeydir=`/usr/bin/dirname ${sessionkeyfile}` if [ ! -d ${sessionkeydir} ]; then install -d -o ${named_uid} -g ${named_uid} ${sessionkeydir} fi command_args="-u ${named_uid:=root} -c ${named_conf} ${command_args}" %%NATIVE_PKCS11%% if [ -z "${named_pkcs11_engine}"]; then %%NATIVE_PKCS11%% err 3 "named_pkcs11_engine has to be set to the PKCS#11 engine's library you want to use" %%NATIVE_PKCS11%% elif [ ! -f ${named_pkcs11_engine} ]; then %%NATIVE_PKCS11%% err 3 "named_pkcs11_engine the PKCS#11 engine's library you want to use doesn't exist" %%NATIVE_PKCS11%% else %%NATIVE_PKCS11%% mkdir -p ${named_chrootdir}${named_pkcs11_engine%/*} %%NATIVE_PKCS11%% cp -p ${named_pkcs11_engine} ${named_chrootdir}${named_pkcs11_engine} %%NATIVE_PKCS11%% command_args="-E ${named_pkcs11_engine} ${command_args}" %%NATIVE_PKCS11%% fi local line nsip firstns # Is the user using a sandbox? # if [ -n "${named_chrootdir}" ]; then rc_flags="${rc_flags} -t ${named_chrootdir}" checkyesno named_chroot_autoupdate && chroot_autoupdate case "${altlog_proglist}" in *named*) ;; *) warn 'Using chroot without setting altlog_proglist, logging may not' warn 'work correctly. Run sysrc altlog_proglist+=named' ;; esac else named_symlink_enable=NO fi # Create an rndc.key file for the user if none exists # confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \ -c ${_named_confdir}/rndc.key" if [ -s "${_named_confdir}/rndc.conf" ]; then unset confgen_command fi if [ -s "${_named_confdir}/rndc.key" ]; then case `stat -f%Su ${_named_confdir}/rndc.key` in root|${named_uid}) ;; *) ${confgen_command} ;; esac else ${confgen_command} fi local checkconf checkconf="${_named_program_root}/sbin/named-checkconf" if ! checkyesno named_chroot_autoupdate && [ -n "${named_chrootdir}" ]; then checkconf="${checkconf} -t ${named_chrootdir}" fi # Create a forwarder configuration based on /etc/resolv.conf if checkyesno named_auto_forward; then if [ ! -s /etc/resolv.conf ]; then warn "named_auto_forward enabled, but no /etc/resolv.conf" # Empty the file in case it is included in named.conf [ -s "${_named_confdir}/auto_forward.conf" ] && create_file ${_named_confdir}/auto_forward.conf ${checkconf} ${named_conf} || err 3 'named-checkconf for ${named_conf} failed' return fi create_file /var/run/naf-resolv.conf create_file /var/run/auto_forward.conf echo ' forwarders {' > /var/run/auto_forward.conf while read line; do case "${line}" in 'nameserver '*|'nameserver '*) nsip=${line##nameserver[ ]} if [ -z "${firstns}" ]; then if [ ! "${nsip}" = '127.0.0.1' ]; then echo 'nameserver 127.0.0.1' echo " ${nsip};" >> /var/run/auto_forward.conf fi firstns=1 else [ "${nsip}" = '127.0.0.1' ] && continue echo " ${nsip};" >> /var/run/auto_forward.conf fi ;; esac echo ${line} done < /etc/resolv.conf > /var/run/naf-resolv.conf echo ' };' >> /var/run/auto_forward.conf echo '' >> /var/run/auto_forward.conf if checkyesno named_auto_forward_only; then echo " forward only;" >> /var/run/auto_forward.conf else echo " forward first;" >> /var/run/auto_forward.conf fi if cmp -s /etc/resolv.conf /var/run/naf-resolv.conf; then unlink /var/run/naf-resolv.conf else [ -e /etc/resolv.conf ] && unlink /etc/resolv.conf mv /var/run/naf-resolv.conf /etc/resolv.conf fi if cmp -s ${_named_confdir}/auto_forward.conf \ /var/run/auto_forward.conf; then unlink /var/run/auto_forward.conf else [ -e "${_named_confdir}/auto_forward.conf" ] && unlink ${_named_confdir}/auto_forward.conf mv /var/run/auto_forward.conf \ ${_named_confdir}/auto_forward.conf fi else # Empty the file in case it is included in named.conf [ -s "${_named_confdir}/auto_forward.conf" ] && create_file ${_named_confdir}/auto_forward.conf fi ${checkconf} ${named_conf} || err 3 "named-checkconf for ${named_conf} failed" } run_rc_command "$1" Index: head/dns/bind912/Makefile =================================================================== --- head/dns/bind912/Makefile (revision 487358) +++ head/dns/bind912/Makefile (revision 487359) @@ -1,275 +1,279 @@ # $FreeBSD$ # pkg-help formatted with fmt 59 63 PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 1 +PORTREVISION= 0 .else -# dns/bind912 here -PORTREVISION= 2 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} .if defined(BIND_TOOLS_SLAVE) PKGNAMESUFFIX= -tools .else PKGNAMESUFFIX= 912 .endif DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org .if defined(BIND_TOOLS_SLAVE) COMMENT= Command line tools from BIND: delv, dig, host, nslookup... .else COMMENT= BIND DNS suite with updated DNSSEC and DNS64 .endif LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libxml2.so:textproc/libxml2 USES= compiler:c11 cpe libedit # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.3 +ISCVERSION= 9.12.3-P1 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} .if ${ISCVERSION:M*-*} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ - --disable-symtable \ --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --with-gost=no \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb CONFLICTS= bind99 bind910 bind911 bind913 bind9-devel .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared CONFLICTS+= bind912 .else USE_RC_SUBR= named SUB_FILES= pkg-message named.conf CONFLICTS+= bind-tools PORTDOCS= * .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON PYTHON OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 THREADS OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11 .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ START_LATE TUNING_LARGE TCP_FASTOPEN OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB .endif # BIND_TOOLS_SLAVE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SUB= yes CRYPTO_DESC= Choose which crypto engine to use DLZ_BDB_DESC= DLZ BDB driver DLZ_DESC= Dynamically Loadable Zones DLZ_FILESYSTEM_DESC= DLZ filesystem driver DLZ_LDAP_DESC= DLZ LDAP driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_STUB_DESC= DLZ stub driver DNSTAP_DESC= Provides fast passive logging of DNS messages FIXED_RRSET_DESC= Enable fixed rrset ordering GEOIP_DESC= Allow geographically based ACL. GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable LARGE_FILE_DESC= 64-bit file support LMDB_DESC= Use LMDB for zone management MINCACHE_DESC= Use the mincachettl patch NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) PORTREVISION_DESC= Show PORTREVISION in the version string PYTHON_DESC= Build with Python utilities QUERYTRACE_DESC= Enable the very verbose query tracelogging RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation SSL_DESC= Build with OpenSSL (Required for DNSSEC) START_LATE_DESC= Start BIND late in the boot process (see help) TCP_FASTOPEN_DESC= RFC 7413 support TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes DLZ_BDB_USES= bdb DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes DLZ_LDAP_USE= openldap=yes DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_PREVENTS= THREADS DLZ_MYSQL_USES= mysql DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes DLZ_POSTGRESQL_USES= pgsql DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_IMPLIES= THREADS DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP GSSAPI_BASE_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi IDN_CONFIGURE_OFF= --without-libidn2 IDN_CONFIGURE_ON= --with-libidn2=${LOCALBASE} ${ICONV_CONFIGURE_BASE} IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_USES= iconv IPV6_CONFIGURE_ENABLE= ipv6 JSON_CONFIGURE_WITH= libjson=${LOCALBASE} JSON_LIB_DEPENDS= libjson-c.so:devel/json-c LARGE_FILE_CONFIGURE_ENABLE= largefile LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 NATIVE_PKCS11_IMPLIES= THREADS PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_USES= python QUERYTRACE_CONFIGURE_ENABLE= querytrace RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" SSL_CONFIGURE_OFF= --disable-openssl-version-check --without-openssl SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_USES= ssl START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ NAMED_BEFORE="LOGIN" START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ NAMED_BEFORE="SERVERS" TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen THREADS_CONFIGURE_ENABLE= threads TUNING_LARGE_IMPLIES= THREADS TUNING_LARGE_CONFIGURE_ON= --with-tuning=large TUNING_LARGE_CONFIGURE_OFF= --with-tuning=default .include + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-symtable +.else +CONFIGURE_ARGS+= --disable-symtable +.endif .if ${SSL_DEFAULT} == base SUB_LIST+= ENGINES=/usr/lib/engines .else SUB_LIST+= ENGINES=${LOCALBASE}/lib/engines .endif post-patch: .if defined(BIND_TOOLS_SLAVE) @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ -e 's#isc-config.sh installdirs#installdirs#' \ -e 's#.*INSTALL.*isc-config.*##' \ -e 's#.*INSTALL.*bind.keys.*##' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \ -e 's#^ .*check confgen ##' \ ${WRKSRC}/bin/Makefile.in .else . for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} . endfor .endif .if !defined(BIND_TOOLS_SLAVE) . if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ ${WRKSRC}/version . endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} . for i in dynamic master slave working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i . endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .endif # BIND_TOOLS_SLAVE # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} .include Index: head/dns/bind912/distinfo =================================================================== --- head/dns/bind912/distinfo (revision 487358) +++ head/dns/bind912/distinfo (revision 487359) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540325569 -SHA256 (bind-9.12.3.tar.gz) = 0e80762631258e1c193552efa7c56c05ec5e8c2f98e4b2a3b91a61fd8d96b938 -SIZE (bind-9.12.3.tar.gz) = 8616664 +TIMESTAMP = 1544687855 +SHA256 (bind-9.12.3-P1.tar.gz) = 6cb79389d787368af27f01c65a9fa09be1fd062eda37c94819a1a0178d5ded73 +SIZE (bind-9.12.3-P1.tar.gz) = 8625693 Index: head/dns/bind912/files/named.in =================================================================== --- head/dns/bind912/files/named.in (revision 487358) +++ head/dns/bind912/files/named.in (revision 487359) @@ -1,435 +1,451 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: named # REQUIRE: %%NAMED_REQUIRE%% # BEFORE: %%NAMED_BEFORE%% # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable BIND: # named_enable (bool): Run named, the DNS server (or NO). # named_program (str): Path to named, if you want a different one. # named_conf (str): Path to the configuration file # named_flags (str): Use this for flags OTHER than -u and -c # named_uid (str): User to run named as # named_chrootdir (str): Chroot directory (or "" not to auto-chroot it) # Historically, was /var/named # named_chroot_autoupdate (bool): Automatically install/update chrooted # components of named. # named_symlink_enable (bool): Symlink the chrooted pid file # named_wait (bool): Wait for working name service before exiting # named_wait_host (str): Hostname to check if named_wait is enabled # named_auto_forward (str): Set up forwarders from /etc/resolv.conf # named_auto_forward_only (str): Do "forward only" instead of "forward first" %%NATIVE_PKCS11%%# named_pkcs11_engine (str): Path to the PKCS#11 library to use. # . /etc/rc.subr name=named desc="named BIND startup script" rcvar=named_enable load_rc_config ${name} extra_commands=reload start_precmd=named_prestart start_postcmd=named_poststart reload_cmd=named_reload stop_cmd=named_stop stop_postcmd=named_poststop named_enable=${named_enable:-"NO"} named_program=${named_program:-"%%PREFIX%%/sbin/named"} named_conf=${named_conf:-"%%ETCDIR%%/named.conf"} named_flags=${named_flags:-""} named_uid=${named_uid:-"bind"} named_chrootdir=${named_chrootdir:-""} named_chroot_autoupdate=${named_chroot_autoupdate:-"YES"} named_symlink_enable=${named_symlink_enable:-"YES"} named_wait=${named_wait:-"NO"} named_wait_host=${named_wait_host:-"localhost"} named_auto_forward=${named_auto_forward:-"NO"} named_auto_forward_only=${named_auto_forward_only:-"NO"} %%NATIVE_PKCS11%%named_pkcs11_engine=${named_pkcs11_engine:-""} # Not configuration variables but having them here keeps rclint happy required_dirs="${named_chrootdir}" _named_confdirroot="${named_conf%/*}" _named_confdir="${named_chrootdir}${_named_confdirroot}" _named_program_root="${named_program%/sbin/named}" _openssl_engines="%%ENGINES%%" # Needed if named.conf and rndc.conf are moved or if rndc.conf is used rndc_conf=${rndc_conf:-"$_named_confdir/rndc.conf"} rndc_key=${rndc_key:-"$_named_confdir/rndc.key"} # If running in a chroot cage, ensure that the appropriate files # exist inside the cage, as well as helper symlinks into the cage # from outside. # # As this is called after the is_running and required_dir checks # are made in run_rc_command(), we can safely assume ${named_chrootdir} # exists and named isn't running at this point (unless forcestart # is used). # chroot_autoupdate() { local file # If it's the first time around, fiddle with things and move the # current configuration to the chroot. if [ -d ${_named_confdirroot} -a ! -d ${_named_confdir} ]; then warn "named chroot: Moving current configuration in the chroot!" install -d ${_named_confdir%/*} mv ${_named_confdirroot} ${_named_confdir} fi # Create (or update) the chroot directory structure # if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.dist ]; then mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.dist \ -p ${named_chrootdir} else warn "%%PREFIX%%/etc/mtree/BIND.chroot.dist missing," warn "${named_chrootdir} directory structure not updated" fi if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.local.dist ]; then mkdir -p ${named_chrootdir}%%PREFIX%% mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.local.dist \ -p ${named_chrootdir}%%PREFIX%% else warn "%%PREFIX%%/etc/mtree/BIND.chroot.local.dist missing," warn "${named_chrootdir}%%PREFIX%% directory structure not updated" fi # Create (or update) the configuration directory symlink # if [ ! -L "${_named_confdirroot}" ]; then if [ -d "${_named_confdirroot}" ]; then warn "named chroot: ${_named_confdirroot} is a directory!" elif [ -e "${_named_confdirroot}" ]; then warn "named chroot: ${_named_confdirroot} exists!" else ln -s ${_named_confdir} ${_named_confdirroot} fi else # Make sure it points to the right place. ln -shf ${_named_confdir} ${_named_confdirroot} fi # Mount a devfs in the chroot directory if needed # if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then umount ${named_chrootdir}/dev 2>/dev/null devfs_domount ${named_chrootdir}/dev devfsrules_hide_all devfs -m ${named_chrootdir}/dev rule apply path null unhide devfs -m ${named_chrootdir}/dev rule apply path random unhide else if [ -c ${named_chrootdir}/dev/null -a \ -c ${named_chrootdir}/dev/random ]; then info "named chroot: using pre-mounted devfs." else err 1 "named chroot: devfs cannot be mounted from " \ "within a jail. Thus a chrooted named cannot " \ "be run from within a jail. Either mount the " \ "devfs with null and random from the host, or " \ "run named without chrooting it, set " \ "named_chrootdir=\"\" in /etc/rc.conf." fi fi # The OpenSSL engines should be present in the chroot, named loads them # after chrooting. if [ -d ${_openssl_engines} ]; then - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ] || - [ `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ] || - [ `${SYSCTL_N} security.jail.mount_nullfs_allowed` -eq 1 ] ; then - mkdir -p ${named_chrootdir}${_openssl_engines} + mkdir -p ${named_chrootdir}${_openssl_engines} + if can_mount nullfs ; then mount -t nullfs ${_openssl_engines} ${named_chrootdir}${_openssl_engines} else warn "named chroot: cannot nullfs mount OpenSSL" \ "engines into the chroot, will copy the shared" \ "libraries instead." - mkdir -p ${named_chrootdir}${_openssl_engines} cp -f ${_openssl_engines}/*.so ${named_chrootdir}${_openssl_engines} fi fi # Copy and/or update key files to the chroot /etc # for file in localtime protocols services; do if [ -r /etc/${file} ] && \ ! cmp -s /etc/${file} "${named_chrootdir}/etc/${file}"; then cp -p /etc/${file} "${named_chrootdir}/etc/${file}" fi done } # Make symlinks to the correct pid file # make_symlinks() { checkyesno named_symlink_enable && ln -fs "${named_chrootdir}${pidfile}" ${pidfile} && ln -fs "${named_chrootdir}${sessionkeyfile}" ${sessionkeyfile} } named_poststart() { make_symlinks if checkyesno named_wait; then until ${_named_program_root}/bin/host ${named_wait_host} >/dev/null 2>&1; do echo " Waiting for nameserver to resolve ${named_wait_host}" sleep 1 done fi } named_reload() { # This is a one line function, but ${named_program} is not defined early # enough to be there when the reload_cmd variable is defined up there. rndc reload } find_pidfile() { if get_pidfile_from_conf pid-file ${named_conf}; then pidfile="${_pidfile_from_conf}" else pidfile="/var/run/named/pid" fi } find_sessionkeyfile() { if get_pidfile_from_conf session-keyfile ${named_conf}; then sessionkeyfile="${_pidfile_from_conf}" else sessionkeyfile="/var/run/named/session.key" fi } named_stop() { find_pidfile # This duplicates an undesirably large amount of code from the stop # routine in rc.subr in order to use rndc to shut down the process, # and to give it a second chance in case rndc fails. rc_pid=$(check_pidfile ${pidfile} ${command}) if [ -z "${rc_pid}" ]; then [ -n "${rc_fast}" ] && return 0 _run_rc_notrunning return 1 fi echo 'Stopping named.' if rndc stop; then wait_for_pids ${rc_pid} else echo -n 'rndc failed, trying kill: ' kill -TERM ${rc_pid} wait_for_pids ${rc_pid} fi } named_poststop() { - if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then + if [ -n "${named_chrootdir}" ]; then # if using OpenSSL from ports, unmount OpenSSL engines, if they # were not mounted but only copied, do nothing. - if [ -d ${_openssl_engines} -a \( `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 \) ]; then - umount ${named_chrootdir}${_openssl_engines} + if [ -d ${_openssl_engines} ]; then + if can_mount nullfs; then + umount ${named_chrootdir}${_openssl_engines} + fi fi - # unmount /dev - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then - umount ${named_chrootdir}/dev 2>/dev/null || true - else - warn "named chroot:" \ - "cannot unmount devfs from inside jail!" + if [ -c ${named_chrootdir}/dev/null ]; then + # unmount /dev + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then + umount ${named_chrootdir}/dev 2>/dev/null || true + else + warn "named chroot:" \ + "cannot unmount devfs from inside jail!" + fi fi fi +} + +can_mount() +{ + local kld + kld=$1 + if ! load_kld $kld; then + return 1 + fi + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ] || + [ `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ] || + [ `${SYSCTL_N} security.jail.mount_${kld}_allowed` -eq 1 ] ; then + return 0 + fi + return 1 } create_file() { if [ -e "$1" ]; then unlink $1 fi install -o root -g wheel -m 0644 /dev/null $1 } rndc() { if [ -z "${rndc_flags}" ]; then if [ -s "${rndc_conf}" ] ; then rndc_flags="-c ${rndc_conf}" elif [ -s "${rndc_key}" ] ; then rndc_flags="-k ${rndc_key}" else rndc_flags="" fi fi ${_named_program_root}/sbin/rndc ${rndc_flags} "$@" } named_prestart() { find_pidfile find_sessionkeyfile if [ -n "${named_pidfile}" ]; then warn 'named_pidfile: now determined from the conf file' fi if [ -n "${named_sessionkeyfile}" ]; then warn 'named_sessionkeyfile: now determined from the conf file' fi piddir=`/usr/bin/dirname ${pidfile}` if [ ! -d ${piddir} ]; then install -d -o ${named_uid} -g ${named_uid} ${piddir} fi sessionkeydir=`/usr/bin/dirname ${sessionkeyfile}` if [ ! -d ${sessionkeydir} ]; then install -d -o ${named_uid} -g ${named_uid} ${sessionkeydir} fi command_args="-u ${named_uid:=root} -c ${named_conf} ${command_args}" %%NATIVE_PKCS11%% if [ -z "${named_pkcs11_engine}"]; then %%NATIVE_PKCS11%% err 3 "named_pkcs11_engine has to be set to the PKCS#11 engine's library you want to use" %%NATIVE_PKCS11%% elif [ ! -f ${named_pkcs11_engine} ]; then %%NATIVE_PKCS11%% err 3 "named_pkcs11_engine the PKCS#11 engine's library you want to use doesn't exist" %%NATIVE_PKCS11%% else %%NATIVE_PKCS11%% mkdir -p ${named_chrootdir}${named_pkcs11_engine%/*} %%NATIVE_PKCS11%% cp -p ${named_pkcs11_engine} ${named_chrootdir}${named_pkcs11_engine} %%NATIVE_PKCS11%% command_args="-E ${named_pkcs11_engine} ${command_args}" %%NATIVE_PKCS11%% fi local line nsip firstns # Is the user using a sandbox? # if [ -n "${named_chrootdir}" ]; then rc_flags="${rc_flags} -t ${named_chrootdir}" checkyesno named_chroot_autoupdate && chroot_autoupdate case "${altlog_proglist}" in *named*) ;; *) warn 'Using chroot without setting altlog_proglist, logging may not' warn 'work correctly. Run sysrc altlog_proglist+=named' ;; esac else named_symlink_enable=NO fi # Create an rndc.key file for the user if none exists # confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \ -c ${_named_confdir}/rndc.key" if [ -s "${_named_confdir}/rndc.conf" ]; then unset confgen_command fi if [ -s "${_named_confdir}/rndc.key" ]; then case `stat -f%Su ${_named_confdir}/rndc.key` in root|${named_uid}) ;; *) ${confgen_command} ;; esac else ${confgen_command} fi local checkconf checkconf="${_named_program_root}/sbin/named-checkconf" if ! checkyesno named_chroot_autoupdate && [ -n "${named_chrootdir}" ]; then checkconf="${checkconf} -t ${named_chrootdir}" fi # Create a forwarder configuration based on /etc/resolv.conf if checkyesno named_auto_forward; then if [ ! -s /etc/resolv.conf ]; then warn "named_auto_forward enabled, but no /etc/resolv.conf" # Empty the file in case it is included in named.conf [ -s "${_named_confdir}/auto_forward.conf" ] && create_file ${_named_confdir}/auto_forward.conf ${checkconf} ${named_conf} || err 3 'named-checkconf for ${named_conf} failed' return fi create_file /var/run/naf-resolv.conf create_file /var/run/auto_forward.conf echo ' forwarders {' > /var/run/auto_forward.conf while read line; do case "${line}" in 'nameserver '*|'nameserver '*) nsip=${line##nameserver[ ]} if [ -z "${firstns}" ]; then if [ ! "${nsip}" = '127.0.0.1' ]; then echo 'nameserver 127.0.0.1' echo " ${nsip};" >> /var/run/auto_forward.conf fi firstns=1 else [ "${nsip}" = '127.0.0.1' ] && continue echo " ${nsip};" >> /var/run/auto_forward.conf fi ;; esac echo ${line} done < /etc/resolv.conf > /var/run/naf-resolv.conf echo ' };' >> /var/run/auto_forward.conf echo '' >> /var/run/auto_forward.conf if checkyesno named_auto_forward_only; then echo " forward only;" >> /var/run/auto_forward.conf else echo " forward first;" >> /var/run/auto_forward.conf fi if cmp -s /etc/resolv.conf /var/run/naf-resolv.conf; then unlink /var/run/naf-resolv.conf else [ -e /etc/resolv.conf ] && unlink /etc/resolv.conf mv /var/run/naf-resolv.conf /etc/resolv.conf fi if cmp -s ${_named_confdir}/auto_forward.conf \ /var/run/auto_forward.conf; then unlink /var/run/auto_forward.conf else [ -e "${_named_confdir}/auto_forward.conf" ] && unlink ${_named_confdir}/auto_forward.conf mv /var/run/auto_forward.conf \ ${_named_confdir}/auto_forward.conf fi else # Empty the file in case it is included in named.conf [ -s "${_named_confdir}/auto_forward.conf" ] && create_file ${_named_confdir}/auto_forward.conf fi ${checkconf} ${named_conf} || err 3 "named-checkconf for ${named_conf} failed" } run_rc_command "$1" Index: head/dns/bind913/Makefile =================================================================== --- head/dns/bind913/Makefile (revision 487358) +++ head/dns/bind913/Makefile (revision 487359) @@ -1,257 +1,268 @@ # $FreeBSD$ # pkg-help formatted with fmt 59 63 PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 1 +PORTREVISION= 0 .else # dns/bind913 here -PORTREVISION= 1 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} .if defined(BIND_TOOLS_SLAVE) PKGNAMESUFFIX= -tools .else PKGNAMESUFFIX= 913 .endif DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org .if defined(BIND_TOOLS_SLAVE) COMMENT= Command line tools from BIND: delv, dig, host, nslookup... .else COMMENT= BIND DNS suite with updated DNSSEC and DNS64 .endif LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libxml2.so:textproc/libxml2 USES= compiler:c11 cpe libedit ssl # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.13.4 +ISCVERSION= 9.13.5 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} .if ${ISCVERSION:M*-*} CPE_UPDATE= ${ISCVERSION:C/.*-//:tl} .endif GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ - --disable-symtable \ --with-libxml2=${LOCALBASE} \ --with-readline="-L${LOCALBASE}/lib -ledit" \ --with-dlopen=yes \ --with-openssl=${OPENSSLBASE} \ --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb CONFLICTS= bind99 bind910 bind911 bind912 bind9-devel .if defined(BIND_TOOLS_SLAVE) CONFIGURE_ARGS+= --disable-shared CONFLICTS+= bind913 .else USE_RC_SUBR= named SUB_FILES= pkg-message named.conf CONFLICTS+= bind-tools PORTDOCS= * .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes OPTIONS_DEFAULT= SIGCHASE IDN GSSAPI_NONE JSON PYTHON OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \ FIXED_RRSET SIGCHASE IPV6 OPTIONS_RADIO= CRYPTO OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11 .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \ MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \ START_LATE TUNING_LARGE TCP_FASTOPEN OPTIONS_GROUP= DLZ OPTIONS_GROUP_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB .endif # BIND_TOOLS_SLAVE OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SUB= yes CRYPTO_DESC= Choose which crypto engine to use DLZ_BDB_DESC= DLZ BDB driver DLZ_DESC= Dynamically Loadable Zones DLZ_FILESYSTEM_DESC= DLZ filesystem driver DLZ_LDAP_DESC= DLZ LDAP driver DLZ_MYSQL_DESC= DLZ MySQL driver (no threading) DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_STUB_DESC= DLZ stub driver DNSTAP_DESC= Provides fast passive logging of DNS messages FIXED_RRSET_DESC= Enable fixed rrset ordering GEOIP_DESC= Allow geographically based ACL. GSSAPI_BASE_DESC= Using Heimdal in base GSSAPI_HEIMDAL_DESC= Using security/heimdal GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable LARGE_FILE_DESC= 64-bit file support LMDB_DESC= Use LMDB for zone management MINCACHE_DESC= Use the mincachettl patch NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**) PORTREVISION_DESC= Show PORTREVISION in the version string PYTHON_DESC= Build with Python utilities QUERYTRACE_DESC= Enable the very verbose query tracelogging RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation START_LATE_DESC= Start BIND late in the boot process (see help) TCP_FASTOPEN_DESC= RFC 7413 support TUNING_LARGE_DESC= Tune named for large systems (**READ HELP**) DLZ_BDB_CONFIGURE_ON= --with-dlz-bdb=yes DLZ_BDB_USES= bdb DLZ_FILESYSTEM_CONFIGURE_ON= --with-dlz-filesystem=yes DLZ_LDAP_CONFIGURE_ON= --with-dlz-ldap=yes DLZ_LDAP_USE= openldap=yes DLZ_MYSQL_CONFIGURE_ON= --with-dlz-mysql=yes DLZ_MYSQL_USES= mysql DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes DLZ_POSTGRESQL_USES= pgsql DLZ_STUB_CONFIGURE_ON= --with-dlz-stub=yes DNSTAP_CONFIGURE_ENABLE= dnstap DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \ libprotobuf-c.so:devel/protobuf-c FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset GEOIP_CONFIGURE_WITH= geoip GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP GSSAPI_BASE_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CONFIGURE_ON=\ --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CONFIGURE_ON= --without-gssapi IDN_CONFIGURE_OFF= --without-libidn2 IDN_CONFIGURE_ON= --with-libidn2=${LOCALBASE} ${ICONV_CONFIGURE_BASE} IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN_USES= iconv IPV6_CONFIGURE_ENABLE= ipv6 JSON_CONFIGURE_WITH= libjson=${LOCALBASE} JSON_LIB_DEPENDS= libjson-c.so:devel/json-c LARGE_FILE_CONFIGURE_ENABLE= largefile LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_USES= python QUERYTRACE_CONFIGURE_ENABLE= querytrace RPZ_NSDNAME_CONFIGURE_ENABLE= rpz-nsdname RPZ_NSIP_CONFIGURE_ENABLE= rpz-nsip SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1" START_LATE_SUB_LIST= NAMED_REQUIRE="SERVERS cleanvar" \ NAMED_BEFORE="LOGIN" START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \ NAMED_BEFORE="SERVERS" TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen TUNING_LARGE_CONFIGURE_ON= --with-tuning=large TUNING_LARGE_CONFIGURE_OFF= --with-tuning=default .include + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-symtable +.else +CONFIGURE_ARGS+= --disable-symtable +.endif + +.if ${SSL_DEFAULT} == base +SUB_LIST+= ENGINES=/usr/lib/engines +.else +SUB_LIST+= ENGINES=${LOCALBASE}/lib/engines +.endif post-patch: .if defined(BIND_TOOLS_SLAVE) @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ -e 's#isc-config.sh installdirs#installdirs#' \ -e 's#.*INSTALL.*isc-config.*##' \ -e 's#.*INSTALL.*bind.keys.*##' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec tools nsupdate \\#' \ -e 's#^ .*check confgen ##' \ ${WRKSRC}/bin/Makefile.in .else . for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} . endfor .endif .if !defined(BIND_TOOLS_SLAVE) . if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ ${WRKSRC}/version . endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} . for i in dynamic master slave working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i . endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample ${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \ ${STAGEDIR}${ETCDIR}/rndc.conf.sample post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} .endif # BIND_TOOLS_SLAVE # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST} .include Index: head/dns/bind913/distinfo =================================================================== --- head/dns/bind913/distinfo (revision 487358) +++ head/dns/bind913/distinfo (revision 487359) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542875991 -SHA256 (bind-9.13.4.tar.gz) = ea02107ae0b22a5b3df76d4c45bd44414f1d17731fffc07813d8e5b4ce05f95b -SIZE (bind-9.13.4.tar.gz) = 6274124 +TIMESTAMP = 1544687807 +SHA256 (bind-9.13.5.tar.gz) = bbde0b81c66a7c7f5b074c8f0e714ed8aa235e4b930e28953cab0ae3cae94e4b +SIZE (bind-9.13.5.tar.gz) = 6309308 Index: head/dns/bind913/files/extrapatch-bind-min-override-ttl =================================================================== --- head/dns/bind913/files/extrapatch-bind-min-override-ttl (revision 487358) +++ head/dns/bind913/files/extrapatch-bind-min-override-ttl (revision 487359) @@ -1,59 +1,59 @@ ---- bin/named/config.c.orig 2018-11-19 17:02:41 UTC +--- bin/named/config.c.orig 2018-12-07 18:44:21 UTC +++ bin/named/config.c -@@ -182,6 +182,7 @@ options {\n\ +@@ -179,6 +179,7 @@ options {\n\ notify-source *;\n\ notify-source-v6 *;\n\ nsec3-test-zone no;\n\ + override-cache-ttl 0; /* do not override */\n\ provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2018-11-19 17:02:41 UTC +--- bin/named/server.c.orig 2018-12-07 18:44:21 UTC +++ bin/named/server.c -@@ -4116,6 +4116,11 @@ configure_view(dns_view_t *view, dns_vie +@@ -4154,6 +4154,11 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; + result = named_config_get(maps, "override-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->overridecachettl = cfg_obj_asuint32(obj); + + obj = NULL; result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2018-11-19 17:02:41 UTC +--- lib/dns/include/dns/view.h.orig 2018-12-07 18:44:21 UTC +++ lib/dns/include/dns/view.h @@ -153,6 +153,7 @@ struct dns_view { bool requestnsid; bool sendcookie; dns_ttl_t maxcachettl; + dns_ttl_t overridecachettl; dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2018-11-19 17:02:41 UTC +--- lib/dns/resolver.c.orig 2018-12-07 18:44:21 UTC +++ lib/dns/resolver.c @@ -5967,6 +5967,12 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* + * Enforce the configure cache TTL override. + */ + if (res->view->overridecachettl) + rdataset->ttl = res->view->overridecachettl; + + /* * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2018-11-19 17:02:41 UTC +--- lib/isccfg/namedconf.c.orig 2018-12-07 18:44:21 UTC +++ lib/isccfg/namedconf.c -@@ -1921,6 +1921,7 @@ view_clauses[] = { +@@ -1900,6 +1900,7 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, + { "override-cache-ttl", &cfg_type_ttlval, 0 }, { "max-cache-ttl", &cfg_type_ttlval, 0 }, { "max-clients-per-query", &cfg_type_uint32, 0 }, { "max-ncache-ttl", &cfg_type_ttlval, 0 }, Index: head/dns/bind913/files/named.in =================================================================== --- head/dns/bind913/files/named.in (revision 487358) +++ head/dns/bind913/files/named.in (revision 487359) @@ -1,435 +1,451 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: named # REQUIRE: %%NAMED_REQUIRE%% # BEFORE: %%NAMED_BEFORE%% # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable BIND: # named_enable (bool): Run named, the DNS server (or NO). # named_program (str): Path to named, if you want a different one. # named_conf (str): Path to the configuration file # named_flags (str): Use this for flags OTHER than -u and -c # named_uid (str): User to run named as # named_chrootdir (str): Chroot directory (or "" not to auto-chroot it) # Historically, was /var/named # named_chroot_autoupdate (bool): Automatically install/update chrooted # components of named. # named_symlink_enable (bool): Symlink the chrooted pid file # named_wait (bool): Wait for working name service before exiting # named_wait_host (str): Hostname to check if named_wait is enabled # named_auto_forward (str): Set up forwarders from /etc/resolv.conf # named_auto_forward_only (str): Do "forward only" instead of "forward first" %%NATIVE_PKCS11%%# named_pkcs11_engine (str): Path to the PKCS#11 library to use. # . /etc/rc.subr name=named desc="named BIND startup script" rcvar=named_enable load_rc_config ${name} extra_commands=reload start_precmd=named_prestart start_postcmd=named_poststart reload_cmd=named_reload stop_cmd=named_stop stop_postcmd=named_poststop named_enable=${named_enable:-"NO"} named_program=${named_program:-"%%PREFIX%%/sbin/named"} named_conf=${named_conf:-"%%ETCDIR%%/named.conf"} named_flags=${named_flags:-""} named_uid=${named_uid:-"bind"} named_chrootdir=${named_chrootdir:-""} named_chroot_autoupdate=${named_chroot_autoupdate:-"YES"} named_symlink_enable=${named_symlink_enable:-"YES"} named_wait=${named_wait:-"NO"} named_wait_host=${named_wait_host:-"localhost"} named_auto_forward=${named_auto_forward:-"NO"} named_auto_forward_only=${named_auto_forward_only:-"NO"} %%NATIVE_PKCS11%%named_pkcs11_engine=${named_pkcs11_engine:-""} # Not configuration variables but having them here keeps rclint happy required_dirs="${named_chrootdir}" _named_confdirroot="${named_conf%/*}" _named_confdir="${named_chrootdir}${_named_confdirroot}" _named_program_root="${named_program%/sbin/named}" -_openssl_engines="%%LOCALBASE%%/lib/engines" +_openssl_engines="%%ENGINES%%" # Needed if named.conf and rndc.conf are moved or if rndc.conf is used rndc_conf=${rndc_conf:-"$_named_confdir/rndc.conf"} rndc_key=${rndc_key:-"$_named_confdir/rndc.key"} # If running in a chroot cage, ensure that the appropriate files # exist inside the cage, as well as helper symlinks into the cage # from outside. # # As this is called after the is_running and required_dir checks # are made in run_rc_command(), we can safely assume ${named_chrootdir} # exists and named isn't running at this point (unless forcestart # is used). # chroot_autoupdate() { local file # If it's the first time around, fiddle with things and move the # current configuration to the chroot. if [ -d ${_named_confdirroot} -a ! -d ${_named_confdir} ]; then warn "named chroot: Moving current configuration in the chroot!" install -d ${_named_confdir%/*} mv ${_named_confdirroot} ${_named_confdir} fi # Create (or update) the chroot directory structure # if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.dist ]; then mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.dist \ -p ${named_chrootdir} else warn "%%PREFIX%%/etc/mtree/BIND.chroot.dist missing," warn "${named_chrootdir} directory structure not updated" fi if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.local.dist ]; then mkdir -p ${named_chrootdir}%%PREFIX%% mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.local.dist \ -p ${named_chrootdir}%%PREFIX%% else warn "%%PREFIX%%/etc/mtree/BIND.chroot.local.dist missing," warn "${named_chrootdir}%%PREFIX%% directory structure not updated" fi # Create (or update) the configuration directory symlink # if [ ! -L "${_named_confdirroot}" ]; then if [ -d "${_named_confdirroot}" ]; then warn "named chroot: ${_named_confdirroot} is a directory!" elif [ -e "${_named_confdirroot}" ]; then warn "named chroot: ${_named_confdirroot} exists!" else ln -s ${_named_confdir} ${_named_confdirroot} fi else # Make sure it points to the right place. ln -shf ${_named_confdir} ${_named_confdirroot} fi # Mount a devfs in the chroot directory if needed # if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then umount ${named_chrootdir}/dev 2>/dev/null devfs_domount ${named_chrootdir}/dev devfsrules_hide_all devfs -m ${named_chrootdir}/dev rule apply path null unhide devfs -m ${named_chrootdir}/dev rule apply path random unhide else if [ -c ${named_chrootdir}/dev/null -a \ -c ${named_chrootdir}/dev/random ]; then info "named chroot: using pre-mounted devfs." else err 1 "named chroot: devfs cannot be mounted from " \ "within a jail. Thus a chrooted named cannot " \ "be run from within a jail. Either mount the " \ "devfs with null and random from the host, or " \ "run named without chrooting it, set " \ "named_chrootdir=\"\" in /etc/rc.conf." fi fi - # If OpenSSL from ports, then the engines should be present in the - # chroot, named loads them after chrooting. + # The OpenSSL engines should be present in the chroot, named loads them + # after chrooting. if [ -d ${_openssl_engines} ]; then - # FIXME when 8.4 is gone see if - # security.jail.param.allow.mount.nullfs can be used. - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ]; then - mkdir -p ${named_chrootdir}${_openssl_engines} + mkdir -p ${named_chrootdir}${_openssl_engines} + if can_mount nullfs ; then mount -t nullfs ${_openssl_engines} ${named_chrootdir}${_openssl_engines} else warn "named chroot: cannot nullfs mount OpenSSL" \ "engines into the chroot, will copy the shared" \ "libraries instead." - mkdir -p ${named_chrootdir}${_openssl_engines} cp -f ${_openssl_engines}/*.so ${named_chrootdir}${_openssl_engines} fi fi # Copy and/or update key files to the chroot /etc # for file in localtime protocols services; do if [ -r /etc/${file} ] && \ ! cmp -s /etc/${file} "${named_chrootdir}/etc/${file}"; then cp -p /etc/${file} "${named_chrootdir}/etc/${file}" fi done } # Make symlinks to the correct pid file # make_symlinks() { checkyesno named_symlink_enable && ln -fs "${named_chrootdir}${pidfile}" ${pidfile} && ln -fs "${named_chrootdir}${sessionkeyfile}" ${sessionkeyfile} } named_poststart() { make_symlinks if checkyesno named_wait; then until ${_named_program_root}/bin/host ${named_wait_host} >/dev/null 2>&1; do echo " Waiting for nameserver to resolve ${named_wait_host}" sleep 1 done fi } named_reload() { # This is a one line function, but ${named_program} is not defined early # enough to be there when the reload_cmd variable is defined up there. rndc reload } find_pidfile() { if get_pidfile_from_conf pid-file ${named_conf}; then pidfile="${_pidfile_from_conf}" else pidfile="/var/run/named/pid" fi } find_sessionkeyfile() { if get_pidfile_from_conf session-keyfile ${named_conf}; then sessionkeyfile="${_pidfile_from_conf}" else sessionkeyfile="/var/run/named/session.key" fi } named_stop() { find_pidfile # This duplicates an undesirably large amount of code from the stop # routine in rc.subr in order to use rndc to shut down the process, # and to give it a second chance in case rndc fails. rc_pid=$(check_pidfile ${pidfile} ${command}) if [ -z "${rc_pid}" ]; then [ -n "${rc_fast}" ] && return 0 _run_rc_notrunning return 1 fi echo 'Stopping named.' if rndc stop; then wait_for_pids ${rc_pid} else echo -n 'rndc failed, trying kill: ' kill -TERM ${rc_pid} wait_for_pids ${rc_pid} fi } named_poststop() { - if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then + if [ -n "${named_chrootdir}" ]; then # if using OpenSSL from ports, unmount OpenSSL engines, if they # were not mounted but only copied, do nothing. - if [ -d ${_openssl_engines} -a \( `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 \) ]; then - umount ${named_chrootdir}${_openssl_engines} + if [ -d ${_openssl_engines} ]; then + if can_mount nullfs; then + umount ${named_chrootdir}${_openssl_engines} + fi fi - # unmount /dev - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then - umount ${named_chrootdir}/dev 2>/dev/null || true - else - warn "named chroot:" \ - "cannot unmount devfs from inside jail!" + if [ -c ${named_chrootdir}/dev/null ]; then + # unmount /dev + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then + umount ${named_chrootdir}/dev 2>/dev/null || true + else + warn "named chroot:" \ + "cannot unmount devfs from inside jail!" + fi fi fi +} + +can_mount() +{ + local kld + kld=$1 + if ! load_kld $kld; then + return 1 + fi + if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ] || + [ `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ] || + [ `${SYSCTL_N} security.jail.mount_${kld}_allowed` -eq 1 ] ; then + return 0 + fi + return 1 } create_file() { if [ -e "$1" ]; then unlink $1 fi install -o root -g wheel -m 0644 /dev/null $1 } rndc() { if [ -z "${rndc_flags}" ]; then if [ -s "${rndc_conf}" ] ; then rndc_flags="-c ${rndc_conf}" elif [ -s "${rndc_key}" ] ; then rndc_flags="-k ${rndc_key}" else rndc_flags="" fi fi ${_named_program_root}/sbin/rndc ${rndc_flags} "$@" } named_prestart() { find_pidfile find_sessionkeyfile if [ -n "${named_pidfile}" ]; then warn 'named_pidfile: now determined from the conf file' fi if [ -n "${named_sessionkeyfile}" ]; then warn 'named_sessionkeyfile: now determined from the conf file' fi piddir=`/usr/bin/dirname ${pidfile}` if [ ! -d ${piddir} ]; then install -d -o ${named_uid} -g ${named_uid} ${piddir} fi sessionkeydir=`/usr/bin/dirname ${sessionkeyfile}` if [ ! -d ${sessionkeydir} ]; then install -d -o ${named_uid} -g ${named_uid} ${sessionkeydir} fi command_args="-u ${named_uid:=root} -c ${named_conf} ${command_args}" %%NATIVE_PKCS11%% if [ -z "${named_pkcs11_engine}"]; then %%NATIVE_PKCS11%% err 3 "named_pkcs11_engine has to be set to the PKCS#11 engine's library you want to use" %%NATIVE_PKCS11%% elif [ ! -f ${named_pkcs11_engine} ]; then %%NATIVE_PKCS11%% err 3 "named_pkcs11_engine the PKCS#11 engine's library you want to use doesn't exist" %%NATIVE_PKCS11%% else %%NATIVE_PKCS11%% mkdir -p ${named_chrootdir}${named_pkcs11_engine%/*} %%NATIVE_PKCS11%% cp -p ${named_pkcs11_engine} ${named_chrootdir}${named_pkcs11_engine} %%NATIVE_PKCS11%% command_args="-E ${named_pkcs11_engine} ${command_args}" %%NATIVE_PKCS11%% fi local line nsip firstns # Is the user using a sandbox? # if [ -n "${named_chrootdir}" ]; then rc_flags="${rc_flags} -t ${named_chrootdir}" checkyesno named_chroot_autoupdate && chroot_autoupdate case "${altlog_proglist}" in *named*) ;; *) warn 'Using chroot without setting altlog_proglist, logging may not' warn 'work correctly. Run sysrc altlog_proglist+=named' ;; esac else named_symlink_enable=NO fi # Create an rndc.key file for the user if none exists # confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \ -c ${_named_confdir}/rndc.key" if [ -s "${_named_confdir}/rndc.conf" ]; then unset confgen_command fi if [ -s "${_named_confdir}/rndc.key" ]; then case `stat -f%Su ${_named_confdir}/rndc.key` in root|${named_uid}) ;; *) ${confgen_command} ;; esac else ${confgen_command} fi local checkconf checkconf="${_named_program_root}/sbin/named-checkconf" if ! checkyesno named_chroot_autoupdate && [ -n "${named_chrootdir}" ]; then checkconf="${checkconf} -t ${named_chrootdir}" fi # Create a forwarder configuration based on /etc/resolv.conf if checkyesno named_auto_forward; then if [ ! -s /etc/resolv.conf ]; then warn "named_auto_forward enabled, but no /etc/resolv.conf" # Empty the file in case it is included in named.conf [ -s "${_named_confdir}/auto_forward.conf" ] && create_file ${_named_confdir}/auto_forward.conf ${checkconf} ${named_conf} || err 3 'named-checkconf for ${named_conf} failed' return fi create_file /var/run/naf-resolv.conf create_file /var/run/auto_forward.conf echo ' forwarders {' > /var/run/auto_forward.conf while read line; do case "${line}" in 'nameserver '*|'nameserver '*) nsip=${line##nameserver[ ]} if [ -z "${firstns}" ]; then if [ ! "${nsip}" = '127.0.0.1' ]; then echo 'nameserver 127.0.0.1' echo " ${nsip};" >> /var/run/auto_forward.conf fi firstns=1 else [ "${nsip}" = '127.0.0.1' ] && continue echo " ${nsip};" >> /var/run/auto_forward.conf fi ;; esac echo ${line} done < /etc/resolv.conf > /var/run/naf-resolv.conf echo ' };' >> /var/run/auto_forward.conf echo '' >> /var/run/auto_forward.conf if checkyesno named_auto_forward_only; then echo " forward only;" >> /var/run/auto_forward.conf else echo " forward first;" >> /var/run/auto_forward.conf fi if cmp -s /etc/resolv.conf /var/run/naf-resolv.conf; then unlink /var/run/naf-resolv.conf else [ -e /etc/resolv.conf ] && unlink /etc/resolv.conf mv /var/run/naf-resolv.conf /etc/resolv.conf fi if cmp -s ${_named_confdir}/auto_forward.conf \ /var/run/auto_forward.conf; then unlink /var/run/auto_forward.conf else [ -e "${_named_confdir}/auto_forward.conf" ] && unlink ${_named_confdir}/auto_forward.conf mv /var/run/auto_forward.conf \ ${_named_confdir}/auto_forward.conf fi else # Empty the file in case it is included in named.conf [ -s "${_named_confdir}/auto_forward.conf" ] && create_file ${_named_confdir}/auto_forward.conf fi ${checkconf} ${named_conf} || err 3 "named-checkconf for ${named_conf} failed" } run_rc_command "$1" Index: head/dns/bind913/files/patch-configure =================================================================== --- head/dns/bind913/files/patch-configure (revision 487358) +++ head/dns/bind913/files/patch-configure (revision 487359) @@ -1,90 +1,90 @@ ---- configure.orig 2018-11-22 00:20:34 UTC +--- configure.orig 2018-12-07 18:44:21 UTC +++ configure -@@ -16386,27 +16386,9 @@ done +@@ -16296,27 +16296,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ - "-lgssapi_krb5" \ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \ - "-lgssapi" \ - "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lhx509 -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgss -lkrb5" + "$($KRB5CONFIG gssapi --libs)"; \ do - # Note that this does not include $saved_libs, because - # on FreeBSD machines this configure script has added - # -L/usr/local/lib to LIBS, which can make the - # -lgssapi_krb5 test succeed with shared libraries even - # when you are trying to build with KTH in /usr/lib. - if test "/usr" = "$use_gssapi" - then - LIBS="$TRY_LIBS $ISC_OPENSSL_LIBS" - else - LIBS="-L$use_gssapi/lib $TRY_LIBS $ISC_OPENSSL_LIBS" - fi + LIBS="$TRY_LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -16449,47 +16431,7 @@ $as_echo "no" >&6; } ;; +@@ -16359,47 +16341,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac - # - # XXXDCL Major kludge. Tries to cope with KTH in /usr/lib - # but MIT in /usr/local/lib and trying to build with KTH. - # /usr/local/lib can end up earlier on the link lines. - # Like most kludges, this one is not only inelegant it - # is also likely to be the wrong thing to do at least as - # many times as it is the right thing. Something better - # needs to be done. - # - if test "/usr" = "$use_gssapi" -a \ - -f /usr/local/lib/libkrb5.a; then - FIX_KTH_VS_MIT=yes - fi - - case "$FIX_KTH_VS_MIT" in - yes) - case "$enable_static_linking" in - yes) gssapi_lib_suffix=".a" ;; - *) gssapi_lib_suffix=".so" ;; - esac - - for lib in $LIBS; do - case $lib in - -L*) - ;; - -l*) - new_lib=`echo $lib | - sed -e s%^-l%$use_gssapi/lib/lib% \ - -e s%$%$gssapi_lib_suffix%` - NEW_LIBS="$NEW_LIBS $new_lib" - ;; - *) - as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5 - ;; - esac - done - LIBS="$NEW_LIBS" - ;; - esac - - DST_GSSAPI_INC="-I$use_gssapi/include" + DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)" DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -21015,7 +20957,7 @@ $as_echo "" >&6; } +@@ -20933,7 +20875,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). - bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db" + bdb_incdirs="/db6 /db5 /db48" # include a blank element first for d in "" $bdb_incdirs do Index: head/dns/bind913/pkg-plist =================================================================== --- head/dns/bind913/pkg-plist (revision 487358) +++ head/dns/bind913/pkg-plist (revision 487359) @@ -1,352 +1,355 @@ bin/arpaname bin/bind9-config bin/delv bin/dig %%DNSTAP%%bin/dnstap-read bin/host bin/isc-config.sh bin/mdig bin/named-rrchecker bin/nslookup bin/nsupdate @sample etc/mtree/BIND.chroot.dist.sample @sample etc/mtree/BIND.chroot.local.dist.sample %%ETCDIR%%/bind.keys %%ETCDIR%%/master/empty.db %%ETCDIR%%/master/localhost-forward.db %%ETCDIR%%/master/localhost-reverse.db @sample %%ETCDIR%%/named.conf.sample %%ETCDIR%%/named.root %%ETCDIR%%/rndc.conf.sample include/bind9/check.h include/bind9/getaddresses.h include/bind9/version.h include/dns/acl.h include/dns/adb.h include/dns/badcache.h include/dns/bit.h include/dns/byaddr.h include/dns/cache.h include/dns/callbacks.h include/dns/catz.h include/dns/cert.h include/dns/client.h include/dns/clientinfo.h include/dns/compress.h include/dns/db.h include/dns/dbiterator.h include/dns/dbtable.h include/dns/diff.h include/dns/dispatch.h include/dns/dlz.h include/dns/dlz_dlopen.h include/dns/dns64.h include/dns/dnsrps.h include/dns/dnssec.h include/dns/dnstap.h %%DNSTAP%%include/dns/dnstap.pb-c.h include/dns/ds.h include/dns/dsdigest.h include/dns/dyndb.h include/dns/ecdb.h include/dns/ecs.h include/dns/edns.h include/dns/enumclass.h include/dns/enumtype.h include/dns/events.h include/dns/fixedname.h include/dns/forward.h include/dns/geoip.h include/dns/ipkeylist.h include/dns/iptable.h include/dns/journal.h include/dns/keydata.h include/dns/keyflags.h include/dns/keytable.h include/dns/keyvalues.h include/dns/lib.h include/dns/librpz.h include/dns/log.h include/dns/lookup.h include/dns/master.h include/dns/masterdump.h include/dns/message.h include/dns/name.h include/dns/ncache.h include/dns/nsec.h include/dns/nsec3.h include/dns/nta.h include/dns/opcode.h include/dns/order.h include/dns/peer.h include/dns/portlist.h include/dns/private.h include/dns/rbt.h include/dns/rcode.h include/dns/rdata.h include/dns/rdataclass.h include/dns/rdatalist.h include/dns/rdataset.h include/dns/rdatasetiter.h include/dns/rdataslab.h include/dns/rdatastruct.h include/dns/rdatatype.h include/dns/request.h include/dns/resolver.h include/dns/result.h include/dns/rootns.h include/dns/rpz.h include/dns/rriterator.h include/dns/rrl.h include/dns/sdb.h include/dns/sdlz.h include/dns/secalg.h include/dns/secproto.h include/dns/soa.h include/dns/ssu.h include/dns/stats.h include/dns/tcpmsg.h include/dns/time.h include/dns/timer.h include/dns/tkey.h include/dns/tsec.h include/dns/tsig.h include/dns/ttl.h include/dns/types.h include/dns/update.h include/dns/validator.h include/dns/version.h include/dns/view.h include/dns/xfrin.h include/dns/zone.h include/dns/zonekey.h include/dns/zoneverify.h include/dns/zt.h include/dst/dst.h include/dst/gssapi.h include/dst/lib.h include/dst/result.h include/irs/context.h include/irs/dnsconf.h include/irs/netdb.h include/irs/platform.h include/irs/resconf.h include/irs/types.h include/irs/version.h include/isc/aes.h include/isc/app.h include/isc/assertions.h include/isc/atomic.h include/isc/backtrace.h include/isc/base32.h include/isc/base64.h include/isc/bind9.h include/isc/buffer.h include/isc/bufferlist.h include/isc/commandline.h include/isc/condition.h include/isc/counter.h include/isc/crc64.h include/isc/deprecated.h include/isc/dir.h include/isc/errno.h include/isc/error.h include/isc/event.h include/isc/eventclass.h include/isc/file.h include/isc/formatcheck.h include/isc/fsaccess.h include/isc/fuzz.h include/isc/hash.h include/isc/heap.h include/isc/hex.h include/isc/hmac.h include/isc/ht.h include/isc/httpd.h include/isc/interfaceiter.h include/isc/iterated_hash.h include/isc/json.h include/isc/lang.h include/isc/lex.h include/isc/lfsr.h include/isc/lib.h include/isc/likely.h include/isc/list.h include/isc/log.h include/isc/magic.h include/isc/md.h include/isc/mem.h include/isc/meminfo.h include/isc/msgcat.h include/isc/msgs.h include/isc/mutex.h include/isc/mutexblock.h include/isc/net.h include/isc/netaddr.h include/isc/netdb.h include/isc/netscope.h include/isc/nonce.h include/isc/offset.h include/isc/once.h include/isc/os.h include/isc/parseint.h include/isc/platform.h include/isc/pool.h include/isc/portset.h include/isc/print.h include/isc/queue.h include/isc/quota.h include/isc/radix.h include/isc/random.h include/isc/ratelimiter.h include/isc/refcount.h include/isc/regex.h include/isc/region.h include/isc/resource.h include/isc/result.h include/isc/resultclass.h include/isc/rwlock.h include/isc/safe.h include/isc/serial.h include/isc/sockaddr.h include/isc/socket.h include/isc/stat.h include/isc/stats.h include/isc/stdatomic.h include/isc/stdio.h include/isc/stdtime.h include/isc/strerr.h include/isc/string.h include/isc/symtab.h include/isc/syslog.h include/isc/task.h include/isc/taskpool.h include/isc/thread.h include/isc/time.h include/isc/timer.h include/isc/tm.h include/isc/types.h include/isc/util.h include/isc/version.h include/isc/xml.h include/isccc/alist.h include/isccc/base64.h include/isccc/cc.h include/isccc/ccmsg.h include/isccc/events.h include/isccc/lib.h include/isccc/result.h include/isccc/sexpr.h include/isccc/symtab.h include/isccc/symtype.h include/isccc/types.h include/isccc/util.h include/isccc/version.h include/isccfg/aclconf.h include/isccfg/cfg.h include/isccfg/dnsconf.h include/isccfg/grammar.h include/isccfg/log.h include/isccfg/namedconf.h include/isccfg/version.h include/ns/client.h +include/ns/hooks.h include/ns/interfacemgr.h include/ns/lib.h include/ns/listenlist.h include/ns/log.h include/ns/notify.h include/ns/query.h include/ns/server.h include/ns/sortlist.h include/ns/stats.h include/ns/types.h include/ns/update.h include/ns/version.h include/ns/xfrout.h include/pk11/constants.h include/pk11/internal.h include/pk11/pk11.h include/pk11/result.h include/pk11/site.h include/pkcs11/cryptoki.h include/pkcs11/eddsa.h include/pkcs11/pkcs11.h include/pkcs11/pkcs11f.h include/pkcs11/pkcs11t.h +lib/filter-aaaa.so lib/libbind9.a lib/libdns.a lib/libirs.a lib/libisc.a lib/libisccc.a lib/libisccfg.a lib/libns.a man/man1/arpaname.1.gz man/man1/bind9-config.1.gz man/man1/delv.1.gz man/man1/dig.1.gz %%DNSTAP%%man/man1/dnstap-read.1.gz man/man1/host.1.gz man/man1/isc-config.sh.1.gz man/man1/mdig.1.gz man/man1/named-rrchecker.1.gz man/man1/nslookup.1.gz man/man1/nsupdate.1.gz man/man5/named.conf.5.gz man/man5/rndc.conf.5.gz man/man8/ddns-confgen.8.gz man/man8/dnssec-cds.8.gz %%PYTHON%%man/man8/dnssec-checkds.8.gz %%PYTHON%%man/man8/dnssec-coverage.8.gz man/man8/dnssec-dsfromkey.8.gz man/man8/dnssec-importkey.8.gz man/man8/dnssec-keyfromlabel.8.gz man/man8/dnssec-keygen.8.gz %%PYTHON%%man/man8/dnssec-keymgr.8.gz man/man8/dnssec-revoke.8.gz man/man8/dnssec-settime.8.gz man/man8/dnssec-signzone.8.gz man/man8/dnssec-verify.8.gz +man/man8/filter-aaaa.8.gz man/man8/named-checkconf.8.gz man/man8/named-checkzone.8.gz man/man8/named-compilezone.8.gz man/man8/named-journalprint.8.gz %%LMDB%%man/man8/named-nzd2nzf.8.gz man/man8/named.8.gz man/man8/nsec3hash.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz %%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz man/man8/rndc-confgen.8.gz man/man8/rndc.8.gz man/man8/tsig-keygen.8.gz sbin/ddns-confgen sbin/dnssec-cds %%PYTHON%%sbin/dnssec-checkds %%PYTHON%%sbin/dnssec-coverage sbin/dnssec-dsfromkey sbin/dnssec-importkey sbin/dnssec-keyfromlabel sbin/dnssec-keygen %%PYTHON%%sbin/dnssec-keymgr sbin/dnssec-revoke sbin/dnssec-settime sbin/dnssec-signzone sbin/dnssec-verify sbin/named sbin/named-checkconf sbin/named-checkzone sbin/named-compilezone sbin/named-journalprint %%LMDB%%sbin/named-nzd2nzf sbin/nsec3hash %%NATIVE_PKCS11%%sbin/pkcs11-destroy %%NATIVE_PKCS11%%sbin/pkcs11-keygen %%NATIVE_PKCS11%%sbin/pkcs11-list %%NATIVE_PKCS11%%sbin/pkcs11-tokens sbin/rndc sbin/rndc-confgen sbin/tsig-keygen @dir(bind,bind,) %%ETCDIR%%/dynamic @dir(bind,bind,) %%ETCDIR%%/slave @dir(bind,bind,) %%ETCDIR%%/working