Sat Apr 20 14:02:40 2024 UTC (36d)
net/bind918: fix blocklist handling

Apply change of revision 1.21 in NetBSD base which fixed PR bin/58170.

Bump PKGREVISION.


(taca)
diff -r1.30 -r1.31 pkgsrc/net/bind918/Makefile
diff -r1.17 -r1.18 pkgsrc/net/bind918/distinfo
diff -r1.1 -r1.2 pkgsrc/net/bind918/patches/patch-lib_ns_query.c
cvs diff -r1.30 -r1.31 pkgsrc/net/bind918/Makefile (expand / switch to unified diff)

--- pkgsrc/net/bind918/Makefile 2024/04/18 13:37:53 1.30
+++ pkgsrc/net/bind918/Makefile 2024/04/20 14:02:39 1.31
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.30 2024/04/18 13:37:53 taca Exp $ 1# $NetBSD: Makefile,v 1.31 2024/04/20 14:02:39 taca Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
 5PKGREVISION= 1
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= https://downloads.isc.org/isc/bind9/${BIND_VERSION}/ 7MASTER_SITES= https://downloads.isc.org/isc/bind9/${BIND_VERSION}/
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= sekiya@NetBSD.org 10MAINTAINER= sekiya@NetBSD.org
10HOMEPAGE= https://www.isc.org/bind/ 11HOMEPAGE= https://www.isc.org/bind/
11COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.18 12COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.18
12LICENSE= mpl-2.0 13LICENSE= mpl-2.0
13 14
14CONFLICTS+= host-[0-9]* 15CONFLICTS+= host-[0-9]*
15 16
16MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no
17 18
cvs diff -r1.17 -r1.18 pkgsrc/net/bind918/distinfo (expand / switch to unified diff)

