[src/trunk]: src/external/mpl/dhcp Adjust for bind-9.16.20

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a8c95c0b4f28
branches:  trunk
changeset: 985326:a8c95c0b4f28
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Aug 19 11:50:56 2021 +0000

description:
Adjust for bind-9.16.20

diffstat:

 external/mpl/dhcp/Makefile.inc                  |   6 +-
 external/mpl/dhcp/dist/includes/omapip/isclib.h |   4 +-
 external/mpl/dhcp/dist/omapip/isclib.c          |  50 ++++++++++++-------------
 3 files changed, 30 insertions(+), 30 deletions(-)

diffs (136 lines):

diff -r 6c33877a9b07 -r a8c95c0b4f28 external/mpl/dhcp/Makefile.inc
--- a/external/mpl/dhcp/Makefile.inc    Thu Aug 19 11:50:14 2021 +0000
+++ b/external/mpl/dhcp/Makefile.inc    Thu Aug 19 11:50:56 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2021/04/13 04:14:46 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.11 2021/08/19 11:50:56 christos Exp $
 
 WARNS?=        1       # XXX -Wshadow -Wcast-qual -Wsign-compare
 
@@ -45,8 +45,8 @@
 LDADD+= -L${LIBUVOBJDIR} -luv
 DPADD+= ${LIBIRS} ${LIBISCCFG} ${LIBDNS} ${LIBISC} ${LIBUV}
 DPADD+= ${LIBUVOBJDIR}/libuv.a
-LDADD+= -lkvm -lpthread -lz
-DPADD+= ${LIBKVM} ${LIBPTHREAD} ${LIBZ}
+LDADD+= -lexecinfo -lkvm -lpthread -lz
+DPADD+= ${LIBEXECINFO} ${LIBKVM} ${LIBPTHREAD} ${LIBZ}
 .if (${MKKERBEROS} != "no")
 LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} ${LIBKRB5_STATIC_LDADD}
 DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM} ${LIBGSSAPI} ${LIBKRB5_STATIC_DPADD}
