Index: external/bsd/dhcpcd/dist/src/dhcp6.c
===================================================================
RCS file: /cvsroot/src/external/bsd/dhcpcd/dist/src/dhcp6.c,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 dhcp6.c
--- external/bsd/dhcpcd/dist/src/dhcp6.c 31 Mar 2017 20:51:15 -0000 1.1.1.1
+++ external/bsd/dhcpcd/dist/src/dhcp6.c 2 Apr 2017 18:07:44 -0000
@@ -2885,8 +2885,6 @@ dhcp6_handledata(void *arg)
syslog(LOG_WARNING, "%s: no authentication from %s",
ifp->name, ctx->sfrom);
}
-#else
- auth = NULL;
#endif
op = dhcp6_get_op(r->type);
@@ -2996,12 +2994,14 @@ dhcp6_handledata(void *arg)
return;
break;
case DHCP6_RECONFIGURE:
+#ifdef AUTH
if (auth == NULL) {
syslog(LOG_ERR, "%s: unauthenticated %s from %s",
ifp->name, op, ctx->sfrom);
if (ifo->auth.options & DHCPCD_AUTH_REQUIRE)
return;
}
+#endif
syslog(LOG_INFO, "%s: %s from %s",
ifp->name, op, ctx->sfrom);
o = dhcp6_findmoption(r, len, D6_OPTION_RECONF_MSG, &ol);
Index: external/bsd/dhcpcd/dist/src/ipv4ll.h
===================================================================
RCS file: /cvsroot/src/external/bsd/dhcpcd/dist/src/ipv4ll.h,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 ipv4ll.h
--- external/bsd/dhcpcd/dist/src/ipv4ll.h 31 Mar 2017 20:51:16 -0000 1.1.1.1
+++ external/bsd/dhcpcd/dist/src/ipv4ll.h 2 Apr 2017 18:07:44 -0000
@@ -71,9 +71,11 @@ int ipv4ll_recvrt(int, const struct rt *
void ipv4ll_freedrop(struct interface *, int);
#else
#define IPV4LL_STATE_RUNNING(ifp) (0)
-#define ipv4ll_subnet_route(ifp) (NULL)
-#define ipv4ll_default_route(ifp) (NULL)
-#define ipv4ll_handlert(a, b, c) (0)
+#define ipv4ll_subnetroute(routes, ifp) (0)
+#define ipv4ll_defaultroute(routes, ifp) (0)
+#define ipv4ll_start(a) {}
+#define ipv4ll_claimed(a) {}
+#define ipv4ll_handle_failure(a) {}
#define ipv4ll_free(a) {}
#define ipv4ll_drop(a) {}
#endif
Index: external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile
===================================================================
RCS file: /cvsroot/src/external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile,v
retrieving revision 1.2
diff -p -u -r1.2 Makefile
--- external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile 1 Apr 2017 19:02:58 -0000 1.2
+++ external/bsd/dhcpcd/libexec/dhcpcd-hooks/Makefile 2 Apr 2017 18:07:44 -0000
@@ -19,18 +19,22 @@ CLEANFILES+= 50-ypbind
.if ${MKSHARE} != "no"
EGFILES= ${EGHOOKS:C,^,${HOOKSRC}/,}
-EGFILES+= ${MKEGHOOKS:C,^,${.OBJDIR}/,}
-FILES+= ${EGFILES}
-.for f in ${EGFILES}
+MKEGFILES= ${MKEGHOOKS:C,^,${.OBJDIR}/,}
+FILES+= ${EGFILES} ${MKEGFILES}
+
+.for f in ${EGFILES} ${MKEGFILES}
FILESDIR_${f}= /usr/share/examples/dhcpcd/hooks
.endfor
-.endif
-.SUFFIXES: .in
+.for f in ${MKEGFILES}
+FILESBUILD_$f= yes
+.endfor
-all: ${HOOKS} ${EGHOOKS} ${MKEGHOOKS}
+.for f in ${MKEGHOOKS}
+${f:C,^,${.OBJDIR}/,}: ${f}.in
+ ${TOOL_SED} ${SED_SYS} ${HOOKSRC}/${f}.in > $@
+.endfor
-.in: ../../Makefile.inc
- ${TOOL_SED} ${SED_SYS} $< > $@
+.endif
.include <bsd.prog.mk>
