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

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

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

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

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

Revisions pulled up:
- net/bind918/Makefile                                          1.29-1.31
- net/bind918/distinfo                                          1.17-1.18
- net/bind918/patches/patch-lib_ns_query.c                      1.2

---
   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:37:53 UTC 2024

   Modified Files:
        pkgsrc/net/bind918: Makefile distinfo

   Log Message:
   net/bind918: update to 9.18.62

   9.18.26 (2024-04-17)

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

   6363.        [bug]           dig/mdig +ednsflags=<non-zero-value> did not re-enable
                        EDNS if it had been disabled. [GL #4641]

   6361.        [bug]           Some invalid ISO 8601 durations were accepted
                        erroneously. [GL #4624]

   6360.        [bug]           Don't return static-stub synthesised NS RRset.
                        [GL #4608]

   6359.        [bug]           Fix bug in Depends (keymgr_dep) function. [GL #4552]

   6351.        [protocol]      Support for the RESINFO record type has been added.
                        [GL #4413]

   6346.        [bug]           Cleaned up several minor bugs in the RBTDB dbiterator
                        implementation. [GL !8741]

   6345.        [bug]           Added missing dns_rdataset_disassociate calls in
                        validator.c:findnsec3proofs. [GL #4571]

   6340.        [test]          Fix incorrectly reported errors when running tests
                        with `make test` on platforms with older pytest.
                        [GL #4560]

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

   6334.        [doc]           Improve ARM parental-agents definition. [GL #4531]

   6333.        [bug]           Fix the DNS_GETDB_STALEFIRST flag, which was defined
                        incorrectly in lib/ns/query.c. [GL !8683]

   6330.        [doc]           Update ZSK minimum lifetime documentation in ARM, also
                        depends on signing delay. [GL #4510]

   6328.        [func]          Add workaround to enforce dynamic linker to pull
                        jemalloc earlier than libc to ensure all memory
                        allocations are done via jemalloc. [GL #4404]

   6326.        [bug]           Changes to "listen-on" statements were ignored on
                        reconfiguration unless the port or interface address was
                        changed, making it impossible to change a related
                        listener transport type. Thanks to Thomas Amgarten.
                        [GL #4518] [GL #4528]

   6325.        [func]          Expose the TCP client count in statistics channel.
                        [GL #4425]

   6324.        [bug]           Fix a possible crash in 'dig +nssearch +nofail' and
                        'host -C' commands when one of the name servers returns
                        SERVFAIL. [GL #4508]

   6313.        [bug]           When dnssec-policy is in effect the DNSKEY's TTLs in
                        the zone where not being updated to match the policy.
                        This lead to failures when DNSKEYs where updated as the
                        TTLs mismatched. [GL #4466]

---
   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.28 -r1.28.2.1 pkgsrc/net/bind918/Makefile
cvs rdiff -u -r1.16 -r1.16.2.1 pkgsrc/net/bind918/distinfo
cvs rdiff -u -r1.1 -r1.1.12.1 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.28 pkgsrc/net/bind918/Makefile:1.28.2.1
--- pkgsrc/net/bind918/Makefile:1.28    Wed Mar 20 14:59:15 2024
+++ pkgsrc/net/bind918/Makefile Tue Apr 23 16:18:48 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2024/03/20 14:59:15 taca Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2024/04/23 16:18:48 bsiegert 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
@@ -15,7 +16,7 @@ CONFLICTS+=   host-[0-9]*
 
 MAKE_JOBS_SAFE=        no
 
-BIND_VERSION=  9.18.25
+BIND_VERSION=  9.18.26
 
 BUILD_DEFS+=   BIND_DIR VARBASE
 

Index: pkgsrc/net/bind918/distinfo
diff -u pkgsrc/net/bind918/distinfo:1.16 pkgsrc/net/bind918/distinfo:1.16.2.1
--- pkgsrc/net/bind918/distinfo:1.16    Wed Mar 20 14:59:15 2024
+++ pkgsrc/net/bind918/distinfo Tue Apr 23 16:18:48 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2024/03/20 14:59:15 taca Exp $
+$NetBSD: distinfo,v 1.16.2.1 2024/04/23 16:18:48 bsiegert Exp $
 
-BLAKE2s (bind-9.18.25.tar.xz) = 5999c0dd143a60a80d9809b1290c8fee79703352fbfbcd4e017e910e3d845460
-SHA512 (bind-9.18.25.tar.xz) = af2b751b72121a6e98d762110bff183984ab5312d0e080b4ff091f3176437d8be570a8d849034ae4df5eee4e8795f32196d94859262e44f2ce55d8b3d895ba6e
-Size (bind-9.18.25.tar.xz) = 5514064 bytes
+BLAKE2s (bind-9.18.26.tar.xz) = f873e9aaa5c11c9b120f739b8cb07d7ed905550272d31d435efe40214a242955
+SHA512 (bind-9.18.26.tar.xz) = 517951bd462aff206706a4bbae3ef917299f90af361fb931a50d2340f0580010b8a0eedce1d4e8c99e99389fc44d71221b907e30d91be0d398acbe29688d6e55
+Size (bind-9.18.26.tar.xz) = 5519432 bytes
 SHA1 (patch-bin_named_main.c) = 4e4a763c478f1fcecb7e65968cf6ca20dacf01f1
 SHA1 (patch-bin_named_os.c) = 5ecb0883076575d8ac5fcad68f9daad6c9be0d0b
 SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d
@@ -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.1.12.1
--- 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     Tue Apr 23 16:18:48 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.1.12.1 2024/04/23 16:18:48 bsiegert 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 {