 @@ -1,78 +1,79 @@
-# $NetBSD: Makefile,v 1.10 2019/06/20 02:13:58 taca Exp $
+# $NetBSD: Makefile,v 1.11 2019/06/28 17:01:30 jperkin Exp $
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
 PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.isc.org/software/bind/
 COMMENT=	Berkeley Internet Name Daemon implementation of DNS, version 9.11
 LICENSE=	mpl-2.0
 CONFLICTS+=	host-[0-9]*
 MAKE_JOBS_SAFE=	no
 BIND_VERSION=	9.11.8
 .include "../../mk/bsd.prefs.mk"
 BUILD_DEFS+=	BIND_DIR VARBASE
 .include "options.mk"
 USE_TOOLS+=		pax perl
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libtool
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--with-python=no
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-vax)
 CONFIGURE_ARGS+=	--disable-atomic
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != ""
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 CONFIGURE_ARGS.DragonFly+=	--disable-kqueue
 PKG_GROUPS_VARS+=	BIND_GROUP
 PKG_USERS_VARS=		BIND_USER
 PKG_GROUPS=		${BIND_GROUP}
 PKG_USERS=		${BIND_USER}:${BIND_GROUP}
 PKG_GECOS.${BIND_USER}=	Named pseudo-user
 PKG_HOME.${BIND_USER}=	${BIND_DIR}
 DOCS=			CHANGES HISTORY OPTIONS README
 FILES_SUBST+=		BIND_GROUP=${BIND_GROUP} \
 			BIND_USER=${BIND_USER} PAX=${PAX:Q} \
 			SSLBASE=${SSLBASE}
 MESSAGE_SUBST+=		BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
 DOCDIR=			share/doc/bind9
 RCD_SCRIPTS=		lwresd named9
 SMF_METHODS=		named
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/bind9
 CONF_FILES+=		share/examples/bind9/bind.keys \
 			${PKG_SYSCONFDIR}/bind.keys
 INSTALLATION_DIRS+=	${DOCDIR} ${DOCDIR}/arm
 post-install:
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,262 +1,262 @@
 #!@SMF_METHOD_SHELL@
+#
 # CDDL HEADER START
+#
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
+#
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
+#
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
+#
 # CDDL HEADER END
+#
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+#
 #pragma ident	"@(#)dns-server.sh	1.1	07/03/26 SMI"
 # smf_method(5) start/stop script required for server DNS
 . /lib/svc/share/smf_include.sh
 mount_chroot ()
+{
     c=$1
     shift
     for f in $*; do
         if [ -z "${f}" -o ! -f "${f}" -o \
              -z "${c}" -o ! -d "${c}" ]; then
              exit ${SMF_EXIT_ERR_CONFIG}
         fi
         umount ${c}/${f} >/dev/null 2>&1
         mkdir -p `dirname ${c}/${f}`
         touch ${c}/${f}
         mount -Flofs ${f} ${c}/${f}
     done
+}
 umount_chroot ()
+{
     c=$1
     shift
     for f in $*; do
         umount ${c}/${f} >/dev/null 2>&1
     done
+}
 get_config ()
