CVS commit: pkgsrc/net/bind914

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Thu May  2 13:29:53 UTC 2019

Modified Files:
        pkgsrc/net/bind914: Makefile distinfo
        pkgsrc/net/bind914/patches: patch-bin_named_server.c

Log Message:
net/bind914: 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.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind914/Makefile \
    pkgsrc/net/bind914/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind914/patches/patch-bin_named_server.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/bind914/Makefile
diff -u pkgsrc/net/bind914/Makefile:1.1 pkgsrc/net/bind914/Makefile:1.2
--- pkgsrc/net/bind914/Makefile:1.1     Tue Apr 30 03:34:34 2019
+++ pkgsrc/net/bind914/Makefile Thu May  2 13:29:53 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2019/04/30 03:34:34 taca Exp $
+# $NetBSD: Makefile,v 1.2 2019/05/02 13:29:53 taca Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
Index: pkgsrc/net/bind914/distinfo
diff -u pkgsrc/net/bind914/distinfo:1.1 pkgsrc/net/bind914/distinfo:1.2
--- pkgsrc/net/bind914/distinfo:1.1     Tue Apr 30 03:34:34 2019
+++ pkgsrc/net/bind914/distinfo Thu May  2 13:29:53 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2019/04/30 03:34:34 taca Exp $
+$NetBSD: distinfo,v 1.2 2019/05/02 13:29:53 taca Exp $
 
 SHA1 (bind-9.14.1.tar.gz) = 29e43a99c059c5458822833b2267f237361feca6
 RMD160 (bind-9.14.1.tar.gz) = 12e8bec5d7eb29d588596a204220edfe12bbc743
@@ -8,7 +8,7 @@ SHA1 (patch-bin_named_Makefile.in) = 12e
 SHA1 (patch-bin_named_main.c) = 51c8ab464a009575b6513c7ed4b79f89446eb7d0
 SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b
 SHA1 (patch-bin_named_pfilter.h) = c14617cb266a4b5d33ba6e5db98562e806792833
-SHA1 (patch-bin_named_server.c) = 8f981649ba318de1acc4e4eaf76d9ff647de38ef
+SHA1 (patch-bin_named_server.c) = 558088a1e1128e7a69394d66bfff03a5b3b62ee8
 SHA1 (patch-bin_nsupdate_nsupdate.c) = f71213385ec7c78243c1f93a6940caa111cb5072
 SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e
 SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28

Index: pkgsrc/net/bind914/patches/patch-bin_named_server.c
diff -u pkgsrc/net/bind914/patches/patch-bin_named_server.c:1.1 pkgsrc/net/bind914/patches/patch-bin_named_server.c:1.2
--- pkgsrc/net/bind914/patches/patch-bin_named_server.c:1.1     Tue Apr 30 03:34:34 2019
+++ pkgsrc/net/bind914/patches/patch-bin_named_server.c Thu May  2 13:29:53 2019
@@ -1,11 +1,27 @@
-$NetBSD: patch-bin_named_server.c,v 1.1 2019/04/30 03:34:34 taca Exp $
+$NetBSD: patch-bin_named_server.c,v 1.2 2019/05/02 13:29:53 taca Exp $
 
 * Disable checking working directory is writable as BIND_USER in NetBSD
   base system.
 
 --- bin/named/server.c.orig    2019-04-06 20:09:59.000000000 +0000
 +++ bin/named/server.c
-@@ -8864,6 +8864,7 @@ load_configuration(const char *filename,
+@@ -6464,6 +6464,7 @@ directory_callback(const char *clausenam
+                           "option 'directory' contains relative path '%s'",
+                           directory);
+ 
++#if 0
+       if (!isc_file_isdirwritable(directory)) {
+               isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
+                             NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
+@@ -6471,6 +6472,7 @@ directory_callback(const char *clausenam
+                             directory);
+               return (ISC_R_NOPERM);
+       }
++#endif
+ 
+       result = isc_dir_chdir(directory);
+       if (result != ISC_R_SUCCESS) {
+@@ -8864,6 +8866,7 @@ load_configuration(const char *filename,
                named_os_changeuser();
        }
  
@@ -13,7 +29,7 @@ $NetBSD: patch-bin_named_server.c,v 1.1 
        /*
         * Check that the working directory is writable.
         */
-@@ -8874,6 +8875,7 @@ load_configuration(const char *filename,
+@@ -8874,6 +8877,7 @@ load_configuration(const char *filename,
                result = ISC_R_NOPERM;
                goto cleanup;
        }