Received: by mail.netbsd.org (Postfix, from userid 605) id 8D31484DBF; Wed, 19 Jun 2019 10:58:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0FDD684DBA for ; Wed, 19 Jun 2019 10:58:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id yjwlUObXCsTU for ; Wed, 19 Jun 2019 10:58:49 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6ADA284DC4 for ; Wed, 19 Jun 2019 10:58:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 64FF8FBF4; Wed, 19 Jun 2019 10:58:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_15609419295640" MIME-Version: 1.0 Date: Wed, 19 Jun 2019 10:58:49 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/net To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20190619105849.64FF8FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_15609419295640 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Wed Jun 19 10:58:49 UTC 2019 Modified Files: pkgsrc/net/bind911/files/smf: named.sh pkgsrc/net/bind912/files/smf: named.sh pkgsrc/net/bind914/files/smf: named.sh Log Message: bind*: Fix a couple of issues in the SMF method. Fix a typo in the configuration_file arguments, joyent/pkgsrc#189. Ensure the /var/run/named directory has the correct permissions. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/bind911/files/smf/named.sh cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/bind912/files/smf/named.sh cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind914/files/smf/named.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_15609419295640 Content-Disposition: inline Content-Length: 2678 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/bind911/files/smf/named.sh diff -u pkgsrc/net/bind911/files/smf/named.sh:1.2 pkgsrc/net/bind911/files/smf/named.sh:1.3 --- pkgsrc/net/bind911/files/smf/named.sh:1.2 Fri Mar 1 21:46:50 2019 +++ pkgsrc/net/bind911/files/smf/named.sh Wed Jun 19 10:58:48 2019 @@ -111,7 +111,7 @@ get_config () ;; 'configuration_file') cmdopts="${cmdopts} -c ${value}" - checkopts="${checkopts} -t ${value}" + checkopts="${checkopts} ${value}" configuration_file=${value}; ;; 'server') @@ -202,7 +202,7 @@ case "$method" in rndc_key_file=${chroot_dir}${rndc_key_file} rndc_cmd_opts="${rndc_cmd_opts} -t ${chroot_dir}" else - mkdir -p @VARBASE@/run/named + mkdir -p -m 0770 @VARBASE@/run/named chown ${cmduser}:${cmduser} @VARBASE@/run/named fi Index: pkgsrc/net/bind912/files/smf/named.sh diff -u pkgsrc/net/bind912/files/smf/named.sh:1.2 pkgsrc/net/bind912/files/smf/named.sh:1.3 --- pkgsrc/net/bind912/files/smf/named.sh:1.2 Fri Mar 1 21:46:50 2019 +++ pkgsrc/net/bind912/files/smf/named.sh Wed Jun 19 10:58:49 2019 @@ -111,7 +111,7 @@ get_config () ;; 'configuration_file') cmdopts="${cmdopts} -c ${value}" - checkopts="${checkopts} -t ${value}" + checkopts="${checkopts} ${value}" configuration_file=${value}; ;; 'server') @@ -202,7 +202,7 @@ case "$method" in rndc_key_file=${chroot_dir}${rndc_key_file} rndc_cmd_opts="${rndc_cmd_opts} -t ${chroot_dir}" else - mkdir -p @VARBASE@/run/named + mkdir -p -m 0770 @VARBASE@/run/named chown ${cmduser}:${cmduser} @VARBASE@/run/named fi Index: pkgsrc/net/bind914/files/smf/named.sh diff -u pkgsrc/net/bind914/files/smf/named.sh:1.1 pkgsrc/net/bind914/files/smf/named.sh:1.2 --- pkgsrc/net/bind914/files/smf/named.sh:1.1 Tue Apr 30 03:34:34 2019 +++ pkgsrc/net/bind914/files/smf/named.sh Wed Jun 19 10:58:49 2019 @@ -111,7 +111,7 @@ get_config () ;; 'configuration_file') cmdopts="${cmdopts} -c ${value}" - checkopts="${checkopts} -t ${value}" + checkopts="${checkopts} ${value}" configuration_file=${value}; ;; 'server') @@ -202,7 +202,7 @@ case "$method" in rndc_key_file=${chroot_dir}${rndc_key_file} rndc_cmd_opts="${rndc_cmd_opts} -t ${chroot_dir}" else - mkdir -p @VARBASE@/run/named + mkdir -p 0770 @VARBASE@/run/named chown ${cmduser}:${cmduser} @VARBASE@/run/named fi --_----------=_15609419295640--