+{
     configuration_file=@PKG_SYSCONFDIR@/named.conf
     rndc_config_file=@PKG_SYSCONFDIR@/rndc.conf
     rndc_key_file=@PKG_SYSCONFDIR@/rndc.key
     rndc_cmd_opts="-a"
     libraries="/usr/pkg/lib/engines/libgost.so"
     cmdopts=""
     checkopts=""
     properties="debug_level ip_interfaces listen_on_port
         threads chroot_dir configuration_file server user"
     for prop in $properties
     do
         value=`/usr/bin/svcprop -p options/${prop} ${SMF_FMRI}`
         if [ -z "${value}" -o "${value}" = '""' ]; then
             continue;
         fi
         case $prop in
         'debug_level')
             if [ ${value} -gt 0 ]; then
                 cmdopts="${cmdopts} -d ${value}"
             fi
             ;;
         'ip_interfaces')
             case ${value} in
                 'IPv4')
                     cmdopts="${cmdopts} -4";;
                 'IPv6')
                     cmdopts="${cmdopts} -6";;
                 'all')
                     :   # Default is all, therefore ignore.
                     ;;
                 *)
                     echo "$I: Unrecognised value in service instance property" >&2
                     echo "$I: options/${prop} : ${value}" >&2
                     ;;
             esac
             ;;
         'listen_on_port')
             if [ ${value} -gt 0 ]; then
                 cmdopts="${cmdopts} -p ${value}"
             fi
             ;;
         'threads')
             if [ ${value} -gt 0 ]; then
                 cmdopts="${cmdopts} -n ${value}"
             fi
             ;;
         'chroot_dir')
             cmdopts="${cmdopts} -t ${value}"
             checkopts="${checkopts} -t ${value}"
             chroot_dir=${value};
             ;;
         'configuration_file')
             cmdopts="${cmdopts} -c ${value}"
             checkopts="${checkopts} ${value}"
             configuration_file=${value};
             ;;
         'server')
             set -- `echo ${value} | /usr/bin/sed -e  's/\\\\//g'`
             server=$@
             ;;
         'user')
             cmdopts="${cmdopts} -u ${value}"
             cmduser=${value};
             ;;
         esac
     done
     configuration_dir=$(sed -n -e 's,^[[:space:]]*directory.*"\(.*\)";,\1,p' \
         ${configuration_file})
     [ "${configuration_dir}" == "" ] && configuration_dir=@PKG_SYSCONFDIR@/namedb
     configuration_files=$(sed -n -e \
         "s,^[[:space:]]*file.*\"\(.*\)\";,${configuration_dir}/\1,p" \
         ${configuration_file} | sort -u)
     configuration_files="${configuration_files} ${configuration_file}"
+}
 result=${SMF_EXIT_OK}
 # Read command line arguments
 method="$1"		# %m
 instance="$2" 		# %i
 contract="$3"		# %{restarter/contract}
 # Set defaults; SMF_FMRI should have been set, but just in case.
 if [ -z "$SMF_FMRI" ]; then
     SMF_FMRI="svc:/@SMF_PREFIX@/@SMF_NAME@:${instance}"
 fi
 server="@PREFIX@/sbin/named"
 checkconf="@PREFIX@/sbin/named-checkconf"
 I=`/usr/bin/basename $0`
 case "$method" in
 'start')
     get_config
     # If chroot option is set, note zones(5) are preferred, then
     # configuration file lives under chroot directory.
     if [ "${chroot_dir}" != "" ]; then
         if [ "${chroot_dir}" = "/" ]; then
             msg="$I: chroot_dir must not be /"
             echo ${msg} >&2
             /usr/bin/logger -p daemon.error ${msg}
             # dns-server should be placed in maintenance state.
             exit ${SMF_EXIT_ERR_CONFIG}
         fi
         server="env LD_NOLAZYLOAD=1 ${server}"
         checkconf="env LD_NOLAZYLOAD=1 ${checkconf}"
         mkdir -p ${chroot_dir}
         if [ "${SMF_ZONENAME}" = "global" ]; then
             for dev in crypto log null poll random urandom; do
                 rm -f ${chroot_dir}/dev/${dev}
                 pax -rw -H -pe /dev/${dev} ${chroot_dir}
             done
         fi
 	missing=""
         for dev in crypto null poll random urandom; do
 	    if [ ! -e "${chroot_dir}/dev/${dev}" ]; then
 		missing="${missing} ${dev}"
 	    fi
         done
         if [ ! -z "${missing}" ]; then
             msg="$I: missing device nodes in ${chroot_dir}: ${missing}"
             echo ${msg} >&2
             /usr/bin/logger -p daemon.err ${msg}
             # dns-server should be placed in maintenance state.
             exit ${SMF_EXIT_ERR_CONFIG}
         fi
         mount_chroot ${chroot_dir} ${configuration_files} ${libraries}
         mkdir -p ${chroot_dir}/var/run/named
         chown ${cmduser}:${cmduser} ${chroot_dir}/var/run/named
         configuration_file=${chroot_dir}${configuration_file}
         rndc_config_file=${chroot_dir}${rndc_config_file}
         rndc_key_file=${chroot_dir}${rndc_key_file}
         rndc_cmd_opts="${rndc_cmd_opts} -t ${chroot_dir}"
     else
         mkdir -p -m 0770 @VARBASE@/run/named
         chown ${cmduser}:${cmduser} @VARBASE@/run/named
     fi
     # Check if the rndc config file exists.
     if [ ! -f ${rndc_config_file} ]; then
         # If not, check if the default rndc key file exists.
         if [ ! -f ${rndc_key_file} ]; then
             echo "$I: Creating default rndc key file: ${rndc_key_file}." >&2
             @PREFIX@/sbin/rndc-confgen ${rndc_cmd_opts}
             if [ $? -ne 0 ]; then
                 echo "$I : Warning: rndc configuration failed! Use of 'rndc' to" \
                     "control 'named' may fail and 'named' may report further error" \
                     "messages to the system log. This is not fatal. For more" \
                     "information see rndc(1M) and rndc-confgen(1M)." >&2
             fi
         fi
     fi
     if [ ${result} = ${SMF_EXIT_OK} ]; then
         ${checkconf} -z ${checkopts}
         result=$?
         if [ $result -ne 0 ]; then
             msg="$I: named-checkconf failed to verify configuration"
             echo ${msg} >&2
             /usr/bin/logger -p daemon.error ${msg}
             if [ "${chroot_dir}" != "" -a "${chroot_dir}" != "/" ]; then
                 umount_chroot ${chroot_dir} ${configuration_files} ${libraries}
             fi
             # dns-server should be placed in maintenance state.
             exit ${SMF_EXIT_ERR_CONFIG}
         fi
     fi
     if [ ${result} = ${SMF_EXIT_OK} ]; then
 	echo "$I: Executing: ${server} ${cmdopts}"
 	# Execute named(1M) with relevant command line options.
