From owner-svn-ports-head@FreeBSD.ORG Fri Nov 22 13:41:36 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0CD5C625; Fri, 22 Nov 2013 13:41:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EFA602553; Fri, 22 Nov 2013 13:41:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAMDfZDm002159; Fri, 22 Nov 2013 13:41:35 GMT (envelope-from erwin@svn.freebsd.org) Received: (from erwin@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAMDfY3g002148; Fri, 22 Nov 2013 13:41:34 GMT (envelope-from erwin@svn.freebsd.org) Message-Id: <201311221341.rAMDfY3g002148@svn.freebsd.org> From: Erwin Lansing Date: Fri, 22 Nov 2013 13:41:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334593 - in head/dns: bind96 bind96/files bind98 bind98/files bind99 bind99/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Nov 2013 13:41:36 -0000 Author: erwin Date: Fri Nov 22 13:41:34 2013 New Revision: 334593 URL: http://svnweb.freebsd.org/changeset/ports/334593 Log: Fix startup script. PR: 184159 [1] Submitted by: Pawel Biernacki [1], Trond Endrestoel (private email) Modified: head/dns/bind96/Makefile head/dns/bind96/files/named head/dns/bind98/Makefile head/dns/bind98/files/named head/dns/bind99/Makefile head/dns/bind99/files/named Modified: head/dns/bind96/Makefile ============================================================================== --- head/dns/bind96/Makefile Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind96/Makefile Fri Nov 22 13:41:34 2013 (r334593) @@ -2,6 +2,7 @@ PORTNAME= bind96 PORTVERSION= 9.6.3.2.ESV.R10 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind96/files/named ============================================================================== --- head/dns/bind96/files/named Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind96/files/named Fri Nov 22 13:41:34 2013 (r334593) @@ -19,15 +19,15 @@ start_postcmd="named_poststart" reload_cmd="named_reload" stop_cmd="named_stop" -named_enable="NO" # Run named, the DNS server (or NO). -named_program="/usr/local/sbin/named" # Path to named, if you want a different one. -named_conf="/usr/local/etc/namedb/named.conf" # Path to the configuration file -#named_flags="" # Use this for flags OTHER than -u and -c -named_uid="bind" # User to run named as -named_wait="NO" # Wait for working name service before exiting -named_wait_host="localhost" # Hostname to check if named_wait is enabled -named_auto_forward="NO" # Set up forwarders from /etc/resolv.conf -named_auto_forward_only="NO" # Do "forward only" instead of "forward first" +named_enable=${named_enable:-"NO"} # Run named, the DNS server (or NO). +named_program=${named_program:-"/usr/local/sbin/named"} # Path to named, if you want a different one. +named_conf=${named_conf:-"/usr/local/etc/namedb/named.conf"} # Path to the configuration file +named_flags=${named_flags:-""} # Use this for flags OTHER than -u and -c +named_uid=${named_uid:-"bind"} # User to run named as +named_wait=${named_wait:-"NO"} # Wait for working name service before exiting +named_wait_host=${named_wait_host:-"localhost"} # Hostname to check if named_wait is enabled +named_auto_forward=${named_auto_forward:-"NO"} # Set up forwarders from /etc/resolv.conf +named_auto_forward_only=${named_auto_forward_only:-"NO"} # Do "forward only" instead of "forward first" named_poststart() { if checkyesno named_wait; then Modified: head/dns/bind98/Makefile ============================================================================== --- head/dns/bind98/Makefile Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind98/Makefile Fri Nov 22 13:41:34 2013 (r334593) @@ -2,6 +2,7 @@ PORTNAME= bind98 PORTVERSION= 9.8.6 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind98/files/named ============================================================================== --- head/dns/bind98/files/named Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind98/files/named Fri Nov 22 13:41:34 2013 (r334593) @@ -19,15 +19,15 @@ start_postcmd="named_poststart" reload_cmd="named_reload" stop_cmd="named_stop" -named_enable="NO" # Run named, the DNS server (or NO). -named_program="%%PREFIX%%/sbin/named" # Path to named, if you want a different one. -named_conf="%%BIND_DESTETC%%/named.conf" # Path to the configuration file -#named_flags="" # Use this for flags OTHER than -u and -c -named_uid="bind" # User to run named as -named_wait="NO" # Wait for working name service before exiting -named_wait_host="localhost" # Hostname to check if named_wait is enabled -named_auto_forward="NO" # Set up forwarders from /etc/resolv.conf -named_auto_forward_only="NO" # Do "forward only" instead of "forward first" +named_enable=${named_enable:-"NO"} # Run named, the DNS server (or NO). +named_program=${named_program:-"/usr/local/sbin/named"} # Path to named, if you want a different one. +named_conf=${named_conf:-"/usr/local/etc/namedb/named.conf"} # Path to the configuration file +named_flags=${named_flags:-""} # Use this for flags OTHER than -u and -c +named_uid=${named_uid:-"bind"} # User to run named as +named_wait=${named_wait:-"NO"} # Wait for working name service before exiting +named_wait_host=${named_wait_host:-"localhost"} # Hostname to check if named_wait is enabled +named_auto_forward=${named_auto_forward:-"NO"} # Set up forwarders from /etc/resolv.conf +named_auto_forward_only=${named_auto_forward_only:-"NO"} # Do "forward only" instead of "forward first" named_poststart() { if checkyesno named_wait; then Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind99/Makefile Fri Nov 22 13:41:34 2013 (r334593) @@ -2,7 +2,7 @@ PORTNAME?= bind99 PORTVERSION= 9.9.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind99/files/named ============================================================================== --- head/dns/bind99/files/named Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind99/files/named Fri Nov 22 13:41:34 2013 (r334593) @@ -19,15 +19,15 @@ start_postcmd="named_poststart" reload_cmd="named_reload" stop_cmd="named_stop" -named_enable="NO" # Run named, the DNS server (or NO). -named_program="%%PREFIX%%/sbin/named" # Path to named, if you want a different one. -named_conf="%%BIND_DESTETC%%/named.conf" # Path to the configuration file -#named_flags="" # Use this for flags OTHER than -u and -c -named_uid="bind" # User to run named as -named_wait="NO" # Wait for working name service before exiting -named_wait_host="localhost" # Hostname to check if named_wait is enabled -named_auto_forward="NO" # Set up forwarders from /etc/resolv.conf -named_auto_forward_only="NO" # Do "forward only" instead of "forward first" +named_enable=${named_enable:-"NO"} # Run named, the DNS server (or NO). +named_program=${named_program:-"/usr/local/sbin/named"} # Path to named, if you want a different one. +named_conf=${named_conf:-"/usr/local/etc/namedb/named.conf"} # Path to the configuration file +named_flags=${named_flags:-""} # Use this for flags OTHER than -u and -c +named_uid=${named_uid:-"bind"} # User to run named as +named_wait=${named_wait:-"NO"} # Wait for working name service before exiting +named_wait_host=${named_wait_host:-"localhost"} # Hostname to check if named_wait is enabled +named_auto_forward=${named_auto_forward:-"NO"} # Set up forwarders from /etc/resolv.conf +named_auto_forward_only=${named_auto_forward_only:-"NO"} # Do "forward only" instead of "forward first" named_poststart() { if checkyesno named_wait; then @@ -92,6 +92,12 @@ named_prestart() warn 'named_pidfile: now determined from the conf file' fi + echo ${pidfile%/pid} + if [ ! -d ${pidfile%/pid} ]; then + mkdir -p ${pidfile%/pid} + chown ${named_uid}:${named_uid} ${pidfile%/pid} + fi + command_args="-u ${named_uid:=root}" if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then