 @@ -1,32 +1,31 @@
-# $NetBSD: Makefile,v 1.3 2022/12/14 21:44:03 sekiya Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2023/02/12 19:52:24 spz 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
 MAINTAINER=	sekiya@NetBSD.org
 HOMEPAGE=	https://www.isc.org/software/bind/
 COMMENT=	Berkeley Internet Name Daemon implementation of DNS, version 9.18
 LICENSE=	mpl-2.0
 CONFLICTS+=	host-[0-9]*
 MAKE_JOBS_SAFE=	no
-BIND_VERSION=	9.18.9
+BIND_VERSION=	9.18.11
 BUILD_DEFS+=	BIND_DIR VARBASE
 .include "options.mk"
 USE_TOOLS+=		aclocal autoconf automake pax perl pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CHECK_FILES_SKIP=	bin/tests/system/system-test-driver.sh
 MAKE_ENV+=		WRKDIR=${WRKDIR} PREFIX=${PREFIX}
 .if ${OPSYS} == "Linux" && !exists(/usr/include/sys/capability.h)
 CONFIGURE_ARGS+=		--disable-linux-caps

 @@ -1,38 +1,37 @@
-$NetBSD: distinfo,v 1.3 2022/12/12 22:07:04 sekiya Exp $
+$NetBSD: distinfo,v 1.3.2.1 2023/02/12 19:52:24 spz Exp $
-BLAKE2s (bind-9.18.9.tar.xz) = 8c3f2dcb57205959f78c02fd32a12d0897050897af9136b58972fde41468ec55
+BLAKE2s (bind-9.18.11.tar.xz) = c4aae1223078ef089a3f35ae15e3ea552383d235b7a9dfe1c0423a958409891f
-SHA512 (bind-9.18.9.tar.xz) = 7d9bca47e29e8634416ab52819d78ce4ec6196c0dcbd9fe95a24687337f71c69b6472cf20bf49ea0ae1751a861944f354f9122acfb01780f51278ad4a3fdd817
+SHA512 (bind-9.18.11.tar.xz) = 1f71560efca3b6886d71861c76d4a11d59c28f0ffed684f040a59dd9c14be594985a3f15e6d610a4d88a40a16a19e259977d4a254e146469323d15587b23f3ad
-Size (bind-9.18.9.tar.xz) = 5281732 bytes
+Size (bind-9.18.11.tar.xz) = 5284184 bytes
 SHA1 (patch-bin_named_main.c) = 4e4a763c478f1fcecb7e65968cf6ca20dacf01f1
 SHA1 (patch-bin_named_os.c) = 5ecb0883076575d8ac5fcad68f9daad6c9be0d0b
 SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d
 SHA1 (patch-bin_tests_system_keyfromlabel_tests.sh) = 63a1516b573adabe6ff2719532fd58bcf3ecd65b
 SHA1 (patch-config.h.in) = 6072793048cdf590863046355eeffa1d93524c36
 SHA1 (patch-configure.ac) = a6f10aec356691ca1075262a3e87c809cd3a558a
 SHA1 (patch-lib_dns_byaddr.c) = 647ddaaaf040233e18d1a87d83bc2bd63d2a20e3
 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) = e8d61e1ba613b2a2fdcd3ff077e2e5b6ce2e45b2
 SHA1 (patch-lib_dns_request.c) = 4a9d0409afcf9f989aa9297efb97c578b4863d9c
 SHA1 (patch-lib_dns_sdb.c) = ed447ec7a134e620765b25ee36124a19dfd9fab0
 SHA1 (patch-lib_dns_sdlz.c) = 4fc15a577c64501c10c144eab147e54686e80309
 SHA1 (patch-lib_dns_validator.c) = 03dd60d4c38be7248d1e07f2c29ddd543b5f7454
 SHA1 (patch-lib_dns_view.c) = 5b092f0344b92d003f1fe1f28e4cc4c76b2505cf
 SHA1 (patch-lib_dns_zone.c) = cd7bc1e76caf1d664393efa318786c2b33c000de
 SHA1 (patch-lib_isc_app.c) = 8f9fd079d00d34f0d20e6d9e676446d322f9e0fb
 SHA1 (patch-lib_isc_include_isc_netmgr.h) = 48ac44c6a9b81e6b442deba6c075653d3691464b
 SHA1 (patch-lib_isc_net.c) = 743de2701fa96ef25e5689f40e381628cff641d5
 SHA1 (patch-lib_isc_netmgr_netmgr-int.h) = d84993edf254605f85421fbdd2fc523255c7316d
 SHA1 (patch-lib_isc_netmgr_netmgr.c) = 3df1d37061f6ceb37e309a0dc4f782fc35863146
 SHA1 (patch-lib_isc_rwlock.c) = 1d114248ddee20db7a7429afab446f8b2f0dca82