-	ppriv -s A-all -s A+basic,net_privaddr,file_dac_read,file_dac_search,sys_resource,proc_chroot,proc_setid -e ${server} ${cmdopts}
+	${server} ${cmdopts}
 	result=$?
     fi
     ;;
 'stop')
     get_config
     smf_kill_contract ${contract} TERM 1
     [ $? -ne 0 ] && exit 1
     if [ "${chroot_dir}" != "" -a "${chroot_dir}" != "/" ]; then
         umount_chroot ${chroot_dir} ${configuration_files} ${libraries}
     fi
     ;;
 *)
     echo "Usage: $I [stop|start] <instance>" >&2
     exit 1
     ;;
 esac
 exit ${result}

 @@ -1,79 +1,80 @@
-# $NetBSD: Makefile,v 1.12 2019/06/20 02:15:20 taca Exp $
+# $NetBSD: Makefile,v 1.13 2019/06/28 17:01:30 jperkin Exp $
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
 PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.isc.org/software/bind/
 COMMENT=	Berkeley Internet Name Daemon implementation of DNS, version 9.12
 LICENSE=	mpl-2.0
 CONFLICTS+=	host-[0-9]*
 MAKE_JOBS_SAFE=	no
 USE_CWRAPPERS=	no
 BIND_VERSION=	9.12.4-P2
 .include "../../mk/bsd.prefs.mk"
 BUILD_DEFS+=	BIND_DIR VARBASE
 .include "options.mk"
 USE_TOOLS+=		pax perl
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libtool
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--with-python=no
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-vax)
 CONFIGURE_ARGS+=	--disable-atomic
 .endif
 .if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} != ""
 CONFIGURE_ARGS+=	--disable-threads
 .endif
 CONFIGURE_ARGS.DragonFly+=	--disable-kqueue
 PKG_GROUPS_VARS+=	BIND_GROUP
 PKG_USERS_VARS=		BIND_USER
 PKG_GROUPS=		${BIND_GROUP}
 PKG_USERS=		${BIND_USER}:${BIND_GROUP}
 PKG_GECOS.${BIND_USER}=	Named pseudo-user
 PKG_HOME.${BIND_USER}=	${BIND_DIR}
 DOCS=			CHANGES HISTORY OPTIONS README
 FILES_SUBST+=		BIND_GROUP=${BIND_GROUP} \
 			BIND_USER=${BIND_USER} PAX=${PAX:Q} \
 			SSLBASE=${SSLBASE}
 MESSAGE_SUBST+=		BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
 DOCDIR=			share/doc/bind9
 RCD_SCRIPTS=		named9
 SMF_METHODS=		named
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/bind9
 CONF_FILES+=		share/examples/bind9/bind.keys \
 			${PKG_SYSCONFDIR}/bind.keys
 INSTALLATION_DIRS+=	${DOCDIR} ${DOCDIR}/arm
 post-install:
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,262 +1,262 @@
 #!@SMF_METHOD_SHELL@
