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

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

details:   https://anonhg.NetBSD.org/src/rev/d73b11047221
branches:  trunk
changeset: 933331:d73b11047221
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 24 19:50:12 2020 +0000

description:
Adjust for bind-9.16.3

diffstat:

 external/mpl/dhcp/Makefile.inc         |  10 +++++-----
 external/mpl/dhcp/dist/omapip/isclib.c |  12 +++---------
 2 files changed, 8 insertions(+), 14 deletions(-)

diffs (79 lines):

diff -r 266d5c1f4684 -r d73b11047221 external/mpl/dhcp/Makefile.inc
--- a/external/mpl/dhcp/Makefile.inc    Sun May 24 19:49:34 2020 +0000
+++ b/external/mpl/dhcp/Makefile.inc    Sun May 24 19:50:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2019/01/10 17:41:47 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2020/05/24 19:50:12 christos Exp $
 
 WARNS?=        1       # XXX -Wshadow -Wcast-qual -Wsign-compare
 
@@ -37,8 +37,10 @@
 # would be to install the libraries in /lib...
 LDADD+=-Wl,-Bstatic
 .endif
-LDADD+= -lirs -lisccfg -ldns -lisc
-LDADD+=-lpthread -lz
+LDADD+= -lirs -lisccfg -ldns -lisc -luv
+DPADD+= ${LIBIRS} ${LIBISCCFG} ${LIBDNS} ${LIBISC} ${LIBUV}
+LDADD+= -lpthread -lz
+DPADD+= ${LIBPTHREAD} ${LIBZ}
 .if (${MKKERBEROS} != "no")
 LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} ${LIBKRB5_STATIC_LDADD}
 DPADD+= ${LIBKRB5_DPADD} ${LIBHEIMNTLM} ${LIBGSSAPI} ${LIBKRB5_STATIC_DPADD}
@@ -53,5 +55,3 @@
 .endif
 DPADD+= ${COBJDIR}/libdhcp.a
 DPADD+= ${OMOBJDIR}/libomapi.a
-DPADD+=        ${LIBDNS} ${LIBISC}
-DPADD+= ${LIBPTHREAD} ${LIBZ}
diff -r 266d5c1f4684 -r d73b11047221 external/mpl/dhcp/dist/omapip/isclib.c
--- a/external/mpl/dhcp/dist/omapip/isclib.c    Sun May 24 19:49:34 2020 +0000
+++ b/external/mpl/dhcp/dist/omapip/isclib.c    Sun May 24 19:50:12 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isclib.c,v 1.3 2019/01/10 17:41:47 christos Exp $      */
+/*     $NetBSD: isclib.c,v 1.4 2020/05/24 19:50:12 christos Exp $      */
 
 /*
  * Copyright(c) 2009-2017 by Internet Systems Consortium, Inc.("ISC")
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: isclib.c,v 1.3 2019/01/10 17:41:47 christos Exp $");
+__RCSID("$NetBSD: isclib.c,v 1.4 2020/05/24 19:50:12 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
@@ -169,10 +169,7 @@
                 * the lib inits in case we aren't doing NSUPDATE
                 * in which case dst needs a memory context
                 */
-               result = isc_mem_create(0, 0, &dhcp_gbl_ctx.mctx);
-               if (result != ISC_R_SUCCESS)
-                       goto cleanup;
-
+               isc_mem_create(&dhcp_gbl_ctx.mctx);
 
 #if defined (NSUPDATE)
                result = dns_lib_init();
@@ -193,20 +190,17 @@
                        goto cleanup;
 
                result = isc_taskmgr_createinctx(dhcp_gbl_ctx.mctx,
-                                                dhcp_gbl_ctx.actx,
                                                 1, 0,
                                                 &dhcp_gbl_ctx.taskmgr);
                if (result != ISC_R_SUCCESS)
                        goto cleanup;
 
                result = isc_socketmgr_createinctx(dhcp_gbl_ctx.mctx,
-                                                  dhcp_gbl_ctx.actx,
                                                   &dhcp_gbl_ctx.socketmgr);
                if (result != ISC_R_SUCCESS)
                        goto cleanup;
 
                result = isc_timermgr_createinctx(dhcp_gbl_ctx.mctx,
-                                                 dhcp_gbl_ctx.actx,
                                                  &dhcp_gbl_ctx.timermgr);
                if (result != ISC_R_SUCCESS)
                        goto cleanup;