--- pkgsrc/net/bind918/distinfo 2024/04/18 13:37:53 1.17
+++ pkgsrc/net/bind918/distinfo 2024/04/20 14:02:39 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.17 2024/04/18 13:37:53 taca Exp $ 1$NetBSD: distinfo,v 1.18 2024/04/20 14:02:39 taca Exp $
2 2
3BLAKE2s (bind-9.18.26.tar.xz) = f873e9aaa5c11c9b120f739b8cb07d7ed905550272d31d435efe40214a242955 3BLAKE2s (bind-9.18.26.tar.xz) = f873e9aaa5c11c9b120f739b8cb07d7ed905550272d31d435efe40214a242955
4SHA512 (bind-9.18.26.tar.xz) = 517951bd462aff206706a4bbae3ef917299f90af361fb931a50d2340f0580010b8a0eedce1d4e8c99e99389fc44d71221b907e30d91be0d398acbe29688d6e55 4SHA512 (bind-9.18.26.tar.xz) = 517951bd462aff206706a4bbae3ef917299f90af361fb931a50d2340f0580010b8a0eedce1d4e8c99e99389fc44d71221b907e30d91be0d398acbe29688d6e55
5Size (bind-9.18.26.tar.xz) = 5519432 bytes 5Size (bind-9.18.26.tar.xz) = 5519432 bytes
6SHA1 (patch-bin_named_main.c) = 4e4a763c478f1fcecb7e65968cf6ca20dacf01f1 6SHA1 (patch-bin_named_main.c) = 4e4a763c478f1fcecb7e65968cf6ca20dacf01f1
7SHA1 (patch-bin_named_os.c) = 5ecb0883076575d8ac5fcad68f9daad6c9be0d0b 7SHA1 (patch-bin_named_os.c) = 5ecb0883076575d8ac5fcad68f9daad6c9be0d0b
8SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d 8SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d
9SHA1 (patch-config.h.in) = 6072793048cdf590863046355eeffa1d93524c36 9SHA1 (patch-config.h.in) = 6072793048cdf590863046355eeffa1d93524c36
10SHA1 (patch-configure.ac) = 65f4255300a0ab3b6b663fe59412570fd7b08675 10SHA1 (patch-configure.ac) = 65f4255300a0ab3b6b663fe59412570fd7b08675
11SHA1 (patch-lib_dns_byaddr.c) = 647ddaaaf040233e18d1a87d83bc2bd63d2a20e3 11SHA1 (patch-lib_dns_byaddr.c) = 647ddaaaf040233e18d1a87d83bc2bd63d2a20e3
12SHA1 (patch-lib_dns_gssapi__link.c) = 72296598b0bdd2a57d0f38ecf1775e2898a041c6 12SHA1 (patch-lib_dns_gssapi__link.c) = 72296598b0bdd2a57d0f38ecf1775e2898a041c6
13SHA1 (patch-lib_dns_include_dns_zone.h) = e6dfcd43430538ac2a39b217fcae0d81e4c4d163 13SHA1 (patch-lib_dns_include_dns_zone.h) = e6dfcd43430538ac2a39b217fcae0d81e4c4d163
14SHA1 (patch-lib_dns_lookup.c) = 6c7463aca16abf6bd578aba1733a3217608a39d3 14SHA1 (patch-lib_dns_lookup.c) = 6c7463aca16abf6bd578aba1733a3217608a39d3
@@ -21,16 +21,16 @@ SHA1 (patch-lib_dns_view.c) = 5b092f0344 @@ -21,16 +21,16 @@ SHA1 (patch-lib_dns_view.c) = 5b092f0344
21SHA1 (patch-lib_dns_zone.c) = cd7bc1e76caf1d664393efa318786c2b33c000de 21SHA1 (patch-lib_dns_zone.c) = cd7bc1e76caf1d664393efa318786c2b33c000de
22SHA1 (patch-lib_isc_include_isc_netmgr.h) = 48ac44c6a9b81e6b442deba6c075653d3691464b 22SHA1 (patch-lib_isc_include_isc_netmgr.h) = 48ac44c6a9b81e6b442deba6c075653d3691464b
23SHA1 (patch-lib_isc_net.c) = 743de2701fa96ef25e5689f40e381628cff641d5 23SHA1 (patch-lib_isc_net.c) = 743de2701fa96ef25e5689f40e381628cff641d5
24SHA1 (patch-lib_isc_netmgr_netmgr-int.h) = d84993edf254605f85421fbdd2fc523255c7316d 24SHA1 (patch-lib_isc_netmgr_netmgr-int.h) = d84993edf254605f85421fbdd2fc523255c7316d
25SHA1 (patch-lib_isc_netmgr_netmgr.c) = 0e94f78e0f6ac43197883adac7828a3f0d04291c 25SHA1 (patch-lib_isc_netmgr_netmgr.c) = 0e94f78e0f6ac43197883adac7828a3f0d04291c
26SHA1 (patch-lib_isc_rwlock.c) = 1d114248ddee20db7a7429afab446f8b2f0dca82 26SHA1 (patch-lib_isc_rwlock.c) = 1d114248ddee20db7a7429afab446f8b2f0dca82
27SHA1 (patch-lib_isc_siphash.c) = 2dd80dde7bd8e869a3cf03c1699665b56eaaf866 27SHA1 (patch-lib_isc_siphash.c) = 2dd80dde7bd8e869a3cf03c1699665b56eaaf866
28SHA1 (patch-lib_isc_time.c) = 22780fd25d89a0ece46ec1624b3977ca4c46281a 28SHA1 (patch-lib_isc_time.c) = 22780fd25d89a0ece46ec1624b3977ca4c46281a
29SHA1 (patch-lib_isc_timer.c) = aea2019bbf3d84cad77af432a2bbdf0da8f2f893 29SHA1 (patch-lib_isc_timer.c) = aea2019bbf3d84cad77af432a2bbdf0da8f2f893
30SHA1 (patch-lib_ns_Makefile.am) = a91e1713185c4366e96bf52ebee38e3b7e35a0c6 30SHA1 (patch-lib_ns_Makefile.am) = a91e1713185c4366e96bf52ebee38e3b7e35a0c6
31SHA1 (patch-lib_ns_client.c) = 4093c82254321e6c6eaa40ea1cf738b3f9bda0bb 31SHA1 (patch-lib_ns_client.c) = 4093c82254321e6c6eaa40ea1cf738b3f9bda0bb
32SHA1 (patch-lib_ns_include_ns_pfilter.h) = cc86752971b4f9f7492283c4ad3ff29bc1bae237 32SHA1 (patch-lib_ns_include_ns_pfilter.h) = cc86752971b4f9f7492283c4ad3ff29bc1bae237
33SHA1 (patch-lib_ns_pfilter.c) = b0345f9b27e2bdd4f9a992cfc23616e027de4988 33SHA1 (patch-lib_ns_pfilter.c) = b0345f9b27e2bdd4f9a992cfc23616e027de4988
34SHA1 (patch-lib_ns_query.c) = d947318dc6a261931928c4bf8b7f48efa9004a38 34SHA1 (patch-lib_ns_query.c) = 27bc6e5efc8ba0756d968d54e9ae1a3b2c3bc97e
35SHA1 (patch-lib_ns_update.c) = 941ca5601904e9b4cc5314148e955f5490a5d071 35SHA1 (patch-lib_ns_update.c) = 941ca5601904e9b4cc5314148e955f5490a5d071
36SHA1 (patch-lib_ns_xfrout.c) = 79d9e4add58ffd75ea9718f5501f1517e67416e3 36SHA1 (patch-lib_ns_xfrout.c) = 79d9e4add58ffd75ea9718f5501f1517e67416e3
cvs diff -r1.1 -r1.2 pkgsrc/net/bind918/patches/patch-lib_ns_query.c (expand / switch to unified diff)