+#
 # CDDL HEADER START
+#
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
+#
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
+#
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
+#
 # CDDL HEADER END
+#
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+#
 #pragma ident	"@(#)dns-server.sh	1.1	07/03/26 SMI"
 # smf_method(5) start/stop script required for server DNS
 . /lib/svc/share/smf_include.sh
 mount_chroot ()
+{
     c=$1
     shift
     for f in $*; do
         if [ -z "${f}" -o ! -f "${f}" -o \
              -z "${c}" -o ! -d "${c}" ]; then
              exit ${SMF_EXIT_ERR_CONFIG}
         fi
         umount ${c}/${f} >/dev/null 2>&1
         mkdir -p `dirname ${c}/${f}`
         touch ${c}/${f}
         mount -Flofs ${f} ${c}/${f}
     done
+}
 umount_chroot ()
+{
     c=$1
     shift
     for f in $*; do
         umount ${c}/${f} >/dev/null 2>&1
     done
+}
 get_config ()
+{
     configuration_file=@PKG_SYSCONFDIR@/named.conf
     rndc_config_file=@PKG_SYSCONFDIR@/rndc.conf
     rndc_key_file=@PKG_SYSCONFDIR@/rndc.key
     rndc_cmd_opts="-a"
     libraries="/usr/pkg/lib/engines/libgost.so"
     cmdopts=""
     checkopts=""
     properties="debug_level ip_interfaces listen_on_port
         threads chroot_dir configuration_file server user"
     for prop in $properties
     do
         value=`/usr/bin/svcprop -p options/${prop} ${SMF_FMRI}`
         if [ -z "${value}" -o "${value}" = '""' ]; then
             continue;
         fi
         case $prop in
         'debug_level')
             if [ ${value} -gt 0 ]; then
                 cmdopts="${cmdopts} -d ${value}"
             fi
             ;;
         'ip_interfaces')
             case ${value} in
                 'IPv4')
                     cmdopts="${cmdopts} -4";;
                 'IPv6')
                     cmdopts="${cmdopts} -6";;
                 'all')
                     :   # Default is all, therefore ignore.
                     ;;
                 *)
                     echo "$I: Unrecognised value in service instance property" >&2
                     echo "$I: options/${prop} : ${value}" >&2
                     ;;
             esac
             ;;
         'listen_on_port')
             if [ ${value} -gt 0 ]; then
                 cmdopts="${cmdopts} -p ${value}"
             fi
             ;;
         'threads')
             if [ ${value} -gt 0 ]; then
                 cmdopts="${cmdopts} -n ${value}"
             fi
             ;;
         'chroot_dir')
             cmdopts="${cmdopts} -t ${value}"
             checkopts="${checkopts} -t ${value}"
             chroot_dir=${value};
             ;;
         'configuration_file')
             cmdopts="${cmdopts} -c ${value}"
             checkopts="${checkopts} ${value}"
             configuration_file=${value};
             ;;
         'server')
             set -- `echo ${value} | /usr/bin/sed -e  's/\\\\//g'`
             server=$@
             ;;
         'user')
             cmdopts="${cmdopts} -u ${value}"
             cmduser=${value};
             ;;
         esac
     done
     configuration_dir=$(sed -n -e 's,^[[:space:]]*directory.*"\(.*\)";,\1,p' \
         ${configuration_file})
     [ "${configuration_dir}" == "" ] && configuration_dir=@PKG_SYSCONFDIR@/namedb
     configuration_files=$(sed -n -e \
         "s,^[[:space:]]*file.*\"\(.*\)\";,${configuration_dir}/\1,p" \
         ${configuration_file} | sort -u)
     configuration_files="${configuration_files} ${configuration_file}"
