CVS commit: pkgsrc/net

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

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.

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