Date: Tue, 7 Jan 2014 09:55:07 +0000 (UTC) From: Erwin Lansing <erwin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338989 - in head/dns: bind96 bind96/files bind98 bind98/files bind99 bind99/files Message-ID: <201401070955.s079t7Ka039287@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: erwin Date: Tue Jan 7 09:55:06 2014 New Revision: 338989 URL: http://svnweb.freebsd.org/changeset/ports/338989 Log: There's always a default value for named_conf now, so no need to check for it, and espcially not for a wrong value. Noticed by: Stefan Bethke <stb@lassitu.de> Approved by: mat (maintainer) 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 Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind96/Makefile Tue Jan 7 09:55:06 2014 (r338989) @@ -2,7 +2,7 @@ PORTNAME= bind96 PORTVERSION= 9.6.3.2.ESV.R10 -PORTREVISION= 3 +PORTREVISION= 4 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 Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind96/files/named Tue Jan 7 09:55:06 2014 (r338989) @@ -98,14 +98,7 @@ named_prestart() chown ${named_uid}:${named_uid} ${pidfile%/pid} fi - command_args="-u ${named_uid:=root}" - - if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then - case "$named_flags" in - -c*|*' -c'*) ;; # No need to add it - *) command_args="-c $named_conf $command_args" ;; - esac - fi + command_args="-u ${named_uid:=root} -c $named_conf $command_args" local line nsip firstns Modified: head/dns/bind98/Makefile ============================================================================== --- head/dns/bind98/Makefile Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind98/Makefile Tue Jan 7 09:55:06 2014 (r338989) @@ -2,7 +2,7 @@ PORTNAME= bind98 PORTVERSION= 9.8.6 -PORTREVISION= 6 +PORTREVISION= 7 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 Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind98/files/named Tue Jan 7 09:55:06 2014 (r338989) @@ -98,14 +98,7 @@ named_prestart() chown ${named_uid}:${named_uid} ${pidfile%/pid} fi - command_args="-u ${named_uid:=root}" - - if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then - case "$named_flags" in - -c*|*' -c'*) ;; # No need to add it - *) command_args="-c $named_conf $command_args" ;; - esac - fi + command_args="-u ${named_uid:=root} -c $named_conf $command_args" local line nsip firstns Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind99/Makefile Tue Jan 7 09:55:06 2014 (r338989) @@ -2,7 +2,7 @@ PORTNAME?= bind99 PORTVERSION= 9.9.4 -PORTREVISION?= 7 +PORTREVISION?= 8 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 Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind99/files/named Tue Jan 7 09:55:06 2014 (r338989) @@ -98,14 +98,7 @@ named_prestart() chown ${named_uid}:${named_uid} ${pidfile%/pid} fi - command_args="-u ${named_uid:=root}" - - if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then - case "$named_flags" in - -c*|*' -c'*) ;; # No need to add it - *) command_args="-c $named_conf $command_args" ;; - esac - fi + command_args="-u ${named_uid:=root} -c $named_conf $command_args" local line nsip firstns
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401070955.s079t7Ka039287>