+}
 result=${SMF_EXIT_OK}
 # Read command line arguments
 method="$1"		# %m
 instance="$2" 		# %i
 contract="$3"		# %{restarter/contract}
 # Set defaults; SMF_FMRI should have been set, but just in case.
 if [ -z "$SMF_FMRI" ]; then
     SMF_FMRI="svc:/@SMF_PREFIX@/@SMF_NAME@:${instance}"
 fi
 server="@PREFIX@/sbin/named"
 checkconf="@PREFIX@/sbin/named-checkconf"
 I=`/usr/bin/basename $0`
 case "$method" in
 'start')
     get_config
     # If chroot option is set, note zones(5) are preferred, then
     # configuration file lives under chroot directory.
     if [ "${chroot_dir}" != "" ]; then
         if [ "${chroot_dir}" = "/" ]; then
             msg="$I: chroot_dir must not be /"
             echo ${msg} >&2
             /usr/bin/logger -p daemon.error ${msg}
             # dns-server should be placed in maintenance state.
             exit ${SMF_EXIT_ERR_CONFIG}
         fi
         server="env LD_NOLAZYLOAD=1 ${server}"
         checkconf="env LD_NOLAZYLOAD=1 ${checkconf}"
         mkdir -p ${chroot_dir}
         if [ "${SMF_ZONENAME}" = "global" ]; then
             for dev in crypto log null poll random urandom; do
                 rm -f ${chroot_dir}/dev/${dev}
                 pax -rw -H -pe /dev/${dev} ${chroot_dir}
             done
         fi
 	missing=""
         for dev in crypto null poll random urandom; do
 	    if [ ! -e "${chroot_dir}/dev/${dev}" ]; then
 		missing="${missing} ${dev}"
 	    fi
         done
         if [ ! -z "${missing}" ]; then
             msg="$I: missing device nodes in ${chroot_dir}: ${missing}"
             echo ${msg} >&2
             /usr/bin/logger -p daemon.err ${msg}
             # dns-server should be placed in maintenance state.
             exit ${SMF_EXIT_ERR_CONFIG}
         fi
         mount_chroot ${chroot_dir} ${configuration_files} ${libraries}
         mkdir -p ${chroot_dir}/var/run/named
         chown ${cmduser}:${cmduser} ${chroot_dir}/var/run/named
         configuration_file=${chroot_dir}${configuration_file}
         rndc_config_file=${chroot_dir}${rndc_config_file}
         rndc_key_file=${chroot_dir}${rndc_key_file}
         rndc_cmd_opts="${rndc_cmd_opts} -t ${chroot_dir}"
     else
         mkdir -p -m 0770 @VARBASE@/run/named
         chown ${cmduser}:${cmduser} @VARBASE@/run/named
     fi
     # Check if the rndc config file exists.
     if [ ! -f ${rndc_config_file} ]; then
         # If not, check if the default rndc key file exists.
         if [ ! -f ${rndc_key_file} ]; then
             echo "$I: Creating default rndc key file: ${rndc_key_file}." >&2
             @PREFIX@/sbin/rndc-confgen ${rndc_cmd_opts}
             if [ $? -ne 0 ]; then
                 echo "$I : Warning: rndc configuration failed! Use of 'rndc' to" \
                     "control 'named' may fail and 'named' may report further error" \
                     "messages to the system log. This is not fatal. For more" \
                     "information see rndc(1M) and rndc-confgen(1M)." >&2
             fi
         fi
     fi
     if [ ${result} = ${SMF_EXIT_OK} ]; then
         ${checkconf} -z ${checkopts}
         result=$?
         if [ $result -ne 0 ]; then
             msg="$I: named-checkconf failed to verify configuration"
             echo ${msg} >&2
             /usr/bin/logger -p daemon.error ${msg}
             if [ "${chroot_dir}" != "" -a "${chroot_dir}" != "/" ]; then
                 umount_chroot ${chroot_dir} ${configuration_files} ${libraries}
             fi
             # dns-server should be placed in maintenance state.
             exit ${SMF_EXIT_ERR_CONFIG}
         fi
     fi
     if [ ${result} = ${SMF_EXIT_OK} ]; then
 	echo "$I: Executing: ${server} ${cmdopts}"
 	# Execute named(1M) with relevant command line options.
