summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorroy <roy@NetBSD.org>2018-06-04 09:55:13 +0000
committerroy <roy@NetBSD.org>2018-06-04 09:55:13 +0000
commitbcba08e6cfc79433d3a608fd953a187ca08400a6 (patch)
tree842a593edd1fb21bdc5695b808992537ef06dee6 /external
parent0b13af8b4d5a9dc267946ee00d7ae777b5663a99 (diff)
Import dhcpcd-7.0.5a.
Only change is to fix builds without INET6.
Diffstat (limited to 'external')
-rw-r--r--external/bsd/dhcpcd/dist/Makefile3
-rw-r--r--external/bsd/dhcpcd/dist/src/dhcp.h1
-rw-r--r--external/bsd/dhcpcd/dist/src/dhcp6.h1
-rw-r--r--external/bsd/dhcpcd/dist/src/ipv4ll.h1
-rw-r--r--external/bsd/dhcpcd/dist/src/ipv6.c2
-rw-r--r--external/bsd/dhcpcd/dist/src/ipv6.h1
-rw-r--r--external/bsd/dhcpcd/dist/src/ipv6nd.h1
7 files changed, 4 insertions, 6 deletions
diff --git a/external/bsd/dhcpcd/dist/Makefile b/external/bsd/dhcpcd/dist/Makefile
index 6368540d86f..8a8b79ae23e 100644
--- a/external/bsd/dhcpcd/dist/Makefile
+++ b/external/bsd/dhcpcd/dist/Makefile
@@ -8,7 +8,8 @@ DIST!= if test -f .fslckout; then echo "dist-fossil"; \
FOSSILID?= current
GITREF?= HEAD
-DISTPREFIX?= dhcpcd-${VERSION}
+DISTSUFFIX=
+DISTPREFIX?= dhcpcd-${VERSION}${DISTSUFFIX}
DISTFILEGZ?= ${DISTPREFIX}.tar.gz
DISTFILE?= ${DISTPREFIX}.tar.xz
DISTINFO= ${DISTFILE}.distinfo
diff --git a/external/bsd/dhcpcd/dist/src/dhcp.h b/external/bsd/dhcpcd/dist/src/dhcp.h
index b4313d435ea..fb2795874a7 100644
--- a/external/bsd/dhcpcd/dist/src/dhcp.h
+++ b/external/bsd/dhcpcd/dist/src/dhcp.h
@@ -267,7 +267,6 @@ void dhcp_close(struct interface *);
void dhcp_free(struct interface *);
int dhcp_dump(struct interface *);
#else
-#define dhcp_drop(a, b) {}
#define dhcp_start(a) {}
#define dhcp_abort(a) {}
#define dhcp_renew(a) {}
diff --git a/external/bsd/dhcpcd/dist/src/dhcp6.h b/external/bsd/dhcpcd/dist/src/dhcp6.h
index f9f8c403695..0e48ad0e6a8 100644
--- a/external/bsd/dhcpcd/dist/src/dhcp6.h
+++ b/external/bsd/dhcpcd/dist/src/dhcp6.h
@@ -245,7 +245,6 @@ int dhcp6_dump(struct interface *);
#define dhcp6_renew(a) {}
#define dhcp6_env(a, b, c, d, e) (0)
#define dhcp6_free(a) {}
-#define dhcp6_handleifa(a, b) {}
#define dhcp6_dadcompleted(a) (0)
#define dhcp6_drop(a, b) {}
#define dhcp6_dropnondelegates(a) {}
diff --git a/external/bsd/dhcpcd/dist/src/ipv4ll.h b/external/bsd/dhcpcd/dist/src/ipv4ll.h
index 074de6933ef..6ce1bef2d22 100644
--- a/external/bsd/dhcpcd/dist/src/ipv4ll.h
+++ b/external/bsd/dhcpcd/dist/src/ipv4ll.h
@@ -75,7 +75,6 @@ void ipv4ll_freedrop(struct interface *, int);
#define ipv4ll_defaultroute(route, ifp) (0)
#define ipv4ll_handlert(a, b, c) (0)
#define ipv4ll_free(a) {}
-#define ipv4ll_drop(a) {}
#endif
#endif
diff --git a/external/bsd/dhcpcd/dist/src/ipv6.c b/external/bsd/dhcpcd/dist/src/ipv6.c
index 3085b8884f4..b3b026b3202 100644
--- a/external/bsd/dhcpcd/dist/src/ipv6.c
+++ b/external/bsd/dhcpcd/dist/src/ipv6.c
@@ -1183,7 +1183,9 @@ ipv6_handleifa(struct dhcpcd_ctx *ctx,
return;
ipv6nd_handleifa(cmd, ia, pid);
+#ifdef DHCP6
dhcp6_handleifa(cmd, ia, pid);
+#endif
out:
/* Done with the ia now, so free it. */
diff --git a/external/bsd/dhcpcd/dist/src/ipv6.h b/external/bsd/dhcpcd/dist/src/ipv6.h
index 2b6eb5cced3..ef740ba4a2f 100644
--- a/external/bsd/dhcpcd/dist/src/ipv6.h
+++ b/external/bsd/dhcpcd/dist/src/ipv6.h
@@ -285,7 +285,6 @@ bool inet6_getroutes(struct dhcpcd_ctx *, struct rt_head *);
#define ipv6_hasaddr(a) (0)
#define ipv6_free_ll_callbacks(a) {}
#define ipv6_free(a) {}
-#define ipv6_drop(a) {}
#define ipv6_ctxfree(a) {}
#define ipv6_gentempifid(a) {}
#endif
diff --git a/external/bsd/dhcpcd/dist/src/ipv6nd.h b/external/bsd/dhcpcd/dist/src/ipv6nd.h
index 7e123e48d5f..d40ed0341d8 100644
--- a/external/bsd/dhcpcd/dist/src/ipv6nd.h
+++ b/external/bsd/dhcpcd/dist/src/ipv6nd.h
@@ -107,7 +107,6 @@ void ipv6nd_neighbour(struct dhcpcd_ctx *, struct in6_addr *, int);
#define ipv6nd_free(a) {}
#define ipv6nd_hasra(a) (0)
#define ipv6nd_dadcompleted(a) (0)
-#define ipv6nd_drop(a) {}
#define ipv6nd_expire(a, b) {}
#endif