diff -r 6c33877a9b07 -r a8c95c0b4f28 external/mpl/dhcp/dist/includes/omapip/isclib.h
--- a/external/mpl/dhcp/dist/includes/omapip/isclib.h   Thu Aug 19 11:50:14 2021 +0000
+++ b/external/mpl/dhcp/dist/includes/omapip/isclib.h   Thu Aug 19 11:50:56 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isclib.h,v 1.3 2020/08/03 21:10:57 christos Exp $      */
+/*     $NetBSD: isclib.h,v 1.4 2021/08/19 11:50:56 christos Exp $      */
 
 /* isclib.h
 
@@ -54,6 +54,7 @@
 #include <isc/lex.h>
 #include <isc/lib.h>
 #include <isc/app.h>
+#include <isc/managers.h>
 #include <isc/mem.h>
 #include <isc/parseint.h>
 #include <isc/socket.h>
@@ -96,6 +97,7 @@
        int              actx_started; // ISC_TRUE if ctxstart has been called
        int              actx_running; // ISC_TRUE if ctxrun has been called
        isc_taskmgr_t   *taskmgr;
+       isc_nm_t        *netmgr;
        isc_task_t      *task;
        isc_socketmgr_t *socketmgr;
        isc_timermgr_t  *timermgr;
diff -r 6c33877a9b07 -r a8c95c0b4f28 external/mpl/dhcp/dist/omapip/isclib.c
--- a/external/mpl/dhcp/dist/omapip/isclib.c    Thu Aug 19 11:50:14 2021 +0000
+++ b/external/mpl/dhcp/dist/omapip/isclib.c    Thu Aug 19 11:50:56 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isclib.c,v 1.5 2020/08/03 21:10:57 christos Exp $      */
+/*     $NetBSD: isclib.c,v 1.6 2021/08/19 11:50:56 christos Exp $      */
 
 /*
  * Copyright(c) 2009-2019 by Internet Systems Consortium, Inc.("ISC")
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: isclib.c,v 1.5 2020/08/03 21:10:57 christos Exp $");
+__RCSID("$NetBSD: isclib.c,v 1.6 2021/08/19 11:50:56 christos Exp $");
 
 /*Trying to figure out what we need to define to get things to work.
   It looks like we want/need the library but need the fdwatchcommand
@@ -109,7 +109,8 @@
                isc_socketmgr_destroy(&dhcp_gbl_ctx.socketmgr);
 
        if (dhcp_gbl_ctx.taskmgr != NULL)
-               isc_taskmgr_destroy(&dhcp_gbl_ctx.taskmgr);
+               isc_managers_destroy(&dhcp_gbl_ctx.netmgr,
+                                    &dhcp_gbl_ctx.taskmgr);
 
        if (dhcp_gbl_ctx.actx_started != ISC_FALSE) {
                isc_app_ctxfinish(dhcp_gbl_ctx.actx);
@@ -218,22 +219,19 @@
 
                result = isc_appctx_create(dhcp_gbl_ctx.mctx,
                                           &dhcp_gbl_ctx.actx);
+
+               result = isc_managers_create(dhcp_gbl_ctx.mctx, 1, 0,
+                   &dhcp_gbl_ctx.netmgr, &dhcp_gbl_ctx.taskmgr);
                if (result != ISC_R_SUCCESS)
                        goto cleanup;
 
-               result = isc_taskmgr_createinctx(dhcp_gbl_ctx.mctx,
-                                                1, 0,
-                                                &dhcp_gbl_ctx.taskmgr);
+               result = isc_socketmgr_create(dhcp_gbl_ctx.mctx,
+                                             &dhcp_gbl_ctx.socketmgr);
                if (result != ISC_R_SUCCESS)
                        goto cleanup;
 
-               result = isc_socketmgr_createinctx(dhcp_gbl_ctx.mctx,
-                                                  &dhcp_gbl_ctx.socketmgr);
-               if (result != ISC_R_SUCCESS)
-                       goto cleanup;
-
-               result = isc_timermgr_createinctx(dhcp_gbl_ctx.mctx,
-                                                 &dhcp_gbl_ctx.timermgr);
+               result = isc_timermgr_create(dhcp_gbl_ctx.mctx,
+                                            &dhcp_gbl_ctx.timermgr);
                if (result != ISC_R_SUCCESS)
                        goto cleanup;
 
@@ -395,19 +393,19 @@
 isc_result_t dns_client_init() {
        isc_result_t result;
        if (dhcp_gbl_ctx.dnsclient == NULL) {
-               result = dns_client_createx(dhcp_gbl_ctx.mctx,
-                                            dhcp_gbl_ctx.actx,
-                                            dhcp_gbl_ctx.taskmgr,
-                                            dhcp_gbl_ctx.socketmgr,
-                                            dhcp_gbl_ctx.timermgr,
-                                            0,
-                                            &dhcp_gbl_ctx.dnsclient,
-                                            (dhcp_gbl_ctx.use_local4 ?
-                                             &dhcp_gbl_ctx.local4_sockaddr
-                                             : NULL),
-                                            (dhcp_gbl_ctx.use_local6 ?
-                                             &dhcp_gbl_ctx.local6_sockaddr
-                                             : NULL));
+               result = dns_client_create(dhcp_gbl_ctx.mctx,
+                                          dhcp_gbl_ctx.actx,
+                                          dhcp_gbl_ctx.taskmgr,
+                                          dhcp_gbl_ctx.socketmgr,
+                                          dhcp_gbl_ctx.timermgr,
+                                          0,
+                                          &dhcp_gbl_ctx.dnsclient,
+                                          (dhcp_gbl_ctx.use_local4 ?
+                                           &dhcp_gbl_ctx.local4_sockaddr
+                                           : NULL),
+                                          (dhcp_gbl_ctx.use_local6 ?
+                                           &dhcp_gbl_ctx.local6_sockaddr
+                                           : NULL));
 
                if (result != ISC_R_SUCCESS) {
                        log_error("Unable to create DNS client context:"