-SHA1 (patch-lib_isc_siphash.c) = 8999deb002e4fdb6b13e6f297298ef73c97042c3
+SHA1 (patch-lib_isc_siphash.c) = 2dd80dde7bd8e869a3cf03c1699665b56eaaf866
-SHA1 (patch-lib_isc_time.c) = 04719dce1ad7328909fd584104b7bc20170b3c5e
+SHA1 (patch-lib_isc_time.c) = 22780fd25d89a0ece46ec1624b3977ca4c46281a
 SHA1 (patch-lib_isc_timer.c) = aea2019bbf3d84cad77af432a2bbdf0da8f2f893
 SHA1 (patch-lib_ns_Makefile.am) = a91e1713185c4366e96bf52ebee38e3b7e35a0c6
 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_update.c) = 2fb3457da333143508d28420490cbc1cb69ddb19
+SHA1 (patch-lib_ns_update.c) = 941ca5601904e9b4cc5314148e955f5490a5d071
 SHA1 (patch-lib_ns_xfrout.c) = 79d9e4add58ffd75ea9718f5501f1517e67416e3

 @@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+@comment $NetBSD: PLIST,v 1.1.2.1 2023/02/12 19:52:24 spz Exp $
 bin/arpaname
 bin/delv
 bin/dig
 bin/dnssec-cds
 bin/dnssec-dsfromkey
 bin/dnssec-importkey
 bin/dnssec-keyfromlabel
 bin/dnssec-keygen
 bin/dnssec-revoke
 bin/dnssec-settime
 bin/dnssec-signzone
 bin/dnssec-verify
 ${PLIST.dnstap}bin/dnstap-read
 @@ -243,39 +243,32 @@ include/ns/hooks.h
 include/ns/interfacemgr.h
 include/ns/listenlist.h
 include/ns/log.h
 include/ns/notify.h
 include/ns/query.h
 include/ns/server.h
 include/ns/sortlist.h
 include/ns/stats.h
 include/ns/types.h
 include/ns/update.h
 include/ns/xfrout.h
 lib/bind/filter-a.la
 lib/bind/filter-aaaa.la
 lib/libbind9-9.18.9.so
 lib/libbind9.la
 lib/libdns-9.18.9.so
 lib/libdns.la
 lib/libirs-9.18.9.so
 lib/libirs.la
 lib/libisc-9.18.9.so
 lib/libisc.la
 lib/libisccc-9.18.9.so
 lib/libisccc.la
 lib/libisccfg-9.18.9.so
 lib/libisccfg.la
 lib/libns-9.18.9.so
 lib/libns.la
 man/man1/arpaname.1
 man/man1/delv.1
 man/man1/dig.1
 man/man1/dnssec-cds.1
 man/man1/dnssec-dsfromkey.1
 man/man1/dnssec-importkey.1
 man/man1/dnssec-keyfromlabel.1
 man/man1/dnssec-keygen.1
 man/man1/dnssec-revoke.1
 man/man1/dnssec-settime.1
 man/man1/dnssec-signzone.1
 man/man1/dnssec-verify.1

 @@ -1,22 +1,22 @@
-$NetBSD: patch-lib_isc_siphash.c,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+$NetBSD: patch-lib_isc_siphash.c,v 1.1.2.1 2023/02/12 19:52:24 spz Exp $
 * Take from NetBSD base.
---- lib/isc/siphash.c.orig	2021-09-07 09:37:05.000000000 +0000
+--- lib/isc/siphash.c.orig	2023-01-12 22:21:15.270402532 +0000
 +++ lib/isc/siphash.c
