CVS commit: pkgsrc/net/bind918

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Mar 20 14:59:15 UTC 2024

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

Log Message:
net/bind918: update to 9.18.25

9.18.25 (2024-03-20)

6356.   [bug]           Create the pruning task in the dns_cache_flush(), so
                        the cache pruning still works after the flush.
                        [GL #4621]

6353.   [bug]           Improve the TTL-based cleaning by removing the expired
                        headers from the heap, so they don't block the next
                        cleaning round and clean more than a single item for
                        each new addition to the RBTDB. [GL #4591]

6352.   [bug]           Revert change 6319 and decrease lock contention during
                        RBTDB tree pruning by not cleaning up nodes recursively
                        within a single prune_tree() call. [GL #4596]

6350.   [bug]           Address use after free in expire_lru_headers. [GL #4495]


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/bind918/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/bind918/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/bind918/patches/patch-lib_dns_rbtdb.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.27 pkgsrc/net/bind918/Makefile:1.28
--- pkgsrc/net/bind918/Makefile:1.27    Tue Feb 13 13:50:39 2024
+++ pkgsrc/net/bind918/Makefile Wed Mar 20 14:59:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2024/02/13 13:50:39 taca Exp $
+# $NetBSD: Makefile,v 1.28 2024/03/20 14:59:15 taca Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
@@ -15,7 +15,7 @@ CONFLICTS+=   host-[0-9]*
 
 MAKE_JOBS_SAFE=        no
 
-BIND_VERSION=  9.18.24
+BIND_VERSION=  9.18.25
 
 BUILD_DEFS+=   BIND_DIR VARBASE
 

Index: pkgsrc/net/bind918/distinfo
diff -u pkgsrc/net/bind918/distinfo:1.15 pkgsrc/net/bind918/distinfo:1.16
--- pkgsrc/net/bind918/distinfo:1.15    Tue Feb 13 13:50:39 2024
+++ pkgsrc/net/bind918/distinfo Wed Mar 20 14:59:15 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2024/02/13 13:50:39 taca Exp $
+$NetBSD: distinfo,v 1.16 2024/03/20 14:59:15 taca Exp $
 
-BLAKE2s (bind-9.18.24.tar.xz) = be5193356fcdd06256343776425012970124d0940ff950ff31367be17b40ae9f
-SHA512 (bind-9.18.24.tar.xz) = 465f5b01570fdde5c95adfb780f54e0585814bd25baf914bb95bf5972f15a672e3e7b743a55f1804e69e17609d5a0cd66cc2bbab9174238b3c89e5ad732dc085
-Size (bind-9.18.24.tar.xz) = 5515528 bytes
+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
 SHA1 (patch-bin_named_main.c) = 4e4a763c478f1fcecb7e65968cf6ca20dacf01f1
 SHA1 (patch-bin_named_os.c) = 5ecb0883076575d8ac5fcad68f9daad6c9be0d0b
 SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d
@@ -12,7 +12,7 @@ SHA1 (patch-lib_dns_byaddr.c) = 647ddaaa
 SHA1 (patch-lib_dns_gssapi__link.c) = 72296598b0bdd2a57d0f38ecf1775e2898a041c6
 SHA1 (patch-lib_dns_include_dns_zone.h) = e6dfcd43430538ac2a39b217fcae0d81e4c4d163
 SHA1 (patch-lib_dns_lookup.c) = 6c7463aca16abf6bd578aba1733a3217608a39d3
-SHA1 (patch-lib_dns_rbtdb.c) = f216c1f629add101daf1cec45e1f693204beeefe
+SHA1 (patch-lib_dns_rbtdb.c) = d623f736da7da4df051b2078b861d253e4b89581
 SHA1 (patch-lib_dns_request.c) = 4a9d0409afcf9f989aa9297efb97c578b4863d9c
 SHA1 (patch-lib_dns_sdb.c) = ed447ec7a134e620765b25ee36124a19dfd9fab0
 SHA1 (patch-lib_dns_sdlz.c) = 4fc15a577c64501c10c144eab147e54686e80309

Index: pkgsrc/net/bind918/patches/patch-lib_dns_rbtdb.c
diff -u pkgsrc/net/bind918/patches/patch-lib_dns_rbtdb.c:1.2 pkgsrc/net/bind918/patches/patch-lib_dns_rbtdb.c:1.3
--- pkgsrc/net/bind918/patches/patch-lib_dns_rbtdb.c:1.2        Tue Feb 13 13:50:39 2024
+++ pkgsrc/net/bind918/patches/patch-lib_dns_rbtdb.c    Wed Mar 20 14:59:15 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_dns_rbtdb.c,v 1.2 2024/02/13 13:50:39 taca Exp $
+$NetBSD: patch-lib_dns_rbtdb.c,v 1.3 2024/03/20 14:59:15 taca Exp $
 
 * Take from NetBSD base.
 
---- lib/dns/rbtdb.c.orig       2024-02-11 10:42:55.656990155 +0000
+--- lib/dns/rbtdb.c.orig       2024-03-12 08:51:08.618355570 +0000
 +++ lib/dns/rbtdb.c
-@@ -2234,7 +2234,7 @@ prune_tree(isc_task_t *task, isc_event_t
-       }
+@@ -2222,7 +2222,7 @@ prune_tree(isc_task_t *task, isc_event_t
+       NODE_UNLOCK(&rbtdb->node_locks[locknum].lock, isc_rwlocktype_write);
        RWUNLOCK(&rbtdb->tree_lock, isc_rwlocktype_write);
  
 -      detach((dns_db_t **)&rbtdb);