-	ppriv -s A-all -s A+basic,net_privaddr,file_dac_read,file_dac_search,sys_resource,proc_chroot,proc_setid -e ${server} ${cmdopts}
+	${server} ${cmdopts}
 	result=$?
     fi
     ;;
 'stop')
     get_config
     smf_kill_contract ${contract} TERM 1
     [ $? -ne 0 ] && exit 1
     if [ "${chroot_dir}" != "" -a "${chroot_dir}" != "/" ]; then
         umount_chroot ${chroot_dir} ${configuration_files} ${libraries}
     fi
     ;;
 *)
     echo "Usage: $I [stop|start] <instance>" >&2
     exit 1
     ;;
 esac
 exit ${result}

 @@ -1,75 +1,76 @@
-# $NetBSD: Makefile,v 1.6 2019/06/20 02:16:53 taca Exp $
+# $NetBSD: Makefile,v 1.7 2019/06/28 17:01:30 jperkin Exp $
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
 PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.isc.org/software/bind/
 COMMENT=	Berkeley Internet Name Daemon implementation of DNS, version 9.14
 LICENSE=	mpl-2.0
 CONFLICTS+=	host-[0-9]*
 MAKE_JOBS_SAFE=	no
 BIND_VERSION=	9.14.3
 .include "../../mk/bsd.prefs.mk"
 BUILD_DEFS+=	BIND_DIR VARBASE
 .include "options.mk"
 USE_TOOLS+=		pax perl
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libtool
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 CONFIGURE_ARGS+=	--with-python=no
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-vax)
 CONFIGURE_ARGS+=	--disable-atomic
 .endif
 CONFIGURE_ARGS.DragonFly+=	--disable-kqueue
 PKG_GROUPS_VARS+=	BIND_GROUP
 PKG_USERS_VARS=		BIND_USER
 PKG_GROUPS=		${BIND_GROUP}
 PKG_USERS=		${BIND_USER}:${BIND_GROUP}
 PKG_GECOS.${BIND_USER}=	Named pseudo-user
 PKG_HOME.${BIND_USER}=	${BIND_DIR}
 DOCS=			CHANGES HISTORY OPTIONS README
 FILES_SUBST+=		BIND_GROUP=${BIND_GROUP} \
 			BIND_USER=${BIND_USER} PAX=${PAX:Q} \
 			SSLBASE=${SSLBASE}
 MESSAGE_SUBST+=		BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
 DOCDIR=			share/doc/bind9
 RCD_SCRIPTS=		named9
 SMF_METHODS=		named
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/bind9
 CONF_FILES+=		share/examples/bind9/bind.keys \
 			${PKG_SYSCONFDIR}/bind.keys
 INSTALLATION_DIRS+=	${DOCDIR} ${DOCDIR}/arm
 post-install:
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,262 +1,262 @@
 #!@SMF_METHOD_SHELL@
+#
 # CDDL HEADER START
+#
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
+#
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
+#
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
+#
 # CDDL HEADER END
+#
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+#
 #pragma ident	"@(#)dns-server.sh	1.1	07/03/26 SMI"
 # smf_method(5) start/stop script required for server DNS
 . /lib/svc/share/smf_include.sh
 mount_chroot ()