-@@ -90,8 +90,14 @@ isc_siphash24(const uint8_t *k, const ui
+@@ -93,8 +93,14 @@ isc_siphash24(const uint8_t *k, const ui
  	REQUIRE(k != NULL);
  	REQUIRE(out != NULL);
  	REQUIRE(inlen == 0 || in != NULL);
 -	uint64_t k0 = U8TO64_LE(k);
 -	uint64_t k1 = U8TO64_LE(k + 8);
 +	uint64_t k0;
 +	uint64_t k1;
++
 +	memcpy(&k0, k, sizeof(k0));
 +	memcpy(&k1, k + sizeof(k0), sizeof(k1));
++
 +	k0 = le64toh(k0);
 +	k1 = le64toh(k1);
  	uint64_t v0 = UINT64_C(0x736f6d6570736575) ^ k0;

 @@ -1,29 +1,29 @@
-$NetBSD: patch-lib_isc_time.c,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+$NetBSD: patch-lib_isc_time.c,v 1.1.2.1 2023/02/12 19:52:24 spz Exp $
 * More check time_t range.
---- lib/isc/time.c.orig	2020-05-06 09:59:35.000000000 +0000
+--- lib/isc/time.c.orig	2023-01-12 22:21:15.270402532 +0000
 +++ lib/isc/time.c
-@@ -285,7 +285,7 @@ isc_time_seconds(const isc_time_t *t) {
+@@ -318,7 +318,7 @@ isc_time_seconds(const isc_time_t *t) {
  isc_result_t
  isc_time_secondsastimet(const isc_time_t *t, time_t *secondsp) {
 -	time_t seconds;
 +	time_t seconds, i;
  	REQUIRE(t != NULL);
- 	INSIST(t->nanoseconds < NS_PER_S);
+ 	INSIST(t->nanoseconds < NS_PER_SEC);
-@@ -312,7 +312,18 @@ isc_time_secondsastimet(const isc_time_t
+@@ -345,7 +345,18 @@ isc_time_secondsastimet(const isc_time_t
  	INSIST(sizeof(unsigned int) == sizeof(uint32_t));
  	INSIST(sizeof(time_t) >= sizeof(uint32_t));
 -	if (t->seconds > (~0U >> 1) && seconds <= (time_t)(~0U >> 1)) {
 +	if (sizeof(time_t) == sizeof(uint32_t) &&	       /* Same size. */
 +	    (time_t)0.5 != 0.5 &&	       /* Not a floating point type. */
 +	    (i = (time_t)-1) != 4294967295u &&		       /* Is signed. */
 +	    (seconds &
 +	     (1ULL << (sizeof(time_t) * CHAR_BIT - 1))) != 0ULL) {   /* Negative. */
 +		/*
 +		 * This UNUSED() is here to shut up the IRIX compiler:
 +		 *	variable "i" was set but never used
 +		 * when the value of i *was* used in the third test.

 @@ -1,47 +1,47 @@
-$NetBSD: patch-lib_ns_update.c,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+$NetBSD: patch-lib_ns_update.c,v 1.1.2.1 2023/02/12 19:52:24 spz Exp $
 * Based on NetBSD, add support for blocklist(blacklist).
---- lib/ns/update.c.orig	2020-12-07 08:16:53.000000000 +0000
+--- lib/ns/update.c.orig	2023-01-12 22:21:15.274402517 +0000
 +++ lib/ns/update.c
-@@ -52,6 +52,10 @@
+@@ -55,6 +55,10 @@
  #include <ns/stats.h>
  #include <ns/update.h>
 +#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H)
 +#include <ns/pfilter.h>
 +#endif
++
  /*! \file
   * \brief
   * This module implements dynamic update as in RFC2136.
-@@ -340,6 +344,9 @@ checkqueryacl(ns_client_t *client, dns_a
+@@ -358,6 +362,9 @@ checkqueryacl(ns_client_t *client, dns_a
  	result = ns_client_checkaclsilent(client, NULL, queryacl, true);
  	if (result != ISC_R_SUCCESS) {
  		int level = update_possible ? ISC_LOG_ERROR : ISC_LOG_INFO;
 +#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H)
 +		pfilter_notify(result, client, "queryacl");
 +#endif
  		dns_name_format(zonename, namebuf, sizeof(namebuf));
  		dns_rdataclass_format(client->view->rdclass, classbuf,
  				      sizeof(classbuf));
-@@ -352,6 +359,9 @@ checkqueryacl(ns_client_t *client, dns_a
+@@ -367,6 +374,9 @@ checkqueryacl(ns_client_t *client, dns_a
  			      "update '%s/%s' denied due to allow-query",
  			      namebuf, classbuf);
- 	} else if (updateacl == NULL && ssutable == NULL) {
+ 	} else if (!update_possible) {
 +#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H)
 +		pfilter_notify(result, client, "updateacl");
 +#endif
  		dns_name_format(zonename, namebuf, sizeof(namebuf));
  		dns_rdataclass_format(client->view->rdclass, classbuf,
  				      sizeof(classbuf));
-@@ -393,6 +403,9 @@ checkupdateacl(ns_client_t *client, dns_
+@@ -409,6 +419,9 @@ checkupdateacl(ns_client_t *client, dns_
  		msg = "disabled";
  	} else {
  		result = ns_client_checkaclsilent(client, NULL, acl, false);
 +#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H)
 +		pfilter_notify(result, client, "updateacl");
 +#endif
  		if (result == ISC_R_SUCCESS) {
  			level = ISC_LOG_DEBUG(3);
  			msg = "approved";