CVS commit: [pkgsrc-2024Q1] pkgsrc/net/bind916

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue Apr 23 16:18:54 UTC 2024

Modified Files:
        pkgsrc/net/bind916 [pkgsrc-2024Q1]: Makefile distinfo
        pkgsrc/net/bind916/patches [pkgsrc-2024Q1]: patch-lib_ns_query.c

Log Message:
Pullup ticket #6852 - requested by taca
net/bind916: blocklist handling fix (PR bin/58170)

Revisions pulled up:
- net/bind916/Makefile                                          1.70-1.72
- net/bind916/distinfo                                          1.55-1.56
- net/bind916/patches/patch-lib_ns_query.c                      1.3

---
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Fri Apr  5 14:01:01 UTC 2024

   Modified Files:
        pkgsrc/audio/forked-daapd: Makefile
        pkgsrc/audio/mixxx: Makefile
        pkgsrc/audio/strawberry: Makefile
        pkgsrc/audio/termusic: Makefile
        pkgsrc/biology/plinkseq: Makefile
        pkgsrc/chat/ekg: Makefile
        pkgsrc/chat/libgadu: Makefile buildlink3.mk
        pkgsrc/chat/mumble: Makefile
        pkgsrc/databases/mysql80-server: Makefile
        pkgsrc/databases/postgresql-postgis2: Makefile
        pkgsrc/devel/compizconfig-backend-gconf: Makefile buildlink3.mk
        pkgsrc/devel/libcompizconfig: Makefile buildlink3.mk
        pkgsrc/devel/protobuf: buildlink3.mk
        pkgsrc/devel/protobuf-c: Makefile buildlink3.mk
        pkgsrc/devel/py-compizconfig: Makefile buildlink3.mk
        pkgsrc/finance/bitcoin: Makefile
        pkgsrc/geography/qgis: Makefile
        pkgsrc/graphics/digikam: Makefile
        pkgsrc/graphics/opencv: Makefile buildlink3.mk
        pkgsrc/graphics/opencv-contrib-face: Makefile buildlink3.mk
        pkgsrc/graphics/py-Willow: Makefile
        pkgsrc/misc/marble: Makefile
        pkgsrc/multimedia/vlc: Makefile
        pkgsrc/net/bind916: Makefile
        pkgsrc/net/bind918: Makefile
        pkgsrc/net/frr: Makefile
        pkgsrc/net/grpc: Makefile buildlink3.mk
        pkgsrc/net/kopete: Makefile
        pkgsrc/net/mosh: Makefile
        pkgsrc/net/py-grpcio: Makefile
        pkgsrc/net/py-grpcio-tools: Makefile
        pkgsrc/net/qt6-qtgrpc: Makefile buildlink3.mk
        pkgsrc/net/ratman: Makefile
        pkgsrc/net/unbound: Makefile
        pkgsrc/sysutils/collectd-grpc: Makefile
        pkgsrc/sysutils/collectd-pinba: Makefile
        pkgsrc/sysutils/collectd-riemann: Makefile
        pkgsrc/sysutils/collectd-write_prometheus: Makefile
        pkgsrc/sysutils/riemann-client: Makefile
        pkgsrc/wm/ccsm: Makefile

   Log Message:
   *: recursive bump for protobuf 26.1

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Thu Apr 18 13:39:53 UTC 2024

   Modified Files:
        pkgsrc/net/bind916: Makefile distinfo

   Log Message:
   net/bind916: update to 9.16.50

   9.16.50 (2024-04-17)

   This release marks the end of maintenance for the BIND 9.16 branch.

   6364.        [protocol]      Add RESOLVER.ARPA to the built in empty zones.
                        [GL #4580]

   6338.        [func]          Optimize slabheader placement, so the infrastructure
                        records are put in the beginning of the slabheader
                        linked list. [GL !8675]

---
   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.69 -r1.69.2.1 pkgsrc/net/bind916/Makefile
cvs rdiff -u -r1.54 -r1.54.2.1 pkgsrc/net/bind916/distinfo
cvs rdiff -u -r1.2 -r1.2.28.1 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.

Modified files:

Index: pkgsrc/net/bind916/Makefile
diff -u pkgsrc/net/bind916/Makefile:1.69 pkgsrc/net/bind916/Makefile:1.69.2.1
--- pkgsrc/net/bind916/Makefile:1.69    Wed Mar 20 14:57:54 2024
+++ pkgsrc/net/bind916/Makefile Tue Apr 23 16:18:54 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2024/03/20 14:57:54 taca Exp $
+# $NetBSD: Makefile,v 1.69.2.1 2024/04/23 16:18:54 bsiegert 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
@@ -15,7 +16,7 @@ CONFLICTS+=   host-[0-9]*
 
 MAKE_JOBS_SAFE=        no
 
-BIND_VERSION=  9.16.49
+BIND_VERSION=  9.16.50
 
 BUILD_DEFS+=   BIND_DIR VARBASE
 

Index: pkgsrc/net/bind916/distinfo
diff -u pkgsrc/net/bind916/distinfo:1.54 pkgsrc/net/bind916/distinfo:1.54.2.1
--- pkgsrc/net/bind916/distinfo:1.54    Wed Mar 20 14:57:54 2024
+++ pkgsrc/net/bind916/distinfo Tue Apr 23 16:18:54 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.54 2024/03/20 14:57:54 taca Exp $
+$NetBSD: distinfo,v 1.54.2.1 2024/04/23 16:18:54 bsiegert Exp $
 
-BLAKE2s (bind-9.16.49.tar.xz) = bc14d82b01f0aeb0deb64a7db3e9bf75a53b0837f4154e98427b7568c2594f9c
-SHA512 (bind-9.16.49.tar.xz) = e57d57d0a7674ab04440399c0e187b693bf3abe5bd6f80b0f8094b4320793d3ffda3443dd5d247bfd21ad020f602fb83f85d6a68c873c9a3b10c940aecf94090
-Size (bind-9.16.49.tar.xz) = 5133308 bytes
+BLAKE2s (bind-9.16.50.tar.xz) = 2b4c06e4a435091054844cd2075461b2016889cc6bae8aed1c58703877caeca0
+SHA512 (bind-9.16.50.tar.xz) = 7627e0606ac389343046fa9d1ca789ed732b3c8d99e83ba6f59593f816cebc0b2ebd319c2812ac1f604c68f5115bbc281d432036c0d31bbe489ee2d678374213
+Size (bind-9.16.50.tar.xz) = 5134620 bytes
 SHA1 (patch-bin_dig_dighost.c) = b1073911d80ecd519af98b6678968296ff8c0c98
 SHA1 (patch-bin_dig_include_dig_dig.h) = 10166f5bb98b208c7b10d63eb31e8253f704acc8
 SHA1 (patch-bin_named_Makefile.in) = f1367da6a226ba44d0ee13acf00b8abeb5b1b7eb
@@ -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.2.28.1
--- 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     Tue Apr 23 16:18:54 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.2.28.1 2024/04/23 16:18:54 bsiegert 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 {