pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/bind916 net/bind916: update pkgsrc changes from Ne...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1adb64f6cf30
branches: trunk
changeset: 768481:1adb64f6cf30
user: taca <taca%pkgsrc.org@localhost>
date: Sun Oct 24 06:40:28 2021 +0000
description:
net/bind916: update pkgsrc changes from NetBSD
Catch up changes from NetBSD; update them for BIND 9.16.
Bump PKGREVISION.
diffstat:
net/bind916/Makefile | 4 +-
net/bind916/distinfo | 31 +-
net/bind916/patches/patch-bin_named_unix_os.c | 20 +
net/bind916/patches/patch-bin_tools_arpaname.c | 15 -
net/bind916/patches/patch-contrib_dlz_modules_wildcard_dlz__wildcard__dynamic.c | 15 -
net/bind916/patches/patch-lib_dns_client.c | 1871 ++++++++++
net/bind916/patches/patch-lib_dns_dnsrps.c | 14 -
net/bind916/patches/patch-lib_dns_include_dns_client.h | 280 +
net/bind916/patches/patch-lib_dns_include_dns_zone.h | 8 +-
net/bind916/patches/patch-lib_dns_peer.c | 23 -
net/bind916/patches/patch-lib_dns_rbt.c | 10 +-
net/bind916/patches/patch-lib_dns_rdata.c | 17 +
net/bind916/patches/patch-lib_dns_zone.c | 19 +-
net/bind916/patches/patch-lib_isc_app.c | 24 +
net/bind916/patches/patch-lib_isc_netmgr_netmgr-int.h | 102 +
net/bind916/patches/patch-lib_isc_netmgr_netmgr.c | 15 +-
net/bind916/patches/patch-lib_isc_siphash.c | 23 +
net/bind916/patches/patch-lib_isc_timer.c | 15 +
net/bind916/patches/patch-lib_isc_unix_include_isc_align.h | 15 -
net/bind916/patches/patch-lib_isc_unix_include_isc_stdatomic.h | 15 +
net/bind916/patches/patch-lib_isc_unix_socket.c | 110 +-
net/bind916/patches/patch-lib_ns_Makefile.in | 21 +-
net/bind916/patches/patch-lib_ns_client.c | 17 +-
net/bind916/patches/patch-lib_ns_interfacemgr.c | 19 -
24 files changed, 2481 insertions(+), 222 deletions(-)
diffs (truncated from 3107 to 300 lines):
diff -r ab7fdeeb47f2 -r 1adb64f6cf30 net/bind916/Makefile
--- a/net/bind916/Makefile Sun Oct 24 04:03:55 2021 +0000
+++ b/net/bind916/Makefile Sun Oct 24 06:40:28 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2021/10/21 20:33:07 kim Exp $
+# $NetBSD: Makefile,v 1.28 2021/10/24 06:40:28 taca Exp $
DISTNAME= bind-${BIND_VERSION}
PKGNAME= ${DISTNAME:S/-P/pl/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
EXTRACT_SUFX= .tar.xz
diff -r ab7fdeeb47f2 -r 1adb64f6cf30 net/bind916/distinfo
--- a/net/bind916/distinfo Sun Oct 24 04:03:55 2021 +0000
+++ b/net/bind916/distinfo Sun Oct 24 06:40:28 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2021/10/07 14:41:15 nia Exp $
+$NetBSD: distinfo,v 1.24 2021/10/24 06:40:28 taca Exp $
RMD160 (bind-9.16.21.tar.xz) = 57f41616424441caa6cd83e407f8a5043bd70e50
SHA512 (bind-9.16.21.tar.xz) = 2cb71e50600fd7409ca7b7e2e9cf4ef6668b07faad7980ac8060e6a76f30a315182d75534ad1dcfb740c225cdf727b2bd6aa9ceb24ab77ffff09b7b5d6eaca2d
@@ -8,9 +8,9 @@
SHA1 (patch-bin_named_Makefile.in) = f1367da6a226ba44d0ee13acf00b8abeb5b1b7eb
SHA1 (patch-bin_named_main.c) = f00842529ec2015e0969d0dba58a1e13a510f9eb
SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d
+SHA1 (patch-bin_named_unix_os.c) = fe9cde1240107151c5b10ba325c8f994ef76852d
SHA1 (patch-bin_nsupdate_nsupdate.c) = 4ccd0e503a972cf16905e999bcc574f8ee0dd85d
SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e
-SHA1 (patch-bin_tools_arpaname.c) = 868da4454d06dc823680cf06a764fa40b8474708
SHA1 (patch-bin_tools_nsec3hash.c) = 87c3891db62c45cd8ed2b484b17f7bf2e319bef3
SHA1 (patch-config.guess) = f44c6344a297e7c623dcbf75b308eb35f797a537
SHA1 (patch-config.h.in) = fb0396429bd68bb3bf478cb1da67736592208702
@@ -18,39 +18,42 @@
SHA1 (patch-config.threads.in) = fc5cc7097d87523a34c0e630cb8dd1d081d859e5
SHA1 (patch-configure.ac) = 3dd8c49eb6bc475c20c88edc20bd8457698ad500
SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7
-SHA1 (patch-contrib_dlz_modules_wildcard_dlz__wildcard__dynamic.c) = 37ba5f06f4970abaae6d98c4305f6372537a313f
SHA1 (patch-lib_dns_byaddr.c) = 647ddaaaf040233e18d1a87d83bc2bd63d2a20e3
-SHA1 (patch-lib_dns_dnsrps.c) = b4c66a808eeb1e859801028afacd7237cd89903a
+SHA1 (patch-lib_dns_client.c) = 94909ebeaded676cca502d83bf8071ae651e1928
SHA1 (patch-lib_dns_gssapi__link.c) = acd5f3c975d4edf391e77fd39cfa91810ad17ba2
-SHA1 (patch-lib_dns_include_dns_zone.h) = aafd99bf0b0c84aa69b444106608c6cff61938f1
+SHA1 (patch-lib_dns_include_dns_client.h) = 5e3c6baebe136b026f30552dbbff632a2b535301
+SHA1 (patch-lib_dns_include_dns_zone.h) = e6dfcd43430538ac2a39b217fcae0d81e4c4d163
SHA1 (patch-lib_dns_lookup.c) = 6c7463aca16abf6bd578aba1733a3217608a39d3
-SHA1 (patch-lib_dns_peer.c) = 16cc26fd4e792a23caef6e091f94f974041179e7
SHA1 (patch-lib_dns_pkcs11ecdsa__link.c) = 99f386b056c5a6471f69841c41a2698d36b6b275
SHA1 (patch-lib_dns_pkcs11eddsa__link.c) = bd887a6c8960da3a8663cdf5e955e045f16dee3f
-SHA1 (patch-lib_dns_rbt.c) = a9ef153a0548eb432567f1e3347c27ce5775a041
+SHA1 (patch-lib_dns_rbt.c) = c14eff9a609e4b49aa9db18f395461cd7c8944be
SHA1 (patch-lib_dns_rbtdb.c) = bb3f829cbed23bce624462766aa6d039a0153afe
+SHA1 (patch-lib_dns_rdata.c) = fb12d214a86d71d62e200e6bc09b7c8b7187b911
SHA1 (patch-lib_dns_request.c) = 82560e819cba0259883da8d47618ffabead22c55
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) = 04a224863c8860c5f1b5bf4291b1af920c57fcd2
+SHA1 (patch-lib_dns_zone.c) = cd7bc1e76caf1d664393efa318786c2b33c000de
+SHA1 (patch-lib_isc_app.c) = 1c75ba0db1e7978b37e22742bf69a216ca9a23ef
SHA1 (patch-lib_isc_backtrace.c) = 1b6bca9b3de7f7298882c6c88274b0baf1dad507
SHA1 (patch-lib_isc_include_isc_netmgr.h) = 48ac44c6a9b81e6b442deba6c075653d3691464b
SHA1 (patch-lib_isc_include_isc_socket.h) = dc6376cd9e8391fa96efd805faee1a5d0647a142
SHA1 (patch-lib_isc_include_isc_types.h) = e5fcf15ee03d1d032a67f2e6d23b2e409042ab64
-SHA1 (patch-lib_isc_netmgr_netmgr.c) = 63168c8901646e7b2079e1dc3324087508bb1e62
+SHA1 (patch-lib_isc_netmgr_netmgr-int.h) = 9f493b33e00f09f45c78b6a66ebf7bfd52083792
+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_stats.c) = 8d962fa360740770588fccf1d303d7fe22ae724b
-SHA1 (patch-lib_isc_unix_include_isc_align.h) = 1bbd78f1617a40079d1044175cfe037bbd1d95b2
+SHA1 (patch-lib_isc_timer.c) = aea2019bbf3d84cad77af432a2bbdf0da8f2f893
+SHA1 (patch-lib_isc_unix_include_isc_stdatomic.h) = b73b0224be47c1733f6346fce9243e97f54e1865
SHA1 (patch-lib_isc_unix_net.c) = c654f60a1feefdba9bf980dcfa46ce37f46918aa
-SHA1 (patch-lib_isc_unix_socket.c) = ed1816b50698107cb2034e0e3c61406ee458e697
+SHA1 (patch-lib_isc_unix_socket.c) = 7d5b61124187009ce03f4fc963f8ad3c44d267d0
SHA1 (patch-lib_isc_unix_time.c) = fac9e66754e099f53ba8c499f5f179825a0b0fbd
-SHA1 (patch-lib_ns_Makefile.in) = 5d3ecf4d6673cf227635c03779e9969e6eeb8227
-SHA1 (patch-lib_ns_client.c) = db2ee0cc915f20ae09beb2c8a917e0b3e60dfedc
+SHA1 (patch-lib_ns_Makefile.in) = 7375d0cb44c891492594dc7540f78826c141106a
+SHA1 (patch-lib_ns_client.c) = 099ca607278d064081a0cfc92d96f0b31d95a944
SHA1 (patch-lib_ns_include_ns_client.h) = 3ccd630aee77ea638fb3b954b85bad9c74b0c86e
SHA1 (patch-lib_ns_include_ns_pfilter.h) = cc86752971b4f9f7492283c4ad3ff29bc1bae237
-SHA1 (patch-lib_ns_interfacemgr.c) = fc31720734b02155acd7fa9b370a6ebb82022532
SHA1 (patch-lib_ns_pfilter.c) = 8f4a3b3a729360a131eb1962c42a9f9f985c7e7b
SHA1 (patch-lib_ns_query.c) = 0c3c4a20aa4b40c144c4f986599cda67db3e2491
SHA1 (patch-lib_ns_update.c) = 2fb3457da333143508d28420490cbc1cb69ddb19
diff -r ab7fdeeb47f2 -r 1adb64f6cf30 net/bind916/patches/patch-bin_named_unix_os.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/bind916/patches/patch-bin_named_unix_os.c Sun Oct 24 06:40:28 2021 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-bin_named_unix_os.c,v 1.1 2021/10/24 06:40:28 taca Exp $
+
+* Take from NetBSD base.
+
+--- bin/named/unix/os.c.orig 2021-09-07 09:37:05.000000000 +0000
++++ bin/named/unix/os.c
+@@ -125,11 +125,10 @@ linux_setcaps(cap_t caps) {
+ } \
+ } while (0)
+ #define FREE_CAP \
+- { \
++ do { \
+ cap_free(caps); \
+ cap_free(curcaps); \
+- } \
+- while (0)
++ } while (0)
+
+ static void
+ linux_initialprivs(void) {
diff -r ab7fdeeb47f2 -r 1adb64f6cf30 net/bind916/patches/patch-bin_tools_arpaname.c
--- a/net/bind916/patches/patch-bin_tools_arpaname.c Sun Oct 24 04:03:55 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-bin_tools_arpaname.c,v 1.1 2020/08/09 15:20:22 taca Exp $
-
-* C syntax.
-
---- bin/tools/arpaname.c.orig 2020-05-06 09:59:35.000000000 +0000
-+++ bin/tools/arpaname.c
-@@ -14,7 +14,7 @@
- #include <isc/net.h>
- #include <isc/print.h>
-
--#define UNUSED(x) (void)(x)
-+#define UNUSED(x) (void)&(x)
-
- int
- main(int argc, char *argv[]) {
diff -r ab7fdeeb47f2 -r 1adb64f6cf30 net/bind916/patches/patch-contrib_dlz_modules_wildcard_dlz__wildcard__dynamic.c
--- a/net/bind916/patches/patch-contrib_dlz_modules_wildcard_dlz__wildcard__dynamic.c Sun Oct 24 04:03:55 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-contrib_dlz_modules_wildcard_dlz__wildcard__dynamic.c,v 1.1 2020/08/09 15:20:22 taca Exp $
-
-* Take from NetBSD base.
-
---- contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c.orig 2020-05-06 09:59:35.000000000 +0000
-+++ contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c
-@@ -59,6 +59,8 @@
- #include <dlz_list.h>
- #include <dlz_minimal.h>
-
-+#include <ctype.h>
-+
- #define DE_CONST(konst, var) \
- do { \
- union { \
diff -r ab7fdeeb47f2 -r 1adb64f6cf30 net/bind916/patches/patch-lib_dns_client.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/bind916/patches/patch-lib_dns_client.c Sun Oct 24 06:40:28 2021 +0000
@@ -0,0 +1,1871 @@
+$NetBSD: patch-lib_dns_client.c,v 1.1 2021/10/24 06:40:28 taca Exp $
+
+* Take from NetBSD base.
+
+--- lib/dns/client.c.orig 2021-09-07 09:37:05.000000000 +0000
++++ lib/dns/client.c
+@@ -56,6 +56,9 @@
+ #define RCTX_MAGIC ISC_MAGIC('R', 'c', 't', 'x')
+ #define RCTX_VALID(c) ISC_MAGIC_VALID(c, RCTX_MAGIC)
+
++#define REQCTX_MAGIC ISC_MAGIC('R', 'q', 'c', 'x')
++#define REQCTX_VALID(c) ISC_MAGIC_VALID(c, REQCTX_MAGIC)
++
+ #define UCTX_MAGIC ISC_MAGIC('U', 'c', 't', 'x')
+ #define UCTX_VALID(c) ISC_MAGIC_VALID(c, UCTX_MAGIC)
+
+@@ -92,6 +95,9 @@ struct dns_client {
+ dns_dispatch_t *dispatchv4;
+ dns_dispatch_t *dispatchv6;
+
++ unsigned int update_timeout;
++ unsigned int update_udptimeout;
++ unsigned int update_udpretries;
+ unsigned int find_timeout;
+ unsigned int find_udpretries;
+
+@@ -100,11 +106,23 @@ struct dns_client {
+ /* Locked */
+ dns_viewlist_t viewlist;
+ ISC_LIST(struct resctx) resctxs;
++ ISC_LIST(struct reqctx) reqctxs;
++ ISC_LIST(struct updatectx) updatectxs;
+ };
+
++/*%
++ * Timeout/retry constants for dynamic update borrowed from nsupdate
++ */
++#define DEF_UPDATE_TIMEOUT 300
++#define MIN_UPDATE_TIMEOUT 30
++#define DEF_UPDATE_UDPTIMEOUT 3
++#define DEF_UPDATE_UDPRETRIES 3
++
+ #define DEF_FIND_TIMEOUT 5
+ #define DEF_FIND_UDPRETRIES 3
+
++#define DNS_CLIENTATTR_OWNCTX 0x01
++
+ /*%
+ * Internal state for a single name resolution procedure
+ */
+@@ -151,8 +169,98 @@ typedef struct resarg {
+ bool canceled;
+ } resarg_t;
+
++/*%
++ * Internal state for a single DNS request
++ */
++typedef struct reqctx {
++ /* Unlocked */
++ unsigned int magic;
++ isc_mutex_t lock;
++ dns_client_t *client;
++ unsigned int parseoptions;
++
++ /* Locked */
++ ISC_LINK(struct reqctx) link;
++ bool canceled;
++ dns_tsigkey_t *tsigkey;
++ dns_request_t *request;
++ dns_clientreqevent_t *event;
++} reqctx_t;
++
++/*%
++ * Argument of an internal event for synchronous DNS request.
++ */
++typedef struct reqarg {
++ /* Unlocked */
++ isc_appctx_t *actx;
++ dns_client_t *client;
++ isc_mutex_t lock;
++
++ /* Locked */
++ isc_result_t result;
++ dns_clientreqtrans_t *trans;
++ bool canceled;
++} reqarg_t;
++
++/*%
++ * Argument of an internal event for synchronous name resolution.
++ */
++typedef struct updatearg {
++ /* Unlocked */
++ isc_appctx_t *actx;
++ dns_client_t *client;
++ isc_mutex_t lock;
++
++ /* Locked */
++ isc_result_t result;
++ dns_clientupdatetrans_t *trans;
++ bool canceled;
++} updatearg_t;
++
++/*%
++ * Internal state for a single dynamic update procedure
++ */
++typedef struct updatectx {
++ /* Unlocked */
++ unsigned int magic;
++ isc_mutex_t lock;
++ dns_client_t *client;
++ bool want_tcp;
++
++ /* Locked */
++ dns_request_t *updatereq;
++ dns_request_t *soareq;
++ dns_clientrestrans_t *restrans;
++ dns_clientrestrans_t *restrans2;
++ bool canceled;
++
++ /* Task Locked */
++ ISC_LINK(struct updatectx) link;
++ dns_clientupdatestate_t state;
++ dns_rdataclass_t rdclass;
++ dns_view_t *view;
++ dns_message_t *updatemsg;
++ dns_message_t *soaquery;
++ dns_clientupdateevent_t *event;
++ dns_tsigkey_t *tsigkey;
++ dst_key_t *sig0key;
++ dns_name_t *firstname;
++ dns_name_t soaqname;
++ dns_fixedname_t zonefname;
++ dns_name_t *zonename;
++ isc_sockaddrlist_t servers;
++ unsigned int nservers;
++ isc_sockaddr_t *currentserver;
++ struct updatectx *bp4;
++ struct updatectx *bp6;
++} updatectx_t;
++
++static isc_result_t
++request_soa(updatectx_t *uctx);
+ static void
+ client_resfind(resctx_t *rctx, dns_fetchevent_t *event);
++static isc_result_t
Home |
Main Index |
Thread Index |
Old Index