--- pkgsrc/net/bind918/patches/patch-lib_ns_query.c 2022/12/11 01:57:55 1.1
+++ pkgsrc/net/bind918/patches/patch-lib_ns_query.c 2024/04/20 14:02:40 1.2
@@ -1,37 +1,27 @@ @@ -1,37 +1,27 @@
1$NetBSD: patch-lib_ns_query.c,v 1.1 2022/12/11 01:57:55 sekiya Exp $ 1$NetBSD: patch-lib_ns_query.c,v 1.2 2024/04/20 14:02:40 taca Exp $
2 2
3* Based on NetBSD, add support for blocklist(blacklist). 3* Based on NetBSD, add support for blocklist(blacklist).
4 4
5--- lib/ns/query.c.orig 2022-11-08 07:17:42.056257919 +0900 5--- lib/ns/query.c.orig 2024-04-03 09:39:01.839989165 +0000
6+++ lib/ns/query.c 2022-12-10 11:00:47.549957781 +0900 6+++ lib/ns/query.c
7@@ -74,6 +74,10 @@ 7@@ -74,6 +74,10 @@
8 #include <ns/stats.h> 8 #include <ns/stats.h>
9 #include <ns/xfrout.h> 9 #include <ns/xfrout.h>
10  10
11+#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H) 11+#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H)
12+#include <ns/pfilter.h> 12+#include <ns/pfilter.h>
13+#endif 13+#endif
14+ 14+
15 #if 0 15 #if 0
16 /* 16 /*
17 * It has been recommended that DNS64 be changed to return excluded 17 * It has been recommended that DNS64 be changed to return excluded
18@@ -915,6 +919,9 @@ 18@@ -1047,6 +1051,9 @@ query_validatezonedb(ns_client_t *client
19 NULL); 
20  
21 if (log) { 
22+#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H) 
23+ pfilter_notify(result, client, "checkcacheaccess"); 
24+#endif 
25 ns_client_aclmsg("query (cache)", name, qtype, 
26 client->view->rdclass, msg, 
27 sizeof(msg)); 
28@@ -1043,6 +1050,9 @@ 
29 msg); 19 msg);
30 } 20 }
31 } else { 21 } else {
32+#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H) 22+#if defined(HAVE_BLACKLIST_H) || defined(HAVE_BLOCKLIST_H)
33+ pfilter_notify(result, client, "validatezonedb"); 23+ pfilter_notify(result, client, "validatezonedb");
34+#endif 24+#endif
35 ns_client_aclmsg("query", name, qtype, 25 ns_client_aclmsg("query", name, qtype,
36 client->view->rdclass, msg, 26 client->view->rdclass, msg,
37 sizeof(msg)); 27 sizeof(msg));