+{
     c=$1
     shift
     for f in $*; do
         if [ -z "${f}" -o ! -f "${f}" -o \
              -z "${c}" -o ! -d "${c}" ]; then
              exit ${SMF_EXIT_ERR_CONFIG}
         fi
         umount ${c}/${f} >/dev/null 2>&1
         mkdir -p `dirname ${c}/${f}`
         touch ${c}/${f}
         mount -Flofs ${f} ${c}/${f}
     done
+}
 umount_chroot ()
+{
     c=$1
     shift
     for f in $*; do
         umount ${c}/${f} >/dev/null 2>&1
     done
+}
 get_config ()
+{
     configuration_file=@PKG_SYSCONFDIR@/named.conf
     rndc_config_file=@PKG_SYSCONFDIR@/rndc.conf
     rndc_key_file=@PKG_SYSCONFDIR@/rndc.key
     rndc_cmd_opts="-a"
     libraries="/usr/pkg/lib/engines/libgost.so"
     cmdopts=""
     checkopts=""
     properties="debug_level ip_interfaces listen_on_port
         threads chroot_dir configuration_file server user"
     for prop in $properties
     do
         value=`/usr/bin/svcprop -p options/${prop} ${SMF_FMRI}`
         if [ -z "${value}" -o "${value}" = '""' ]; then
             continue;
         fi
         case $prop in
         'debug_level')
             if [ ${value} -gt 0 ]; then
                 cmdopts="${cmdopts} -d ${value}"
             fi
             ;;
         'ip_interfaces')
             case ${value} in
                 'IPv4')
                     cmdopts="${cmdopts} -4";;
                 'IPv6')
                     cmdopts="${cmdopts} -6";;
                 'all')
                     :   # Default is all, therefore ignore.
                     ;;
                 *)
                     echo "$I: Unrecognised value in service instance property" >&2
                     echo "$I: options/${prop} : ${value}" >&2
                     ;;
             esac
             ;;
         'listen_on_port')
             if [ ${value} -gt 0 ]; then
                 cmdopts="${cmdopts} -p ${value}"
             fi
             ;;
         'threads')
             if [ ${value} -gt 0 ]; then
                 cmdopts="${cmdopts} -n ${value}"
             fi
             ;;
         'chroot_dir')
             cmdopts="${cmdopts} -t ${value}"
             checkopts="${checkopts} -t ${value}"
             chroot_dir=${value};
             ;;
         'configuration_file')
             cmdopts="${cmdopts} -c ${value}"
             checkopts="${checkopts} ${value}"
             configuration_file=${value};
             ;;
         'server')
             set -- `echo ${value} | /usr/bin/sed -e  's/\\\\//g'`
             server=$@
             ;;
         'user')
             cmdopts="${cmdopts} -u ${value}"
             cmduser=${value};
             ;;
         esac
     done
     configuration_dir=$(sed -n -e 's,^[[:space:]]*directory.*"\(.*\)";,\1,p' \
         ${configuration_file})
     [ "${configuration_dir}" == "" ] && configuration_dir=@PKG_SYSCONFDIR@/namedb
     configuration_files=$(sed -n -e \
         "s,^[[:space:]]*file.*\"\(.*\)\";,${configuration_dir}/\1,p" \
         ${configuration_file} | sort -u)
     configuration_files="${configuration_files} ${configuration_file}"
