CVS commit: pkgsrc/net/bind918

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat Apr 20 14:02:40 UTC 2024

Modified Files:
        pkgsrc/net/bind918: Makefile distinfo
        pkgsrc/net/bind918/patches: patch-lib_ns_query.c

Log Message:
net/bind918: fix blocklist handling

Apply change of revision 1.21 in NetBSD base which fixed PR bin/58170.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/bind918/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/bind918/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind918/patches/patch-lib_ns_query.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/bind918/Makefile
diff -u pkgsrc/net/bind918/Makefile:1.30 pkgsrc/net/bind918/Makefile:1.31
--- pkgsrc/net/bind918/Makefile:1.30    Thu Apr 18 13:37:53 2024
+++ pkgsrc/net/bind918/Makefile Sat Apr 20 14:02:39 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2024/04/18 13:37:53 taca Exp $
+# $NetBSD: Makefile,v 1.31 2024/04/20 14:02:39 taca Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  https://downloads.isc.org/isc/bind9/${BIND_VERSION}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/net/bind918/distinfo
diff -u pkgsrc/net/bind918/distinfo:1.17 pkgsrc/net/bind918/distinfo:1.18
--- pkgsrc/net/bind918/distinfo:1.17    Thu Apr 18 13:37:53 2024
+++ pkgsrc/net/bind918/distinfo Sat Apr 20 14:02:39 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2024/04/18 13:37:53 taca Exp $
+$NetBSD: distinfo,v 1.18 2024/04/20 14:02:39 taca Exp $
 
 BLAKE2s (bind-9.18.26.tar.xz) = f873e9aaa5c11c9b120f739b8cb07d7ed905550272d31d435efe40214a242955
 SHA512 (bind-9.18.26.tar.xz) = 517951bd462aff206706a4bbae3ef917299f90af361fb931a50d2340f0580010b8a0eedce1d4e8c99e99389fc44d71221b907e30d91be0d398acbe29688d6e55
@@ -31,6 +31,6 @@ SHA1 (patch-lib_ns_Makefile.am) = a91e17
 SHA1 (patch-lib_ns_client.c) = 4093c82254321e6c6eaa40ea1cf738b3f9bda0bb
 SHA1 (patch-lib_ns_include_ns_pfilter.h) = cc86752971b4f9f7492283c4ad3ff29bc1bae237
 SHA1 (patch-lib_ns_pfilter.c) = b0345f9b27e2bdd4f9a992cfc23616e027de4988
-SHA1 (patch-lib_ns_query.c) = d947318dc6a261931928c4bf8b7f48efa9004a38
+SHA1 (patch-lib_ns_query.c) = 27bc6e5efc8ba0756d968d54e9ae1a3b2c3bc97e
 SHA1 (patch-lib_ns_update.c) = 941ca5601904e9b4cc5314148e955f5490a5d071
 SHA1 (patch-lib_ns_xfrout.c) = 79d9e4add58ffd75ea9718f5501f1517e67416e3

Index: pkgsrc/net/bind918/patches/patch-lib_ns_query.c
diff -u pkgsrc/net/bind918/patches/patch-lib_ns_query.c:1.1 pkgsrc/net/bind918/patches/patch-lib_ns_query.c:1.2
--- pkgsrc/net/bind918/patches/patch-lib_ns_query.c:1.1 Sun Dec 11 01:57:55 2022
+++ pkgsrc/net/bind918/patches/patch-lib_ns_query.c     Sat Apr 20 14:02:40 2024
@@ -1,9 +1,9 @@
-$NetBSD: patch-lib_ns_query.c,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+$NetBSD: patch-lib_ns_query.c,v 1.2 2024/04/20 14:02:40 taca Exp $
 
 * Based on NetBSD, add support for blocklist(blacklist).
 
---- lib/ns/query.c.orig        2022-11-08 07:17:42.056257919 +0900
-+++ lib/ns/query.c     2022-12-10 11:00:47.549957781 +0900
+--- lib/ns/query.c.orig        2024-04-03 09:39:01.839989165 +0000
++++ lib/ns/query.c
 @@ -74,6 +74,10 @@
  #include <ns/stats.h>
  #include <ns/xfrout.h>
@@ -15,17 +15,7 @@ $NetBSD: patch-lib_ns_query.c,v 1.1 2022
  #if 0
  /*
   * It has been recommended that DNS64 be changed to return excluded
-@@ -915,6 +919,9 @@
-                                               NULL);
- 
-                       if (log) {
-+#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H)
-+                              pfilter_notify(result, client, "checkcacheaccess");
-+#endif
-                               ns_client_aclmsg("query (cache)", name, qtype,
-                                                client->view->rdclass, msg,
-                                                sizeof(msg));
-@@ -1043,6 +1050,9 @@
+@@ -1047,6 +1051,9 @@ query_validatezonedb(ns_client_t *client
                                              msg);
                        }
                } else {