Thu May 2 13:31:07 2019 UTC ()
net/bind912: fix an error when reloading configuration

Fix an error when reloading configuration.  There is on more check to
"directory" in option statement is writable.

Bump PKGREVISION.


(taca)
diff -r1.10 -r1.11 pkgsrc/net/bind912/Makefile
diff -r1.7 -r1.8 pkgsrc/net/bind912/distinfo
diff -r1.1 -r1.2 pkgsrc/net/bind912/patches/patch-bin_named_server.c
cvs diff -r1.10 -r1.11 pkgsrc/net/bind912/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/bind912/Attic/Makefile 2019/04/30 02:46:16 1.10
+++ pkgsrc/net/bind912/Attic/Makefile 2019/05/02 13:31:07 1.11
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.10 2019/04/30 02:46:16 taca Exp $ 1# $NetBSD: Makefile,v 1.11 2019/05/02 13:31:07 taca Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
 5PKGREVISION= 1
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ 7MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.isc.org/software/bind/ 10HOMEPAGE= http://www.isc.org/software/bind/
10COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.12 11COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.12
11LICENSE= mpl-2.0 12LICENSE= mpl-2.0
12 13
13CONFLICTS+= host-[0-9]* 14CONFLICTS+= host-[0-9]*
14 15
15MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
16USE_CWRAPPERS= no 17USE_CWRAPPERS= no
17 18
cvs diff -r1.7 -r1.8 pkgsrc/net/bind912/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/bind912/Attic/distinfo 2019/04/30 02:46:16 1.7
+++ pkgsrc/net/bind912/Attic/distinfo 2019/05/02 13:31:07 1.8
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.7 2019/04/30 02:46:16 taca Exp $ 1$NetBSD: distinfo,v 1.8 2019/05/02 13:31:07 taca Exp $
2 2
3SHA1 (bind-9.12.4-P1.tar.gz) = e1406e294aee810e32f93d60bd45b15b5d1f76e9 3SHA1 (bind-9.12.4-P1.tar.gz) = e1406e294aee810e32f93d60bd45b15b5d1f76e9
4RMD160 (bind-9.12.4-P1.tar.gz) = b656fbd38b80fc59bcd592803671e80825e6e24a 4RMD160 (bind-9.12.4-P1.tar.gz) = b656fbd38b80fc59bcd592803671e80825e6e24a
5SHA512 (bind-9.12.4-P1.tar.gz) = 1c07f6e10cb9fd499c4231e8290da94da1f5f4294c664635eac82bdb10be9a01119208fe2c15f5d28f50e3c2cdec7b553851b7676b65792f3f21de071587297d 5SHA512 (bind-9.12.4-P1.tar.gz) = 1c07f6e10cb9fd499c4231e8290da94da1f5f4294c664635eac82bdb10be9a01119208fe2c15f5d28f50e3c2cdec7b553851b7676b65792f3f21de071587297d
6Size (bind-9.12.4-P1.tar.gz) = 7914907 bytes 6Size (bind-9.12.4-P1.tar.gz) = 7914907 bytes
7SHA1 (patch-bin_named_server.c) = dee624cc8a664abe74959ab40cea53d85872f672 7SHA1 (patch-bin_named_server.c) = fc54c9014104bfb0c73ec59e2a490de51a5e5b78
8SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e 8SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e
9SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28 9SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
10SHA1 (patch-config.threads.in) = 8341bdb11888d3efdde5f115de91b1f46aa40bd0 10SHA1 (patch-config.threads.in) = 8341bdb11888d3efdde5f115de91b1f46aa40bd0
11SHA1 (patch-configure) = 7d74eef1002351a5513c7c617e28721b39de65d0 11SHA1 (patch-configure) = 7d74eef1002351a5513c7c617e28721b39de65d0
12SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7 12SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7
13SHA1 (patch-lib_dns_rbt.c) = 8af91b6d40b591d28d15f7f98c9b7a82df234381 13SHA1 (patch-lib_dns_rbt.c) = 8af91b6d40b591d28d15f7f98c9b7a82df234381
14SHA1 (patch-lib_dns_view.c) = 93ef5f1e303cc362818ddd0135f267c5090af40d 14SHA1 (patch-lib_dns_view.c) = 93ef5f1e303cc362818ddd0135f267c5090af40d
15SHA1 (patch-lib_isc_unix_socket.c) = d02f33800eb17d4818c72d79a226ab01b6bf12ad 15SHA1 (patch-lib_isc_unix_socket.c) = d02f33800eb17d4818c72d79a226ab01b6bf12ad
cvs diff -r1.1 -r1.2 pkgsrc/net/bind912/patches/Attic/patch-bin_named_server.c (expand / switch to unified diff)

--- pkgsrc/net/bind912/patches/Attic/patch-bin_named_server.c 2019/04/30 02:46:16 1.1
+++ pkgsrc/net/bind912/patches/Attic/patch-bin_named_server.c 2019/05/02 13:31:07 1.2
@@ -1,23 +1,39 @@ @@ -1,23 +1,39 @@
1$NetBSD: patch-bin_named_server.c,v 1.1 2019/04/30 02:46:16 taca Exp $ 1$NetBSD: patch-bin_named_server.c,v 1.2 2019/05/02 13:31:07 taca Exp $
2 2
3* Disable checking working directory is writable as BIND_USER in NetBSD 3* Disable checking working directory is writable as BIND_USER in NetBSD
4 base system. 4 base system.
5 5
6--- bin/named/server.c.orig 2019-04-06 01:27:27.000000000 +0000 6--- bin/named/server.c.orig 2019-04-06 01:27:27.000000000 +0000
7+++ bin/named/server.c 7+++ bin/named/server.c
8@@ -8760,6 +8760,7 @@ load_configuration(const char *filename, 8@@ -6297,6 +6297,7 @@ directory_callback(const char *clausenam
 9 "option 'directory' contains relative path '%s'",
 10 directory);
 11
 12+#if 0
 13 if (!isc_file_isdirwritable(directory)) {
 14 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
 15 NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
 16@@ -6304,6 +6305,7 @@ directory_callback(const char *clausenam
 17 directory);
 18 return (ISC_R_NOPERM);
 19 }
 20+#endif
 21
 22 result = isc_dir_chdir(directory);
 23 if (result != ISC_R_SUCCESS) {
 24@@ -8760,6 +8762,7 @@ load_configuration(const char *filename,
9 named_os_changeuser(); 25 named_os_changeuser();
10 } 26 }
11  27
12+#if 0 28+#if 0
13 /* 29 /*
14 * Check that the working directory is writable. 30 * Check that the working directory is writable.
15 */ 31 */
16@@ -8770,6 +8771,7 @@ load_configuration(const char *filename, 32@@ -8770,6 +8773,7 @@ load_configuration(const char *filename,
17 result = ISC_R_NOPERM; 33 result = ISC_R_NOPERM;
18 goto cleanup; 34 goto cleanup;
19 } 35 }
20+#endif 36+#endif
21  37
22 #ifdef HAVE_LMDB 38 #ifdef HAVE_LMDB
23 /* 39 /*