Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1713621668270330"
MIME-Version: 1.0
Date: Sat, 20 Apr 2024 14:01:08 +0000
From: "Takahiro Kambe" <taca@netbsd.org>
Subject: CVS commit: pkgsrc/net/bind916
To: pkgsrc-changes@NetBSD.org
Reply-To: taca@netbsd.org
Message-Id: <20240420140108.BFC69FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1713621668270330
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	taca
Date:		Sat Apr 20 14:01:08 UTC 2024

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

Log Message:
net/bind916: 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.71 -r1.72 pkgsrc/net/bind916/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/net/bind916/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/bind916/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.


--_----------=_1713621668270330
Content-Disposition: inline
Content-Length: 3286
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/bind916/Makefile
diff -u pkgsrc/net/bind916/Makefile:1.71 pkgsrc/net/bind916/Makefile:1.72
--- pkgsrc/net/bind916/Makefile:1.71	Thu Apr 18 13:39:53 2024
+++ pkgsrc/net/bind916/Makefile	Sat Apr 20 14:01:08 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2024/04/18 13:39:53 taca Exp $
+# $NetBSD: Makefile,v 1.72 2024/04/20 14:01:08 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}/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/net/bind916/distinfo
diff -u pkgsrc/net/bind916/distinfo:1.55 pkgsrc/net/bind916/distinfo:1.56
--- pkgsrc/net/bind916/distinfo:1.55	Thu Apr 18 13:39:53 2024
+++ pkgsrc/net/bind916/distinfo	Sat Apr 20 14:01:08 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2024/04/18 13:39:53 taca Exp $
+$NetBSD: distinfo,v 1.56 2024/04/20 14:01:08 taca Exp $
 
 BLAKE2s (bind-9.16.50.tar.xz) = 2b4c06e4a435091054844cd2075461b2016889cc6bae8aed1c58703877caeca0
 SHA512 (bind-9.16.50.tar.xz) = 7627e0606ac389343046fa9d1ca789ed732b3c8d99e83ba6f59593f816cebc0b2ebd319c2812ac1f604c68f5115bbc281d432036c0d31bbe489ee2d678374213
@@ -54,7 +54,7 @@ SHA1 (patch-lib_ns_client.c) = e1e2de898
 SHA1 (patch-lib_ns_include_ns_client.h) = 3ccd630aee77ea638fb3b954b85bad9c74b0c86e
 SHA1 (patch-lib_ns_include_ns_pfilter.h) = cc86752971b4f9f7492283c4ad3ff29bc1bae237
 SHA1 (patch-lib_ns_pfilter.c) = 8f4a3b3a729360a131eb1962c42a9f9f985c7e7b
-SHA1 (patch-lib_ns_query.c) = 0c3c4a20aa4b40c144c4f986599cda67db3e2491
+SHA1 (patch-lib_ns_query.c) = 540ccddeafc186dc2915c4608ac1e42bb945ed70
 SHA1 (patch-lib_ns_update.c) = 2c5a9302178abe9dc9b6396b053319e39e1ef950
 SHA1 (patch-lib_ns_xfrout.c) = 79d9e4add58ffd75ea9718f5501f1517e67416e3
 SHA1 (patch-make_rules.in) = 5fb3a44ff0066c93872c25596267fbabffc6da8f

Index: pkgsrc/net/bind916/patches/patch-lib_ns_query.c
diff -u pkgsrc/net/bind916/patches/patch-lib_ns_query.c:1.2 pkgsrc/net/bind916/patches/patch-lib_ns_query.c:1.3
--- pkgsrc/net/bind916/patches/patch-lib_ns_query.c:1.2	Sat Dec 19 16:41:36 2020
+++ pkgsrc/net/bind916/patches/patch-lib_ns_query.c	Sat Apr 20 14:01:08 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_ns_query.c,v 1.2 2020/12/19 16:41:36 taca Exp $
+$NetBSD: patch-lib_ns_query.c,v 1.3 2024/04/20 14:01:08 taca Exp $
 
 * Based on NetBSD, add support for blocklist(blacklist).
 
---- lib/ns/query.c.orig	2020-12-07 08:16:53.000000000 +0000
+--- lib/ns/query.c.orig	2024-04-03 12:48:29.000000000 +0000
 +++ lib/ns/query.c
-@@ -68,6 +68,10 @@
+@@ -71,6 +71,10 @@
  #include <ns/stats.h>
  #include <ns/xfrout.h>
  
@@ -15,17 +15,7 @@ $NetBSD: patch-lib_ns_query.c,v 1.2 2020
  #if 0
  /*
   * It has been recommended that DNS64 be changed to return excluded
-@@ -857,6 +861,9 @@ query_checkcacheaccess(ns_client_t *clie
- 					      msg);
- 			}
- 		} else if (log) {
-+#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H)
-+			pfilter_notify(result, client, "checkcacheaccess");
-+#endif
- 			/*
- 			 * We were denied by the "allow-query-cache" ACL.
- 			 * There is no need to clear NS_QUERYATTR_CACHEACLOK
-@@ -989,6 +996,9 @@ query_validatezonedb(ns_client_t *client
+@@ -1014,6 +1018,9 @@ query_validatezonedb(ns_client_t *client
  					      msg);
  			}
  		} else {


--_----------=_1713621668270330--