+}
 result=${SMF_EXIT_OK}
 # Read command line arguments
 method="$1"		# %m
 instance="$2" 		# %i
 contract="$3"		# %{restarter/contract}
 # Set defaults; SMF_FMRI should have been set, but just in case.
 if [ -z "$SMF_FMRI" ]; then
     SMF_FMRI="svc:/@SMF_PREFIX@/@SMF_NAME@:${instance}"
 fi
 server="@PREFIX@/sbin/named"
 checkconf="@PREFIX@/sbin/named-checkconf"
 I=`/usr/bin/basename $0`
 case "$method" in
 'start')
     get_config
     # If chroot option is set, note zones(5) are preferred, then
     # configuration file lives under chroot directory.
     if [ "${chroot_dir}" != "" ]; then
         if [ "${chroot_dir}" = "/" ]; then
             msg="$I: chroot_dir must not be /"
             echo ${msg} >&2
             /usr/bin/logger -p daemon.error ${msg}
             # dns-server should be placed in maintenance state.
             exit ${SMF_EXIT_ERR_CONFIG}
         fi
         server="env LD_NOLAZYLOAD=1 ${server}"
         checkconf="env LD_NOLAZYLOAD=1 ${checkconf}"
         mkdir -p ${chroot_dir}
         if [ "${SMF_ZONENAME}" = "global" ]; then
             for dev in crypto log null poll random urandom; do
                 rm -f ${chroot_dir}/dev/${dev}
                 pax -rw -H -pe /dev/${dev} ${chroot_dir}
             done
         fi
 	missing=""
         for dev in crypto null poll random urandom; do
 	    if [ ! -e "${chroot_dir}/dev/${dev}" ]; then
 		missing="${missing} ${dev}"
 	    fi
         done
         if [ ! -z "${missing}" ]; then
             msg="$I: missing device nodes in ${chroot_dir}: ${missing}"
             echo ${msg} >&2
             /usr/bin/logger -p daemon.err ${msg}
             # dns-server should be placed in maintenance state.
             exit ${SMF_EXIT_ERR_CONFIG}
         fi
         mount_chroot ${chroot_dir} ${configuration_files} ${libraries}
         mkdir -p ${chroot_dir}/var/run/named
         chown ${cmduser}:${cmduser} ${chroot_dir}/var/run/named
         configuration_file=${chroot_dir}${configuration_file}
         rndc_config_file=${chroot_dir}${rndc_config_file}
         rndc_key_file=${chroot_dir}${rndc_key_file}
         rndc_cmd_opts="${rndc_cmd_opts} -t ${chroot_dir}"
     else
         mkdir -p 0770 @VARBASE@/run/named
         chown ${cmduser}:${cmduser} @VARBASE@/run/named
     fi
     # Check if the rndc config file exists.
     if [ ! -f ${rndc_config_file} ]; then
         # If not, check if the default rndc key file exists.
         if [ ! -f ${rndc_key_file} ]; then
             echo "$I: Creating default rndc key file: ${rndc_key_file}." >&2
             @PREFIX@/sbin/rndc-confgen ${rndc_cmd_opts}
             if [ $? -ne 0 ]; then
                 echo "$I : Warning: rndc configuration failed! Use of 'rndc' to" \
                     "control 'named' may fail and 'named' may report further error" \
                     "messages to the system log. This is not fatal. For more" \
                     "information see rndc(1M) and rndc-confgen(1M)." >&2
             fi
         fi
     fi
     if [ ${result} = ${SMF_EXIT_OK} ]; then
         ${checkconf} -z ${checkopts}
         result=$?
         if [ $result -ne 0 ]; then
             msg="$I: named-checkconf failed to verify configuration"
             echo ${msg} >&2
             /usr/bin/logger -p daemon.error ${msg}
             if [ "${chroot_dir}" != "" -a "${chroot_dir}" != "/" ]; then
                 umount_chroot ${chroot_dir} ${configuration_files} ${libraries}
             fi
             # dns-server should be placed in maintenance state.
             exit ${SMF_EXIT_ERR_CONFIG}
         fi
     fi
     if [ ${result} = ${SMF_EXIT_OK} ]; then
 	echo "$I: Executing: ${server} ${cmdopts}"
 	# Execute named(1M) with relevant command line options.
-	ppriv -s A-all -s A+basic,net_privaddr,file_dac_read,file_dac_search,sys_resource,proc_chroot,proc_setid -e ${server} ${cmdopts}
+	${server} ${cmdopts}
 	result=$?
     fi
     ;;
 'stop')
     get_config
     smf_kill_contract ${contract} TERM 1
     [ $? -ne 0 ] && exit 1
     if [ "${chroot_dir}" != "" -a "${chroot_dir}" != "/" ]; then
         umount_chroot ${chroot_dir} ${configuration_files} ${libraries}
     fi
     ;;
 *)
     echo "Usage: $I [stop|start] <instance>" >&2
     exit 1
     ;;
 esac
 exit ${result}